From e95b1156d22e2652b6d13ea1af123aed7ab5221c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 3 Jun 2018 09:37:01 +0200 Subject: more progress --- include/librfu.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/librfu.h') diff --git a/include/librfu.h b/include/librfu.h index aae7df4e9..2c4d091bd 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -200,8 +200,6 @@ extern struct RfuUnk1* gUnknown_03007870[4]; extern void* sub_82E53F4; extern void rfu_STC_clearAPIVariables(void); -struct UnkLinkRfuStruct_02022B14; - void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, bool8 copyInterruptToRam); void rfu_REQ_stopMode(void); void rfu_waitREQComplete(void); -- cgit v1.2.3 From 166295acc78b0057e25f6e46f9fa183369708053 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 9 Jun 2018 22:14:52 +0200 Subject: union room prepare for battle --- include/librfu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/librfu.h') diff --git a/include/librfu.h b/include/librfu.h index 2c4d091bd..03c142587 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -80,8 +80,8 @@ struct __attribute__((packed)) UnkLinkRfuStruct_02022B14 u16 unk_01_6:2; u8 playerTrainerId[2]; u8 unk_04[4]; - u16 unk_08_0:10; - u16 unk_09_2:6; + u16 species:10; + u16 type:6; u8 unk_0a_0:7; u8 unk_0a_7:1; u8 playerGender:1; -- cgit v1.2.3 From 5526d980ec656c7a9a66937376c2dc9cdf9c7a54 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 10 Jun 2018 18:28:37 +0200 Subject: union room is too hard --- include/librfu.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include/librfu.h') diff --git a/include/librfu.h b/include/librfu.h index 03c142587..dc3d336da 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -47,7 +47,7 @@ enum RFU_UNK3A, RFU_UNK3B, RFU_UNK3C, - RFU_STOP_MODE, //3D + RFU_STOP_MODE, // 3D }; struct RfuPacket8 @@ -67,7 +67,7 @@ union RfuPacket struct RfuPacket8 rfuPacket8; }; -struct __attribute__((packed)) UnkLinkRfuStruct_02022B14 +struct UnkLinkRfuStruct_02022B14Substruct { u16 unk_00_0:4; u16 unk_00_4:1; @@ -79,6 +79,11 @@ struct __attribute__((packed)) UnkLinkRfuStruct_02022B14 u16 unk_01_2:4; u16 unk_01_6:2; u8 playerTrainerId[2]; +}; + +struct UnkLinkRfuStruct_02022B14 +{ + struct UnkLinkRfuStruct_02022B14Substruct unk_00; u8 unk_04[4]; u16 species:10; u16 type:6; -- cgit v1.2.3 From c9d486a5d3ea6bf7d256c2d7ca7f10339e498427 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 22 Jul 2018 12:49:49 +0200 Subject: make union room compile i guess --- include/librfu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/librfu.h') diff --git a/include/librfu.h b/include/librfu.h index dc3d336da..9d131f027 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -81,7 +81,7 @@ struct UnkLinkRfuStruct_02022B14Substruct u8 playerTrainerId[2]; }; -struct UnkLinkRfuStruct_02022B14 +struct __attribute__((packed)) UnkLinkRfuStruct_02022B14 { struct UnkLinkRfuStruct_02022B14Substruct unk_00; u8 unk_04[4]; -- cgit v1.2.3