From 1416a4c4efe8b926c809664eb63dd2c3d0f86728 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 28 Jan 2018 23:10:53 -0600
Subject: clean up option_menu.c and field_poison.c a bit

---
 src/field/fldeff_poison.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/field/fldeff_poison.c')

diff --git a/src/field/fldeff_poison.c b/src/field/fldeff_poison.c
index b0052d59d..52afc2516 100644
--- a/src/field/fldeff_poison.c
+++ b/src/field/fldeff_poison.c
@@ -32,13 +32,13 @@ static void Task_FieldPoisonEffect(u8 taskId)
     REG_MOSAIC = (data[1] << 4) | data[1];
 }
 
-void DoFieldPoisonEffect(void)
+void FldeffPoison_Start(void)
 {
     PlaySE(SE_DOKU);
     CreateTask(Task_FieldPoisonEffect, 80);
 }
 
-bool32 FieldPoisonEffectIsRunning(void)
+bool32 FldeffPoison_IsActive(void)
 {
     return FuncIsActiveTask(Task_FieldPoisonEffect);
 }
-- 
cgit v1.2.3


From daa05c1b7c5e079ad8554e88a290e07b333bd2db Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 18 Feb 2018 19:59:51 -0600
Subject: remove subdirectories

---
 src/field/fldeff_poison.c | 44 --------------------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 src/field/fldeff_poison.c

(limited to 'src/field/fldeff_poison.c')

diff --git a/src/field/fldeff_poison.c b/src/field/fldeff_poison.c
deleted file mode 100644
index 52afc2516..000000000
--- a/src/field/fldeff_poison.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "global.h"
-#include "fldeff_poison.h"
-#include "task.h"
-#include "constants/songs.h"
-#include "sound.h"
-
-static void Task_FieldPoisonEffect(u8 taskId)
-{
-    s16 *data = gTasks[taskId].data;
-
-    switch (data[0])
-    {
-    case 0:
-        data[1] += 2;
-        if (data[1] > 8)
-        {
-            data[0]++;
-        }
-        break;
-    case 1:
-        data[1] -= 2;
-        if (data[1] == 0)
-        {
-            data[0]++;
-        }
-        break;
-    case 2:
-        DestroyTask(taskId);
-        return;
-    }
-
-    REG_MOSAIC = (data[1] << 4) | data[1];
-}
-
-void FldeffPoison_Start(void)
-{
-    PlaySE(SE_DOKU);
-    CreateTask(Task_FieldPoisonEffect, 80);
-}
-
-bool32 FldeffPoison_IsActive(void)
-{
-    return FuncIsActiveTask(Task_FieldPoisonEffect);
-}
-- 
cgit v1.2.3