finished fldeff_strength + lots of clean up

2019-06-29 03:30:48 +08:00
parent c994998aad
commit d09d78dca3
10 changed files with 86 additions and 129 deletions
@@ -0,0 +1,46 @@
+#include "global.h"
+#include "field_player_avatar.h"
+#include "field_effect.h"
+#include "party_menu.h"
+#include "event_data.h"
+#include "script.h"
+#include "fldeff.h"
+#include "event_scripts.h"
+
+static void FldEff_UseStrength(void);
+static void sub_80D08A8(void);
+
+bool8 SetUpFieldMove_Strength(void)
+{
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(0x61) != TRUE)
+    {
+    	return FALSE;
+    }
+    else
+    {
+        gSpecialVar_Result = GetCursorSelectionMonId();
+        gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
+        gPostMenuFieldCallback = FldEff_UseStrength;
+        return TRUE;
+    }
+}
+static void FldEff_UseStrength(void)
+{
+    gFieldEffectArguments[0] = GetCursorSelectionMonId();
+    ScriptContext1_SetupScript(EventScript_FldEffStrength);
+}
+
+bool8 sub_80D0860(void)
+{
+    u8 taskId = oei_task_add();
+    gTasks[taskId].data[8] = (u32)sub_80D08A8 >> 16;
+    gTasks[taskId].data[9] = (u32)sub_80D08A8;
+    GetMonNickname(&gPlayerParty[gFieldEffectArguments[0]], gStringVar1);
+    return FALSE;
+}
+
+static void sub_80D08A8(void)
+{
+    FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH);
+    EnableBothScriptContexts();
+}