From c3534e7b0e2df48fe989deb74c26f98e1fe759b8 Mon Sep 17 00:00:00 2001
From: Cameron Hall <cameronghall@cox.net>
Date: Wed, 17 Jan 2018 16:46:54 -0600
Subject: add more debug code

---
 src/field/fldeff_strength.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

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

diff --git a/src/field/fldeff_strength.c b/src/field/fldeff_strength.c
index 565ac1651..9f9cd4013 100644
--- a/src/field/fldeff_strength.c
+++ b/src/field/fldeff_strength.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "constants/map_objects.h"
 #include "braille_puzzles.h"
 #include "field_effect.h"
 #include "party_menu.h"
@@ -20,6 +21,28 @@ extern void (*gUnknown_03005CE4)(void);
 
 extern u8 S_UseStrength[];
 
+#if DEBUG
+void debug_sub_8130318(void)
+{
+    if (ShouldDoBrailleStrengthEffect())
+    {
+        gLastFieldPokeMenuOpened = 0;
+        gSpecialVar_Result = 0;
+        sub_811AA38();
+    }
+    else if (npc_before_player_of_type(MAP_OBJ_GFX_PUSHABLE_BOULDER) == TRUE)
+    {
+        gLastFieldPokeMenuOpened = 0;
+        gSpecialVar_Result = 0;
+        sub_811AA18();
+    }
+    else
+    {
+        ScriptContext2_Disable();
+    }
+}
+#endif
+
 bool8 SetUpFieldMove_Strength(void)
 {
     if (ShouldDoBrailleStrengthEffect())
-- 
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_strength.c | 99 ---------------------------------------------
 1 file changed, 99 deletions(-)
 delete mode 100644 src/field/fldeff_strength.c

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

diff --git a/src/field/fldeff_strength.c b/src/field/fldeff_strength.c
deleted file mode 100644
index 9f9cd4013..000000000
--- a/src/field/fldeff_strength.c
+++ /dev/null
@@ -1,99 +0,0 @@
-#include "global.h"
-#include "constants/map_objects.h"
-#include "braille_puzzles.h"
-#include "field_effect.h"
-#include "party_menu.h"
-#include "pokemon.h"
-#include "pokemon_menu.h"
-#include "rom6.h"
-#include "script.h"
-#include "task.h"
-#include "text.h"
-
-static void sub_811AA18(void);
-static void sub_811AA38(void);
-static void sub_811AA9C(void);
-
-extern u8 gLastFieldPokeMenuOpened;
-extern u16 gSpecialVar_Result;
-extern void (*gFieldCallback)(void);
-extern void (*gUnknown_03005CE4)(void);
-
-extern u8 S_UseStrength[];
-
-#if DEBUG
-void debug_sub_8130318(void)
-{
-    if (ShouldDoBrailleStrengthEffect())
-    {
-        gLastFieldPokeMenuOpened = 0;
-        gSpecialVar_Result = 0;
-        sub_811AA38();
-    }
-    else if (npc_before_player_of_type(MAP_OBJ_GFX_PUSHABLE_BOULDER) == TRUE)
-    {
-        gLastFieldPokeMenuOpened = 0;
-        gSpecialVar_Result = 0;
-        sub_811AA18();
-    }
-    else
-    {
-        ScriptContext2_Disable();
-    }
-}
-#endif
-
-bool8 SetUpFieldMove_Strength(void)
-{
-    if (ShouldDoBrailleStrengthEffect())
-    {
-        gSpecialVar_Result = gLastFieldPokeMenuOpened;
-        gFieldCallback = FieldCallback_Teleport;
-        gUnknown_03005CE4 = sub_811AA38;
-    }
-    else
-    {
-        if (npc_before_player_of_type(87) != TRUE)
-            return 0;
-        gSpecialVar_Result = gLastFieldPokeMenuOpened;
-        gFieldCallback = FieldCallback_Teleport;
-        gUnknown_03005CE4 = sub_811AA18;
-    }
-
-    return TRUE;
-}
-
-static void sub_811AA18(void)
-{
-    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
-    ScriptContext1_SetupScript(S_UseStrength);
-}
-
-static void sub_811AA38(void)
-{
-    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
-    FieldEffectStart(FLDEFF_USE_STRENGTH);
-}
-
-bool8 FldEff_UseStrength(void)
-{
-    u8 taskId = oei_task_add();
-
-    gTasks[taskId].data[8] = (u32)sub_811AA9C >> 16;
-    gTasks[taskId].data[9] = (u32)sub_811AA9C;
-    GetMonNickname(&gPlayerParty[gFieldEffectArguments[0]], gStringVar1);
-    return FALSE;
-}
-
-static void sub_811AA9C(void)
-{
-    if (ShouldDoBrailleStrengthEffect())
-    {
-        DoBrailleStrengthEffect();
-    }
-    else
-    {
-        FieldEffectActiveListRemove(40);
-        EnableBothScriptContexts();
-    }
-}
-- 
cgit v1.2.3