Some documentation of rfu_union_tool

4 files changed, 12 insertions, 12 deletions

diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 1b4c9e365..f2e7bd325 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -47,7 +47,7 @@ void ObjectEventClearAnimIfSpecialAnimActive(struct ObjectEvent *);
 void SpawnObjectEventsInView(s16, s16);
 u8 sprite_new(u8, u8, s16, s16, u8, u8);
 u8 AddPseudoObjectEvent(u16, SpriteCallback, s16, s16, u8);
-u8 TrySpawnObjectEvent(u8, u8, u8);
+u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup);
 u8 SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8);
 u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *);
 void sub_8093038(s16, s16, s16 *, s16 *);
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 874f62511..985c260ef 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -303,7 +303,7 @@ bool32 sub_80F8F7C(bool32 a0);
 bool32 sub_80FA634(u16 a0, const u8 *a1);
 void sub_80FA670(u8 a0, u16 a1, const u8 *a2);
 u32 sub_80FA6FC(u16 a0, const u8 *a1);
-void sub_80FAF58(u8 a0, u32 a1, u32 a2);
+void SetHostRFUtgtGname(u8 a0, u32 a1, u32 a2);
 void sub_80FBB8C(u32 a0);
 void sub_80FBD4C(const u8 *ptr, u16 a1);
 void LinkRfu3_SetGnameUnameFromStaticBuffers(struct GFtgtGname *gname, u8 *uname);
diff --git a/include/rfu_union_tool.h b/include/rfu_union_tool.h
index e7895d25f..b8b5cd664 100644
--- a/include/rfu_union_tool.h
+++ b/include/rfu_union_tool.h
@@ -11,7 +11,7 @@ void sub_811BECC(struct UnkStruct_URoom *arg0);
 void sub_811BEDC(struct UnkStruct_URoom *arg0);
 bool32 sub_811BF00(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3);
 void sub_811C028(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2);
-u8 sub_811B754(struct UnionObj * ptr);
+u8 ZeroUnionObjWork(struct UnionObj * ptr);
 void sub_811BA78(void);
 
 #endif //GUARD_UNION_ROOM_PLAYER_AVATAR_H
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