diff options
| author | Rozelette <Rozelette@users.noreply.github.com> | 2020-08-07 17:12:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 18:12:03 -0400 |
| commit | 125b16cb17717ab0e535b5c91c02007eab1db515 (patch) | |
| tree | 514e834a2167b5fc37e50ba9381763511a0ec0ce /src/code | |
| parent | 12e258561e296a5800cea26ad2527e95f70b1305 (diff) | |
Add object enum (#9)
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_scene.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 4beed7366..b6f5233f4 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -162,13 +162,11 @@ void Scene_HeaderCommand00(GlobalContext* ctxt, SceneCmd* entry) { if ( (ctxt->linkActorEntry->params & 0x0F00) >> 8 == 0x0C || (gSaveContext.extra.unk10 == 0x02 && gSaveContext.extra.unk42 == 0x0CFF) ) { - // TODO: 0x192 is an object enum - Scene_LoadObject(&ctxt->sceneContext, 0x192); + Scene_LoadObject(&ctxt->sceneContext, OBJECT_STK); return; } - // TODO: 0x11 is an object enum - loadedCount = Scene_LoadObject(&ctxt->sceneContext, 0x11); + loadedCount = Scene_LoadObject(&ctxt->sceneContext, OBJECT_LINK_CHILD); objectVramAddr = global->sceneContext.objects[global->sceneContext.objectCount].vramAddr; ctxt->sceneContext.objectCount = loadedCount; ctxt->sceneContext.spawnedObjectCount = loadedCount; |