diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-01-30 15:20:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-30 15:20:24 -0600 |
| commit | 6873f47821379b45f00a78a7d90000c6ab5f834e (patch) | |
| tree | 32b49176ddbdbeff1aac1bf78d020fa25738eeaf /src/scrcmd.c | |
| parent | a75c476d57a8ffad9bebc7524c698cc2d5738d2a (diff) | |
| parent | 76fc1d1c129fa1aa01bd51d44ba1aa780f69f9cf (diff) | |
Merge pull request #190 from DizzyEggg/decompile_time_events
decompile time events
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 0557cd95e..1768f0d4c 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -638,7 +638,7 @@ static bool8 IsPaletteNotActive(void) bool8 ScrCmd_fadescreen(struct ScriptContext *ctx) { - fade_screen(ScriptReadByte(ctx), 0); + FadeScreen(ScriptReadByte(ctx), 0); SetupNativeScript(ctx, IsPaletteNotActive); return TRUE; } @@ -648,7 +648,7 @@ bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx) u8 mode = ScriptReadByte(ctx); u8 speed = ScriptReadByte(ctx); - fade_screen(mode, speed); + FadeScreen(mode, speed); SetupNativeScript(ctx, IsPaletteNotActive); return TRUE; } @@ -662,12 +662,12 @@ bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx) case 1: default: CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_DECOMP_BUFFER_SIZE); - fade_screen(mode, 0); + FadeScreen(mode, 0); break; case 0: case 2: CpuCopy32(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_DECOMP_BUFFER_SIZE); - fade_screen(mode, 0); + FadeScreen(mode, 0); break; } @@ -726,7 +726,7 @@ bool8 ScrCmd_setweather(struct ScriptContext *ctx) bool8 ScrCmd_resetweather(struct ScriptContext *ctx) { - sub_80AEDBC(); + SetSav1WeatherFromCurrMapHeader(); return FALSE; } |