From 7d446a9ef7737874f772f7537de97a8b8be2d7d4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 3 May 2018 08:51:52 -0400 Subject: through sub_80D8490 --- include/contest_effect.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 include/contest_effect.h (limited to 'include/contest_effect.h') diff --git a/include/contest_effect.h b/include/contest_effect.h new file mode 100644 index 000000000..4d680be9e --- /dev/null +++ b/include/contest_effect.h @@ -0,0 +1,14 @@ +#ifndef GUARD_CONTEST_EFFECT_H +#define GUARD_CONTEST_EFFECT_H + +struct ContestMove +{ + u8 effect; + u8 contestCategory:3; + u8 comboStarterId; + u8 comboMoves[4]; +}; + +extern const struct ContestMove gContestMoves[]; + +#endif //GUARD_CONTEST_EFFECT_H -- cgit v1.2.3 From c15b50ac686632130512de37d01037bff6e10cd2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 11 May 2018 08:44:21 -0400 Subject: through prints_contest_move_description --- include/contest_effect.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include/contest_effect.h') diff --git a/include/contest_effect.h b/include/contest_effect.h index 4d680be9e..3484ca5df 100644 --- a/include/contest_effect.h +++ b/include/contest_effect.h @@ -9,6 +9,14 @@ struct ContestMove u8 comboMoves[4]; }; +struct ContestEffect +{ + u8 effectType; + u8 appeal; + u8 jam; +}; + extern const struct ContestMove gContestMoves[]; +extern struct ContestEffect gContestEffects[]; #endif //GUARD_CONTEST_EFFECT_H -- cgit v1.2.3 From a07d69d7c2e65ed8ea71ec88cc3c4cadbb444510 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 14 Aug 2018 21:56:11 -0700 Subject: Finish pokemon_summary_screen --- include/contest_effect.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/contest_effect.h') diff --git a/include/contest_effect.h b/include/contest_effect.h index 3484ca5df..c8f5e389a 100644 --- a/include/contest_effect.h +++ b/include/contest_effect.h @@ -18,5 +18,6 @@ struct ContestEffect extern const struct ContestMove gContestMoves[]; extern struct ContestEffect gContestEffects[]; +extern const u8 *const gContestEffectDescriptionPointers[]; #endif //GUARD_CONTEST_EFFECT_H -- cgit v1.2.3 From c806992cfc5a4fac53f2c8a52b32f7a039773e41 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 15 Aug 2018 11:43:57 +0200 Subject: Port contest ai from pokeruby --- include/contest_effect.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/contest_effect.h') diff --git a/include/contest_effect.h b/include/contest_effect.h index 3484ca5df..4b3b151eb 100644 --- a/include/contest_effect.h +++ b/include/contest_effect.h @@ -17,6 +17,8 @@ struct ContestEffect }; extern const struct ContestMove gContestMoves[]; -extern struct ContestEffect gContestEffects[]; +extern const struct ContestEffect gContestEffects[]; + +bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove); #endif //GUARD_CONTEST_EFFECT_H -- cgit v1.2.3