Merge pull request #1 from pret/master

Update fork to match main fork.

1 files changed, 18 insertions, 14 deletions

diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 3cc33e3c1..1edae09d4 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -1,37 +1,41 @@
 #include "global.h"
+#include "braille_puzzles.h"
 #include "field_effect.h"
-#include "asm.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 u32 gUnknown_0202FF84;
+extern u32 gUnknown_0202FF84[];
 
-extern u8 gUnknown_03005CE0;
+extern u8 gLastFieldPokeMenuOpened;
 extern u16 gScriptResult;
-extern void (*gUnknown_0300485C)(void);
+extern void (*gFieldCallback)(void);
 extern void (*gUnknown_03005CE4)(void);
 
 extern u8 UseStrengthScript[];
 
 bool8 SetUpFieldMove_Strength(void)
 {
-    if (sub_81474C8())
+    if (ShouldDoBrailleStrengthEffect())
     {
-        gScriptResult = gUnknown_03005CE0;
-        gUnknown_0300485C = sub_808AB90;
+        gScriptResult = gLastFieldPokeMenuOpened;
+        gFieldCallback = sub_808AB90;
         gUnknown_03005CE4 = sub_811AA38;
     }
     else
     {
         if (npc_before_player_of_type(87) != TRUE)
             return 0;
-        gScriptResult = gUnknown_03005CE0;
-        gUnknown_0300485C = sub_808AB90;
+        gScriptResult = gLastFieldPokeMenuOpened;
+        gFieldCallback = sub_808AB90;
         gUnknown_03005CE4 = sub_811AA18;
     }
 
@@ -40,13 +44,13 @@ bool8 SetUpFieldMove_Strength(void)
 
 static void sub_811AA18(void)
 {
-    gUnknown_0202FF84 = gUnknown_03005CE0;
+    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
     ScriptContext1_SetupScript(UseStrengthScript);
 }
 
 static void sub_811AA38(void)
 {
-    gUnknown_0202FF84 = gUnknown_03005CE0;
+    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
     FieldEffectStart(40);
 }
 
@@ -56,15 +60,15 @@ bool8 FldEff_UseStrength(void)
 
     gTasks[taskId].data[8] = (u32)sub_811AA9C >> 16;
     gTasks[taskId].data[9] = (u32)sub_811AA9C;
-    GetMonNickname(&gPlayerParty[gUnknown_0202FF84], gStringVar1);
+    GetMonNickname(&gPlayerParty[gUnknown_0202FF84[0]], gStringVar1);
     return FALSE;
 }
 
 static void sub_811AA9C(void)
 {
-    if (sub_81474C8())
+    if (ShouldDoBrailleStrengthEffect())
     {
-        sub_8147514();
+        DoBrailleStrengthEffect();
     }
     else
     {