mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-31 09:21:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add object enum (#9)

Browse Source
This commit is contained in:
Rozelette
2020-08-07 17:12:03 -05:00
committed by GitHub
parent 12e258561e
commit 125b16cb17
2 changed files with 648 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_scene.c
+2 -4
View File
@@ -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;