diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-15 16:27:36 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-15 16:27:36 -0500 |
| commit | 153858af6035015ca8aae24f44640ce7f25679bc (patch) | |
| tree | 66e6c438d0bb15348d0016195e17e19389cf6f99 /include/union_room.h | |
| parent | 04d176334ad590d3462e3c1eb75c1313705ae183 (diff) | |
| parent | 3170b753442da34dbdff6f141f0d2223973c0e83 (diff) | |
Merge master into doc-questlog
Diffstat (limited to 'include/union_room.h')
| -rw-r--r-- | include/union_room.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/union_room.h b/include/union_room.h index 03628441b..d57683a8a 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -6,7 +6,7 @@ struct UnkStruct_Shared { - struct UnkLinkRfuStruct_02022B14 field_0; + struct GFtgtGname field_0; u8 ALIGNED(4) playerName[PLAYER_NAME_LENGTH]; }; @@ -149,7 +149,7 @@ struct TradeUnkStruct u32 personality; }; -extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_203B064; +extern struct GFtgtGnameSub gUnknown_203B064; extern u16 gUnionRoomOfferedSpecies; extern u8 gUnionRoomRequestedMonType; |