ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-20 11:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

RandomlyLookNorthOrWest

Browse Source
This commit is contained in:
scnorton 2017-09-15 15:26:51 -04:00
parent bf101743c2
commit 0571056955
3 changed files with 55 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
asm/field_map_obj.s
View File

@ -5,174 +5,6 @@
.text
thumb_func_start FieldObjectCB_RandomlyLookNorthOrWest
FieldObjectCB_RandomlyLookNorthOrWest: @ 80902D0
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_RandomlyLookNorthOrWest
bl FieldObjectStep
pop {r0}
bx r0
.pool
thumb_func_end FieldObjectCB_RandomlyLookNorthOrWest
thumb_func_start FieldObjectCB2_RandomlyLookNorthOrWest
FieldObjectCB2_RandomlyLookNorthOrWest: @ 80902F4
push {r4,lr}
ldr r3, =gUnknown_0850D7DC
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_RandomlyLookNorthOrWest
thumb_func_start sub_8090314
sub_8090314: @ 8090314
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_8090314
thumb_func_start sub_8090328
sub_8090328: @ 8090328
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl GetFaceDirectionAnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
bl FieldObjectSetRegularAnim
movs r0, 0x2
strh r0, [r5, 0x30]
movs r0, 0x1
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8090328
thumb_func_start sub_8090354
sub_8090354: @ 8090354
push {r4-r7,lr}
adds r6, r0, 0
adds r7, r1, 0
bl FieldObjectExecRegularAnim
lsls r0, 24
cmp r0, 0
beq _0809038A
ldr r4, =gUnknown_0850D6EC
bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
lsls r1, 1
adds r1, r4
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
ands r0, r1
strb r0, [r6]
strh r5, [r7, 0x30]
_0809038A:
movs r0, 0
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_8090354
thumb_func_start sub_8090398
sub_8090398: @ 8090398
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _080903B6
adds r0, r4, 0
bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _080903BE
_080903B6:
movs r0, 0x4
strh r0, [r5, 0x30]
movs r0, 0x1
b _080903C0
_080903BE:
movs r0, 0
_080903C0:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8090398
thumb_func_start sub_80903C8
sub_80903C8: @ 80903C8
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
adds r5, r1, 0
ldr r1, =gUnknown_0850D7F0
mov r0, sp
movs r2, 0x2
bl memcpy
adds r0, r4, 0
movs r1, 0x3
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _080903F8
bl Random
movs r1, 0x1
ands r1, r0
mov r2, sp
adds r0, r2, r1
ldrb r1, [r0]
_080903F8:
adds r0, r4, 0
bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
pop {r4,r5}
pop {r1}
bx r1
.pool
thumb_func_end sub_80903C8
thumb_func_start FieldObjectCB_RandomlyLookNorthOrEast
FieldObjectCB_RandomlyLookNorthOrEast: @ 8090410
push {lr}

2
include/data3.h
View File

@ -18,8 +18,10 @@ extern const struct PairedPalettes gUnknown_0850BD00[15];
extern const struct PairedPalettes gUnknown_0850BD78[15];
extern const u16 *const gUnknown_0850BE38[2];
extern const s16 gUnknown_0850D6DC[4]; // {0x20, 0x40, 0x60, 0x80}
extern const s16 gUnknown_0850D6EC[4];
extern const u8 gUnknown_0850D710[4]; // {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST}
extern const u8 gUnknown_0850D770[2]; // {DIR_SOUTH, DIR_NORTH}
extern const u8 gUnknown_0850D790[2]; // {DIR_WEST, DIR_EAST}
extern const u8 gUnknown_0850D7F0[2]; // {DIR_NORTH, DIR_WEST}
#endif //POKEEMERALD_DATA3_H

53
src/field_map_obj.c
View File

@ -2486,3 +2486,56 @@ bool8 sub_8090288 (struct MapObject *mapObject, struct Sprite *sprite)
sprite->data1 = 1;
return TRUE;
}
field_object_step(RandomlyLookNorthOrWest, gUnknown_0850D7DC)
bool8 sub_8090314 (struct MapObject *mapObject, struct Sprite *sprite)
{
npc_reset(mapObject, sprite);
sprite->data1 = 1;
return TRUE;
}
bool8 sub_8090328 (struct MapObject *mapObject, struct Sprite *sprite)
{
FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
sprite->data1 = 2;
return TRUE;
}
bool8 sub_8090354 (struct MapObject *mapObject, struct Sprite *sprite)
{
if (FieldObjectExecRegularAnim(mapObject, sprite))
{
SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
mapObject->mapobj_bit_1 = FALSE;
sprite->data1 = 3;
}
return FALSE;
}
bool8 sub_8090398 (struct MapObject *mapObject, struct Sprite *sprite)
{
if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
{
sprite->data1 = 4;
return TRUE;
}
return FALSE;
}
bool8 sub_80903C8 (struct MapObject *mapObject, struct Sprite *sprite)
{
u8 directions[2];
u8 direction;
memcpy(directions, gUnknown_0850D7F0, sizeof gUnknown_0850D7F0);
direction = GetRunningPastFacingDirection(mapObject, 3);
if (direction == 0)
{
direction = directions[Random() & 0x01];
}
FieldObjectSetDirection(mapObject, direction);
sprite->data1 = 1;
return TRUE;
}