atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Static

Browse source
This commit is contained in:
scnorton 2017-09-06 17:29:13 -04:00
parent e060123648
commit a6269f2f0f
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/field_map_obj.c
View file

@ -16,9 +16,9 @@
// Static ROM declarations // Static ROM declarations
/*static*/ void sub_808D450(void); /*static*/ void sub_808D450(void);
/*static*/ u8 GetFieldObjectIdByLocalId(u8); static u8 GetFieldObjectIdByLocalId(u8);
/*static*/ u8 GetFieldObjectIdByLocalIdAndMapInternal(u8, u8, u8); static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8, u8, u8);
/*static*/ bool8 GetAvailableFieldObjectSlot(u16, u8, u8, u8 *); static bool8 GetAvailableFieldObjectSlot(u16, u8, u8, u8 *);
/*static*/ void FieldObjectHandleDynamicGraphicsId(struct MapObject *); /*static*/ void FieldObjectHandleDynamicGraphicsId(struct MapObject *);
// ROM data // ROM data
@ -28,7 +28,7 @@ const u8 gUnknown_0850557C[0x51];
// Code // Code
/*static*/ void npc_clear_ids_and_state(struct MapObject *mapObject) static void npc_clear_ids_and_state(struct MapObject *mapObject)
{ {
*mapObject = (struct MapObject){}; *mapObject = (struct MapObject){};
mapObject->localId = 0xFF; mapObject->localId = 0xFF;
@ -119,7 +119,7 @@ u8 GetFieldObjectIdByXY(s16 x, s16 y)
return i; return i;
} }
u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId) static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId)
{ {
u8 i; u8 i;
@ -388,7 +388,12 @@ u8 unref_sub_808D77C(u8 localId)
return ARRAY_COUNT(gMapObjects); return ARRAY_COUNT(gMapObjects);
} }
bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 *result) static bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 *result)
// Looks for an empty slot.
// Returns FALSE and the location of the available slot
// in *result.
// If no slots are available, or if the object is already
// loaded, returns TRUE.
{ {
u8 i = 0; u8 i = 0;