diff --git a/asm/f/op/scene/f_op_scene_iter.s b/asm/f/op/scene/f_op_scene_iter.s deleted file mode 100644 index fa96cdda3fd..00000000000 --- a/asm/f/op/scene/f_op_scene_iter.s +++ /dev/null @@ -1,25 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 8001ec74 - - -.global fopScnIt_Judge -fopScnIt_Judge: -/* 8001EC74 0001BBB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001EC78 0001BBB8 7C 08 02 A6 */ mflr r0 -/* 8001EC7C 0001BBBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001EC80 0001BBC0 90 61 00 08 */ stw r3, 8(r1) -/* 8001EC84 0001BBC4 90 81 00 0C */ stw r4, 0xc(r1) -/* 8001EC88 0001BBC8 3C 60 80 3A */ lis r3, lbl_803A3918@ha -/* 8001EC8C 0001BBCC 38 63 39 18 */ addi r3, r3, lbl_803A3918@l -.global cTgIt_JudgeFilter -/* 8001EC90 0001BBD0 3C 80 80 26 */ lis r4, cTgIt_JudgeFilter@ha -.global cTgIt_JudgeFilter -/* 8001EC94 0001BBD4 38 84 6A B0 */ addi r4, r4, cTgIt_JudgeFilter@l -/* 8001EC98 0001BBD8 38 A1 00 08 */ addi r5, r1, 8 -/* 8001EC9C 0001BBDC 48 24 73 FD */ bl cLsIt_Judge -/* 8001ECA0 0001BBE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001ECA4 0001BBE4 7C 08 03 A6 */ mtlr r0 -/* 8001ECA8 0001BBE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001ECAC 0001BBEC 4E 80 00 20 */ blr - diff --git a/asm/f/op/scene/f_op_scene_pause.s b/asm/f/op/scene/f_op_scene_pause.s deleted file mode 100644 index 7a8b40b8459..00000000000 --- a/asm/f/op/scene/f_op_scene_pause.s +++ /dev/null @@ -1,83 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 80020548 - - -.global fopScnPause_Enable__FP11scene_class -fopScnPause_Enable__FP11scene_class: -/* 80020548 0001D488 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002054C 0001D48C 7C 08 02 A6 */ mflr r0 -/* 80020550 0001D490 90 01 00 14 */ stw r0, 0x14(r1) -/* 80020554 0001D494 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80020558 0001D498 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8002055C 0001D49C 41 82 00 20 */ beq lbl_8002057C -/* 80020560 0001D4A0 38 80 00 01 */ li r4, 1 -/* 80020564 0001D4A4 48 00 1E 09 */ bl fpcM_PauseEnable -/* 80020568 0001D4A8 7F E3 FB 78 */ mr r3, r31 -/* 8002056C 0001D4AC 38 80 00 02 */ li r4, 2 -/* 80020570 0001D4B0 48 00 1D FD */ bl fpcM_PauseEnable -/* 80020574 0001D4B4 38 60 00 01 */ li r3, 1 -/* 80020578 0001D4B8 48 00 00 08 */ b lbl_80020580 -lbl_8002057C: -/* 8002057C 0001D4BC 38 60 00 00 */ li r3, 0 -lbl_80020580: -/* 80020580 0001D4C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80020584 0001D4C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80020588 0001D4C8 7C 08 03 A6 */ mtlr r0 -/* 8002058C 0001D4CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80020590 0001D4D0 4E 80 00 20 */ blr - -.global fopScnPause_Disable__FP11scene_class -fopScnPause_Disable__FP11scene_class: -/* 80020594 0001D4D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80020598 0001D4D8 7C 08 02 A6 */ mflr r0 -/* 8002059C 0001D4DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800205A0 0001D4E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800205A4 0001D4E4 93 C1 00 08 */ stw r30, 8(r1) -/* 800205A8 0001D4E8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 800205AC 0001D4EC 41 82 00 84 */ beq lbl_80020630 -/* 800205B0 0001D4F0 80 9E 00 2C */ lwz r4, 0x2c(r30) -/* 800205B4 0001D4F4 83 E4 00 18 */ lwz r31, 0x18(r4) -/* 800205B8 0001D4F8 28 1F 00 00 */ cmplwi r31, 0 -/* 800205BC 0001D4FC 40 82 00 1C */ bne lbl_800205D8 -/* 800205C0 0001D500 38 80 00 01 */ li r4, 1 -/* 800205C4 0001D504 48 00 1D CD */ bl fpcM_PauseDisable -/* 800205C8 0001D508 7F C3 F3 78 */ mr r3, r30 -/* 800205CC 0001D50C 38 80 00 02 */ li r4, 2 -/* 800205D0 0001D510 48 00 1D C1 */ bl fpcM_PauseDisable -/* 800205D4 0001D514 48 00 00 54 */ b lbl_80020628 -lbl_800205D8: -/* 800205D8 0001D518 80 7F 00 04 */ lwz r3, 4(r31) -/* 800205DC 0001D51C 48 00 0D C1 */ bl fpcEx_IsExist -/* 800205E0 0001D520 2C 03 00 01 */ cmpwi r3, 1 -/* 800205E4 0001D524 40 82 00 44 */ bne lbl_80020628 -/* 800205E8 0001D528 7F E3 FB 78 */ mr r3, r31 -/* 800205EC 0001D52C 38 80 00 01 */ li r4, 1 -/* 800205F0 0001D530 48 00 1D 59 */ bl fpcM_IsPause -/* 800205F4 0001D534 2C 03 00 00 */ cmpwi r3, 0 -/* 800205F8 0001D538 40 82 00 10 */ bne lbl_80020608 -/* 800205FC 0001D53C 7F C3 F3 78 */ mr r3, r30 -/* 80020600 0001D540 38 80 00 01 */ li r4, 1 -/* 80020604 0001D544 48 00 1D 8D */ bl fpcM_PauseDisable -lbl_80020608: -/* 80020608 0001D548 7F E3 FB 78 */ mr r3, r31 -/* 8002060C 0001D54C 38 80 00 02 */ li r4, 2 -/* 80020610 0001D550 48 00 1D 39 */ bl fpcM_IsPause -/* 80020614 0001D554 2C 03 00 00 */ cmpwi r3, 0 -/* 80020618 0001D558 40 82 00 10 */ bne lbl_80020628 -/* 8002061C 0001D55C 7F C3 F3 78 */ mr r3, r30 -/* 80020620 0001D560 38 80 00 02 */ li r4, 2 -/* 80020624 0001D564 48 00 1D 6D */ bl fpcM_PauseDisable -lbl_80020628: -/* 80020628 0001D568 38 60 00 01 */ li r3, 1 -/* 8002062C 0001D56C 48 00 00 08 */ b lbl_80020634 -lbl_80020630: -/* 80020630 0001D570 38 60 00 00 */ li r3, 0 -lbl_80020634: -/* 80020634 0001D574 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80020638 0001D578 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002063C 0001D57C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80020640 0001D580 7C 08 03 A6 */ mtlr r0 -/* 80020644 0001D584 38 21 00 10 */ addi r1, r1, 0x10 -/* 80020648 0001D588 4E 80 00 20 */ blr - diff --git a/asm/f/op/scene/f_op_scene_req.s b/asm/f/op/scene/f_op_scene_req.s index 87dd035cef1..4702e3a9d04 100644 --- a/asm/f/op/scene/f_op_scene_req.s +++ b/asm/f/op/scene/f_op_scene_req.s @@ -2,7 +2,8 @@ .section .text, "ax" # 8001ee34 - +.global fopScnRq_phase_ClearOverlap +fopScnRq_phase_ClearOverlap: /* 8001EE34 0001BD74 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001EE38 0001BD78 7C 08 02 A6 */ mflr r0 /* 8001EE3C 0001BD7C 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/f/op/scene/f_op_scene_tag.s b/asm/f/op/scene/f_op_scene_tag.s deleted file mode 100644 index e66c5383b7b..00000000000 --- a/asm/f/op/scene/f_op_scene_tag.s +++ /dev/null @@ -1,40 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 8001f13c - - -.global fopScnTg_QueueTo -fopScnTg_QueueTo: -/* 8001F13C 0001C07C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F140 0001C080 7C 08 02 A6 */ mflr r0 -/* 8001F144 0001C084 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F148 0001C088 48 24 78 5D */ bl cTg_SingleCut -/* 8001F14C 0001C08C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F150 0001C090 7C 08 03 A6 */ mtlr r0 -/* 8001F154 0001C094 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F158 0001C098 4E 80 00 20 */ blr - -.global fopScnTg_ToQueue -fopScnTg_ToQueue: -/* 8001F15C 0001C09C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F160 0001C0A0 7C 08 02 A6 */ mflr r0 -/* 8001F164 0001C0A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F168 0001C0A8 7C 64 1B 78 */ mr r4, r3 -/* 8001F16C 0001C0AC 3C 60 80 3A */ lis r3, lbl_803A3918@ha -/* 8001F170 0001C0B0 38 63 39 18 */ addi r3, r3, lbl_803A3918@l -/* 8001F174 0001C0B4 48 24 78 71 */ bl cTg_Addition -/* 8001F178 0001C0B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F17C 0001C0BC 7C 08 03 A6 */ mtlr r0 -/* 8001F180 0001C0C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F184 0001C0C4 4E 80 00 20 */ blr - -.global fopScnTg_Init -fopScnTg_Init: -/* 8001F188 0001C0C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F18C 0001C0CC 7C 08 02 A6 */ mflr r0 -/* 8001F190 0001C0D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F194 0001C0D4 48 24 78 A1 */ bl cTg_Create -/* 8001F198 0001C0D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F19C 0001C0DC 7C 08 03 A6 */ mtlr r0 -/* 8001F1A0 0001C0E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F1A4 0001C0E4 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_scene_iter/asm/func_8001EC74.s b/include/f/f_op/f_op_scene_iter/asm/func_8001EC74.s new file mode 100644 index 00000000000..9420ce3396f --- /dev/null +++ b/include/f/f_op/f_op_scene_iter/asm/func_8001EC74.s @@ -0,0 +1,17 @@ +/* 8001EC74 0001BBB4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001EC78 0001BBB8 7C 08 02 A6 */ mflr r0 +/* 8001EC7C 0001BBBC 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001EC80 0001BBC0 90 61 00 08 */ stw r3, 8(r1) +/* 8001EC84 0001BBC4 90 81 00 0C */ stw r4, 0xc(r1) +/* 8001EC88 0001BBC8 3C 60 80 3A */ lis r3, lbl_803A3918@ha +/* 8001EC8C 0001BBCC 38 63 39 18 */ addi r3, r3, lbl_803A3918@l +/*.global cTgIt_JudgeFilter*/ +/* 8001EC90 0001BBD0 3C 80 80 26 */ lis r4, cTgIt_JudgeFilter@ha +/*.global cTgIt_JudgeFilter*/ +/* 8001EC94 0001BBD4 38 84 6A B0 */ addi r4, r4, cTgIt_JudgeFilter@l +/* 8001EC98 0001BBD8 38 A1 00 08 */ addi r5, r1, 8 +/* 8001EC9C 0001BBDC 48 24 73 FD */ bl cLsIt_Judge +/* 8001ECA0 0001BBE0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001ECA4 0001BBE4 7C 08 03 A6 */ mtlr r0 +/* 8001ECA8 0001BBE8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001ECAC 0001BBEC 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_scene_pause/asm/func_80020548.s b/include/f/f_op/f_op_scene_pause/asm/func_80020548.s new file mode 100644 index 00000000000..ac16275143f --- /dev/null +++ b/include/f/f_op/f_op_scene_pause/asm/func_80020548.s @@ -0,0 +1,21 @@ +/* 80020548 0001D488 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8002054C 0001D48C 7C 08 02 A6 */ mflr r0 +/* 80020550 0001D490 90 01 00 14 */ stw r0, 0x14(r1) +/* 80020554 0001D494 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80020558 0001D498 7C 7F 1B 79 */ or. r31, r3, r3 +/* 8002055C 0001D49C 41 82 00 20 */ beq lbl_8002057C +/* 80020560 0001D4A0 38 80 00 01 */ li r4, 1 +/* 80020564 0001D4A4 48 00 1E 09 */ bl fpcM_PauseEnable +/* 80020568 0001D4A8 7F E3 FB 78 */ mr r3, r31 +/* 8002056C 0001D4AC 38 80 00 02 */ li r4, 2 +/* 80020570 0001D4B0 48 00 1D FD */ bl fpcM_PauseEnable +/* 80020574 0001D4B4 38 60 00 01 */ li r3, 1 +/* 80020578 0001D4B8 48 00 00 08 */ b lbl_80020580 +lbl_8002057C: +/* 8002057C 0001D4BC 38 60 00 00 */ li r3, 0 +lbl_80020580: +/* 80020580 0001D4C0 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80020584 0001D4C4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80020588 0001D4C8 7C 08 03 A6 */ mtlr r0 +/* 8002058C 0001D4CC 38 21 00 10 */ addi r1, r1, 0x10 +/* 80020590 0001D4D0 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_scene_pause/asm/func_80020594.s b/include/f/f_op/f_op_scene_pause/asm/func_80020594.s new file mode 100644 index 00000000000..0811fde82e8 --- /dev/null +++ b/include/f/f_op/f_op_scene_pause/asm/func_80020594.s @@ -0,0 +1,51 @@ +/* 80020594 0001D4D4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80020598 0001D4D8 7C 08 02 A6 */ mflr r0 +/* 8002059C 0001D4DC 90 01 00 14 */ stw r0, 0x14(r1) +/* 800205A0 0001D4E0 93 E1 00 0C */ stw r31, 0xc(r1) +/* 800205A4 0001D4E4 93 C1 00 08 */ stw r30, 8(r1) +/* 800205A8 0001D4E8 7C 7E 1B 79 */ or. r30, r3, r3 +/* 800205AC 0001D4EC 41 82 00 84 */ beq lbl_80020630 +/* 800205B0 0001D4F0 80 9E 00 2C */ lwz r4, 0x2c(r30) +/* 800205B4 0001D4F4 83 E4 00 18 */ lwz r31, 0x18(r4) +/* 800205B8 0001D4F8 28 1F 00 00 */ cmplwi r31, 0 +/* 800205BC 0001D4FC 40 82 00 1C */ bne lbl_800205D8 +/* 800205C0 0001D500 38 80 00 01 */ li r4, 1 +/* 800205C4 0001D504 48 00 1D CD */ bl fpcM_PauseDisable +/* 800205C8 0001D508 7F C3 F3 78 */ mr r3, r30 +/* 800205CC 0001D50C 38 80 00 02 */ li r4, 2 +/* 800205D0 0001D510 48 00 1D C1 */ bl fpcM_PauseDisable +/* 800205D4 0001D514 48 00 00 54 */ b lbl_80020628 +lbl_800205D8: +/* 800205D8 0001D518 80 7F 00 04 */ lwz r3, 4(r31) +/* 800205DC 0001D51C 48 00 0D C1 */ bl fpcEx_IsExist +/* 800205E0 0001D520 2C 03 00 01 */ cmpwi r3, 1 +/* 800205E4 0001D524 40 82 00 44 */ bne lbl_80020628 +/* 800205E8 0001D528 7F E3 FB 78 */ mr r3, r31 +/* 800205EC 0001D52C 38 80 00 01 */ li r4, 1 +/* 800205F0 0001D530 48 00 1D 59 */ bl fpcM_IsPause +/* 800205F4 0001D534 2C 03 00 00 */ cmpwi r3, 0 +/* 800205F8 0001D538 40 82 00 10 */ bne lbl_80020608 +/* 800205FC 0001D53C 7F C3 F3 78 */ mr r3, r30 +/* 80020600 0001D540 38 80 00 01 */ li r4, 1 +/* 80020604 0001D544 48 00 1D 8D */ bl fpcM_PauseDisable +lbl_80020608: +/* 80020608 0001D548 7F E3 FB 78 */ mr r3, r31 +/* 8002060C 0001D54C 38 80 00 02 */ li r4, 2 +/* 80020610 0001D550 48 00 1D 39 */ bl fpcM_IsPause +/* 80020614 0001D554 2C 03 00 00 */ cmpwi r3, 0 +/* 80020618 0001D558 40 82 00 10 */ bne lbl_80020628 +/* 8002061C 0001D55C 7F C3 F3 78 */ mr r3, r30 +/* 80020620 0001D560 38 80 00 02 */ li r4, 2 +/* 80020624 0001D564 48 00 1D 6D */ bl fpcM_PauseDisable +lbl_80020628: +/* 80020628 0001D568 38 60 00 01 */ li r3, 1 +/* 8002062C 0001D56C 48 00 00 08 */ b lbl_80020634 +lbl_80020630: +/* 80020630 0001D570 38 60 00 00 */ li r3, 0 +lbl_80020634: +/* 80020634 0001D574 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80020638 0001D578 83 C1 00 08 */ lwz r30, 8(r1) +/* 8002063C 0001D57C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80020640 0001D580 7C 08 03 A6 */ mtlr r0 +/* 80020644 0001D584 38 21 00 10 */ addi r1, r1, 0x10 +/* 80020648 0001D588 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_scene_req/asm/func_8001EE34.s b/include/f/f_op/f_op_scene_req/asm/func_8001EE34.s new file mode 100644 index 00000000000..6614fadcbbf --- /dev/null +++ b/include/f/f_op/f_op_scene_req/asm/func_8001EE34.s @@ -0,0 +1,13 @@ +/* 8001EE34 0001BD74 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001EE38 0001BD78 7C 08 02 A6 */ mflr r0 +/* 8001EE3C 0001BD7C 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001EE40 0001BD80 4B FF F7 91 */ bl fopOvlpM_ClearOfReq__Fv +/* 8001EE44 0001BD84 2C 03 00 01 */ cmpwi r3, 1 +/* 8001EE48 0001BD88 38 60 00 00 */ li r3, 0 +/* 8001EE4C 0001BD8C 40 82 00 08 */ bne lbl_8001EE54 +/* 8001EE50 0001BD90 38 60 00 02 */ li r3, 2 +lbl_8001EE54: +/* 8001EE54 0001BD94 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001EE58 0001BD98 7C 08 03 A6 */ mtlr r0 +/* 8001EE5C 0001BD9C 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001EE60 0001BDA0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_scene_req/asm/func_8001EE64.s b/include/f/f_op/f_op_scene_req/asm/func_8001EE64.s new file mode 100644 index 00000000000..492193979c0 --- /dev/null +++ b/include/f/f_op/f_op_scene_req/asm/func_8001EE64.s @@ -0,0 +1,8 @@ +/* 8001EE64 0001BDA4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001EE68 0001BDA8 7C 08 02 A6 */ mflr r0 +/* 8001EE6C 0001BDAC 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001EE70 0001BDB0 48 00 3B 69 */ bl fpcNdRq_Execute +/* 8001EE74 0001BDB4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001EE78 0001BDB8 7C 08 03 A6 */ mtlr r0 +/* 8001EE7C 0001BDBC 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001EE80 0001BDC0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_scene_req/asm/func_8001EE84.s b/include/f/f_op/f_op_scene_req/asm/func_8001EE84.s new file mode 100644 index 00000000000..efe254d31c7 --- /dev/null +++ b/include/f/f_op/f_op_scene_req/asm/func_8001EE84.s @@ -0,0 +1,13 @@ +/* 8001EE84 0001BDC4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001EE88 0001BDC8 7C 08 02 A6 */ mflr r0 +/* 8001EE8C 0001BDCC 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001EE90 0001BDD0 4B FF F7 19 */ bl fopOvlpM_IsDoingReq__Fv +/* 8001EE94 0001BDD4 2C 03 00 01 */ cmpwi r3, 1 +/* 8001EE98 0001BDD8 38 60 00 00 */ li r3, 0 +/* 8001EE9C 0001BDDC 40 82 00 08 */ bne lbl_8001EEA4 +/* 8001EEA0 0001BDE0 38 60 00 02 */ li r3, 2 +lbl_8001EEA4: +/* 8001EEA4 0001BDE4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001EEA8 0001BDE8 7C 08 03 A6 */ mtlr r0 +/* 8001EEAC 0001BDEC 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001EEB0 0001BDF0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_scene_req/asm/func_8001EEB4.s b/include/f/f_op/f_op_scene_req/asm/func_8001EEB4.s new file mode 100644 index 00000000000..7691c2e2ab5 --- /dev/null +++ b/include/f/f_op/f_op_scene_req/asm/func_8001EEB4.s @@ -0,0 +1,13 @@ +/* 8001EEB4 0001BDF4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001EEB8 0001BDF8 7C 08 02 A6 */ mflr r0 +/* 8001EEBC 0001BDFC 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001EEC0 0001BE00 4B FF F6 B5 */ bl fopOvlpM_IsDone__Fv +/* 8001EEC4 0001BE04 2C 03 00 01 */ cmpwi r3, 1 +/* 8001EEC8 0001BE08 38 60 00 00 */ li r3, 0 +/* 8001EECC 0001BE0C 40 82 00 08 */ bne lbl_8001EED4 +/* 8001EED0 0001BE10 38 60 00 02 */ li r3, 2 +lbl_8001EED4: +/* 8001EED4 0001BE14 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001EED8 0001BE18 7C 08 03 A6 */ mtlr r0 +/* 8001EEDC 0001BE1C 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001EEE0 0001BE20 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_scene_req/asm/func_8001EEE4.s b/include/f/f_op/f_op_scene_req/asm/func_8001EEE4.s new file mode 100644 index 00000000000..a5e571c0fca --- /dev/null +++ b/include/f/f_op/f_op_scene_req/asm/func_8001EEE4.s @@ -0,0 +1,17 @@ +/* 8001EEE4 0001BE24 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001EEE8 0001BE28 7C 08 02 A6 */ mflr r0 +/* 8001EEEC 0001BE2C 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001EEF0 0001BE30 80 03 00 40 */ lwz r0, 0x40(r3) +/* 8001EEF4 0001BE34 2C 00 00 01 */ cmpwi r0, 1 +/* 8001EEF8 0001BE38 41 82 00 10 */ beq lbl_8001EF08 +/* 8001EEFC 0001BE3C 80 63 00 54 */ lwz r3, 0x54(r3) +/* 8001EF00 0001BE40 48 00 24 59 */ bl fpcEx_SearchByID +/* 8001EF04 0001BE44 48 00 16 91 */ bl fopScnPause_Disable__FP11scene_class +lbl_8001EF08: +/* 8001EF08 0001BE48 38 00 00 00 */ li r0, 0 +/* 8001EF0C 0001BE4C 90 0D 87 60 */ stw r0, lbl_80450CE0-_SDA_BASE_(r13) +/* 8001EF10 0001BE50 38 60 00 02 */ li r3, 2 +/* 8001EF14 0001BE54 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001EF18 0001BE58 7C 08 03 A6 */ mtlr r0 +/* 8001EF1C 0001BE5C 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001EF20 0001BE60 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_scene_req/asm/func_8001EF24.s b/include/f/f_op/f_op_scene_req/asm/func_8001EF24.s new file mode 100644 index 00000000000..f9284f27a9e --- /dev/null +++ b/include/f/f_op/f_op_scene_req/asm/func_8001EF24.s @@ -0,0 +1,20 @@ +/* 8001EF24 0001BE64 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001EF28 0001BE68 7C 08 02 A6 */ mflr r0 +/* 8001EF2C 0001BE6C 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001EF30 0001BE70 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8001EF34 0001BE74 7C 7F 1B 78 */ mr r31, r3 +/* 8001EF38 0001BE78 38 7F 00 68 */ addi r3, r31, 0x68 +/* 8001EF3C 0001BE7C 7F E4 FB 78 */ mr r4, r31 +/* 8001EF40 0001BE80 48 24 77 99 */ bl cPhs_Do +/* 8001EF44 0001BE84 2C 03 00 02 */ cmpwi r3, 2 +/* 8001EF48 0001BE88 41 82 00 08 */ beq lbl_8001EF50 +/* 8001EF4C 0001BE8C 48 00 00 0C */ b lbl_8001EF58 +lbl_8001EF50: +/* 8001EF50 0001BE90 7F E3 FB 78 */ mr r3, r31 +/* 8001EF54 0001BE94 4B FF FF D1 */ bl fopScnRq_Execute +lbl_8001EF58: +/* 8001EF58 0001BE98 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8001EF5C 0001BE9C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001EF60 0001BEA0 7C 08 03 A6 */ mtlr r0 +/* 8001EF64 0001BEA4 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001EF68 0001BEA8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_scene_req/asm/func_8001EF6C.s b/include/f/f_op/f_op_scene_req/asm/func_8001EF6C.s new file mode 100644 index 00000000000..ad0f6aad919 --- /dev/null +++ b/include/f/f_op/f_op_scene_req/asm/func_8001EF6C.s @@ -0,0 +1,18 @@ +/* 8001EF6C 0001BEAC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001EF70 0001BEB0 7C 08 02 A6 */ mflr r0 +/* 8001EF74 0001BEB4 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001EF78 0001BEB8 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8001EF7C 0001BEBC 7C 7F 1B 78 */ mr r31, r3 +/* 8001EF80 0001BEC0 80 04 00 64 */ lwz r0, 0x64(r4) +/* 8001EF84 0001BEC4 28 00 00 00 */ cmplwi r0, 0 +/* 8001EF88 0001BEC8 41 82 00 10 */ beq lbl_8001EF98 +/* 8001EF8C 0001BECC 48 00 15 BD */ bl fopScnPause_Enable__FP11scene_class +/* 8001EF90 0001BED0 80 7F 00 04 */ lwz r3, 4(r31) +/* 8001EF94 0001BED4 4B FF F5 AD */ bl fopOvlpM_ToldAboutID__FUi +lbl_8001EF98: +/* 8001EF98 0001BED8 38 60 00 01 */ li r3, 1 +/* 8001EF9C 0001BEDC 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8001EFA0 0001BEE0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001EFA4 0001BEE4 7C 08 03 A6 */ mtlr r0 +/* 8001EFA8 0001BEE8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001EFAC 0001BEEC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_scene_req/asm/func_8001EFB0.s b/include/f/f_op/f_op_scene_req/asm/func_8001EFB0.s new file mode 100644 index 00000000000..12a72c82cc4 --- /dev/null +++ b/include/f/f_op/f_op_scene_req/asm/func_8001EFB0.s @@ -0,0 +1,18 @@ +/* 8001EFB0 0001BEF0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001EFB4 0001BEF4 7C 08 02 A6 */ mflr r0 +/* 8001EFB8 0001BEF8 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001EFBC 0001BEFC 80 03 00 64 */ lwz r0, 0x64(r3) +/* 8001EFC0 0001BF00 28 00 00 00 */ cmplwi r0, 0 +/* 8001EFC4 0001BF04 41 82 00 18 */ beq lbl_8001EFDC +/* 8001EFC8 0001BF08 4B FF F6 D1 */ bl fopOvlpM_Cancel__Fv +/* 8001EFCC 0001BF0C 2C 03 00 00 */ cmpwi r3, 0 +/* 8001EFD0 0001BF10 40 82 00 0C */ bne lbl_8001EFDC +/* 8001EFD4 0001BF14 38 60 00 00 */ li r3, 0 +/* 8001EFD8 0001BF18 48 00 00 08 */ b lbl_8001EFE0 +lbl_8001EFDC: +/* 8001EFDC 0001BF1C 38 60 00 01 */ li r3, 1 +lbl_8001EFE0: +/* 8001EFE0 0001BF20 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001EFE4 0001BF24 7C 08 03 A6 */ mtlr r0 +/* 8001EFE8 0001BF28 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001EFEC 0001BF2C 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_scene_req/asm/func_8001EFF0.s b/include/f/f_op/f_op_scene_req/asm/func_8001EFF0.s new file mode 100644 index 00000000000..d24d01bd06b --- /dev/null +++ b/include/f/f_op/f_op_scene_req/asm/func_8001EFF0.s @@ -0,0 +1,18 @@ +/* 8001EFF0 0001BF30 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001EFF4 0001BF34 7C 08 02 A6 */ mflr r0 +/* 8001EFF8 0001BF38 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001EFFC 0001BF3C 38 A0 00 00 */ li r5, 0 +/* 8001F000 0001BF40 80 0D 87 60 */ lwz r0, lbl_80450CE0-_SDA_BASE_(r13) +/* 8001F004 0001BF44 2C 00 00 00 */ cmpwi r0, 0 +/* 8001F008 0001BF48 40 82 00 18 */ bne lbl_8001F020 +/* 8001F00C 0001BF4C 4B FF F5 F9 */ bl fopOvlpM_Request__FsUs +/* 8001F010 0001BF50 7C 65 1B 79 */ or. r5, r3, r3 +/* 8001F014 0001BF54 41 82 00 0C */ beq lbl_8001F020 +/* 8001F018 0001BF58 38 00 00 01 */ li r0, 1 +/* 8001F01C 0001BF5C 90 0D 87 60 */ stw r0, lbl_80450CE0-_SDA_BASE_(r13) +lbl_8001F020: +/* 8001F020 0001BF60 7C A3 2B 78 */ mr r3, r5 +/* 8001F024 0001BF64 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F028 0001BF68 7C 08 03 A6 */ mtlr r0 +/* 8001F02C 0001BF6C 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F030 0001BF70 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_scene_req/asm/func_8001F034.s b/include/f/f_op/f_op_scene_req/asm/func_8001F034.s new file mode 100644 index 00000000000..f7d933e28df --- /dev/null +++ b/include/f/f_op/f_op_scene_req/asm/func_8001F034.s @@ -0,0 +1,53 @@ +/* 8001F034 0001BF74 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8001F038 0001BF78 7C 08 02 A6 */ mflr r0 +/* 8001F03C 0001BF7C 90 01 00 24 */ stw r0, 0x24(r1) +/* 8001F040 0001BF80 39 61 00 20 */ addi r11, r1, 0x20 +/* 8001F044 0001BF84 48 34 31 8D */ bl _savegpr_26 +/* 8001F048 0001BF88 7C 6B 1B 78 */ mr r11, r3 +/* 8001F04C 0001BF8C 7C 8A 23 78 */ mr r10, r4 +/* 8001F050 0001BF90 7C A9 2B 78 */ mr r9, r5 +/* 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 +/* 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 +/* 8001F074 0001BFB4 7D 64 5B 78 */ mr r4, r11 +/* 8001F078 0001BFB8 7D 45 53 78 */ mr r5, r10 +/* 8001F07C 0001BFBC 7D 26 4B 78 */ mr r6, r9 +/* 8001F080 0001BFC0 7C 07 03 78 */ mr r7, r0 +/* 8001F084 0001BFC4 39 1F 00 00 */ addi r8, r31, 0 +/* 8001F088 0001BFC8 48 00 3F 61 */ bl fpcNdRq_Request +/* 8001F08C 0001BFCC 7C 7C 1B 79 */ or. r28, r3, r3 +/* 8001F090 0001BFD0 40 82 00 0C */ bne lbl_8001F09C +/* 8001F094 0001BFD4 38 60 FF FF */ li r3, -1 +/* 8001F098 0001BFD8 48 00 00 4C */ b lbl_8001F0E4 +lbl_8001F09C: +/* 8001F09C 0001BFDC 7F 40 07 34 */ extsh r0, r26 +/* 8001F0A0 0001BFE0 2C 00 7F FF */ cmpwi r0, 0x7fff +/* 8001F0A4 0001BFE4 41 82 00 2C */ beq lbl_8001F0D0 +/* 8001F0A8 0001BFE8 3B BF 00 30 */ addi r29, r31, 0x30 +/* 8001F0AC 0001BFEC 7F 43 D3 78 */ mr r3, r26 +/* 8001F0B0 0001BFF0 7F 64 DB 78 */ mr r4, r27 +/* 8001F0B4 0001BFF4 4B FF FF 3D */ bl fopScnRq_FadeRequest +/* 8001F0B8 0001BFF8 7C 7E 1B 79 */ or. r30, r3, r3 +/* 8001F0BC 0001BFFC 40 82 00 14 */ bne lbl_8001F0D0 +/* 8001F0C0 0001C000 7F 83 E3 78 */ mr r3, r28 +/* 8001F0C4 0001C004 48 00 39 79 */ bl fpcNdRq_Delete +/* 8001F0C8 0001C008 38 60 FF FF */ li r3, -1 +/* 8001F0CC 0001C00C 48 00 00 18 */ b lbl_8001F0E4 +lbl_8001F0D0: +/* 8001F0D0 0001C010 93 DC 00 64 */ stw r30, 0x64(r28) +/* 8001F0D4 0001C014 38 7C 00 68 */ addi r3, r28, 0x68 +/* 8001F0D8 0001C018 7F A4 EB 78 */ mr r4, r29 +/* 8001F0DC 0001C01C 48 24 75 55 */ bl cPhs_Set +/* 8001F0E0 0001C020 80 7C 00 44 */ lwz r3, 0x44(r28) +lbl_8001F0E4: +/* 8001F0E4 0001C024 39 61 00 20 */ addi r11, r1, 0x20 +/* 8001F0E8 0001C028 48 34 31 35 */ bl _restgpr_26 +/* 8001F0EC 0001C02C 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8001F0F0 0001C030 7C 08 03 A6 */ mtlr r0 +/* 8001F0F4 0001C034 38 21 00 20 */ addi r1, r1, 0x20 +/* 8001F0F8 0001C038 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_scene_req/asm/func_8001F0FC.s b/include/f/f_op/f_op_scene_req/asm/func_8001F0FC.s new file mode 100644 index 00000000000..76decab3a07 --- /dev/null +++ b/include/f/f_op/f_op_scene_req/asm/func_8001F0FC.s @@ -0,0 +1,8 @@ +/* 8001F0FC 0001C03C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F100 0001C040 7C 08 02 A6 */ mflr r0 +/* 8001F104 0001C044 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F108 0001C048 48 00 40 09 */ bl fpcNdRq_ReRequest +/* 8001F10C 0001C04C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F110 0001C050 7C 08 03 A6 */ mtlr r0 +/* 8001F114 0001C054 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F118 0001C058 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_scene_req/asm/func_8001F11C.s b/include/f/f_op/f_op_scene_req/asm/func_8001F11C.s new file mode 100644 index 00000000000..f0617e301be --- /dev/null +++ b/include/f/f_op/f_op_scene_req/asm/func_8001F11C.s @@ -0,0 +1,8 @@ +/* 8001F11C 0001C05C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F120 0001C060 7C 08 02 A6 */ mflr r0 +/* 8001F124 0001C064 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F128 0001C068 48 00 39 D5 */ bl fpcNdRq_Handler +/* 8001F12C 0001C06C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F130 0001C070 7C 08 03 A6 */ mtlr r0 +/* 8001F134 0001C074 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F138 0001C078 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_scene_tag/asm/func_8001F13C.s b/include/f/f_op/f_op_scene_tag/asm/func_8001F13C.s new file mode 100644 index 00000000000..6657d54300e --- /dev/null +++ b/include/f/f_op/f_op_scene_tag/asm/func_8001F13C.s @@ -0,0 +1,8 @@ +/* 8001F13C 0001C07C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F140 0001C080 7C 08 02 A6 */ mflr r0 +/* 8001F144 0001C084 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F148 0001C088 48 24 78 5D */ bl cTg_SingleCut +/* 8001F14C 0001C08C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F150 0001C090 7C 08 03 A6 */ mtlr r0 +/* 8001F154 0001C094 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F158 0001C098 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_scene_tag/asm/func_8001F15C.s b/include/f/f_op/f_op_scene_tag/asm/func_8001F15C.s new file mode 100644 index 00000000000..0691688a8e6 --- /dev/null +++ b/include/f/f_op/f_op_scene_tag/asm/func_8001F15C.s @@ -0,0 +1,11 @@ +/* 8001F15C 0001C09C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F160 0001C0A0 7C 08 02 A6 */ mflr r0 +/* 8001F164 0001C0A4 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F168 0001C0A8 7C 64 1B 78 */ mr r4, r3 +/* 8001F16C 0001C0AC 3C 60 80 3A */ lis r3, lbl_803A3918@ha +/* 8001F170 0001C0B0 38 63 39 18 */ addi r3, r3, lbl_803A3918@l +/* 8001F174 0001C0B4 48 24 78 71 */ bl cTg_Addition +/* 8001F178 0001C0B8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F17C 0001C0BC 7C 08 03 A6 */ mtlr r0 +/* 8001F180 0001C0C0 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F184 0001C0C4 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_scene_tag/asm/func_8001F188.s b/include/f/f_op/f_op_scene_tag/asm/func_8001F188.s new file mode 100644 index 00000000000..5d3e2c098b7 --- /dev/null +++ b/include/f/f_op/f_op_scene_tag/asm/func_8001F188.s @@ -0,0 +1,8 @@ +/* 8001F188 0001C0C8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F18C 0001C0CC 7C 08 02 A6 */ mflr r0 +/* 8001F190 0001C0D0 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F194 0001C0D4 48 24 78 A1 */ bl cTg_Create +/* 8001F198 0001C0D8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F19C 0001C0DC 7C 08 03 A6 */ mtlr r0 +/* 8001F1A0 0001C0E0 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F1A4 0001C0E4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/ldscript.lcf b/ldscript.lcf index a8e92c9f4fe..964674fc463 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -3396,6 +3396,25 @@ func_8001E854 func_8001E7E4 func_8001E794 func_8001E748 +func_8001EFB0 +func_8001EF6C +func_8001EEE4 +func_8001EEB4 +func_8001EE84 +func_8001EE64 +fopScnRq_phase_ClearOverlap +fopScnIt_Judge +fopScnTg_QueueTo +fopScnTg_ToQueue +fopScnTg_Init +fopScnPause_Enable__FP11scene_class +fopScnPause_Disable__FP11scene_class +func_8001EE64 +func_8001EE84 +func_8001EEB4 +func_8001EEE4 +func_8001EF6C +func_8001EFB0 } /* .init 80003100 - 80005600 diff --git a/obj_files.mk b/obj_files.mk index 91d7bb6bd19..e9498a8f981 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -61,10 +61,10 @@ TEXT_O_FILES := \ $(BUILD_DIR)/src/f/f_op/f_op_overlap_mng.o \ $(BUILD_DIR)/src/f/f_op/f_op_overlap_req.o \ $(BUILD_DIR)/asm/f/op/f_op_scene.o \ - $(BUILD_DIR)/asm/f/op/scene/f_op_scene_iter.o \ + $(BUILD_DIR)/src/f/f_op/f_op_scene_iter.o \ $(BUILD_DIR)/src/f/f_op/f_op_scene_mng.o \ $(BUILD_DIR)/asm/f/op/scene/f_op_scene_req.o \ - $(BUILD_DIR)/asm/f/op/scene/f_op_scene_tag.o \ + $(BUILD_DIR)/src/f/f_op/f_op_scene_tag.o \ $(BUILD_DIR)/src/f/f_op/f_op_view.o \ $(BUILD_DIR)/asm/f/op/f_op_kankyo.o \ $(BUILD_DIR)/asm/f/op/f_op_msg.o \ @@ -74,7 +74,7 @@ TEXT_O_FILES := \ $(BUILD_DIR)/src/f/f_op/f_op_msg_mng.o \ $(BUILD_DIR)/src/f/f_op/f_op_draw_iter.o \ $(BUILD_DIR)/src/f/f_op/f_op_draw_tag.o \ - $(BUILD_DIR)/asm/f/op/scene/f_op_scene_pause.o \ + $(BUILD_DIR)/src/f/f_op/f_op_scene_pause.o \ $(BUILD_DIR)/src/f/f_pc/f_pc_base.o \ $(BUILD_DIR)/src/f/f_pc/f_pc_create_iter.o \ $(BUILD_DIR)/src/f/f_pc/f_pc_create_req.o \ diff --git a/src/f/f_op/f_op_scene_iter.cpp b/src/f/f_op/f_op_scene_iter.cpp index 4bf93c8658d..65e12526f7d 100644 --- a/src/f/f_op/f_op_scene_iter.cpp +++ b/src/f/f_op/f_op_scene_iter.cpp @@ -1 +1,26 @@ -// ok +/* f_op_scene_iter.cpp autogenerated by split.py v0.4 at 2021-02-15 20:27:34.795954 */ + +#include "global.h" +#include "SComponent/c_tag_iter.h" + +// additional symbols needed for f_op_scene_iter.cpp +// autogenerated by split.py v0.4 at 2021-02-15 20:27:34.795974 +extern "C" { + void cLsIt_Judge(void); + void fopScnIt_Judge(void); +} + +// additional symbols needed for f_op_scene_iter.cpp +// autogenerated by split.py v0.4 at 2021-02-15 20:27:34.795978 +extern u8 lbl_803A3918; + + +extern "C" { +// fopScnIt_Judge__FPFPvPv_PvPv +// fopScnIt_Judge(void* (*)(void*, void*), void*) +asm void fopScnIt_Judge(void) { + nofralloc + #include "f/f_op/f_op_scene_iter/asm/func_8001EC74.s" +} + +}; diff --git a/src/f/f_op/f_op_scene_pause.cpp b/src/f/f_op/f_op_scene_pause.cpp index 4bf93c8658d..75917d362a1 100644 --- a/src/f/f_op/f_op_scene_pause.cpp +++ b/src/f/f_op/f_op_scene_pause.cpp @@ -1 +1,36 @@ -// ok +/* f_op_scene_pause.cpp autogenerated by split.py v0.4 at 2021-02-15 20:28:00.829529 */ + +#include "global.h" + +// additional symbols needed for f_op_scene_pause.cpp +// autogenerated by split.py v0.4 at 2021-02-15 20:28:00.829561 +extern "C" { + void fopScnPause_Disable__FP11scene_class(void); + void fopScnPause_Enable__FP11scene_class(void); + void fpcEx_IsExist(void); + void fpcM_IsPause(void); + void fpcM_PauseDisable(void); + void fpcM_PauseEnable(void); +} + +// additional symbols needed for f_op_scene_pause.cpp +// autogenerated by split.py v0.4 at 2021-02-15 20:28:00.829565 + + + +extern "C" { +// fopScnPause_Enable__FP11scene_class +// fopScnPause_Enable(scene_class*) +asm void fopScnPause_Enable__FP11scene_class(void) { + nofralloc + #include "f/f_op/f_op_scene_pause/asm/func_80020548.s" +} + +// fopScnPause_Disable__FP11scene_class +// fopScnPause_Disable(scene_class*) +asm void fopScnPause_Disable__FP11scene_class(void) { + nofralloc + #include "f/f_op/f_op_scene_pause/asm/func_80020594.s" +} + +}; diff --git a/src/f/f_op/f_op_scene_req.cpp b/src/f/f_op/f_op_scene_req.cpp index 4bf93c8658d..6181a1b1a8a 100644 --- a/src/f/f_op/f_op_scene_req.cpp +++ b/src/f/f_op/f_op_scene_req.cpp @@ -1 +1,131 @@ -// ok +/* f_op_scene_req.cpp autogenerated by split.py v0.4 at 2021-02-15 20:29:06.358849 */ + +#include "global.h" + +// additional symbols needed for f_op_scene_req.cpp +// autogenerated by split.py v0.4 at 2021-02-15 20:29:06.358877 +extern "C" { + void _restgpr_26(void); + void _savegpr_26(void); + void cPhs_Do(void); + void cPhs_Set(void); + void fopOvlpM_Cancel__Fv(void); + void fopOvlpM_ClearOfReq__Fv(void); + void fopOvlpM_IsDoingReq__Fv(void); + void fopOvlpM_IsDone__Fv(void); + void fopOvlpM_Request__FsUs(void); + void fopOvlpM_ToldAboutID__FUi(void); + void fopScnPause_Disable__FP11scene_class(void); + void fopScnPause_Enable__FP11scene_class(void); + void fopScnRq_Execute(void); + void fopScnRq_FadeRequest(void); + void fopScnRq_Handler(void); + void fopScnRq_ReRequest(void); + void fopScnRq_Request(void); + void fopScnRq_phase_ClearOverlap(void); + void fpcEx_SearchByID(void); + void fpcNdRq_Delete(void); + void fpcNdRq_Execute(void); + void fpcNdRq_Handler(void); + void fpcNdRq_ReRequest(void); + void fpcNdRq_Request(void); + void func_8001EE64(void); + void func_8001EE84(void); + void func_8001EEB4(void); + void func_8001EEE4(void); + void func_8001EF6C(void); + void func_8001EFB0(void); +} + +// additional symbols needed for f_op_scene_req.cpp +// autogenerated by split.py v0.4 at 2021-02-15 20:29:06.358882 +extern u8 lbl_803A38C8; +extern u8 lbl_80450CE0; + + +extern "C" { +// fopScnRq_phase_ClearOverlap__FP19scene_request_class +// fopScnRq_phase_ClearOverlap(scene_request_class*) +asm void fopScnRq_phase_ClearOverlap(void) { + nofralloc + #include "f/f_op/f_op_scene_req/asm/func_8001EE34.s" +} + +// fopScnRq_phase_Execute__FP19scene_request_class +// fopScnRq_phase_Execute(scene_request_class*) +asm void func_8001EE64(void) { + nofralloc + #include "f/f_op/f_op_scene_req/asm/func_8001EE64.s" +} + +// fopScnRq_phase_IsDoingOverlap__FP19scene_request_class +// fopScnRq_phase_IsDoingOverlap(scene_request_class*) +asm void func_8001EE84(void) { + nofralloc + #include "f/f_op/f_op_scene_req/asm/func_8001EE84.s" +} + +// fopScnRq_phase_IsDoneOverlap__FP19scene_request_class +// fopScnRq_phase_IsDoneOverlap(scene_request_class*) +asm void func_8001EEB4(void) { + nofralloc + #include "f/f_op/f_op_scene_req/asm/func_8001EEB4.s" +} + +// fopScnRq_phase_Done__FP19scene_request_class +// fopScnRq_phase_Done(scene_request_class*) +asm void func_8001EEE4(void) { + nofralloc + #include "f/f_op/f_op_scene_req/asm/func_8001EEE4.s" +} + +// fopScnRq_Execute__FP19scene_request_class +// fopScnRq_Execute(scene_request_class*) +asm void fopScnRq_Execute(void) { + nofralloc + #include "f/f_op/f_op_scene_req/asm/func_8001EF24.s" +} + +// fopScnRq_PostMethod__FPvP19scene_request_class +// fopScnRq_PostMethod(void*, scene_request_class*) +asm void func_8001EF6C(void) { + nofralloc + #include "f/f_op/f_op_scene_req/asm/func_8001EF6C.s" +} + +// fopScnRq_Cancel__FP19scene_request_class +// fopScnRq_Cancel(scene_request_class*) +asm void func_8001EFB0(void) { + nofralloc + #include "f/f_op/f_op_scene_req/asm/func_8001EFB0.s" +} + +// fopScnRq_FadeRequest__FsUs +// fopScnRq_FadeRequest(s16, u16) +asm void fopScnRq_FadeRequest(void) { + nofralloc + #include "f/f_op/f_op_scene_req/asm/func_8001EFF0.s" +} + +// fopScnRq_Request__FiP11scene_classsPvsUs +// fopScnRq_Request(int, scene_class*, s16, void*, s16, u16) +asm void fopScnRq_Request(void) { + nofralloc + #include "f/f_op/f_op_scene_req/asm/func_8001F034.s" +} + +// fopScnRq_ReRequest__FUisPv +// fopScnRq_ReRequest(unsigned int, s16, void*) +asm void fopScnRq_ReRequest(void) { + nofralloc + #include "f/f_op/f_op_scene_req/asm/func_8001F0FC.s" +} + +// fopScnRq_Handler__Fv +// fopScnRq_Handler(void) +asm void fopScnRq_Handler(void) { + nofralloc + #include "f/f_op/f_op_scene_req/asm/func_8001F11C.s" +} + +}; diff --git a/src/f/f_op/f_op_scene_tag.cpp b/src/f/f_op/f_op_scene_tag.cpp index 4bf93c8658d..8c8c66557d8 100644 --- a/src/f/f_op/f_op_scene_tag.cpp +++ b/src/f/f_op/f_op_scene_tag.cpp @@ -1 +1,43 @@ -// ok +/* f_op_scene_tag.cpp autogenerated by split.py v0.4 at 2021-02-15 20:28:40.331340 */ + +#include "global.h" + +// additional symbols needed for f_op_scene_tag.cpp +// autogenerated by split.py v0.4 at 2021-02-15 20:28:40.331363 +extern "C" { + void cTg_Addition(void); + void cTg_Create(void); + void cTg_SingleCut(void); + void fopScnTg_Init(void); + void fopScnTg_QueueTo(void); + void fopScnTg_ToQueue(void); +} + +// additional symbols needed for f_op_scene_tag.cpp +// autogenerated by split.py v0.4 at 2021-02-15 20:28:40.331367 +extern u8 lbl_803A3918; + + +extern "C" { +// fopScnTg_QueueTo__FP15scene_tag_class +// fopScnTg_QueueTo(scene_tag_class*) +asm void fopScnTg_QueueTo(void) { + nofralloc + #include "f/f_op/f_op_scene_tag/asm/func_8001F13C.s" +} + +// fopScnTg_ToQueue__FP15scene_tag_class +// fopScnTg_ToQueue(scene_tag_class*) +asm void fopScnTg_ToQueue(void) { + nofralloc + #include "f/f_op/f_op_scene_tag/asm/func_8001F15C.s" +} + +// fopScnTg_Init__FP15scene_tag_classPv +// fopScnTg_Init(scene_tag_class*, void*) +asm void fopScnTg_Init(void) { + nofralloc + #include "f/f_op/f_op_scene_tag/asm/func_8001F188.s" +} + +};