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

Merge pull request #340 from GriffinRichards/doc-inconnect

Browse Source 
Label in_connection's field in ObjectEventTemplate
This commit is contained in:
PikalaxALT
2020-05-27 07:53:11 -04:00
committed by GitHub
parent 1648d6c66b 7b18204a90
commit e3769a2ee9
6 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_movement.c
+2 -2
View File
@@ -1335,7 +1335,7 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
s16 y2;
s16 elevation2;
if(template->unk2 == 0xFF)
if(template->inConnection == 0xFF)
{
var = 1;
mapNum = template2->trainerType;
@@ -1904,7 +1904,7 @@ int SpawnSpecialObjectEventParameterized(u8 graphicsId, u8 movementBehavior, u8
y -= 7;
objectEventTemplate.localId = localId;
objectEventTemplate.graphicsId = graphicsId;
objectEventTemplate.unk2 = 0;
objectEventTemplate.inConnection = 0;
objectEventTemplate.x = x;
objectEventTemplate.y = y;
objectEventTemplate.elevation = z;