diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_movement.h | 2 | ||||
| -rw-r--r-- | include/field_camera.h | 6 | ||||
| -rw-r--r-- | include/fieldmap.h | 1 | ||||
| -rw-r--r-- | include/overworld.h | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 50d9935fc..5c65db228 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -129,6 +129,8 @@ void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible); u8 ZCoordToPriority(u8 z); void SetObjectSubpriorityByZCoord(u8 z, struct Sprite * sprite, u8 offset); void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables); +u8 AddCameraObject(u8 trackedSpriteId); +void UpdateObjectEventsForCameraUpdate(s16 x, s16 y); // Exported data declarations diff --git a/include/field_camera.h b/include/field_camera.h index fdab03255..65003bc6f 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -8,9 +8,9 @@ struct CameraObject { void (*callback)(struct CameraObject *); - u32 unk4; - s32 unk8; - s32 unkC; + u32 spriteId; + s32 movementSpeedX; + s32 movementSpeedY; s32 x; s32 y; }; diff --git a/include/fieldmap.h b/include/fieldmap.h index a8e31685f..7cccbcc24 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -33,5 +33,6 @@ void save_serialize_map(void); u32 GetMetatileAttributeFromRawMetatileBehavior(u32 original, u8 bit); u32 MapGridGetMetatileAttributeAt(s16 x, s16 y, u8 attr); void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 arg2); +bool8 CameraMove(s32 x, s32 y); #endif //GUARD_FIELDMAP_H diff --git a/include/overworld.h b/include/overworld.h index 02492f74b..fecacf6de 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -194,6 +194,9 @@ void CB1_Overworld(void); void sub_80568C4(void); u8 GetLastUsedWarpMapSectionId(void); +extern u16 *gBGTilemapBuffers1; +extern u16 *gBGTilemapBuffers2; +extern u16 *gBGTilemapBuffers3; extern u16 gHeldKeyCodeToSend; #endif //GUARD_OVERWORLD_H |