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

sub_808E75C

Browse source
This commit is contained in:
scnorton 2017-09-08 14:53:00 -04:00
parent 05685f3961
commit 62eca95358
2 changed files with 35 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
asm/field_map_obj.s
View file

@ -5,33 +5,6 @@
.text
thumb_func_start sub_808E75C
sub_808E75C: @ 808E75C
push {lr}
lsls r0, 16
asrs r0, 16
lsls r1, 16
asrs r1, 16
bl GetFieldObjectIdByXY
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x10
beq _0808E784
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
adds r0, r1
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
strb r1, [r0]
_0808E784:
pop {r0}
bx r0
.pool
thumb_func_end sub_808E75C
thumb_func_start sub_808E78C
sub_808E78C: @ 808E78C
push {r4,lr}

57
src/field_map_obj.c
View file

@ -63,7 +63,7 @@ static void npcs_clear_ids_and_state(void)
{
u8 i;
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
{
npc_clear_ids_and_state(&gMapObjects[i]);
}
@ -98,7 +98,7 @@ u8 sub_808D4F4(void)
{
u8 i;
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
{
if (!gMapObjects[i].active)
{
@ -120,7 +120,7 @@ u8 GetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8 *fieldObjectId)
{
*fieldObjectId = GetFieldObjectIdByLocalIdAndMap(localId, mapId, mapGroupId);
if (*fieldObjectId == ARRAY_COUNT(gMapObjects))
if (*fieldObjectId == NUM_FIELD_OBJECTS)
{
return TRUE;
}
@ -131,7 +131,7 @@ u8 GetFieldObjectIdByXY(s16 x, s16 y)
{
u8 i;
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
{
if (gMapObjects[i].active && gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y)
{
@ -145,28 +145,28 @@ static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGr
{
u8 i;
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
{
if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapId && gMapObjects[i].mapGroup == mapGroupId)
{
return i;
}
}
return ARRAY_COUNT(gMapObjects);
return NUM_FIELD_OBJECTS;
}
static u8 GetFieldObjectIdByLocalId(u8 localId)
{
u8 i;
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
{
if (gMapObjects[i].active && gMapObjects[i].localId == localId)
{
return i;
}
}
return ARRAY_COUNT(gMapObjects);
return NUM_FIELD_OBJECTS;
}
// This function has the same nonmatching quirk as in Ruby/Sapphire.
@ -180,7 +180,7 @@ static u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u
if (GetAvailableFieldObjectSlot(template->localId, mapId, mapGroupId, &slot))
{
return ARRAY_COUNT(gMapObjects);
return NUM_FIELD_OBJECTS;
}
mapObject = &gMapObjects[slot];
npc_clear_ids_and_state(mapObject);
@ -409,7 +409,7 @@ u8 unref_sub_808D77C(u8 localId)
}
}
}
return ARRAY_COUNT(gMapObjects);
return NUM_FIELD_OBJECTS;
}
static bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 *result)
@ -421,14 +421,14 @@ static bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8
{
u8 i = 0;
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
{
if (!gMapObjects[i].active)
break;
if (gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup)
return TRUE;
}
if (i >= ARRAY_COUNT(gMapObjects))
if (i >= NUM_FIELD_OBJECTS)
return TRUE;
*result = i;
do
@ -436,7 +436,7 @@ static bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8
if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup)
return TRUE;
i ++;
} while (i < ARRAY_COUNT(gMapObjects));
} while (i < NUM_FIELD_OBJECTS);
return FALSE;
}
@ -468,7 +468,7 @@ void unref_sub_808D958(void)
{
u8 i;
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
{
if (i != gPlayerAvatar.mapObjectId)
{
@ -487,9 +487,9 @@ static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate,
u8 spriteId;
mapObjectId = InitFieldObjectStateFromTemplate(mapObjectTemplate, mapNum, mapGroup);
if (mapObjectId == ARRAY_COUNT(gMapObjects))
if (mapObjectId == NUM_FIELD_OBJECTS)
{
return ARRAY_COUNT(gMapObjects);
return NUM_FIELD_OBJECTS;
}
mapObject = &gMapObjects[mapObjectId];
graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
@ -516,7 +516,7 @@ static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate,
if (spriteId == MAX_SPRITES)
{
gMapObjects[mapObjectId].active = FALSE;
return ARRAY_COUNT(gMapObjects);
return NUM_FIELD_OBJECTS;
}
sprite = &gSprites[spriteId];
sub_8092FF0(mapObject->coords2.x + cameraX, mapObject->coords2.y + cameraY, &sprite->pos1.x, &sprite->pos1.y);
@ -552,9 +552,9 @@ static u8 SpawnFieldObject(struct MapObjectTemplate *mapObjectTemplate, u8 mapNu
spriteFrameImage.size = graphicsInfo->size;
spriteTemplate.images = &spriteFrameImage;
mapObjectId = SpawnFieldObjectInternal(mapObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY);
if (mapObjectId == ARRAY_COUNT(gMapObjects))
if (mapObjectId == NUM_FIELD_OBJECTS)
{
return ARRAY_COUNT(gMapObjects);
return NUM_FIELD_OBJECTS;
}
gSprites[gMapObjects[mapObjectId].spriteId].images = graphicsInfo->images;
if (subspriteTables != NULL)
@ -602,7 +602,7 @@ u8 show_sprite(u8 localId, u8 mapNum, u8 mapGroup)
mapObjectTemplate = GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup);
if (mapObjectTemplate == NULL)
{
return ARRAY_COUNT(gMapObjects);
return NUM_FIELD_OBJECTS;
}
GetFieldObjectMovingCameraOffset(&cameraX, &cameraY);
return SpawnFieldObject(mapObjectTemplate, mapNum, mapGroup, cameraX, cameraY);
@ -757,7 +757,7 @@ void SpawnFieldObjectsInView(s16 cameraX, s16 cameraY)
bool8 isActiveLinkPlayer;
struct MapObject *mapObject;
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
{
for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerMapObjects); j ++)
{
@ -800,7 +800,7 @@ void sub_808E16C(s16 x, s16 y)
u8 i;
ClearPlayerAvatarInfo();
for (i = 0; i < ARRAY_COUNT(gMapObjects); i ++)
for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
{
if (gMapObjects[i].active)
{
@ -1051,3 +1051,16 @@ void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, u8 *localId, u8 *m
*mapNum = mapObject->mapNum;
*mapGroup = mapObject->mapGroup;
}
void sub_808E75C(s16 x, s16 y)
{
u8 mapObjectId;
struct MapObject *mapObject;
mapObjectId = GetFieldObjectIdByXY(x, y);
if (mapObjectId != NUM_FIELD_OBJECTS)
{
mapObject = &gMapObjects[mapObjectId];
mapObject->mapobj_bit_2 = TRUE;
}
}