diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
| commit | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (patch) | |
| tree | cca355371fd2cdd9d9b6fd86c266a500837123a8 /include/field_poison.h | |
| parent | 734403fdfafd1dc4b738f98158dcec45bb01f58b (diff) | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
Fix conflicts
Diffstat (limited to 'include/field_poison.h')
| -rw-r--r-- | include/field_poison.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/field_poison.h b/include/field_poison.h index 6a1ba17f2..a23a93ca5 100644 --- a/include/field_poison.h +++ b/include/field_poison.h @@ -13,7 +13,7 @@ enum { FLDPSN_FNT }; -void sub_80F972C(void); -int DoPoisonFieldEffect(void); +void ExecuteWhiteOut(void); +s32 DoPoisonFieldEffect(void); #endif //GUARD_FIELD_POISON_H |