diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_effect.c | 1 | ||||
| -rw-r--r-- | src/fldeff_strength.c | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 59c3677f9..dc6976287 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -3899,6 +3899,7 @@ void Task_FldEffUnk45(u8 taskId) } } +// Bug: Return value should be u32, not void void FldEff_Unk45(void) { BlendPalettes(0xFFFFFFFF, 0x10, RGB_WHITE); 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(); |