ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

GetFieldObjectMovingCameraOffset

Browse Source
This commit is contained in:
PikalaxALT 2017-09-16 22:23:48 -04:00
parent 812ad017e8
commit eb41c57ecd
2 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
asm/field_map_obj.s
View File

@ -5,46 +5,6 @@
.text
thumb_func_start GetFieldObjectMovingCameraOffset
@ void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
GetFieldObjectMovingCameraOffset: @ 809312C
push {lr}
adds r2, r0, 0
movs r0, 0
strh r0, [r2]
strh r0, [r1]
ldr r3, =gUnknown_03005DD0
ldr r0, [r3, 0x10]
cmp r0, 0
ble _08093142
movs r0, 0x1
strh r0, [r2]
_08093142:
ldr r0, [r3, 0x10]
cmp r0, 0
bge _0809314E
ldrh r0, [r2]
subs r0, 0x1
strh r0, [r2]
_0809314E:
ldr r2, [r3, 0x14]
cmp r2, 0
ble _0809315A
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
_0809315A:
cmp r2, 0
bge _08093164
ldrh r0, [r1]
subs r0, 0x1
strh r0, [r1]
_08093164:
pop {r0}
bx r0
.pool
thumb_func_end GetFieldObjectMovingCameraOffset
thumb_func_start FieldObjectMoveDestCoords
@ void FieldObjectMoveDestCoords(struct npc_state *fieldObject, u8 direction)
FieldObjectMoveDestCoords: @ 809316C

22
src/field_map_obj.c
View File

@ -3870,6 +3870,28 @@ void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy)
*y += dy;
}
void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
{
*x = 0;
*y = 0;
if (gUnknown_03005DD0.x > 0)
{
(*x) ++;
}
if (gUnknown_03005DD0.x < 0)
{
(*x) --;
}
if (gUnknown_03005DD0.y > 0)
{
(*y) ++;
}
if (gUnknown_03005DD0.y < 0)
{
(*y) --;
}
}
asm(".section .text.get_face_direction_anim_id");
void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);