rfu_REQ_sendData_wrapper

This commit is contained in:
PikalaxALT 2017-11-17 00:05:28 -05:00
parent 3c20c54b83
commit 8377b00662
5 changed files with 59 additions and 58 deletions

View File

@ -7,37 +7,6 @@
// RFU; bss indicates that no file boundary exists here // RFU; bss indicates that no file boundary exists here
thumb_func_start rfu_REQ_sendData_wrapper
rfu_REQ_sendData_wrapper: @ 800BF0C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =gUnknown_03007890
ldr r0, [r0]
ldrb r0, [r0]
cmp r0, 0
bne _0800BF34
ldr r0, =gUnknown_03004140
ldrb r0, [r0, 0x2]
movs r2, 0
cmp r0, 0x1
bne _0800BF3C
movs r2, 0x1
b _0800BF3C
.pool
_0800BF34:
ldr r0, =gUnknown_03004140
ldrb r1, [r0, 0x3]
movs r1, 0
strb r1, [r0, 0x3]
_0800BF3C:
adds r0, r2, 0
bl rfu_REQ_sendData
pop {r0}
bx r0
.pool
thumb_func_end rfu_REQ_sendData_wrapper
thumb_func_start sub_800BF4C thumb_func_start sub_800BF4C
sub_800BF4C: @ 800BF4C sub_800BF4C: @ 800BF4C
push {r4-r6,lr} push {r4-r6,lr}

View File

@ -103,9 +103,47 @@ struct RfuIntrStruct
u8 block2[0x30]; u8 block2[0x30];
}; };
struct RfuUnk1
{
u8 unk_0[0x14];
u32 unk_14;
u32 unk_18;
struct RfuIntrStruct unk_1c;
};
struct RfuUnk2
{
u8 unk_0[0x68];
u32 unk_68;
u32 unk_6c;
u8 unk_70[0x70];
};
struct RfuUnk3
{
u32 unk_0;
u32 unk_4;
u8 unk_8[0xD4];
u32 unk_dc;
};
struct RfuUnk5
{
u8 unk_00;
};
extern struct RfuStruct *gRfuState; extern struct RfuStruct *gRfuState;
extern struct RfuUnk5 *gUnknown_03007890;
extern u32 *gUnknown_03007894;
extern struct RfuUnk3* gUnknown_03007898;
extern struct RfuUnk2* gUnknown_03007880[4];
extern struct RfuUnk1* gUnknown_03007870[4];
extern void* sub_82E53F4;
extern void rfu_STC_clearAPIVariables(void);
void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, bool8 copyInterruptToRam); void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, bool8 copyInterruptToRam);
void rfu_REQ_stopMode(void); void rfu_REQ_stopMode(void);
void rfu_waitREQComplete(void); void rfu_waitREQComplete(void);
u32 rfu_REQBN_softReset_and_checkID(void); u32 rfu_REQBN_softReset_and_checkID(void);
void rfu_REQ_sendData(u8);

View File

@ -7,7 +7,7 @@ struct UnkRfuStruct_1 {
u8 unk_00; u8 unk_00;
u8 unk_01; u8 unk_01;
u8 unk_02; u8 unk_02;
u8 unk_03; vu8 unk_03;
u8 unk_04; u8 unk_04;
u8 unk_05; u8 unk_05;
u8 unk_06; u8 unk_06;

View File

@ -3,31 +3,7 @@
#include "librfu.h" #include "librfu.h"
struct RfuUnk1 extern struct RfuUnk5 *gUnknown_03007890;
{
u8 unk_0[0x14];
u32 unk_14;
u32 unk_18;
struct RfuIntrStruct unk_1c;
};
struct RfuUnk2
{
u8 unk_0[0x68];
u32 unk_68;
u32 unk_6c;
u8 unk_70[0x70];
};
struct RfuUnk3
{
u32 unk_0;
u32 unk_4;
u8 unk_8[0xD4];
u32 unk_dc;
};
extern u32 *gUnknown_03007890;
extern u32 *gUnknown_03007894; extern u32 *gUnknown_03007894;
extern struct RfuUnk3* gUnknown_03007898; extern struct RfuUnk3* gUnknown_03007898;
extern struct RfuUnk2* gUnknown_03007880[4]; extern struct RfuUnk2* gUnknown_03007880[4];

View File

@ -2447,7 +2447,6 @@ void ResetRecvBuffer(void)
u32 sub_800BEC0(void) u32 sub_800BEC0(void)
{ {
u32 r4; u32 r4;
u8 r2;
r4 = rfu_REQBN_softReset_and_checkID(); r4 = rfu_REQBN_softReset_and_checkID();
if (r4 == 0x8001) if (r4 == 0x8001)
@ -2467,3 +2466,22 @@ u32 sub_800BEC0(void)
sub_800D610(); sub_800D610();
return r4; return r4;
} }
void rfu_REQ_sendData_wrapper(u8 r2)
{
u8 val;
if (!gUnknown_03007890->unk_00)
{
val = gUnknown_03004140.unk_02;
r2 = 0;
if (val == 1)
{
r2 = 1;
}
}
else
{
gUnknown_03004140.unk_03 = 0;
}
rfu_REQ_sendData(r2);
}