diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:40:26 -0600 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:40:37 -0600 |
commit | 754e911b4e95205bafa5dc93242da9cee3f2c5c6 (patch) | |
tree | e544ba9723182224bf99c4fc144654517037296e /src/script_pokemon_util_80C4BF0.c | |
parent | a753c44277c050fb24aaf97a8947c7f54e0dacd7 (diff) |
Rename gScript* vars to gSpecialVar_*
Diffstat (limited to 'src/script_pokemon_util_80C4BF0.c')
-rw-r--r-- | src/script_pokemon_util_80C4BF0.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index 9d1aaa125..3ac2dc7a7 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -38,9 +38,9 @@ extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; extern u16 gSpecialVar_0x8006; -extern u16 gScriptContestCategory; -extern u16 gScriptContestRank; -extern u16 gScriptResult; +extern u16 gSpecialVar_ContestCategory; +extern u16 gSpecialVar_ContestRank; +extern u16 gSpecialVar_Result; extern u32 gUnknown_03005D28; @@ -91,7 +91,7 @@ void sub_80C4C78(void) u16 var; u16 returnVar; - switch(gScriptContestCategory) + switch(gSpecialVar_ContestCategory) { case 0: var = 8; @@ -127,7 +127,7 @@ void sub_80C4CEC(void) void sub_80C4CF8(void) { if(!gUnknown_02038690[gContestPlayerMonIndex] - && gScriptContestRank == 3 + && gSpecialVar_ContestRank == 3 && (s16)gUnknown_02038678[gContestPlayerMonIndex] >= 800) { gSpecialVar_0x8004 = 1; @@ -388,7 +388,7 @@ bool8 GiveMonArtistRibbon(void) if(ribbon == FALSE && gUnknown_02038690[gContestPlayerMonIndex] == 0 - && gScriptContestRank == 3 + && gSpecialVar_ContestRank == 3 && (s16)gUnknown_02038678[gContestPlayerMonIndex] >= 800) { ribbon = TRUE; @@ -488,9 +488,9 @@ void sub_80C5190(u8 taskId) void ScriptGetMultiplayerId(void) { if(gIsLinkContest & 1) - gScriptResult = GetMultiplayerId(); + gSpecialVar_Result = GetMultiplayerId(); else - gScriptResult = 4; + gSpecialVar_Result = 4; } void ScriptRandom(void) @@ -502,11 +502,11 @@ void ScriptRandom(void) { gUnknown_03005D28 = 1103515245 * gUnknown_03005D28 + 24691; random = gUnknown_03005D28 >> 16; - scriptPtr = &gScriptResult; + scriptPtr = &gSpecialVar_Result; } else { - scriptPtr = &gScriptResult; + scriptPtr = &gSpecialVar_Result; random = Random(); } *scriptPtr = random % *scriptPtr; @@ -587,13 +587,13 @@ void CheckForAlivePartyMons(void) switch(var) { case 1: - gScriptResult = var; + gSpecialVar_Result = var; break; case 0: - gScriptResult = var; + gSpecialVar_Result = var; break; case 2: - gScriptResult = var; + gSpecialVar_Result = var; break; } } @@ -657,10 +657,10 @@ void sub_80C5580(void) switch(var) { case 0: - gScriptResult = 0; + gSpecialVar_Result = 0; break; default: - gScriptResult = 1; + gSpecialVar_Result = 1; break; } @@ -681,11 +681,11 @@ void SetBattleTowerPlayerParty(void) { case 0: // player quit battle tower? LoadPlayerParty(); - gScriptResult = 0; + gSpecialVar_Result = 0; break; default: // load battle tower. ReducePlayerPartyToThree(); - gScriptResult = 1; + gSpecialVar_Result = 1; break; } |