dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final pass at unifying on object event

Browse Source
This commit is contained in:
garak
2019-12-17 20:16:40 -05:00
parent ddaa88390e
commit fabe354c01
11 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/event_object_movement.h
+3 -3
View File
@@ -88,11 +88,11 @@ void sub_805FE7C(struct ObjectEvent *, u8);
void SetTrainerMovementType(struct ObjectEvent *, u8);
u8 sub_80634F0(u8 direction);
u8 sub_8063500(u8 a0);
void ObjectEventSetGraphicsId(struct ObjectEvent *mapObject, u8 a1);
void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 a1);
u8 sub_805EB44(u8, u8, s16, s16);
void npc_paltag_set_load(u8 mode);
bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *mapObject);
u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *mapObject);
bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent);
u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent);
u8 sub_8063F84(u8 direction);
u8 GetTrainerFacingDirectionMovementType(u8 direction);
void CameraObjectSetFollowedObjectId(u8 spriteId);
include/global.fieldmap.h
+1 -1
View File
@@ -288,7 +288,7 @@ struct PlayerAvatar /* 0x202E858 */
/*0x02*/ u8 running2;
/*0x03*/ u8 running1;
/*0x04*/ u8 spriteId;
/*0x05*/ u8 mapObjectId;
/*0x05*/ u8 objectEventId;
/*0x06*/ u8 unk6;
/*0x07*/ u8 gender;
u8 acroBikeState;