diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-11 10:31:09 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-11 10:31:09 -0400 |
| commit | 7c40186e35a35f4cf84612af5c9326b7879342f2 (patch) | |
| tree | cef62383819e6a98cc4c7a373a5feb180a5b1893 | |
| parent | 5ad282c82c79205045fce2e8d7db993846d86b17 (diff) | |
FindFieldObjectTemplateInArrayByLocalId
| -rw-r--r-- | asm/field_map_obj.s | 36 | ||||
| -rw-r--r-- | src/field_map_obj.c | 13 |
2 files changed, 13 insertions, 36 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index f3c2929fd..a0bf5fa69 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -5,42 +5,6 @@ .text - thumb_func_start FindFieldObjectTemplateInArrayByLocalId -@ struct FieldObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct FieldObjectTemplate *templates, u8 numTemplates) -FindFieldObjectTemplateInArrayByLocalId: @ 808F17C - push {r4,r5,lr} - adds r5, r1, 0 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r2, 24 - lsrs r2, 24 - movs r1, 0 - cmp r1, r2 - bcs _0808F1AA -_0808F18E: - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - adds r3, r0, r5 - ldrb r0, [r3] - cmp r0, r4 - bne _0808F1A0 - adds r0, r3, 0 - b _0808F1AC -_0808F1A0: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, r2 - bcc _0808F18E -_0808F1AA: - movs r0, 0 -_0808F1AC: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end FindFieldObjectTemplateInArrayByLocalId - thumb_func_start sub_808F1B4 @ int sub_808F1B4(struct npc_state *fieldObject) sub_808F1B4: @ 808F1B4 diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 78269fd58..86ac6a00f 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -1564,3 +1564,16 @@ struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 m return FindFieldObjectTemplateInArrayByLocalId(localId, templates, count); } +struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count) +{ + u8 i; + + for (i = 0; i < count; i ++) + { + if (templates[i].localId == localId) + { + return &templates[i]; + } + } + return NULL; +} |