atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1039 from GriffinRichards/doc-inconnect

Browse source 
Label in_connection's field in ObjectEventTemplate
This commit is contained in:
Sierra A 2020-05-18 16:32:55 -07:00 committed by GitHub
commit ab6bbd7ef0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/global.fieldmap.h
View file

@ -54,7 +54,7 @@ struct ObjectEventTemplate
{
/*0x00*/ u8 localId;
/*0x01*/ u8 graphicsId;
/*0x02*/ u8 unk2;
/*0x02*/ u8 inConnection; // Leftover from FRLG
/*0x04*/ s16 x;
/*0x06*/ s16 y;
/*0x08*/ u8 elevation;

2
src/event_object_movement.c
View file

@ -1448,7 +1448,7 @@ u8 SpawnSpecialObjectEventParameterized(u8 graphicsId, u8 movementBehavior, u8 l
y -= 7;
objectEventTemplate.localId = localId;
objectEventTemplate.graphicsId = graphicsId;
objectEventTemplate.unk2 = 0;
objectEventTemplate.inConnection = 0;
objectEventTemplate.x = x;
objectEventTemplate.y = y;
objectEventTemplate.elevation = z;