Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PlayerObjectTurn

This commit is contained in:
scnorton 2017-09-08 13:46:21 -04:00
parent ddcce8c3bc
commit 9b98055ecc
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
asm/field_map_obj.s
View File

@ -5,23 +5,6 @@
.text
thumb_func_start sub_808E5D4
sub_808E5D4: @ 808E5D4
push {lr}
lsls r1, 24
lsrs r1, 24
ldrb r2, [r0, 0x5]
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, =gMapObjects
adds r0, r2
bl FieldObjectTurn
pop {r0}
bx r0
.pool
thumb_func_end sub_808E5D4
thumb_func_start get_berry_tree_graphics
@ void get_berry_tree_graphics(npc_state *npcState, struct obj *obj)
get_berry_tree_graphics: @ 808E5F4

2
include/field_map_obj.h
View File

@ -35,7 +35,7 @@ void sub_8093038(s16, s16, s16 *, s16 *);
void CameraObjectReset1(void);
void FieldObjectSetGraphicsId(struct MapObject *, u8);
void FieldObjectTurn(struct MapObject *, u8);
void FieldObjectTurnByLocalIdAndMap(u8, u8, u8);
void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
// Exported data declarations

5
src/field_map_obj.c
View File

@ -973,3 +973,8 @@ void FieldObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direc
FieldObjectTurn(&gMapObjects[mapObjectId], direction);
}
}
void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction)
{
FieldObjectTurn(&gMapObjects[playerAvatar->mapObjectId], direction);
}