mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-11 03:39:59 +00:00
57ce0cf8d9
* `Object_InitBank` -> `Object_InitContext` * Add and use `OBJECT_SPACE_SIZE_BASE` * Remove `OBJECT_EXCHANGE_BANK_MAX` -> use `ARRAY_COUNT()` instead * "object status" -> "object load entry" * Misc. cleanup/renames * Partial docs and way too much batch renaming and cleanup for a single commit * ctrl shift h * format * format clang-11.1 * fix regressions * Improve a `@bug` comment * Move `OBJECT_SPACE_SIZE_BASE` from header to near `Object_InitContext` * "objectID" -> "objectId" * Revert iterator index to `i` in `Actor_KillActorsWithUnloadedObject` * "object load entry index" -> "object entry" * `Object_UpdateLoadEntries` -> `Object_UpdateEntries` * Run format.sh * "object entry" -> "object slot" (except internal usage) * Proper `Object_SpawnPersistent` doc Co-authored-by: fig02 <fig02srl@gmail.com> * fixup one comment "object bank index" -> "object slot" * Amend `Object_SpawnPersistent` comment to mention running out of free slots * `Actor_KillActorsWithUnloadedObject` -> `Actor_KillAllWithMissingObject` * Remove useless mention of what uses `Object_SpawnPersistent` * Fix mistake on `Object_SpawnPersistent` doing sync dma, not async * run formatter * `Object_InitContext` -> `Object_Init` * `waitObjectSlot` -> `requiredObjectSlot` * `Object_Init` -> `func_80097DD8` * one objectIndex -> objectSlot * Remove `OBJECT_SPACE_SIZE_BASE` * light fix on the merge (rm OBJECT_EXCHANGE_BANK_MAX) * `func_80097DD8` -> `Object_InitContext` --------- Co-authored-by: fig02 <fig02srl@gmail.com>
38 lines
1.1 KiB
C
38 lines
1.1 KiB
C
#ifndef Z64OBJECT_H
|
|
#define Z64OBJECT_H
|
|
|
|
#include "ultra64.h"
|
|
#include "z64dma.h"
|
|
|
|
typedef struct {
|
|
/* 0x00 */ s16 id;
|
|
/* 0x04 */ void* segment;
|
|
/* 0x08 */ DmaRequest dmaRequest;
|
|
/* 0x28 */ OSMesgQueue loadQueue;
|
|
/* 0x40 */ OSMesg loadMsg;
|
|
} ObjectEntry; // size = 0x44
|
|
|
|
typedef struct {
|
|
/* 0x0000 */ void* spaceStart;
|
|
/* 0x0004 */ void* spaceEnd; // original name: "endSegment"
|
|
/* 0x0008 */ u8 numEntries; // total amount of used entries
|
|
/* 0x0009 */ u8 numPersistentEntries; // amount of entries that won't be reused when loading a new object list (when loading a new room)
|
|
/* 0x000A */ u8 mainKeepSlot; // "gameplay_keep" slot
|
|
/* 0x000B */ u8 subKeepSlot; // "gameplay_field_keep" or "gameplay_dangeon_keep" slot
|
|
/* 0x000C */ ObjectEntry slots[19];
|
|
} ObjectContext; // size = 0x518
|
|
|
|
#define DEFINE_OBJECT(_0, enum) enum,
|
|
#define DEFINE_OBJECT_NULL(_0, enum) enum,
|
|
#define DEFINE_OBJECT_UNSET(enum) enum,
|
|
|
|
typedef enum {
|
|
#include "tables/object_table.h"
|
|
/* 0x0192 */ OBJECT_ID_MAX
|
|
} ObjectId;
|
|
|
|
#undef DEFINE_OBJECT
|
|
#undef DEFINE_OBJECT_NULL
|
|
#undef DEFINE_OBJECT_UNSET
|
|
|
|
#endif
|