Merge remote-tracking branch 'upstream/master' into nakamura

1 files changed, 220 insertions, 51 deletions

diff --git a/include/contest.h b/include/contest.h
index 557b9e5c4..86a5ea4d7 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -13,13 +13,186 @@ enum
 enum
 {
     CONTEST_EFFECT_HIGHLY_APPEALING,
-    CONTEST_EFFECT_USER_MORE_STARTLED,
-    CONTEST_EFFECT_APPEAL_ONLY_ONCE,
-    CONTEST_EFFECT_REPEATABLE,
+    CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
+    CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
+    CONTEST_EFFECT_REPETITION_NOT_BORING,
     CONTEST_EFFECT_AVOID_STARTLE_ONCE,
     CONTEST_EFFECT_AVOID_STARTLE,
-    CONTEST_EFFECT_AVOID_STARTLE_LITTLE,
-    //...
+    CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY,
+    CONTEST_EFFECT_USER_LESS_EASILY_STARTLED,
+    CONTEST_EFFECT_STARTLE_FRONT_MON,
+    CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS,
+    CONTEST_EFFECT_STARTLE_PREV_MON,
+    CONTEST_EFFECT_STARTLE_PREV_MONS,
+    CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+    CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+    CONTEST_EFFECT_STARTLE_PREV_MON_2,
+    CONTEST_EFFECT_STARTLE_PREV_MONS_2,
+    CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION,
+    CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+    CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
+    CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+    CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL,
+    CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL,
+    CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL,
+    CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL,
+    CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL,
+    CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS,
+    CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+    CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
+    CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION,
+    CONTEST_EFFECT_BETTER_IF_FIRST,
+    CONTEST_EFFECT_BETTER_IF_LAST,
+    CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
+    CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE,
+    CONTEST_EFFECT_BETTER_WHEN_LATER,
+    CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING,
+    CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+    CONTEST_EFFECT_BETTER_IF_DIFF_TYPE,
+    CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
+    CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+    CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION,
+    CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
+    CONTEST_EFFECT_NEXT_APPEAL_LATER,
+    CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER,
+    CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
+    CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST,
+    CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+    CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
+    CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
+};
+
+enum
+{
+    COMBO_STARTER_RAIN_DANCE = 1,
+    COMBO_STARTER_RAGE,
+    COMBO_STARTER_FOCUS_ENERGY,
+    COMBO_STARTER_HYPNOSIS,
+    COMBO_STARTER_ENDURE,
+    COMBO_STARTER_HORN_ATTACK,
+    COMBO_STARTER_SWORDS_DANCE,
+    COMBO_STARTER_STOCKPILE,
+    COMBO_STARTER_SUNNY_DAY,
+    COMBO_STARTER_REST,
+    COMBO_STARTER_VICE_GRIP,
+    COMBO_STARTER_DEFENSE_CURL,
+    COMBO_STARTER_CHARGE,
+    COMBO_STARTER_ROCK_THROW,
+    COMBO_STARTER_YAWN,
+    COMBO_STARTER_SCARY_FACE,
+    COMBO_STARTER_POWDER_SNOW,
+    COMBO_STARTER_LOCK_ON,
+    COMBO_STARTER_SOFT_BOILED,
+    COMBO_STARTER_MEAN_LOOK,
+    COMBO_STARTER_SCRATCH,
+    COMBO_STARTER_GROWTH,
+    COMBO_STARTER_HAIL,
+    COMBO_STARTER_SANDSTORM,
+    COMBO_STARTER_BELLY_DRUM,
+    COMBO_STARTER_MIND_READER,
+    COMBO_STARTER_DRAGON_BREATH,
+    COMBO_STARTER_DRAGON_RAGE,
+    COMBO_STARTER_DRAGON_DANCE,
+    COMBO_STARTER_SURF,
+    COMBO_STARTER_DIVE,
+    COMBO_STARTER_STRING_SHOT,
+    COMBO_STARTER_LEER,
+    COMBO_STARTER_TAUNT,
+    COMBO_STARTER_CHARM,
+    COMBO_STARTER_HARDEN,
+    COMBO_STARTER_SING,
+    COMBO_STARTER_EARTHQUAKE,
+    COMBO_STARTER_DOUBLE_TEAM,
+    COMBO_STARTER_CURSE,
+    COMBO_STARTER_SWEET_SCENT,
+    COMBO_STARTER_SLUDGE,
+    COMBO_STARTER_SLUDGE_BOMB,
+    COMBO_STARTER_THUNDER_PUNCH,
+    COMBO_STARTER_FIRE_PUNCH,
+    COMBO_STARTER_ICE_PUNCH,
+    COMBO_STARTER_PECK,
+    COMBO_STARTER_METAL_SOUND,
+    COMBO_STARTER_MUD_SPORT,
+    COMBO_STARTER_WATER_SPORT,
+    COMBO_STARTER_BONE_CLUB,
+    COMBO_STARTER_BONEMERANG,
+    COMBO_STARTER_BONE_RUSH,
+    COMBO_STARTER_SAND_ATTACK,
+    COMBO_STARTER_MUD_SLAP,
+    COMBO_STARTER_FAKE_OUT,
+    COMBO_STARTER_PSYCHIC,
+    COMBO_STARTER_KINESIS,
+    COMBO_STARTER_CONFUSION,
+    COMBO_STARTER_POUND,
+    COMBO_STARTER_SMOG,
+    COMBO_STARTER_CALM_MIND
+};
+
+enum
+{
+    CONTEST_STRING_MORE_CONSCIOUS,
+    CONTEST_STRING_NO_APPEAL,
+    CONTEST_STRING_SETTLE_DOWN,
+    CONTEST_STRING_OBLIVIOUS_TO_OTHERS,
+    CONTEST_STRING_LESS_AWARE,
+    CONTEST_STRING_STOPPED_CARING,
+    CONTEST_STRING_STARTLE_ATTEMPT,
+    CONTEST_STRING_DAZZLE_ATTEMPT,
+    CONTEST_STRING_JUDGE_LOOK_AWAY2,
+    CONTEST_STRING_UNNERVE_ATTEMPT,
+    CONTEST_STRING_NERVOUS,
+    CONTEST_STRING_UNNERVE_WAITING,
+    CONTEST_STRING_TAUNT_WELL,
+    CONTEST_STRING_REGAINED_FORM,
+    CONTEST_STRING_JAM_WELL,
+    CONTEST_STRING_HUSTLE_STANDOUT,
+    CONTEST_STRING_WORK_HARD_UNNOTICED,
+    CONTEST_STRING_WORK_BEFORE,
+    CONTEST_STRING_APPEAL_NOT_WELL,
+    CONTEST_STRING_WORK_PRECEDING,
+    CONTEST_STRING_APPEAL_NOT_WELL2,
+    CONTEST_STRING_APPEAL_NOT_SHOWN_WELL,
+    CONTEST_STRING_APPEAL_SLIGHTLY_WELL,
+    CONTEST_STRING_APPEAL_PRETTY_WELL,
+    CONTEST_STRING_APPEAL_EXCELLENTLY,
+    CONTEST_STRING_APPEAL_DUD,
+    CONTEST_STRING_APPEAL_NOT_VERY_WELL,
+    CONTEST_STRING_APPEAL_SLIGHTLY_WELL2,
+    CONTEST_STRING_APPEAL_PRETTY_WELL2,
+    CONTEST_STRING_APPEAL_VERY_WELL,
+    CONTEST_STRING_APPEAL_EXCELLENTLY2,
+    CONTEST_STRING_SAME_TYPE_GOOD,
+    CONTEST_STRING_DIFF_TYPE_GOOD,
+    CONTEST_STRING_STOOD_OUT_AS_MUCH,
+    CONTEST_STRING_NOT_AS_WELL,
+    CONTEST_STRING_CONDITION_ROSE,
+    CONTEST_STRING_HOT_STATUS,
+    CONTEST_STRING_MOVE_UP_LINE,
+    CONTEST_STRING_MOVE_BACK_LINE,
+    CONTEST_STRING_SCRAMBLE_ORDER,
+    CONTEST_STRING_JUDGE_EXPECTANTLY2,
+    CONTEST_STRING_WENT_OVER_WELL,
+    CONTEST_STRING_WENT_OVER_VERY_WELL,
+    CONTEST_STRING_APPEAL_COMBO_EXCELLENTLY,
+    CONTEST_STRING_AVERT_GAZE,
+    CONTEST_STRING_AVOID_SEEING,
+    CONTEST_STRING_NOT_FAZED,
+    CONTEST_STRING_LITTLE_DISTRACTED,
+    CONTEST_STRING_ATTEMPT_STARTLE,
+    CONTEST_STRING_LOOKED_DOWN,
+    CONTEST_STRING_TURNED_BACK,
+    CONTEST_STRING_UTTER_CRY,
+    CONTEST_STRING_LEAPT_UP,
+    CONTEST_STRING_TRIPPED_OVER,
+    CONTEST_STRING_MESSED_UP2,
+    CONTEST_STRING_FAILED_TARGET_NERVOUS,
+    CONTEST_STRING_FAILED_ANYONE_NERVOUS,
+    CONTEST_STRING_IGNORED,
+    CONTEST_STRING_NO_CONDITION_IMPROVE,
+    CONTEST_STRING_BAD_CONDITION_WEAK_APPEAL,
+    CONTEST_STRING_UNAFFECTED,
+    CONTEST_STRING_ATTRACTED_ATTENTION,
+    CONTEST_STRING_NONE = 255
 };
 
 struct ContestMove
@@ -156,51 +329,44 @@ struct ContestantStatus
  /*0x0B*/ u8 unkB_0:2;
           u8 unkB_2:2;
           u8 moveRepeatCount:3;
-          u8 unkB_7:1;  // used a one-time move?
- /*0x0C*/ u8 unkC_0:1;
-          u8 unkC_1:2;
- /*0x0D*/ s8 unkD;
- /*0x0E*/ u8 unkE;
- /*0x0F*/ u8 unkF;
- /*0x10*/ u8 unk10_0:1;
-          u8 unk10_1:1;
-          u8 unk10_2:1;
-          u8 unk10_3:1;
-          u8 unk10_4:2;
-          u8 unk10_6:2;
- /*0x11*/ u8 unk11_0:2;
-          u8 unk11_2:1;
-          u8 unk11_3:1;
-          u8 unk11_4:1;
-          u8 unk11_5:1;
- /*0x12*/ u8 unk12;
- /*0x13*/ u8 unk13;   // status action?
- /*0x14*/ u8 unk14;
+          u8 noMoreTurns:1;  // used a one-time move?
+ /*0x0C*/ u8 nervous:1;
+          u8 numTurnsSkipped:2;
+ /*0x0D*/ s8 condition;
+ /*0x0E*/ u8 jam;
+ /*0x0F*/ u8 jamReduction;
+
+          // Flags set by move effect
+ /*0x10*/ u8 resistant:1;
+          u8 immune:1;
+          u8 moreEasilyStartled:1;
+          u8 usedRepeatableMove:1;
+          u8 conditionMod:2; // 1: just raised condition; 2: appeal greatly improved by condition
+          u8 turnOrderMod:2; // 1: defined; 2: random
+ /*0x11*/ u8 turnOrderModAction:2; // 1: made first; 2: made last; 3: made random
+          u8 turnSkipped:1;
+          u8 exploded:1;
+          u8 overrideCategoryExcitementMod:1;
+          u8 appealTripleCondition:1;
+
+ /*0x12*/ u8 jamSafetyCount;
+ /*0x13*/ u8 effectStringId;   // status action?
+ /*0x14*/ u8 effectStringId2;
  /*0x15*/ u8 disappointedRepeat:1;
           u8 unk15_1:1;
           u8 unk15_2:1;
           u8 unk15_3:1;
-          u8 unk15_4:1;
-          u8 unk15_5:1;
+          u8 hasJudgesAttention:1;
+          u8 judgesAttentionWasRemoved:1;
           u8 unk15_6:1;
  /*0x16*/ u8 unk16;
  /*0x17*/ u8 unk17;
  /*0x18*/ u8 unk18;
- /*0x19*/ u8 unk19;  // turn position
+ /*0x19*/ u8 nextTurnOrder;  // turn position
  /*0x1A*/ u8 attentionLevel;  // How much the Pokemon "stood out"
  /*0x1B*/ u8 unk1B;
 };
 
-struct UnknownContestStruct3
-{
-    u8 unk0;
-    u8 unk1;
-    //u8 unk2_0:1;
-    //u8 unk2_1:1;
-    u8 unk2;  // maybe a bitfield
-    u8 filler3;
-};
-
 // possibly the same as UnknownContestStruct3?
 struct UnknownContestStruct4
 {
@@ -209,28 +375,24 @@ struct UnknownContestStruct4
     u8 unk2_0:1;
     u8 unk2_1:1;
     u8 unk2_2:1;
-    u8 filler3;
 };
 
 struct UnknownContestStruct5
 {
     s8 bits_0;  // current move excitement?
-    u8 bits_8:1;
-    u8 bits_9:3;
-    u8 bits_C:4;
+    u8 excitementFrozen:1;
+    u8 excitementFreezer:3;
     s8 unk2;
-    u8 filler3;
 };
 
 struct UnknownContestStruct7
 {
-    u8 unk0[4];
-    u16 unk4;
-    u16 unk6;
-    u8 filler8[0xD-8];
-    u8 unkD[4];
-    u8 unk11;
-    u8 filler12[2];
+    u8 turnOrder[4];
+    s16 jam;
+    s16 jam2;
+    u8 jamQueue[5];
+    u8 unnervedPokes[4];
+    u8 contestant;
 };
 
 struct UnknownContestStruct8
@@ -239,7 +401,6 @@ struct UnknownContestStruct8
     u16 unk2;
     u8 unk4_0:1;
     u8 unk5;
-    u8 filler6[2];
     u32 unk8;
     u32 unkC;
     u32 unk10;
@@ -277,5 +438,13 @@ extern u16 gUnknown_02038688[4];
 extern u8 gContestFinalStandings[4];
 extern u8 gUnknown_02038696[4];
 extern u8 gUnknown_0203869B;
+extern u16 gSpecialVar_ContestCategory;
+
+void SetContestantEffectStringID(u8 a, u8 b);
+void SetContestantEffectStringID2(u8 a, u8 b);
+void MakeContestantNervous(u8 p);
+bool8 Contest_IsMonsTurnDisabled(u8 a);
+bool8 sub_80B214C(u8 a);
+void SetStartledString(u8 a, u8 b);
 
 #endif // GUARD_CONTEST_H