fopScnRq_Request attempt + clang-format

This commit is contained in:
Pheenoh
2021-03-20 21:14:41 -04:00
parent bcced20f39
commit 9245f01cbb
6 changed files with 62 additions and 51 deletions
+4 -4
View File
@@ -1,10 +1,10 @@
#ifndef F_F_OP_SCENE_REQ_H_
#define F_F_OP_SCENE_REQ_H_
#include "SComponent/c_phase.h"
#include "dolphin/types.h"
#include "f/f_op/f_op_scene_pause.h"
#include "f/f_pc/f_pc_node_req.h"
#include "SComponent/c_phase.h"
extern "C" {
void fopScnRq_Handler__Fv(void);
@@ -12,7 +12,7 @@ void fopScnRq_ReRequest(void);
}
class scene_request_class {
public:
public:
node_create_request mCrtReq;
u32 mFadeRequest;
request_of_phase_process_class mReqPhsProcCls;
@@ -20,7 +20,7 @@ class scene_request_class {
};
scene_request_class* fopScnRq_phase_ClearOverlap(scene_request_class* param_1);
u32 fopScnRq_Request(int, scene_class*, s16, void*, s16, u16);
u32 fopScnRq_ReRequest(unsigned int, s16, void*);
s32 fopScnRq_Request(int, scene_class*, s16, void*, s16, u16);
s32 fopScnRq_ReRequest(unsigned int, s16, void*);
#endif
@@ -9,8 +9,8 @@
/* 8001F054 0001BF94 7C C0 33 78 */ mr r0, r6
/* 8001F058 0001BF98 7C FA 3B 78 */ mr r26, r7
/* 8001F05C 0001BF9C 7D 1B 43 78 */ mr r27, r8
/* 8001F060 0001BFA0 3C 60 80 3A */ lis r3, lbl_803A38C8@ha
/* 8001F064 0001BFA4 3B E3 38 C8 */ addi r31, r3, lbl_803A38C8@l
/* 8001F060 0001BFA0 3C 60 80 3A */ lis r3, submethod@ha
/* 8001F064 0001BFA4 3B E3 38 C8 */ addi r31, r3, submethod@l
/* 8001F068 0001BFA8 3B C0 00 00 */ li r30, 0
/* 8001F06C 0001BFAC 3B BF 00 10 */ addi r29, r31, 0x10
/* 8001F070 0001BFB0 38 60 00 74 */ li r3, 0x74