diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-06 10:44:22 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-06 10:44:22 -0500 |
| commit | 78caeff45b98bf3cce180d37606d5a5239fbb030 (patch) | |
| tree | dd2bda7991d1d50e83317c9a99633714c0c0106a /include/union_room.h | |
| parent | 6af7391add68be30c6bd7d22803a3dd454e08a33 (diff) | |
Name remaining funcs in union_room.c
Diffstat (limited to 'include/union_room.h')
| -rw-r--r-- | include/union_room.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/include/union_room.h b/include/union_room.h index 3efca7867..e24bcd480 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -29,11 +29,9 @@ struct UnkStruct_x20 struct UnionGnameUnamePair gname_uname; u16 field_18; u8 groupScheduledAnim:2; - u8 field_1A_1:1; + bool8 field_1A_1:1; u8 field_1B; - u8 field_1D; - u8 field_1E; - u8 field_1F; + u32 field_1C; // unused }; // These arrays are dynamically allocated but must be @@ -80,17 +78,17 @@ struct UnkStruct_Group struct UnkStruct_Main4 * field_4; u8 state; u8 textState; - u8 field_A; + u8 field_A; // unused u8 listWindowId; - u8 field_C; - u8 field_D; + u8 bButtonCancelWindowId; + u8 playerNameAndIdWindowId; u8 listTaskId; - u8 field_F; + u8 leaderId; u8 field_10; u8 listenTaskId; u8 cardOrNews; - u8 field_13; - u8 field_14; + u8 field_13; // referenced but never set + u8 refreshTimer; u8 delayBeforePrint; }; @@ -164,6 +162,6 @@ extern struct GFtgtGnameSub gPartnerTgtGnameSub; extern u16 gUnionRoomOfferedSpecies; extern u8 gUnionRoomRequestedMonType; -void sub_81173C0(u16 battleFlags); +void StartUnionRoomBattle(u16 battleFlags); #endif //GUARD_UNION_ROOM_H |