diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-01-03 03:30:20 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-03 00:30:20 -0800 |
| commit | bdb3dea2b751e65a349ec2d637b461f39cc5ef74 (patch) | |
| tree | b9d31ad793e0f693b70b8b6749ae7d1ca2a64ff7 /src/scrcmd.c | |
| parent | 929148fb7de2eda9fee1f4611834d4dfb73c9f91 (diff) | |
more labels in battle_ai.c and intro.c and misc places (#151)
* make ROM match again
* clean up item_use.c labels and clarify functions.
* label and clarify some functions in decompress.c
* label and clarify berry.c
* rename 20239F8 to gBattleTypeFlags
* formatting
* label intro.c a bit
* label battle_ai.c and document some stuff
* formatting
* more labeling and clarification.
* more label stuff
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 125842db5..e11f73bfc 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -578,9 +578,9 @@ bool8 ScrCmd_fadescreen(struct ScriptContext *ctx) bool8 ScrCmd_fadescreendelay(struct ScriptContext *ctx) { - u8 val1 = ScriptReadByte(ctx); - u8 val2 = ScriptReadByte(ctx); - fade_screen(val1, val2); + u8 duration = ScriptReadByte(ctx); + u8 delay = ScriptReadByte(ctx); + fade_screen(duration, delay); SetupNativeScript(ctx, sub_8066248); return TRUE; } @@ -1855,8 +1855,8 @@ bool8 ScrCmd_checkcoins(struct ScriptContext *ctx) bool8 ScrCmd_givecoins(struct ScriptContext *ctx) { - u16 v2 = VarGet(ScriptReadHalfword(ctx)); - if (GiveCoins(v2) == TRUE) + u16 coins = VarGet(ScriptReadHalfword(ctx)); + if (GiveCoins(coins) == TRUE) gScriptResult = 0; else gScriptResult = 1; @@ -1866,8 +1866,8 @@ bool8 ScrCmd_givecoins(struct ScriptContext *ctx) bool8 ScrCmd_removecoins(struct ScriptContext *ctx) { - u16 v2 = VarGet(ScriptReadHalfword(ctx)); - if (TakeCoins(v2) == TRUE) + u16 coins = VarGet(ScriptReadHalfword(ctx)); + if (TakeCoins(coins) == TRUE) gScriptResult = 0; else gScriptResult = 1; |