From 8ee35bc615de6a00a3938f8d9eef88c7e900a203 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 17 Dec 2019 21:09:15 -0500 Subject: *actual* final pass at unifying on object event --- src/fldeff_strength.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 3f3254ade..9a05c51d8 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -7,14 +7,14 @@ #include "fldeff.h" #include "event_scripts.h" #include "constants/songs.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" static void FldEff_UseStrength(void); static void sub_80D08A8(void); bool8 SetUpFieldMove_Strength(void) { - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(/*MAP_OBJ_GFX_PUSHABLE_BOULDER*/0x61) != TRUE) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(/*OBJECT_EVENT_GFX_PUSHABLE_BOULDER*/0x61) != TRUE) { return FALSE; } -- cgit v1.2.3 From f30a6c7ac653dfdad4bf998e534ad5fe27571532 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 17 Dec 2019 22:26:38 -0500 Subject: use new gfx constants for fldeffs --- src/fldeff_strength.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fldeff_strength.c') diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 9a05c51d8..b8d5af31d 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -14,7 +14,7 @@ static void sub_80D08A8(void); bool8 SetUpFieldMove_Strength(void) { - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(/*OBJECT_EVENT_GFX_PUSHABLE_BOULDER*/0x61) != TRUE) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(OBJECT_EVENT_GFX_STRENGTH_BOULDER) != TRUE) { return FALSE; } -- cgit v1.2.3