diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2026-09-23 20:46:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-23 20:46:36 -0700 |
| commit | ca6d0c227e133614c0da131b02f488abf1521127 (patch) | |
| tree | f0a15c46e2273babc26ae435aedaea40b6e11fef /src/code | |
| parent | a0436bd1976ed6583995b78c6d5d55df40772647 (diff) | |
OBJECT_UNSET_0 -> OBJECT_INVALID (#1908)
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_scene.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 921031bf0..1d568720a 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -59,7 +59,7 @@ void Object_InitContext(GameState* gameState, ObjectContext* objectCtx) { objectCtx->subKeepSlot = 0; // clang-format off - for (i = 0; i < ARRAY_COUNT(objectCtx->slots); i++) { objectCtx->slots[i].id = 0; } + for (i = 0; i < ARRAY_COUNT(objectCtx->slots); i++) { objectCtx->slots[i].id = OBJECT_INVALID; } // clang-format on objectCtx->spaceStart = objectCtx->slots[0].segment = THA_AllocTailAlign16(&gameState->tha, spaceSize); @@ -84,7 +84,7 @@ void Object_UpdateEntries(ObjectContext* objectCtx) { size = objectFile->vromEnd - objectFile->vromStart; if (size == 0) { - entry->id = 0; + entry->id = OBJECT_INVALID; } else { osCreateMesgQueue(&entry->loadQueue, &entry->loadMsg, 1); DmaMgr_RequestAsync(&entry->dmaReq, entry->segment, objectFile->vromStart, size, 0, @@ -238,7 +238,7 @@ void Scene_CommandSpecialFiles(PlayState* play, SceneCmd* cmd) { ROM_FILE(elf_message_ydan), }; - if (cmd->specialFiles.subKeepId != 0) { + if (cmd->specialFiles.subKeepId != OBJECT_INVALID) { play->objectCtx.subKeepSlot = Object_SpawnPersistent(&play->objectCtx, cmd->specialFiles.subKeepId); // TODO: Segment number enum? gSegments[0x05] = OS_K0_TO_PHYSICAL(play->objectCtx.slots[play->objectCtx.subKeepSlot].segment); @@ -286,7 +286,7 @@ void Scene_CommandObjectList(PlayState* play, SceneCmd* cmd) { invalidatedEntry = &play->objectCtx.slots[i]; for (j = i; j < play->objectCtx.numEntries; j++) { - invalidatedEntry->id = 0; + invalidatedEntry->id = OBJECT_INVALID; invalidatedEntry++; } |