diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/contest.h | 26 | ||||
| -rw-r--r-- | include/easy_chat.h | 2 | ||||
| -rw-r--r-- | include/text.h | 25 |
3 files changed, 36 insertions, 17 deletions
diff --git a/include/contest.h b/include/contest.h index a9ef50e0c..8281b76ce 100644 --- a/include/contest.h +++ b/include/contest.h @@ -295,13 +295,13 @@ void CB2_StartContest(void); void Contest_CreatePlayerMon(u8); void Contest_InitAllPokemon(u8, u8); u8 CanMonParticipateInContest(struct Pokemon *party); -u16 InitContestMonConditionI(u8, u8); -void InitContestMonConditions(u8); +u16 CalculateContestantRound1Points(u8, u8); +void CalculateRound1Points(u8); u8 IsSpeciesNotUnown(u16); -void sub_80AF668(void); +void CalculateFinalScores(void); void SortContestants(u8); bool8 Contest_SaveWinner(u8); -u8 sub_80B2C4C(u8, u8); +u8 GetContestWinnerSaveIdx(u8, u8); void Contest_ResetWinners(void); s8 Contest_GetMoveExcitement(u16); @@ -439,12 +439,12 @@ struct UnknownContestStruct8 u32 unk10; }; -struct UnknownContestStruct6 +struct ContestFinalStandings { - s32 unk0; - s32 unk4; - s32 unk8; - s32 unkC; + s32 totalPoints; + s32 round1Points; + s32 random; + s32 contestant; }; // TODO: Please move these to ewram.h once the defines are settled down and figured out completely. @@ -463,13 +463,13 @@ struct UnknownContestStruct6 extern u8 gContestPlayerMonIndex; extern u8 gIsLinkContest; extern u32 gContestRngValue; -extern u8 gUnknown_02038696[4]; +extern u8 gContestantTurnOrder[4]; extern s16 gContestMonRound1Points[4]; extern s16 gContestMonTotalPoints[4]; -extern s16 gUnknown_02038680[4]; -extern s16 gUnknown_02038688[4]; +extern s16 gContestMonAppealPointTotals[4]; +extern s16 gContestMonRound2Points[4]; extern u8 gContestFinalStandings[4]; -extern u8 gUnknown_02038696[4]; +extern u8 gContestantTurnOrder[4]; extern u8 gContestLinkLeaderIndex; extern u16 gSpecialVar_ContestRank; extern u16 gSpecialVar_ContestCategory; diff --git a/include/easy_chat.h b/include/easy_chat.h index 729bc0b62..468902e4c 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -18,7 +18,7 @@ struct Shared1000 u16 *unk4; u8 unk8; u8 unk9; - u8 unkA; // length of unkC array + u8 unkA; // length of contestant array u8 unkB; // reporter talked to (Gabby or Ty) u16 unkC[9]; void (*unk20)(void); diff --git a/include/text.h b/include/text.h index 920093a1d..1d79eeb46 100644 --- a/include/text.h +++ b/include/text.h @@ -75,7 +75,6 @@ #define CHAR_NEWLINE 0xFE #define EOS 0xFF // end of string -#define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 4 #define TEXT_COLOR_TRANSPARENT 0x00 #define TEXT_COLOR_DARK_GREY 0x01 #define TEXT_COLOR_RED 0x02 @@ -93,8 +92,28 @@ #define TEXT_COLOR_LIGHT_BLUE 0x0E #define TEXT_COLOR_WHITE2 0x0F -#define EXT_CTRL_CODE_CLEAR 17 - +#define EXT_CTRL_CODE_COLOR 0x01 +#define EXT_CTRL_CODE_HIGHLIGHT 0x02 +#define EXT_CTRL_CODE_SHADOW 0x03 +#define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 0x04 +#define EXT_CTRL_CODE_PALETTE 0x05 +#define EXT_CTRL_CODE_SIZE 0x06 +#define EXT_CTRL_CODE_RESET_SIZE 0x07 +#define EXT_CTRL_CODE_PAUSE 0x08 +#define EXT_CTRL_CODE_PAUSE_UNTIL_PRESS 0x09 +#define EXT_CTRL_CODE_WAIT_SE 0x0A +#define EXT_CTRL_CODE_PLAY_BGM 0x0B +#define EXT_CTRL_CODE_ESCAPE 0x0C +#define EXT_CTRL_CODE_SHIFT_TEXT 0x0D // nop +#define EXT_CTRL_CODE_SHIFT_DOWN 0x0E +#define EXT_CTRL_CODE_FILL_WINDOW 0x0F +#define EXT_CTRL_CODE_PLAY_SE 0x10 +#define EXT_CTRL_CODE_CLEAR 0x11 +#define EXT_CTRL_CODE_SKIP 0x12 +#define EXT_CTRL_CODE_CLEAR_TO 0x13 +#define EXT_CTRL_CODE_MIN_LETTER_SPACING 0x14 +#define EXT_CTRL_CODE_JPN 0x15 +#define EXT_CTRL_CODE_ENG 0x16 struct WindowTemplate { |