fopScnM_ChangeReq OK

10 files changed, 30 insertions, 10 deletions

diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CC54.s b/include/d/d_com/d_com_inf_game/asm/func_8002CC54.s
index 9c8113cd3d..65d4751974 100644
--- a/include/d/d_com/d_com_inf_game/asm/func_8002CC54.s
+++ b/include/d/d_com/d_com_inf_game/asm/func_8002CC54.s
@@ -48,10 +48,10 @@ lbl_8002CD08:
 /* 8002CD0C 00029C4C  7F E4 FB 78 */ mr r4, r31
 /* 8002CD10 00029C50  38 A0 00 00 */ li r5, 0
 /* 8002CD14 00029C54  38 C0 00 1E */ li r6, 0x1e
-/* 8002CD18 00029C58  4B FF 1F C9 */ bl fopScnM_ChangeReq
+/* 8002CD18 00029C58  4B FF 1F C9 */ bl fopScnM_ChangeReq__FP11scene_classssUs
 /* 8002CD1C 00029C5C  7F E3 FB 78 */ mr r3, r31
 /* 8002CD20 00029C60  38 80 00 00 */ li r4, 0
-/* 8002CD24 00029C64  4B FF 20 A9 */ bl fopScnM_ReRequest
+/* 8002CD24 00029C64  4B FF 20 A9 */ bl fopScnM_ReRequest__FsUl
 /* 8002CD28 00029C68  38 60 00 01 */ li r3, 1
 /* 8002CD2C 00029C6C  83 E1 00 1C */ lwz r31, 0x1c(r1)
 /* 8002CD30 00029C70  83 C1 00 18 */ lwz r30, 0x18(r1)
diff --git a/include/d/d_stage/asm/func_80024460.s b/include/d/d_stage/asm/func_80024460.s
index bdc18eded6..68cc3c7f23 100644
--- a/include/d/d_stage/asm/func_80024460.s
+++ b/include/d/d_stage/asm/func_80024460.s
@@ -18,7 +18,7 @@ lbl_80024498:
 /* 800244A0 000213E0  38 80 7F FF */ li r4, 0x7fff
 /* 800244A4 000213E4  38 A0 00 00 */ li r5, 0
 /* 800244A8 000213E8  7F E6 FB 78 */ mr r6, r31
-/* 800244AC 000213EC  4B FF A8 D9 */ bl fopScnM_CreateReq
+/* 800244AC 000213EC  4B FF A8 D9 */ bl fopScnM_CreateReq__FssUsUl
 /* 800244B0 000213F0  2C 03 00 00 */ cmpwi r3, 0
 /* 800244B4 000213F4  40 82 00 18 */ bne lbl_800244CC
 /* 800244B8 000213F8  7F E3 FB 78 */ mr r3, r31
diff --git a/include/f/f_ap_game/asm/func_80018A44.s b/include/f/f_ap_game/asm/func_80018A44.s
index 01265e63b3..3b054d6ba3 100644
--- a/include/f/f_ap_game/asm/func_80018A44.s
+++ b/include/f/f_ap_game/asm/func_80018A44.s
@@ -1,7 +1,7 @@
 /* 80018A44 00015984  94 21 FF F0 */ stwu r1, -0x10(r1)
 /* 80018A48 00015988  7C 08 02 A6 */ mflr r0
 /* 80018A4C 0001598C  90 01 00 14 */ stw r0, 0x14(r1)
-/* 80018A50 00015990  48 00 63 C1 */ bl fopScnM_Management
+/* 80018A50 00015990  48 00 63 C1 */ bl fopScnM_Management__Fv
 /* 80018A54 00015994  48 00 5B FD */ bl fopOvlpM_Management__Fv
 /* 80018A58 00015998  48 00 59 1D */ bl fopCamM_Management
 /* 80018A5C 0001599C  80 01 00 14 */ lwz r0, 0x14(r1)
diff --git a/include/f/f_ap_game/asm/func_80018AA0.s b/include/f/f_ap_game/asm/func_80018AA0.s
index 75ea6c239c..ae821aab5c 100644
--- a/include/f/f_ap_game/asm/func_80018AA0.s
+++ b/include/f/f_ap_game/asm/func_80018AA0.s
@@ -2,7 +2,7 @@
 /* 80018AA4 000159E4  7C 08 02 A6 */ mflr r0
 /* 80018AA8 000159E8  90 01 00 14 */ stw r0, 0x14(r1)
 /* 80018AAC 000159EC  48 00 98 0D */ bl fpcM_Init
-/* 80018AB0 000159F0  48 00 63 81 */ bl fopScnM_Init
+/* 80018AB0 000159F0  48 00 63 81 */ bl fopScnM_Init__Fv
 /* 80018AB4 000159F4  48 00 5C 35 */ bl fopOvlpM_Init__Fv
 /* 80018AB8 000159F8  48 00 58 C1 */ bl fopCamM_Init__Fv
 /* 80018ABC 000159FC  48 00 7A 5D */ bl fopDwTg_CreateQueue
diff --git a/include/f/f_op/f_op_scene_mng.h b/include/f/f_op/f_op_scene_mng.h
index e8fe8e87bb..74b2e30928 100644
--- a/include/f/f_op/f_op_scene_mng.h
+++ b/include/f/f_op/f_op_scene_mng.h
@@ -1,5 +1,14 @@
 #ifndef F_F_OP_SCENE_MNG_H_
 #define F_F_OP_SCENE_MNG_H_
 
+#include "f/f_op/f_op_scene_pause.h"
+
+void* fopScnM_SearchByID(unsigned int id);
+int fopScnM_ChangeReq(scene_class*, s16, s16, u16);
+void fopScnM_DeleteReq(scene_class*);
+void fopScnM_CreateReq(s16, s16, u16, u32);
+void fopScnM_ReRequest(s16, u32) ;
 void fopScnM_Management(void);
+void fopScnM_Init(void);
+
 #endif
\ No newline at end of file
diff --git a/include/f/f_op/f_op_scene_req.h b/include/f/f_op/f_op_scene_req.h
new file mode 100644
index 0000000000..903058e795
--- /dev/null
+++ b/include/f/f_op/f_op_scene_req.h
@@ -0,0 +1,11 @@
+#ifndef F_F_OP_SCENE_REQ_H_
+#define F_F_OP_SCENE_REQ_H_
+
+extern "C" {
+void fopScnRq_Handler(void);
+void fopScnRq_ReRequest(void);
+}
+
+u32 fopScnRq_Request(int,scene_class*,s16,void*,s16,u16);
+
+#endif
\ No newline at end of file
diff --git a/include/f/f_op_scene_mng/asm/func_8001ECE0.s b/include/f/f_op_scene_mng/asm/func_8001ECE0.s
index 14f3a4a9fc..ee06fc2814 100644
--- a/include/f/f_op_scene_mng/asm/func_8001ECE0.s
+++ b/include/f/f_op_scene_mng/asm/func_8001ECE0.s
@@ -9,14 +9,14 @@
 /* 8001ED00 0001BC40  7D 24 4B 78 */ mr r4, r9
 /* 8001ED04 0001BC44  7C 05 03 78 */ mr r5, r0
 /* 8001ED08 0001BC48  38 C0 00 00 */ li r6, 0
-/* 8001ED0C 0001BC4C  48 00 03 29 */ bl fopScnRq_Request
+/* 8001ED0C 0001BC4C  48 00 03 29 */ bl fopScnRq_Request__FiP11scene_classsPvsUs
 /* 8001ED10 0001BC50  3C 03 00 01 */ addis r0, r3, 1
 /* 8001ED14 0001BC54  28 00 FF FF */ cmplwi r0, 0xffff
 /* 8001ED18 0001BC58  40 82 00 0C */ bne lbl_8001ED24
 /* 8001ED1C 0001BC5C  38 60 00 00 */ li r3, 0
 /* 8001ED20 0001BC60  48 00 00 0C */ b lbl_8001ED2C
 lbl_8001ED24:
-/* 8001ED24 0001BC64  90 6D 80 38 */ stw r3, lbl_804505B8-_SDA_BASE_(r13)
+/* 8001ED24 0001BC64  90 6D 80 38 */ stw r3, l_scnRqID-_SDA_BASE_(r13)
 /* 8001ED28 0001BC68  38 60 00 01 */ li r3, 1
 lbl_8001ED2C:
 /* 8001ED2C 0001BC6C  80 01 00 14 */ lwz r0, 0x14(r1)
diff --git a/include/f/f_op_scene_mng/asm/func_8001ED3C.s b/include/f/f_op_scene_mng/asm/func_8001ED3C.s
index 95594e7868..91b6bc9b7e 100644
--- a/include/f/f_op_scene_mng/asm/func_8001ED3C.s
+++ b/include/f/f_op_scene_mng/asm/func_8001ED3C.s
@@ -7,7 +7,7 @@
 /* 8001ED54 0001BC94  38 C0 00 00 */ li r6, 0
 /* 8001ED58 0001BC98  38 E0 7F FF */ li r7, 0x7fff
 /* 8001ED5C 0001BC9C  39 00 00 00 */ li r8, 0
-/* 8001ED60 0001BCA0  48 00 02 D5 */ bl fopScnRq_Request
+/* 8001ED60 0001BCA0  48 00 02 D5 */ bl fopScnRq_Request__FiP11scene_classsPvsUs
 /* 8001ED64 0001BCA4  20 63 FF FF */ subfic r3, r3, -1
 /* 8001ED68 0001BCA8  30 03 FF FF */ addic r0, r3, -1
 /* 8001ED6C 0001BCAC  7C 00 19 10 */ subfe r0, r0, r3
diff --git a/include/f/f_op_scene_mng/asm/func_8001ED84.s b/include/f/f_op_scene_mng/asm/func_8001ED84.s
index c8a5ff98d6..9f3d577820 100644
--- a/include/f/f_op_scene_mng/asm/func_8001ED84.s
+++ b/include/f/f_op_scene_mng/asm/func_8001ED84.s
@@ -7,7 +7,7 @@
 /* 8001ED9C 0001BCDC  38 60 00 00 */ li r3, 0
 /* 8001EDA0 0001BCE0  38 80 00 00 */ li r4, 0
 /* 8001EDA4 0001BCE4  7C 05 03 78 */ mr r5, r0
-/* 8001EDA8 0001BCE8  48 00 02 8D */ bl fopScnRq_Request
+/* 8001EDA8 0001BCE8  48 00 02 8D */ bl fopScnRq_Request__FiP11scene_classsPvsUs
 /* 8001EDAC 0001BCEC  20 63 FF FF */ subfic r3, r3, -1
 /* 8001EDB0 0001BCF0  30 03 FF FF */ addic r0, r3, -1
 /* 8001EDB4 0001BCF4  7C 00 19 10 */ subfe r0, r0, r3
diff --git a/include/f/f_op_scene_mng/asm/func_8001EDCC.s b/include/f/f_op_scene_mng/asm/func_8001EDCC.s
index 9e8765ec4e..d1d4014be6 100644
--- a/include/f/f_op_scene_mng/asm/func_8001EDCC.s
+++ b/include/f/f_op_scene_mng/asm/func_8001EDCC.s
@@ -3,7 +3,7 @@
 /* 8001EDD4 0001BD14  90 01 00 14 */ stw r0, 0x14(r1)
 /* 8001EDD8 0001BD18  7C 66 1B 78 */ mr r6, r3
 /* 8001EDDC 0001BD1C  7C 85 23 78 */ mr r5, r4
-/* 8001EDE0 0001BD20  80 6D 80 38 */ lwz r3, lbl_804505B8-_SDA_BASE_(r13)
+/* 8001EDE0 0001BD20  80 6D 80 38 */ lwz r3, l_scnRqID-_SDA_BASE_(r13)
 /* 8001EDE4 0001BD24  3C 03 00 01 */ addis r0, r3, 1
 /* 8001EDE8 0001BD28  28 00 FF FF */ cmplwi r0, 0xffff
 /* 8001EDEC 0001BD2C  40 82 00 0C */ bne lbl_8001EDF8