summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-09-17 08:05:33 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-09-17 08:05:33 -0400
commit0582b5cb909298b49e7f0588c042fb20a951be44 (patch)
tree7935357d9692f4f573c3213bc292ca843f6321f3 /asm
parent7c8991842f10cce925a5b3a23f3887a0bb41ecb5 (diff)
npc_obj_ministep_stop_on_arrival
Diffstat (limited to 'asm')
-rwxr-xr-xasm/field_map_obj.s33
1 files changed, 0 insertions, 33 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 7aa32c862..25ec2cc28 100755
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,39 +5,6 @@
.text
- 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
- push {r4,r5,lr}
- adds r4, r0, 0
- adds r5, r1, 0
- adds r0, r5, 0
- bl obj_npc_ministep
- lsls r0, 24
- cmp r0, 0
- bne _08093ACE
- movs r0, 0
- b _08093AEA
-_08093ACE:
- adds r0, r4, 0
- bl npc_coords_shift_still
- ldrb r0, [r4]
- movs r1, 0x8
- orrs r0, r1
- strb r0, [r4]
- adds r2, r5, 0
- adds r2, 0x2C
- ldrb r0, [r2]
- movs r1, 0x40
- orrs r0, r1
- strb r0, [r2]
- movs r0, 0x1
-_08093AEA:
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end npc_obj_ministep_stop_on_arrival
-
thumb_func_start sub_8093AF0
@ void sub_8093AF0(struct npc_state *fieldObject, struct obj *object, u8 direction)
sub_8093AF0: @ 8093AF0