diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-05 08:41:31 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-05 08:41:31 -0400 |
| commit | a58d9a16dd7e4f263ebccda50e70103e7490886b (patch) | |
| tree | ddde359501adee874131731c700862c615c46e77 /src/scrcmd.c | |
| parent | a677d1f4cb6f2925e9694b8d2b408273dcd13d9b (diff) | |
| parent | 9e74409bb2032e25d431dda116462759e5b51fe0 (diff) | |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 314504600..125a57c01 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -281,7 +281,7 @@ bool8 ScrCmd_callstd_if(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_gotoram(struct ScriptContext *ctx) +bool8 ScrCmd_returnram(struct ScriptContext *ctx) { ScriptJump(ctx, gUnknown_020375C0); return FALSE; @@ -2215,9 +2215,9 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_cmdCF(struct ScriptContext *ctx) +bool8 ScrCmd_gotoram(struct ScriptContext *ctx) { - const u8* v1 = sub_8099244(); + const u8* v1 = GetSavedRamScriptIfValid(); if (v1) { |