diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-03 01:34:39 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-07 01:46:05 +0800 |
| commit | d97925df0edcac9212ba827b31ff75c7968703f3 (patch) | |
| tree | bcea1cbd328ae08e736a94a640dce6f90104633a /include | |
| parent | 40a808351a5b76b0a536c5fac6c9479284468af8 (diff) | |
finished field_poison
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_poison.h | 10 | ||||
| -rw-r--r-- | include/overworld.h | 1 | ||||
| -rw-r--r-- | include/safari_zone.h | 1 | ||||
| -rw-r--r-- | include/strings.h | 1 |
4 files changed, 4 insertions, 9 deletions
diff --git a/include/field_poison.h b/include/field_poison.h index fcfb71cf5..4887fa27a 100644 --- a/include/field_poison.h +++ b/include/field_poison.h @@ -3,19 +3,13 @@ #include "global.h" -// Exported type declarations - -// Exported RAM declarations - -// Exported ROM declarations - enum { FLDPSN_NONE, FLDPSN_PSN, FLDPSN_FNT }; -void sub_80F972C(void); -unsigned int overworld_poison(void); +void ExecuteWhiteOut(void); +s32 DoPoisonFieldEffect(void); #endif //GUARD_FIELD_POISON_H diff --git a/include/overworld.h b/include/overworld.h index 71625415a..60fa566f7 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -2,7 +2,6 @@ #define GUARD_ROM4_H #include "global.h" - #include "main.h" struct UnkPlayerStruct diff --git a/include/safari_zone.h b/include/safari_zone.h index c65ab7b7b..feaa93ed0 100644 --- a/include/safari_zone.h +++ b/include/safari_zone.h @@ -4,6 +4,7 @@ #include "global.h" extern u8 gNumSafariBalls; +extern u16 gSafariZoneStepCounter; bool32 GetSafariZoneFlag(void); void SetSafariZoneFlag(void); diff --git a/include/strings.h b/include/strings.h index 1aa858e82..55c178b0d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -91,6 +91,7 @@ extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; extern const u8 gText_EggNickname[]; extern const u8 gText_Pokemon[]; +extern const u8 gText_PkmnFainted3[]; extern const u8 gOtherText_Use[]; extern const u8 gOtherText_Give[]; |