diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_80688E4.h | 10 | ||||
| -rw-r--r-- | include/fieldmap.h | 2 | ||||
| -rw-r--r-- | include/link_rfu.h | 3 | ||||
| -rw-r--r-- | include/rfu_union_tool.h | 17 | ||||
| -rw-r--r-- | include/union_room_battle.h | 6 |
5 files changed, 22 insertions, 16 deletions
diff --git a/include/event_object_80688E4.h b/include/event_object_80688E4.h index a3da168b4..241d48c3a 100644 --- a/include/event_object_80688E4.h +++ b/include/event_object_80688E4.h @@ -6,10 +6,10 @@ void FreezeObjectEvents(void); bool8 FreezeObjectEvent(struct ObjectEvent *); void FreezeObjectEventsExceptOne(u8 objEventId); -void RfuUnionObjectToggleInvisibility(u8 a0, bool32 a1); -u32 RfuUnionObjectIsInvisible(u8 a0); -void RfuUnionObjectStartWarp(u8 a0, u8 a1); -void RfuUnionObjectSetFacingDirection(u8 a0, u8 a1); -bool32 RfuUnionObjectIsWarping(u8 a0); +void RfuUnionObjectSetFacingDirection(u8 objectEventId, u8 direction); +void RfuUnionObjectToggleInvisibility(u8 objectEventId, bool32 invisible); +bool32 RfuUnionObjectIsInvisible(u8 objectEventId); +void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo); +bool32 RfuUnionObjectIsWarping(u8 objectEventId); #endif // GUARD_EVENT_OBJECT_80688E4_H diff --git a/include/fieldmap.h b/include/fieldmap.h index 91a45d8c5..406ec2959 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -31,6 +31,6 @@ void sub_8059948(u8 a0, u8 a1); void save_serialize_map(void); u32 sub_8058F1C(u32 original, u8 bit); u32 sub_8058F48(s16 x, s16 y, u8 z); -void sub_8059024(s32 x, s32 y, bool32 arg2); +void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 arg2); #endif //GUARD_FIELDMAP_H diff --git a/include/link_rfu.h b/include/link_rfu.h index 52fd07f7c..4f11d8cb6 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -117,7 +117,8 @@ struct GFtgtGnameSub struct __attribute__((packed, aligned(2))) GFtgtGname { struct GFtgtGnameSub unk_00; - u8 unk_04[4]; + u8 unk_04[RFU_CHILD_MAX]; // u8 sprite_idx:3; + // u8 gender:1; u16 species:10; u16 type:6; u8 activity:7; diff --git a/include/rfu_union_tool.h b/include/rfu_union_tool.h index b8b5cd664..7fc7fd4cb 100644 --- a/include/rfu_union_tool.h +++ b/include/rfu_union_tool.h @@ -3,15 +3,14 @@ #include "union_room.h" -void sub_811C1C8(void); -void sub_811BAAC(u8 *spriteIds, s32 arg1); -void sub_811BB40(u8 *spriteIds); -void sub_811BB68(void); -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 ZeroUnionObjWork(struct UnionObj * ptr); -void sub_811BA78(void); +void DeleteUnionObjWorkAndStopTask(void); +void CreateGroupMemberObjectsInvisible(u8 *spriteIds, s32 group); +void DestroyGroupMemberObjects(u8 *spriteIds); +void MakeGroupAssemblyAreasPassable(void); +void ScheduleUnionRoomPlayerRefresh(struct UnkStruct_URoom *uroom_p); +void HandleUnionRoomPlayerRefresh(struct UnkStruct_URoom *uroom_p); +bool32 RfuUnionTool_GetGroupAndMemberInFrontOfPlayer(struct UnkStruct_Main0 *main0_p, s16 *member_p, s16 *group_p, u8 *spriteIds); +void UpdateUnionGroupMemberFacing(u32 member, u32 group, struct UnkStruct_Main0 *main0_p); #endif //GUARD_UNION_ROOM_PLAYER_AVATAR_H diff --git a/include/union_room_battle.h b/include/union_room_battle.h new file mode 100644 index 000000000..ffccf197f --- /dev/null +++ b/include/union_room_battle.h @@ -0,0 +1,6 @@ +#ifndef GUARD_UNION_ROOM_BATTLE_H +#define GUARD_UNION_ROOM_BATTLE_H + +void CB2_UnionRoomBattle(void); + +#endif //GUARD_UNION_ROOM_BATTLE_H |