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 /include/constants | |
| 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 'include/constants')
| -rw-r--r-- | include/constants/pokemon.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 18791e926..e32ddf496 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -165,14 +165,14 @@ #define MON_DATA_ARTIST_RIBBON 70 #define MON_DATA_EFFORT_RIBBON 71 #define MON_DATA_MARINE_RIBBON 72 -#define MON_DATA_LAND_RIBBON 73 -#define MON_DATA_SKY_RIBBON 74 -#define MON_DATA_COUNTRY_RIBBON 75 -#define MON_DATA_NATIONAL_RIBBON 76 -#define MON_DATA_EARTH_RIBBON 77 -#define MON_DATA_WORLD_RIBBON 78 -#define MON_DATA_FILLER 79 -#define MON_DATA_FATEFUL_ENCOUNTER 80 +#define MON_DATA_LAND_RIBBON 73 +#define MON_DATA_SKY_RIBBON 74 +#define MON_DATA_COUNTRY_RIBBON 75 +#define MON_DATA_NATIONAL_RIBBON 76 +#define MON_DATA_EARTH_RIBBON 77 +#define MON_DATA_WORLD_RIBBON 78 +#define MON_DATA_FILLER 79 +#define MON_DATA_EVENT_LEGAL 80 #define MON_DATA_KNOWN_MOVES 81 #define MON_DATA_RIBBON_COUNT 82 #define MON_DATA_RIBBONS 83 |