diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-07 14:14:08 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-07 14:14:08 -0500 |
| commit | b67afb9490ce7fce8c7d478e9b436c5b849fb4ad (patch) | |
| tree | b07bb0bb43aeba2c7cfef97213578fb815ccb266 /src/field_poison.c | |
| parent | 5f7709dc8bf1bf4eb75d9481e285980f347d5dd7 (diff) | |
| parent | 802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff) | |
I hope this fixes the conflicts
Diffstat (limited to 'src/field_poison.c')
| -rw-r--r-- | src/field_poison.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_poison.c b/src/field_poison.c index b83788210..98819c450 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -42,7 +42,7 @@ static bool32 sub_80F958C(void) static void sub_80F95C0(u8 partyIdx) { struct Pokemon *pokemon = gPlayerParty + partyIdx; - unsigned int status = STATUS_NONE; + unsigned int status = STATUS1_NONE; AdjustFriendship(pokemon, 0x07); SetMonData(pokemon, MON_DATA_STATUS, &status); GetMonData(pokemon, MON_DATA_NICKNAME, gStringVar1); |