diff options
| author | Deokishisu <6993375+Deokishisu@users.noreply.github.com> | 2021-02-15 14:54:35 -0500 |
|---|---|---|
| committer | Deokishisu <6993375+Deokishisu@users.noreply.github.com> | 2021-02-15 14:54:35 -0500 |
| commit | 7b2bf8c7e2249f66a04eabdbaeb2a8018855955f (patch) | |
| tree | fd9c56262c4ef44569f313e5e067523a6a3546bf /asm/macros | |
| parent | b89c3e901e1de2f3513d74fa548373d82d3f26d0 (diff) | |
Rename obedient/fatefulEncounter to eventLegal
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.
Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
Diffstat (limited to 'asm/macros')
| -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 434b76ec3..4625f8df6 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1486,15 +1486,15 @@ .4byte \value .endm - @ Sets the Pokemon in the specified slot of the player party's fateful encounter bit. - .macro setmonfatefulencounter 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 a fateful encounter. If the Pokemon isn't a fateful encounter, - @ VAR_RESULT is TRUE. If the Pokemon is a fateful encounter (or if the specified slot is empty or invalid), VAR_RESULT is FALSE. - .macro checkmonfatefulencounter 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 |