diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 05:11:37 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 05:11:37 -0500 |
commit | ce5bc554e5739044af0c10eb6cc9231308fb28ce (patch) | |
tree | 9bbd647b96b9a44eb897174804bf324861e78874 /src/scrcmd.c | |
parent | c63a889bf45d9cd6da0668703fad55941e531fa2 (diff) | |
parent | 39556605cd27a567a45bfc2c46af745ac031ab90 (diff) |
Merge branch 'doc-ttower' of https://github.com/GriffinRichards/pokefirered into doc-ttower
Diffstat (limited to 'src/scrcmd.c')
-rw-r--r-- | src/scrcmd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 51e7d2c35..c2c422a0a 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -630,7 +630,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; } @@ -640,7 +640,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; } @@ -1064,7 +1064,7 @@ bool8 ScrCmd_addobject(struct ScriptContext *ctx) { u16 objectId = VarGet(ScriptReadHalfword(ctx)); - show_sprite(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } @@ -1074,7 +1074,7 @@ bool8 ScrCmd_addobject_at(struct ScriptContext *ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - show_sprite(objectId, mapNum, mapGroup); + TrySpawnObjectEvent(objectId, mapNum, mapGroup); return FALSE; } |