diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-16 17:55:56 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-16 17:55:56 -0500 |
commit | 33126a06331f8afce668a1152a26e9ed6f5d9a16 (patch) | |
tree | 0d603397418119f4f055b29a339e094fba1a4141 /src/scrcmd.c | |
parent | bc4f88d72c5efd05f6dd5ee76966a1fc7c69bc3a (diff) | |
parent | 57e3f5e0f8743191420de5d5569680ade54c4619 (diff) |
Merge pull request #392 from Deokishisu/ExternalEvents-doc
Mirror pokeemerald PR#1329 & PR#1335 to pokefirered
Diffstat (limited to 'src/scrcmd.c')
-rw-r--r-- | src/scrcmd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 3b6c73b68..69acf7b7b 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -2230,21 +2230,21 @@ bool8 ScrCmd_normalmsg(struct ScriptContext * ctx) return FALSE; } -// This command will force the Pokémon to be obedient, you don't get to make it disobedient. -bool8 ScrCmd_setmonobedient(struct ScriptContext * ctx) +// This command will set a Pokémon's eventLegal bit; there is no similar command to clear it. +bool8 ScrCmd_setmoneventlegal(struct ScriptContext * ctx) { - bool8 obedient = TRUE; + bool8 isEventLegal = TRUE; u16 partyIndex = VarGet(ScriptReadHalfword(ctx)); - SetMonData(&gPlayerParty[partyIndex], MON_DATA_OBEDIENCE, &obedient); + SetMonData(&gPlayerParty[partyIndex], MON_DATA_EVENT_LEGAL, &isEventLegal); return FALSE; } -bool8 ScrCmd_checkmonobedience(struct ScriptContext * ctx) +bool8 ScrCmd_checkmoneventlegal(struct ScriptContext * ctx) { u16 partyIndex = VarGet(ScriptReadHalfword(ctx)); - gSpecialVar_Result = GetMonData(&gPlayerParty[partyIndex], MON_DATA_OBEDIENCE, NULL); + gSpecialVar_Result = GetMonData(&gPlayerParty[partyIndex], MON_DATA_EVENT_LEGAL, NULL); return FALSE; } |