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

FieldObjectGetLocalIdAndMap

Browse source
This commit is contained in:
scnorton 2017-09-08 14:40:34 -04:00
parent 67955bb51a
commit 05685f3961
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
asm/field_map_obj.s
View file

@ -5,21 +5,6 @@
.text
thumb_func_start FieldObjectGetLocalIdAndMap
@ void FieldObjectGetLocalIdAndMap(struct npc_state *fieldObject, u8 *localId, u8 *mapId, u8 *mapGroupId)
FieldObjectGetLocalIdAndMap: @ 808E748
push {r4,lr}
ldrb r4, [r0, 0x8]
strb r4, [r1]
ldrb r1, [r0, 0x9]
strb r1, [r2]
ldrb r0, [r0, 0xA]
strb r0, [r3]
pop {r4}
pop {r0}
bx r0
thumb_func_end FieldObjectGetLocalIdAndMap
thumb_func_start sub_808E75C
sub_808E75C: @ 808E75C
push {lr}

7
src/field_map_obj.c
View file

@ -1044,3 +1044,10 @@ void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGr
gMapObjects[mapObjectId].mapobj_bit_13 = state;
}
}
void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, u8 *localId, u8 *mapNum, u8 *mapGroup)
{
*localId = mapObject->localId;
*mapNum = mapObject->mapNum;
*mapGroup = mapObject->mapGroup;
}