Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103

# Conflicts:
#	include/link_rfu.h
This commit is contained in:
Eduardo Quezada committed 2023-01-03 15:40:33 -03:00
commit e0802f13a2
15 files changed
+172 -102

No files matched your search

+1 -1
View File
@@ -109,7 +109,7 @@ struct __attribute__((packed, aligned(2))) RfuGameData
u8 playerGender:1;
u8 tradeLevel:7;
u8 tradeType:6;
u8 padding:2;
u8 filler:2;
};
// Constants for getting/setting information in 'partnerInfo' of RfuGameData.