Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added fix to Keep the Camera from Making Waves #1987

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/event_object_movement.c
Original file line number Diff line number Diff line change
Expand Up @@ -8070,7 +8070,11 @@ static void DoGroundEffects_OnSpawn(struct ObjectEvent *objEvent, struct Sprite
{
u32 flags;

#ifdef BUGFIX
if (objEvent->triggerGroundEffectsOnMove && objEvent->localId != OBJ_EVENT_ID_CAMERA)
#else
if (objEvent->triggerGroundEffectsOnMove)
#endif
{
flags = 0;
UpdateObjectEventElevationAndPriority(objEvent, sprite);
Expand All @@ -8086,7 +8090,11 @@ static void DoGroundEffects_OnBeginStep(struct ObjectEvent *objEvent, struct Spr
{
u32 flags;

#ifdef BUGFIX
if (objEvent->triggerGroundEffectsOnMove && objEvent->localId != OBJ_EVENT_ID_CAMERA)
#else
if (objEvent->triggerGroundEffectsOnMove)
#endif
{
flags = 0;
UpdateObjectEventElevationAndPriority(objEvent, sprite);
Expand All @@ -8103,7 +8111,11 @@ static void DoGroundEffects_OnFinishStep(struct ObjectEvent *objEvent, struct Sp
{
u32 flags;

#ifdef BUGFIX
if (objEvent->triggerGroundEffectsOnStop && objEvent->localId != OBJ_EVENT_ID_CAMERA)
#else
if (objEvent->triggerGroundEffectsOnStop)
#endif
{
flags = 0;
UpdateObjectEventElevationAndPriority(objEvent, sprite);
Expand Down