Finish fldeff_strength.s

2 files changed, 15 insertions, 83 deletions

diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 77fa0db35..9f649f56c 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -1,16 +1,14 @@
 #include "global.h"
+#include "event_data.h"
+#include "event_scripts.h"
 #include "field_effect.h"
-#include "rom6.h"
 #include "party_menu.h"
-
+#include "rom6.h"
 #include "script.h"
+#include "task.h"
 
-extern u16 gSpecialVar_Result;
-extern void (*gUnknown_0203CEEC)(void);
-extern bool8 (*gUnknown_03005DB0)(void);
-static void sub_8145E0C(void);
-
-extern u8 FieryPath_EventScript_2908FD[];
+void sub_8145E0C(void);
+void sub_8145E74(void);
 
 bool8 hm_prepare_rocksmash(void)
 {
@@ -24,86 +22,23 @@ bool8 hm_prepare_rocksmash(void)
     return FALSE;
 }
 
-static void sub_8145E0C(void)
+void sub_8145E0C(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
     ScriptContext1_SetupScript(FieryPath_EventScript_2908FD);
 }
 
-/*
-#include "braille_puzzles.h"
-#include "field_effect.h"
-#include "party_menu.h"
-#include "pokemon.h"
-#include "pokemon_menu.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[];
-
-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)
+bool8 sub_8145E2C(void)
 {
     u8 taskId = oei_task_add();
-
-    gTasks[taskId].data[8] = (u32)sub_811AA9C >> 16;
-    gTasks[taskId].data[9] = (u32)sub_811AA9C;
+    gTasks[taskId].data[8] = (u32)sub_8145E74 >> 16;
+    gTasks[taskId].data[9] = (u32)sub_8145E74;
     GetMonNickname(&gPlayerParty[gFieldEffectArguments[0]], gStringVar1);
     return FALSE;
 }
 
-static void sub_811AA9C(void)
+void sub_8145E74(void)
 {
-    if (ShouldDoBrailleStrengthEffect())
-    {
-        DoBrailleStrengthEffect();
-    }
-    else
-    {
-        FieldEffectActiveListRemove(40);
-        EnableBothScriptContexts();
-    }
+    FieldEffectActiveListRemove(40);
+    EnableBothScriptContexts();
 }
-*/
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index 5b3492db0..e675ef0a5 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -7,17 +7,14 @@
 #include "rom6.h"
 #include "task.h"
 
-extern bool8 (*gUnknown_03005DB0)(void);
-extern void (*gUnknown_0203CEEC)(void);
-
 bool8 SetUpFieldMove_Teleport(void)
 {
     if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE)
     {
         gUnknown_03005DB0 = FieldCallback_Teleport;
-        gUnknown_0203CEEC = hm_teleport_run_dp02scr;   
+        gUnknown_0203CEEC = hm_teleport_run_dp02scr;
         return TRUE;
-    } 
+    }
     return FALSE;
 }