diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_80688E4.h | 4 | ||||
| -rw-r--r-- | include/event_object_movement.h | 3 | ||||
| -rw-r--r-- | include/field_effect.h | 2 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/include/event_object_80688E4.h b/include/event_object_80688E4.h index 36040e0a5..c5dadc672 100644 --- a/include/event_object_80688E4.h +++ b/include/event_object_80688E4.h @@ -4,9 +4,9 @@ #include "global.h" void FreezeObjectEvents(void); -void FreezeObjectEvent(struct ObjectEvent *); +bool8 FreezeObjectEvent(struct ObjectEvent *); void FreezeObjectEventsExceptOne(u8 objEventId); -void sub_8069124(u8 a0, bool8 a1); +void sub_8069124(u8 a0, bool32 a1); u32 sub_806916C(u8 a0); void sub_80691A4(u8 a0, u8 a1); void sub_8069094(u8 a0, u8 a1); diff --git a/include/event_object_movement.h b/include/event_object_movement.h index f2e7bd325..89cdd0cff 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -97,7 +97,7 @@ u8 sub_8063F84(u8 direction); u8 GetTrainerFacingDirectionMovementType(u8 direction); void CameraObjectSetFollowedObjectId(u8 spriteId); void UnfreezeObjectEvents(void); -void sub_8069058(u8, u8); +void TurnEventObject(u8, u8); // Exported data declarations @@ -105,5 +105,6 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; extern const struct SpritePalette gUnknown_83A5348; extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[]; extern const struct OamData gObjectEventBaseOam_32x32; +extern const struct UCoords16 gUnknown_83A64C8[]; #endif // GUARD_EVENT_OBJECT_MOVEMENT_H diff --git a/include/field_effect.h b/include/field_effect.h index c2d14d43c..3e30fa897 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -8,7 +8,7 @@ extern u32 gFieldEffectArguments[8]; extern void (*gPostMenuFieldCallback)(void); extern bool8 (*gFieldCallback2)(void); -u8 FieldEffectStart(u8); +u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); void sub_80B69DC(void); void CreateTeleportFieldEffectTask(void); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 01cd992ec..b7f28d8a0 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -190,7 +190,7 @@ struct ObjectEvent u32 mapobj_bit_19:1; u32 mapobj_bit_20:1; u32 mapobj_bit_21:1; - u32 mapobj_bit_22:1; + u32 hasShadow:1; u32 mapobj_bit_23:1; /*0x03*/ u32 mapobj_bit_24:1; u32 mapobj_bit_25:1; |