diff options
| -rw-r--r-- | data/script_cmd_table.inc | 20 | ||||
| -rw-r--r-- | src/scrcmd.c | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 1ee61e2e7..a3d96c0a1 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -10,17 +10,17 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_call_if @ 0x07 .4byte ScrCmd_gotostd @ 0x08 .4byte ScrCmd_callstd @ 0x09 - .4byte ScrCmd_jumpstdif @ 0x0A - .4byte ScrCmd_callstdif @ 0x0B - .4byte ScrCmd_jumpram @ 0x0C - .4byte ScrCmd_die @ 0x0D - .4byte ScrCmd_setbyte @ 0x0E - .4byte ScrCmd_loadptr @ 0x0F - .4byte ScrCmd_setbufferbyte @ 0x10 - .4byte ScrCmd_writebytetooffset @ 0x11 - .4byte ScrCmd_loadbytefrompointer @ 0x12 + .4byte ScrCmd_gotostd_if @ 0x0A + .4byte ScrCmd_callstd_if @ 0x0B + .4byte ScrCmd_gotoram @ 0x0C + .4byte ScrCmd_killscript @ 0x0D + .4byte ScrCmd_setmestatus @ 0x0E + .4byte ScrCmd_loadword @ 0x0F + .4byte ScrCmd_loadbyte @ 0x10 + .4byte ScrCmd_writebytetoaddr @ 0x11 + .4byte ScrCmd_loadbytefromaddr @ 0x12 .4byte ScrCmd_setptrbyte @ 0x13 - .4byte ScrCmd_copybuffers @ 0x14 + .4byte ScrCmd_copylocal @ 0x14 .4byte ScrCmd_copybyte @ 0x15 .4byte ScrCmd_setvar @ 0x16 .4byte ScrCmd_addvar @ 0x17 diff --git a/src/scrcmd.c b/src/scrcmd.c index e4b0f73af..df85bdc1c 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -252,7 +252,7 @@ bool8 ScrCmd_callstd(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_jumpstdif(struct ScriptContext *ctx) +bool8 ScrCmd_gotostd_if(struct ScriptContext *ctx) { u8 condition = ScriptReadByte(ctx); u8 index = ScriptReadByte(ctx); @@ -266,7 +266,7 @@ bool8 ScrCmd_jumpstdif(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_callstdif(struct ScriptContext *ctx) +bool8 ScrCmd_callstd_if(struct ScriptContext *ctx) { u8 condition = ScriptReadByte(ctx); u8 index = ScriptReadByte(ctx); @@ -280,20 +280,20 @@ bool8 ScrCmd_callstdif(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_jumpram(struct ScriptContext *ctx) +bool8 ScrCmd_gotoram(struct ScriptContext *ctx) { ScriptJump(ctx, (u8 *)gUnknown_0202E8AC); return FALSE; } -bool8 ScrCmd_die(struct ScriptContext *ctx) +bool8 ScrCmd_killscript(struct ScriptContext *ctx) { ClearRamScript(); StopScript(ctx); return TRUE; } -bool8 ScrCmd_setbyte(struct ScriptContext *ctx) +bool8 ScrCmd_setmestatus(struct ScriptContext *ctx) { u8 value = ScriptReadByte(ctx); @@ -301,7 +301,7 @@ bool8 ScrCmd_setbyte(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_loadptr(struct ScriptContext *ctx) +bool8 ScrCmd_loadword(struct ScriptContext *ctx) { u8 index = ScriptReadByte(ctx); @@ -309,7 +309,7 @@ bool8 ScrCmd_loadptr(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_loadbytefrompointer(struct ScriptContext *ctx) +bool8 ScrCmd_loadbytefromaddr(struct ScriptContext *ctx) { u8 index = ScriptReadByte(ctx); @@ -317,7 +317,7 @@ bool8 ScrCmd_loadbytefrompointer(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_writebytetooffset(struct ScriptContext *ctx) +bool8 ScrCmd_writebytetoaddr(struct ScriptContext *ctx) { u8 value = ScriptReadByte(ctx); @@ -325,7 +325,7 @@ bool8 ScrCmd_writebytetooffset(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_setbufferbyte(struct ScriptContext *ctx) +bool8 ScrCmd_loadbyte(struct ScriptContext *ctx) { u8 index = ScriptReadByte(ctx); @@ -341,7 +341,7 @@ bool8 ScrCmd_setptrbyte(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_copybuffers(struct ScriptContext *ctx) +bool8 ScrCmd_copylocal(struct ScriptContext *ctx) { u8 destIndex = ScriptReadByte(ctx); u8 srcIndex = ScriptReadByte(ctx); |