summaryrefslogtreecommitdiff
path: root/src/field_poison.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-09-30 16:41:16 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-09-30 16:41:16 -0700
commit4c5bfdc153a8484c00aae30ed22badf006d7f8d9 (patch)
tree47bfb4286c03f021d48ffadde5da675a9f903f61 /src/field_poison.c
parentaaa09d735451cced915bc6bacfce45ced8e33fa1 (diff)
parentf74d4742f597a423b7a8685d72c06597c8c78db7 (diff)
Merge remote-tracking branch 'upstream/master' into name_labels
Diffstat (limited to 'src/field_poison.c')
-rw-r--r--src/field_poison.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_poison.c b/src/field_poison.c
index 8c9e029e1..1244b9c62 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -108,7 +108,7 @@ void ExecuteWhiteOut(void)
ScriptContext1_Stop();
}
-s32 overworld_poison(void)
+s32 DoPoisonFieldEffect(void)
{
struct Pokemon *pkmn = &gPlayerParty[0];
u32 numPoisoned = 0;