summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-10-01 13:02:25 -0500
committercamthesaxman <cameronghall@cox.net>2017-10-01 13:02:25 -0500
commitdc802ea2bee0c4a8d8c99abc6918dae2679a4227 (patch)
tree19d7ef89191cbaea178e5cae6bfe11f33e5f6330
parent3505da56b15432062be0b49fc9d212b12f0bea15 (diff)
setmestatus -> setmysteryeventstatus
-rw-r--r--asm/macros/event.inc2
-rw-r--r--data/script_cmd_table.inc2
-rw-r--r--src/field/scrcmd.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index f306c6e23..04ab2f001 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -81,7 +81,7 @@
.endm
@ Sets mystery event status
- .macro setmestatus value
+ .macro setmysteryeventstatus value
.byte 0x0e
.byte \value
.endm
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index dd002fb1a..3f89949a1 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -14,7 +14,7 @@ gScriptCmdTable:: @ 814AE30
.4byte ScrCmd_callstd_if @ 0x0B
.4byte ScrCmd_gotoram @ 0x0C
.4byte ScrCmd_killscript @ 0x0D
- .4byte ScrCmd_setmestatus @ 0x0E
+ .4byte ScrCmd_setmysteryeventstatus @ 0x0E
.4byte ScrCmd_loadword @ 0x0F
.4byte ScrCmd_loadbyte @ 0x10
.4byte ScrCmd_writebytetoaddr @ 0x11
diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c
index b64b17951..68511ecb7 100644
--- a/src/field/scrcmd.c
+++ b/src/field/scrcmd.c
@@ -293,7 +293,7 @@ bool8 ScrCmd_killscript(struct ScriptContext *ctx)
return TRUE;
}
-bool8 ScrCmd_setmestatus(struct ScriptContext *ctx)
+bool8 ScrCmd_setmysteryeventstatus(struct ScriptContext *ctx)
{
u8 value = ScriptReadByte(ctx);