diff options
| author | theo3 <arisstephenson2@gmail.com> | 2023-12-29 21:42:55 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2023-12-29 21:42:55 -0800 |
| commit | 37723f560798698a2a17d0b29ee7baca1a8cb1c7 (patch) | |
| tree | 65f802f7a9162b3ece97177b9aa7adc8c51d21f3 /include | |
| parent | c2f081600bca5c3f1f82d7bac8bc5827faf0d17a (diff) | |
document RoomVars struct
Diffstat (limited to 'include')
| -rw-r--r-- | include/kinstone.h | 2 | ||||
| -rw-r--r-- | include/room.h | 29 |
2 files changed, 14 insertions, 17 deletions
diff --git a/include/kinstone.h b/include/kinstone.h index c5b63874..18910ee3 100644 --- a/include/kinstone.h +++ b/include/kinstone.h @@ -197,7 +197,7 @@ typedef enum { WORLD_EVENT_TYPE_8, // set a tile type WORLD_EVENT_TYPE_9, // LoadRoomEntity and set some tile type WORLD_EVENT_TYPE_BEANSTALK, - WORLD_EVENT_TYPE_11, // LoadRoomEntity and set gRoomVars.field_0x8c + WORLD_EVENT_TYPE_11, // LoadRoomEntity and set gRoomVars.entityRails WORLD_EVENT_TYPE_12, WORLD_EVENT_TYPE_13, WORLD_EVENT_TYPE_14, diff --git a/include/room.h b/include/room.h index a23dff14..3b0ff0d2 100644 --- a/include/room.h +++ b/include/room.h @@ -60,29 +60,26 @@ typedef struct { extern RoomControls gRoomControls; typedef struct { - /* 0x00 */ u8 field_0x0; - /* 0x01 */ u8 filler_0x1; + /* 0x00 */ bool8 didEnterScrolling; + /* 0x01 */ bool8 destructableManagerLoaded; /* 0x02 */ bool8 randomDropsDisabled; - /* 0x03 */ u8 field_0x3; - /* 0x04 */ u8 field_0x4; - /* 0x05 */ u8 filler1[1]; + /* 0x03 */ bool8 remFlagUnused; + /* 0x04 */ u8 numKinstoneDrops; + /* 0x05 */ u8 numKinstoneDropsPrevFrame; /* 0x06 */ u8 shopItemType; /* 0x07 */ u8 shopItemType2; - /* 0x08 */ u8 field_0x8; + /* 0x08 */ u8 unused; /* 0x09 */ u8 fight_bgm; - /* 0x0a */ u8 unk2; - /* 0x0b */ u8 filler2; + /* 0x0a */ u8 needHealthDrop; /* 0x0c */ s16 lightLevel; - /* 0x0e */ u16 unk_0e; - /* 0x10 */ u8 unk_10[4]; - /* 0x14 */ u32 flags; - /* 0x18 */ u32 unk3; - /* 0x1c */ u8 filler4[44]; + /* 0x0e */ u16 tileEntityCount; + /* 0x10 */ u8 graphicsGroups[4]; + /* 0x14 */ u8 flags[52]; /* 0x48 */ Droptable currentAreaDroptable; /* 0x68 */ u32 animFlags; - /* 0x6c */ void* field_0x6c[8]; - /* 0x8c */ void* field_0x8c[8]; - /* 0xac */ Entity* entities[8]; + /* 0x6c */ void* properties[8]; + /* 0x8c */ void* entityRails[8]; + /* 0xac */ Entity* puzzleEntities[8]; } RoomVars; static_assert(sizeof(RoomVars) == 0xCC); extern RoomVars gRoomVars; |