From b7c28c4be76f19d3515ede426ae874390523457f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 15:00:56 -0500 Subject: Remove redundant include lines --- src/fldeff_strength.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index b8d5af31d..f3ddd8212 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -6,7 +6,6 @@ #include "script.h" #include "fldeff.h" #include "event_scripts.h" -#include "constants/songs.h" #include "constants/object_events.h" static void FldEff_UseStrength(void); -- cgit v1.2.3 From 1fc8db43b7254f7445b335cec22c7406edb1902d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 23 Feb 2020 17:00:12 -0500 Subject: Sync object event gfx constants --- src/fldeff_strength.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index f3ddd8212..230b9c751 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -6,14 +6,14 @@ #include "script.h" #include "fldeff.h" #include "event_scripts.h" -#include "constants/object_events.h" +#include "constants/event_objects.h" static void FldEff_UseStrength(void); static void sub_80D08A8(void); bool8 SetUpFieldMove_Strength(void) { - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(OBJECT_EVENT_GFX_STRENGTH_BOULDER) != TRUE) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_STRENGTH_BOULDER) != TRUE) { return FALSE; } -- cgit v1.2.3 From 4747fcb6296709bf3f9eb287ca6adb977dae0bce Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 26 Feb 2020 09:21:49 -0500 Subject: Name methods in fldeff_cut --- src/fldeff_strength.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 230b9c751..712d9f1c6 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -33,7 +33,7 @@ static void FldEff_UseStrength(void) bool8 sub_80D0860(void) { - u8 taskId = oei_task_add(); + u8 taskId = CreateFieldEffectShowMon(); FLDEFF_SET_FUNC_TO_DATA(sub_80D08A8); GetMonNickname(&gPlayerParty[gFieldEffectArguments[0]], gStringVar1); return FALSE; -- cgit v1.2.3 From 875dde7a0cc2229decf41b1ecbac88addbdc8ea4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Mar 2020 09:51:21 -0500 Subject: Rename remaining field effect callbacks --- src/fldeff_strength.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 712d9f1c6..c6b92b28c 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -8,8 +8,8 @@ #include "event_scripts.h" #include "constants/event_objects.h" -static void FldEff_UseStrength(void); -static void sub_80D08A8(void); +static void FieldCB_UseStrength(void); +static void ShowMonCB_UseStrength(void); bool8 SetUpFieldMove_Strength(void) { @@ -21,25 +21,25 @@ bool8 SetUpFieldMove_Strength(void) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; - gPostMenuFieldCallback = FldEff_UseStrength; + gPostMenuFieldCallback = FieldCB_UseStrength; return TRUE; } } -static void FldEff_UseStrength(void) +static void FieldCB_UseStrength(void) { gFieldEffectArguments[0] = GetCursorSelectionMonId(); ScriptContext1_SetupScript(EventScript_FldEffStrength); } -bool8 sub_80D0860(void) +bool8 FldEff_UseStrength(void) { u8 taskId = CreateFieldEffectShowMon(); - FLDEFF_SET_FUNC_TO_DATA(sub_80D08A8); + FLDEFF_SET_FUNC_TO_DATA(ShowMonCB_UseStrength); GetMonNickname(&gPlayerParty[gFieldEffectArguments[0]], gStringVar1); return FALSE; } -static void sub_80D08A8(void) +static void ShowMonCB_UseStrength(void) { FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH); EnableBothScriptContexts(); -- cgit v1.2.3