diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-23 10:20:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 10:20:32 -0500 |
commit | 91099dbd0c451188742bf045a26a036e0e8d9f89 (patch) | |
tree | 01c4c152ba0b751f66d790e395f72fd803e938e5 /src/scrcmd.c | |
parent | e97d3532d4d72a1fe9aec755cd2a3c6527484e27 (diff) | |
parent | 7824a413dea43f2c0c99c2b86af17c33378139fa (diff) |
Merge pull request #236 from PikalaxALT/union_room
Union room
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; } |