summaryrefslogtreecommitdiff
path: root/src/event_object_80688E4.c
diff options
context:
space:
mode:
authorultima-soul <akshayjhanji@hotmail.com>2020-03-13 19:44:09 -0700
committerultima-soul <akshayjhanji@hotmail.com>2020-03-13 19:44:09 -0700
commit96b7836d482596232d1f3e78fb0a8e3ce7f9d6d5 (patch)
tree88c05dbf8eb6dce46bb5705dca4f0efec52a2975 /src/event_object_80688E4.c
parent99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (diff)
Finish rest of event_object_movement
Diffstat (limited to 'src/event_object_80688E4.c')
-rw-r--r--src/event_object_80688E4.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/event_object_80688E4.c b/src/event_object_80688E4.c
index 746b10f38..0477a02d9 100644
--- a/src/event_object_80688E4.c
+++ b/src/event_object_80688E4.c
@@ -1,7 +1,6 @@
#include "global.h"
#include "event_object_movement.h"
#include "field_effect.h"
-#include "field_ground_effect.h"
// This is part of evobjmv.c (see assert statement in DoObjectUnionRoomWarpYDisplacement).
@@ -627,7 +626,7 @@ bool32 RfuUnionObjectIsWarping(u8 objectEventId)
#undef tZCoord
#undef tObjectEventId
-u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct ObjectEvent * objectEvent)
+u32 StartFieldEffectForObjectEvent(u8 fieldEffectId, struct ObjectEvent * objectEvent)
{
ObjectEventGetLocalIdAndMap(objectEvent, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
return FieldEffectStart(fieldEffectId);
@@ -638,7 +637,7 @@ void DoShadowFieldEffect(struct ObjectEvent *objectEvent)
if (!objectEvent->hasShadow)
{
objectEvent->hasShadow = TRUE;
- oe_exec_and_other_stuff(FLDEFF_SHADOW, objectEvent);
+ StartFieldEffectForObjectEvent(FLDEFF_SHADOW, objectEvent);
}
}