Merge branch 'master' into event_object_movement

1 files changed, 4 insertions, 4 deletions

diff --git a/include/fldeff.h b/include/fldeff.h
index 51287f400..9dd6121b2 100644
--- a/include/fldeff.h
+++ b/include/fldeff.h
@@ -10,11 +10,11 @@ gTasks[taskId].data[9] = (u32)func;
 extern struct MapPosition gPlayerFacingPosition;
 
 bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
-u8 oei_task_add(void);
+u8 CreateFieldEffectShowMon(void);
 
 // flash
-u8 sub_80C9DCC(u8 lightLevel, u8 mapType);
-u8 sub_80C9D7C(u8 mapType1, u8 mapType2);
+u8 MapTransitionIsExit(u8 lightLevel, u8 mapType);
+u8 MapTransitionIsEnter(u8 mapType1, u8 mapType2);
 bool8 SetUpFieldMove_Flash(void);
 
 // cut
@@ -37,7 +37,7 @@ bool32 FldEffPoison_IsActive(void);
 
 // strength
 bool8 SetUpFieldMove_Strength(void);
-bool8 sub_80D0860(void);
+bool8 FldEff_UseStrength(void);
 
 // teleport
 bool8 SetUpFieldMove_Teleport(void);