diff options
| author | Sierra A <6080951+Sierraffinity@users.noreply.github.com> | 2020-05-18 16:32:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 16:32:55 -0700 |
| commit | ab6bbd7ef042c5d9857a7d340d226434339651d2 (patch) | |
| tree | b771f632a6e4debbad31dd98ffd42f28fa715420 | |
| parent | 9601b9616822edb459d406573f5451e57f24d39f (diff) | |
| parent | 5bb688df3e798c845cfee6c117cea5d3bc6cd178 (diff) | |
Merge pull request #1039 from GriffinRichards/doc-inconnect
Label in_connection's field in ObjectEventTemplate
| -rw-r--r-- | include/global.fieldmap.h | 2 | ||||
| -rw-r--r-- | src/event_object_movement.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 837d5da00..59610f9ad 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -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; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index e166f8b95..d6a2fe2ec 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -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; |