diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-17 13:52:38 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-17 13:52:38 +0100 |
| commit | a0991cfc153d5b6c02bd2967da0ed6b0193e3353 (patch) | |
| tree | 0df91ecbf2ea73e352be5d1a4549c06e540434d4 /include | |
| parent | bb72dcf19dc13d07234b50fbaabb7e5f74f1ac63 (diff) | |
More synchronisation
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_movement.h | 4 | ||||
| -rw-r--r-- | include/item_menu.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 430d41abb..594d90e6d 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -347,14 +347,10 @@ u8 GetFirstInactiveEventObjectId(void); u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); u8 GetEventObjectIdByXY(s16, s16); -u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8); -u8 GetEventObjectIdByLocalId(u8); u8 GetAvailableEventObjectId(u16, u8, u8, u8 *); void RemoveEventObjectByLocalIdAndMap(u8, u8, u8); -void RemoveEventObjectInternal(struct EventObject *); u8 SpawnSpecialEventObject(struct EventObjectTemplate *); u8 show_sprite(u8, u8, u8); -void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables); u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority); u8 sub_805B410(u8, u8, s16, s16, u8, u8); void TrySpawnEventObjects(s16, s16); diff --git a/include/item_menu.h b/include/item_menu.h index 22ef3892c..1a34b8f53 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -37,7 +37,7 @@ void CleanUpOverworldMessage(u8); void ExecuteItemUseFromBlackPalette(void); void sub_80A5D04(void); void ItemMenu_LoadSellMenu(void); -void sub_80A68CC(); +void CB2_ChooseBerry(); void sub_80A6A30(void); bool32 UseRegisteredKeyItem(void); void sub_80A6DCC(void); |