summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_actor.c8
-rw-r--r--src/code/z_draw.c4
-rw-r--r--src/code/z_effect_soft_sprite_old_init.c2
-rw-r--r--src/code/z_en_hy_code.c6
-rw-r--r--src/code/z_en_item00.c12
-rw-r--r--src/code/z_play.c24
-rw-r--r--src/code/z_player_lib.c6
-rw-r--r--src/code/z_scene.c157
-rw-r--r--src/code/z_sub_s.c2
9 files changed, 117 insertions, 104 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 10f782e25..7c741ae85 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -1096,7 +1096,7 @@ void Actor_SetScale(Actor* actor, f32 scale) {
}
void Actor_SetObjectDependency(PlayState* play, Actor* actor) {
- gSegments[0x06] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[actor->objBankIndex].segment);
+ gSegments[0x06] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[actor->objBankIndex].segment);
}
void Actor_Init(Actor* actor, PlayState* play) {
@@ -2700,8 +2700,8 @@ void Actor_Draw(PlayState* play, Actor* actor) {
Matrix_Scale(actor->scale.x, actor->scale.y, actor->scale.z, MTXMODE_APPLY);
Actor_SetObjectDependency(play, actor);
- gSPSegment(POLY_OPA_DISP++, 0x06, play->objectCtx.status[actor->objBankIndex].segment);
- gSPSegment(POLY_XLU_DISP++, 0x06, play->objectCtx.status[actor->objBankIndex].segment);
+ gSPSegment(POLY_OPA_DISP++, 0x06, play->objectCtx.slots[actor->objBankIndex].segment);
+ gSPSegment(POLY_XLU_DISP++, 0x06, play->objectCtx.slots[actor->objBankIndex].segment);
if (actor->colorFilterTimer != 0) {
s32 colorFlag = COLORFILTER_GET_COLORFLAG(actor->colorFilterParams);
@@ -3299,7 +3299,7 @@ Actor* Actor_SpawnAsChildAndCutscene(ActorContext* actorCtx, PlayState* play, s1
return NULL;
}
- objBankIndex = Object_GetIndex(&play->objectCtx, actorInit->objectId);
+ objBankIndex = Object_GetSlot(&play->objectCtx, actorInit->objectId);
if ((objBankIndex < 0) || ((actorInit->type == ACTORCAT_ENEMY) && Flags_GetClear(play, play->roomCtx.curRoom.num) &&
(actorInit->id != ACTOR_BOSS_05))) {
Actor_FreeOverlay(&gActorOverlayTable[index]);
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index 2a56e0ba5..3f1d1dc47 100644
--- a/src/code/z_draw.c
+++ b/src/code/z_draw.c
@@ -827,9 +827,9 @@ void GetItem_DrawRemains(PlayState* play, s16 drawId) {
OPEN_DISPS(play->state.gfxCtx);
- objectIndex = Object_GetIndex(&play->objectCtx, OBJECT_BSMASK);
+ objectIndex = Object_GetSlot(&play->objectCtx, OBJECT_BSMASK);
- gSPSegment(POLY_OPA_DISP++, 0x06, play->objectCtx.status[objectIndex].segment);
+ gSPSegment(POLY_OPA_DISP++, 0x06, play->objectCtx.slots[objectIndex].segment);
Gfx_SetupDL25_Opa(play->state.gfxCtx);
Matrix_Scale(0.02f, 0.02f, 0.02f, MTXMODE_APPLY);
diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c
index 63b6861a7..d71a18674 100644
--- a/src/code/z_effect_soft_sprite_old_init.c
+++ b/src/code/z_effect_soft_sprite_old_init.c
@@ -41,7 +41,7 @@ void EffectSs_DrawGEffect(PlayState* play, EffectSs* this, TexturePtr texture) {
MtxF mfTrans11DA0;
s32 pad1;
Mtx* mtx;
- void* object = play->objectCtx.status[this->rgObjBankIndex].segment;
+ void* object = play->objectCtx.slots[this->rgObjBankIndex].segment;
OPEN_DISPS(gfxCtx);
diff --git a/src/code/z_en_hy_code.c b/src/code/z_en_hy_code.c
index e2f31c404..d64308bff 100644
--- a/src/code/z_en_hy_code.c
+++ b/src/code/z_en_hy_code.c
@@ -133,7 +133,7 @@ EnDoor* EnHy_FindNearestDoor(Actor* actor, PlayState* play) {
}
void EnHy_ChangeObjectAndAnim(EnHy* enHy, PlayState* play, s16 animIndex) {
- gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[enHy->animObjIndex].segment);
+ gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[enHy->animObjIndex].segment);
EnHy_ChangeAnim(&enHy->skelAnime, animIndex);
}
@@ -141,7 +141,7 @@ s32 EnHy_UpdateSkelAnime(EnHy* enHy, PlayState* play) {
s32 isUpdated = false;
if (enHy->actor.draw != NULL) {
- gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[enHy->animObjIndex].segment);
+ gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[enHy->animObjIndex].segment);
SkelAnime_Update(&enHy->skelAnime);
isUpdated = true;
}
@@ -168,7 +168,7 @@ s32 EnHy_Init(EnHy* enHy, PlayState* play, FlexSkeletonHeader* skeletonHeaderSeg
enHy->actor.objBankIndex = enHy->skelLowerObjIndex;
isInitialized = true;
ActorShape_Init(&enHy->actor.shape, 0.0f, NULL, 0.0f);
- gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[enHy->actor.objBankIndex].segment);
+ gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[enHy->actor.objBankIndex].segment);
SkelAnime_InitFlex(play, &enHy->skelAnime, skeletonHeaderSeg, NULL, enHy->jointTable, enHy->morphTable,
ENHY_LIMB_MAX);
EnHy_ChangeObjectAndAnim(enHy, play, animIndex);
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index f9f5df5a8..c6b52e476 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -184,17 +184,17 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
break;
case ITEM00_SHIELD_HERO:
- thisx->objBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_GI_SHIELD_2);
+ thisx->objBankIndex = Object_GetSlot(&play->objectCtx, OBJECT_GI_SHIELD_2);
EnItem00_SetObject(this, play, &shadowOffset, &shadowScale);
break;
case ITEM00_MAP:
- thisx->objBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_GI_MAP);
+ thisx->objBankIndex = Object_GetSlot(&play->objectCtx, OBJECT_GI_MAP);
EnItem00_SetObject(this, play, &shadowOffset, &shadowScale);
break;
case ITEM00_COMPASS:
- thisx->objBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_GI_COMPASS);
+ thisx->objBankIndex = Object_GetSlot(&play->objectCtx, OBJECT_GI_COMPASS);
EnItem00_SetObject(this, play, &shadowOffset, &shadowScale);
break;
@@ -317,7 +317,7 @@ void EnItem00_Destroy(Actor* thisx, PlayState* play) {
}
void EnItem00_WaitForHeartObject(EnItem00* this, PlayState* play) {
- s32 objBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_GI_HEARTS);
+ s32 objBankIndex = Object_GetSlot(&play->objectCtx, OBJECT_GI_HEARTS);
if (Object_IsLoaded(&play->objectCtx, objBankIndex)) {
this->actor.objBankIndex = objBankIndex;
@@ -725,7 +725,7 @@ void EnItem00_Draw(Actor* thisx, PlayState* play) {
case ITEM00_RECOVERY_HEART:
if (this->unk152 < 0) {
if (this->unk152 == -1) {
- s8 bankIndex = Object_GetIndex(&play->objectCtx, OBJECT_GI_HEART);
+ s8 bankIndex = Object_GetSlot(&play->objectCtx, OBJECT_GI_HEART);
if (Object_IsLoaded(&play->objectCtx, bankIndex)) {
this->actor.objBankIndex = bankIndex;
@@ -852,7 +852,7 @@ void EnItem00_DrawSprite(EnItem00* this, PlayState* play) {
void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play) {
s32 pad[2];
- if (Object_GetIndex(&play->objectCtx, OBJECT_GI_HEARTS) == this->actor.objBankIndex) {
+ if (Object_GetSlot(&play->objectCtx, OBJECT_GI_HEARTS) == this->actor.objBankIndex) {
OPEN_DISPS(play->state.gfxCtx);
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 9a5e6541d..f71cf0c0d 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -921,8 +921,8 @@ void Play_UpdateMain(PlayState* this) {
u8 freezeFlashTimer;
s32 sp5C = false;
- gSegments[4] = VIRTUAL_TO_PHYSICAL(this->objectCtx.status[this->objectCtx.mainKeepIndex].segment);
- gSegments[5] = VIRTUAL_TO_PHYSICAL(this->objectCtx.status[this->objectCtx.subKeepIndex].segment);
+ gSegments[4] = VIRTUAL_TO_PHYSICAL(this->objectCtx.slots[this->objectCtx.mainKeepSlot].segment);
+ gSegments[5] = VIRTUAL_TO_PHYSICAL(this->objectCtx.slots[this->objectCtx.subKeepSlot].segment);
gSegments[2] = VIRTUAL_TO_PHYSICAL(this->sceneSegment);
if (R_PICTO_PHOTO_STATE == PICTO_PHOTO_STATE_PROCESS) {
@@ -972,7 +972,7 @@ void Play_UpdateMain(PlayState* this) {
sp5C = (this->pauseCtx.state != 0) || (this->pauseCtx.debugEditor != DEBUG_EDITOR_NONE);
AnimationContext_Reset(&this->animationCtx);
- Object_UpdateBank(&this->objectCtx);
+ Object_UpdateEntries(&this->objectCtx);
if (!sp5C && (IREG(72) == 0)) {
this->gameplayFrames++;
@@ -1153,17 +1153,17 @@ void Play_DrawMain(PlayState* this) {
OPEN_DISPS(gfxCtx);
- gSegments[4] = VIRTUAL_TO_PHYSICAL(this->objectCtx.status[this->objectCtx.mainKeepIndex].segment);
- gSegments[5] = VIRTUAL_TO_PHYSICAL(this->objectCtx.status[this->objectCtx.subKeepIndex].segment);
+ gSegments[4] = VIRTUAL_TO_PHYSICAL(this->objectCtx.slots[this->objectCtx.mainKeepSlot].segment);
+ gSegments[5] = VIRTUAL_TO_PHYSICAL(this->objectCtx.slots[this->objectCtx.subKeepSlot].segment);
gSegments[2] = VIRTUAL_TO_PHYSICAL(this->sceneSegment);
- gSPSegment(POLY_OPA_DISP++, 0x04, this->objectCtx.status[this->objectCtx.mainKeepIndex].segment);
- gSPSegment(POLY_XLU_DISP++, 0x04, this->objectCtx.status[this->objectCtx.mainKeepIndex].segment);
- gSPSegment(OVERLAY_DISP++, 0x04, this->objectCtx.status[this->objectCtx.mainKeepIndex].segment);
+ gSPSegment(POLY_OPA_DISP++, 0x04, this->objectCtx.slots[this->objectCtx.mainKeepSlot].segment);
+ gSPSegment(POLY_XLU_DISP++, 0x04, this->objectCtx.slots[this->objectCtx.mainKeepSlot].segment);
+ gSPSegment(OVERLAY_DISP++, 0x04, this->objectCtx.slots[this->objectCtx.mainKeepSlot].segment);
- gSPSegment(POLY_OPA_DISP++, 0x05, this->objectCtx.status[this->objectCtx.subKeepIndex].segment);
- gSPSegment(POLY_XLU_DISP++, 0x05, this->objectCtx.status[this->objectCtx.subKeepIndex].segment);
- gSPSegment(OVERLAY_DISP++, 0x05, this->objectCtx.status[this->objectCtx.subKeepIndex].segment);
+ gSPSegment(POLY_OPA_DISP++, 0x05, this->objectCtx.slots[this->objectCtx.subKeepSlot].segment);
+ gSPSegment(POLY_XLU_DISP++, 0x05, this->objectCtx.slots[this->objectCtx.subKeepSlot].segment);
+ gSPSegment(OVERLAY_DISP++, 0x05, this->objectCtx.slots[this->objectCtx.subKeepSlot].segment);
gSPSegment(POLY_OPA_DISP++, 0x02, this->sceneSegment);
gSPSegment(POLY_XLU_DISP++, 0x02, this->sceneSegment);
@@ -1585,7 +1585,7 @@ void Play_InitScene(PlayState* this, s32 spawn) {
this->sceneMaterialAnims = NULL;
this->roomCtx.unk74 = NULL;
this->numSetupActors = 0;
- Object_InitBank(&this->state, &this->objectCtx);
+ Object_InitContext(&this->state, &this->objectCtx);
LightContext_Init(this, &this->lightCtx);
Door_InitContext(&this->state, &this->doorCtx);
Room_Init(this, &this->roomCtx);
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 24b55cfea..f288b31de 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -396,9 +396,9 @@ void func_8012301C(Actor* thisx, PlayState* play2) {
gActorOverlayTable[ACTOR_PLAYER].initInfo->objectId = objectId;
func_8012F73C(&play->objectCtx, this->actor.objBankIndex, objectId);
- this->actor.objBankIndex = Object_GetIndex(&play->objectCtx, GAMEPLAY_KEEP);
+ this->actor.objBankIndex = Object_GetSlot(&play->objectCtx, GAMEPLAY_KEEP);
} else if (this->actionVar1 >= 3) {
- s32 objBankIndex = Object_GetIndex(&play->objectCtx, gActorOverlayTable[ACTOR_PLAYER].initInfo->objectId);
+ s32 objBankIndex = Object_GetSlot(&play->objectCtx, gActorOverlayTable[ACTOR_PLAYER].initInfo->objectId);
if (Object_IsLoaded(&play->objectCtx, objBankIndex)) {
this->actor.objBankIndex = objBankIndex;
@@ -1869,7 +1869,7 @@ void Player_DrawHookshotReticle(PlayState* play, Player* player, f32 hookshotDis
gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPSegment(OVERLAY_DISP++, 0x06, play->objectCtx.status[player->actor.objBankIndex].segment);
+ gSPSegment(OVERLAY_DISP++, 0x06, play->objectCtx.slots[player->actor.objBankIndex].segment);
gSPDisplayList(OVERLAY_DISP++, gHookshotReticleDL);
CLOSE_DISPS(play->state.gfxCtx);
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
index 811853f07..d26156d58 100644
--- a/src/code/z_scene.c
+++ b/src/code/z_scene.c
@@ -1,28 +1,41 @@
#include "global.h"
-s32 Object_Spawn(ObjectContext* objectCtx, s16 id) {
+/**
+ * Spawn an object file of a specified ID that will persist through room changes.
+ *
+ * This waits for the file to be fully loaded, the data is available when the function returns.
+ *
+ * @return The new object slot corresponding to the requested object ID.
+ *
+ * @note This function is not meant to be called externally to spawn object files on the fly.
+ * When an object is spawned with this function, all objects that come before it in the entry list will be treated as
+ * persistent, which will likely cause either the amount of free slots or object space memory to run out.
+ * This function is only meant to be called internally on scene load, before the object list from any room is processed.
+ */
+s32 Object_SpawnPersistent(ObjectContext* objectCtx, s16 id) {
size_t size;
- objectCtx->status[objectCtx->num].id = id;
+ objectCtx->slots[objectCtx->numEntries].id = id;
size = gObjectTable[id].vromEnd - gObjectTable[id].vromStart;
if (1) {}
if (size != 0) {
- DmaMgr_SendRequest0(objectCtx->status[objectCtx->num].segment, gObjectTable[id].vromStart, size);
+ DmaMgr_SendRequest0(objectCtx->slots[objectCtx->numEntries].segment, gObjectTable[id].vromStart, size);
}
- if (objectCtx->num < OBJECT_EXCHANGE_BANK_MAX - 1) {
- objectCtx->status[objectCtx->num + 1].segment = ALIGN16((u32)objectCtx->status[objectCtx->num].segment + size);
+ if (objectCtx->numEntries < ARRAY_COUNT(objectCtx->slots) - 1) {
+ objectCtx->slots[objectCtx->numEntries + 1].segment =
+ ALIGN16((u32)objectCtx->slots[objectCtx->numEntries].segment + size);
}
- objectCtx->num++;
- objectCtx->spawnedObjectCount = objectCtx->num;
+ objectCtx->numEntries++;
+ objectCtx->numPersistentEntries = objectCtx->numEntries;
- return objectCtx->num - 1;
+ return objectCtx->numEntries - 1;
}
-void Object_InitBank(GameState* gameState, ObjectContext* objectCtx) {
+void Object_InitContext(GameState* gameState, ObjectContext* objectCtx) {
PlayState* play = (PlayState*)gameState;
s32 pad;
u32 spaceSize;
@@ -30,66 +43,66 @@ void Object_InitBank(GameState* gameState, ObjectContext* objectCtx) {
if (play->sceneId == SCENE_CLOCKTOWER || play->sceneId == SCENE_TOWN || play->sceneId == SCENE_BACKTOWN ||
play->sceneId == SCENE_ICHIBA) {
- spaceSize = OBJECT_SPACE_SIZE_CLOCK_TOWN;
+ spaceSize = 1530 * 1024;
} else if (play->sceneId == SCENE_MILK_BAR) {
- spaceSize = OBJECT_SPACE_SIZE_MILK_BAR;
+ spaceSize = 1580 * 1024;
} else if (play->sceneId == SCENE_00KEIKOKU) {
- spaceSize = OBJECT_SPACE_SIZE_TERMINA_FIELD;
+ spaceSize = 1470 * 1024;
} else {
- spaceSize = OBJECT_SPACE_SIZE_DEFAULT;
+ spaceSize = 1380 * 1024;
}
- objectCtx->num = 0;
- objectCtx->spawnedObjectCount = 0;
- objectCtx->mainKeepIndex = 0;
- objectCtx->subKeepIndex = 0;
+ objectCtx->numEntries = 0;
+ objectCtx->numPersistentEntries = 0;
+ objectCtx->mainKeepSlot = 0;
+ objectCtx->subKeepSlot = 0;
// clang-format off
- for (i = 0; i < OBJECT_EXCHANGE_BANK_MAX; i++) { objectCtx->status[i].id = 0; }
+ for (i = 0; i < ARRAY_COUNT(objectCtx->slots); i++) { objectCtx->slots[i].id = 0; }
// clang-format on
- objectCtx->spaceStart = objectCtx->status[0].segment = THA_AllocTailAlign16(&gameState->tha, spaceSize);
+ objectCtx->spaceStart = objectCtx->slots[0].segment = THA_AllocTailAlign16(&gameState->tha, spaceSize);
objectCtx->spaceEnd = (void*)((u32)objectCtx->spaceStart + spaceSize);
- objectCtx->mainKeepIndex = Object_Spawn(objectCtx, GAMEPLAY_KEEP);
+ objectCtx->mainKeepSlot = Object_SpawnPersistent(objectCtx, GAMEPLAY_KEEP);
- gSegments[0x04] = VIRTUAL_TO_PHYSICAL(objectCtx->status[objectCtx->mainKeepIndex].segment);
+ gSegments[4] = VIRTUAL_TO_PHYSICAL(objectCtx->slots[objectCtx->mainKeepSlot].segment);
}
-void Object_UpdateBank(ObjectContext* objectCtx) {
+void Object_UpdateEntries(ObjectContext* objectCtx) {
s32 i;
- ObjectStatus* status = &objectCtx->status[0];
+ ObjectEntry* entry = &objectCtx->slots[0];
RomFile* objectFile;
size_t size;
- for (i = 0; i < objectCtx->num; i++) {
- if (status->id < 0) {
- s32 id = -status->id;
+ for (i = 0; i < objectCtx->numEntries; i++) {
+ if (entry->id < 0) {
+ s32 id = -entry->id;
- if (status->dmaReq.vromAddr == 0) {
+ if (entry->dmaReq.vromAddr == 0) {
objectFile = &gObjectTable[id];
size = objectFile->vromEnd - objectFile->vromStart;
if (size == 0) {
- status->id = 0;
+ entry->id = 0;
} else {
- osCreateMesgQueue(&status->loadQueue, &status->loadMsg, 1);
- DmaMgr_SendRequestImpl(&status->dmaReq, status->segment, objectFile->vromStart, size, 0,
- &status->loadQueue, NULL);
+ osCreateMesgQueue(&entry->loadQueue, &entry->loadMsg, 1);
+ DmaMgr_SendRequestImpl(&entry->dmaReq, entry->segment, objectFile->vromStart, size, 0,
+ &entry->loadQueue, NULL);
}
- } else if (!osRecvMesg(&status->loadQueue, NULL, OS_MESG_NOBLOCK)) {
- status->id = id;
+ } else if (!osRecvMesg(&entry->loadQueue, NULL, OS_MESG_NOBLOCK)) {
+ entry->id = id;
}
}
- status++;
+ entry++;
}
}
-s32 Object_GetIndex(ObjectContext* objectCtx, s16 objectId) {
+s32 Object_GetSlot(ObjectContext* objectCtx, s16 objectId) {
s32 i;
- for (i = 0; i < objectCtx->num; i++) {
- if (ABS_ALT(objectCtx->status[i].id) == objectId) {
+ for (i = 0; i < objectCtx->numEntries; i++) {
+ if (ABS_ALT(objectCtx->slots[i].id) == objectId) {
return i;
}
}
@@ -97,8 +110,8 @@ s32 Object_GetIndex(ObjectContext* objectCtx, s16 objectId) {
return -1;
}
-s32 Object_IsLoaded(ObjectContext* objectCtx, s32 index) {
- if (objectCtx->status[index].id > 0) {
+s32 Object_IsLoaded(ObjectContext* objectCtx, s32 slot) {
+ if (objectCtx->slots[slot].id > 0) {
return true;
} else {
return false;
@@ -110,31 +123,31 @@ void Object_LoadAll(ObjectContext* objectCtx) {
s32 id;
uintptr_t vromSize;
- for (i = 0; i < objectCtx->num; i++) {
- id = objectCtx->status[i].id;
+ for (i = 0; i < objectCtx->numEntries; i++) {
+ id = objectCtx->slots[i].id;
vromSize = gObjectTable[id].vromEnd - gObjectTable[id].vromStart;
if (vromSize == 0) {
continue;
}
- DmaMgr_SendRequest0(objectCtx->status[i].segment, gObjectTable[id].vromStart, vromSize);
+ DmaMgr_SendRequest0(objectCtx->slots[i].segment, gObjectTable[id].vromStart, vromSize);
}
}
-void* func_8012F73C(ObjectContext* objectCtx, s32 iParm2, s16 id) {
+void* func_8012F73C(ObjectContext* objectCtx, s32 slot, s16 id) {
u32 addr;
uintptr_t vromSize;
RomFile* fileTableEntry;
- objectCtx->status[iParm2].id = -id;
- objectCtx->status[iParm2].dmaReq.vromAddr = 0;
+ objectCtx->slots[slot].id = -id;
+ objectCtx->slots[slot].dmaReq.vromAddr = 0;
fileTableEntry = &gObjectTable[id];
vromSize = fileTableEntry->vromEnd - fileTableEntry->vromStart;
// TODO: UB to cast void to u32
- addr = ((u32)objectCtx->status[iParm2].segment) + vromSize;
+ addr = ((u32)objectCtx->slots[slot].segment) + vromSize;
addr = ALIGN16(addr);
return (void*)addr;
@@ -152,19 +165,19 @@ void Scene_CommandSpawnList(PlayState* play, SceneCmd* cmd) {
((gSaveContext.respawnFlag == 2) &&
(gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams == PLAYER_PARAMS(0xFF, PLAYER_INITMODE_TELESCOPE)))) {
// Skull Kid Object
- Object_Spawn(&play->objectCtx, OBJECT_STK);
+ Object_SpawnPersistent(&play->objectCtx, OBJECT_STK);
return;
}
- loadedCount = Object_Spawn(&play->objectCtx, OBJECT_LINK_CHILD);
- nextObject = play->objectCtx.status[play->objectCtx.num].segment;
- play->objectCtx.num = loadedCount;
- play->objectCtx.spawnedObjectCount = loadedCount;
+ loadedCount = Object_SpawnPersistent(&play->objectCtx, OBJECT_LINK_CHILD);
+ nextObject = play->objectCtx.slots[play->objectCtx.numEntries].segment;
+ play->objectCtx.numEntries = loadedCount;
+ play->objectCtx.numPersistentEntries = loadedCount;
playerObjectId = gPlayerFormObjectIndices[GET_PLAYER_FORM];
gActorOverlayTable[0].initInfo->objectId = playerObjectId;
- Object_Spawn(&play->objectCtx, playerObjectId);
+ Object_SpawnPersistent(&play->objectCtx, playerObjectId);
- play->objectCtx.status[play->objectCtx.num].segment = nextObject;
+ play->objectCtx.slots[play->objectCtx.numEntries].segment = nextObject;
}
// SceneTableEntry Header Command 0x01: Actor List
@@ -224,10 +237,10 @@ void Scene_CommandSpecialFiles(PlayState* play, SceneCmd* cmd) {
{ SEGMENT_ROM_START(elf_message_ydan), SEGMENT_ROM_END(elf_message_ydan) },
};
- if (cmd->specialFiles.subKeepIndex != 0) {
- play->objectCtx.subKeepIndex = Object_Spawn(&play->objectCtx, cmd->specialFiles.subKeepIndex);
+ if (cmd->specialFiles.subKeepId != 0) {
+ play->objectCtx.subKeepSlot = Object_SpawnPersistent(&play->objectCtx, cmd->specialFiles.subKeepId);
// TODO: Segment number enum?
- gSegments[0x05] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[play->objectCtx.subKeepIndex].segment);
+ gSegments[0x05] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[play->objectCtx.subKeepSlot].segment);
}
if (cmd->specialFiles.naviQuestHintFileId != NAVI_QUEST_HINTS_NONE) {
@@ -255,28 +268,28 @@ void Scene_CommandObjectList(PlayState* play, SceneCmd* cmd) {
s32 i;
s32 j;
s32 k;
- ObjectStatus* firstObject;
- ObjectStatus* status;
- ObjectStatus* status2;
+ ObjectEntry* firstObject;
+ ObjectEntry* entry;
+ ObjectEntry* invalidatedEntry;
s16* objectEntry;
void* nextPtr;
objectEntry = Lib_SegmentedToVirtual(cmd->objectList.segment);
k = 0;
- i = play->objectCtx.spawnedObjectCount;
- status = &play->objectCtx.status[i];
- firstObject = play->objectCtx.status;
+ i = play->objectCtx.numPersistentEntries;
+ entry = &play->objectCtx.slots[i];
+ firstObject = &play->objectCtx.slots[0];
- while (i < play->objectCtx.num) {
- if (status->id != *objectEntry) {
- status2 = &play->objectCtx.status[i];
+ while (i < play->objectCtx.numEntries) {
+ if (entry->id != *objectEntry) {
+ invalidatedEntry = &play->objectCtx.slots[i];
- for (j = i; j < play->objectCtx.num; j++) {
- status2->id = 0;
- status2++;
+ for (j = i; j < play->objectCtx.numEntries; j++) {
+ invalidatedEntry->id = 0;
+ invalidatedEntry++;
}
- play->objectCtx.num = i;
+ play->objectCtx.numEntries = i;
Actor_KillAllWithMissingObject(play, &play->actorCtx);
continue;
@@ -285,13 +298,13 @@ void Scene_CommandObjectList(PlayState* play, SceneCmd* cmd) {
i++;
k++;
objectEntry++;
- status++;
+ entry++;
}
while (k < cmd->objectList.num) {
nextPtr = func_8012F73C(&play->objectCtx, i, *objectEntry);
- if (i < OBJECT_EXCHANGE_BANK_MAX - 1) {
+ if (i < ARRAY_COUNT(play->objectCtx.slots) - 1) {
firstObject[i + 1].segment = nextPtr;
}
@@ -300,7 +313,7 @@ void Scene_CommandObjectList(PlayState* play, SceneCmd* cmd) {
objectEntry++;
}
- play->objectCtx.num = i;
+ play->objectCtx.numEntries = i;
}
// SceneTableEntry Header Command 0x0C: Light List
diff --git a/src/code/z_sub_s.c b/src/code/z_sub_s.c
index 4baff41ce..3dc02ba7d 100644
--- a/src/code/z_sub_s.c
+++ b/src/code/z_sub_s.c
@@ -1174,7 +1174,7 @@ s8 SubS_IsObjectLoaded(s8 index, PlayState* play) {
}
s8 SubS_GetObjectIndex(s16 id, PlayState* play) {
- return Object_GetIndex(&play->objectCtx, id);
+ return Object_GetSlot(&play->objectCtx, id);
}
/**
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 09:46:15 +0000