diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-16 22:53:01 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-16 22:53:01 +0200 |
| commit | 0bfe894566fe3c19c0f12342a273a40c5d6e12da (patch) | |
| tree | 37ef4a4f7be61b3bd70c2118dff9421140c67abe /include/contest.h | |
| parent | ba225f8eaab5e46f7fc825adc6df833f3996b38d (diff) | |
| parent | 2b81db7acecd8baa3e343de66fd229040ec81381 (diff) | |
Merge with master
Diffstat (limited to 'include/contest.h')
| -rw-r--r-- | include/contest.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/contest.h b/include/contest.h index 79c362908..33080225b 100644 --- a/include/contest.h +++ b/include/contest.h @@ -341,7 +341,8 @@ struct UnknownContestStruct7 u8 contestant; }; -struct ContestAIInfo { +struct ContestAIInfo +{ /*0x00*/ u8 aiState; /*0x02*/ u16 unk2; /*0x04*/ u8 unk4; @@ -352,9 +353,9 @@ struct ContestAIInfo { /*0x14*/ u32 flags; /*0x18*/ s16 scriptResult; /*0x1A*/ s16 scriptArr[3]; - /*0x20*/ u32 stack[8]; - /*0x40*/ u8 unk40; - /*0x41*/ u8 unk41; + /*0x20*/ const u8 *stack[8]; + /*0x40*/ u8 stackSize; + /*0x41*/ u8 contestantId; }; struct UnknownContestStruct5 @@ -406,7 +407,7 @@ extern struct ContestResources *gContestResources; #define sContest (*gContestResources->field_0) #define sContestantStatus (gContestResources->field_4) #define shared192D0 (*gContestResources->field_8) -#define eContestAI (*gContestResources->field_C) +#define eContestAI (gContestResources->field_C) #define shared19328 (*gContestResources->field_10) #define shared19338 (*gContestResources->field_14) @@ -424,5 +425,6 @@ void MakeContestantNervous(u8 p); bool8 Contest_IsMonsTurnDisabled(u8 a); bool8 sub_80DE1E8(u8 a); void SetStartledString(u8 a, u8 b); +s8 Contest_GetMoveExcitement(u16); #endif //GUARD_CONTEST_H |