diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-17 10:29:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-17 10:29:57 -0400 |
| commit | 384ca4658b84168bc836a32ebd8b17ce70279555 (patch) | |
| tree | 6da7e5b04cb60e09d7f579e563cfd809865e32c2 /src | |
| parent | f8b08d3ee7f2836f86eed171b064ebb125d43400 (diff) | |
yet more an_walk_any_2_macro functions
Diffstat (limited to 'src')
| -rwxr-xr-x | src/field_map_obj.c | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c index c4847ae4f..5fd92199f 100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -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) - -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) +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, 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) |