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

MoveFieldObjectInNextDirectionInSequence

Browse source
This commit is contained in:
PikalaxALT 2017-09-15 21:39:24 -04:00
parent 79e8235701
commit 3e9e4b13ec
2 changed files with 36 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
asm/field_map_obj.s
View file

@ -5,108 +5,6 @@
.text
thumb_func_start sub_8091048
@ bool8 sub_8091048(struct npc_state *fieldObject, struct obj *object)
sub_8091048: @ 8091048
push {r4,lr}
adds r4, r1, 0
bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8091048
thumb_func_start MoveFieldObjectInNextDirectionInSequence
@ bool8 MoveFieldObjectInNextDirectionInSequence(struct npc_state *fieldObject, struct obj *object, u8 *directions)
MoveFieldObjectInNextDirectionInSequence: @ 809105C
push {r4-r7,lr}
mov r7, r8
push {r7}
adds r4, r0, 0
mov r8, r1
adds r7, r2, 0
adds r2, r4, 0
adds r2, 0x21
ldrb r0, [r2]
cmp r0, 0x3
bne _0809107E
ldr r1, [r4, 0xC]
ldr r0, [r4, 0x10]
cmp r1, r0
bne _0809107E
movs r0, 0
strb r0, [r2]
_0809107E:
adds r5, r4, 0
adds r5, 0x21
ldrb r0, [r5]
adds r0, r7, r0
ldrb r1, [r0]
adds r0, r4, 0
bl FieldObjectSetDirection
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl GetGoSpeed0AnimId
lsls r0, 24
lsrs r6, r0, 24
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
bl npc_block_way__next_tile
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080910D8
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
ldrb r0, [r5]
adds r0, r7, r0
ldrb r1, [r0]
adds r0, r4, 0
bl FieldObjectSetDirection
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl GetGoSpeed0AnimId
lsls r0, 24
lsrs r6, r0, 24
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
bl npc_block_way__next_tile
lsls r0, 24
lsrs r0, 24
_080910D8:
cmp r0, 0
beq _080910EA
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl GetStepInPlaceDelay16AnimId
lsls r0, 24
lsrs r6, r0, 24
_080910EA:
adds r0, r4, 0
mov r1, r8
adds r2, r6, 0
bl FieldObjectSetRegularAnim
ldrb r0, [r4]
movs r1, 0x2
orrs r0, r1
strb r0, [r4]
movs r0, 0x2
mov r1, r8
strh r0, [r1, 0x30]
movs r0, 0x1
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end MoveFieldObjectInNextDirectionInSequence
thumb_func_start sub_8091110
@ bool8 sub_8091110(struct npc_state *fieldObject, struct obj *object)
sub_8091110: @ 8091110

36
src/field_map_obj.c
View file

@ -3062,3 +3062,39 @@ bool8 sub_8091020 (struct MapObject *mapObject, struct Sprite *sprite)
}
return FALSE;
}
bool8 sub_8091048(struct MapObject *mapObject, struct Sprite *sprite)
{
npc_reset(mapObject, sprite);
sprite->data1 = 1;
return TRUE;
}
bool8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, struct Sprite *sprite, u8 *route)
{
u8 blockingWay;
u8 animId;
if (mapObject->mapobj_unk_21 == 3 && mapObject->coords1.x == mapObject->coords2.x && mapObject->coords1.y == mapObject->coords2.y)
{
mapObject->mapobj_unk_21 = 0;
}
FieldObjectSetDirection(mapObject, route[mapObject->mapobj_unk_21]);
animId = GetGoSpeed0AnimId(mapObject->placeholder18);
blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18);
if (blockingWay == TRUE)
{
mapObject->mapobj_unk_21 ++;
FieldObjectSetDirection(mapObject, route[mapObject->mapobj_unk_21]);
animId = GetGoSpeed0AnimId(mapObject->placeholder18);
blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18);
}
if (blockingWay)
{
animId = GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18);
}
FieldObjectSetRegularAnim(mapObject, sprite, animId);
mapObject->mapobj_bit_1 = TRUE;
sprite->data1 = 2;
return TRUE;
}