summaryrefslogtreecommitdiff
path: root/include/union_room.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/union_room.h')
-rw-r--r--include/union_room.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/union_room.h b/include/union_room.h
index 4730dfb18..0ad5e920e 100644
--- a/include/union_room.h
+++ b/include/union_room.h
@@ -87,10 +87,10 @@ struct UnkStruct_Group
struct UnionObj
{
- u8 field_0;
- u8 field_1;
- s8 field_2;
- u8 field_3;
+ u8 state;
+ u8 gfxId;
+ s8 animState;
+ u8 schedAnim;
};
struct UnkStruct_URoom
@@ -121,17 +121,17 @@ struct UnkStruct_URoom
/* 0x058 */ u8 field_58[4][11];
/* 0x084 */ u16 field_98;
/* 0x086 */ u16 field_9A[3];
- /* 0x08C */ struct UnionObj field_A0[8];
- /* 0x0AC */ u8 field_C0[12][15];
+ /* 0x08C */ struct UnionObj unionObjs[8];
+ /* 0x0AC */ u8 trainerCardStrbufs[12][15];
/* 0x160 */ u8 field_174[48];
/* 0x190 */ u8 field_1A4[200];
};
union UnkUnion_Main
{
- struct UnkStruct_Leader *leader;
- struct UnkStruct_Group *group;
- struct UnkStruct_URoom *uRoom;
+ struct UnkStruct_Leader * leader;
+ struct UnkStruct_Group * group;
+ struct UnkStruct_URoom * uRoom;
};
struct UnionRoomTrade