diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-10-01 14:39:25 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-10-01 14:39:25 -0500 |
| commit | ab3c40fbf6dd7e32d63ef8146edea900d10681d6 (patch) | |
| tree | be25184d91d099fe769ba5eda55f4898f128ce9c | |
| parent | 7e3c396c43542fa442a8caad34434f9db25b06e8 (diff) | |
vloadptr -> vloadword
| -rw-r--r-- | asm/macros/event.inc | 2 | ||||
| -rw-r--r-- | data/script_cmd_table.inc | 2 | ||||
| -rw-r--r-- | src/field/scrcmd.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index afcd2a6f8..960b300b7 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1264,7 +1264,7 @@ .4byte \pointer .endm - .macro vloadptr pointer + .macro vloadword pointer .byte 0xbe .4byte \pointer .endm diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 17b872d7c..b6b7401f3 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -190,7 +190,7 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_vgoto_if @ 0xBB .4byte ScrCmd_vcall_if @ 0xBC .4byte ScrCmd_vmessage @ 0xBD - .4byte ScrCmd_vloadptr @ 0xBE + .4byte ScrCmd_vloadword @ 0xBE .4byte ScrCmd_vgetstring @ 0xBF .4byte ScrCmd_showcoinsbox @ 0xC0 .4byte ScrCmd_hidecoinsbox @ 0xC1 diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c index ec8e17d34..28584d4d0 100644 --- a/src/field/scrcmd.c +++ b/src/field/scrcmd.c @@ -1526,7 +1526,7 @@ bool8 ScrCmd_getstring(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_vloadptr(struct ScriptContext *ctx) +bool8 ScrCmd_vloadword(struct ScriptContext *ctx) { u8 *ptr = (u8 *)(ScriptReadWord(ctx) - gUnknown_0202E8B0); |