diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-31 18:40:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 18:40:40 -0500 |
| commit | cbc414c44115550c811d6629c23c2e749d9d7fe3 (patch) | |
| tree | 42a2274534149cb609636c3ef98a90438a11ca33 /src/field_effect_helpers.c | |
| parent | 425cb7ec71d549bed0a73bb864c3f33a1c89f1c4 (diff) | |
| parent | bc71641386573c7e865d0cec941f84310fbd648f (diff) | |
Merge pull request #698 from Slawter666/synchronise
Synchronise with pokeemerald
Diffstat (limited to 'src/field_effect_helpers.c')
| -rw-r--r-- | src/field_effect_helpers.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 84f340b35..641cbad8f 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -1,13 +1,13 @@ #include "global.h" -#include "sprite.h" -#include "fieldmap.h" -#include "metatile_behavior.h" -#include "sound.h" #include "event_object_movement.h" #include "field_camera.h" -#include "field_weather.h" #include "field_effect.h" #include "field_effect_helpers.h" +#include "field_weather.h" +#include "fieldmap.h" +#include "metatile_behavior.h" +#include "sound.h" +#include "sprite.h" #include "constants/field_effects.h" #include "constants/songs.h" @@ -297,7 +297,7 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite) mapNum = sprite->data[5] >> 8; mapGroup = sprite->data[5]; - if (gCamera.field_0 && (gSaveBlock1.location.mapNum != mapNum || gSaveBlock1.location.mapGroup != mapGroup)) + if (gCamera.active && (gSaveBlock1.location.mapNum != mapNum || gSaveBlock1.location.mapGroup != mapGroup)) { sprite->data[1] -= gCamera.x; sprite->data[2] -= gCamera.y; @@ -403,7 +403,7 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite) mapNum = sprite->data[5] >> 8; mapGroup = sprite->data[5]; - if (gCamera.field_0 && (gSaveBlock1.location.mapNum != mapNum || gSaveBlock1.location.mapGroup != mapGroup)) + if (gCamera.active && (gSaveBlock1.location.mapNum != mapNum || gSaveBlock1.location.mapGroup != mapGroup)) { sprite->data[1] -= gCamera.x; sprite->data[2] -= gCamera.y; |