diff options
| author | huderlem <huderlem@gmail.com> | 2020-01-12 20:10:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 20:10:03 -0600 |
| commit | fa5816915d2a089549bfae3851c36336eae35d43 (patch) | |
| tree | 96f44cc9d9e1b02d87f1c7bbfc15a99999782b27 /src/field_specials.c | |
| parent | 43962fe141d8ca5e4c53530992de4378c541a6f1 (diff) | |
| parent | e5df61e362beaaab9ae4344f4f160397df9c54cc (diff) | |
Merge pull request #949 from GriffinRichards/doc-dome
Document Battle Dome and add facility party constants
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index 54d435b2c..ce3ccce95 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -995,7 +995,7 @@ u16 GetWeekCount(void) u8 GetLeadMonFriendshipScore(void) { struct Pokemon *pokemon = &gPlayerParty[GetLeadMonIndex()]; - if (GetMonData(pokemon, MON_DATA_FRIENDSHIP) == 255) + if (GetMonData(pokemon, MON_DATA_FRIENDSHIP) == MAX_FRIENDSHIP) { return 6; } @@ -1221,18 +1221,18 @@ void EndLotteryCornerComputerEffect(void) DrawWholeMapView(); } -void SetTrickHouseEndRoomFlag(void) +void SetTrickHouseNuggetFlag(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = FLAG_TRICK_HOUSE_END_ROOM; + u16 flag = FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET; *specVar = flag; FlagSet(flag); } -void ResetTrickHouseEndRoomFlag(void) +void ResetTrickHouseNuggetFlag(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = FLAG_TRICK_HOUSE_END_ROOM; + u16 flag = FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET; *specVar = flag; FlagClear(flag); } |