dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename remaining field effect callbacks

Browse Source
This commit is contained in:
PikalaxALT
2020-03-02 09:51:21 -05:00
parent a7966b5047
commit 875dde7a0c
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_effect.c
+1
View File
@@ -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);
src/fldeff_strength.c
+7 -7
View File
@@ -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();