diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-08 21:25:20 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-08 21:25:20 -0400 |
| commit | 43c3b9fdff01c05860969d80fbc6ae0b0dbbcb90 (patch) | |
| tree | bcc40f74dfbf9fbdf2a02d52606bf111e6e5bb69 | |
| parent | b639ca3b15bea19d7115d7ad619a1e6140015740 (diff) | |
unref_sub_808EAC4
| -rw-r--r-- | asm/field_map_obj.s | 20 | ||||
| -rw-r--r-- | src/field_map_obj.c | 8 |
2 files changed, 8 insertions, 20 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 2bf3ce572..57ea7af2e 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -5,26 +5,6 @@ .text - thumb_func_start sub_808EAC4 -sub_808EAC4: @ 808EAC4 - push {r4,lr} - ldrh r3, [r0, 0x10] - strh r3, [r0, 0x14] - ldrh r4, [r0, 0x12] - strh r4, [r0, 0x16] - lsls r1, 16 - asrs r1, 16 - adds r1, r3 - strh r1, [r0, 0x10] - lsls r2, 16 - asrs r2, 16 - adds r2, r4 - strh r2, [r0, 0x12] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_808EAC4 - thumb_func_start npc_coords_shift @ void npc_coords_shift(struct npc_state *fieldObject, u16 x, u16 y) npc_coords_shift: @ 808EAE4 diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 8042348f2..e5025fccf 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -1217,3 +1217,11 @@ static void sub_808EAB0(u16 tag, u8 slot) { pal_patch_for_npc(tag, slot); } + +void unref_sub_808EAC4(struct MapObject *mapObject, s16 x, s16 y) +{ + mapObject->coords3.x = mapObject->coords2.x; + mapObject->coords3.y = mapObject->coords2.y; + mapObject->coords2.x = x + mapObject->coords3.x; + mapObject->coords2.y = y + mapObject->coords3.y; +} |