ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-06 07:27:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

sub_80930E0

Browse Source
This commit is contained in:
PikalaxALT 2017-09-16 22:19:23 -04:00
parent 44e590add0
commit 812ad017e8
3 changed files with 8 additions and 41 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 .text
thumb_func_start sub_80930E0
sub_80930E0: @ 80930E0
push {r4-r6,lr}
mov r6, r8
push {r6}
adds r6, r0, 0
mov r8, r1
adds r4, r2, 0
adds r5, r3, 0
lsls r4, 16
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
movs r1, 0
ldrsh r0, [r6, r1]
mov r2, r8
movs r3, 0
ldrsh r1, [r2, r3]
adds r2, r6, 0
mov r3, r8
bl sub_8093038
lsls r4, 16
asrs r4, 16
ldrh r0, [r6]
adds r4, r0
strh r4, [r6]
lsls r5, 16
asrs r5, 16
mov r1, r8
ldrh r1, [r1]
adds r5, r1
mov r2, r8
strh r5, [r2]
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_80930E0
thumb_func_start GetFieldObjectMovingCameraOffset thumb_func_start GetFieldObjectMovingCameraOffset
@ void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y) @ void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
GetFieldObjectMovingCameraOffset: @ 809312C GetFieldObjectMovingCameraOffset: @ 809312C

2
include/field_map_obj.h
View File

@ -37,7 +37,7 @@ void pal_patch_for_npc(u16, u8);
void sub_808E16C(s16, s16); void sub_808E16C(s16, s16);
void sub_8092FF0(s16, s16, s16 *, s16 *); void sub_8092FF0(s16, s16, s16 *, s16 *);
u8 FieldObjectDirectionToImageAnimId(u8); u8 FieldObjectDirectionToImageAnimId(u8);
void sub_80930E0(s16 *, s16 *, u8, u8); void sub_80930E0(s16 *, s16 *, s16, s16);
void FieldObjectClearAnim(struct MapObject *); void FieldObjectClearAnim(struct MapObject *);
void SpawnFieldObjectsInView(s16, s16); void SpawnFieldObjectsInView(s16, s16);
u8 sprite_new(u8, u8, s16, s16, u8, u8); u8 sprite_new(u8, u8, s16, s16, u8, u8);

7
src/field_map_obj.c
View File

@ -3863,6 +3863,13 @@ void sub_8093038(s16 x, s16 y, s16 *dest_x, s16 *dest_y)
*dest_y = ((y - gSaveBlock1Ptr->pos.y) << 4) + dy; *dest_y = ((y - gSaveBlock1Ptr->pos.y) << 4) + dy;
} }
void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy)
{
sub_8093038(*x, *y, x, y);
*x += dx;
*y += dy;
}
asm(".section .text.get_face_direction_anim_id"); asm(".section .text.get_face_direction_anim_id");
void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *); void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);