From 73327f0d44195f26d1af8b894326e1b98b609681 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 10:23:14 -0500 Subject: Decompile field_ground_effect into event_object_movement.c --- include/field_effect_helpers.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/field_effect_helpers.h') diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 3c9e00b62..faf6290e4 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -15,5 +15,8 @@ bool8 sub_8155DA0(struct MapObject *); void sub_8155D78(struct MapObject *); void sub_81555AC(u8, u8); void ash(s16, s16, u16, s16); +void SetUpReflection(struct MapObject*, struct Sprite*, u8); +u32 StartFieldEffectForEventObject(u8, struct MapObject*); +u8 sub_81546C8(u8, u8, u8, s16, s16); #endif //GUARD_FIELD_EFFECT_HELPERS_H -- cgit v1.2.3 From 89edf6d9e989669f439fdfbf452ee4079e325785 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 17:33:50 -0500 Subject: Move all field object data into src/data and event_object_movement.c --- include/field_effect_helpers.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'include/field_effect_helpers.h') diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index faf6290e4..e7517acf1 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -18,5 +18,21 @@ void ash(s16, s16, u16, s16); void SetUpReflection(struct MapObject*, struct Sprite*, u8); u32 StartFieldEffectForEventObject(u8, struct MapObject*); u8 sub_81546C8(u8, u8, u8, s16, s16); +void sub_8155F80(struct Sprite*); +void oamc_shadow(struct Sprite*); +void unc_grass_normal(struct Sprite*); +void sub_81561D0(struct Sprite*); +void sub_8155460(struct Sprite*); +void sub_8155658(struct Sprite*); +void sub_8156194(struct Sprite*); +void sub_8154C60(struct Sprite*); +void sub_8154D90(struct Sprite*); +void unc_grass_tall(struct Sprite*); +void sub_81559BC(struct Sprite*); +void sub_8155C88(struct Sprite*); +void sub_8154A10(struct Sprite*); +void sub_8155158(struct Sprite*); +void sub_8155AEC(struct Sprite*); +void sub_8155E50(struct Sprite*); #endif //GUARD_FIELD_EFFECT_HELPERS_H -- cgit v1.2.3 From aa9a45c16fbaee2fffc94e4741e0a1f203b244bc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 19:11:48 -0500 Subject: Rebrand 'map object' and 'field object' to 'event object' --- include/field_effect_helpers.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/field_effect_helpers.h') diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index e7517acf1..547f515eb 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -11,12 +11,12 @@ // Exported ROM declarations u8 sub_8154228(void); -bool8 sub_8155DA0(struct MapObject *); -void sub_8155D78(struct MapObject *); +bool8 sub_8155DA0(struct EventObject *); +void sub_8155D78(struct EventObject *); void sub_81555AC(u8, u8); void ash(s16, s16, u16, s16); -void SetUpReflection(struct MapObject*, struct Sprite*, u8); -u32 StartFieldEffectForEventObject(u8, struct MapObject*); +void SetUpReflection(struct EventObject*, struct Sprite*, u8); +u32 StartFieldEffectForEventObject(u8, struct EventObject*); u8 sub_81546C8(u8, u8, u8, s16, s16); void sub_8155F80(struct Sprite*); void oamc_shadow(struct Sprite*); -- cgit v1.2.3