summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/contest.h15
-rw-r--r--include/learn_move.h15
2 files changed, 15 insertions, 15 deletions
diff --git a/include/contest.h b/include/contest.h
index 983f9bc6a..06c356c2f 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -1,6 +1,21 @@
#ifndef GUARD_CONTEST_H
#define GUARD_CONTEST_H
+struct ContestMove
+{
+ u8 effect;
+ u8 contestCategory:3;
+ u8 comboStarterId;
+ u8 comboMoves[4];
+};
+
+struct ContestEffect
+{
+ u8 effectType;
+ u8 appeal;
+ u8 jam;
+};
+
struct ContestPokemon
{
/* 0x00 */ u16 species;
diff --git a/include/learn_move.h b/include/learn_move.h
index 7a05ea60b..85fbf046e 100644
--- a/include/learn_move.h
+++ b/include/learn_move.h
@@ -1,21 +1,6 @@
#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