From 1e2601a0287fdacfb8f0d680fbe82a274414ea65 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:10:51 -0500 Subject: more script command renaming --- src/event_data.c | 4 +--- src/scrcmd.c | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/event_data.c b/src/event_data.c index ee475343f..43d49c417 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -114,10 +114,8 @@ u16 *GetVarPointer(u16 id) { if (id < 0x4000) return NULL; - - if ((s16)id >= 0) + if (id < 0x8000) return &gSaveBlock1.vars[id - 0x4000]; - return gSpecialVars[id - 0x8000]; } diff --git a/src/scrcmd.c b/src/scrcmd.c index f45e57e02..d44fa53e2 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -387,6 +387,7 @@ u8 compare_012(u16 a1, u16 a2) return 2; } +// comparelocaltolocal bool8 ScrCmd_comparebuffers(struct ScriptContext *ctx) { u8 value1 = ctx->data[ScriptReadByte(ctx)]; @@ -396,6 +397,7 @@ bool8 ScrCmd_comparebuffers(struct ScriptContext *ctx) return FALSE; } +// comparelocaltoimm bool8 ScrCmd_comparebuffertobyte(struct ScriptContext *ctx) { u8 value1 = ctx->data[ScriptReadByte(ctx)]; -- cgit v1.2.3