From e52349b474a58928acba5145e8f596cc13bbc675 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Mon, 22 May 2023 12:28:32 -0400 Subject: [PATCH] fix missed conflict --- include/event_object_movement.h | 6 ------ src/event_object_movement.c | 5 +++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/include/event_object_movement.h b/include/event_object_movement.h index e636fd032..dc3b4852e 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -214,13 +214,7 @@ s16 GetFigure8YOffset(s16 idx); void CameraObjectReset2(void); u8 GetObjectEventBerryTreeId(u8 objectEventId); void SetBerryTreeJustPicked(u8 mapId, u8 mapNumber, u8 mapGroup); -<<<<<<< HEAD -bool8 IsBerryTreeSparkling(u8, u8, u8); -struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup); -u8 TrySpawnObjectEventTemplate(struct ObjectEventTemplate *objectEventTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY); -======= bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup); ->>>>>>> 73a6a583b3706979e1a15976e30270984f1f0c26 void MovementType_None(struct Sprite *); void MovementType_LookAround(struct Sprite *); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 084f8760c..1bf74a781 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -133,6 +133,7 @@ static u16 GetObjectEventFlagIdByObjectEventId(u8); static void UpdateObjectEventVisibility(struct ObjectEvent *, struct Sprite *); static void MakeSpriteTemplateFromObjectEventTemplate(const struct ObjectEventTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); static void GetObjectEventMovingCameraOffset(s16 *, s16 *); +static const struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8, u8, u8); static void LoadObjectEventPalette(u16); static void RemoveObjectEventIfOutsideView(struct ObjectEvent *); static void SpawnObjectEventOnReturnToField(u8, s16, s16); @@ -1535,7 +1536,7 @@ static u8 TrySetupObjectEventSprite(const struct ObjectEventTemplate *objectEven return objectEventId; } -u8 TrySpawnObjectEventTemplate(const struct ObjectEventTemplate *objectEventTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +static u8 TrySpawnObjectEventTemplate(const struct ObjectEventTemplate *objectEventTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) { u8 objectEventId; struct SpriteTemplate spriteTemplate; @@ -2498,7 +2499,7 @@ u8 GetObjectEventBerryTreeId(u8 objectEventId) return gObjectEvents[objectEventId].trainerRange_berryTreeId; } -struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static const struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { const struct ObjectEventTemplate *templates; const struct MapHeader *mapHeader;