diff options
| author | garak <garakmon@gmail.com> | 2018-10-17 12:30:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 12:30:45 -0400 |
| commit | 7d88b9647f92d099177fc734f32e94fc472f2cbf (patch) | |
| tree | 3b3d6ea2a092b2fd482d03145094689a05ec1b92 /src/scrcmd.c | |
| parent | ff97873c309e28beec91efe11393c093a08b19d3 (diff) | |
| parent | f67bbbdaaa905833f1c2a315624128aafef9a4cb (diff) | |
Merge branch 'master' into event-flags
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 acaf78576..fa3e21996 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -52,7 +52,7 @@ typedef u16 (*SpecialFunc)(void); typedef void (*NativeFunc)(void); -extern u32 gUnknown_020375C0; +extern const u8 *gUnknown_020375C0; static EWRAM_DATA u32 gUnknown_020375C4 = 0; static EWRAM_DATA u16 sPauseCounter = 0; @@ -284,7 +284,7 @@ bool8 ScrCmd_callstd_if(struct ScriptContext *ctx) bool8 ScrCmd_gotoram(struct ScriptContext *ctx) { - ScriptJump(ctx, (const u8 *)gUnknown_020375C0); + ScriptJump(ctx, gUnknown_020375C0); return FALSE; } @@ -2223,7 +2223,7 @@ bool8 ScrCmd_cmdCF(struct ScriptContext *ctx) if (v1) { - ((u8*)gUnknown_020375C0) = ctx->scriptPtr; + gUnknown_020375C0 = ctx->scriptPtr; ScriptJump(ctx, v1); } return FALSE; |