diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-26 23:33:31 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-26 23:33:31 -0600 |
| commit | 5d74d11d3e3047b4b53153365325db9e6999c627 (patch) | |
| tree | f15fe9425296d4f95d0cd7190d6f19f852fbfe93 /include/learn_move.h | |
| parent | 48ec0941b4ebbe78fe70ef93d205ce52d2de89b2 (diff) | |
| parent | e6500d12a21e9833e08ad25cc6a76b075cff42dd (diff) | |
fix merge conflicts
Diffstat (limited to 'include/learn_move.h')
| -rw-r--r-- | include/learn_move.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/learn_move.h b/include/learn_move.h index 85fbf046e..7a05ea60b 100644 --- a/include/learn_move.h +++ b/include/learn_move.h @@ -1,6 +1,21 @@ #ifndef GUARD_LEARN_MOVE_H #define GUARD_LEARN_MOVE_H +struct ContestMove +{ + u8 effect; + u8 contestCategory:3; + u8 comboStarterId; + u8 comboMoves[4]; +}; + +struct ContestEffect +{ + u8 effectType; + u8 appeal; + u8 jam; +}; + void sub_8132670(void); #endif // GUARD_LEARN_MOVE_H |