diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-13 20:36:58 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-13 20:36:58 -0400 |
| commit | 2895765964014d241808ee936293d255a6578daa (patch) | |
| tree | 4c4fd56da785879d3391187b4278e73f2a1f62a0 | |
| parent | ddf712beac8f166c90c0f97d2a6ccdc97c7f6d08 (diff) | |
LookRandomDirections
| -rwxr-xr-x | asm/field_map_obj.s | 37 | ||||
| -rwxr-xr-x | src/field_map_obj.c | 2 |
2 files changed, 2 insertions, 37 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index bf447c447..62cc02fb7 100755 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -5,43 +5,6 @@ .text - thumb_func_start FieldObjectCB_LookRandomDirections -FieldObjectCB_LookRandomDirections: @ 808F944 - push {lr} - adds r1, r0, 0 - movs r0, 0x2E - ldrsh r2, [r1, r0] - lsls r0, r2, 3 - adds r0, r2 - lsls r0, 2 - ldr r2, =gMapObjects - adds r0, r2 - ldr r2, =FieldObjectCB2_LookRandomDirections - bl FieldObjectStep - pop {r0} - bx r0 - .pool - thumb_func_end FieldObjectCB_LookRandomDirections - - thumb_func_start FieldObjectCB2_LookRandomDirections -@ bool8 FieldObjectCB2_LookRandomDirections(struct npc_state *fieldObject, struct obj *object) -FieldObjectCB2_LookRandomDirections: @ 808F968 - push {r4,lr} - ldr r3, =gUnknown_0850D740 - movs r4, 0x30 - ldrsh r2, [r1, r4] - lsls r2, 2 - adds r2, r3 - ldr r2, [r2] - bl _call_via_r2 - lsls r0, 24 - lsrs r0, 24 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end FieldObjectCB2_LookRandomDirections - thumb_func_start sub_808F988 @ bool8 sub_808F988(struct npc_state *fieldObject, struct obj *object) sub_808F988: @ 808F988 diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 24f48db40..9fd533f60 100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -2051,3 +2051,5 @@ u8 sub_808F8BC(struct MapObject *mapObject, u8 movementType) } return gUnknown_0850D714[movementType](dx, dy, absdx, absdy); } + +field_object_step(LookRandomDirections, gUnknown_0850D740) |