From 6dd973012bce48295e14fcb1c203c4ca72a36cd4 Mon Sep 17 00:00:00 2001 From: SphericalIce Date: Tue, 19 Jan 2021 23:21:50 +0000 Subject: Correct ground effect flag names for reflections & document sprite data usage --- include/event_object_movement.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 9b4d9302f..919c75399 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -16,14 +16,22 @@ enum SpinnerRunnerFollowPatterns RUNFOLLOW_SOUTH_EAST_WEST }; +enum ReflectionTypes +{ + REFL_TYPE_NONE, + REFL_TYPE_ICE, + REFL_TYPE_WATER +}; +#define NUM_REFLECTION_TYPES 2 + #define FIGURE_8_LENGTH 72 #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN (1 << 0) #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE (1 << 1) #define GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN (1 << 2) #define GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE (1 << 3) -#define GROUND_EFFECT_FLAG_ICE_REFLECTION (1 << 4) -#define GROUND_EFFECT_FLAG_REFLECTION (1 << 5) +#define GROUND_EFFECT_FLAG_WATER_REFLECTION (1 << 4) +#define GROUND_EFFECT_FLAG_ICE_REFLECTION (1 << 5) #define GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER (1 << 6) #define GROUND_EFFECT_FLAG_SAND (1 << 7) #define GROUND_EFFECT_FLAG_DEEP_SAND (1 << 8) -- cgit v1.2.3 From 2746fd1f95b13f6cade1a7499917cc377d7b93be Mon Sep 17 00:00:00 2001 From: SphericalIce Date: Tue, 19 Jan 2021 23:35:57 +0000 Subject: Name object event ID arguments properly --- include/event_object_movement.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 919c75399..6abb4416f 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -422,10 +422,10 @@ u8 MovementType_RunInPlace_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_Invisible_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_Invisible_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_Invisible_Step2(struct ObjectEvent *, struct Sprite *); -void SetObjectEventSpriteInvisibility(u8 var, bool32 var2); -bool32 IsObjectEventSpriteInvisible(u8 var); -void SetObjectEventSpriteGraphics(u8 var1, u8 graphicsId); -void SetObjectEventSpriteAnim(u8 var1, u8 var2); -bool32 IsObjectEventSpriteAnimating(u8 var); +void SetObjectEventSpriteInvisibility(u8 objectEventId, bool32 invisible); +bool32 IsObjectEventSpriteInvisible(u8 objectEventId); +void SetObjectEventSpriteGraphics(u8 objectEventId, u8 graphicsId); +void SetObjectEventSpriteAnim(u8 objectEventId, u8 animNum); +bool32 IsObjectEventSpriteAnimating(u8 objectEventId); #endif //GUARD_EVENT_OBJECT_MOVEMENT_H -- cgit v1.2.3 From 4334f7a3793af278846dab3471fe943cb96b3883 Mon Sep 17 00:00:00 2001 From: SphericalIce Date: Wed, 20 Jan 2021 10:17:07 +0000 Subject: Include NUM_REFLECTION_TYPES in the ReflectionTypes enum --- include/event_object_movement.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 6abb4416f..cd76cac11 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -20,9 +20,9 @@ enum ReflectionTypes { REFL_TYPE_NONE, REFL_TYPE_ICE, - REFL_TYPE_WATER + REFL_TYPE_WATER, + NUM_REFLECTION_TYPES }; -#define NUM_REFLECTION_TYPES 2 #define FIGURE_8_LENGTH 72 -- cgit v1.2.3