diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-15 00:40:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 00:40:47 -0400 |
| commit | e129d04b931a4fc0e6584b4340dc57b9162264d5 (patch) | |
| tree | a6ae1eb111f652b1cfffdd9a4bccba4a65a0de35 /include/contest.h | |
| parent | ebb6c4ee661758874972956a94eb06d38eaa18a8 (diff) | |
| parent | 3c356a1d7af543d84c06f28f670b6ddc4b27fdd6 (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'include/contest.h')
| -rw-r--r-- | include/contest.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/contest.h b/include/contest.h index 00c3191eb..a9b1db9ee 100644 --- a/include/contest.h +++ b/include/contest.h @@ -430,9 +430,9 @@ struct ContestResources extern struct ContestPokemon gContestMons[CONTESTANT_COUNT]; extern s16 gContestMonConditions[CONTESTANT_COUNT]; -extern s16 gUnknown_02039F08[CONTESTANT_COUNT]; +extern s16 gContestMonTotalPoints[CONTESTANT_COUNT]; extern s16 gUnknown_02039F10[CONTESTANT_COUNT]; -extern s16 gUnknown_02039F18[CONTESTANT_COUNT]; +extern s16 gContestMonRound2Points[CONTESTANT_COUNT]; extern u8 gContestFinalStandings[CONTESTANT_COUNT]; extern u8 gContestMonPartyIndex; extern u8 gContestPlayerMonIndex; @@ -448,7 +448,6 @@ extern u8 sContestBgCopyFlags; extern struct ContestWinner gCurContestWinner; extern u8 gUnknown_02039F5C; extern u8 gUnknown_02039F5D; - extern u32 gContestRngValue; // contest.c |