atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1987 from PokemonSanFran/cancelGroundEffectsCamera

Browse source 
Added fix to Keep the Camera from Making Waves
This commit is contained in:
GriffinR 2024-04-11 14:41:04 -04:00 committed by GitHub
commit af0165a35d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/event_object_movement.c
View file

@ -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);
@ -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);
@ -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);