diff options
| -rwxr-xr-x | asm/field_map_obj.s | 9 | ||||
| -rwxr-xr-x | src/field_map_obj.c | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index c4da7b242..2d2c39ced 100755 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -5,15 +5,6 @@ .text - thumb_func_start FieldObjectSetRegularAnim -@ void FieldObjectSetRegularAnim(struct npc_state *fieldObject, struct obj *object, u8 animState) -FieldObjectSetRegularAnim: @ 8093904 - movs r3, 0 - strb r2, [r0, 0x1C] - strh r3, [r1, 0x32] - bx lr - thumb_func_end FieldObjectSetRegularAnim - thumb_func_start an_look_any @ void an_look_any(struct npc_state *fieldObject, struct obj *object, u8 direction) an_look_any: @ 809390C diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 9702385e4..0629fd983 100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -4112,3 +4112,9 @@ bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *spr } return FALSE; } + +void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId) +{ + mapObject->mapobj_unk_1C = animId; + sprite->data2 = 0; +} |