diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-28 20:18:00 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-28 20:18:00 -0500 |
| commit | 6bef5a2622b432049df9c8b581e21ae09965b02c (patch) | |
| tree | d764c1d61d17018c41ef9eab403137d5aeef17d0 /src/script_pokemon_util_80C4BF0.c | |
| parent | 4327bee485510b424cbf28e450d90ff50e6fe78b (diff) | |
| parent | e92ead0e159ccaa8301b189b9ef2bb1a33b2ea62 (diff) | |
merge
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 |