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 /src/tv.c | |
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 'src/tv.c')
-rw-r--r-- | src/tv.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -2421,12 +2421,12 @@ u8 TV_MonDataIdxToRibbon(u8 monDataIdx) if (monDataIdx == MON_DATA_ARTIST_RIBBON) return 23; if (monDataIdx == MON_DATA_EFFORT_RIBBON) return 24; if (monDataIdx == MON_DATA_MARINE_RIBBON) return 25; - if (monDataIdx == MON_DATA_LAND_RIBBON) return 26; - if (monDataIdx == MON_DATA_SKY_RIBBON) return 27; - if (monDataIdx == MON_DATA_COUNTRY_RIBBON) return 28; - if (monDataIdx == MON_DATA_NATIONAL_RIBBON) return 29; - if (monDataIdx == MON_DATA_EARTH_RIBBON) return 30; - if (monDataIdx == MON_DATA_WORLD_RIBBON) return 31; + if (monDataIdx == MON_DATA_LAND_RIBBON) return 26; + if (monDataIdx == MON_DATA_SKY_RIBBON) return 27; + if (monDataIdx == MON_DATA_COUNTRY_RIBBON) return 28; + if (monDataIdx == MON_DATA_NATIONAL_RIBBON) return 29; + if (monDataIdx == MON_DATA_EARTH_RIBBON) return 30; + if (monDataIdx == MON_DATA_WORLD_RIBBON) return 31; return 0; } |