diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-15 17:33:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 17:33:29 -0500 |
| commit | f8a70fdf24aa9e405af7abbbcf22ffa1c12c89a2 (patch) | |
| tree | e0b21e29ff6fd427d48ed1d55f57d119ab192836 /asm/macros/event.inc | |
| parent | 5f58ea02c66a7e1a7d0164ba497bfa2d7527328b (diff) | |
| parent | d418321627afa2e5796fe8287ba880b0c84c81fa (diff) | |
Merge pull request #1334 from Deokishisu/giftRibbons-doc
[LEAK-INFORMED] Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
Diffstat (limited to 'asm/macros/event.inc')
| -rw-r--r-- | asm/macros/event.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index e9d55c4bc..4625f8df6 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1486,15 +1486,15 @@ .4byte \value .endm - @ Makes the Pokemon in the specified slot of the player's party obedient. It will not randomly disobey orders in battle. - .macro setmonobedient slot:req + @ Sets the Pokemon in the specified slot of the player party's eventLegal bit. + .macro setmoneventlegal slot:req .byte 0xcd .2byte \slot .endm - @ Checks if the Pokemon in the specified slot of the player's party is obedient. If the Pokemon is disobedient, - @ VAR_RESULT is TRUE. If the Pokemon is obedient (or if the specified slot is empty or invalid), VAR_RESULT is FALSE. - .macro checkmonobedience slot:req + @ Checks if the Pokemon in the specified slot of the player's party has its eventLegal bit set. If it isn't set, + @ VAR_RESULT is TRUE. If the bit is set (or if the specified slot is empty or invalid), VAR_RESULT is FALSE. + .macro checkmoneventlegal slot:req .byte 0xce .2byte \slot .endm |