diff options
| author | Pheenoh <pheenoh@gmail.com> | 2021-02-17 13:01:00 -0500 |
|---|---|---|
| committer | Pheenoh <pheenoh@gmail.com> | 2021-02-17 13:01:00 -0500 |
| commit | 327dff36bedfbf052b8bb450976d90bade9884b4 (patch) | |
| tree | 87b09d61be43a04d24ea7a75cd59e6b53c5cf9f6 /include | |
| parent | e262f2c2243eae5a962a95b981f627bb12418d60 (diff) | |
fopOvlpReq_Request OK
Diffstat (limited to 'include')
| -rw-r--r-- | include/f/f_op/f_op_overlap_req.h | 12 | ||||
| -rw-r--r-- | include/f/f_op/f_op_overlap_req/asm/func_8001E954.s | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/include/f/f_op/f_op_overlap_req.h b/include/f/f_op/f_op_overlap_req.h index fbc097a316..9a7c6c5586 100644 --- a/include/f/f_op/f_op_overlap_req.h +++ b/include/f/f_op/f_op_overlap_req.h @@ -1,9 +1,10 @@ #ifndef F_F_OP_OVERLAP_REQ_H_ #define F_F_OP_OVERLAP_REQ_H_ +#include "SComponent/c_phase.h" #include "SComponent/c_request.h" -#include "f/f_pc/f_pc_layer.h" #include "dolphin/types.h" +#include "f/f_pc/f_pc_layer.h" class overlap_request_class { public: @@ -18,14 +19,7 @@ public: u8 field_0x12; u8 field_0x13; int field_0x14; - u8 field_0x18; - u8 field_0x19; - u8 field_0x1a; - u8 field_0x1b; - u8 field_0x1c; - u8 field_0x1d; - u8 field_0x1e; - u8 field_0x1f; + request_of_phase_process_class field_0x18; u8* field_0x20; layer_class* pCurrentLayer; }; diff --git a/include/f/f_op/f_op_overlap_req/asm/func_8001E954.s b/include/f/f_op/f_op_overlap_req/asm/func_8001E954.s index 35247ac809..97fb20c692 100644 --- a/include/f/f_op/f_op_overlap_req/asm/func_8001E954.s +++ b/include/f/f_op/f_op_overlap_req/asm/func_8001E954.s @@ -16,8 +16,8 @@ lbl_8001E988: /* 8001E98C 0001B8CC 48 24 7E A5 */ bl cReq_Command__FP18request_base_classUc /* 8001E990 0001B8D0 B3 DD 00 10 */ sth r30, 0x10(r29) /* 8001E994 0001B8D4 38 7D 00 18 */ addi r3, r29, 0x18 -/* 8001E998 0001B8D8 3C 80 80 3A */ lis r4, lbl_803A3890@ha -/* 8001E99C 0001B8DC 38 84 38 90 */ addi r4, r4, lbl_803A3890@l +/* 8001E998 0001B8D8 3C 80 80 3A */ lis r4, phaseMethod@ha +/* 8001E99C 0001B8DC 38 84 38 90 */ addi r4, r4, phaseMethod@l /* 8001E9A0 0001B8E0 48 24 7C 91 */ bl cPhs_Set /* 8001E9A4 0001B8E4 7F A3 EB 78 */ mr r3, r29 /* 8001E9A8 0001B8E8 7F E4 FB 78 */ mr r4, r31 |