summaryrefslogtreecommitdiff
path: root/src/fldeff_strength.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-10 13:11:19 -0700
committerMarcus Huderle <huderlem@gmail.com>2018-04-10 13:11:19 -0700
commit9179520b3802f7b2ed74fd930a95bb577c2c06f0 (patch)
treef34368a86cca8be1ae4f115dd9b3d2da1fb9cc4c /src/fldeff_strength.c
parent49a7fe02416b0e5b2287c2fd4dbc979bc711457d (diff)
Document/cleanup fldeff_secretpower.c
Diffstat (limited to 'src/fldeff_strength.c')
-rw-r--r--src/fldeff_strength.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 9f9cd4013..b41f369bb 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -1,5 +1,4 @@
#include "global.h"
-#include "constants/map_objects.h"
#include "braille_puzzles.h"
#include "field_effect.h"
#include "party_menu.h"
@@ -9,6 +8,8 @@
#include "script.h"
#include "task.h"
#include "text.h"
+#include "constants/field_effects.h"
+#include "constants/map_objects.h"
static void sub_811AA18(void);
static void sub_811AA38(void);
@@ -17,7 +18,7 @@ static void sub_811AA9C(void);
extern u8 gLastFieldPokeMenuOpened;
extern u16 gSpecialVar_Result;
extern void (*gFieldCallback)(void);
-extern void (*gUnknown_03005CE4)(void);
+extern void (*gPostMenuFieldCallback)(void);
extern u8 S_UseStrength[];
@@ -48,16 +49,16 @@ bool8 SetUpFieldMove_Strength(void)
if (ShouldDoBrailleStrengthEffect())
{
gSpecialVar_Result = gLastFieldPokeMenuOpened;
- gFieldCallback = FieldCallback_Teleport;
- gUnknown_03005CE4 = sub_811AA38;
+ gFieldCallback = FieldCallback_PrepareFadeInFromMenu;
+ gPostMenuFieldCallback = sub_811AA38;
}
else
{
if (npc_before_player_of_type(87) != TRUE)
return 0;
gSpecialVar_Result = gLastFieldPokeMenuOpened;
- gFieldCallback = FieldCallback_Teleport;
- gUnknown_03005CE4 = sub_811AA18;
+ gFieldCallback = FieldCallback_PrepareFadeInFromMenu;
+ gPostMenuFieldCallback = sub_811AA18;
}
return TRUE;