diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-02 12:11:22 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-02 12:11:22 -0500 |
commit | ae08a402904b8c4069bdfba61f0af8f433083f91 (patch) | |
tree | 7bc8513f997cbf0ee4457df9341919b4e9eabe08 /src/fldeff_strength.c | |
parent | 5198a05272716990bcd98b9b216d3431adb25a3e (diff) | |
parent | 2d820809d74eaf4775ad0e2cc50e57bb65ed61a6 (diff) |
Merge pull request #279 from PikalaxALT/field_effect
Field effect
Diffstat (limited to 'src/fldeff_strength.c')
-rw-r--r-- | src/fldeff_strength.c | 14 |
1 files changed, 7 insertions, 7 deletions
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(); |