diff options
| -rwxr-xr-x | asm/field_map_obj.s | 24 | ||||
| -rwxr-xr-x | src/field_map_obj.c | 10 |
2 files changed, 10 insertions, 24 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index fc8efe4c8..7a6d08ea3 100755 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -5,30 +5,6 @@ .text - thumb_func_start sub_8091110 -@ bool8 sub_8091110(struct npc_state *fieldObject, struct obj *object) -sub_8091110: @ 8091110 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - bl FieldObjectExecRegularAnim - lsls r0, 24 - cmp r0, 0 - beq _0809112E - ldrb r0, [r4] - movs r1, 0x3 - negs r1, r1 - ands r1, r0 - strb r1, [r4] - movs r0, 0x1 - strh r0, [r5, 0x30] -_0809112E: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8091110 - thumb_func_start FieldObjectCB_GoInDirectionSequence1 FieldObjectCB_GoInDirectionSequence1: @ 8091138 push {lr} diff --git a/src/field_map_obj.c b/src/field_map_obj.c index cfe04f395..0c6397730 100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -3098,3 +3098,13 @@ bool8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, stru sprite->data1 = 2; return TRUE; } + +bool8 sub_8091110(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite)) + { + mapObject->mapobj_bit_1 = FALSE; + sprite->data1 = 1; + } + return FALSE; +} |