mirror of https://github.com/pret/pokeemerald.git
yet more an_walk_any_2_macro functions
This commit is contained in:
PikalaxALT
parent
f8b08d3ee7
commit
384ca4658b
|
|
@ -5,156 +5,6 @@
|
|||
|
||||
.text
|
||||
|
||||
thumb_func_start do_run_south_anim
|
||||
@ bool8 do_run_south_anim(struct npc_state *fieldObject, struct obj *object)
|
||||
do_run_south_anim: @ 8094C80
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
movs r2, 0x1
|
||||
bl do_run_anim
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl sub_8094CA0
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end do_run_south_anim
|
||||
|
||||
thumb_func_start sub_8094CA0
|
||||
@ bool8 sub_8094CA0(struct npc_state *fieldObject, struct obj *object)
|
||||
sub_8094CA0: @ 8094CA0
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
bl npc_obj_ministep_stop_on_arrival
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08094CB2
|
||||
movs r0, 0
|
||||
b _08094CB8
|
||||
_08094CB2:
|
||||
movs r0, 0x2
|
||||
strh r0, [r4, 0x32]
|
||||
movs r0, 0x1
|
||||
_08094CB8:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8094CA0
|
||||
|
||||
thumb_func_start do_run_north_anim
|
||||
do_run_north_anim: @ 8094CC0
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
movs r2, 0x2
|
||||
bl do_run_anim
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl sub_8094CE0
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end do_run_north_anim
|
||||
|
||||
thumb_func_start sub_8094CE0
|
||||
sub_8094CE0: @ 8094CE0
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
bl npc_obj_ministep_stop_on_arrival
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08094CF2
|
||||
movs r0, 0
|
||||
b _08094CF8
|
||||
_08094CF2:
|
||||
movs r0, 0x2
|
||||
strh r0, [r4, 0x32]
|
||||
movs r0, 0x1
|
||||
_08094CF8:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8094CE0
|
||||
|
||||
thumb_func_start do_run_west_anim
|
||||
do_run_west_anim: @ 8094D00
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
movs r2, 0x3
|
||||
bl do_run_anim
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl sub_8094D20
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end do_run_west_anim
|
||||
|
||||
thumb_func_start sub_8094D20
|
||||
sub_8094D20: @ 8094D20
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
bl npc_obj_ministep_stop_on_arrival
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08094D32
|
||||
movs r0, 0
|
||||
b _08094D38
|
||||
_08094D32:
|
||||
movs r0, 0x2
|
||||
strh r0, [r4, 0x32]
|
||||
movs r0, 0x1
|
||||
_08094D38:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8094D20
|
||||
|
||||
thumb_func_start do_run_east_anim
|
||||
do_run_east_anim: @ 8094D40
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
movs r2, 0x4
|
||||
bl do_run_anim
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl sub_8094D60
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end do_run_east_anim
|
||||
|
||||
thumb_func_start sub_8094D60
|
||||
sub_8094D60: @ 8094D60
|
||||
push {r4,lr}
|
||||
adds r4, r1, 0
|
||||
bl npc_obj_ministep_stop_on_arrival
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08094D72
|
||||
movs r0, 0
|
||||
b _08094D78
|
||||
_08094D72:
|
||||
movs r0, 0x2
|
||||
strh r0, [r4, 0x32]
|
||||
movs r0, 0x1
|
||||
_08094D78:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8094D60
|
||||
|
||||
thumb_func_start npc_set_direction_and_anim__an_proceed
|
||||
npc_set_direction_and_anim__an_proceed: @ 8094D80
|
||||
push {r4-r6,lr}
|
||||
|
|
|
|||
|
|
@ -4449,37 +4449,41 @@ bool8 sub_80945C4(struct MapObject *mapObject, struct Sprite *sprite)
|
|||
bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
|
||||
{\
|
||||
u8 animId;\
|
||||
animId = get_##images##_image_anim_num(direction);\
|
||||
sub_8094554(mapObject, sprite, direction, animId, duration);\
|
||||
animId = get_##images##_image_anim_num(DIR_##direction);\
|
||||
sub_8094554(mapObject, sprite, DIR_##direction, animId, duration);\
|
||||
return timer(mapObject, sprite);\
|
||||
}
|
||||
|
||||
special_anim_with_timer_2(sub_8094600, DIR_SOUTH, go, 32, sub_80945C4)
|
||||
special_anim_with_timer_2(sub_8094638, DIR_NORTH, go, 32, sub_80945C4)
|
||||
special_anim_with_timer_2(sub_8094670, DIR_WEST, go, 32, sub_80945C4)
|
||||
special_anim_with_timer_2(sub_80946A8, DIR_EAST, go, 32, sub_80945C4)
|
||||
special_anim_with_timer_2(sub_80946E0, DIR_SOUTH, go, 16, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094718, DIR_NORTH, go, 16, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094750, DIR_WEST, go, 16, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094788, DIR_EAST, go, 16, sub_809459C)
|
||||
special_anim_with_timer_2(sub_80947C0, DIR_SOUTH, go_fast, 8, sub_809459C)
|
||||
special_anim_with_timer_2(sub_80947F8, DIR_NORTH, go_fast, 8, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094830, DIR_WEST, go_fast, 8, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094868, DIR_EAST, go_fast, 8, sub_809459C)
|
||||
special_anim_with_timer_2(sub_80948A0, DIR_SOUTH, go_faster, 4, sub_809459C)
|
||||
special_anim_with_timer_2(sub_80948D8, DIR_NORTH, go_faster, 4, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094910, DIR_WEST, go_faster, 4, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094948, DIR_EAST, go_faster, 4, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094600, SOUTH, go, 32, sub_80945C4)
|
||||
special_anim_with_timer_2(sub_8094638, NORTH, go, 32, sub_80945C4)
|
||||
special_anim_with_timer_2(sub_8094670, WEST, go, 32, sub_80945C4)
|
||||
special_anim_with_timer_2(sub_80946A8, EAST, go, 32, sub_80945C4)
|
||||
special_anim_with_timer_2(sub_80946E0, SOUTH, go, 16, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094718, NORTH, go, 16, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094750, WEST, go, 16, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094788, EAST, go, 16, sub_809459C)
|
||||
special_anim_with_timer_2(sub_80947C0, SOUTH, go_fast, 8, sub_809459C)
|
||||
special_anim_with_timer_2(sub_80947F8, NORTH, go_fast, 8, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094830, WEST, go_fast, 8, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094868, EAST, go_fast, 8, sub_809459C)
|
||||
special_anim_with_timer_2(sub_80948A0, SOUTH, go_faster, 4, sub_809459C)
|
||||
special_anim_with_timer_2(sub_80948D8, NORTH, go_faster, 4, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094910, WEST, go_faster, 4, sub_809459C)
|
||||
special_anim_with_timer_2(sub_8094948, EAST, go_faster, 4, sub_809459C)
|
||||
|
||||
an_walk_any_2_macro(sub_8094980, do_go_anim, npc_obj_ministep_stop_on_arrival, 1, 2)
|
||||
an_walk_any_2_macro(sub_80949C0, do_go_anim, npc_obj_ministep_stop_on_arrival, 2, 2)
|
||||
an_walk_any_2_macro(sub_8094A00, do_go_anim, npc_obj_ministep_stop_on_arrival, 3, 2)
|
||||
an_walk_any_2_macro(sub_8094A40, do_go_anim, npc_obj_ministep_stop_on_arrival, 4, 2)
|
||||
an_walk_any_2_macro(sub_8094A80, do_go_anim, npc_obj_ministep_stop_on_arrival, 1, 3)
|
||||
an_walk_any_2_macro(sub_8094AC0, do_go_anim, npc_obj_ministep_stop_on_arrival, 2, 3)
|
||||
an_walk_any_2_macro(sub_8094B00, do_go_anim, npc_obj_ministep_stop_on_arrival, 3, 3)
|
||||
an_walk_any_2_macro(sub_8094B40, do_go_anim, npc_obj_ministep_stop_on_arrival, 4, 3)
|
||||
an_walk_any_2_macro(sub_8094B80, do_go_anim, npc_obj_ministep_stop_on_arrival, 1, 4)
|
||||
an_walk_any_2_macro(sub_8094BC0, do_go_anim, npc_obj_ministep_stop_on_arrival, 2, 4)
|
||||
an_walk_any_2_macro(sub_8094C00, do_go_anim, npc_obj_ministep_stop_on_arrival, 3, 4)
|
||||
an_walk_any_2_macro(sub_8094C40, do_go_anim, npc_obj_ministep_stop_on_arrival, 4, 4)
|
||||
an_walk_any_2_macro(sub_8094980, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 2)
|
||||
an_walk_any_2_macro(sub_80949C0, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 2)
|
||||
an_walk_any_2_macro(sub_8094A00, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST, 2)
|
||||
an_walk_any_2_macro(sub_8094A40, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST, 2)
|
||||
an_walk_any_2_macro(sub_8094A80, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 3)
|
||||
an_walk_any_2_macro(sub_8094AC0, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 3)
|
||||
an_walk_any_2_macro(sub_8094B00, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST, 3)
|
||||
an_walk_any_2_macro(sub_8094B40, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST, 3)
|
||||
an_walk_any_2_macro(sub_8094B80, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 4)
|
||||
an_walk_any_2_macro(sub_8094BC0, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 4)
|
||||
an_walk_any_2_macro(sub_8094C00, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST, 4)
|
||||
an_walk_any_2_macro(sub_8094C40, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST, 4)
|
||||
an_walk_any_2_macro(sub_8094C80, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_SOUTH)
|
||||
an_walk_any_2_macro(sub_8094CC0, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_NORTH)
|
||||
an_walk_any_2_macro(sub_8094D00, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST)
|
||||
an_walk_any_2_macro(sub_8094D40, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST)
|
||||
|
|
|
|||
Loading…
Reference in New Issue