diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
| commit | d8948a5cda2e385c1d4b5c6190c4fe0fb53359fb (patch) | |
| tree | fa882b0733f88cc17dcbaef8c25c30c7198bdca1 /src/field_poison.c | |
| parent | dea41e1a7e6e73789431153d6c28dac3a3a73ac6 (diff) | |
| parent | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (diff) | |
Merge remote-tracking branch 'pret/master' into trade
Diffstat (limited to 'src/field_poison.c')
| -rw-r--r-- | src/field_poison.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_poison.c b/src/field_poison.c index 02f37f69f..fac17dea9 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -4,7 +4,7 @@ #include "event_data.h" #include "field_message_box.h" #include "field_poison.h" -#include "fldeff_80F9BCC.h" +#include "fldeff_misc.h" #include "frontier_util.h" #include "party_menu.h" #include "pokenav.h" @@ -122,7 +122,7 @@ s32 DoPoisonFieldEffect(void) u32 numFainted = 0; for (i = 0; i < PARTY_SIZE; i++) { - if (GetMonData(pokemon, MON_DATA_SANITY_BIT2) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN) + if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN) { hp = GetMonData(pokemon, MON_DATA_HP); if (hp == 0 || --hp == 0) @@ -136,7 +136,7 @@ s32 DoPoisonFieldEffect(void) } if (numFainted != 0 || numPoisoned != 0) { - FldeffPoison_Start(); + FldEffPoison_Start(); } if (numFainted != 0) { |