diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
| commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
| tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /include/contest.h | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'include/contest.h')
| -rw-r--r-- | include/contest.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/contest.h b/include/contest.h index 76fbaad3e..d920117f3 100644 --- a/include/contest.h +++ b/include/contest.h @@ -12,8 +12,8 @@ struct ContestStruct_02039E00 extern struct ContestStruct_02039E00 gUnknown_02039E00[4]; extern u8 gUnknown_02039F24; -extern u16 gScriptContestCategory; -extern u8 gUnknown_02039F2E; +extern u16 gSpecialVar_ContestCategory; +extern u8 gSpecialVar_ContestRank; extern u8 gUnknown_02039F30; struct ContestStruct_field_18 |