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

do_run_anim

Browse source
This commit is contained in:
PikalaxALT 2017-09-16 23:52:50 -04:00
parent 529ccf9a96
commit 7c8991842f
2 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
asm/field_map_obj.s
View file

@ -5,31 +5,6 @@
.text
thumb_func_start do_run_anim
@ void do_run_anim(struct npc_state *fieldObject, struct obj *object, u8 direction)
do_run_anim: @ 8093A88
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
lsls r2, 24
lsrs r2, 24
movs r3, 0x1
bl npc_apply_direction
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl get_run_image_anim_num
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
bl npc_apply_anim_looping
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end do_run_anim
thumb_func_start npc_obj_ministep_stop_on_arrival
@ bool8 npc_obj_ministep_stop_on_arrival(struct npc_state *fieldObject, struct obj *object)
npc_obj_ministep_stop_on_arrival: @ 8093AB8

6
src/field_map_obj.c
View file

@ -4183,3 +4183,9 @@ void do_go_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction
npc_apply_direction(mapObject, sprite, direction, speed);
npc_apply_anim_looping(mapObject, sprite, functions[speed](mapObject->mapobj_unk_18));
}
void do_run_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
{
npc_apply_direction(mapObject, sprite, direction, 1);
npc_apply_anim_looping(mapObject, sprite, get_run_image_anim_num(mapObject->mapobj_unk_18));
}