diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-24 10:07:59 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-24 10:07:59 -0500 |
commit | 06ae5a37e2671455bfb59935cf93d8f23923ce8a (patch) | |
tree | e3c2150b616992a2f94a865c6e3d825078a338cd /src/pokemon.c | |
parent | fc3d6eb178be7efcf0f09644c9567f3b4fd83efd (diff) | |
parent | da67b6ebd9bba43c047f6b237d11bdce28de441e (diff) |
Merge pull request #1336 from GriffinRichards/giftribbons
Document some ribbon usage
Diffstat (limited to 'src/pokemon.c')
-rw-r--r-- | src/pokemon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 29ac4547f..f0d50ba0e 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3928,8 +3928,8 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data) case MON_DATA_WORLD_RIBBON: retVal = substruct3->worldRibbon; break; - case MON_DATA_FILLER: - retVal = substruct3->filler; + case MON_DATA_UNUSED_RIBBONS: + retVal = substruct3->unusedRibbons; break; case MON_DATA_EVENT_LEGAL: retVal = substruct3->eventLegal; @@ -4307,8 +4307,8 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg) case MON_DATA_WORLD_RIBBON: SET8(substruct3->worldRibbon); break; - case MON_DATA_FILLER: - SET8(substruct3->filler); + case MON_DATA_UNUSED_RIBBONS: + SET8(substruct3->unusedRibbons); break; case MON_DATA_EVENT_LEGAL: SET8(substruct3->eventLegal); |