diff options
author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-21 00:20:09 +0100 |
---|---|---|
committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-21 00:20:09 +0100 |
commit | 3d8874d9190f8904e5fc45439aa54fdf325fad48 (patch) | |
tree | caa1f1f0a2f86094cbaa36b77a69a1547bd4b105 /src/field_poison.c | |
parent | 7a072d4527387cf21a019142caf67ce516be861d (diff) | |
parent | 2a3ba78831f2dca1ff0d3fe3f03844a993597b28 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
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 a3b70323e..a5a76e00a 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -112,7 +112,7 @@ void ExecuteWhiteOut(void) ScriptContext1_Stop(); } -u32 DoPoisonFieldEffect(void) +s32 DoPoisonFieldEffect(void) { int i; u32 hp; |