diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-26 18:54:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 18:54:15 -0800 |
| commit | 914f7fc6645ee456994f7a34bc6dac2c165a6392 (patch) | |
| tree | 81b21c4a96ec454fac34d763e16dbee3575442b0 /src/script_pokemon_util_80C4BF0.c | |
| parent | 4e54b9f65e93e84887ef81b726a187bbf3197530 (diff) | |
| parent | 76c40aac928d139afa725182ab291436f809258d (diff) | |
Merge pull request #551 from PikalaxALT/contest_link_80C857C
Contest link 80 c857 c
Diffstat (limited to 'src/script_pokemon_util_80C4BF0.c')
| -rw-r--r-- | src/script_pokemon_util_80C4BF0.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index f991297ab..02e66d313 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -32,26 +32,13 @@ extern void sub_80C4698(u8 *, u8); extern struct SpriteTemplate gUnknown_02024E8C; -extern u8 gContestPlayerMonIndex; -extern u8 gIsLinkContest; -extern u8 gPlayerPartyCount; extern u8 gSelectedOrderFromParty[]; -extern u16 gSpecialVar_0x8004; -extern u16 gSpecialVar_0x8005; -extern u16 gSpecialVar_0x8006; - extern u16 gSpecialVar_ContestCategory; extern u16 gSpecialVar_ContestRank; -extern u16 gSpecialVar_Result; - -extern u32 gUnknown_03005D28; extern u8 gUnknown_02038694; extern u8 gUnknown_0203856C; -extern u8 gContestFinalStandings[]; -extern s16 gUnknown_02038670[]; -extern s16 gUnknown_02038678[]; void SetContestTrainerGfxIds(void) { @@ -373,8 +360,8 @@ void ScriptRandom(void) if(gIsLinkContest & 1) { - gUnknown_03005D28 = 1103515245 * gUnknown_03005D28 + 24691; - random = gUnknown_03005D28 >> 16; + gContestRngValue = 1103515245 * gContestRngValue + 24691; + random = gContestRngValue >> 16; scriptPtr = &gSpecialVar_Result; } else |