diff --git a/asm/d/ovlp/d_ovlp_fade/dOvlpFd_Create__FPv.s b/asm/d/ovlp/d_ovlp_fade/dOvlpFd_Create__FPv.s deleted file mode 100644 index c23e11c1734..00000000000 --- a/asm/d/ovlp/d_ovlp_fade/dOvlpFd_Create__FPv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80252468: -/* 80252468 3C 60 80 25 */ lis r3, dOvlpFd_FadeIn__FP14overlap1_class@ha /* 0x80252300@ha */ -/* 8025246C 38 03 23 00 */ addi r0, r3, dOvlpFd_FadeIn__FP14overlap1_class@l /* 0x80252300@l */ -/* 80252470 90 0D 8B 60 */ stw r0, dOvlpFd_execute_f(r13) -/* 80252474 38 60 00 04 */ li r3, 4 -/* 80252478 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade/dOvlpFd_Execute__FP14overlap1_class.s b/asm/d/ovlp/d_ovlp_fade/dOvlpFd_Execute__FP14overlap1_class.s deleted file mode 100644 index ad7c8f93fda..00000000000 --- a/asm/d/ovlp/d_ovlp_fade/dOvlpFd_Execute__FP14overlap1_class.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8025242C: -/* 8025242C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80252430 7C 08 02 A6 */ mflr r0 -/* 80252434 90 01 00 14 */ stw r0, 0x14(r1) -/* 80252438 81 8D 8B 60 */ lwz r12, dOvlpFd_execute_f(r13) -/* 8025243C 7D 89 03 A6 */ mtctr r12 -/* 80252440 4E 80 04 21 */ bctrl -/* 80252444 38 60 00 01 */ li r3, 1 -/* 80252448 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025244C 7C 08 03 A6 */ mtlr r0 -/* 80252450 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252454 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade/dOvlpFd_FadeIn__FP14overlap1_class.s b/asm/d/ovlp/d_ovlp_fade/dOvlpFd_FadeIn__FP14overlap1_class.s deleted file mode 100644 index b8ee35741e2..00000000000 --- a/asm/d/ovlp/d_ovlp_fade/dOvlpFd_FadeIn__FP14overlap1_class.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_80252300: -/* 80252300 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80252304 7C 08 02 A6 */ mflr r0 -/* 80252308 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025230C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80252310 93 C1 00 08 */ stw r30, 8(r1) -/* 80252314 7C 7F 1B 78 */ mr r31, r3 -/* 80252318 3B C0 00 1E */ li r30, 0x1e -/* 8025231C 80 03 00 D0 */ lwz r0, 0xd0(r3) -/* 80252320 2C 00 00 00 */ cmpwi r0, 0 -/* 80252324 40 82 00 A4 */ bne lbl_802523C8 -/* 80252328 A8 7F 00 0E */ lha r3, 0xe(r31) -/* 8025232C 7C 60 07 35 */ extsh. r0, r3 -/* 80252330 41 82 00 0C */ beq lbl_8025233C -/* 80252334 2C 03 00 04 */ cmpwi r3, 4 -/* 80252338 40 82 00 60 */ bne lbl_80252398 -lbl_8025233C: -/* 8025233C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80252340 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80252344 88 03 4E 1C */ lbz r0, 0x4e1c(r3) -/* 80252348 2C 00 00 01 */ cmpwi r0, 1 -/* 8025234C 40 82 00 08 */ bne lbl_80252354 -/* 80252350 8B C3 4E 1E */ lbz r30, 0x4e1e(r3) -lbl_80252354: -/* 80252354 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80252358 80 63 00 04 */ lwz r3, 4(r3) -/* 8025235C 28 03 00 00 */ cmplwi r3, 0 -/* 80252360 41 82 00 1C */ beq lbl_8025237C -/* 80252364 7F C4 F3 78 */ mr r4, r30 -/* 80252368 81 83 00 00 */ lwz r12, 0(r3) -/* 8025236C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80252370 7D 89 03 A6 */ mtctr r12 -/* 80252374 4E 80 04 21 */ bctrl -/* 80252378 48 00 00 08 */ b lbl_80252380 -lbl_8025237C: -/* 8025237C 38 60 00 01 */ li r3, 1 -lbl_80252380: -/* 80252380 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80252384 40 82 00 0C */ bne lbl_80252390 -/* 80252388 38 60 00 01 */ li r3, 1 -/* 8025238C 48 00 00 88 */ b lbl_80252414 -lbl_80252390: -/* 80252390 93 DF 00 D0 */ stw r30, 0xd0(r31) -/* 80252394 48 00 00 28 */ b lbl_802523BC -lbl_80252398: -/* 80252398 2C 03 00 07 */ cmpwi r3, 7 -/* 8025239C 41 82 00 0C */ beq lbl_802523A8 -/* 802523A0 2C 03 00 08 */ cmpwi r3, 8 -/* 802523A4 40 82 00 10 */ bne lbl_802523B4 -lbl_802523A8: -/* 802523A8 38 00 00 01 */ li r0, 1 -/* 802523AC 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 802523B0 48 00 00 0C */ b lbl_802523BC -lbl_802523B4: -/* 802523B4 38 00 00 1E */ li r0, 0x1e -/* 802523B8 90 1F 00 D0 */ stw r0, 0xd0(r31) -lbl_802523BC: -/* 802523BC 93 DF 00 D4 */ stw r30, 0xd4(r31) -/* 802523C0 38 60 00 00 */ li r3, 0 -/* 802523C4 4B DB 4E 61 */ bl mDoAud_setFadeOutStart__FUc -lbl_802523C8: -/* 802523C8 80 7F 00 D0 */ lwz r3, 0xd0(r31) -/* 802523CC 34 03 FF FF */ addic. r0, r3, -1 -/* 802523D0 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 802523D4 40 82 00 3C */ bne lbl_80252410 -/* 802523D8 3C 60 80 25 */ lis r3, dOvlpFd_Wait__FP14overlap1_class@ha /* 0x802522C8@ha */ -/* 802523DC 38 03 22 C8 */ addi r0, r3, dOvlpFd_Wait__FP14overlap1_class@l /* 0x802522C8@l */ -/* 802523E0 90 0D 8B 60 */ stw r0, dOvlpFd_execute_f(r13) -/* 802523E4 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 802523E8 80 63 00 04 */ lwz r3, 4(r3) -/* 802523EC 28 03 00 00 */ cmplwi r3, 0 -/* 802523F0 41 82 00 18 */ beq lbl_80252408 -/* 802523F4 38 80 00 00 */ li r4, 0 -/* 802523F8 81 83 00 00 */ lwz r12, 0(r3) -/* 802523FC 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80252400 7D 89 03 A6 */ mtctr r12 -/* 80252404 4E 80 04 21 */ bctrl -lbl_80252408: -/* 80252408 7F E3 FB 78 */ mr r3, r31 -/* 8025240C 4B DC C1 11 */ bl fopOvlpM_Done__FP18overlap_task_class -lbl_80252410: -/* 80252410 38 60 00 01 */ li r3, 1 -lbl_80252414: -/* 80252414 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80252418 83 C1 00 08 */ lwz r30, 8(r1) -/* 8025241C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80252420 7C 08 03 A6 */ mtlr r0 -/* 80252424 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252428 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade/dOvlpFd_FadeOut__FP14overlap1_class.s b/asm/d/ovlp/d_ovlp_fade/dOvlpFd_FadeOut__FP14overlap1_class.s deleted file mode 100644 index 30cc3f6fea8..00000000000 --- a/asm/d/ovlp/d_ovlp_fade/dOvlpFd_FadeOut__FP14overlap1_class.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_802521F4: -/* 802521F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802521F8 7C 08 02 A6 */ mflr r0 -/* 802521FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80252200 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80252204 93 C1 00 08 */ stw r30, 8(r1) -/* 80252208 7C 7E 1B 78 */ mr r30, r3 -/* 8025220C 83 E3 00 D4 */ lwz r31, 0xd4(r3) -/* 80252210 80 03 00 CC */ lwz r0, 0xcc(r3) -/* 80252214 2C 00 00 00 */ cmpwi r0, 0 -/* 80252218 40 82 00 4C */ bne lbl_80252264 -/* 8025221C 38 60 00 00 */ li r3, 0 -/* 80252220 4B DB 50 35 */ bl mDoAud_setFadeInStart__FUc -/* 80252224 A8 1E 00 0E */ lha r0, 0xe(r30) -/* 80252228 2C 00 00 08 */ cmpwi r0, 8 -/* 8025222C 40 82 00 10 */ bne lbl_8025223C -/* 80252230 38 00 00 0A */ li r0, 0xa -/* 80252234 90 1E 00 CC */ stw r0, 0xcc(r30) -/* 80252238 48 00 00 2C */ b lbl_80252264 -lbl_8025223C: -/* 8025223C 2C 00 00 03 */ cmpwi r0, 3 -/* 80252240 41 82 00 14 */ beq lbl_80252254 -/* 80252244 7F E3 FB 78 */ mr r3, r31 -/* 80252248 4B FF FF 3D */ bl dOvlpFd_startFadeIn__Fi -/* 8025224C 93 FE 00 CC */ stw r31, 0xcc(r30) -/* 80252250 48 00 00 14 */ b lbl_80252264 -lbl_80252254: -/* 80252254 38 60 00 00 */ li r3, 0 -/* 80252258 4B FF FF 2D */ bl dOvlpFd_startFadeIn__Fi -/* 8025225C 38 00 00 01 */ li r0, 1 -/* 80252260 90 1E 00 CC */ stw r0, 0xcc(r30) -lbl_80252264: -/* 80252264 A8 1E 00 0E */ lha r0, 0xe(r30) -/* 80252268 2C 00 00 08 */ cmpwi r0, 8 -/* 8025226C 40 82 00 18 */ bne lbl_80252284 -/* 80252270 80 1E 00 CC */ lwz r0, 0xcc(r30) -/* 80252274 2C 00 00 07 */ cmpwi r0, 7 -/* 80252278 40 82 00 0C */ bne lbl_80252284 -/* 8025227C 38 60 00 07 */ li r3, 7 -/* 80252280 4B FF FF 05 */ bl dOvlpFd_startFadeIn__Fi -lbl_80252284: -/* 80252284 4B DC C2 41 */ bl fopOvlpM_SceneIsStart__Fv -/* 80252288 80 7E 00 CC */ lwz r3, 0xcc(r30) -/* 8025228C 34 03 FF FF */ addic. r0, r3, -1 -/* 80252290 90 1E 00 CC */ stw r0, 0xcc(r30) -/* 80252294 40 82 00 18 */ bne lbl_802522AC -/* 80252298 7F C3 F3 78 */ mr r3, r30 -/* 8025229C 4B DC C2 81 */ bl fopOvlpM_Done__FP18overlap_task_class -/* 802522A0 80 7E 00 CC */ lwz r3, 0xcc(r30) -/* 802522A4 38 03 00 01 */ addi r0, r3, 1 -/* 802522A8 90 1E 00 CC */ stw r0, 0xcc(r30) -lbl_802522AC: -/* 802522AC 38 60 00 01 */ li r3, 1 -/* 802522B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802522B4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802522B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802522BC 7C 08 03 A6 */ mtlr r0 -/* 802522C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802522C4 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade/dOvlpFd_Wait__FP14overlap1_class.s b/asm/d/ovlp/d_ovlp_fade/dOvlpFd_Wait__FP14overlap1_class.s deleted file mode 100644 index c928de6ac51..00000000000 --- a/asm/d/ovlp/d_ovlp_fade/dOvlpFd_Wait__FP14overlap1_class.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802522C8: -/* 802522C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802522CC 7C 08 02 A6 */ mflr r0 -/* 802522D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802522D4 4B DC C2 31 */ bl fopOvlpM_IsOutReq__FP18overlap_task_class -/* 802522D8 2C 03 00 00 */ cmpwi r3, 0 -/* 802522DC 41 82 00 10 */ beq lbl_802522EC -/* 802522E0 3C 60 80 25 */ lis r3, dOvlpFd_FadeOut__FP14overlap1_class@ha /* 0x802521F4@ha */ -/* 802522E4 38 03 21 F4 */ addi r0, r3, dOvlpFd_FadeOut__FP14overlap1_class@l /* 0x802521F4@l */ -/* 802522E8 90 0D 8B 60 */ stw r0, dOvlpFd_execute_f(r13) -lbl_802522EC: -/* 802522EC 38 60 00 01 */ li r3, 1 -/* 802522F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802522F4 7C 08 03 A6 */ mtlr r0 -/* 802522F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802522FC 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade/dOvlpFd_startFadeIn__Fi.s b/asm/d/ovlp/d_ovlp_fade/dOvlpFd_startFadeIn__Fi.s deleted file mode 100644 index 92ab15850de..00000000000 --- a/asm/d/ovlp/d_ovlp_fade/dOvlpFd_startFadeIn__Fi.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80252184: -/* 80252184 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80252188 7C 08 02 A6 */ mflr r0 -/* 8025218C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80252190 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80252194 93 C1 00 08 */ stw r30, 8(r1) -/* 80252198 7C 7E 1B 78 */ mr r30, r3 -/* 8025219C 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 802521A0 83 E3 00 04 */ lwz r31, 4(r3) -/* 802521A4 7F E3 FB 78 */ mr r3, r31 -/* 802521A8 38 80 00 00 */ li r4, 0 -/* 802521AC 38 A0 00 00 */ li r5, 0 -/* 802521B0 48 09 36 21 */ bl setStatus__8JUTFaderFQ28JUTFader7EStatusi -/* 802521B4 7F E3 FB 78 */ mr r3, r31 -/* 802521B8 38 80 00 00 */ li r4, 0 -/* 802521BC 38 A0 FF FF */ li r5, -1 -/* 802521C0 48 09 36 11 */ bl setStatus__8JUTFaderFQ28JUTFader7EStatusi -/* 802521C4 7F E3 FB 78 */ mr r3, r31 -/* 802521C8 7F C4 F3 78 */ mr r4, r30 -/* 802521CC 81 9F 00 00 */ lwz r12, 0(r31) -/* 802521D0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802521D4 7D 89 03 A6 */ mtctr r12 -/* 802521D8 4E 80 04 21 */ bctrl -/* 802521DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802521E0 83 C1 00 08 */ lwz r30, 8(r1) -/* 802521E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802521E8 7C 08 03 A6 */ mtlr r0 -/* 802521EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802521F0 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade2/__ct__10dOvlpFd2_cFv.s b/asm/d/ovlp/d_ovlp_fade2/__ct__10dOvlpFd2_cFv.s deleted file mode 100644 index 8bae660ebb7..00000000000 --- a/asm/d/ovlp/d_ovlp_fade2/__ct__10dOvlpFd2_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80252990: -/* 80252990 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 80252994 38 A4 6F 88 */ addi r5, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 80252998 90 A3 00 D8 */ stw r5, 0xd8(r3) -/* 8025299C 3C 80 80 3C */ lis r4, __vt__16dDlst_snapShot_c@ha /* 0x803C2DEC@ha */ -/* 802529A0 38 04 2D EC */ addi r0, r4, __vt__16dDlst_snapShot_c@l /* 0x803C2DEC@l */ -/* 802529A4 90 03 00 D8 */ stw r0, 0xd8(r3) -/* 802529A8 90 A3 00 DC */ stw r5, 0xdc(r3) -/* 802529AC 3C 80 80 3C */ lis r4, __vt__15dOvlpFd2_dlst_c@ha /* 0x803C2D5C@ha */ -/* 802529B0 38 04 2D 5C */ addi r0, r4, __vt__15dOvlpFd2_dlst_c@l /* 0x803C2D5C@l */ -/* 802529B4 90 03 00 DC */ stw r0, 0xdc(r3) -/* 802529B8 3C 80 80 3C */ lis r4, lit_3695@ha /* 0x803C2CF0@ha */ -/* 802529BC 38 A4 2C F0 */ addi r5, r4, lit_3695@l /* 0x803C2CF0@l */ -/* 802529C0 80 85 00 00 */ lwz r4, 0(r5) -/* 802529C4 80 05 00 04 */ lwz r0, 4(r5) -/* 802529C8 90 83 00 CC */ stw r4, 0xcc(r3) -/* 802529CC 90 03 00 D0 */ stw r0, 0xd0(r3) -/* 802529D0 80 05 00 08 */ lwz r0, 8(r5) -/* 802529D4 90 03 00 D4 */ stw r0, 0xd4(r3) -/* 802529D8 38 00 00 00 */ li r0, 0 -/* 802529DC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802529E0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802529E4 98 04 5E B8 */ stb r0, 0x5eb8(r4) -/* 802529E8 38 00 00 02 */ li r0, 2 -/* 802529EC 98 03 01 1D */ stb r0, 0x11d(r3) -/* 802529F0 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade2/__dt__15dOvlpFd2_dlst_cFv.s b/asm/d/ovlp/d_ovlp_fade2/__dt__15dOvlpFd2_dlst_cFv.s deleted file mode 100644 index ba7ad5305a2..00000000000 --- a/asm/d/ovlp/d_ovlp_fade2/__dt__15dOvlpFd2_dlst_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80252E8C: -/* 80252E8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80252E90 7C 08 02 A6 */ mflr r0 -/* 80252E94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80252E98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80252E9C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80252EA0 41 82 00 1C */ beq lbl_80252EBC -/* 80252EA4 3C A0 80 3C */ lis r5, __vt__15dOvlpFd2_dlst_c@ha /* 0x803C2D5C@ha */ -/* 80252EA8 38 05 2D 5C */ addi r0, r5, __vt__15dOvlpFd2_dlst_c@l /* 0x803C2D5C@l */ -/* 80252EAC 90 1F 00 00 */ stw r0, 0(r31) -/* 80252EB0 7C 80 07 35 */ extsh. r0, r4 -/* 80252EB4 40 81 00 08 */ ble lbl_80252EBC -/* 80252EB8 48 07 BE 85 */ bl __dl__FPv -lbl_80252EBC: -/* 80252EBC 7F E3 FB 78 */ mr r3, r31 -/* 80252EC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80252EC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80252EC8 7C 08 03 A6 */ mtlr r0 -/* 80252ECC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252ED0 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Create__FPv.s b/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Create__FPv.s deleted file mode 100644 index e39832f5f87..00000000000 --- a/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Create__FPv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80252E44: -/* 80252E44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80252E48 7C 08 02 A6 */ mflr r0 -/* 80252E4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80252E50 28 03 00 00 */ cmplwi r3, 0 -/* 80252E54 41 82 00 08 */ beq lbl_80252E5C -/* 80252E58 4B FF FB 39 */ bl __ct__10dOvlpFd2_cFv -lbl_80252E5C: -/* 80252E5C 38 60 00 04 */ li r3, 4 -/* 80252E60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80252E64 7C 08 03 A6 */ mtlr r0 -/* 80252E68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252E6C 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Draw__FP10dOvlpFd2_c.s b/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Draw__FP10dOvlpFd2_c.s deleted file mode 100644 index ad1e071b173..00000000000 --- a/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Draw__FP10dOvlpFd2_c.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_80252D0C: -/* 80252D0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80252D10 7C 08 02 A6 */ mflr r0 -/* 80252D14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80252D18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80252D1C 7C 7F 1B 78 */ mr r31, r3 -/* 80252D20 88 03 01 1C */ lbz r0, 0x11c(r3) -/* 80252D24 28 00 00 00 */ cmplwi r0, 0 -/* 80252D28 40 82 00 2C */ bne lbl_80252D54 -/* 80252D2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80252D30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80252D34 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80252D38 38 83 02 3C */ addi r4, r3, 0x23c -/* 80252D3C 38 A3 02 40 */ addi r5, r3, 0x240 -/* 80252D40 38 DF 00 D8 */ addi r6, r31, 0xd8 -/* 80252D44 4B E0 3A 51 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80252D48 38 00 00 01 */ li r0, 1 -/* 80252D4C 98 1F 01 1C */ stb r0, 0x11c(r31) -/* 80252D50 48 00 00 98 */ b lbl_80252DE8 -lbl_80252D54: -/* 80252D54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80252D58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80252D5C 88 03 5D 44 */ lbz r0, 0x5d44(r3) -/* 80252D60 2C 00 00 00 */ cmpwi r0, 0 -/* 80252D64 40 82 00 84 */ bne lbl_80252DE8 -/* 80252D68 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80252D6C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80252D70 C0 22 B4 24 */ lfs f1, lit_3683(r2) -/* 80252D74 FC 40 08 90 */ fmr f2, f1 -/* 80252D78 C0 62 B4 54 */ lfs f3, lit_3822(r2) -/* 80252D7C 48 0F 3B 6D */ bl PSMTXTrans -/* 80252D80 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80252D84 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80252D88 A8 9F 01 14 */ lha r4, 0x114(r31) -/* 80252D8C 4B DB 97 41 */ bl mDoMtx_ZrotM__FPA4_fs -/* 80252D90 C0 22 B4 30 */ lfs f1, lit_3686(r2) -/* 80252D94 C0 1F 01 18 */ lfs f0, 0x118(r31) -/* 80252D98 EC 41 00 2A */ fadds f2, f1, f0 -/* 80252D9C FC 60 08 90 */ fmr f3, f1 -/* 80252DA0 4B DB A0 99 */ bl scaleM__14mDoMtx_stack_cFfff -/* 80252DA4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80252DA8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80252DAC A8 1F 01 14 */ lha r0, 0x114(r31) -/* 80252DB0 7C 00 00 D0 */ neg r0, r0 -/* 80252DB4 7C 04 07 34 */ extsh r4, r0 -/* 80252DB8 4B DB 97 15 */ bl mDoMtx_ZrotM__FPA4_fs -/* 80252DBC 38 9F 00 E0 */ addi r4, r31, 0xe0 -/* 80252DC0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80252DC4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80252DC8 48 0F 36 E9 */ bl PSMTXCopy -/* 80252DCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80252DD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80252DD4 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80252DD8 38 83 02 3C */ addi r4, r3, 0x23c -/* 80252DDC 38 A3 02 40 */ addi r5, r3, 0x240 -/* 80252DE0 38 DF 00 DC */ addi r6, r31, 0xdc -/* 80252DE4 4B E0 39 B1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_80252DE8: -/* 80252DE8 38 00 00 00 */ li r0, 0 -/* 80252DEC 98 0D 86 64 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0(r13) -/* 80252DF0 38 60 00 01 */ li r3, 1 -/* 80252DF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80252DF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80252DFC 7C 08 03 A6 */ mtlr r0 -/* 80252E00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252E04 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Execute__FP10dOvlpFd2_c.s b/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Execute__FP10dOvlpFd2_c.s deleted file mode 100644 index 190e94528db..00000000000 --- a/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Execute__FP10dOvlpFd2_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80252E08: -/* 80252E08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80252E0C 7C 08 02 A6 */ mflr r0 -/* 80252E10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80252E14 39 83 00 CC */ addi r12, r3, 0xcc -/* 80252E18 48 10 F2 6D */ bl __ptmf_scall -/* 80252E1C 60 00 00 00 */ nop -/* 80252E20 38 60 00 01 */ li r3, 1 -/* 80252E24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80252E28 7C 08 03 A6 */ mtlr r0 -/* 80252E2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252E30 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade2/draw__15dOvlpFd2_dlst_cFv.s b/asm/d/ovlp/d_ovlp_fade2/draw__15dOvlpFd2_dlst_cFv.s deleted file mode 100644 index fc8e50e1e3f..00000000000 --- a/asm/d/ovlp/d_ovlp_fade2/draw__15dOvlpFd2_dlst_cFv.s +++ /dev/null @@ -1,326 +0,0 @@ -lbl_8025247C: -/* 8025247C 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80252480 7C 08 02 A6 */ mflr r0 -/* 80252484 90 01 00 74 */ stw r0, 0x74(r1) -/* 80252488 93 E1 00 6C */ stw r31, 0x6c(r1) -/* 8025248C 7C 7F 1B 78 */ mr r31, r3 -/* 80252490 C0 22 B4 24 */ lfs f1, lit_3683(r2) -/* 80252494 FC 40 08 90 */ fmr f2, f1 -/* 80252498 C0 62 B4 28 */ lfs f3, lit_3684(r2) -/* 8025249C C0 82 B4 2C */ lfs f4, lit_3685(r2) -/* 802524A0 FC A0 08 90 */ fmr f5, f1 -/* 802524A4 C0 C2 B4 30 */ lfs f6, lit_3686(r2) -/* 802524A8 48 10 DF BD */ bl GXSetViewport -/* 802524AC 38 60 00 00 */ li r3, 0 -/* 802524B0 38 80 00 00 */ li r4, 0 -/* 802524B4 38 A0 02 60 */ li r5, 0x260 -/* 802524B8 38 C0 01 C0 */ li r6, 0x1c0 -/* 802524BC 48 10 E0 15 */ bl GXSetScissor -/* 802524C0 38 60 00 00 */ li r3, 0 -/* 802524C4 38 80 00 09 */ li r4, 9 -/* 802524C8 38 A0 00 00 */ li r5, 0 -/* 802524CC 38 C0 00 03 */ li r6, 3 -/* 802524D0 38 E0 00 00 */ li r7, 0 -/* 802524D4 48 10 90 F1 */ bl GXSetVtxAttrFmt -/* 802524D8 48 10 90 B5 */ bl GXClearVtxDesc -/* 802524DC 38 60 00 09 */ li r3, 9 -/* 802524E0 38 80 00 01 */ li r4, 1 -/* 802524E4 48 10 89 D5 */ bl GXSetVtxDesc -/* 802524E8 38 60 00 01 */ li r3, 1 -/* 802524EC 48 10 B6 45 */ bl GXSetNumChans -/* 802524F0 38 60 00 04 */ li r3, 4 -/* 802524F4 38 80 00 00 */ li r4, 0 -/* 802524F8 38 A0 00 00 */ li r5, 0 -/* 802524FC 38 C0 00 00 */ li r6, 0 -/* 80252500 38 E0 00 00 */ li r7, 0 -/* 80252504 39 00 00 00 */ li r8, 0 -/* 80252508 39 20 00 02 */ li r9, 2 -/* 8025250C 48 10 B6 61 */ bl GXSetChanCtrl -/* 80252510 38 60 00 00 */ li r3, 0 -/* 80252514 48 10 98 E9 */ bl GXSetNumTexGens -/* 80252518 38 60 00 01 */ li r3, 1 -/* 8025251C 48 10 D3 75 */ bl GXSetNumTevStages -/* 80252520 38 60 00 00 */ li r3, 0 -/* 80252524 38 80 00 FF */ li r4, 0xff -/* 80252528 38 A0 00 FF */ li r5, 0xff -/* 8025252C 38 C0 00 04 */ li r6, 4 -/* 80252530 48 10 D1 C5 */ bl GXSetTevOrder -/* 80252534 38 60 00 00 */ li r3, 0 -/* 80252538 38 80 00 0F */ li r4, 0xf -/* 8025253C 38 A0 00 0F */ li r5, 0xf -/* 80252540 38 C0 00 0F */ li r6, 0xf -/* 80252544 38 E0 00 0F */ li r7, 0xf -/* 80252548 48 10 CC DD */ bl GXSetTevColorIn -/* 8025254C 38 60 00 00 */ li r3, 0 -/* 80252550 38 80 00 00 */ li r4, 0 -/* 80252554 38 A0 00 00 */ li r5, 0 -/* 80252558 38 C0 00 00 */ li r6, 0 -/* 8025255C 38 E0 00 01 */ li r7, 1 -/* 80252560 39 00 00 00 */ li r8, 0 -/* 80252564 48 10 CD 49 */ bl GXSetTevColorOp -/* 80252568 38 60 00 00 */ li r3, 0 -/* 8025256C 38 80 00 07 */ li r4, 7 -/* 80252570 38 A0 00 07 */ li r5, 7 -/* 80252574 38 C0 00 07 */ li r6, 7 -/* 80252578 38 E0 00 07 */ li r7, 7 -/* 8025257C 48 10 CC ED */ bl GXSetTevAlphaIn -/* 80252580 38 60 00 00 */ li r3, 0 -/* 80252584 38 80 00 00 */ li r4, 0 -/* 80252588 38 A0 00 00 */ li r5, 0 -/* 8025258C 38 C0 00 00 */ li r6, 0 -/* 80252590 38 E0 00 01 */ li r7, 1 -/* 80252594 39 00 00 00 */ li r8, 0 -/* 80252598 48 10 CD 7D */ bl GXSetTevAlphaOp -/* 8025259C 38 60 00 01 */ li r3, 1 -/* 802525A0 48 10 D7 31 */ bl GXSetZCompLoc -/* 802525A4 38 60 00 00 */ li r3, 0 -/* 802525A8 38 80 00 07 */ li r4, 7 -/* 802525AC 38 A0 00 00 */ li r5, 0 -/* 802525B0 48 10 D6 ED */ bl GXSetZMode -/* 802525B4 38 60 00 00 */ li r3, 0 -/* 802525B8 38 80 00 04 */ li r4, 4 -/* 802525BC 38 A0 00 05 */ li r5, 5 -/* 802525C0 38 C0 00 00 */ li r6, 0 -/* 802525C4 48 10 D6 2D */ bl GXSetBlendMode -/* 802525C8 38 60 00 07 */ li r3, 7 -/* 802525CC 38 80 00 00 */ li r4, 0 -/* 802525D0 38 A0 00 01 */ li r5, 1 -/* 802525D4 38 C0 00 07 */ li r6, 7 -/* 802525D8 38 E0 00 00 */ li r7, 0 -/* 802525DC 48 10 D0 49 */ bl GXSetAlphaCompare -/* 802525E0 80 0D 80 80 */ lwz r0, g_clearColor(r13) -/* 802525E4 90 01 00 10 */ stw r0, 0x10(r1) -/* 802525E8 38 60 00 00 */ li r3, 0 -/* 802525EC C0 22 B4 24 */ lfs f1, lit_3683(r2) -/* 802525F0 FC 40 08 90 */ fmr f2, f1 -/* 802525F4 FC 60 08 90 */ fmr f3, f1 -/* 802525F8 FC 80 08 90 */ fmr f4, f1 -/* 802525FC 38 81 00 10 */ addi r4, r1, 0x10 -/* 80252600 48 10 D2 B9 */ bl GXSetFog -/* 80252604 38 60 00 00 */ li r3, 0 -/* 80252608 48 10 A3 7D */ bl GXSetCullMode -/* 8025260C 38 60 00 01 */ li r3, 1 -/* 80252610 48 10 D7 C9 */ bl GXSetDither -/* 80252614 38 60 00 01 */ li r3, 1 -/* 80252618 48 10 DF B9 */ bl GXSetClipMode -/* 8025261C 3C 60 80 3A */ lis r3, g_mDoMtx_identity@ha /* 0x803A2FD8@ha */ -/* 80252620 38 63 2F D8 */ addi r3, r3, g_mDoMtx_identity@l /* 0x803A2FD8@l */ -/* 80252624 38 80 00 00 */ li r4, 0 -/* 80252628 48 10 DC 25 */ bl GXLoadPosMtxImm -/* 8025262C 38 60 00 00 */ li r3, 0 -/* 80252630 48 10 DC BD */ bl GXSetCurrentMtx -/* 80252634 38 60 00 80 */ li r3, 0x80 -/* 80252638 38 80 00 00 */ li r4, 0 -/* 8025263C 38 A0 00 04 */ li r5, 4 -/* 80252640 48 10 A1 25 */ bl GXBegin -/* 80252644 38 80 00 00 */ li r4, 0 -/* 80252648 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 8025264C B0 83 80 00 */ sth r4, 0x8000(r3) /* 0xCC008000@l */ -/* 80252650 B0 83 80 00 */ sth r4, -0x8000(r3) -/* 80252654 38 00 02 60 */ li r0, 0x260 -/* 80252658 B0 03 80 00 */ sth r0, -0x8000(r3) -/* 8025265C B0 83 80 00 */ sth r4, -0x8000(r3) -/* 80252660 B0 03 80 00 */ sth r0, -0x8000(r3) -/* 80252664 38 00 01 C0 */ li r0, 0x1c0 -/* 80252668 B0 03 80 00 */ sth r0, -0x8000(r3) -/* 8025266C B0 83 80 00 */ sth r4, -0x8000(r3) -/* 80252670 B0 03 80 00 */ sth r0, -0x8000(r3) -/* 80252674 38 61 00 24 */ addi r3, r1, 0x24 -/* 80252678 C0 22 B4 34 */ lfs f1, lit_3687(r2) -/* 8025267C C0 42 B4 38 */ lfs f2, lit_3688(r2) -/* 80252680 C0 62 B4 3C */ lfs f3, lit_3689(r2) -/* 80252684 C0 82 B4 40 */ lfs f4, lit_3690(r2) -/* 80252688 48 0F 48 A1 */ bl C_MTXPerspective -/* 8025268C 38 61 00 24 */ addi r3, r1, 0x24 -/* 80252690 38 80 00 00 */ li r4, 0 -/* 80252694 48 10 DA 41 */ bl GXSetProjection -/* 80252698 3C 60 80 3E */ lis r3, mFrameBufferTexObj__13mDoGph_gInf_c@ha /* 0x803DD3E8@ha */ -/* 8025269C 38 63 D3 E8 */ addi r3, r3, mFrameBufferTexObj__13mDoGph_gInf_c@l /* 0x803DD3E8@l */ -/* 802526A0 80 8D 86 50 */ lwz r4, mFrameBufferTex__13mDoGph_gInf_c(r13) -/* 802526A4 38 A0 01 30 */ li r5, 0x130 -/* 802526A8 38 C0 00 E0 */ li r6, 0xe0 -/* 802526AC 38 E0 00 06 */ li r7, 6 -/* 802526B0 39 00 00 00 */ li r8, 0 -/* 802526B4 39 20 00 00 */ li r9, 0 -/* 802526B8 39 40 00 00 */ li r10, 0 -/* 802526BC 48 10 B7 85 */ bl GXInitTexObj -/* 802526C0 3C 60 80 3E */ lis r3, mFrameBufferTexObj__13mDoGph_gInf_c@ha /* 0x803DD3E8@ha */ -/* 802526C4 38 63 D3 E8 */ addi r3, r3, mFrameBufferTexObj__13mDoGph_gInf_c@l /* 0x803DD3E8@l */ -/* 802526C8 38 80 00 01 */ li r4, 1 -/* 802526CC 38 A0 00 01 */ li r5, 1 -/* 802526D0 C0 22 B4 24 */ lfs f1, lit_3683(r2) -/* 802526D4 FC 40 08 90 */ fmr f2, f1 -/* 802526D8 FC 60 08 90 */ fmr f3, f1 -/* 802526DC 38 C0 00 00 */ li r6, 0 -/* 802526E0 38 E0 00 00 */ li r7, 0 -/* 802526E4 39 00 00 00 */ li r8, 0 -/* 802526E8 48 10 B9 ED */ bl GXInitTexObjLOD -/* 802526EC 3C 60 80 3E */ lis r3, mFrameBufferTexObj__13mDoGph_gInf_c@ha /* 0x803DD3E8@ha */ -/* 802526F0 38 63 D3 E8 */ addi r3, r3, mFrameBufferTexObj__13mDoGph_gInf_c@l /* 0x803DD3E8@l */ -/* 802526F4 38 80 00 00 */ li r4, 0 -/* 802526F8 48 10 BD 1D */ bl GXLoadTexObj -/* 802526FC 38 60 00 01 */ li r3, 1 -/* 80252700 48 10 B4 31 */ bl GXSetNumChans -/* 80252704 38 60 00 00 */ li r3, 0 -/* 80252708 38 80 00 00 */ li r4, 0 -/* 8025270C 38 A0 00 00 */ li r5, 0 -/* 80252710 38 C0 00 00 */ li r6, 0 -/* 80252714 38 E0 00 00 */ li r7, 0 -/* 80252718 39 00 00 00 */ li r8, 0 -/* 8025271C 39 20 00 02 */ li r9, 2 -/* 80252720 48 10 B4 4D */ bl GXSetChanCtrl -/* 80252724 80 02 B4 20 */ lwz r0, lit_3631(r2) -/* 80252728 90 01 00 0C */ stw r0, 0xc(r1) -/* 8025272C 38 60 00 00 */ li r3, 0 -/* 80252730 38 81 00 0C */ addi r4, r1, 0xc -/* 80252734 48 10 B3 15 */ bl GXSetChanMatColor -/* 80252738 38 60 00 01 */ li r3, 1 -/* 8025273C 48 10 96 C1 */ bl GXSetNumTexGens -/* 80252740 38 60 00 00 */ li r3, 0 -/* 80252744 38 80 00 01 */ li r4, 1 -/* 80252748 38 A0 00 04 */ li r5, 4 -/* 8025274C 38 C0 00 3C */ li r6, 0x3c -/* 80252750 38 E0 00 00 */ li r7, 0 -/* 80252754 39 00 00 7D */ li r8, 0x7d -/* 80252758 48 10 94 25 */ bl GXSetTexCoordGen2 -/* 8025275C 38 60 00 01 */ li r3, 1 -/* 80252760 48 10 D1 31 */ bl GXSetNumTevStages -/* 80252764 38 60 00 00 */ li r3, 0 -/* 80252768 38 80 00 00 */ li r4, 0 -/* 8025276C 38 A0 00 00 */ li r5, 0 -/* 80252770 38 C0 00 04 */ li r6, 4 -/* 80252774 48 10 CF 81 */ bl GXSetTevOrder -/* 80252778 38 60 00 00 */ li r3, 0 -/* 8025277C 38 80 00 0F */ li r4, 0xf -/* 80252780 38 A0 00 0A */ li r5, 0xa -/* 80252784 38 C0 00 08 */ li r6, 8 -/* 80252788 38 E0 00 0F */ li r7, 0xf -/* 8025278C 48 10 CA 99 */ bl GXSetTevColorIn -/* 80252790 38 60 00 00 */ li r3, 0 -/* 80252794 38 80 00 00 */ li r4, 0 -/* 80252798 38 A0 00 00 */ li r5, 0 -/* 8025279C 38 C0 00 00 */ li r6, 0 -/* 802527A0 38 E0 00 01 */ li r7, 1 -/* 802527A4 39 00 00 00 */ li r8, 0 -/* 802527A8 48 10 CB 05 */ bl GXSetTevColorOp -/* 802527AC 38 60 00 00 */ li r3, 0 -/* 802527B0 38 80 00 07 */ li r4, 7 -/* 802527B4 38 A0 00 07 */ li r5, 7 -/* 802527B8 38 C0 00 07 */ li r6, 7 -/* 802527BC 38 E0 00 07 */ li r7, 7 -/* 802527C0 48 10 CA A9 */ bl GXSetTevAlphaIn -/* 802527C4 38 60 00 00 */ li r3, 0 -/* 802527C8 38 80 00 00 */ li r4, 0 -/* 802527CC 38 A0 00 00 */ li r5, 0 -/* 802527D0 38 C0 00 00 */ li r6, 0 -/* 802527D4 38 E0 00 01 */ li r7, 1 -/* 802527D8 39 00 00 00 */ li r8, 0 -/* 802527DC 48 10 CB 39 */ bl GXSetTevAlphaOp -/* 802527E0 38 60 00 01 */ li r3, 1 -/* 802527E4 48 10 D4 ED */ bl GXSetZCompLoc -/* 802527E8 38 60 00 00 */ li r3, 0 -/* 802527EC 38 80 00 07 */ li r4, 7 -/* 802527F0 38 A0 00 00 */ li r5, 0 -/* 802527F4 48 10 D4 A9 */ bl GXSetZMode -/* 802527F8 38 60 00 00 */ li r3, 0 -/* 802527FC 38 80 00 04 */ li r4, 4 -/* 80252800 38 A0 00 05 */ li r5, 5 -/* 80252804 38 C0 00 00 */ li r6, 0 -/* 80252808 48 10 D3 E9 */ bl GXSetBlendMode -/* 8025280C 38 60 00 07 */ li r3, 7 -/* 80252810 38 80 00 00 */ li r4, 0 -/* 80252814 38 A0 00 01 */ li r5, 1 -/* 80252818 38 C0 00 07 */ li r6, 7 -/* 8025281C 38 E0 00 00 */ li r7, 0 -/* 80252820 48 10 CE 05 */ bl GXSetAlphaCompare -/* 80252824 80 0D 80 80 */ lwz r0, g_clearColor(r13) -/* 80252828 90 01 00 08 */ stw r0, 8(r1) -/* 8025282C 38 60 00 00 */ li r3, 0 -/* 80252830 C0 22 B4 24 */ lfs f1, lit_3683(r2) -/* 80252834 FC 40 08 90 */ fmr f2, f1 -/* 80252838 FC 60 08 90 */ fmr f3, f1 -/* 8025283C FC 80 08 90 */ fmr f4, f1 -/* 80252840 38 81 00 08 */ addi r4, r1, 8 -/* 80252844 48 10 D0 75 */ bl GXSetFog -/* 80252848 38 60 00 00 */ li r3, 0 -/* 8025284C 48 10 A1 39 */ bl GXSetCullMode -/* 80252850 38 60 00 01 */ li r3, 1 -/* 80252854 48 10 D5 85 */ bl GXSetDither -/* 80252858 38 60 00 00 */ li r3, 0 -/* 8025285C 48 10 DD 75 */ bl GXSetClipMode -/* 80252860 38 7F 00 04 */ addi r3, r31, 4 -/* 80252864 38 80 00 00 */ li r4, 0 -/* 80252868 48 10 D9 E5 */ bl GXLoadPosMtxImm -/* 8025286C 38 60 00 00 */ li r3, 0 -/* 80252870 48 10 DA 7D */ bl GXSetCurrentMtx -/* 80252874 48 10 8D 19 */ bl GXClearVtxDesc -/* 80252878 38 60 00 09 */ li r3, 9 -/* 8025287C 38 80 00 01 */ li r4, 1 -/* 80252880 48 10 86 39 */ bl GXSetVtxDesc -/* 80252884 38 60 00 0D */ li r3, 0xd -/* 80252888 38 80 00 01 */ li r4, 1 -/* 8025288C 48 10 86 2D */ bl GXSetVtxDesc -/* 80252890 38 60 00 00 */ li r3, 0 -/* 80252894 38 80 00 09 */ li r4, 9 -/* 80252898 38 A0 00 00 */ li r5, 0 -/* 8025289C 38 C0 00 03 */ li r6, 3 -/* 802528A0 38 E0 00 00 */ li r7, 0 -/* 802528A4 48 10 8D 21 */ bl GXSetVtxAttrFmt -/* 802528A8 38 60 00 00 */ li r3, 0 -/* 802528AC 38 80 00 0D */ li r4, 0xd -/* 802528B0 38 A0 00 01 */ li r5, 1 -/* 802528B4 38 C0 00 01 */ li r6, 1 -/* 802528B8 38 E0 00 00 */ li r7, 0 -/* 802528BC 48 10 8D 09 */ bl GXSetVtxAttrFmt -/* 802528C0 38 60 00 80 */ li r3, 0x80 -/* 802528C4 38 80 00 00 */ li r4, 0 -/* 802528C8 38 A0 00 04 */ li r5, 4 -/* 802528CC 48 10 9E 99 */ bl GXBegin -/* 802528D0 38 C0 FE D0 */ li r6, -304 -/* 802528D4 3C A0 CC 01 */ lis r5, 0xCC01 /* 0xCC008000@ha */ -/* 802528D8 B0 C5 80 00 */ sth r6, 0x8000(r5) /* 0xCC008000@l */ -/* 802528DC 38 60 00 E0 */ li r3, 0xe0 -/* 802528E0 B0 65 80 00 */ sth r3, -0x8000(r5) -/* 802528E4 38 80 00 00 */ li r4, 0 -/* 802528E8 98 85 80 00 */ stb r4, -0x8000(r5) -/* 802528EC 98 85 80 00 */ stb r4, -0x8000(r5) -/* 802528F0 38 00 01 30 */ li r0, 0x130 -/* 802528F4 B0 05 80 00 */ sth r0, -0x8000(r5) -/* 802528F8 B0 65 80 00 */ sth r3, -0x8000(r5) -/* 802528FC 38 60 00 01 */ li r3, 1 -/* 80252900 98 65 80 00 */ stb r3, -0x8000(r5) -/* 80252904 98 85 80 00 */ stb r4, -0x8000(r5) -/* 80252908 B0 05 80 00 */ sth r0, -0x8000(r5) -/* 8025290C 38 00 FF 20 */ li r0, -224 -/* 80252910 B0 05 80 00 */ sth r0, -0x8000(r5) -/* 80252914 98 65 80 00 */ stb r3, -0x8000(r5) -/* 80252918 98 65 80 00 */ stb r3, -0x8000(r5) -/* 8025291C B0 C5 80 00 */ sth r6, -0x8000(r5) -/* 80252920 B0 05 80 00 */ sth r0, -0x8000(r5) -/* 80252924 98 85 80 00 */ stb r4, -0x8000(r5) -/* 80252928 98 65 80 00 */ stb r3, -0x8000(r5) -/* 8025292C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80252930 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80252934 83 E3 5F 50 */ lwz r31, 0x5f50(r3) -/* 80252938 C0 02 B4 24 */ lfs f0, lit_3683(r2) -/* 8025293C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80252940 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80252944 C0 02 B4 28 */ lfs f0, lit_3684(r2) -/* 80252948 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8025294C C0 02 B4 2C */ lfs f0, lit_3685(r2) -/* 80252950 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80252954 7F E3 FB 78 */ mr r3, r31 -/* 80252958 38 81 00 14 */ addi r4, r1, 0x14 -/* 8025295C C0 22 B4 44 */ lfs f1, lit_3691(r2) -/* 80252960 C0 42 B4 30 */ lfs f2, lit_3686(r2) -/* 80252964 48 09 6E A9 */ bl func_802E980C -/* 80252968 7F E3 FB 78 */ mr r3, r31 -/* 8025296C 81 9F 00 00 */ lwz r12, 0(r31) -/* 80252970 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80252974 7D 89 03 A6 */ mtctr r12 -/* 80252978 4E 80 04 21 */ bctrl -/* 8025297C 83 E1 00 6C */ lwz r31, 0x6c(r1) -/* 80252980 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80252984 7C 08 03 A6 */ mtlr r0 -/* 80252988 38 21 00 70 */ addi r1, r1, 0x70 -/* 8025298C 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade2/execFadeIn__10dOvlpFd2_cFv.s b/asm/d/ovlp/d_ovlp_fade2/execFadeIn__10dOvlpFd2_cFv.s deleted file mode 100644 index a65ac14d428..00000000000 --- a/asm/d/ovlp/d_ovlp_fade2/execFadeIn__10dOvlpFd2_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80252C68: -/* 80252C68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80252C6C 7C 08 02 A6 */ mflr r0 -/* 80252C70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80252C74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80252C78 7C 7F 1B 78 */ mr r31, r3 -/* 80252C7C A8 63 01 14 */ lha r3, 0x114(r3) -/* 80252C80 38 03 F8 00 */ addi r0, r3, -2048 -/* 80252C84 B0 1F 01 14 */ sth r0, 0x114(r31) -/* 80252C88 38 7F 01 18 */ addi r3, r31, 0x118 -/* 80252C8C C0 22 B4 30 */ lfs f1, lit_3686(r2) -/* 80252C90 C0 42 B4 4C */ lfs f2, lit_3794(r2) -/* 80252C94 48 01 CD ED */ bl cLib_addCalc0__FPfff -/* 80252C98 C0 3F 01 18 */ lfs f1, 0x118(r31) -/* 80252C9C C0 02 B4 50 */ lfs f0, lit_3795(r2) -/* 80252CA0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80252CA4 40 80 00 40 */ bge lbl_80252CE4 -/* 80252CA8 88 1F 01 1E */ lbz r0, 0x11e(r31) -/* 80252CAC 28 00 00 00 */ cmplwi r0, 0 -/* 80252CB0 40 82 00 14 */ bne lbl_80252CC4 -/* 80252CB4 4B DC B8 11 */ bl fopOvlpM_SceneIsStart__Fv -/* 80252CB8 38 00 00 01 */ li r0, 1 -/* 80252CBC 98 1F 01 1E */ stb r0, 0x11e(r31) -/* 80252CC0 48 00 00 38 */ b lbl_80252CF8 -lbl_80252CC4: -/* 80252CC4 7F E3 FB 78 */ mr r3, r31 -/* 80252CC8 4B DC B8 55 */ bl fopOvlpM_Done__FP18overlap_task_class -/* 80252CCC 38 00 00 01 */ li r0, 1 -/* 80252CD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80252CD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80252CD8 98 03 5D 44 */ stb r0, 0x5d44(r3) -/* 80252CDC 98 03 5E B8 */ stb r0, 0x5eb8(r3) -/* 80252CE0 48 00 00 18 */ b lbl_80252CF8 -lbl_80252CE4: -/* 80252CE4 38 00 00 00 */ li r0, 0 -/* 80252CE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80252CEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80252CF0 98 03 5D 44 */ stb r0, 0x5d44(r3) -/* 80252CF4 4B DC B7 91 */ bl fopOvlpM_SceneIsStop__Fv -lbl_80252CF8: -/* 80252CF8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80252CFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80252D00 7C 08 03 A6 */ mtlr r0 -/* 80252D04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252D08 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade2/execFadeOut__10dOvlpFd2_cFv.s b/asm/d/ovlp/d_ovlp_fade2/execFadeOut__10dOvlpFd2_cFv.s deleted file mode 100644 index 27a2dab38b1..00000000000 --- a/asm/d/ovlp/d_ovlp_fade2/execFadeOut__10dOvlpFd2_cFv.s +++ /dev/null @@ -1,87 +0,0 @@ -lbl_80252A78: -/* 80252A78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80252A7C 7C 08 02 A6 */ mflr r0 -/* 80252A80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80252A84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80252A88 7C 7F 1B 78 */ mr r31, r3 -/* 80252A8C 38 00 00 00 */ li r0, 0 -/* 80252A90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80252A94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80252A98 98 03 5D 44 */ stb r0, 0x5d44(r3) -/* 80252A9C 38 7F 01 12 */ addi r3, r31, 0x112 -/* 80252AA0 38 80 07 D0 */ li r4, 0x7d0 -/* 80252AA4 38 A0 00 64 */ li r5, 0x64 -/* 80252AA8 48 01 E0 E9 */ bl cLib_chaseAngleS__FPsss -/* 80252AAC A8 9F 01 12 */ lha r4, 0x112(r31) -/* 80252AB0 A8 7F 01 10 */ lha r3, 0x110(r31) -/* 80252AB4 38 03 40 00 */ addi r0, r3, 0x4000 -/* 80252AB8 54 00 04 20 */ rlwinm r0, r0, 0, 0x10, 0x10 -/* 80252ABC 60 00 40 00 */ ori r0, r0, 0x4000 -/* 80252AC0 7C 04 00 50 */ subf r0, r4, r0 -/* 80252AC4 7C 05 07 34 */ extsh r5, r0 -/* 80252AC8 7C 03 22 14 */ add r0, r3, r4 -/* 80252ACC B0 1F 01 10 */ sth r0, 0x110(r31) -/* 80252AD0 A8 7F 01 12 */ lha r3, 0x112(r31) -/* 80252AD4 A8 1F 01 10 */ lha r0, 0x110(r31) -/* 80252AD8 7C 00 28 50 */ subf r0, r0, r5 -/* 80252ADC 7C 00 07 34 */ extsh r0, r0 -/* 80252AE0 7C 03 01 D7 */ mullw. r0, r3, r0 -/* 80252AE4 40 80 00 54 */ bge lbl_80252B38 -/* 80252AE8 88 1F 01 1D */ lbz r0, 0x11d(r31) -/* 80252AEC 7C 00 07 75 */ extsb. r0, r0 -/* 80252AF0 40 82 00 48 */ bne lbl_80252B38 -/* 80252AF4 7F E3 FB 78 */ mr r3, r31 -/* 80252AF8 4B DC BA 0D */ bl fopOvlpM_IsOutReq__FP18overlap_task_class -/* 80252AFC 2C 03 00 00 */ cmpwi r3, 0 -/* 80252B00 41 82 00 38 */ beq lbl_80252B38 -/* 80252B04 4B DC B9 C1 */ bl fopOvlpM_SceneIsStart__Fv -/* 80252B08 3C 60 80 3C */ lis r3, lit_3736@ha /* 0x803C2D08@ha */ -/* 80252B0C 38 83 2D 08 */ addi r4, r3, lit_3736@l /* 0x803C2D08@l */ -/* 80252B10 80 64 00 00 */ lwz r3, 0(r4) -/* 80252B14 80 04 00 04 */ lwz r0, 4(r4) -/* 80252B18 90 7F 00 CC */ stw r3, 0xcc(r31) -/* 80252B1C 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 80252B20 80 04 00 08 */ lwz r0, 8(r4) -/* 80252B24 90 1F 00 D4 */ stw r0, 0xd4(r31) -/* 80252B28 38 00 C0 00 */ li r0, -16384 -/* 80252B2C B0 1F 01 10 */ sth r0, 0x110(r31) -/* 80252B30 38 00 00 0F */ li r0, 0xf -/* 80252B34 98 1F 01 1D */ stb r0, 0x11d(r31) -lbl_80252B38: -/* 80252B38 88 7F 01 1D */ lbz r3, 0x11d(r31) -/* 80252B3C 7C 60 07 75 */ extsb. r0, r3 -/* 80252B40 40 80 00 44 */ bge lbl_80252B84 -/* 80252B44 38 03 00 01 */ addi r0, r3, 1 -/* 80252B48 98 1F 01 1D */ stb r0, 0x11d(r31) -/* 80252B4C 7C 00 07 75 */ extsb. r0, r0 -/* 80252B50 40 82 00 3C */ bne lbl_80252B8C -/* 80252B54 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80252B58 80 63 00 04 */ lwz r3, 4(r3) -/* 80252B5C 28 03 00 00 */ cmplwi r3, 0 -/* 80252B60 41 82 00 18 */ beq lbl_80252B78 -/* 80252B64 38 80 00 10 */ li r4, 0x10 -/* 80252B68 81 83 00 00 */ lwz r12, 0(r3) -/* 80252B6C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80252B70 7D 89 03 A6 */ mtctr r12 -/* 80252B74 4E 80 04 21 */ bctrl -lbl_80252B78: -/* 80252B78 38 00 00 14 */ li r0, 0x14 -/* 80252B7C 98 1F 01 1D */ stb r0, 0x11d(r31) -/* 80252B80 48 00 00 0C */ b lbl_80252B8C -lbl_80252B84: -/* 80252B84 38 7F 01 1D */ addi r3, r31, 0x11d -/* 80252B88 48 00 02 E9 */ bl func_80252E70 -lbl_80252B8C: -/* 80252B8C A8 7F 01 14 */ lha r3, 0x114(r31) -/* 80252B90 38 03 08 00 */ addi r0, r3, 0x800 -/* 80252B94 B0 1F 01 14 */ sth r0, 0x114(r31) -/* 80252B98 38 7F 01 18 */ addi r3, r31, 0x118 -/* 80252B9C C0 22 B4 30 */ lfs f1, lit_3686(r2) -/* 80252BA0 FC 40 08 90 */ fmr f2, f1 -/* 80252BA4 C0 62 B4 48 */ lfs f3, lit_3757(r2) -/* 80252BA8 48 01 CE 95 */ bl cLib_addCalc2__FPffff -/* 80252BAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80252BB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80252BB4 7C 08 03 A6 */ mtlr r0 -/* 80252BB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252BBC 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade2/execFirstSnap__10dOvlpFd2_cFv.s b/asm/d/ovlp/d_ovlp_fade2/execFirstSnap__10dOvlpFd2_cFv.s deleted file mode 100644 index 5409a82f342..00000000000 --- a/asm/d/ovlp/d_ovlp_fade2/execFirstSnap__10dOvlpFd2_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_802529F4: -/* 802529F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802529F8 7C 08 02 A6 */ mflr r0 -/* 802529FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80252A00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80252A04 7C 7F 1B 78 */ mr r31, r3 -/* 80252A08 88 03 01 1C */ lbz r0, 0x11c(r3) -/* 80252A0C 28 00 00 00 */ cmplwi r0, 0 -/* 80252A10 41 82 00 54 */ beq lbl_80252A64 -/* 80252A14 38 7F 01 1D */ addi r3, r31, 0x11d -/* 80252A18 48 00 04 59 */ bl func_80252E70 -/* 80252A1C 7C 60 07 75 */ extsb. r0, r3 -/* 80252A20 40 82 00 34 */ bne lbl_80252A54 -/* 80252A24 3C 60 80 3C */ lis r3, lit_3721@ha /* 0x803C2CFC@ha */ -/* 80252A28 38 83 2C FC */ addi r4, r3, lit_3721@l /* 0x803C2CFC@l */ -/* 80252A2C 80 64 00 00 */ lwz r3, 0(r4) -/* 80252A30 80 04 00 04 */ lwz r0, 4(r4) -/* 80252A34 90 7F 00 CC */ stw r3, 0xcc(r31) -/* 80252A38 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 80252A3C 80 04 00 08 */ lwz r0, 8(r4) -/* 80252A40 90 1F 00 D4 */ stw r0, 0xd4(r31) -/* 80252A44 7F E3 FB 78 */ mr r3, r31 -/* 80252A48 4B DC BA D5 */ bl fopOvlpM_Done__FP18overlap_task_class -/* 80252A4C 38 00 FF F4 */ li r0, -12 -/* 80252A50 98 1F 01 1D */ stb r0, 0x11d(r31) -lbl_80252A54: -/* 80252A54 38 00 00 00 */ li r0, 0 -/* 80252A58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80252A5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80252A60 98 03 5D 44 */ stb r0, 0x5d44(r3) -lbl_80252A64: -/* 80252A64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80252A68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80252A6C 7C 08 03 A6 */ mtlr r0 -/* 80252A70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252A74 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade2/execNextSnap__10dOvlpFd2_cFv.s b/asm/d/ovlp/d_ovlp_fade2/execNextSnap__10dOvlpFd2_cFv.s deleted file mode 100644 index 981a7793c99..00000000000 --- a/asm/d/ovlp/d_ovlp_fade2/execNextSnap__10dOvlpFd2_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80252BC0: -/* 80252BC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80252BC4 7C 08 02 A6 */ mflr r0 -/* 80252BC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80252BCC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80252BD0 7C 7F 1B 78 */ mr r31, r3 -/* 80252BD4 38 7F 01 1D */ addi r3, r31, 0x11d -/* 80252BD8 48 00 02 99 */ bl func_80252E70 -/* 80252BDC 7C 60 07 75 */ extsb. r0, r3 -/* 80252BE0 40 82 00 74 */ bne lbl_80252C54 -/* 80252BE4 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80252BE8 80 63 00 04 */ lwz r3, 4(r3) -/* 80252BEC 38 80 00 10 */ li r4, 0x10 -/* 80252BF0 81 83 00 00 */ lwz r12, 0(r3) -/* 80252BF4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80252BF8 7D 89 03 A6 */ mtctr r12 -/* 80252BFC 4E 80 04 21 */ bctrl -/* 80252C00 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80252C04 40 82 00 50 */ bne lbl_80252C54 -/* 80252C08 A8 7F 01 10 */ lha r3, 0x110(r31) -/* 80252C0C A8 1F 01 12 */ lha r0, 0x112(r31) -/* 80252C10 7C 03 02 14 */ add r0, r3, r0 -/* 80252C14 B0 1F 01 10 */ sth r0, 0x110(r31) -/* 80252C18 38 80 00 00 */ li r4, 0 -/* 80252C1C 98 9F 01 1C */ stb r4, 0x11c(r31) -/* 80252C20 38 00 00 01 */ li r0, 1 -/* 80252C24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80252C28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80252C2C 98 03 5D 44 */ stb r0, 0x5d44(r3) -/* 80252C30 98 83 5E B8 */ stb r4, 0x5eb8(r3) -/* 80252C34 3C 60 80 3C */ lis r3, lit_3765@ha /* 0x803C2D14@ha */ -/* 80252C38 38 83 2D 14 */ addi r4, r3, lit_3765@l /* 0x803C2D14@l */ -/* 80252C3C 80 64 00 00 */ lwz r3, 0(r4) -/* 80252C40 80 04 00 04 */ lwz r0, 4(r4) -/* 80252C44 90 7F 00 CC */ stw r3, 0xcc(r31) -/* 80252C48 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 80252C4C 80 04 00 08 */ lwz r0, 8(r4) -/* 80252C50 90 1F 00 D4 */ stw r0, 0xd4(r31) -lbl_80252C54: -/* 80252C54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80252C58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80252C5C 7C 08 03 A6 */ mtlr r0 -/* 80252C60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252C64 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade3/__ct__10dOvlpFd3_cFv.s b/asm/d/ovlp/d_ovlp_fade3/__ct__10dOvlpFd3_cFv.s deleted file mode 100644 index 894ffd9cbe7..00000000000 --- a/asm/d/ovlp/d_ovlp_fade3/__ct__10dOvlpFd3_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8025343C: -/* 8025343C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80253440 7C 08 02 A6 */ mflr r0 -/* 80253444 90 01 00 14 */ stw r0, 0x14(r1) -/* 80253448 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025344C 7C 7F 1B 78 */ mr r31, r3 -/* 80253450 3C 60 80 3A */ lis r3, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 80253454 38 83 6F 88 */ addi r4, r3, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 80253458 90 9F 00 D8 */ stw r4, 0xd8(r31) -/* 8025345C 3C 60 80 3C */ lis r3, __vt__16dDlst_snapShot_c@ha /* 0x803C2DEC@ha */ -/* 80253460 38 03 2D EC */ addi r0, r3, __vt__16dDlst_snapShot_c@l /* 0x803C2DEC@l */ -/* 80253464 90 1F 00 D8 */ stw r0, 0xd8(r31) -/* 80253468 90 9F 00 DC */ stw r4, 0xdc(r31) -/* 8025346C 3C 60 80 3C */ lis r3, __vt__15dOvlpFd3_dlst_c@ha /* 0x803C2DDC@ha */ -/* 80253470 38 03 2D DC */ addi r0, r3, __vt__15dOvlpFd3_dlst_c@l /* 0x803C2DDC@l */ -/* 80253474 90 1F 00 DC */ stw r0, 0xdc(r31) -/* 80253478 3C 60 80 3C */ lis r3, lit_3812@ha /* 0x803C2D70@ha */ -/* 8025347C 38 83 2D 70 */ addi r4, r3, lit_3812@l /* 0x803C2D70@l */ -/* 80253480 80 64 00 00 */ lwz r3, 0(r4) -/* 80253484 80 04 00 04 */ lwz r0, 4(r4) -/* 80253488 90 7F 00 CC */ stw r3, 0xcc(r31) -/* 8025348C 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 80253490 80 04 00 08 */ lwz r0, 8(r4) -/* 80253494 90 1F 00 D4 */ stw r0, 0xd4(r31) -/* 80253498 38 00 00 00 */ li r0, 0 -/* 8025349C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802534A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802534A4 98 03 5E B8 */ stb r0, 0x5eb8(r3) -/* 802534A8 38 00 00 02 */ li r0, 2 -/* 802534AC 98 1F 01 1D */ stb r0, 0x11d(r31) -/* 802534B0 88 03 4E 1E */ lbz r0, 0x4e1e(r3) -/* 802534B4 98 1F 01 1F */ stb r0, 0x11f(r31) -/* 802534B8 88 1F 01 1F */ lbz r0, 0x11f(r31) -/* 802534BC 28 00 00 00 */ cmplwi r0, 0 -/* 802534C0 40 82 00 0C */ bne lbl_802534CC -/* 802534C4 38 00 00 01 */ li r0, 1 -/* 802534C8 98 1F 01 1F */ stb r0, 0x11f(r31) -lbl_802534CC: -/* 802534CC 4B F2 E1 75 */ bl dCam_getBody__Fv -/* 802534D0 4B F0 E0 01 */ bl Stop__9dCamera_cFv -/* 802534D4 88 1F 01 1F */ lbz r0, 0x11f(r31) -/* 802534D8 7C 03 0E 70 */ srawi r3, r0, 1 -/* 802534DC 38 83 00 5A */ addi r4, r3, 0x5a -/* 802534E0 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 802534E4 80 63 00 04 */ lwz r3, 4(r3) -/* 802534E8 28 03 00 00 */ cmplwi r3, 0 -/* 802534EC 41 82 00 14 */ beq lbl_80253500 -/* 802534F0 81 83 00 00 */ lwz r12, 0(r3) -/* 802534F4 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802534F8 7D 89 03 A6 */ mtctr r12 -/* 802534FC 4E 80 04 21 */ bctrl -lbl_80253500: -/* 80253500 7F E3 FB 78 */ mr r3, r31 -/* 80253504 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80253508 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025350C 7C 08 03 A6 */ mtlr r0 -/* 80253510 38 21 00 10 */ addi r1, r1, 0x10 -/* 80253514 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade3/__dt__15dOvlpFd3_dlst_cFv.s b/asm/d/ovlp/d_ovlp_fade3/__dt__15dOvlpFd3_dlst_cFv.s deleted file mode 100644 index f6af1a9ebf1..00000000000 --- a/asm/d/ovlp/d_ovlp_fade3/__dt__15dOvlpFd3_dlst_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802538E8: -/* 802538E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802538EC 7C 08 02 A6 */ mflr r0 -/* 802538F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802538F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802538F8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802538FC 41 82 00 1C */ beq lbl_80253918 -/* 80253900 3C A0 80 3C */ lis r5, __vt__15dOvlpFd3_dlst_c@ha /* 0x803C2DDC@ha */ -/* 80253904 38 05 2D DC */ addi r0, r5, __vt__15dOvlpFd3_dlst_c@l /* 0x803C2DDC@l */ -/* 80253908 90 1F 00 00 */ stw r0, 0(r31) -/* 8025390C 7C 80 07 35 */ extsh. r0, r4 -/* 80253910 40 81 00 08 */ ble lbl_80253918 -/* 80253914 48 07 B4 29 */ bl __dl__FPv -lbl_80253918: -/* 80253918 7F E3 FB 78 */ mr r3, r31 -/* 8025391C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80253920 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80253924 7C 08 03 A6 */ mtlr r0 -/* 80253928 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025392C 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade3/dOvlpFd3_Create__FPv.s b/asm/d/ovlp/d_ovlp_fade3/dOvlpFd3_Create__FPv.s deleted file mode 100644 index b113768bc8c..00000000000 --- a/asm/d/ovlp/d_ovlp_fade3/dOvlpFd3_Create__FPv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802538BC: -/* 802538BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802538C0 7C 08 02 A6 */ mflr r0 -/* 802538C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802538C8 28 03 00 00 */ cmplwi r3, 0 -/* 802538CC 41 82 00 08 */ beq lbl_802538D4 -/* 802538D0 4B FF FB 6D */ bl __ct__10dOvlpFd3_cFv -lbl_802538D4: -/* 802538D4 38 60 00 04 */ li r3, 4 -/* 802538D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802538DC 7C 08 03 A6 */ mtlr r0 -/* 802538E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802538E4 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade3/dOvlpFd3_Draw__FP10dOvlpFd3_c.s b/asm/d/ovlp/d_ovlp_fade3/dOvlpFd3_Draw__FP10dOvlpFd3_c.s deleted file mode 100644 index 9aa31db4723..00000000000 --- a/asm/d/ovlp/d_ovlp_fade3/dOvlpFd3_Draw__FP10dOvlpFd3_c.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_802537AC: -/* 802537AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802537B0 7C 08 02 A6 */ mflr r0 -/* 802537B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802537B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802537BC 7C 7F 1B 78 */ mr r31, r3 -/* 802537C0 88 03 01 1F */ lbz r0, 0x11f(r3) -/* 802537C4 28 00 00 00 */ cmplwi r0, 0 -/* 802537C8 40 82 00 A0 */ bne lbl_80253868 -/* 802537CC 88 1F 01 1C */ lbz r0, 0x11c(r31) -/* 802537D0 28 00 00 00 */ cmplwi r0, 0 -/* 802537D4 40 82 00 2C */ bne lbl_80253800 -/* 802537D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802537DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802537E0 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 802537E4 38 83 02 3C */ addi r4, r3, 0x23c -/* 802537E8 38 A3 02 40 */ addi r5, r3, 0x240 -/* 802537EC 38 DF 00 D8 */ addi r6, r31, 0xd8 -/* 802537F0 4B E0 2F A5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 802537F4 38 00 00 01 */ li r0, 1 -/* 802537F8 98 1F 01 1C */ stb r0, 0x11c(r31) -/* 802537FC 48 00 00 6C */ b lbl_80253868 -lbl_80253800: -/* 80253800 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80253804 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80253808 88 03 5D 44 */ lbz r0, 0x5d44(r3) -/* 8025380C 2C 00 00 00 */ cmpwi r0, 0 -/* 80253810 40 82 00 58 */ bne lbl_80253868 -/* 80253814 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80253818 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8025381C C0 22 B4 5C */ lfs f1, lit_3800(r2) -/* 80253820 FC 40 08 90 */ fmr f2, f1 -/* 80253824 C0 62 B4 84 */ lfs f3, lit_3947(r2) -/* 80253828 48 0F 30 C1 */ bl PSMTXTrans -/* 8025382C C0 22 B4 68 */ lfs f1, lit_3803(r2) -/* 80253830 FC 40 08 90 */ fmr f2, f1 -/* 80253834 FC 60 08 90 */ fmr f3, f1 -/* 80253838 4B DB 96 01 */ bl scaleM__14mDoMtx_stack_cFfff -/* 8025383C 38 9F 00 E0 */ addi r4, r31, 0xe0 -/* 80253840 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80253844 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80253848 48 0F 2C 69 */ bl PSMTXCopy -/* 8025384C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80253850 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80253854 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80253858 38 83 02 3C */ addi r4, r3, 0x23c -/* 8025385C 38 A3 02 40 */ addi r5, r3, 0x240 -/* 80253860 38 DF 00 DC */ addi r6, r31, 0xdc -/* 80253864 4B E0 2F 31 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_80253868: -/* 80253868 38 60 00 01 */ li r3, 1 -/* 8025386C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80253870 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80253874 7C 08 03 A6 */ mtlr r0 -/* 80253878 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025387C 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade3/dOvlpFd3_Execute__FP10dOvlpFd3_c.s b/asm/d/ovlp/d_ovlp_fade3/dOvlpFd3_Execute__FP10dOvlpFd3_c.s deleted file mode 100644 index a3c77d57183..00000000000 --- a/asm/d/ovlp/d_ovlp_fade3/dOvlpFd3_Execute__FP10dOvlpFd3_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80253880: -/* 80253880 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80253884 7C 08 02 A6 */ mflr r0 -/* 80253888 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025388C 39 83 00 CC */ addi r12, r3, 0xcc -/* 80253890 48 10 E7 F5 */ bl __ptmf_scall -/* 80253894 60 00 00 00 */ nop -/* 80253898 38 60 00 01 */ li r3, 1 -/* 8025389C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802538A0 7C 08 03 A6 */ mtlr r0 -/* 802538A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802538A8 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade3/draw__15dOvlpFd3_dlst_cFv.s b/asm/d/ovlp/d_ovlp_fade3/draw__15dOvlpFd3_dlst_cFv.s deleted file mode 100644 index eea8a507a6a..00000000000 --- a/asm/d/ovlp/d_ovlp_fade3/draw__15dOvlpFd3_dlst_cFv.s +++ /dev/null @@ -1,326 +0,0 @@ -lbl_80252F28: -/* 80252F28 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80252F2C 7C 08 02 A6 */ mflr r0 -/* 80252F30 90 01 00 74 */ stw r0, 0x74(r1) -/* 80252F34 93 E1 00 6C */ stw r31, 0x6c(r1) -/* 80252F38 7C 7F 1B 78 */ mr r31, r3 -/* 80252F3C C0 22 B4 5C */ lfs f1, lit_3800(r2) -/* 80252F40 FC 40 08 90 */ fmr f2, f1 -/* 80252F44 C0 62 B4 60 */ lfs f3, lit_3801(r2) -/* 80252F48 C0 82 B4 64 */ lfs f4, lit_3802(r2) -/* 80252F4C FC A0 08 90 */ fmr f5, f1 -/* 80252F50 C0 C2 B4 68 */ lfs f6, lit_3803(r2) -/* 80252F54 48 10 D5 11 */ bl GXSetViewport -/* 80252F58 38 60 00 00 */ li r3, 0 -/* 80252F5C 38 80 00 00 */ li r4, 0 -/* 80252F60 38 A0 02 60 */ li r5, 0x260 -/* 80252F64 38 C0 01 C0 */ li r6, 0x1c0 -/* 80252F68 48 10 D5 69 */ bl GXSetScissor -/* 80252F6C 38 60 00 00 */ li r3, 0 -/* 80252F70 38 80 00 09 */ li r4, 9 -/* 80252F74 38 A0 00 00 */ li r5, 0 -/* 80252F78 38 C0 00 03 */ li r6, 3 -/* 80252F7C 38 E0 00 00 */ li r7, 0 -/* 80252F80 48 10 86 45 */ bl GXSetVtxAttrFmt -/* 80252F84 48 10 86 09 */ bl GXClearVtxDesc -/* 80252F88 38 60 00 09 */ li r3, 9 -/* 80252F8C 38 80 00 01 */ li r4, 1 -/* 80252F90 48 10 7F 29 */ bl GXSetVtxDesc -/* 80252F94 38 60 00 01 */ li r3, 1 -/* 80252F98 48 10 AB 99 */ bl GXSetNumChans -/* 80252F9C 38 60 00 04 */ li r3, 4 -/* 80252FA0 38 80 00 00 */ li r4, 0 -/* 80252FA4 38 A0 00 00 */ li r5, 0 -/* 80252FA8 38 C0 00 00 */ li r6, 0 -/* 80252FAC 38 E0 00 00 */ li r7, 0 -/* 80252FB0 39 00 00 00 */ li r8, 0 -/* 80252FB4 39 20 00 02 */ li r9, 2 -/* 80252FB8 48 10 AB B5 */ bl GXSetChanCtrl -/* 80252FBC 38 60 00 00 */ li r3, 0 -/* 80252FC0 48 10 8E 3D */ bl GXSetNumTexGens -/* 80252FC4 38 60 00 01 */ li r3, 1 -/* 80252FC8 48 10 C8 C9 */ bl GXSetNumTevStages -/* 80252FCC 38 60 00 00 */ li r3, 0 -/* 80252FD0 38 80 00 FF */ li r4, 0xff -/* 80252FD4 38 A0 00 FF */ li r5, 0xff -/* 80252FD8 38 C0 00 04 */ li r6, 4 -/* 80252FDC 48 10 C7 19 */ bl GXSetTevOrder -/* 80252FE0 38 60 00 00 */ li r3, 0 -/* 80252FE4 38 80 00 0F */ li r4, 0xf -/* 80252FE8 38 A0 00 0F */ li r5, 0xf -/* 80252FEC 38 C0 00 0F */ li r6, 0xf -/* 80252FF0 38 E0 00 0F */ li r7, 0xf -/* 80252FF4 48 10 C2 31 */ bl GXSetTevColorIn -/* 80252FF8 38 60 00 00 */ li r3, 0 -/* 80252FFC 38 80 00 00 */ li r4, 0 -/* 80253000 38 A0 00 00 */ li r5, 0 -/* 80253004 38 C0 00 00 */ li r6, 0 -/* 80253008 38 E0 00 01 */ li r7, 1 -/* 8025300C 39 00 00 00 */ li r8, 0 -/* 80253010 48 10 C2 9D */ bl GXSetTevColorOp -/* 80253014 38 60 00 00 */ li r3, 0 -/* 80253018 38 80 00 07 */ li r4, 7 -/* 8025301C 38 A0 00 07 */ li r5, 7 -/* 80253020 38 C0 00 07 */ li r6, 7 -/* 80253024 38 E0 00 07 */ li r7, 7 -/* 80253028 48 10 C2 41 */ bl GXSetTevAlphaIn -/* 8025302C 38 60 00 00 */ li r3, 0 -/* 80253030 38 80 00 00 */ li r4, 0 -/* 80253034 38 A0 00 00 */ li r5, 0 -/* 80253038 38 C0 00 00 */ li r6, 0 -/* 8025303C 38 E0 00 01 */ li r7, 1 -/* 80253040 39 00 00 00 */ li r8, 0 -/* 80253044 48 10 C2 D1 */ bl GXSetTevAlphaOp -/* 80253048 38 60 00 01 */ li r3, 1 -/* 8025304C 48 10 CC 85 */ bl GXSetZCompLoc -/* 80253050 38 60 00 00 */ li r3, 0 -/* 80253054 38 80 00 07 */ li r4, 7 -/* 80253058 38 A0 00 00 */ li r5, 0 -/* 8025305C 48 10 CC 41 */ bl GXSetZMode -/* 80253060 38 60 00 00 */ li r3, 0 -/* 80253064 38 80 00 04 */ li r4, 4 -/* 80253068 38 A0 00 05 */ li r5, 5 -/* 8025306C 38 C0 00 00 */ li r6, 0 -/* 80253070 48 10 CB 81 */ bl GXSetBlendMode -/* 80253074 38 60 00 07 */ li r3, 7 -/* 80253078 38 80 00 00 */ li r4, 0 -/* 8025307C 38 A0 00 01 */ li r5, 1 -/* 80253080 38 C0 00 07 */ li r6, 7 -/* 80253084 38 E0 00 00 */ li r7, 0 -/* 80253088 48 10 C5 9D */ bl GXSetAlphaCompare -/* 8025308C 80 0D 80 80 */ lwz r0, g_clearColor(r13) -/* 80253090 90 01 00 10 */ stw r0, 0x10(r1) -/* 80253094 38 60 00 00 */ li r3, 0 -/* 80253098 C0 22 B4 5C */ lfs f1, lit_3800(r2) -/* 8025309C FC 40 08 90 */ fmr f2, f1 -/* 802530A0 FC 60 08 90 */ fmr f3, f1 -/* 802530A4 FC 80 08 90 */ fmr f4, f1 -/* 802530A8 38 81 00 10 */ addi r4, r1, 0x10 -/* 802530AC 48 10 C8 0D */ bl GXSetFog -/* 802530B0 38 60 00 00 */ li r3, 0 -/* 802530B4 48 10 98 D1 */ bl GXSetCullMode -/* 802530B8 38 60 00 01 */ li r3, 1 -/* 802530BC 48 10 CD 1D */ bl GXSetDither -/* 802530C0 38 60 00 01 */ li r3, 1 -/* 802530C4 48 10 D5 0D */ bl GXSetClipMode -/* 802530C8 3C 60 80 3A */ lis r3, g_mDoMtx_identity@ha /* 0x803A2FD8@ha */ -/* 802530CC 38 63 2F D8 */ addi r3, r3, g_mDoMtx_identity@l /* 0x803A2FD8@l */ -/* 802530D0 38 80 00 00 */ li r4, 0 -/* 802530D4 48 10 D1 79 */ bl GXLoadPosMtxImm -/* 802530D8 38 60 00 00 */ li r3, 0 -/* 802530DC 48 10 D2 11 */ bl GXSetCurrentMtx -/* 802530E0 38 60 00 80 */ li r3, 0x80 -/* 802530E4 38 80 00 00 */ li r4, 0 -/* 802530E8 38 A0 00 04 */ li r5, 4 -/* 802530EC 48 10 96 79 */ bl GXBegin -/* 802530F0 38 80 00 00 */ li r4, 0 -/* 802530F4 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 802530F8 B0 83 80 00 */ sth r4, 0x8000(r3) /* 0xCC008000@l */ -/* 802530FC B0 83 80 00 */ sth r4, -0x8000(r3) -/* 80253100 38 00 02 60 */ li r0, 0x260 -/* 80253104 B0 03 80 00 */ sth r0, -0x8000(r3) -/* 80253108 B0 83 80 00 */ sth r4, -0x8000(r3) -/* 8025310C B0 03 80 00 */ sth r0, -0x8000(r3) -/* 80253110 38 00 01 C0 */ li r0, 0x1c0 -/* 80253114 B0 03 80 00 */ sth r0, -0x8000(r3) -/* 80253118 B0 83 80 00 */ sth r4, -0x8000(r3) -/* 8025311C B0 03 80 00 */ sth r0, -0x8000(r3) -/* 80253120 38 61 00 24 */ addi r3, r1, 0x24 -/* 80253124 C0 22 B4 6C */ lfs f1, lit_3804(r2) -/* 80253128 C0 42 B4 70 */ lfs f2, lit_3805(r2) -/* 8025312C C0 62 B4 74 */ lfs f3, lit_3806(r2) -/* 80253130 C0 82 B4 78 */ lfs f4, lit_3807(r2) -/* 80253134 48 0F 3D F5 */ bl C_MTXPerspective -/* 80253138 38 61 00 24 */ addi r3, r1, 0x24 -/* 8025313C 38 80 00 00 */ li r4, 0 -/* 80253140 48 10 CF 95 */ bl GXSetProjection -/* 80253144 3C 60 80 3E */ lis r3, mFrameBufferTexObj__13mDoGph_gInf_c@ha /* 0x803DD3E8@ha */ -/* 80253148 38 63 D3 E8 */ addi r3, r3, mFrameBufferTexObj__13mDoGph_gInf_c@l /* 0x803DD3E8@l */ -/* 8025314C 80 8D 86 50 */ lwz r4, mFrameBufferTex__13mDoGph_gInf_c(r13) -/* 80253150 38 A0 01 30 */ li r5, 0x130 -/* 80253154 38 C0 00 E0 */ li r6, 0xe0 -/* 80253158 38 E0 00 06 */ li r7, 6 -/* 8025315C 39 00 00 00 */ li r8, 0 -/* 80253160 39 20 00 00 */ li r9, 0 -/* 80253164 39 40 00 00 */ li r10, 0 -/* 80253168 48 10 AC D9 */ bl GXInitTexObj -/* 8025316C 3C 60 80 3E */ lis r3, mFrameBufferTexObj__13mDoGph_gInf_c@ha /* 0x803DD3E8@ha */ -/* 80253170 38 63 D3 E8 */ addi r3, r3, mFrameBufferTexObj__13mDoGph_gInf_c@l /* 0x803DD3E8@l */ -/* 80253174 38 80 00 01 */ li r4, 1 -/* 80253178 38 A0 00 01 */ li r5, 1 -/* 8025317C C0 22 B4 5C */ lfs f1, lit_3800(r2) -/* 80253180 FC 40 08 90 */ fmr f2, f1 -/* 80253184 FC 60 08 90 */ fmr f3, f1 -/* 80253188 38 C0 00 00 */ li r6, 0 -/* 8025318C 38 E0 00 00 */ li r7, 0 -/* 80253190 39 00 00 00 */ li r8, 0 -/* 80253194 48 10 AF 41 */ bl GXInitTexObjLOD -/* 80253198 3C 60 80 3E */ lis r3, mFrameBufferTexObj__13mDoGph_gInf_c@ha /* 0x803DD3E8@ha */ -/* 8025319C 38 63 D3 E8 */ addi r3, r3, mFrameBufferTexObj__13mDoGph_gInf_c@l /* 0x803DD3E8@l */ -/* 802531A0 38 80 00 00 */ li r4, 0 -/* 802531A4 48 10 B2 71 */ bl GXLoadTexObj -/* 802531A8 38 60 00 01 */ li r3, 1 -/* 802531AC 48 10 A9 85 */ bl GXSetNumChans -/* 802531B0 38 60 00 00 */ li r3, 0 -/* 802531B4 38 80 00 00 */ li r4, 0 -/* 802531B8 38 A0 00 00 */ li r5, 0 -/* 802531BC 38 C0 00 00 */ li r6, 0 -/* 802531C0 38 E0 00 00 */ li r7, 0 -/* 802531C4 39 00 00 00 */ li r8, 0 -/* 802531C8 39 20 00 02 */ li r9, 2 -/* 802531CC 48 10 A9 A1 */ bl GXSetChanCtrl -/* 802531D0 80 02 B4 58 */ lwz r0, lit_3748(r2) -/* 802531D4 90 01 00 0C */ stw r0, 0xc(r1) -/* 802531D8 38 60 00 00 */ li r3, 0 -/* 802531DC 38 81 00 0C */ addi r4, r1, 0xc -/* 802531E0 48 10 A8 69 */ bl GXSetChanMatColor -/* 802531E4 38 60 00 01 */ li r3, 1 -/* 802531E8 48 10 8C 15 */ bl GXSetNumTexGens -/* 802531EC 38 60 00 00 */ li r3, 0 -/* 802531F0 38 80 00 01 */ li r4, 1 -/* 802531F4 38 A0 00 04 */ li r5, 4 -/* 802531F8 38 C0 00 3C */ li r6, 0x3c -/* 802531FC 38 E0 00 00 */ li r7, 0 -/* 80253200 39 00 00 7D */ li r8, 0x7d -/* 80253204 48 10 89 79 */ bl GXSetTexCoordGen2 -/* 80253208 38 60 00 01 */ li r3, 1 -/* 8025320C 48 10 C6 85 */ bl GXSetNumTevStages -/* 80253210 38 60 00 00 */ li r3, 0 -/* 80253214 38 80 00 00 */ li r4, 0 -/* 80253218 38 A0 00 00 */ li r5, 0 -/* 8025321C 38 C0 00 04 */ li r6, 4 -/* 80253220 48 10 C4 D5 */ bl GXSetTevOrder -/* 80253224 38 60 00 00 */ li r3, 0 -/* 80253228 38 80 00 0F */ li r4, 0xf -/* 8025322C 38 A0 00 0A */ li r5, 0xa -/* 80253230 38 C0 00 08 */ li r6, 8 -/* 80253234 38 E0 00 0F */ li r7, 0xf -/* 80253238 48 10 BF ED */ bl GXSetTevColorIn -/* 8025323C 38 60 00 00 */ li r3, 0 -/* 80253240 38 80 00 00 */ li r4, 0 -/* 80253244 38 A0 00 00 */ li r5, 0 -/* 80253248 38 C0 00 00 */ li r6, 0 -/* 8025324C 38 E0 00 01 */ li r7, 1 -/* 80253250 39 00 00 00 */ li r8, 0 -/* 80253254 48 10 C0 59 */ bl GXSetTevColorOp -/* 80253258 38 60 00 00 */ li r3, 0 -/* 8025325C 38 80 00 07 */ li r4, 7 -/* 80253260 38 A0 00 07 */ li r5, 7 -/* 80253264 38 C0 00 07 */ li r6, 7 -/* 80253268 38 E0 00 07 */ li r7, 7 -/* 8025326C 48 10 BF FD */ bl GXSetTevAlphaIn -/* 80253270 38 60 00 00 */ li r3, 0 -/* 80253274 38 80 00 00 */ li r4, 0 -/* 80253278 38 A0 00 00 */ li r5, 0 -/* 8025327C 38 C0 00 00 */ li r6, 0 -/* 80253280 38 E0 00 01 */ li r7, 1 -/* 80253284 39 00 00 00 */ li r8, 0 -/* 80253288 48 10 C0 8D */ bl GXSetTevAlphaOp -/* 8025328C 38 60 00 01 */ li r3, 1 -/* 80253290 48 10 CA 41 */ bl GXSetZCompLoc -/* 80253294 38 60 00 00 */ li r3, 0 -/* 80253298 38 80 00 07 */ li r4, 7 -/* 8025329C 38 A0 00 00 */ li r5, 0 -/* 802532A0 48 10 C9 FD */ bl GXSetZMode -/* 802532A4 38 60 00 00 */ li r3, 0 -/* 802532A8 38 80 00 04 */ li r4, 4 -/* 802532AC 38 A0 00 05 */ li r5, 5 -/* 802532B0 38 C0 00 00 */ li r6, 0 -/* 802532B4 48 10 C9 3D */ bl GXSetBlendMode -/* 802532B8 38 60 00 07 */ li r3, 7 -/* 802532BC 38 80 00 00 */ li r4, 0 -/* 802532C0 38 A0 00 01 */ li r5, 1 -/* 802532C4 38 C0 00 07 */ li r6, 7 -/* 802532C8 38 E0 00 00 */ li r7, 0 -/* 802532CC 48 10 C3 59 */ bl GXSetAlphaCompare -/* 802532D0 80 0D 80 80 */ lwz r0, g_clearColor(r13) -/* 802532D4 90 01 00 08 */ stw r0, 8(r1) -/* 802532D8 38 60 00 00 */ li r3, 0 -/* 802532DC C0 22 B4 5C */ lfs f1, lit_3800(r2) -/* 802532E0 FC 40 08 90 */ fmr f2, f1 -/* 802532E4 FC 60 08 90 */ fmr f3, f1 -/* 802532E8 FC 80 08 90 */ fmr f4, f1 -/* 802532EC 38 81 00 08 */ addi r4, r1, 8 -/* 802532F0 48 10 C5 C9 */ bl GXSetFog -/* 802532F4 38 60 00 00 */ li r3, 0 -/* 802532F8 48 10 96 8D */ bl GXSetCullMode -/* 802532FC 38 60 00 01 */ li r3, 1 -/* 80253300 48 10 CA D9 */ bl GXSetDither -/* 80253304 38 60 00 00 */ li r3, 0 -/* 80253308 48 10 D2 C9 */ bl GXSetClipMode -/* 8025330C 38 7F 00 04 */ addi r3, r31, 4 -/* 80253310 38 80 00 00 */ li r4, 0 -/* 80253314 48 10 CF 39 */ bl GXLoadPosMtxImm -/* 80253318 38 60 00 00 */ li r3, 0 -/* 8025331C 48 10 CF D1 */ bl GXSetCurrentMtx -/* 80253320 48 10 82 6D */ bl GXClearVtxDesc -/* 80253324 38 60 00 09 */ li r3, 9 -/* 80253328 38 80 00 01 */ li r4, 1 -/* 8025332C 48 10 7B 8D */ bl GXSetVtxDesc -/* 80253330 38 60 00 0D */ li r3, 0xd -/* 80253334 38 80 00 01 */ li r4, 1 -/* 80253338 48 10 7B 81 */ bl GXSetVtxDesc -/* 8025333C 38 60 00 00 */ li r3, 0 -/* 80253340 38 80 00 09 */ li r4, 9 -/* 80253344 38 A0 00 00 */ li r5, 0 -/* 80253348 38 C0 00 03 */ li r6, 3 -/* 8025334C 38 E0 00 00 */ li r7, 0 -/* 80253350 48 10 82 75 */ bl GXSetVtxAttrFmt -/* 80253354 38 60 00 00 */ li r3, 0 -/* 80253358 38 80 00 0D */ li r4, 0xd -/* 8025335C 38 A0 00 01 */ li r5, 1 -/* 80253360 38 C0 00 01 */ li r6, 1 -/* 80253364 38 E0 00 00 */ li r7, 0 -/* 80253368 48 10 82 5D */ bl GXSetVtxAttrFmt -/* 8025336C 38 60 00 80 */ li r3, 0x80 -/* 80253370 38 80 00 00 */ li r4, 0 -/* 80253374 38 A0 00 04 */ li r5, 4 -/* 80253378 48 10 93 ED */ bl GXBegin -/* 8025337C 38 C0 FE D0 */ li r6, -304 -/* 80253380 3C A0 CC 01 */ lis r5, 0xCC01 /* 0xCC008000@ha */ -/* 80253384 B0 C5 80 00 */ sth r6, 0x8000(r5) /* 0xCC008000@l */ -/* 80253388 38 60 00 E0 */ li r3, 0xe0 -/* 8025338C B0 65 80 00 */ sth r3, -0x8000(r5) -/* 80253390 38 80 00 00 */ li r4, 0 -/* 80253394 98 85 80 00 */ stb r4, -0x8000(r5) -/* 80253398 98 85 80 00 */ stb r4, -0x8000(r5) -/* 8025339C 38 00 01 30 */ li r0, 0x130 -/* 802533A0 B0 05 80 00 */ sth r0, -0x8000(r5) -/* 802533A4 B0 65 80 00 */ sth r3, -0x8000(r5) -/* 802533A8 38 60 00 01 */ li r3, 1 -/* 802533AC 98 65 80 00 */ stb r3, -0x8000(r5) -/* 802533B0 98 85 80 00 */ stb r4, -0x8000(r5) -/* 802533B4 B0 05 80 00 */ sth r0, -0x8000(r5) -/* 802533B8 38 00 FF 20 */ li r0, -224 -/* 802533BC B0 05 80 00 */ sth r0, -0x8000(r5) -/* 802533C0 98 65 80 00 */ stb r3, -0x8000(r5) -/* 802533C4 98 65 80 00 */ stb r3, -0x8000(r5) -/* 802533C8 B0 C5 80 00 */ sth r6, -0x8000(r5) -/* 802533CC B0 05 80 00 */ sth r0, -0x8000(r5) -/* 802533D0 98 85 80 00 */ stb r4, -0x8000(r5) -/* 802533D4 98 65 80 00 */ stb r3, -0x8000(r5) -/* 802533D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802533DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802533E0 83 E3 5F 50 */ lwz r31, 0x5f50(r3) -/* 802533E4 C0 02 B4 5C */ lfs f0, lit_3800(r2) -/* 802533E8 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802533EC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 802533F0 C0 02 B4 60 */ lfs f0, lit_3801(r2) -/* 802533F4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 802533F8 C0 02 B4 64 */ lfs f0, lit_3802(r2) -/* 802533FC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80253400 7F E3 FB 78 */ mr r3, r31 -/* 80253404 38 81 00 14 */ addi r4, r1, 0x14 -/* 80253408 C0 22 B4 7C */ lfs f1, lit_3808(r2) -/* 8025340C C0 42 B4 68 */ lfs f2, lit_3803(r2) -/* 80253410 48 09 63 FD */ bl func_802E980C -/* 80253414 7F E3 FB 78 */ mr r3, r31 -/* 80253418 81 9F 00 00 */ lwz r12, 0(r31) -/* 8025341C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80253420 7D 89 03 A6 */ mtctr r12 -/* 80253424 4E 80 04 21 */ bctrl -/* 80253428 83 E1 00 6C */ lwz r31, 0x6c(r1) -/* 8025342C 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80253430 7C 08 03 A6 */ mtlr r0 -/* 80253434 38 21 00 70 */ addi r1, r1, 0x70 -/* 80253438 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade3/draw__16dDlst_snapShot_cFv.s b/asm/d/ovlp/d_ovlp_fade3/draw__16dDlst_snapShot_cFv.s deleted file mode 100644 index d26f4208c53..00000000000 --- a/asm/d/ovlp/d_ovlp_fade3/draw__16dDlst_snapShot_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80252ED4: -/* 80252ED4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80252ED8 7C 08 02 A6 */ mflr r0 -/* 80252EDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80252EE0 38 60 00 00 */ li r3, 0 -/* 80252EE4 38 80 00 00 */ li r4, 0 -/* 80252EE8 38 A0 02 60 */ li r5, 0x260 -/* 80252EEC 38 C0 01 C0 */ li r6, 0x1c0 -/* 80252EF0 48 10 9B 91 */ bl GXSetTexCopySrc -/* 80252EF4 38 60 01 30 */ li r3, 0x130 -/* 80252EF8 38 80 00 E0 */ li r4, 0xe0 -/* 80252EFC 38 A0 00 06 */ li r5, 6 -/* 80252F00 38 C0 00 01 */ li r6, 1 -/* 80252F04 48 10 9C 2D */ bl GXSetTexCopyDst -/* 80252F08 80 6D 86 50 */ lwz r3, mFrameBufferTex__13mDoGph_gInf_c(r13) -/* 80252F0C 38 80 00 00 */ li r4, 0 -/* 80252F10 48 10 A5 5D */ bl GXCopyTex -/* 80252F14 48 10 94 61 */ bl GXPixModeSync -/* 80252F18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80252F1C 7C 08 03 A6 */ mtlr r0 -/* 80252F20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252F24 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade3/execFadeIn__10dOvlpFd3_cFv.s b/asm/d/ovlp/d_ovlp_fade3/execFadeIn__10dOvlpFd3_cFv.s deleted file mode 100644 index 2d59e7dce75..00000000000 --- a/asm/d/ovlp/d_ovlp_fade3/execFadeIn__10dOvlpFd3_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80253730: -/* 80253730 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80253734 7C 08 02 A6 */ mflr r0 -/* 80253738 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025373C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80253740 7C 7F 1B 78 */ mr r31, r3 -/* 80253744 A8 63 01 14 */ lha r3, 0x114(r3) -/* 80253748 38 03 F8 00 */ addi r0, r3, -2048 -/* 8025374C B0 1F 01 14 */ sth r0, 0x114(r31) -/* 80253750 38 7F 01 18 */ addi r3, r31, 0x118 -/* 80253754 C0 22 B4 68 */ lfs f1, lit_3803(r2) -/* 80253758 C0 42 B4 80 */ lfs f2, lit_3923(r2) -/* 8025375C 48 01 C3 25 */ bl cLib_addCalc0__FPfff -/* 80253760 88 1F 01 1E */ lbz r0, 0x11e(r31) -/* 80253764 28 00 00 00 */ cmplwi r0, 0 -/* 80253768 40 82 00 14 */ bne lbl_8025377C -/* 8025376C 4B DC AD 59 */ bl fopOvlpM_SceneIsStart__Fv -/* 80253770 38 00 00 01 */ li r0, 1 -/* 80253774 98 1F 01 1E */ stb r0, 0x11e(r31) -/* 80253778 48 00 00 20 */ b lbl_80253798 -lbl_8025377C: -/* 8025377C 7F E3 FB 78 */ mr r3, r31 -/* 80253780 4B DC AD 9D */ bl fopOvlpM_Done__FP18overlap_task_class -/* 80253784 38 00 00 01 */ li r0, 1 -/* 80253788 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025378C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80253790 98 03 5D 44 */ stb r0, 0x5d44(r3) -/* 80253794 98 03 5E B8 */ stb r0, 0x5eb8(r3) -lbl_80253798: -/* 80253798 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025379C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802537A0 7C 08 03 A6 */ mtlr r0 -/* 802537A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802537A8 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade3/execFadeOut__10dOvlpFd3_cFv.s b/asm/d/ovlp/d_ovlp_fade3/execFadeOut__10dOvlpFd3_cFv.s deleted file mode 100644 index 4b26e8c6b4e..00000000000 --- a/asm/d/ovlp/d_ovlp_fade3/execFadeOut__10dOvlpFd3_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_802535AC: -/* 802535AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802535B0 7C 08 02 A6 */ mflr r0 -/* 802535B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802535B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802535BC 7C 7F 1B 78 */ mr r31, r3 -/* 802535C0 38 00 00 00 */ li r0, 0 -/* 802535C4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802535C8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802535CC 98 04 5D 44 */ stb r0, 0x5d44(r4) -/* 802535D0 88 03 01 1D */ lbz r0, 0x11d(r3) -/* 802535D4 7C 00 07 75 */ extsb. r0, r0 -/* 802535D8 40 82 00 44 */ bne lbl_8025361C -/* 802535DC 4B DC AF 29 */ bl fopOvlpM_IsOutReq__FP18overlap_task_class -/* 802535E0 2C 03 00 00 */ cmpwi r3, 0 -/* 802535E4 41 82 00 38 */ beq lbl_8025361C -/* 802535E8 4B DC AE DD */ bl fopOvlpM_SceneIsStart__Fv -/* 802535EC 3C 60 80 3C */ lis r3, lit_3871@ha /* 0x803C2D88@ha */ -/* 802535F0 38 83 2D 88 */ addi r4, r3, lit_3871@l /* 0x803C2D88@l */ -/* 802535F4 80 64 00 00 */ lwz r3, 0(r4) -/* 802535F8 80 04 00 04 */ lwz r0, 4(r4) -/* 802535FC 90 7F 00 CC */ stw r3, 0xcc(r31) -/* 80253600 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 80253604 80 04 00 08 */ lwz r0, 8(r4) -/* 80253608 90 1F 00 D4 */ stw r0, 0xd4(r31) -/* 8025360C 38 00 C0 00 */ li r0, -16384 -/* 80253610 B0 1F 01 10 */ sth r0, 0x110(r31) -/* 80253614 38 00 00 01 */ li r0, 1 -/* 80253618 98 1F 01 1D */ stb r0, 0x11d(r31) -lbl_8025361C: -/* 8025361C 88 7F 01 1D */ lbz r3, 0x11d(r31) -/* 80253620 7C 60 07 75 */ extsb. r0, r3 -/* 80253624 40 80 00 4C */ bge lbl_80253670 -/* 80253628 38 03 00 01 */ addi r0, r3, 1 -/* 8025362C 98 1F 01 1D */ stb r0, 0x11d(r31) -/* 80253630 7C 00 07 75 */ extsb. r0, r0 -/* 80253634 40 82 00 44 */ bne lbl_80253678 -/* 80253638 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 8025363C 80 63 00 04 */ lwz r3, 4(r3) -/* 80253640 28 03 00 00 */ cmplwi r3, 0 -/* 80253644 41 82 00 18 */ beq lbl_8025365C -/* 80253648 38 80 00 4B */ li r4, 0x4b -/* 8025364C 81 83 00 00 */ lwz r12, 0(r3) -/* 80253650 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80253654 7D 89 03 A6 */ mtctr r12 -/* 80253658 4E 80 04 21 */ bctrl -lbl_8025365C: -/* 8025365C 38 00 00 5A */ li r0, 0x5a -/* 80253660 98 1F 01 1D */ stb r0, 0x11d(r31) -/* 80253664 38 60 00 00 */ li r3, 0 -/* 80253668 4B DB 3B BD */ bl mDoAud_setFadeOutStart__FUc -/* 8025366C 48 00 00 0C */ b lbl_80253678 -lbl_80253670: -/* 80253670 38 7F 01 1D */ addi r3, r31, 0x11d -/* 80253674 4B FF F7 FD */ bl func_80252E70 -lbl_80253678: -/* 80253678 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025367C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80253680 7C 08 03 A6 */ mtlr r0 -/* 80253684 38 21 00 10 */ addi r1, r1, 0x10 -/* 80253688 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade3/execFirstSnap__10dOvlpFd3_cFv.s b/asm/d/ovlp/d_ovlp_fade3/execFirstSnap__10dOvlpFd3_cFv.s deleted file mode 100644 index c1eb9be8ec8..00000000000 --- a/asm/d/ovlp/d_ovlp_fade3/execFirstSnap__10dOvlpFd3_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80253518: -/* 80253518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025351C 7C 08 02 A6 */ mflr r0 -/* 80253520 90 01 00 14 */ stw r0, 0x14(r1) -/* 80253524 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80253528 7C 7F 1B 78 */ mr r31, r3 -/* 8025352C 38 7F 01 1F */ addi r3, r31, 0x11f -/* 80253530 4B EE E5 B9 */ bl func_80141AE8 -/* 80253534 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80253538 40 82 00 60 */ bne lbl_80253598 -/* 8025353C 88 1F 01 1C */ lbz r0, 0x11c(r31) -/* 80253540 28 00 00 00 */ cmplwi r0, 0 -/* 80253544 41 82 00 54 */ beq lbl_80253598 -/* 80253548 38 7F 01 1D */ addi r3, r31, 0x11d -/* 8025354C 4B FF F9 25 */ bl func_80252E70 -/* 80253550 7C 60 07 75 */ extsb. r0, r3 -/* 80253554 40 82 00 34 */ bne lbl_80253588 -/* 80253558 3C 60 80 3C */ lis r3, lit_3857@ha /* 0x803C2D7C@ha */ -/* 8025355C 38 83 2D 7C */ addi r4, r3, lit_3857@l /* 0x803C2D7C@l */ -/* 80253560 80 64 00 00 */ lwz r3, 0(r4) -/* 80253564 80 04 00 04 */ lwz r0, 4(r4) -/* 80253568 90 7F 00 CC */ stw r3, 0xcc(r31) -/* 8025356C 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 80253570 80 04 00 08 */ lwz r0, 8(r4) -/* 80253574 90 1F 00 D4 */ stw r0, 0xd4(r31) -/* 80253578 7F E3 FB 78 */ mr r3, r31 -/* 8025357C 4B DC AF A1 */ bl fopOvlpM_Done__FP18overlap_task_class -/* 80253580 38 00 FF FF */ li r0, -1 -/* 80253584 98 1F 01 1D */ stb r0, 0x11d(r31) -lbl_80253588: -/* 80253588 38 00 00 00 */ li r0, 0 -/* 8025358C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80253590 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80253594 98 03 5D 44 */ stb r0, 0x5d44(r3) -lbl_80253598: -/* 80253598 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025359C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802535A0 7C 08 03 A6 */ mtlr r0 -/* 802535A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802535A8 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade3/execNextSnap__10dOvlpFd3_cFv.s b/asm/d/ovlp/d_ovlp_fade3/execNextSnap__10dOvlpFd3_cFv.s deleted file mode 100644 index 34abaedda2f..00000000000 --- a/asm/d/ovlp/d_ovlp_fade3/execNextSnap__10dOvlpFd3_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8025368C: -/* 8025368C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80253690 7C 08 02 A6 */ mflr r0 -/* 80253694 90 01 00 14 */ stw r0, 0x14(r1) -/* 80253698 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025369C 7C 7F 1B 78 */ mr r31, r3 -/* 802536A0 38 7F 01 1D */ addi r3, r31, 0x11d -/* 802536A4 4B FF F7 CD */ bl func_80252E70 -/* 802536A8 7C 60 07 75 */ extsb. r0, r3 -/* 802536AC 40 82 00 70 */ bne lbl_8025371C -/* 802536B0 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 802536B4 80 63 00 04 */ lwz r3, 4(r3) -/* 802536B8 38 80 00 1A */ li r4, 0x1a -/* 802536BC 81 83 00 00 */ lwz r12, 0(r3) -/* 802536C0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802536C4 7D 89 03 A6 */ mtctr r12 -/* 802536C8 4E 80 04 21 */ bctrl -/* 802536CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802536D0 40 82 00 4C */ bne lbl_8025371C -/* 802536D4 38 60 00 00 */ li r3, 0 -/* 802536D8 4B DB 3B 7D */ bl mDoAud_setFadeInStart__FUc -/* 802536DC A8 7F 01 10 */ lha r3, 0x110(r31) -/* 802536E0 A8 1F 01 12 */ lha r0, 0x112(r31) -/* 802536E4 7C 03 02 14 */ add r0, r3, r0 -/* 802536E8 B0 1F 01 10 */ sth r0, 0x110(r31) -/* 802536EC 38 00 00 01 */ li r0, 1 -/* 802536F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802536F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802536F8 98 03 5D 44 */ stb r0, 0x5d44(r3) -/* 802536FC 3C 60 80 3C */ lis r3, lit_3898@ha /* 0x803C2D94@ha */ -/* 80253700 38 83 2D 94 */ addi r4, r3, lit_3898@l /* 0x803C2D94@l */ -/* 80253704 80 64 00 00 */ lwz r3, 0(r4) -/* 80253708 80 04 00 04 */ lwz r0, 4(r4) -/* 8025370C 90 7F 00 CC */ stw r3, 0xcc(r31) -/* 80253710 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 80253714 80 04 00 08 */ lwz r0, 8(r4) -/* 80253718 90 1F 00 D4 */ stw r0, 0xd4(r31) -lbl_8025371C: -/* 8025371C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80253720 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80253724 7C 08 03 A6 */ mtlr r0 -/* 80253728 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025372C 4E 80 00 20 */ blr diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h index c836790c3e0..753b043e742 100644 --- a/include/JSystem/JFramework/JFWDisplay.h +++ b/include/JSystem/JFramework/JFWDisplay.h @@ -65,7 +65,7 @@ public: static JFWDisplay* getManager() { return sManager; } - int startFadeOut(int param_0) { + bool startFadeOut(int param_0) { if (mFader != NULL) { return mFader->startFadeOut(param_0); } @@ -86,6 +86,7 @@ public: void setDrawDoneMethod(EDrawDone drawDone) { mDrawDoneMethod = drawDone; } void setFader(JUTFader* fader) { mFader = fader; } + JUTFader* getFader() const { return mFader; } void setClearColor(JUtility::TColor color) { mClearColor = color; } static JFWDisplay* sManager; diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 6fa7a50ffdc..3f9eddb370e 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -401,8 +401,9 @@ public: s8 getNextStageLayer() { return mNextStage.getLayer(); } s16 getNextStagePoint() { return mNextStage.getPoint(); } s8 getNextStageWipe() { return mNextStage.getWipe(); } - bool isEnableNextStage() { return mNextStage.isEnable(); } + BOOL isEnableNextStage() { return mNextStage.isEnable(); } void offEnableNextStage() { mNextStage.offEnable(); } + u8 getNextStageWipeSpeed() { return mNextStage.getWipeSpeed(); } void setNextStage(const char* stage, s8 roomNo, s16 point, s8 layer, s8 wipe, u8 wipe_speed) { mNextStage.set(stage, roomNo, point, layer, wipe, wipe_speed); } @@ -2145,10 +2146,14 @@ inline s32 dComIfGp_getNextStageWipe() { return g_dComIfG_gameInfo.play.getNextStageWipe(); } -inline bool dComIfGp_isEnableNextStage() { +inline BOOL dComIfGp_isEnableNextStage() { return g_dComIfG_gameInfo.play.isEnableNextStage(); } +inline u8 dComIfGp_getNextStageWipeSpeed() { + return g_dComIfG_gameInfo.play.getNextStageWipeSpeed(); +} + inline s16 dComIfGp_getNextStagePoint() { return g_dComIfG_gameInfo.play.getNextStagePoint(); } diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 4aee38d4482..a075055164b 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -33,6 +33,11 @@ public: virtual void draw(); }; +class dDlst_snapShot_c : public dDlst_base_c { +public: + /* 80252ED4 */ virtual void draw(); +}; + class dDlst_effectLine_c : public dDlst_base_c { public: /* 80053E9C */ virtual void draw(); diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 0f4a2403465..736e2008bfc 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -890,8 +890,9 @@ public: } void set(const char*, s8, s16, s8, s8, u8); void offEnable() { enabled = 0; } - s8 isEnable() const { return enabled; } + BOOL isEnable() const { return enabled; } s8 getWipe() const { return wipe; } + u8 getWipeSpeed() const { return wipe_speed; } private: s8 enabled; diff --git a/include/d/ovlp/d_ovlp_fade2.h b/include/d/ovlp/d_ovlp_fade2.h index 177fa7c8f75..bcb58a2890b 100644 --- a/include/d/ovlp/d_ovlp_fade2.h +++ b/include/d/ovlp/d_ovlp_fade2.h @@ -1,6 +1,44 @@ #ifndef D_OVLP_D_OVLP_FADE2_H #define D_OVLP_D_OVLP_FADE2_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_overlap_mng.h" + +class dOvlpFd2_dlst_c : public dDlst_base_c { +public: + /* 8025247C */ virtual void draw(); + /* 80252E8C */ virtual ~dOvlpFd2_dlst_c() {} + + MtxP getMtx() { return mMtx; } + void entry() { dComIfGd_set2DXlu(this); } + + /* 0x4 */ Mtx mMtx; +}; + +class dOvlpFd2_c : public overlap_task_class { +public: + /* 80252990 */ dOvlpFd2_c(); + /* 802529F4 */ void execFirstSnap(); + /* 80252A78 */ void execFadeOut(); + /* 80252BC0 */ void execNextSnap(); + /* 80252C68 */ void execFadeIn(); + + inline void draw(); + inline void execute(); + + typedef void (dOvlpFd2_c::*executeFn)(); + void setExecute(executeFn i_func) { mExecuteFn = i_func; } + + /* 0x0CC */ executeFn mExecuteFn; + /* 0x0D8 */ dDlst_snapShot_c mSnapshot_c; + /* 0x0DC */ dOvlpFd2_dlst_c mDlst_c; + /* 0x110 */ s16 field_0x110; + /* 0x112 */ s16 field_0x112; + /* 0x114 */ s16 field_0x114; + /* 0x118 */ f32 field_0x118; + /* 0x11C */ u8 field_0x11c; + /* 0x11D */ s8 mTimer; + /* 0x11E */ u8 field_0x11e; +}; #endif /* D_OVLP_D_OVLP_FADE2_H */ diff --git a/include/d/ovlp/d_ovlp_fade3.h b/include/d/ovlp/d_ovlp_fade3.h index ebd8ffdfa69..e34306b2122 100644 --- a/include/d/ovlp/d_ovlp_fade3.h +++ b/include/d/ovlp/d_ovlp_fade3.h @@ -1,6 +1,45 @@ #ifndef D_OVLP_D_OVLP_FADE3_H #define D_OVLP_D_OVLP_FADE3_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_overlap_mng.h" + +class dOvlpFd3_dlst_c : public dDlst_base_c { +public: + /* 80252F28 */ virtual void draw(); + /* 802538E8 */ virtual ~dOvlpFd3_dlst_c() {} + + MtxP getMtx() { return mMtx; } + void entry() { dComIfGd_set2DXlu(this); } + + /* 0x4 */ Mtx mMtx; +}; + +class dOvlpFd3_c : public overlap_task_class { +public: + /* 8025343C */ dOvlpFd3_c(); + /* 80253518 */ void execFirstSnap(); + /* 802535AC */ void execFadeOut(); + /* 8025368C */ void execNextSnap(); + /* 80253730 */ void execFadeIn(); + + inline void draw(); + inline void execute(); + + typedef void (dOvlpFd3_c::*executeFn)(); + void setExecute(executeFn i_func) { mExecuteFn = i_func; } + + /* 0x0CC */ executeFn mExecuteFn; + /* 0x0D8 */ dDlst_snapShot_c mSnapshot_c; + /* 0x0DC */ dOvlpFd3_dlst_c mDlst_c; + /* 0x110 */ s16 field_0x110; + /* 0x112 */ s16 field_0x112; + /* 0x114 */ s16 field_0x114; + /* 0x118 */ f32 field_0x118; + /* 0x11C */ u8 field_0x11c; + /* 0x11D */ s8 mTimer; + /* 0x11E */ u8 field_0x11e; + /* 0x11F */ u8 field_0x11f; +}; #endif /* D_OVLP_D_OVLP_FADE3_H */ diff --git a/include/d/s/d_s_play.h b/include/d/s/d_s_play.h index f02fd1294a6..6de31dc3456 100644 --- a/include/d/s/d_s_play.h +++ b/include/d/s/d_s_play.h @@ -7,9 +7,21 @@ class mDoDvdThd_mountXArchive_c; class mDoDvdThd_toMainRam_c; +class dScnPly_reg_childHIO_c { +public: + /* 0x00 */ void* vtable; + /* 0x04 */ f32 mFloatReg[30]; + /* 0x7C */ s16 mShortReg[10]; +}; + class dScnPly_reg_HIO_c { public: /* 8025AD78 */ virtual ~dScnPly_reg_HIO_c(); + +#ifdef DEBUG + /* 0x4 */ u8 field_0x4[0x8 - 0x4]; + /* 0x8 */ dScnPly_reg_childHIO_c mChildReg[26]; +#endif }; class mDoHIO_entry_c { @@ -79,5 +91,224 @@ public: }; extern u8 g_envHIO[68]; +extern u8 g_regHIO[4]; + +/** + * === Register Usage === + * Short Reg(00-09) ... -32768 - +32768 + * Float Reg(00-19) ... -100000.0 - +100000.0 + * Float Reg(20-24) ... 0.0 - 1.0 + * Float Reg(25-29) ... -1.0 - +1.0 + */ + +#ifdef DEBUG +// Morita +#define TREG_F(i) g_regHIO.mChildReg[0].mFloatReg[i] +#define TREG_S(i) g_regHIO.mChildReg[0].mShortReg[i] + +// Matsutani +#define DREG_F(i) g_regHIO.mChildReg[1].mFloatReg[i] +#define DREG_S(i) g_regHIO.mChildReg[1].mShortReg[i] + +// Iwawaki +#define IREG_F(i) g_regHIO.mChildReg[2].mFloatReg[i] +#define IREG_S(i) g_regHIO.mChildReg[2].mShortReg[i] + +// Sasa +#define SREG_F(i) g_regHIO.mChildReg[3].mFloatReg[i] +#define SREG_S(i) g_regHIO.mChildReg[3].mShortReg[i] + +// Umemiya +#define UREG_F(i) g_regHIO.mChildReg[4].mFloatReg[i] +#define UREG_S(i) g_regHIO.mChildReg[4].mShortReg[i] + +// Ogawa +#define OREG_F(i) g_regHIO.mChildReg[5].mFloatReg[i] +#define OREG_S(i) g_regHIO.mChildReg[5].mShortReg[i] + +// Sakaguchi +#define YREG_F(i) g_regHIO.mChildReg[6].mFloatReg[i] +#define YREG_S(i) g_regHIO.mChildReg[6].mShortReg[i] + +// Sakai +#define KREG_F(i) g_regHIO.mChildReg[7].mFloatReg[i] +#define KREG_S(i) g_regHIO.mChildReg[7].mShortReg[i] + +// Hara +#define BREG_F(i) g_regHIO.mChildReg[8].mFloatReg[i] +#define BREG_S(i) g_regHIO.mChildReg[8].mShortReg[i] + +// Sumiyoshi +#define MREG_F(i) g_regHIO.mChildReg[9].mFloatReg[i] +#define MREG_S(i) g_regHIO.mChildReg[9].mShortReg[i] + +// Takeshita +#define AREG_F(i) g_regHIO.mChildReg[10].mFloatReg[i] +#define AREG_S(i) g_regHIO.mChildReg[10].mShortReg[i] + +// Yoshida +#define PREG_F(i) g_regHIO.mChildReg[11].mFloatReg[i] +#define PREG_S(i) g_regHIO.mChildReg[11].mShortReg[i] + +// Noma +#define NREG_F(i) g_regHIO.mChildReg[12].mFloatReg[i] +#define NREG_S(i) g_regHIO.mChildReg[12].mShortReg[i] + +// Nishiwaki +#define WREG_F(i) g_regHIO.mChildReg[13].mFloatReg[i] +#define WREG_S(i) g_regHIO.mChildReg[13].mShortReg[i] + +// Masaro +#define JREG_F(i) g_regHIO.mChildReg[14].mFloatReg[i] +#define JREG_S(i) g_regHIO.mChildReg[14].mShortReg[i] + +// Hayakawa +#define HREG_F(i) g_regHIO.mChildReg[15].mFloatReg[i] +#define HREG_S(i) g_regHIO.mChildReg[15].mShortReg[i] + +// Sadamoto +#define VREG_F(i) g_regHIO.mChildReg[16].mFloatReg[i] +#define VREG_S(i) g_regHIO.mChildReg[16].mShortReg[i] + +// Nishikawa +#define XREG_F(i) g_regHIO.mChildReg[17].mFloatReg[i] +#define XREG_S(i) g_regHIO.mChildReg[17].mShortReg[i] + +// Suzuki +#define ZREG_F(i) g_regHIO.mChildReg[18].mFloatReg[i] +#define ZREG_S(i) g_regHIO.mChildReg[18].mShortReg[i] + +// Nakanishi +#define nREG_F(i) g_regHIO.mChildReg[19].mFloatReg[i] +#define nREG_S(i) g_regHIO.mChildReg[19].mShortReg[i] + +// Kuwajima +#define kREG_F(i) g_regHIO.mChildReg[20].mFloatReg[i] +#define kREG_S(i) g_regHIO.mChildReg[20].mShortReg[i] + +// Okajima +#define oREG_F(i) g_regHIO.mChildReg[21].mFloatReg[i] +#define oREG_S(i) g_regHIO.mChildReg[21].mShortReg[i] + +// Yamazaki +#define yREG_F(i) g_regHIO.mChildReg[22].mFloatReg[i] +#define yREG_S(i) g_regHIO.mChildReg[22].mShortReg[i] + +// Ashida +#define aREG_F(i) g_regHIO.mChildReg[23].mFloatReg[i] +#define aREG_S(i) g_regHIO.mChildReg[23].mShortReg[i] + +// Okada +#define hREG_F(i) g_regHIO.mChildReg[24].mFloatReg[i] +#define hREG_S(i) g_regHIO.mChildReg[24].mShortReg[i] + +// Takahashi +#define tREG_F(i) g_regHIO.mChildReg[25].mFloatReg[i] +#define tREG_S(i) g_regHIO.mChildReg[25].mShortReg[i] +#else +// Morita +#define TREG_F(i) +#define TREG_S(i) + +// Matsutani +#define DREG_F(i) +#define DREG_S(i) + +// Iwawaki +#define IREG_F(i) +#define IREG_S(i) + +// Sasa +#define SREG_F(i) +#define SREG_S(i) + +// Umemiya +#define UREG_F(i) +#define UREG_S(i) + +// Ogawa +#define OREG_F(i) +#define OREG_S(i) + +// Sakaguchi +#define YREG_F(i) +#define YREG_S(i) + +// Sakai +#define KREG_F(i) +#define KREG_S(i) + +// Hara +#define BREG_F(i) +#define BREG_S(i) + +// Sumiyoshi +#define MREG_F(i) +#define MREG_S(i) + +// Takeshita +#define AREG_F(i) +#define AREG_S(i) + +// Yoshida +#define PREG_F(i) +#define PREG_S(i) + +// Noma +#define NREG_F(i) +#define NREG_S(i) + +// Nishiwaki +#define WREG_F(i) +#define WREG_S(i) + +// Masaro +#define JREG_F(i) +#define JREG_S(i) + +// Hayakawa +#define HREG_F(i) +#define HREG_S(i) + +// Sadamoto +#define VREG_F(i) +#define VREG_S(i) + +// Nishikawa +#define XREG_F(i) +#define XREG_S(i) + +// Suzuki +#define ZREG_F(i) +#define ZREG_S(i) + +// Nakanishi +#define nREG_F(i) +#define nREG_S(i) + +// Kuwajima +#define kREG_F(i) +#define kREG_S(i) + +// Okajima +#define oREG_F(i) +#define oREG_S(i) + +// Yamazaki +#define yREG_F(i) +#define yREG_S(i) + +// Ashida +#define aREG_F(i) +#define aREG_S(i) + +// Okada +#define hREG_F(i) +#define hREG_S(i) + +// Takahashi +#define tREG_F(i) +#define tREG_S(i) +#endif #endif /* D_S_D_S_PLAY_H */ diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index 4eb1bd33932..da9fb1c9d01 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -154,6 +154,11 @@ inline void GXPosition2s8(s8 x, s8 y) { GFX_FIFO(s8) = y; } +inline void GXPosition2s16(s16 x, s16 y) { + GFX_FIFO(s16) = x; + GFX_FIFO(s16) = y; +} + inline void i_GXPosition3s16(s16 x, s16 y, s16 z) { GFX_FIFO(s16) = x; GFX_FIFO(s16) = y; diff --git a/include/f_op/f_op_overlap.h b/include/f_op/f_op_overlap.h index 1f83abb6ca5..bd4930cc273 100644 --- a/include/f_op/f_op_overlap.h +++ b/include/f_op/f_op_overlap.h @@ -1,7 +1,22 @@ #ifndef F_F_OP_OVERLAP_H_ #define F_F_OP_OVERLAP_H_ +#include "f_pc/f_pc_leaf.h" + +class overlap_task_class : public leafdraw_class { +public: + /* 0xC0 */ leafdraw_method_class* field_0xc0; + /* 0xC4 */ u8 field_0xc4; // used as both u8 and request_base_class* ?? + /* 0xC8 */ int field_0xc8; +}; // Size: 0xCC + +struct overlap_process_profile_definition { + /* 0x00 */ leaf_process_profile_definition base; + /* 0x24 */ leafdraw_method_class* mSubMtd; +}; // Size: 0x28 static s32 fopOvlp_Draw(void* param_1); +extern leafdraw_method_class g_fopOvlp_Method; + #endif \ No newline at end of file diff --git a/include/f_op/f_op_overlap_mng.h b/include/f_op/f_op_overlap_mng.h index 897f8320841..43a8fc10294 100644 --- a/include/f_op/f_op_overlap_mng.h +++ b/include/f_op/f_op_overlap_mng.h @@ -1,23 +1,11 @@ #ifndef F_F_OP_OVERLAP_MNG_H_ #define F_F_OP_OVERLAP_MNG_H_ -#include "f_pc/f_pc_leaf.h" +#include "f_op/f_op_overlap.h" +#include "f_pc/f_pc_manager.h" struct request_base_class; -class overlap_task_class : public leafdraw_class { -public: - /* 0xC0 */ leafdraw_method_class* field_0xc0; - /* 0xC4 */ u8 field_0xc4; // used as both u8 and request_base_class* ?? - /* 0xC8 */ int field_0xc8; - -}; // Size: 0xD8? - -struct overlap_process_profile_definition { - /* 0x00 */ leaf_process_profile_definition base; - /* 0x24 */ leafdraw_method_class* mSubMtd; -}; // Size: 0x28 - int fopOvlpM_SceneIsStop(); int fopOvlpM_SceneIsStart(); void fopOvlpM_Management(); diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index a7dea790558..b52fbd7f7bc 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -34,6 +34,8 @@ s32 mDoAud_load1stDynamicWave(); static void mDoAud_setLinkGroupInfo(u8 param_0); static void mDoAud_setLinkHp(s32 param_0, s32 param_1); static void mDoAud_seStartLevel(u32 param_0, Vec const* param_1, u32 param_2, s8 param_3); +void mDoAud_setFadeInStart(u8 param_0); +void mDoAud_setFadeOutStart(u8 param_0); inline void mDoAud_bgmSetSwordUsing(s32 id) { Z2AudioMgr::getInterface()->bgmSetSwordUsing(id); diff --git a/obj_files.mk b/obj_files.mk index a6f98ef4fd2..7150ce94bbf 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -1061,6 +1061,9 @@ O_FILES_SYM_ON := \ $(BUILD_DIR)/libs/Z2AudioLib/JASCmdStack.o \ $(BUILD_DIR)/src/d/bg/d_bg_s_grp_pass_chk.o \ $(BUILD_DIR)/src/d/file/d_file_sel_info.o \ + $(BUILD_DIR)/src/d/ovlp/d_ovlp_fade2.o \ + $(BUILD_DIR)/src/d/ovlp/d_ovlp_fade3.o \ + $(BUILD_DIR)/src/d/s/d_s_play.o \ $(BUILD_DIR)/src/d/file/d_file_sel_warning.o \ $(BUILD_DIR)/src/d/d_gameover.o \ $(BUILD_DIR)/src/d/menu/d_menu_save.o \ diff --git a/src/d/ovlp/d_ovlp_fade.cpp b/src/d/ovlp/d_ovlp_fade.cpp index 43e190022a3..c9f49dbe9e4 100644 --- a/src/d/ovlp/d_ovlp_fade.cpp +++ b/src/d/ovlp/d_ovlp_fade.cpp @@ -1,238 +1,269 @@ -// -// Generated By: dol2asm -// Translation Unit: d/ovlp/d_ovlp_fade -// +/** + * d_ovlp_fade.cpp + * + */ #include "d/ovlp/d_ovlp_fade.h" -#include "dol2asm.h" +#include "JSystem/JFramework/JFWDisplay.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_overlap_mng.h" +#include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_graphic.h" -// -// Types: -// - -struct overlap_task_class {}; - -struct overlap1_class {}; - -struct JUTFader { - struct EStatus {}; - - /* 802E57D0 */ void setStatus(JUTFader::EStatus, int); +class overlap1_class : public overlap_task_class { +public: + /* 0xCC */ int field_0xcc; + /* 0xCC */ int field_0xd0; + /* 0xCC */ int field_0xd4; }; -struct JFWDisplay { - static u8 sManager[4]; -}; - -// -// Forward References: -// - -extern "C" static bool dOvlpFd_Draw__FP14overlap1_class(); -extern "C" static void dOvlpFd_startFadeIn__Fi(); -extern "C" static void dOvlpFd_FadeOut__FP14overlap1_class(); -extern "C" static void dOvlpFd_Wait__FP14overlap1_class(); -extern "C" static void dOvlpFd_FadeIn__FP14overlap1_class(); -extern "C" static void dOvlpFd_Execute__FP14overlap1_class(); -extern "C" static bool dOvlpFd_IsDelete__FP14overlap1_class(); -extern "C" static bool dOvlpFd_Delete__FP14overlap1_class(); -extern "C" static void dOvlpFd_Create__FPv(); -extern "C" extern void* g_profile_OVERLAP0[10]; -extern "C" extern void* g_profile_OVERLAP1[10]; -extern "C" extern void* g_profile_OVERLAP6[10]; -extern "C" extern void* g_profile_OVERLAP7[10]; -extern "C" extern void* g_profile_OVERLAP8[10]; -extern "C" extern void* g_profile_OVERLAP9[10]; -extern "C" extern void* g_profile_OVERLAP10[10]; -extern "C" extern void* g_profile_OVERLAP11[10 + 1 /* padding */]; - -// -// External References: -// - -extern "C" void mDoAud_setFadeOutStart__FUc(); -extern "C" void mDoAud_setFadeInStart__FUc(); -extern "C" void fopOvlpM_SceneIsStart__Fv(); -extern "C" void fopOvlpM_IsOutReq__FP18overlap_task_class(); -extern "C" void fopOvlpM_Done__FP18overlap_task_class(); -extern "C" void setStatus__8JUTFaderFQ28JUTFader7EStatusi(); -extern "C" extern void* g_fopOvlp_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 sManager__10JFWDisplay[4]; - -// -// Declarations: -// - /* 8025217C-80252184 24CABC 0008+00 1/0 0/0 0/0 .text dOvlpFd_Draw__FP14overlap1_class */ -static bool dOvlpFd_Draw(overlap1_class* param_0) { - return true; +static int dOvlpFd_Draw(overlap1_class* i_this) { + return 1; } /* 80252184-802521F4 24CAC4 0070+00 1/1 0/0 0/0 .text dOvlpFd_startFadeIn__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dOvlpFd_startFadeIn(int param_0) { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade/dOvlpFd_startFadeIn__Fi.s" +static void dOvlpFd_startFadeIn(int param_0) { + JUTFader* fader = JFWDisplay::getManager()->getFader(); + JUT_ASSERT(fader != 0); + + fader->setStatus(JUTFader::UNKSTATUS_0, 0); + fader->setStatus(JUTFader::UNKSTATUS_0, -1); + fader->startFadeIn(param_0); } -#pragma pop /* 802521F4-802522C8 24CB34 00D4+00 1/1 0/0 0/0 .text dOvlpFd_FadeOut__FP14overlap1_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dOvlpFd_FadeOut(overlap1_class* param_0) { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade/dOvlpFd_FadeOut__FP14overlap1_class.s" -} -#pragma pop +static int dOvlpFd_FadeOut(overlap1_class* i_this) { + int var_r31 = i_this->field_0xd4; + + if (i_this->field_0xcc == 0) { + mDoAud_setFadeInStart(0); + + if (fpcM_GetProfName(i_this) == PROC_OVERLAP11) { + i_this->field_0xcc = 10; + } else if (fpcM_GetProfName(i_this) != PROC_OVERLAP6) { + dOvlpFd_startFadeIn(var_r31); + i_this->field_0xcc = var_r31; + } else { + dOvlpFd_startFadeIn(0); + i_this->field_0xcc = 1; + } + } + + if (fpcM_GetProfName(i_this) == PROC_OVERLAP11 && i_this->field_0xcc == 7) { + dOvlpFd_startFadeIn(7); + } + + fopOvlpM_SceneIsStart(); + + if (--i_this->field_0xcc == 0) { + fopOvlpM_Done(i_this); + i_this->field_0xcc++; + } + + return 1; +} -/* ############################################################################################## */ /* 804510E0-804510E8 0005E0 0004+04 4/4 0/0 0/0 .sbss dOvlpFd_execute_f */ -static u8 dOvlpFd_execute_f[4 + 4 /* padding */]; +static int (*dOvlpFd_execute_f)(overlap1_class*); /* 802522C8-80252300 24CC08 0038+00 1/1 0/0 0/0 .text dOvlpFd_Wait__FP14overlap1_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dOvlpFd_Wait(overlap1_class* param_0) { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade/dOvlpFd_Wait__FP14overlap1_class.s" +static int dOvlpFd_Wait(overlap1_class* i_this) { + if (fopOvlpM_IsOutReq(i_this)) { + dOvlpFd_execute_f = dOvlpFd_FadeOut; + } + + return 1; } -#pragma pop /* 80252300-8025242C 24CC40 012C+00 1/1 0/0 0/0 .text dOvlpFd_FadeIn__FP14overlap1_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dOvlpFd_FadeIn(overlap1_class* param_0) { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade/dOvlpFd_FadeIn__FP14overlap1_class.s" +static int dOvlpFd_FadeIn(overlap1_class* i_this) { + int var_r30 = 30; + + if (i_this->field_0xd0 == 0) { + if (fpcM_GetProfName(i_this) == PROC_OVERLAP0 || fpcM_GetProfName(i_this) == PROC_OVERLAP7) + { + if (dComIfGp_isEnableNextStage() == 1) { + var_r30 = dComIfGp_getNextStageWipeSpeed(); + } + + if (!JFWDisplay::getManager()->startFadeOut(var_r30)) { + return 1; + } + + i_this->field_0xd0 = var_r30; + } else if (fpcM_GetProfName(i_this) == PROC_OVERLAP10 || + fpcM_GetProfName(i_this) == PROC_OVERLAP11) + { + i_this->field_0xd0 = 1; + } else { + i_this->field_0xd0 = 30; + } + + i_this->field_0xd4 = var_r30; + mDoAud_setFadeOutStart(0); + } + + if (--i_this->field_0xd0 == 0) { + dOvlpFd_execute_f = dOvlpFd_Wait; + mDoGph_gInf_c::startFadeOut(0); + fopOvlpM_Done(i_this); + } + + return 1; } -#pragma pop /* 8025242C-80252458 24CD6C 002C+00 1/0 0/0 0/0 .text dOvlpFd_Execute__FP14overlap1_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dOvlpFd_Execute(overlap1_class* param_0) { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade/dOvlpFd_Execute__FP14overlap1_class.s" +static int dOvlpFd_Execute(overlap1_class* i_this) { + dOvlpFd_execute_f(i_this); + return 1; } -#pragma pop /* 80252458-80252460 24CD98 0008+00 1/0 0/0 0/0 .text dOvlpFd_IsDelete__FP14overlap1_class */ -static bool dOvlpFd_IsDelete(overlap1_class* param_0) { - return true; +static int dOvlpFd_IsDelete(overlap1_class* i_this) { + return 1; } /* 80252460-80252468 24CDA0 0008+00 1/0 0/0 0/0 .text dOvlpFd_Delete__FP14overlap1_class */ -static bool dOvlpFd_Delete(overlap1_class* param_0) { - return true; +static int dOvlpFd_Delete(overlap1_class* i_this) { + return 1; } /* 80252468-8025247C 24CDA8 0014+00 1/0 0/0 0/0 .text dOvlpFd_Create__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dOvlpFd_Create(void* param_0) { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade/dOvlpFd_Create__FPv.s" +static int dOvlpFd_Create(void* i_this) { + dOvlpFd_execute_f = dOvlpFd_FadeIn; + return cPhs_COMPLEATE_e; } -#pragma pop /* ############################################################################################## */ /* 803C2B98-803C2BAC -00001 0014+00 8/0 0/0 0/0 .data l_dOvlpFd_Method */ -SECTION_DATA static void* l_dOvlpFd_Method[5] = { - (void*)dOvlpFd_Create__FPv, - (void*)dOvlpFd_Delete__FP14overlap1_class, - (void*)dOvlpFd_Execute__FP14overlap1_class, - (void*)dOvlpFd_IsDelete__FP14overlap1_class, - (void*)dOvlpFd_Draw__FP14overlap1_class, +static leafdraw_method_class l_dOvlpFd_Method = { + (process_method_func)dOvlpFd_Create, (process_method_func)dOvlpFd_Delete, + (process_method_func)dOvlpFd_Execute, (process_method_func)dOvlpFd_IsDelete, + (process_method_func)dOvlpFd_Draw, }; /* 803C2BAC-803C2BD4 -00001 0028+00 0/0 0/0 1/0 .data g_profile_OVERLAP0 */ -SECTION_DATA extern void* g_profile_OVERLAP0[10] = { - (void*)NULL, (void*)0x0000FFFD, - (void*)NULL, (void*)&g_fpcLf_Method, - (void*)0x000000D8, (void*)NULL, - (void*)NULL, (void*)&g_fopOvlp_Method, - (void*)0x03050000, (void*)&l_dOvlpFd_Method, +extern overlap_process_profile_definition g_profile_OVERLAP0 = { + fpcLy_ROOT_e, + 0, + fpcPi_CURRENT_e, + PROC_OVERLAP0, + &g_fpcLf_Method.mBase, + sizeof(overlap1_class), + 0, + 0, + &g_fopOvlp_Method, + 773, + &l_dOvlpFd_Method, }; /* 803C2BD4-803C2BFC -00001 0028+00 0/0 0/0 1/0 .data g_profile_OVERLAP1 */ -SECTION_DATA extern void* g_profile_OVERLAP1[10] = { - (void*)NULL, (void*)0x0000FFFD, - (void*)0x00010000, (void*)&g_fpcLf_Method, - (void*)0x000000D8, (void*)NULL, - (void*)NULL, (void*)&g_fopOvlp_Method, - (void*)0x03060000, (void*)&l_dOvlpFd_Method, +extern overlap_process_profile_definition g_profile_OVERLAP1 = { + fpcLy_ROOT_e, + 0, + fpcPi_CURRENT_e, + PROC_OVERLAP1, + &g_fpcLf_Method.mBase, + sizeof(overlap1_class), + 0, + 0, + &g_fopOvlp_Method, + 774, + &l_dOvlpFd_Method, }; /* 803C2BFC-803C2C24 -00001 0028+00 0/0 0/0 1/0 .data g_profile_OVERLAP6 */ -SECTION_DATA extern void* g_profile_OVERLAP6[10] = { - (void*)NULL, (void*)0x0000FFFD, - (void*)0x00030000, (void*)&g_fpcLf_Method, - (void*)0x000000D8, (void*)NULL, - (void*)NULL, (void*)&g_fopOvlp_Method, - (void*)0x03090000, (void*)&l_dOvlpFd_Method, +extern overlap_process_profile_definition g_profile_OVERLAP6 = { + fpcLy_ROOT_e, + 0, + fpcPi_CURRENT_e, + PROC_OVERLAP6, + &g_fpcLf_Method.mBase, + sizeof(overlap1_class), + 0, + 0, + &g_fopOvlp_Method, + 777, + &l_dOvlpFd_Method, }; /* 803C2C24-803C2C4C -00001 0028+00 0/0 0/0 1/0 .data g_profile_OVERLAP7 */ -SECTION_DATA extern void* g_profile_OVERLAP7[10] = { - (void*)NULL, (void*)0x0000FFFD, - (void*)0x00040000, (void*)&g_fpcLf_Method, - (void*)0x000000D8, (void*)NULL, - (void*)NULL, (void*)&g_fopOvlp_Method, - (void*)0x030A0000, (void*)&l_dOvlpFd_Method, +extern overlap_process_profile_definition g_profile_OVERLAP7 = { + fpcLy_ROOT_e, + 0, + fpcPi_CURRENT_e, + PROC_OVERLAP7, + &g_fpcLf_Method.mBase, + sizeof(overlap1_class), + 0, + 0, + &g_fopOvlp_Method, + 778, + &l_dOvlpFd_Method, }; /* 803C2C4C-803C2C74 -00001 0028+00 0/0 0/0 1/0 .data g_profile_OVERLAP8 */ -SECTION_DATA extern void* g_profile_OVERLAP8[10] = { - (void*)NULL, (void*)0x0000FFFD, - (void*)0x00050000, (void*)&g_fpcLf_Method, - (void*)0x000000D8, (void*)NULL, - (void*)NULL, (void*)&g_fopOvlp_Method, - (void*)0x030B0000, (void*)&l_dOvlpFd_Method, +extern overlap_process_profile_definition g_profile_OVERLAP8 = { + fpcLy_ROOT_e, + 0, + fpcPi_CURRENT_e, + PROC_OVERLAP8, + &g_fpcLf_Method.mBase, + sizeof(overlap1_class), + 0, + 0, + &g_fopOvlp_Method, + 779, + &l_dOvlpFd_Method, }; /* 803C2C74-803C2C9C -00001 0028+00 0/0 0/0 1/0 .data g_profile_OVERLAP9 */ -SECTION_DATA extern void* g_profile_OVERLAP9[10] = { - (void*)NULL, (void*)0x0000FFFD, - (void*)0x00060000, (void*)&g_fpcLf_Method, - (void*)0x000000D8, (void*)NULL, - (void*)NULL, (void*)&g_fopOvlp_Method, - (void*)0x030C0000, (void*)&l_dOvlpFd_Method, +extern overlap_process_profile_definition g_profile_OVERLAP9 = { + fpcLy_ROOT_e, + 0, + fpcPi_CURRENT_e, + PROC_OVERLAP9, + &g_fpcLf_Method.mBase, + sizeof(overlap1_class), + 0, + 0, + &g_fopOvlp_Method, + 780, + &l_dOvlpFd_Method, }; /* 803C2C9C-803C2CC4 -00001 0028+00 0/0 0/0 1/0 .data g_profile_OVERLAP10 */ -SECTION_DATA extern void* g_profile_OVERLAP10[10] = { - (void*)NULL, (void*)0x0000FFFD, - (void*)0x00070000, (void*)&g_fpcLf_Method, - (void*)0x000000D8, (void*)NULL, - (void*)NULL, (void*)&g_fopOvlp_Method, - (void*)0x030D0000, (void*)&l_dOvlpFd_Method, +extern overlap_process_profile_definition g_profile_OVERLAP10 = { + fpcLy_ROOT_e, + 0, + fpcPi_CURRENT_e, + PROC_OVERLAP10, + &g_fpcLf_Method.mBase, + sizeof(overlap1_class), + 0, + 0, + &g_fopOvlp_Method, + 781, + &l_dOvlpFd_Method, }; /* 803C2CC4-803C2CF0 -00001 0028+04 0/0 0/0 1/0 .data g_profile_OVERLAP11 */ -SECTION_DATA extern void* g_profile_OVERLAP11[10 + 1 /* padding */] = { - (void*)NULL, - (void*)0x0000FFFD, - (void*)0x00080000, - (void*)&g_fpcLf_Method, - (void*)0x000000D8, - (void*)NULL, - (void*)NULL, - (void*)&g_fopOvlp_Method, - (void*)0x030E0000, - (void*)&l_dOvlpFd_Method, - /* padding */ - NULL, +extern overlap_process_profile_definition g_profile_OVERLAP11 = { + fpcLy_ROOT_e, + 0, + fpcPi_CURRENT_e, + PROC_OVERLAP11, + &g_fpcLf_Method.mBase, + sizeof(overlap1_class), + 0, + 0, + &g_fopOvlp_Method, + 782, + &l_dOvlpFd_Method, }; diff --git a/src/d/ovlp/d_ovlp_fade2.cpp b/src/d/ovlp/d_ovlp_fade2.cpp index c3fe12ed5a3..fd08a72444e 100644 --- a/src/d/ovlp/d_ovlp_fade2.cpp +++ b/src/d/ovlp/d_ovlp_fade2.cpp @@ -1,373 +1,279 @@ -// -// Generated By: dol2asm -// Translation Unit: d/ovlp/d_ovlp_fade2 -// +/** + * d_ovlp_fade2.cpp + * + */ #include "d/ovlp/d_ovlp_fade2.h" -#include "dol2asm.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" +#include "d/s/d_s_play.h" +#include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_graphic.h" -// -// Types: -// - -struct overlap_task_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoGph_gInf_c { - static u8 mFrameBufferTexObj[32]; - static u8 mFrameBufferTex[4]; -}; - -struct dOvlpFd2_dlst_c { - /* 8025247C */ void draw(); - /* 80252E8C */ ~dOvlpFd2_dlst_c(); -}; - -struct dOvlpFd2_c { - /* 80252990 */ dOvlpFd2_c(); - /* 802529F4 */ void execFirstSnap(); - /* 80252A78 */ void execFadeOut(); - /* 80252BC0 */ void execNextSnap(); - /* 80252C68 */ void execFadeIn(); -}; - -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - -struct JGeometry { - template - struct TBox2 {}; - /* TBox2 */ - struct TBox2__template0 {}; -}; - -struct JFWDisplay { - static u8 sManager[4]; -}; - -struct J2DOrthoGraph { - /* 802E980C */ void setOrtho(JGeometry::TBox2 const&, f32, f32); -}; - -// -// Forward References: -// - -extern "C" void draw__15dOvlpFd2_dlst_cFv(); -extern "C" void __ct__10dOvlpFd2_cFv(); -extern "C" void execFirstSnap__10dOvlpFd2_cFv(); -extern "C" void execFadeOut__10dOvlpFd2_cFv(); -extern "C" void execNextSnap__10dOvlpFd2_cFv(); -extern "C" void execFadeIn__10dOvlpFd2_cFv(); -extern "C" static void dOvlpFd2_Draw__FP10dOvlpFd2_c(); -extern "C" static void dOvlpFd2_Execute__FP10dOvlpFd2_c(); -extern "C" static bool dOvlpFd2_IsDelete__FP10dOvlpFd2_c(); -extern "C" static bool dOvlpFd2_Delete__FP10dOvlpFd2_c(); -extern "C" static void dOvlpFd2_Create__FPv(); -extern "C" void func_80252E70(void* _this, s8*); -extern "C" void __dt__15dOvlpFd2_dlst_cFv(); - -// -// External References: -// - -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void fopOvlpM_SceneIsStop__Fv(); -extern "C" void fopOvlpM_SceneIsStart__Fv(); -extern "C" void fopOvlpM_IsOutReq__FP18overlap_task_class(); -extern "C" void fopOvlpM_Done__FP18overlap_task_class(); -extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void cLib_addCalc0__FPfff(); -extern "C" void cLib_chaseAngleS__FPsss(); -extern "C" void __dl__FPv(); -extern "C" void func_802E980C(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void C_MTXPerspective(); -extern "C" void GXSetVtxDesc(); -extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); -extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); -extern "C" void GXBegin(); -extern "C" void GXSetCullMode(); -extern "C" void GXSetChanMatColor(); -extern "C" void GXSetNumChans(); -extern "C" void GXSetChanCtrl(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetFog(); -extern "C" void GXSetBlendMode(); -extern "C" void GXSetZMode(); -extern "C" void GXSetZCompLoc(); -extern "C" void GXSetDither(); -extern "C" void GXSetProjection(); -extern "C" void GXLoadPosMtxImm(); -extern "C" void GXSetCurrentMtx(); -extern "C" void GXSetViewport(); -extern "C" void GXSetScissor(); -extern "C" void GXSetClipMode(); -extern "C" void __ptmf_scall(); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* g_fopOvlp_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__16dDlst_snapShot_c[3]; -extern "C" u8 mFrameBufferTexObj__13mDoGph_gInf_c[32]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_clearColor[4]; -extern "C" u8 mFrameBufferTex__13mDoGph_gInf_c[4]; -extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; -extern "C" u8 sManager__10JFWDisplay[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80454E20-80454E24 003420 0004+00 1/1 0/0 0/0 .sdata2 @3631 */ -SECTION_SDATA2 static u32 lit_3631 = 0xFFFFFFFF; - -/* 80454E24-80454E28 003424 0004+00 2/2 0/0 0/0 .sdata2 @3683 */ -SECTION_SDATA2 static u8 lit_3683[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80454E28-80454E2C 003428 0004+00 1/1 0/0 0/0 .sdata2 @3684 */ -SECTION_SDATA2 static f32 lit_3684 = 608.0f; - -/* 80454E2C-80454E30 00342C 0004+00 1/1 0/0 0/0 .sdata2 @3685 */ -SECTION_SDATA2 static f32 lit_3685 = 448.0f; - -/* 80454E30-80454E34 003430 0004+00 4/4 0/0 0/0 .sdata2 @3686 */ -SECTION_SDATA2 static f32 lit_3686 = 1.0f; - -/* 80454E34-80454E38 003434 0004+00 1/1 0/0 0/0 .sdata2 @3687 */ -SECTION_SDATA2 static f32 lit_3687 = 60.0f; - -/* 80454E38-80454E3C 003438 0004+00 1/1 0/0 0/0 .sdata2 @3688 */ -SECTION_SDATA2 static f32 lit_3688 = 19.0f / 14.0f; - -/* 80454E3C-80454E40 00343C 0004+00 1/1 0/0 0/0 .sdata2 @3689 */ -SECTION_SDATA2 static f32 lit_3689 = 100.0f; - -/* 80454E40-80454E44 003440 0004+00 1/1 0/0 0/0 .sdata2 @3690 */ -SECTION_SDATA2 static f32 lit_3690 = 100000.0f; - -/* 80454E44-80454E48 003444 0004+00 1/1 0/0 0/0 .sdata2 @3691 */ -SECTION_SDATA2 static f32 lit_3691 = -1.0f; +// TODO: using cLib_calcTimer incorrectly orders dOvlpFd2_dlst_c dtor before calcTimer +// fix later +extern "C" s8 func_80252E70(s8*); /* 8025247C-80252990 24CDBC 0514+00 1/0 0/0 0/0 .text draw__15dOvlpFd2_dlst_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dOvlpFd2_dlst_c::draw() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade2/draw__15dOvlpFd2_dlst_cFv.s" +void dOvlpFd2_dlst_c::draw() { + GXSetViewport(0.0f, 0.0f, 608.0f, 448.0f, 0.0f, 1.0f); + GXSetScissor(0, 0, 608, 448); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_RGBA4, 0); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetNumChans(1); + GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, + GX_AF_NONE); + GXSetNumTexGens(0); + GXSetNumTevStages(1); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetZCompLoc(GX_TRUE); + GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE); + GXSetBlendMode(GX_BM_NONE, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_CLEAR); + GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0); + GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, g_clearColor); + GXSetCullMode(GX_CULL_NONE); + GXSetDither(GX_ENABLE); + GXSetClipMode(GX_CLIP_DISABLE); + GXLoadPosMtxImm(g_mDoMtx_identity, GX_PNMTX0); + GXSetCurrentMtx(0); + + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition2s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMinY()); + GXPosition2s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMinY()); + GXPosition2s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMaxY()); + GXPosition2s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMaxY()); + i_GXEnd(); + + Mtx44 m; + C_MTXPerspective(m, 60.0f, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(), 100.0f, + 100000.0f); + GXSetProjection(m, GX_PERSPECTIVE); + GXInitTexObj(mDoGph_gInf_c::getFrameBufferTexObj(), mDoGph_gInf_c::getFrameBufferTex(), 304, + 224, GX_TF_RGBA8, GX_CLAMP, GX_CLAMP, GX_FALSE); + GXInitTexObjLOD(mDoGph_gInf_c::getFrameBufferTexObj(), GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, + GX_FALSE, GX_FALSE, GX_ANISO_1); + GXLoadTexObj(mDoGph_gInf_c::getFrameBufferTexObj(), GX_TEXMAP0); + + GXSetNumChans(1); + GXSetChanCtrl(GX_COLOR0, 0, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE); + GXColor color = {255, 255, 255, 255}; + GXSetChanMatColor(GX_COLOR0, color); + GXSetNumTexGens(1); + GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_FALSE, 125); + GXSetNumTevStages(1); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_RASC, GX_CC_TEXC, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetZCompLoc(GX_TRUE); + GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE); + GXSetBlendMode(GX_BM_NONE, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_CLEAR); + GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0); + GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, g_clearColor); + GXSetCullMode(GX_CULL_NONE); + GXSetDither(1); + GXSetClipMode(GX_CLIP_ENABLE); + GXLoadPosMtxImm(mMtx, GX_PNMTX0); + GXSetCurrentMtx(0); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_RGBA4, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB8, 0); + + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition2s16(-mDoGph_gInf_c::getWidth() / 2, mDoGph_gInf_c::getHeight() / 2); + GXTexCoord2s8(0, 0); + + GXPosition2s16(mDoGph_gInf_c::getWidth() / 2, mDoGph_gInf_c::getHeight() / 2); + GXTexCoord2s8(1, 0); + + GXPosition2s16(mDoGph_gInf_c::getWidth() / 2, -mDoGph_gInf_c::getHeight() / 2); + GXTexCoord2s8(1, 1); + + GXPosition2s16(-mDoGph_gInf_c::getWidth() / 2, -mDoGph_gInf_c::getHeight() / 2); + GXTexCoord2s8(0, 1); + i_GXEnd(); + + J2DOrthoGraph* graf_ctx = (J2DOrthoGraph*)dComIfGp_getCurrentGrafPort(); + graf_ctx->setOrtho(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(), + mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), -1.0f, 1.0f); + graf_ctx->setup2D(); } -#pragma pop - -/* ############################################################################################## */ -/* 803C2CF0-803C2CFC -00001 000C+00 1/1 0/0 0/0 .data @3695 */ -SECTION_DATA static void* lit_3695[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)execFirstSnap__10dOvlpFd2_cFv, -}; - -/* 803C2CFC-803C2D08 -00001 000C+00 1/1 0/0 0/0 .data @3721 */ -SECTION_DATA static void* lit_3721[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)execFadeOut__10dOvlpFd2_cFv, -}; - -/* 803C2D08-803C2D14 -00001 000C+00 1/1 0/0 0/0 .data @3736 */ -SECTION_DATA static void* lit_3736[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)execNextSnap__10dOvlpFd2_cFv, -}; - -/* 803C2D14-803C2D20 -00001 000C+00 1/1 0/0 0/0 .data @3765 */ -SECTION_DATA static void* lit_3765[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)execFadeIn__10dOvlpFd2_cFv, -}; - -/* 803C2D20-803C2D34 -00001 0014+00 1/0 0/0 0/0 .data l_dOvlpFd2_Method */ -SECTION_DATA static void* l_dOvlpFd2_Method[5] = { - (void*)dOvlpFd2_Create__FPv, - (void*)dOvlpFd2_Delete__FP10dOvlpFd2_c, - (void*)dOvlpFd2_Execute__FP10dOvlpFd2_c, - (void*)dOvlpFd2_IsDelete__FP10dOvlpFd2_c, - (void*)dOvlpFd2_Draw__FP10dOvlpFd2_c, -}; - -/* 803C2D34-803C2D5C -00001 0028+00 0/0 0/0 1/0 .data g_profile_OVERLAP2 */ -SECTION_DATA extern void* g_profile_OVERLAP2[10] = { - (void*)NULL, (void*)0x0002FFFD, - (void*)0x00110000, (void*)&g_fpcLf_Method, - (void*)0x00000120, (void*)NULL, - (void*)NULL, (void*)&g_fopOvlp_Method, - (void*)0x03070000, (void*)&l_dOvlpFd2_Method, -}; - -/* 803C2D5C-803C2D70 01FE7C 0010+04 2/2 0/0 0/0 .data __vt__15dOvlpFd2_dlst_c */ -SECTION_DATA extern void* __vt__15dOvlpFd2_dlst_c[4 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__15dOvlpFd2_dlst_cFv, - (void*)__dt__15dOvlpFd2_dlst_cFv, - /* padding */ - NULL, -}; /* 80252990-802529F4 24D2D0 0064+00 1/1 0/0 0/0 .text __ct__10dOvlpFd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dOvlpFd2_c::dOvlpFd2_c() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade2/__ct__10dOvlpFd2_cFv.s" +dOvlpFd2_c::dOvlpFd2_c() { + setExecute(&execFirstSnap); + dComIfGp_2dShowOff(); + mTimer = 2; } -#pragma pop /* 802529F4-80252A78 24D334 0084+00 1/0 0/0 0/0 .text execFirstSnap__10dOvlpFd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dOvlpFd2_c::execFirstSnap() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade2/execFirstSnap__10dOvlpFd2_cFv.s" -} -#pragma pop +void dOvlpFd2_c::execFirstSnap() { + if (field_0x11c != 0) { + if (func_80252E70(&mTimer) == 0) { + setExecute(&execFadeOut); + fopOvlpM_Done(this); + mTimer = -12; + } -/* ############################################################################################## */ -/* 80454E48-80454E4C 003448 0004+00 1/1 0/0 0/0 .sdata2 @3757 */ -SECTION_SDATA2 static f32 lit_3757 = 1.0f / 20.0f; + dComIfGp_setWindowNum(0); + } +} /* 80252A78-80252BC0 24D3B8 0148+00 1/0 0/0 0/0 .text execFadeOut__10dOvlpFd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dOvlpFd2_c::execFadeOut() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade2/execFadeOut__10dOvlpFd2_cFv.s" +void dOvlpFd2_c::execFadeOut() { + dComIfGp_setWindowNum(0); + cLib_chaseAngleS(&field_0x112, 2000, 100); + + // fake match? + s16 temp_r5 = ((((field_0x110 + 0x4000) & 0x8000) | 0x4000) - field_0x112); + + field_0x110 += field_0x112; + + if (field_0x112 * (s16)(temp_r5 - field_0x110) < 0) { + if (mTimer == 0) { + if (fopOvlpM_IsOutReq(this)) { + fopOvlpM_SceneIsStart(); + setExecute(&execNextSnap); + field_0x110 = -0x4000; + mTimer = 15; + } + } + } + + if (mTimer < 0) { + if (++mTimer == 0) { + mDoGph_gInf_c::startFadeOut(16); + mTimer = TREG_S(1) + 20; + } + } else { + func_80252E70(&mTimer); + } + + field_0x114 += TREG_S(0) + 0x800; + cLib_addCalc2(&field_0x118, TREG_F(1) + 1.0f, 1.0f, TREG_F(2) + 0.05f); } -#pragma pop /* 80252BC0-80252C68 24D500 00A8+00 1/0 0/0 0/0 .text execNextSnap__10dOvlpFd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dOvlpFd2_c::execNextSnap() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade2/execNextSnap__10dOvlpFd2_cFv.s" +void dOvlpFd2_c::execNextSnap() { + if (func_80252E70(&mTimer) == 0) { + if (!JFWDisplay::getManager()->getFader()->startFadeIn(16)) { + field_0x110 += field_0x112; + field_0x11c = 0; + + dComIfGp_setWindowNum(1); + dComIfGp_2dShowOff(); + setExecute(&execFadeIn); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80454E4C-80454E50 00344C 0004+00 1/1 0/0 0/0 .sdata2 @3794 */ -SECTION_SDATA2 static f32 lit_3794 = 3.0f / 100.0f; - -/* 80454E50-80454E54 003450 0004+00 1/1 0/0 0/0 .sdata2 @3795 */ -SECTION_SDATA2 static f32 lit_3795 = 0.0010000000474974513f; /* 80252C68-80252D0C 24D5A8 00A4+00 1/0 0/0 0/0 .text execFadeIn__10dOvlpFd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dOvlpFd2_c::execFadeIn() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade2/execFadeIn__10dOvlpFd2_cFv.s" -} -#pragma pop +void dOvlpFd2_c::execFadeIn() { + field_0x114 -= TREG_S(0) + 0x800; -/* ############################################################################################## */ -/* 80454E54-80454E58 003454 0004+00 1/1 0/0 0/0 .sdata2 @3822 */ -SECTION_SDATA2 static f32 lit_3822 = -420.0f; + cLib_addCalc0(&field_0x118, 1.0f, TREG_F(3) + 0.03f); + if (field_0x118 < 0.001f) { + if (field_0x11e == 0) { + fopOvlpM_SceneIsStart(); + field_0x11e = 1; + } else { + fopOvlpM_Done(this); + dComIfGp_setWindowNum(1); + dComIfGp_2dShowOn(); + } + } else { + dComIfGp_setWindowNum(0); + fopOvlpM_SceneIsStop(); + } +} + +void dOvlpFd2_c::draw() { + if (field_0x11c == 0) { + dComIfGd_set2DXlu(&mSnapshot_c); + field_0x11c = 1; + } else if (dComIfGp_getWindowNum() == 0) { + mDoMtx_stack_c::transS(0.0f, 0.0f, TREG_F(0) + -420.0f); + mDoMtx_stack_c::ZrotM(field_0x114); + mDoMtx_stack_c::scaleM(1.0f, field_0x118 + 1.0f, 1.0f); + mDoMtx_stack_c::ZrotM(-field_0x114); + + cMtx_copy(mDoMtx_stack_c::get(), mDlst_c.getMtx()); + mDlst_c.entry(); + } + + mDoGph_gInf_c::offBlure(); +} /* 80252D0C-80252E08 24D64C 00FC+00 1/0 0/0 0/0 .text dOvlpFd2_Draw__FP10dOvlpFd2_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dOvlpFd2_Draw(dOvlpFd2_c* param_0) { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Draw__FP10dOvlpFd2_c.s" +static int dOvlpFd2_Draw(dOvlpFd2_c* i_this) { + i_this->draw(); + return 1; +} + +void dOvlpFd2_c::execute() { + (this->*mExecuteFn)(); } -#pragma pop /* 80252E08-80252E34 24D748 002C+00 1/0 0/0 0/0 .text dOvlpFd2_Execute__FP10dOvlpFd2_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dOvlpFd2_Execute(dOvlpFd2_c* param_0) { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Execute__FP10dOvlpFd2_c.s" +static int dOvlpFd2_Execute(dOvlpFd2_c* i_this) { + i_this->execute(); + return 1; } -#pragma pop /* 80252E34-80252E3C 24D774 0008+00 1/0 0/0 0/0 .text dOvlpFd2_IsDelete__FP10dOvlpFd2_c */ -static bool dOvlpFd2_IsDelete(dOvlpFd2_c* param_0) { - return true; +static int dOvlpFd2_IsDelete(dOvlpFd2_c* i_this) { + return 1; } /* 80252E3C-80252E44 24D77C 0008+00 1/0 0/0 0/0 .text dOvlpFd2_Delete__FP10dOvlpFd2_c */ -static bool dOvlpFd2_Delete(dOvlpFd2_c* param_0) { - return true; +static int dOvlpFd2_Delete(dOvlpFd2_c* i_this) { + return 1; } /* 80252E44-80252E70 24D784 002C+00 1/0 0/0 0/0 .text dOvlpFd2_Create__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dOvlpFd2_Create(void* param_0) { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Create__FPv.s" +static int dOvlpFd2_Create(void* i_this) { + new (i_this) dOvlpFd2_c(); + return cPhs_COMPLEATE_e; } -#pragma pop /* 80252E70-80252E8C 24D7B0 001C+00 3/3 4/4 0/0 .text cLib_calcTimer__FPSc */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80252E70(void* _this, s8* param_0) { +extern "C" asm s8 func_80252E70(s8* param_0) { nofralloc #include "asm/d/ovlp/d_ovlp_fade2/func_80252E70.s" } #pragma pop -/* 80252E8C-80252ED4 24D7CC 0048+00 1/0 0/0 0/0 .text __dt__15dOvlpFd2_dlst_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dOvlpFd2_dlst_c::~dOvlpFd2_dlst_c() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade2/__dt__15dOvlpFd2_dlst_cFv.s" -} -#pragma pop +/* 803C2D20-803C2D34 -00001 0014+00 1/0 0/0 0/0 .data l_dOvlpFd2_Method */ +static leafdraw_method_class l_dOvlpFd2_Method = { + (process_method_func)dOvlpFd2_Create, (process_method_func)dOvlpFd2_Delete, + (process_method_func)dOvlpFd2_Execute, (process_method_func)dOvlpFd2_IsDelete, + (process_method_func)dOvlpFd2_Draw, +}; + +/* 803C2D34-803C2D5C -00001 0028+00 0/0 0/0 1/0 .data g_profile_OVERLAP2 */ +extern overlap_process_profile_definition g_profile_OVERLAP2 = { + fpcLy_ROOT_e, + 2, + fpcPi_CURRENT_e, + PROC_OVERLAP2, + &g_fpcLf_Method.mBase, + sizeof(dOvlpFd2_c), + 0, + 0, + &g_fopOvlp_Method, + 775, + &l_dOvlpFd2_Method, +}; \ No newline at end of file diff --git a/src/d/ovlp/d_ovlp_fade3.cpp b/src/d/ovlp/d_ovlp_fade3.cpp index e3a69db8786..cb0e54b52d7 100644 --- a/src/d/ovlp/d_ovlp_fade3.cpp +++ b/src/d/ovlp/d_ovlp_fade3.cpp @@ -1,383 +1,266 @@ -// -// Generated By: dol2asm -// Translation Unit: d/ovlp/d_ovlp_fade3 -// +/** + * d_ovlp_fade3.cpp + * + */ #include "d/ovlp/d_ovlp_fade3.h" -#include "dol2asm.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" +#include "d/s/d_s_play.h" +#include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_graphic.h" -// -// Types: -// - -struct overlap_task_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoGph_gInf_c { - static u8 mFrameBufferTexObj[32]; - static u8 mFrameBufferTex[4]; -}; - -struct dOvlpFd3_dlst_c { - /* 80252F28 */ void draw(); - /* 802538E8 */ ~dOvlpFd3_dlst_c(); -}; - -struct dOvlpFd3_c { - /* 8025343C */ dOvlpFd3_c(); - /* 80253518 */ void execFirstSnap(); - /* 802535AC */ void execFadeOut(); - /* 8025368C */ void execNextSnap(); - /* 80253730 */ void execFadeIn(); -}; - -struct dDlst_snapShot_c { - /* 80252ED4 */ void draw(); -}; - -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - -struct dCamera_c { - /* 801614D0 */ void Stop(); -}; - -struct JGeometry { - template - struct TBox2 {}; - /* TBox2 */ - struct TBox2__template0 {}; -}; - -struct JFWDisplay { - static u8 sManager[4]; -}; - -struct J2DOrthoGraph { - /* 802E980C */ void setOrtho(JGeometry::TBox2 const&, f32, f32); -}; - -// -// Forward References: -// - -extern "C" void draw__16dDlst_snapShot_cFv(); -extern "C" void draw__15dOvlpFd3_dlst_cFv(); -extern "C" void __ct__10dOvlpFd3_cFv(); -extern "C" void execFirstSnap__10dOvlpFd3_cFv(); -extern "C" void execFadeOut__10dOvlpFd3_cFv(); -extern "C" void execNextSnap__10dOvlpFd3_cFv(); -extern "C" void execFadeIn__10dOvlpFd3_cFv(); -extern "C" static void dOvlpFd3_Draw__FP10dOvlpFd3_c(); -extern "C" static void dOvlpFd3_Execute__FP10dOvlpFd3_c(); -extern "C" static bool dOvlpFd3_IsDelete__FP10dOvlpFd3_c(); -extern "C" static bool dOvlpFd3_Delete__FP10dOvlpFd3_c(); -extern "C" static void dOvlpFd3_Create__FPv(); -extern "C" void __dt__15dOvlpFd3_dlst_cFv(); - -// -// External References: -// - -extern "C" void mDoAud_setFadeOutStart__FUc(); -extern "C" void mDoAud_setFadeInStart__FUc(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void fopOvlpM_SceneIsStart__Fv(); -extern "C" void fopOvlpM_IsOutReq__FP18overlap_task_class(); -extern "C" void fopOvlpM_Done__FP18overlap_task_class(); -extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); -extern "C" void func_80141AE8(void* _this, u8*); -extern "C" void Stop__9dCamera_cFv(); -extern "C" void dCam_getBody__Fv(); -extern "C" void func_80252E70(void* _this, s8*); -extern "C" void cLib_addCalc0__FPfff(); -extern "C" void __dl__FPv(); -extern "C" void func_802E980C(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void C_MTXPerspective(); -extern "C" void GXSetVtxDesc(); -extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); -extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); -extern "C" void GXPixModeSync(); -extern "C" void GXBegin(); -extern "C" void GXSetCullMode(); -extern "C" void GXSetTexCopySrc(); -extern "C" void GXSetTexCopyDst(); -extern "C" void GXCopyTex(); -extern "C" void GXSetChanMatColor(); -extern "C" void GXSetNumChans(); -extern "C" void GXSetChanCtrl(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetFog(); -extern "C" void GXSetBlendMode(); -extern "C" void GXSetZMode(); -extern "C" void GXSetZCompLoc(); -extern "C" void GXSetDither(); -extern "C" void GXSetProjection(); -extern "C" void GXLoadPosMtxImm(); -extern "C" void GXSetCurrentMtx(); -extern "C" void GXSetViewport(); -extern "C" void GXSetScissor(); -extern "C" void GXSetClipMode(); -extern "C" void __ptmf_scall(); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* g_fopOvlp_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" u8 mFrameBufferTexObj__13mDoGph_gInf_c[32]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_clearColor[4]; -extern "C" u8 mFrameBufferTex__13mDoGph_gInf_c[4]; -extern "C" u8 sManager__10JFWDisplay[4]; - -// -// Declarations: -// +extern "C" u8 func_80141AE8(u8*); +extern "C" s8 func_80252E70(s8*); /* 80252ED4-80252F28 24D814 0054+00 1/0 0/0 0/0 .text draw__16dDlst_snapShot_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_snapShot_c::draw() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade3/draw__16dDlst_snapShot_cFv.s" +void dDlst_snapShot_c::draw() { + GXSetTexCopySrc(0, 0, 608, 448); + GXSetTexCopyDst(608 / 2, 448 / 2, GX_TF_RGBA8, GX_TRUE); + GXCopyTex(mDoGph_gInf_c::getFrameBufferTex(), GX_FALSE); + GXPixModeSync(); } -#pragma pop - -/* ############################################################################################## */ -/* 80454E58-80454E5C 003458 0004+00 1/1 0/0 0/0 .sdata2 @3748 */ -SECTION_SDATA2 static u32 lit_3748 = 0xFFFFFFFF; - -/* 80454E5C-80454E60 00345C 0004+00 2/2 0/0 0/0 .sdata2 @3800 */ -SECTION_SDATA2 static u8 lit_3800[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80454E60-80454E64 003460 0004+00 1/1 0/0 0/0 .sdata2 @3801 */ -SECTION_SDATA2 static f32 lit_3801 = 608.0f; - -/* 80454E64-80454E68 003464 0004+00 1/1 0/0 0/0 .sdata2 @3802 */ -SECTION_SDATA2 static f32 lit_3802 = 448.0f; - -/* 80454E68-80454E6C 003468 0004+00 3/3 0/0 0/0 .sdata2 @3803 */ -SECTION_SDATA2 static f32 lit_3803 = 1.0f; - -/* 80454E6C-80454E70 00346C 0004+00 1/1 0/0 0/0 .sdata2 @3804 */ -SECTION_SDATA2 static f32 lit_3804 = 60.0f; - -/* 80454E70-80454E74 003470 0004+00 1/1 0/0 0/0 .sdata2 @3805 */ -SECTION_SDATA2 static f32 lit_3805 = 19.0f / 14.0f; - -/* 80454E74-80454E78 003474 0004+00 1/1 0/0 0/0 .sdata2 @3806 */ -SECTION_SDATA2 static f32 lit_3806 = 100.0f; - -/* 80454E78-80454E7C 003478 0004+00 1/1 0/0 0/0 .sdata2 @3807 */ -SECTION_SDATA2 static f32 lit_3807 = 100000.0f; - -/* 80454E7C-80454E80 00347C 0004+00 1/1 0/0 0/0 .sdata2 @3808 */ -SECTION_SDATA2 static f32 lit_3808 = -1.0f; /* 80252F28-8025343C 24D868 0514+00 1/0 0/0 0/0 .text draw__15dOvlpFd3_dlst_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dOvlpFd3_dlst_c::draw() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade3/draw__15dOvlpFd3_dlst_cFv.s" +void dOvlpFd3_dlst_c::draw() { + GXSetViewport(0.0f, 0.0f, 608.0f, 448.0f, 0.0f, 1.0f); + GXSetScissor(0, 0, 608, 448); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_RGBA4, 0); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetNumChans(1); + GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, + GX_AF_NONE); + GXSetNumTexGens(0); + GXSetNumTevStages(1); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetZCompLoc(GX_TRUE); + GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE); + GXSetBlendMode(GX_BM_NONE, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_CLEAR); + GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0); + GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, g_clearColor); + GXSetCullMode(GX_CULL_NONE); + GXSetDither(GX_ENABLE); + GXSetClipMode(GX_CLIP_DISABLE); + GXLoadPosMtxImm(g_mDoMtx_identity, GX_PNMTX0); + GXSetCurrentMtx(0); + + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition2s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMinY()); + GXPosition2s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMinY()); + GXPosition2s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMaxY()); + GXPosition2s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMaxY()); + i_GXEnd(); + + Mtx44 m; + C_MTXPerspective(m, 60.0f, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(), 100.0f, + 100000.0f); + GXSetProjection(m, GX_PERSPECTIVE); + GXInitTexObj(mDoGph_gInf_c::getFrameBufferTexObj(), mDoGph_gInf_c::getFrameBufferTex(), 304, + 224, GX_TF_RGBA8, GX_CLAMP, GX_CLAMP, GX_FALSE); + GXInitTexObjLOD(mDoGph_gInf_c::getFrameBufferTexObj(), GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, + GX_FALSE, GX_FALSE, GX_ANISO_1); + GXLoadTexObj(mDoGph_gInf_c::getFrameBufferTexObj(), GX_TEXMAP0); + + GXSetNumChans(1); + GXSetChanCtrl(GX_COLOR0, 0, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE); + GXColor color = {255, 255, 255, 255}; + GXSetChanMatColor(GX_COLOR0, color); + GXSetNumTexGens(1); + GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_FALSE, 125); + GXSetNumTevStages(1); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_RASC, GX_CC_TEXC, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetZCompLoc(GX_TRUE); + GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE); + GXSetBlendMode(GX_BM_NONE, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_CLEAR); + GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0); + GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, g_clearColor); + GXSetCullMode(GX_CULL_NONE); + GXSetDither(1); + GXSetClipMode(GX_CLIP_ENABLE); + GXLoadPosMtxImm(mMtx, GX_PNMTX0); + GXSetCurrentMtx(0); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_RGBA4, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB8, 0); + + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition2s16(-mDoGph_gInf_c::getWidth() / 2, mDoGph_gInf_c::getHeight() / 2); + GXTexCoord2s8(0, 0); + + GXPosition2s16(mDoGph_gInf_c::getWidth() / 2, mDoGph_gInf_c::getHeight() / 2); + GXTexCoord2s8(1, 0); + + GXPosition2s16(mDoGph_gInf_c::getWidth() / 2, -mDoGph_gInf_c::getHeight() / 2); + GXTexCoord2s8(1, 1); + + GXPosition2s16(-mDoGph_gInf_c::getWidth() / 2, -mDoGph_gInf_c::getHeight() / 2); + GXTexCoord2s8(0, 1); + i_GXEnd(); + + J2DOrthoGraph* graf_ctx = (J2DOrthoGraph*)dComIfGp_getCurrentGrafPort(); + graf_ctx->setOrtho(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(), + mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), -1.0f, 1.0f); + graf_ctx->setup2D(); } -#pragma pop - -/* ############################################################################################## */ -/* 803C2D70-803C2D7C -00001 000C+00 1/1 0/0 0/0 .data @3812 */ -SECTION_DATA static void* lit_3812[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)execFirstSnap__10dOvlpFd3_cFv, -}; - -/* 803C2D7C-803C2D88 -00001 000C+00 1/1 0/0 0/0 .data @3857 */ -SECTION_DATA static void* lit_3857[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)execFadeOut__10dOvlpFd3_cFv, -}; - -/* 803C2D88-803C2D94 -00001 000C+00 1/1 0/0 0/0 .data @3871 */ -SECTION_DATA static void* lit_3871[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)execNextSnap__10dOvlpFd3_cFv, -}; - -/* 803C2D94-803C2DA0 -00001 000C+00 1/1 0/0 0/0 .data @3898 */ -SECTION_DATA static void* lit_3898[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)execFadeIn__10dOvlpFd3_cFv, -}; - -/* 803C2DA0-803C2DB4 -00001 0014+00 1/0 0/0 0/0 .data l_dOvlpFd3_Method */ -SECTION_DATA static void* l_dOvlpFd3_Method[5] = { - (void*)dOvlpFd3_Create__FPv, - (void*)dOvlpFd3_Delete__FP10dOvlpFd3_c, - (void*)dOvlpFd3_Execute__FP10dOvlpFd3_c, - (void*)dOvlpFd3_IsDelete__FP10dOvlpFd3_c, - (void*)dOvlpFd3_Draw__FP10dOvlpFd3_c, -}; - -/* 803C2DB4-803C2DDC -00001 0028+00 0/0 0/0 1/0 .data g_profile_OVERLAP3 */ -SECTION_DATA extern void* g_profile_OVERLAP3[10] = { - (void*)NULL, (void*)0x0000FFFD, - (void*)0x00020000, (void*)&g_fpcLf_Method, - (void*)0x00000120, (void*)NULL, - (void*)NULL, (void*)&g_fopOvlp_Method, - (void*)0x03080000, (void*)&l_dOvlpFd3_Method, -}; - -/* 803C2DDC-803C2DEC 01FEFC 0010+00 2/2 0/0 0/0 .data __vt__15dOvlpFd3_dlst_c */ -SECTION_DATA extern void* __vt__15dOvlpFd3_dlst_c[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__15dOvlpFd3_dlst_cFv, - (void*)__dt__15dOvlpFd3_dlst_cFv, -}; - -/* 803C2DEC-803C2DF8 01FF0C 000C+00 1/1 1/1 0/0 .data __vt__16dDlst_snapShot_c */ -SECTION_DATA extern void* __vt__16dDlst_snapShot_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__16dDlst_snapShot_cFv, -}; /* 8025343C-80253518 24DD7C 00DC+00 1/1 0/0 0/0 .text __ct__10dOvlpFd3_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dOvlpFd3_c::dOvlpFd3_c() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade3/__ct__10dOvlpFd3_cFv.s" +dOvlpFd3_c::dOvlpFd3_c() { + setExecute(&execFirstSnap); + dComIfGp_2dShowOff(); + + mTimer = 2; + field_0x11f = dComIfGp_getNextStageWipeSpeed(); + if (field_0x11f == 0) { + field_0x11f = 1; + } + + dCam_getBody()->Stop(); + mDoGph_gInf_c::startFadeOut(XREG_S(3) + (field_0x11f >> 1) + 90); } -#pragma pop /* 80253518-802535AC 24DE58 0094+00 1/0 0/0 0/0 .text execFirstSnap__10dOvlpFd3_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dOvlpFd3_c::execFirstSnap() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade3/execFirstSnap__10dOvlpFd3_cFv.s" +void dOvlpFd3_c::execFirstSnap() { + if (func_80141AE8(&field_0x11f) == 0 && field_0x11c != 0) { + if (func_80252E70(&mTimer) == 0) { + setExecute(&execFadeOut); + fopOvlpM_Done(this); + mTimer = 0xFF; + } + + dComIfGp_setWindowNum(0); + } } -#pragma pop /* 802535AC-8025368C 24DEEC 00E0+00 1/0 0/0 0/0 .text execFadeOut__10dOvlpFd3_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dOvlpFd3_c::execFadeOut() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade3/execFadeOut__10dOvlpFd3_cFv.s" +void dOvlpFd3_c::execFadeOut() { + dComIfGp_setWindowNum(0); + + if (mTimer == 0) { + if (fopOvlpM_IsOutReq(this)) { + fopOvlpM_SceneIsStart(); + setExecute(&execNextSnap); + field_0x110 = -0x4000; + mTimer = 1; + } + } + + if (mTimer < 0) { + if (++mTimer == 0) { + mDoGph_gInf_c::startFadeOut(XREG_S(1) + 75); + mTimer = XREG_S(2) + 90; + mDoAud_setFadeOutStart(0); + } + } else { + func_80252E70(&mTimer); + } } -#pragma pop /* 8025368C-80253730 24DFCC 00A4+00 1/0 0/0 0/0 .text execNextSnap__10dOvlpFd3_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dOvlpFd3_c::execNextSnap() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade3/execNextSnap__10dOvlpFd3_cFv.s" -} -#pragma pop +void dOvlpFd3_c::execNextSnap() { + if (func_80252E70(&mTimer) == 0) { + if (!JFWDisplay::getManager()->getFader()->startFadeIn(XREG_S(4) + 26)) { + mDoAud_setFadeInStart(0); + field_0x110 += field_0x112; -/* ############################################################################################## */ -/* 80454E80-80454E84 003480 0004+00 1/1 0/0 0/0 .sdata2 @3923 */ -SECTION_SDATA2 static f32 lit_3923 = 3.0f / 100.0f; + dComIfGp_setWindowNum(1); + setExecute(&execFadeIn); + } + } +} /* 80253730-802537AC 24E070 007C+00 1/0 0/0 0/0 .text execFadeIn__10dOvlpFd3_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dOvlpFd3_c::execFadeIn() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade3/execFadeIn__10dOvlpFd3_cFv.s" -} -#pragma pop +void dOvlpFd3_c::execFadeIn() { + field_0x114 -= TREG_S(0) + 0x800; -/* ############################################################################################## */ -/* 80454E84-80454E88 003484 0004+00 1/1 0/0 0/0 .sdata2 @3947 */ -SECTION_SDATA2 static f32 lit_3947 = -388.0f; + cLib_addCalc0(&field_0x118, 1.0f, TREG_F(3) + 0.03f); + if (field_0x11e == 0) { + fopOvlpM_SceneIsStart(); + field_0x11e = 1; + } else { + fopOvlpM_Done(this); + dComIfGp_setWindowNum(1); + dComIfGp_2dShowOn(); + } +} + +void dOvlpFd3_c::draw() { + if (field_0x11f == 0) { + if (field_0x11c == 0) { + dComIfGd_set2DXlu(&mSnapshot_c); + field_0x11c = 1; + } else if (dComIfGp_getWindowNum() == 0) { + mDoMtx_stack_c::transS(0.0f, 0.0f, TREG_F(0) + -388.0f); + mDoMtx_stack_c::scaleM(1.0f, 1.0f, 1.0f); + + cMtx_copy(mDoMtx_stack_c::get(), mDlst_c.getMtx()); + mDlst_c.entry(); + } + } +} /* 802537AC-80253880 24E0EC 00D4+00 1/0 0/0 0/0 .text dOvlpFd3_Draw__FP10dOvlpFd3_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dOvlpFd3_Draw(dOvlpFd3_c* param_0) { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade3/dOvlpFd3_Draw__FP10dOvlpFd3_c.s" +static int dOvlpFd3_Draw(dOvlpFd3_c* i_this) { + i_this->draw(); + return 1; +} + +void dOvlpFd3_c::execute() { + (this->*mExecuteFn)(); } -#pragma pop /* 80253880-802538AC 24E1C0 002C+00 1/0 0/0 0/0 .text dOvlpFd3_Execute__FP10dOvlpFd3_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dOvlpFd3_Execute(dOvlpFd3_c* param_0) { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade3/dOvlpFd3_Execute__FP10dOvlpFd3_c.s" +static int dOvlpFd3_Execute(dOvlpFd3_c* i_this) { + i_this->execute(); + return 1; } -#pragma pop /* 802538AC-802538B4 24E1EC 0008+00 1/0 0/0 0/0 .text dOvlpFd3_IsDelete__FP10dOvlpFd3_c */ -static bool dOvlpFd3_IsDelete(dOvlpFd3_c* param_0) { - return true; +static int dOvlpFd3_IsDelete(dOvlpFd3_c* i_this) { + return 1; } /* 802538B4-802538BC 24E1F4 0008+00 1/0 0/0 0/0 .text dOvlpFd3_Delete__FP10dOvlpFd3_c */ -static bool dOvlpFd3_Delete(dOvlpFd3_c* param_0) { - return true; +static int dOvlpFd3_Delete(dOvlpFd3_c* i_this) { + return 1; } /* 802538BC-802538E8 24E1FC 002C+00 1/0 0/0 0/0 .text dOvlpFd3_Create__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dOvlpFd3_Create(void* param_0) { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade3/dOvlpFd3_Create__FPv.s" +static int dOvlpFd3_Create(void* i_this) { + new (i_this) dOvlpFd3_c(); + return cPhs_COMPLEATE_e; } -#pragma pop -/* 802538E8-80253930 24E228 0048+00 1/0 0/0 0/0 .text __dt__15dOvlpFd3_dlst_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dOvlpFd3_dlst_c::~dOvlpFd3_dlst_c() { - nofralloc -#include "asm/d/ovlp/d_ovlp_fade3/__dt__15dOvlpFd3_dlst_cFv.s" -} -#pragma pop +/* 803C2DA0-803C2DB4 -00001 0014+00 1/0 0/0 0/0 .data l_dOvlpFd3_Method */ +static leafdraw_method_class l_dOvlpFd3_Method = { + (process_method_func)dOvlpFd3_Create, (process_method_func)dOvlpFd3_Delete, + (process_method_func)dOvlpFd3_Execute, (process_method_func)dOvlpFd3_IsDelete, + (process_method_func)dOvlpFd3_Draw, +}; + +/* 803C2DB4-803C2DDC -00001 0028+00 0/0 0/0 1/0 .data g_profile_OVERLAP3 */ +extern overlap_process_profile_definition g_profile_OVERLAP3 = { + fpcLy_ROOT_e, + 0, + fpcPi_CURRENT_e, + PROC_OVERLAP3, + &g_fpcLf_Method.mBase, + sizeof(dOvlpFd3_c), + 0, + 0, + &g_fopOvlp_Method, + 776, + &l_dOvlpFd3_Method, +}; diff --git a/src/d/s/d_s_play.cpp b/src/d/s/d_s_play.cpp index c4b8dbb4977..8779f3d9380 100644 --- a/src/d/s/d_s_play.cpp +++ b/src/d/s/d_s_play.cpp @@ -999,7 +999,7 @@ SECTION_DATA extern void* __vt__21dScnPly_preLoad_HIO_c[3] = { }; /* 80451128-80451130 000628 0004+04 1/1 0/0 0/0 .sbss g_regHIO */ -static u8 g_regHIO[4 + 4 /* padding */]; +u8 g_regHIO[4]; /* 8025AC54-8025AD04 255594 00B0+00 0/0 1/0 0/0 .text __sinit_d_s_play_cpp */ #pragma push diff --git a/src/f_op/f_op_overlap.cpp b/src/f_op/f_op_overlap.cpp index 0eb284f10a4..dfb4336f3b8 100644 --- a/src/f_op/f_op_overlap.cpp +++ b/src/f_op/f_op_overlap.cpp @@ -5,7 +5,6 @@ #include "SSystem/SComponent/c_request.h" #include "f_op/f_op_overlap.h" -#include "f_op/f_op_overlap_mng.h" #include "f_pc/f_pc_manager.h" /* 8001E37C-8001E3A4 018CBC 0028+00 1/0 0/0 0/0 .text fopOvlp_Draw__FPv */ @@ -50,7 +49,7 @@ static s32 fopOvlp_Create(void* i_this) { /* ############################################################################################## */ /* 803A3878-803A3890 -00001 0014+04 0/0 10/0 0/0 .data g_fopOvlp_Method */ -extern leafdraw_method_class g_fopOvlp_Method = { +leafdraw_method_class g_fopOvlp_Method = { (process_method_func)fopOvlp_Create, (process_method_func)fopOvlp_Delete, (process_method_func)fopOvlp_Execute, (process_method_func)fopOvlp_IsDelete, (process_method_func)fopOvlp_Draw,