diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/SComponent/c_request.h | 197 | ||||
| -rw-r--r-- | include/d/d_a/d_a_alink/asm/func_8011F460.s | 2 | ||||
| -rw-r--r-- | include/f/f_op/f_op_overlap_mng.h | 14 | ||||
| -rw-r--r-- | include/f/f_op_overlap_mng/asm/func_8001E484.s | 2 | ||||
| -rw-r--r-- | include/f/f_op_overlap_mng/asm/func_8001E4C4.s | 2 | ||||
| -rw-r--r-- | include/f/f_op_overlap_mng/asm/func_8001E540.s | 2 | ||||
| -rw-r--r-- | include/f/f_op_overlap_mng/asm/func_8001E558.s | 2 | ||||
| -rw-r--r-- | include/f/f_op_overlap_mng/asm/func_8001E574.s | 2 | ||||
| -rw-r--r-- | include/f/f_op_overlap_mng/asm/func_8001E5A8.s | 2 | ||||
| -rw-r--r-- | include/f/f_op_overlap_mng/asm/func_8001E5D0.s | 2 | ||||
| -rw-r--r-- | include/f/f_op_overlap_mng/asm/func_8001E604.s | 4 | ||||
| -rw-r--r-- | include/f/f_op_overlap_mng/asm/func_8001E650.s | 4 | ||||
| -rw-r--r-- | include/f/f_op_overlap_mng/asm/func_8001E698.s | 4 |
13 files changed, 223 insertions, 16 deletions
diff --git a/include/SComponent/c_request.h b/include/SComponent/c_request.h index 485c572c2d..34359d78ec 100644 --- a/include/SComponent/c_request.h +++ b/include/SComponent/c_request.h @@ -1,10 +1,203 @@ #ifndef C_REQUEST_H_ #define C_REQUEST_H_ +#include "dolphin/types.h" #include "f/f_pc/f_pc_base.h" -#include "global.h" -struct request_base_class; +struct request_base_class { + u8 field_0x0; + u8 field_0x1; + u8 field_0x2; + u8 field_0x3; + u32 field_0x4; + u32 field_0x8; + u8 field_0xc; + u8 field_0xd; + u8 field_0xe; + u8 field_0xf; + u8 field_0x10; + u8 field_0x11; + u8 field_0x12; + u8 field_0x13; + u8 field_0x14; + u8 field_0x15; + u8 field_0x16; + u8 field_0x17; + u8 field_0x18; + u8 field_0x19; + u8 field_0x1a; + u8 field_0x1b; + u8 field_0x1c; + u8 field_0x1d; + u8 field_0x1e; + u8 field_0x1f; + u32* field_0x20; + u8 field_0x24; + u8 field_0x25; + u8 field_0x26; + u8 field_0x27; + u8 field_0x28; + u8 field_0x29; + u8 field_0x2a; + u8 field_0x2b; + u8 field_0x2c; + u8 field_0x2d; + u8 field_0x2e; + u8 field_0x2f; + u8 field_0x30; + u8 field_0x31; + u8 field_0x32; + u8 field_0x33; + u8 field_0x34; + u8 field_0x35; + u8 field_0x36; + u8 field_0x37; + u8 field_0x38; + u8 field_0x39; + u8 field_0x3a; + u8 field_0x3b; + u8 field_0x3c; + u8 field_0x3d; + u8 field_0x3e; + u8 field_0x3f; + u8 field_0x40; + u8 field_0x41; + u8 field_0x42; + u8 field_0x43; + u8 field_0x44; + u8 field_0x45; + u8 field_0x46; + u8 field_0x47; + u8 field_0x48; + u8 field_0x49; + u8 field_0x4a; + u8 field_0x4b; + u8 field_0x4c; + u8 field_0x4d; + u8 field_0x4e; + u8 field_0x4f; + u8 field_0x50; + u8 field_0x51; + u8 field_0x52; + u8 field_0x53; + u8 field_0x54; + u8 field_0x55; + u8 field_0x56; + u8 field_0x57; + u8 field_0x58; + u8 field_0x59; + u8 field_0x5a; + u8 field_0x5b; + u8 field_0x5c; + u8 field_0x5d; + u8 field_0x5e; + u8 field_0x5f; + u8 field_0x60; + u8 field_0x61; + u8 field_0x62; + u8 field_0x63; + u8 field_0x64; + u8 field_0x65; + u8 field_0x66; + u8 field_0x67; + u8 field_0x68; + u8 field_0x69; + u8 field_0x6a; + u8 field_0x6b; + u8 field_0x6c; + u8 field_0x6d; + u8 field_0x6e; + u8 field_0x6f; + u8 field_0x70; + u8 field_0x71; + u8 field_0x72; + u8 field_0x73; + u8 field_0x74; + u8 field_0x75; + u8 field_0x76; + u8 field_0x77; + u8 field_0x78; + u8 field_0x79; + u8 field_0x7a; + u8 field_0x7b; + u8 field_0x7c; + u8 field_0x7d; + u8 field_0x7e; + u8 field_0x7f; + u8 field_0x80; + u8 field_0x81; + u8 field_0x82; + u8 field_0x83; + u8 field_0x84; + u8 field_0x85; + u8 field_0x86; + u8 field_0x87; + u8 field_0x88; + u8 field_0x89; + u8 field_0x8a; + u8 field_0x8b; + u8 field_0x8c; + u8 field_0x8d; + u8 field_0x8e; + u8 field_0x8f; + u8 field_0x90; + u8 field_0x91; + u8 field_0x92; + u8 field_0x93; + u8 field_0x94; + u8 field_0x95; + u8 field_0x96; + u8 field_0x97; + u8 field_0x98; + u8 field_0x99; + u8 field_0x9a; + u8 field_0x9b; + u8 field_0x9c; + u8 field_0x9d; + u8 field_0x9e; + u8 field_0x9f; + u8 field_0xa0; + u8 field_0xa1; + u8 field_0xa2; + u8 field_0xa3; + u8 field_0xa4; + u8 field_0xa5; + u8 field_0xa6; + u8 field_0xa7; + u8 field_0xa8; + u8 field_0xa9; + u8 field_0xaa; + u8 field_0xab; + u8 field_0xac; + u8 field_0xad; + u8 field_0xae; + u8 field_0xaf; + u8 field_0xb0; + u8 field_0xb1; + u8 field_0xb2; + u8 field_0xb3; + u8 field_0xb4; + u8 field_0xb5; + u8 field_0xb6; + u8 field_0xb7; + u8 field_0xb8; + u8 field_0xb9; + u8 field_0xba; + u8 field_0xbb; + u8 field_0xbc; + u8 field_0xbd; + u8 field_0xbe; + u8 field_0xbf; + u8 field_0xc0; + u8 field_0xc1; + u8 field_0xc2; + u8 field_0xc3; + u8 field_0xc4; + u8 field_0xc5; + u8 field_0xc6; + u8 field_0xc7; + u32* field_0xc8; +}; int cReq_Is_Done(request_base_class*); int cReq_Done(request_base_class*); diff --git a/include/d/d_a/d_a_alink/asm/func_8011F460.s b/include/d/d_a/d_a_alink/asm/func_8011F460.s index b226447b48..61d87312b9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F460.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F460.s @@ -16,7 +16,7 @@ /* 8011F49C 0011C3DC 7D 89 03 A6 */ mtctr r12 /* 8011F4A0 0011C3E0 4E 80 04 21 */ bctrl lbl_8011F4A4: -/* 8011F4A4 0011C3E4 4B EF F0 B5 */ bl fopOvlpM_IsPeek +/* 8011F4A4 0011C3E4 4B EF F0 B5 */ bl fopOvlpM_IsPeek__Fv /* 8011F4A8 0011C3E8 2C 03 00 01 */ cmpwi r3, 1 /* 8011F4AC 0011C3EC 40 82 00 0C */ bne lbl_8011F4B8 /* 8011F4B0 0011C3F0 38 60 00 01 */ li r3, 1 diff --git a/include/f/f_op/f_op_overlap_mng.h b/include/f/f_op/f_op_overlap_mng.h index 80b8192540..7de9206f45 100644 --- a/include/f/f_op/f_op_overlap_mng.h +++ b/include/f/f_op/f_op_overlap_mng.h @@ -1,6 +1,20 @@ #ifndef F_F_OP_OVERLAP_MNG_H_ #define F_F_OP_OVERLAP_MNG_H_ +#include "SComponent/c_request.h" +#include "dolphin/types.h" + +class overlap_task_class { +public: + /* 0x00 */ u8 field_0x00[0xC4]; + /* 0xC4 */ u8 field_0xc4; +}; + void fopOvlpM_Management(void); +BOOL fopOvlpM_IsOutReq(overlap_task_class* pTaskClass); +void fopOvlpM_Done(overlap_task_class* pTaskClass); +void fopOvlpM_ToldAboutID(unsigned int param_1); +u32 fopOvlpM_IsPeek(void); +int fopOvlpM_IsDone(void); #endif
\ No newline at end of file diff --git a/include/f/f_op_overlap_mng/asm/func_8001E484.s b/include/f/f_op_overlap_mng/asm/func_8001E484.s index d9528c408c..eefb2b5847 100644 --- a/include/f/f_op_overlap_mng/asm/func_8001E484.s +++ b/include/f/f_op_overlap_mng/asm/func_8001E484.s @@ -1,7 +1,7 @@ /* 8001E484 0001B3C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001E488 0001B3C8 7C 08 02 A6 */ mflr r0 /* 8001E48C 0001B3CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001E490 0001B3D0 80 6D 80 30 */ lwz r3, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E490 0001B3D0 80 6D 80 30 */ lwz r3, l_fopOvlpM_overlap-_SDA_BASE_(r13) /* 8001E494 0001B3D4 28 03 00 00 */ cmplwi r3, 0 /* 8001E498 0001B3D8 41 82 00 18 */ beq lbl_8001E4B0 /* 8001E49C 0001B3DC 80 63 00 20 */ lwz r3, 0x20(r3) diff --git a/include/f/f_op_overlap_mng/asm/func_8001E4C4.s b/include/f/f_op_overlap_mng/asm/func_8001E4C4.s index 7ef1b12f04..ce4adccada 100644 --- a/include/f/f_op_overlap_mng/asm/func_8001E4C4.s +++ b/include/f/f_op_overlap_mng/asm/func_8001E4C4.s @@ -1,7 +1,7 @@ /* 8001E4C4 0001B404 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001E4C8 0001B408 7C 08 02 A6 */ mflr r0 /* 8001E4CC 0001B40C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001E4D0 0001B410 80 6D 80 30 */ lwz r3, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E4D0 0001B410 80 6D 80 30 */ lwz r3, l_fopOvlpM_overlap-_SDA_BASE_(r13) /* 8001E4D4 0001B414 28 03 00 00 */ cmplwi r3, 0 /* 8001E4D8 0001B418 41 82 00 18 */ beq lbl_8001E4F0 /* 8001E4DC 0001B41C 80 63 00 20 */ lwz r3, 0x20(r3) diff --git a/include/f/f_op_overlap_mng/asm/func_8001E540.s b/include/f/f_op_overlap_mng/asm/func_8001E540.s index ce7490959b..1e0cd79590 100644 --- a/include/f/f_op_overlap_mng/asm/func_8001E540.s +++ b/include/f/f_op_overlap_mng/asm/func_8001E540.s @@ -1,4 +1,4 @@ -/* 8001E540 0001B480 80 8D 80 30 */ lwz r4, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E540 0001B480 80 8D 80 30 */ lwz r4, l_fopOvlpM_overlap-_SDA_BASE_(r13) /* 8001E544 0001B484 28 04 00 00 */ cmplwi r4, 0 /* 8001E548 0001B488 4D 82 00 20 */ beqlr /* 8001E54C 0001B48C 80 84 00 20 */ lwz r4, 0x20(r4) diff --git a/include/f/f_op_overlap_mng/asm/func_8001E558.s b/include/f/f_op_overlap_mng/asm/func_8001E558.s index f9e19e18a6..c39aaca763 100644 --- a/include/f/f_op_overlap_mng/asm/func_8001E558.s +++ b/include/f/f_op_overlap_mng/asm/func_8001E558.s @@ -1,4 +1,4 @@ -/* 8001E558 0001B498 80 6D 80 30 */ lwz r3, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E558 0001B498 80 6D 80 30 */ lwz r3, l_fopOvlpM_overlap-_SDA_BASE_(r13) /* 8001E55C 0001B49C 28 03 00 00 */ cmplwi r3, 0 /* 8001E560 0001B4A0 41 82 00 0C */ beq lbl_8001E56C /* 8001E564 0001B4A4 80 63 00 08 */ lwz r3, 8(r3) diff --git a/include/f/f_op_overlap_mng/asm/func_8001E574.s b/include/f/f_op_overlap_mng/asm/func_8001E574.s index 8f7b1bdef5..4bd2ffaab7 100644 --- a/include/f/f_op_overlap_mng/asm/func_8001E574.s +++ b/include/f/f_op_overlap_mng/asm/func_8001E574.s @@ -1,7 +1,7 @@ /* 8001E574 0001B4B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001E578 0001B4B8 7C 08 02 A6 */ mflr r0 /* 8001E57C 0001B4BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001E580 0001B4C0 80 6D 80 30 */ lwz r3, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E580 0001B4C0 80 6D 80 30 */ lwz r3, l_fopOvlpM_overlap-_SDA_BASE_(r13) /* 8001E584 0001B4C4 28 03 00 00 */ cmplwi r3, 0 /* 8001E588 0001B4C8 41 82 00 0C */ beq lbl_8001E594 /* 8001E58C 0001B4CC 48 24 82 49 */ bl cReq_Is_Done__FP18request_base_class diff --git a/include/f/f_op_overlap_mng/asm/func_8001E5A8.s b/include/f/f_op_overlap_mng/asm/func_8001E5A8.s index bb1008abdd..54adc06b2f 100644 --- a/include/f/f_op_overlap_mng/asm/func_8001E5A8.s +++ b/include/f/f_op_overlap_mng/asm/func_8001E5A8.s @@ -1,4 +1,4 @@ -/* 8001E5A8 0001B4E8 80 6D 80 30 */ lwz r3, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E5A8 0001B4E8 80 6D 80 30 */ lwz r3, l_fopOvlpM_overlap-_SDA_BASE_(r13) /* 8001E5AC 0001B4EC 28 03 00 00 */ cmplwi r3, 0 /* 8001E5B0 0001B4F0 41 82 00 18 */ beq lbl_8001E5C8 /* 8001E5B4 0001B4F4 A0 03 00 04 */ lhz r0, 4(r3) diff --git a/include/f/f_op_overlap_mng/asm/func_8001E5D0.s b/include/f/f_op_overlap_mng/asm/func_8001E5D0.s index d6b37df04a..b291f6de81 100644 --- a/include/f/f_op_overlap_mng/asm/func_8001E5D0.s +++ b/include/f/f_op_overlap_mng/asm/func_8001E5D0.s @@ -1,7 +1,7 @@ /* 8001E5D0 0001B510 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001E5D4 0001B514 7C 08 02 A6 */ mflr r0 /* 8001E5D8 0001B518 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001E5DC 0001B51C 80 6D 80 30 */ lwz r3, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E5DC 0001B51C 80 6D 80 30 */ lwz r3, l_fopOvlpM_overlap-_SDA_BASE_(r13) /* 8001E5E0 0001B520 28 03 00 00 */ cmplwi r3, 0 /* 8001E5E4 0001B524 41 82 00 0C */ beq lbl_8001E5F0 /* 8001E5E8 0001B528 48 00 04 F1 */ bl fopOvlpReq_OverlapClr diff --git a/include/f/f_op_overlap_mng/asm/func_8001E604.s b/include/f/f_op_overlap_mng/asm/func_8001E604.s index 8037c20c37..a00e202f55 100644 --- a/include/f/f_op_overlap_mng/asm/func_8001E604.s +++ b/include/f/f_op_overlap_mng/asm/func_8001E604.s @@ -3,14 +3,14 @@ /* 8001E60C 0001B54C 90 01 00 14 */ stw r0, 0x14(r1) /* 8001E610 0001B550 7C 66 1B 78 */ mr r6, r3 /* 8001E614 0001B554 7C 85 23 78 */ mr r5, r4 -/* 8001E618 0001B558 80 0D 80 30 */ lwz r0, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E618 0001B558 80 0D 80 30 */ lwz r0, l_fopOvlpM_overlap-_SDA_BASE_(r13) /* 8001E61C 0001B55C 28 00 00 00 */ cmplwi r0, 0 /* 8001E620 0001B560 40 82 00 1C */ bne lbl_8001E63C /* 8001E624 0001B564 3C 60 80 3F */ lis r3, lbl_803F1DE8@ha /* 8001E628 0001B568 38 63 1D E8 */ addi r3, r3, lbl_803F1DE8@l /* 8001E62C 0001B56C 7C C4 33 78 */ mr r4, r6 /* 8001E630 0001B570 48 00 03 25 */ bl fopOvlpReq_Request -/* 8001E634 0001B574 90 6D 80 30 */ stw r3, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E634 0001B574 90 6D 80 30 */ stw r3, l_fopOvlpM_overlap-_SDA_BASE_(r13) /* 8001E638 0001B578 48 00 00 08 */ b lbl_8001E640 lbl_8001E63C: /* 8001E63C 0001B57C 38 60 00 00 */ li r3, 0 diff --git a/include/f/f_op_overlap_mng/asm/func_8001E650.s b/include/f/f_op_overlap_mng/asm/func_8001E650.s index 307253574f..29474a4ad5 100644 --- a/include/f/f_op_overlap_mng/asm/func_8001E650.s +++ b/include/f/f_op_overlap_mng/asm/func_8001E650.s @@ -1,7 +1,7 @@ /* 8001E650 0001B590 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001E654 0001B594 7C 08 02 A6 */ mflr r0 /* 8001E658 0001B598 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001E65C 0001B59C 80 6D 80 30 */ lwz r3, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E65C 0001B59C 80 6D 80 30 */ lwz r3, l_fopOvlpM_overlap-_SDA_BASE_(r13) /* 8001E660 0001B5A0 28 03 00 00 */ cmplwi r3, 0 /* 8001E664 0001B5A4 41 82 00 24 */ beq lbl_8001E688 /* 8001E668 0001B5A8 48 00 03 89 */ bl fopOvlpReq_Handler @@ -12,7 +12,7 @@ /* 8001E67C 0001B5BC 48 00 00 0C */ b lbl_8001E688 lbl_8001E680: /* 8001E680 0001B5C0 38 00 00 00 */ li r0, 0 -/* 8001E684 0001B5C4 90 0D 80 30 */ stw r0, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E684 0001B5C4 90 0D 80 30 */ stw r0, l_fopOvlpM_overlap-_SDA_BASE_(r13) lbl_8001E688: /* 8001E688 0001B5C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001E68C 0001B5CC 7C 08 03 A6 */ mtlr r0 diff --git a/include/f/f_op_overlap_mng/asm/func_8001E698.s b/include/f/f_op_overlap_mng/asm/func_8001E698.s index ae65d6467c..3ec0dfd0f7 100644 --- a/include/f/f_op_overlap_mng/asm/func_8001E698.s +++ b/include/f/f_op_overlap_mng/asm/func_8001E698.s @@ -1,7 +1,7 @@ /* 8001E698 0001B5D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001E69C 0001B5DC 7C 08 02 A6 */ mflr r0 /* 8001E6A0 0001B5E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001E6A4 0001B5E4 80 6D 80 30 */ lwz r3, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E6A4 0001B5E4 80 6D 80 30 */ lwz r3, l_fopOvlpM_overlap-_SDA_BASE_(r13) /* 8001E6A8 0001B5E8 28 03 00 00 */ cmplwi r3, 0 /* 8001E6AC 0001B5EC 40 82 00 0C */ bne lbl_8001E6B8 /* 8001E6B0 0001B5F0 38 60 00 01 */ li r3, 1 @@ -11,7 +11,7 @@ lbl_8001E6B8: /* 8001E6BC 0001B5FC 2C 03 00 01 */ cmpwi r3, 1 /* 8001E6C0 0001B600 40 82 00 14 */ bne lbl_8001E6D4 /* 8001E6C4 0001B604 38 00 00 00 */ li r0, 0 -/* 8001E6C8 0001B608 90 0D 80 30 */ stw r0, lbl_804505B0-_SDA_BASE_(r13) +/* 8001E6C8 0001B608 90 0D 80 30 */ stw r0, l_fopOvlpM_overlap-_SDA_BASE_(r13) /* 8001E6CC 0001B60C 38 60 00 01 */ li r3, 1 /* 8001E6D0 0001B610 48 00 00 08 */ b lbl_8001E6D8 lbl_8001E6D4: |