From a01d65b0b99400f62d93eee28475872b641cfd50 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 14 Mar 2023 15:27:46 -0700 Subject: [PATCH] d_ky_thunder done / d_scope wip / m_Do_graphic wip (#308) * d_ky_thunder OK + misc build fixes * d_scope mostly done * some m_Do_graphic wip * remove asm --- Progress.md | 8 +- asm/d/d_ky_thunder/create__10dThunder_cFv.s | 330 ----------- .../dThunder_Delete__FP10dThunder_c.s | 35 -- .../dThunder_Draw__FP10dThunder_c.s | 106 ---- .../dThunder_Execute__FP10dThunder_c.s | 126 ----- asm/d/d_scope/__ct__8dScope_cFUc.s | 186 ------- asm/d/d_scope/__ct__Q28JUtility6TColorFv.s | 4 - asm/d/d_scope/__dt__8dScope_cFv.s | 157 ------ asm/d/d_scope/__sinit_d_scope_cpp.s | 42 -- asm/d/d_scope/_execute__8dScope_cFUl.s | 58 -- asm/d/d_scope/isDead__8dScope_cFv.s | 6 - asm/d/d_scope/open_init__8dScope_cFv.s | 8 - .../m_Do_graphic/create__13mDoGph_gInf_cFv.s | 85 --- .../JSystem/J3DGraphAnimator/J3DAnimation.h | 2 +- include/JSystem/J3DGraphBase/J3DMatBlock.h | 188 +++---- include/JSystem/JFramework/JFWDisplay.h | 4 + include/JSystem/JMath/JMath.h | 12 +- include/JSystem/JParticle/JPAParticle.h | 10 + include/d/a/d_a_alink.h | 3 +- include/d/a/d_a_player.h | 4 +- include/d/com/d_com_inf_game.h | 265 ++++++++- include/d/d_drawlist.h | 38 +- include/d/d_ky_thunder.h | 51 +- include/d/kankyo/d_kankyo.h | 1 + include/d/kankyo/d_kankyo_rain.h | 1 + include/d/meter/d_meter2.h | 30 +- include/d/meter/d_meter2_info.h | 7 +- include/d/particle/d_particle.h | 20 + include/d/save/d_save_init.h | 2 +- include/f_ap/f_ap_game.h | 2 +- include/f_op/f_op_view.h | 12 +- include/m_Do/m_Do_audio.h | 4 + include/m_Do/m_Do_graphic.h | 14 + .../JSystem/J3DGraphAnimator/J3DAnimation.cpp | 4 +- libs/JSystem/J3DGraphBase/J3DMatBlock.cpp | 168 +++--- libs/JSystem/J3DGraphBase/J3DMaterial.cpp | 10 +- src/d/a/d_a_alink.cpp | 6 +- src/d/d_camera.cpp | 56 +- src/d/d_drawlist.cpp | 20 +- src/d/d_ky_thunder.cpp | 523 ++++++++---------- src/d/d_scope.cpp | 465 +++++++++------- src/d/kankyo/d_kankyo.cpp | 9 - src/d/save/d_save.cpp | 83 +-- src/d/save/d_save_init.cpp | 4 +- src/m_Do/m_Do_graphic.cpp | 319 ++++++++++- 45 files changed, 1493 insertions(+), 1995 deletions(-) delete mode 100644 asm/d/d_ky_thunder/create__10dThunder_cFv.s delete mode 100644 asm/d/d_ky_thunder/dThunder_Delete__FP10dThunder_c.s delete mode 100644 asm/d/d_ky_thunder/dThunder_Draw__FP10dThunder_c.s delete mode 100644 asm/d/d_ky_thunder/dThunder_Execute__FP10dThunder_c.s delete mode 100644 asm/d/d_scope/__ct__8dScope_cFUc.s delete mode 100644 asm/d/d_scope/__ct__Q28JUtility6TColorFv.s delete mode 100644 asm/d/d_scope/__dt__8dScope_cFv.s delete mode 100644 asm/d/d_scope/__sinit_d_scope_cpp.s delete mode 100644 asm/d/d_scope/_execute__8dScope_cFUl.s delete mode 100644 asm/d/d_scope/isDead__8dScope_cFv.s delete mode 100644 asm/d/d_scope/open_init__8dScope_cFv.s delete mode 100644 asm/m_Do/m_Do_graphic/create__13mDoGph_gInf_cFv.s diff --git a/Progress.md b/Progress.md index 7459c7ef8e..77aba0bdbb 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 25.604469% | 920876 | 3596544 +.text | 25.741830% | 925808 | 3596512 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 33.447444% | 1344812 | 4020672 +Total | 33.570377% | 1349744 | 4020640 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 33.447444% | 1344812 | 4020672 +main.dol | 33.570377% | 1349744 | 4020640 RELs | 33.387651% | 3839688 | 11500324 -Total | 33.403140% | 5184500 | 15520996 +Total | 33.434985% | 5189432 | 15520964 ## RELs diff --git a/asm/d/d_ky_thunder/create__10dThunder_cFv.s b/asm/d/d_ky_thunder/create__10dThunder_cFv.s deleted file mode 100644 index 3bab881c04..0000000000 --- a/asm/d/d_ky_thunder/create__10dThunder_cFv.s +++ /dev/null @@ -1,330 +0,0 @@ -lbl_801AE458: -/* 801AE458 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 801AE45C 7C 08 02 A6 */ mflr r0 -/* 801AE460 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 801AE464 DB E1 00 90 */ stfd f31, 0x90(r1) -/* 801AE468 F3 E1 00 98 */ psq_st f31, 152(r1), 0, 0 /* qr0 */ -/* 801AE46C DB C1 00 80 */ stfd f30, 0x80(r1) -/* 801AE470 F3 C1 00 88 */ psq_st f30, 136(r1), 0, 0 /* qr0 */ -/* 801AE474 DB A1 00 70 */ stfd f29, 0x70(r1) -/* 801AE478 F3 A1 00 78 */ psq_st f29, 120(r1), 0, 0 /* qr0 */ -/* 801AE47C DB 81 00 60 */ stfd f28, 0x60(r1) -/* 801AE480 F3 81 00 68 */ psq_st f28, 104(r1), 0, 0 /* qr0 */ -/* 801AE484 DB 61 00 50 */ stfd f27, 0x50(r1) -/* 801AE488 F3 61 00 58 */ psq_st f27, 88(r1), 0, 0 /* qr0 */ -/* 801AE48C 39 61 00 50 */ addi r11, r1, 0x50 -/* 801AE490 48 1B 3D 45 */ bl _savegpr_27 -/* 801AE494 7C 7D 1B 78 */ mr r29, r3 -/* 801AE498 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801AE49C 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801AE4A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801AE4A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801AE4A8 83 C3 5D 74 */ lwz r30, 0x5d74(r3) -/* 801AE4AC 7F BC EB 79 */ or. r28, r29, r29 -/* 801AE4B0 41 82 00 4C */ beq lbl_801AE4FC -/* 801AE4B4 3B 7C 01 08 */ addi r27, r28, 0x108 -/* 801AE4B8 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 801AE4BC 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 801AE4C0 90 1C 01 08 */ stw r0, 0x108(r28) -/* 801AE4C4 7F 63 DB 78 */ mr r3, r27 -/* 801AE4C8 38 80 00 00 */ li r4, 0 -/* 801AE4CC 48 17 9F 31 */ bl init__12J3DFrameCtrlFs -/* 801AE4D0 38 00 00 00 */ li r0, 0 -/* 801AE4D4 90 1B 00 14 */ stw r0, 0x14(r27) -/* 801AE4D8 3B 7C 01 20 */ addi r27, r28, 0x120 -/* 801AE4DC 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 801AE4E0 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 801AE4E4 90 1C 01 20 */ stw r0, 0x120(r28) -/* 801AE4E8 7F 63 DB 78 */ mr r3, r27 -/* 801AE4EC 38 80 00 00 */ li r4, 0 -/* 801AE4F0 48 17 9F 0D */ bl init__12J3DFrameCtrlFs -/* 801AE4F4 38 00 00 00 */ li r0, 0 -/* 801AE4F8 90 1B 00 14 */ stw r0, 0x14(r27) -lbl_801AE4FC: -/* 801AE4FC C0 22 A4 7C */ lfs f1, lit_3885(r2) -/* 801AE500 48 0B 94 55 */ bl cM_rndF__Ff -/* 801AE504 C0 02 A4 9C */ lfs f0, lit_4079(r2) -/* 801AE508 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801AE50C 40 80 00 30 */ bge lbl_801AE53C -/* 801AE510 3C 60 80 39 */ lis r3, d_d_ky_thunder__stringBase0@ha /* 0x80394F40@ha */ -/* 801AE514 38 63 4F 40 */ addi r3, r3, d_d_ky_thunder__stringBase0@l /* 0x80394F40@l */ -/* 801AE518 38 80 00 1E */ li r4, 0x1e -/* 801AE51C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801AE520 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801AE524 3C A5 00 02 */ addis r5, r5, 2 -/* 801AE528 38 C0 00 80 */ li r6, 0x80 -/* 801AE52C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801AE530 4B E8 DD BD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 801AE534 7C 7B 1B 78 */ mr r27, r3 -/* 801AE538 48 00 00 2C */ b lbl_801AE564 -lbl_801AE53C: -/* 801AE53C 3C 60 80 39 */ lis r3, d_d_ky_thunder__stringBase0@ha /* 0x80394F40@ha */ -/* 801AE540 38 63 4F 40 */ addi r3, r3, d_d_ky_thunder__stringBase0@l /* 0x80394F40@l */ -/* 801AE544 38 80 00 1F */ li r4, 0x1f -/* 801AE548 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801AE54C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801AE550 3C A5 00 02 */ addis r5, r5, 2 -/* 801AE554 38 C0 00 80 */ li r6, 0x80 -/* 801AE558 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801AE55C 4B E8 DD 91 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 801AE560 7C 7B 1B 78 */ mr r27, r3 -lbl_801AE564: -/* 801AE564 7F 63 DB 78 */ mr r3, r27 -/* 801AE568 3C 80 00 08 */ lis r4, 8 -/* 801AE56C 3C A0 01 00 */ lis r5, 0x100 -/* 801AE570 4B E6 66 E5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 801AE574 90 7D 00 FC */ stw r3, 0xfc(r29) -/* 801AE578 80 1D 00 FC */ lwz r0, 0xfc(r29) -/* 801AE57C 28 00 00 00 */ cmplwi r0, 0 -/* 801AE580 40 82 00 0C */ bne lbl_801AE58C -/* 801AE584 38 60 00 05 */ li r3, 5 -/* 801AE588 48 00 03 70 */ b lbl_801AE8F8 -lbl_801AE58C: -/* 801AE58C 3C 60 80 39 */ lis r3, d_d_ky_thunder__stringBase0@ha /* 0x80394F40@ha */ -/* 801AE590 38 63 4F 40 */ addi r3, r3, d_d_ky_thunder__stringBase0@l /* 0x80394F40@l */ -/* 801AE594 38 80 00 2F */ li r4, 0x2f -/* 801AE598 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801AE59C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801AE5A0 3C A5 00 02 */ addis r5, r5, 2 -/* 801AE5A4 38 C0 00 80 */ li r6, 0x80 -/* 801AE5A8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801AE5AC 4B E8 DD 41 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 801AE5B0 7C 65 1B 78 */ mr r5, r3 -/* 801AE5B4 38 7D 01 08 */ addi r3, r29, 0x108 -/* 801AE5B8 38 9B 00 58 */ addi r4, r27, 0x58 -/* 801AE5BC 38 C0 00 01 */ li r6, 1 -/* 801AE5C0 38 E0 00 00 */ li r7, 0 -/* 801AE5C4 C0 22 A4 7C */ lfs f1, lit_3885(r2) -/* 801AE5C8 39 00 00 00 */ li r8, 0 -/* 801AE5CC 39 20 FF FF */ li r9, -1 -/* 801AE5D0 4B E5 F1 3D */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 801AE5D4 2C 03 00 00 */ cmpwi r3, 0 -/* 801AE5D8 40 82 00 0C */ bne lbl_801AE5E4 -/* 801AE5DC 38 60 00 05 */ li r3, 5 -/* 801AE5E0 48 00 03 18 */ b lbl_801AE8F8 -lbl_801AE5E4: -/* 801AE5E4 C0 22 A4 7C */ lfs f1, lit_3885(r2) -/* 801AE5E8 D0 3D 01 64 */ stfs f1, 0x164(r29) -/* 801AE5EC C0 1D 01 64 */ lfs f0, 0x164(r29) -/* 801AE5F0 D0 1D 01 14 */ stfs f0, 0x114(r29) -/* 801AE5F4 88 1F 0E D5 */ lbz r0, 0xed5(r31) -/* 801AE5F8 28 00 00 0A */ cmplwi r0, 0xa -/* 801AE5FC 40 80 00 0C */ bge lbl_801AE608 -/* 801AE600 FF A0 08 90 */ fmr f29, f1 -/* 801AE604 48 00 00 08 */ b lbl_801AE60C -lbl_801AE608: -/* 801AE608 C3 A2 A4 A0 */ lfs f29, lit_4080(r2) -lbl_801AE60C: -/* 801AE60C 38 7E 00 D8 */ addi r3, r30, 0xd8 -/* 801AE610 38 9E 00 E4 */ addi r4, r30, 0xe4 -/* 801AE614 48 0C 25 F1 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 801AE618 B0 7D 01 68 */ sth r3, 0x168(r29) -/* 801AE61C 3C 60 80 43 */ lis r3, g_Counter@ha /* 0x80430CD8@ha */ -/* 801AE620 80 03 0C D8 */ lwz r0, g_Counter@l(r3) /* 0x80430CD8@l */ -/* 801AE624 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 801AE628 40 82 00 10 */ bne lbl_801AE638 -/* 801AE62C A8 7D 01 68 */ lha r3, 0x168(r29) -/* 801AE630 38 03 7F FF */ addi r0, r3, 0x7fff -/* 801AE634 B0 1D 01 68 */ sth r0, 0x168(r29) -lbl_801AE638: -/* 801AE638 C3 82 A4 A4 */ lfs f28, lit_4081(r2) -/* 801AE63C C3 62 A4 A8 */ lfs f27, lit_4082(r2) -/* 801AE640 FF E0 E0 90 */ fmr f31, f28 -/* 801AE644 FF C0 D8 90 */ fmr f30, f27 -/* 801AE648 C0 02 A4 AC */ lfs f0, lit_4083(r2) -/* 801AE64C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 801AE650 C0 02 A4 B0 */ lfs f0, lit_4084(r2) -/* 801AE654 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 801AE658 C0 02 A4 70 */ lfs f0, lit_3882(r2) -/* 801AE65C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801AE660 C0 02 A4 B4 */ lfs f0, lit_4085(r2) -/* 801AE664 D0 1D 01 5C */ stfs f0, 0x15c(r29) -/* 801AE668 88 1F 0E D5 */ lbz r0, 0xed5(r31) -/* 801AE66C 28 00 00 0A */ cmplwi r0, 0xa -/* 801AE670 41 80 00 1C */ blt lbl_801AE68C -/* 801AE674 FF E0 D8 90 */ fmr f31, f27 -/* 801AE678 C3 C2 A4 B8 */ lfs f30, lit_4086(r2) -/* 801AE67C C0 02 A4 BC */ lfs f0, lit_4087(r2) -/* 801AE680 D0 1D 01 5C */ stfs f0, 0x15c(r29) -/* 801AE684 C0 02 A4 C0 */ lfs f0, lit_4088(r2) -/* 801AE688 D0 01 00 18 */ stfs f0, 0x18(r1) -lbl_801AE68C: -/* 801AE68C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801AE690 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801AE694 3B 63 4E 00 */ addi r27, r3, 0x4e00 -/* 801AE698 7F 63 DB 78 */ mr r3, r27 -/* 801AE69C 3C 80 80 39 */ lis r4, d_d_ky_thunder__stringBase0@ha /* 0x80394F40@ha */ -/* 801AE6A0 38 84 4F 40 */ addi r4, r4, d_d_ky_thunder__stringBase0@l /* 0x80394F40@l */ -/* 801AE6A4 38 84 00 07 */ addi r4, r4, 7 -/* 801AE6A8 48 1B A2 ED */ bl strcmp -/* 801AE6AC 2C 03 00 00 */ cmpwi r3, 0 -/* 801AE6B0 40 82 00 20 */ bne lbl_801AE6D0 -/* 801AE6B4 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 801AE6B8 2C 00 00 04 */ cmpwi r0, 4 -/* 801AE6BC 40 82 00 14 */ bne lbl_801AE6D0 -/* 801AE6C0 C3 82 A4 80 */ lfs f28, lit_3923(r2) -/* 801AE6C4 C3 62 A4 A0 */ lfs f27, lit_4080(r2) -/* 801AE6C8 C3 E2 A4 C4 */ lfs f31, lit_4089(r2) -/* 801AE6CC C3 C2 A4 C8 */ lfs f30, lit_4090(r2) -lbl_801AE6D0: -/* 801AE6D0 C0 3D 01 5C */ lfs f1, 0x15c(r29) -/* 801AE6D4 48 0B 92 B9 */ bl cM_rndFX__Ff -/* 801AE6D8 EC 1D 00 72 */ fmuls f0, f29, f1 -/* 801AE6DC D0 1D 01 5C */ stfs f0, 0x15c(r29) -/* 801AE6E0 EC 3B E0 28 */ fsubs f1, f27, f28 -/* 801AE6E4 48 0B 92 71 */ bl cM_rndF__Ff -/* 801AE6E8 EC 1C 08 2A */ fadds f0, f28, f1 -/* 801AE6EC EC 1D 00 32 */ fmuls f0, f29, f0 -/* 801AE6F0 D0 1D 01 38 */ stfs f0, 0x138(r29) -/* 801AE6F4 C0 22 A4 7C */ lfs f1, lit_3885(r2) -/* 801AE6F8 48 0B 92 95 */ bl cM_rndFX__Ff -/* 801AE6FC C8 02 A4 D0 */ lfd f0, lit_4091(r2) -/* 801AE700 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801AE704 4C 41 13 82 */ cror 2, 1, 2 -/* 801AE708 40 82 00 14 */ bne lbl_801AE71C -/* 801AE70C C0 3D 01 38 */ lfs f1, 0x138(r29) -/* 801AE710 C0 02 A4 D8 */ lfs f0, lit_4092(r2) -/* 801AE714 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801AE718 D0 1D 01 38 */ stfs f0, 0x138(r29) -lbl_801AE71C: -/* 801AE71C EC 3E F8 28 */ fsubs f1, f30, f31 -/* 801AE720 48 0B 92 35 */ bl cM_rndF__Ff -/* 801AE724 EC 1F 08 2A */ fadds f0, f31, f1 -/* 801AE728 EC 1D 00 32 */ fmuls f0, f29, f0 -/* 801AE72C D0 1D 01 3C */ stfs f0, 0x13c(r29) -/* 801AE730 C0 02 A4 7C */ lfs f0, lit_3885(r2) -/* 801AE734 D0 1D 01 40 */ stfs f0, 0x140(r29) -/* 801AE738 38 7E 00 D8 */ addi r3, r30, 0xd8 -/* 801AE73C 38 9E 00 E4 */ addi r4, r30, 0xe4 -/* 801AE740 38 A1 00 20 */ addi r5, r1, 0x20 -/* 801AE744 4B EA D0 1D */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz -/* 801AE748 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 801AE74C EC 61 00 72 */ fmuls f3, f1, f1 -/* 801AE750 C0 41 00 28 */ lfs f2, 0x28(r1) -/* 801AE754 EC 02 00 B2 */ fmuls f0, f2, f2 -/* 801AE758 EF A3 00 2A */ fadds f29, f3, f0 -/* 801AE75C C0 02 A4 70 */ lfs f0, lit_3882(r2) -/* 801AE760 FC 1D 00 40 */ fcmpo cr0, f29, f0 -/* 801AE764 40 81 00 0C */ ble lbl_801AE770 -/* 801AE768 FC 00 E8 34 */ frsqrte f0, f29 -/* 801AE76C EF A0 07 72 */ fmuls f29, f0, f29 -lbl_801AE770: -/* 801AE770 48 0B 8F 05 */ bl cM_atan2s__Fff -/* 801AE774 7C 7C 1B 78 */ mr r28, r3 -/* 801AE778 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 801AE77C FC 40 E8 90 */ fmr f2, f29 -/* 801AE780 48 0B 8E F5 */ bl cM_atan2s__Fff -/* 801AE784 7C 7F 1B 78 */ mr r31, r3 -/* 801AE788 C0 22 A4 7C */ lfs f1, lit_3885(r2) -/* 801AE78C 48 0B 92 01 */ bl cM_rndFX__Ff -/* 801AE790 C0 02 A4 70 */ lfs f0, lit_3882(r2) -/* 801AE794 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801AE798 4C 41 13 82 */ cror 2, 1, 2 -/* 801AE79C 40 82 00 10 */ bne lbl_801AE7AC -/* 801AE7A0 38 1C 40 00 */ addi r0, r28, 0x4000 -/* 801AE7A4 7C 05 07 34 */ extsh r5, r0 -/* 801AE7A8 48 00 00 08 */ b lbl_801AE7B0 -lbl_801AE7AC: -/* 801AE7AC 38 BC C0 00 */ addi r5, r28, -16384 -lbl_801AE7B0: -/* 801AE7B0 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 801AE7B4 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 801AE7B8 38 83 00 04 */ addi r4, r3, 4 -/* 801AE7BC 57 E0 04 38 */ rlwinm r0, r31, 0, 0x10, 0x1c -/* 801AE7C0 7C 24 04 2E */ lfsx f1, r4, r0 -/* 801AE7C4 54 A0 04 38 */ rlwinm r0, r5, 0, 0x10, 0x1c -/* 801AE7C8 7C 03 04 2E */ lfsx f0, r3, r0 -/* 801AE7CC EC 01 00 32 */ fmuls f0, f1, f0 -/* 801AE7D0 D0 01 00 08 */ stfs f0, 8(r1) -/* 801AE7D4 7C 04 04 2E */ lfsx f0, r4, r0 -/* 801AE7D8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801AE7DC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 801AE7E0 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 801AE7E4 48 0B 91 71 */ bl cM_rndF__Ff -/* 801AE7E8 FF E0 08 90 */ fmr f31, f1 -/* 801AE7EC C0 5E 00 D8 */ lfs f2, 0xd8(r30) -/* 801AE7F0 C0 22 A4 DC */ lfs f1, lit_4093(r2) -/* 801AE7F4 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 801AE7F8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801AE7FC EC 22 00 2A */ fadds f1, f2, f0 -/* 801AE800 C0 01 00 08 */ lfs f0, 8(r1) -/* 801AE804 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 801AE808 EC 01 00 2A */ fadds f0, f1, f0 -/* 801AE80C D0 1D 01 44 */ stfs f0, 0x144(r29) -/* 801AE810 C0 21 00 18 */ lfs f1, 0x18(r1) -/* 801AE814 48 0B 91 41 */ bl cM_rndF__Ff -/* 801AE818 C0 42 A4 B4 */ lfs f2, lit_4085(r2) -/* 801AE81C C0 1E 00 DC */ lfs f0, 0xdc(r30) -/* 801AE820 EC 02 00 2A */ fadds f0, f2, f0 -/* 801AE824 EC 00 08 2A */ fadds f0, f0, f1 -/* 801AE828 D0 1D 01 48 */ stfs f0, 0x148(r29) -/* 801AE82C C0 5E 00 E0 */ lfs f2, 0xe0(r30) -/* 801AE830 C0 22 A4 DC */ lfs f1, lit_4093(r2) -/* 801AE834 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 801AE838 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801AE83C EC 22 00 2A */ fadds f1, f2, f0 -/* 801AE840 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801AE844 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 801AE848 EC 01 00 2A */ fadds f0, f1, f0 -/* 801AE84C D0 1D 01 4C */ stfs f0, 0x14c(r29) -/* 801AE850 7F 63 DB 78 */ mr r3, r27 -/* 801AE854 3C 80 80 39 */ lis r4, d_d_ky_thunder__stringBase0@ha /* 0x80394F40@ha */ -/* 801AE858 38 84 4F 40 */ addi r4, r4, d_d_ky_thunder__stringBase0@l /* 0x80394F40@l */ -/* 801AE85C 38 84 00 07 */ addi r4, r4, 7 -/* 801AE860 48 1B A1 35 */ bl strcmp -/* 801AE864 2C 03 00 00 */ cmpwi r3, 0 -/* 801AE868 40 82 00 40 */ bne lbl_801AE8A8 -/* 801AE86C 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 801AE870 2C 00 00 04 */ cmpwi r0, 4 -/* 801AE874 40 82 00 34 */ bne lbl_801AE8A8 -/* 801AE878 C0 22 A4 E4 */ lfs f1, lit_4095(r2) -/* 801AE87C 48 0B 91 11 */ bl cM_rndFX__Ff -/* 801AE880 C0 02 A4 E0 */ lfs f0, lit_4094(r2) -/* 801AE884 EC 00 08 2A */ fadds f0, f0, f1 -/* 801AE888 D0 1D 01 44 */ stfs f0, 0x144(r29) -/* 801AE88C C0 02 A4 E8 */ lfs f0, lit_4096(r2) -/* 801AE890 D0 1D 01 48 */ stfs f0, 0x148(r29) -/* 801AE894 C0 22 A4 F0 */ lfs f1, lit_4098(r2) -/* 801AE898 48 0B 90 F5 */ bl cM_rndFX__Ff -/* 801AE89C C0 02 A4 EC */ lfs f0, lit_4097(r2) -/* 801AE8A0 EC 00 08 2A */ fadds f0, f0, f1 -/* 801AE8A4 D0 1D 01 4C */ stfs f0, 0x14c(r29) -lbl_801AE8A8: -/* 801AE8A8 C0 22 A4 7C */ lfs f1, lit_3885(r2) -/* 801AE8AC 48 0B 90 A9 */ bl cM_rndF__Ff -/* 801AE8B0 C0 02 A4 F4 */ lfs f0, lit_4099(r2) -/* 801AE8B4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801AE8B8 40 80 00 3C */ bge lbl_801AE8F4 -/* 801AE8BC C0 1D 01 44 */ lfs f0, 0x144(r29) -/* 801AE8C0 FC 00 00 50 */ fneg f0, f0 -/* 801AE8C4 D0 1D 01 50 */ stfs f0, 0x150(r29) -/* 801AE8C8 C0 1D 01 48 */ lfs f0, 0x148(r29) -/* 801AE8CC FC 00 00 50 */ fneg f0, f0 -/* 801AE8D0 D0 1D 01 54 */ stfs f0, 0x154(r29) -/* 801AE8D4 C0 1D 01 4C */ lfs f0, 0x14c(r29) -/* 801AE8D8 FC 00 00 50 */ fneg f0, f0 -/* 801AE8DC D0 1D 01 58 */ stfs f0, 0x158(r29) -/* 801AE8E0 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */ -/* 801AE8E4 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ -/* 801AE8E8 38 9D 01 50 */ addi r4, r29, 0x150 -/* 801AE8EC 38 A0 00 00 */ li r5, 0 -/* 801AE8F0 48 11 95 79 */ bl startFarThunderSe__10Z2EnvSeMgrFP3VecSc -lbl_801AE8F4: -/* 801AE8F4 38 60 00 04 */ li r3, 4 -lbl_801AE8F8: -/* 801AE8F8 E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* qr0 */ -/* 801AE8FC CB E1 00 90 */ lfd f31, 0x90(r1) -/* 801AE900 E3 C1 00 88 */ psq_l f30, 136(r1), 0, 0 /* qr0 */ -/* 801AE904 CB C1 00 80 */ lfd f30, 0x80(r1) -/* 801AE908 E3 A1 00 78 */ psq_l f29, 120(r1), 0, 0 /* qr0 */ -/* 801AE90C CB A1 00 70 */ lfd f29, 0x70(r1) -/* 801AE910 E3 81 00 68 */ psq_l f28, 104(r1), 0, 0 /* qr0 */ -/* 801AE914 CB 81 00 60 */ lfd f28, 0x60(r1) -/* 801AE918 E3 61 00 58 */ psq_l f27, 88(r1), 0, 0 /* qr0 */ -/* 801AE91C CB 61 00 50 */ lfd f27, 0x50(r1) -/* 801AE920 39 61 00 50 */ addi r11, r1, 0x50 -/* 801AE924 48 1B 38 FD */ bl _restgpr_27 -/* 801AE928 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 801AE92C 7C 08 03 A6 */ mtlr r0 -/* 801AE930 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801AE934 4E 80 00 20 */ blr diff --git a/asm/d/d_ky_thunder/dThunder_Delete__FP10dThunder_c.s b/asm/d/d_ky_thunder/dThunder_Delete__FP10dThunder_c.s deleted file mode 100644 index 331f359e8f..0000000000 --- a/asm/d/d_ky_thunder/dThunder_Delete__FP10dThunder_c.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_801AE37C: -/* 801AE37C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801AE380 7C 08 02 A6 */ mflr r0 -/* 801AE384 90 01 00 14 */ stw r0, 0x14(r1) -/* 801AE388 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801AE38C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 801AE390 41 82 00 54 */ beq lbl_801AE3E4 -/* 801AE394 80 7F 00 F8 */ lwz r3, 0xf8(r31) -/* 801AE398 4B E6 0D F5 */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap -/* 801AE39C 34 1F 00 FC */ addic. r0, r31, 0xfc -/* 801AE3A0 41 82 00 44 */ beq lbl_801AE3E4 -/* 801AE3A4 34 1F 01 20 */ addic. r0, r31, 0x120 -/* 801AE3A8 41 82 00 1C */ beq lbl_801AE3C4 -/* 801AE3AC 28 00 00 00 */ cmplwi r0, 0 -/* 801AE3B0 41 82 00 14 */ beq lbl_801AE3C4 -/* 801AE3B4 41 82 00 10 */ beq lbl_801AE3C4 -/* 801AE3B8 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 801AE3BC 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 801AE3C0 90 1F 01 20 */ stw r0, 0x120(r31) -lbl_801AE3C4: -/* 801AE3C4 34 1F 01 08 */ addic. r0, r31, 0x108 -/* 801AE3C8 41 82 00 1C */ beq lbl_801AE3E4 -/* 801AE3CC 28 00 00 00 */ cmplwi r0, 0 -/* 801AE3D0 41 82 00 14 */ beq lbl_801AE3E4 -/* 801AE3D4 41 82 00 10 */ beq lbl_801AE3E4 -/* 801AE3D8 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 801AE3DC 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 801AE3E0 90 1F 01 08 */ stw r0, 0x108(r31) -lbl_801AE3E4: -/* 801AE3E4 38 60 00 01 */ li r3, 1 -/* 801AE3E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801AE3EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801AE3F0 7C 08 03 A6 */ mtlr r0 -/* 801AE3F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AE3F8 4E 80 00 20 */ blr diff --git a/asm/d/d_ky_thunder/dThunder_Draw__FP10dThunder_c.s b/asm/d/d_ky_thunder/dThunder_Draw__FP10dThunder_c.s deleted file mode 100644 index a807b536bb..0000000000 --- a/asm/d/d_ky_thunder/dThunder_Draw__FP10dThunder_c.s +++ /dev/null @@ -1,106 +0,0 @@ -lbl_801AE000: -/* 801AE000 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 801AE004 7C 08 02 A6 */ mflr r0 -/* 801AE008 90 01 00 54 */ stw r0, 0x54(r1) -/* 801AE00C 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 801AE010 7C 7F 1B 78 */ mr r31, r3 -/* 801AE014 88 0D 8A F0 */ lbz r0, struct_80451070+0x0(r13) -/* 801AE018 7C 00 07 75 */ extsb. r0, r0 -/* 801AE01C 40 82 00 3C */ bne lbl_801AE058 -/* 801AE020 C0 02 A4 70 */ lfs f0, lit_3882(r2) -/* 801AE024 3C 60 80 43 */ lis r3, data_8042E808@ha /* 0x8042E808@ha */ -/* 801AE028 D4 03 E8 08 */ stfsu f0, data_8042E808@l(r3) /* 0x8042E808@l */ -/* 801AE02C C0 02 A4 74 */ lfs f0, lit_3883(r2) -/* 801AE030 D0 03 00 04 */ stfs f0, 4(r3) -/* 801AE034 C0 02 A4 78 */ lfs f0, lit_3884(r2) -/* 801AE038 D0 03 00 08 */ stfs f0, 8(r3) -/* 801AE03C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */ -/* 801AE040 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */ -/* 801AE044 3C A0 80 43 */ lis r5, lit_3816@ha /* 0x8042E7F0@ha */ -/* 801AE048 38 A5 E7 F0 */ addi r5, r5, lit_3816@l /* 0x8042E7F0@l */ -/* 801AE04C 48 1B 3B D9 */ bl __register_global_object -/* 801AE050 38 00 00 01 */ li r0, 1 -/* 801AE054 98 0D 8A F0 */ stb r0, struct_80451070+0x0(r13) -lbl_801AE058: -/* 801AE058 88 0D 8A F1 */ lbz r0, struct_80451070+0x1(r13) -/* 801AE05C 7C 00 07 75 */ extsb. r0, r0 -/* 801AE060 40 82 00 34 */ bne lbl_801AE094 -/* 801AE064 C0 02 A4 7C */ lfs f0, lit_3885(r2) -/* 801AE068 3C 60 80 43 */ lis r3, data_8042E814@ha /* 0x8042E814@ha */ -/* 801AE06C D4 03 E8 14 */ stfsu f0, data_8042E814@l(r3) /* 0x8042E814@l */ -/* 801AE070 D0 03 00 04 */ stfs f0, 4(r3) -/* 801AE074 D0 03 00 08 */ stfs f0, 8(r3) -/* 801AE078 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */ -/* 801AE07C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */ -/* 801AE080 3C A0 80 43 */ lis r5, lit_3818@ha /* 0x8042E7FC@ha */ -/* 801AE084 38 A5 E7 FC */ addi r5, r5, lit_3818@l /* 0x8042E7FC@l */ -/* 801AE088 48 1B 3B 9D */ bl __register_global_object -/* 801AE08C 38 00 00 01 */ li r0, 1 -/* 801AE090 98 0D 8A F1 */ stb r0, struct_80451070+0x1(r13) -lbl_801AE094: -/* 801AE094 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 801AE098 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 801AE09C C0 3F 01 44 */ lfs f1, 0x144(r31) -/* 801AE0A0 C0 5F 01 48 */ lfs f2, 0x148(r31) -/* 801AE0A4 C0 7F 01 4C */ lfs f3, 0x14c(r31) -/* 801AE0A8 48 19 88 41 */ bl PSMTXTrans -/* 801AE0AC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 801AE0B0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 801AE0B4 A8 9F 01 68 */ lha r4, 0x168(r31) -/* 801AE0B8 4B E5 E3 7D */ bl mDoMtx_YrotM__FPA4_fs -/* 801AE0BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 801AE0C0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 801AE0C4 C0 1F 01 5C */ lfs f0, 0x15c(r31) -/* 801AE0C8 FC 00 00 1E */ fctiwz f0, f0 -/* 801AE0CC D8 01 00 38 */ stfd f0, 0x38(r1) -/* 801AE0D0 80 81 00 3C */ lwz r4, 0x3c(r1) -/* 801AE0D4 4B E5 E3 F9 */ bl mDoMtx_ZrotM__FPA4_fs -/* 801AE0D8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 801AE0DC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 801AE0E0 C0 1F 01 5C */ lfs f0, 0x15c(r31) -/* 801AE0E4 FC 00 00 1E */ fctiwz f0, f0 -/* 801AE0E8 D8 01 00 40 */ stfd f0, 0x40(r1) -/* 801AE0EC 80 81 00 44 */ lwz r4, 0x44(r1) -/* 801AE0F0 4B E5 E2 AD */ bl mDoMtx_XrotM__FPA4_fs -/* 801AE0F4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 801AE0F8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 801AE0FC 38 81 00 08 */ addi r4, r1, 8 -/* 801AE100 48 19 83 B1 */ bl PSMTXCopy -/* 801AE104 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 801AE108 C0 1F 01 38 */ lfs f0, 0x138(r31) -/* 801AE10C D0 03 00 18 */ stfs f0, 0x18(r3) -/* 801AE110 C0 1F 01 3C */ lfs f0, 0x13c(r31) -/* 801AE114 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 801AE118 C0 1F 01 40 */ lfs f0, 0x140(r31) -/* 801AE11C D0 03 00 20 */ stfs f0, 0x20(r3) -/* 801AE120 38 61 00 08 */ addi r3, r1, 8 -/* 801AE124 80 9F 00 FC */ lwz r4, 0xfc(r31) -/* 801AE128 38 84 00 24 */ addi r4, r4, 0x24 -/* 801AE12C 48 19 83 85 */ bl PSMTXCopy -/* 801AE130 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 801AE134 80 83 00 04 */ lwz r4, 4(r3) -/* 801AE138 C0 3F 01 18 */ lfs f1, 0x118(r31) -/* 801AE13C 38 7F 01 08 */ addi r3, r31, 0x108 -/* 801AE140 38 84 00 58 */ addi r4, r4, 0x58 -/* 801AE144 4B E5 F6 65 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 801AE148 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801AE14C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801AE150 80 04 5F 80 */ lwz r0, 0x5f80(r4) -/* 801AE154 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 801AE158 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 801AE15C 90 03 00 48 */ stw r0, 0x48(r3) -/* 801AE160 80 04 5F 84 */ lwz r0, 0x5f84(r4) -/* 801AE164 90 03 00 4C */ stw r0, 0x4c(r3) -/* 801AE168 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 801AE16C 4B E5 FB 59 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 801AE170 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 801AE174 80 63 00 04 */ lwz r3, 4(r3) -/* 801AE178 38 63 00 58 */ addi r3, r3, 0x58 -/* 801AE17C 80 9F 01 1C */ lwz r4, 0x11c(r31) -/* 801AE180 48 18 17 01 */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey -/* 801AE184 38 60 00 01 */ li r3, 1 -/* 801AE188 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 801AE18C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 801AE190 7C 08 03 A6 */ mtlr r0 -/* 801AE194 38 21 00 50 */ addi r1, r1, 0x50 -/* 801AE198 4E 80 00 20 */ blr diff --git a/asm/d/d_ky_thunder/dThunder_Execute__FP10dThunder_c.s b/asm/d/d_ky_thunder/dThunder_Execute__FP10dThunder_c.s deleted file mode 100644 index 00fd328443..0000000000 --- a/asm/d/d_ky_thunder/dThunder_Execute__FP10dThunder_c.s +++ /dev/null @@ -1,126 +0,0 @@ -lbl_801AE19C: -/* 801AE19C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801AE1A0 7C 08 02 A6 */ mflr r0 -/* 801AE1A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801AE1A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801AE1AC 93 C1 00 08 */ stw r30, 8(r1) -/* 801AE1B0 7C 7F 1B 78 */ mr r31, r3 -/* 801AE1B4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801AE1B8 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801AE1BC 88 1E 0E D5 */ lbz r0, 0xed5(r30) -/* 801AE1C0 28 00 00 0A */ cmplwi r0, 0xa -/* 801AE1C4 40 80 00 1C */ bge lbl_801AE1E0 -/* 801AE1C8 38 7F 01 64 */ addi r3, r31, 0x164 -/* 801AE1CC C0 22 A4 80 */ lfs f1, lit_3923(r2) -/* 801AE1D0 C0 42 A4 84 */ lfs f2, lit_3924(r2) -/* 801AE1D4 C0 62 A4 88 */ lfs f3, lit_3925(r2) -/* 801AE1D8 C0 82 A4 8C */ lfs f4, lit_3926(r2) -/* 801AE1DC 48 0C 17 A1 */ bl cLib_addCalc__FPfffff -lbl_801AE1E0: -/* 801AE1E0 C0 1F 01 64 */ lfs f0, 0x164(r31) -/* 801AE1E4 D0 1F 01 14 */ stfs f0, 0x114(r31) -/* 801AE1E8 38 7F 01 08 */ addi r3, r31, 0x108 -/* 801AE1EC 4B E5 F2 3D */ bl play__14mDoExt_baseAnmFv -/* 801AE1F0 2C 03 00 00 */ cmpwi r3, 0 -/* 801AE1F4 41 82 00 20 */ beq lbl_801AE214 -/* 801AE1F8 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */ -/* 801AE1FC 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ -/* 801AE200 38 9F 01 44 */ addi r4, r31, 0x144 -/* 801AE204 38 A0 00 00 */ li r5, 0 -/* 801AE208 48 11 9C 61 */ bl startFarThunderSe__10Z2EnvSeMgrFP3VecSc -/* 801AE20C 7F E3 FB 78 */ mr r3, r31 -/* 801AE210 4B E7 15 39 */ bl fopKyM_Delete__FPv -lbl_801AE214: -/* 801AE214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801AE218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801AE21C 80 63 61 B0 */ lwz r3, 0x61b0(r3) -/* 801AE220 28 03 00 00 */ cmplwi r3, 0 -/* 801AE224 41 82 00 30 */ beq lbl_801AE254 -/* 801AE228 C0 23 00 D0 */ lfs f1, 0xd0(r3) -/* 801AE22C C0 02 A4 90 */ lfs f0, lit_3927(r2) -/* 801AE230 EC 61 00 24 */ fdivs f3, f1, f0 -/* 801AE234 C0 02 A4 7C */ lfs f0, lit_3885(r2) -/* 801AE238 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 801AE23C 4C 41 13 82 */ cror 2, 1, 2 -/* 801AE240 40 82 00 08 */ bne lbl_801AE248 -/* 801AE244 FC 60 00 90 */ fmr f3, f0 -lbl_801AE248: -/* 801AE248 EC 03 00 F2 */ fmuls f0, f3, f3 -/* 801AE24C EC 63 00 32 */ fmuls f3, f3, f0 -/* 801AE250 48 00 00 08 */ b lbl_801AE258 -lbl_801AE254: -/* 801AE254 C0 62 A4 7C */ lfs f3, lit_3885(r2) -lbl_801AE258: -/* 801AE258 C0 1F 01 64 */ lfs f0, 0x164(r31) -/* 801AE25C EC 63 00 32 */ fmuls f3, f3, f0 -/* 801AE260 88 1E 0E D5 */ lbz r0, 0xed5(r30) -/* 801AE264 28 00 00 0A */ cmplwi r0, 0xa -/* 801AE268 40 80 00 78 */ bge lbl_801AE2E0 -/* 801AE26C A8 1F 01 6A */ lha r0, 0x16a(r31) -/* 801AE270 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 801AE274 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 801AE278 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 801AE27C 7C 83 04 2E */ lfsx f4, r3, r0 -/* 801AE280 C0 3F 01 38 */ lfs f1, 0x138(r31) -/* 801AE284 C0 42 A4 94 */ lfs f2, lit_3928(r2) -/* 801AE288 EC 03 00 72 */ fmuls f0, f3, f1 -/* 801AE28C EC 02 00 32 */ fmuls f0, f2, f0 -/* 801AE290 EC 00 01 32 */ fmuls f0, f0, f4 -/* 801AE294 EC 01 00 2A */ fadds f0, f1, f0 -/* 801AE298 D0 1F 01 38 */ stfs f0, 0x138(r31) -/* 801AE29C A8 1F 01 6C */ lha r0, 0x16c(r31) -/* 801AE2A0 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 801AE2A4 7C 63 02 14 */ add r3, r3, r0 -/* 801AE2A8 C0 83 00 04 */ lfs f4, 4(r3) -/* 801AE2AC C0 3F 01 3C */ lfs f1, 0x13c(r31) -/* 801AE2B0 EC 03 00 72 */ fmuls f0, f3, f1 -/* 801AE2B4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801AE2B8 EC 00 01 32 */ fmuls f0, f0, f4 -/* 801AE2BC EC 01 00 2A */ fadds f0, f1, f0 -/* 801AE2C0 D0 1F 01 3C */ stfs f0, 0x13c(r31) -/* 801AE2C4 A8 7F 01 6A */ lha r3, 0x16a(r31) -/* 801AE2C8 38 03 9E 58 */ addi r0, r3, -25000 -/* 801AE2CC B0 1F 01 6A */ sth r0, 0x16a(r31) -/* 801AE2D0 A8 7F 01 6C */ lha r3, 0x16c(r31) -/* 801AE2D4 38 03 70 E4 */ addi r0, r3, 0x70e4 -/* 801AE2D8 B0 1F 01 6C */ sth r0, 0x16c(r31) -/* 801AE2DC 48 00 00 7C */ b lbl_801AE358 -lbl_801AE2E0: -/* 801AE2E0 A8 1F 01 6A */ lha r0, 0x16a(r31) -/* 801AE2E4 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 801AE2E8 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 801AE2EC 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 801AE2F0 7C 83 04 2E */ lfsx f4, r3, r0 -/* 801AE2F4 C0 3F 01 38 */ lfs f1, 0x138(r31) -/* 801AE2F8 C0 42 A4 98 */ lfs f2, lit_3929(r2) -/* 801AE2FC EC 03 00 72 */ fmuls f0, f3, f1 -/* 801AE300 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801AE304 EC 00 01 32 */ fmuls f0, f0, f4 -/* 801AE308 EC 01 00 2A */ fadds f0, f1, f0 -/* 801AE30C D0 1F 01 38 */ stfs f0, 0x138(r31) -/* 801AE310 A8 1F 01 6C */ lha r0, 0x16c(r31) -/* 801AE314 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 801AE318 7C 63 02 14 */ add r3, r3, r0 -/* 801AE31C C0 83 00 04 */ lfs f4, 4(r3) -/* 801AE320 C0 3F 01 3C */ lfs f1, 0x13c(r31) -/* 801AE324 EC 03 00 72 */ fmuls f0, f3, f1 -/* 801AE328 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801AE32C EC 00 01 32 */ fmuls f0, f0, f4 -/* 801AE330 EC 01 00 2A */ fadds f0, f1, f0 -/* 801AE334 D0 1F 01 3C */ stfs f0, 0x13c(r31) -/* 801AE338 A8 7F 01 6A */ lha r3, 0x16a(r31) -/* 801AE33C 3C 63 FF FF */ addis r3, r3, 0xffff -/* 801AE340 38 03 77 48 */ addi r0, r3, 0x7748 -/* 801AE344 B0 1F 01 6A */ sth r0, 0x16a(r31) -/* 801AE348 A8 7F 01 6C */ lha r3, 0x16c(r31) -/* 801AE34C 3C 63 00 01 */ addis r3, r3, 1 -/* 801AE350 38 03 97 F4 */ addi r0, r3, -26636 -/* 801AE354 B0 1F 01 6C */ sth r0, 0x16c(r31) -lbl_801AE358: -/* 801AE358 38 60 00 01 */ li r3, 1 -/* 801AE35C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801AE360 83 C1 00 08 */ lwz r30, 8(r1) -/* 801AE364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801AE368 7C 08 03 A6 */ mtlr r0 -/* 801AE36C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AE370 4E 80 00 20 */ blr diff --git a/asm/d/d_scope/__ct__8dScope_cFUc.s b/asm/d/d_scope/__ct__8dScope_cFUc.s deleted file mode 100644 index 789216628a..0000000000 --- a/asm/d/d_scope/__ct__8dScope_cFUc.s +++ /dev/null @@ -1,186 +0,0 @@ -lbl_80193690: -/* 80193690 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80193694 7C 08 02 A6 */ mflr r0 -/* 80193698 90 01 00 54 */ stw r0, 0x54(r1) -/* 8019369C 39 61 00 50 */ addi r11, r1, 0x50 -/* 801936A0 48 1C EB 3D */ bl _savegpr_29 -/* 801936A4 7C 7D 1B 78 */ mr r29, r3 -/* 801936A8 7C 9E 23 78 */ mr r30, r4 -/* 801936AC 3C 60 80 3A */ lis r3, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801936B0 38 03 6F 88 */ addi r0, r3, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801936B4 90 1D 00 00 */ stw r0, 0(r29) -/* 801936B8 3C 60 80 3C */ lis r3, __vt__11dMeterSub_c@ha /* 0x803BB6D4@ha */ -/* 801936BC 38 03 B6 D4 */ addi r0, r3, __vt__11dMeterSub_c@l /* 0x803BB6D4@l */ -/* 801936C0 90 1D 00 00 */ stw r0, 0(r29) -/* 801936C4 3C 60 80 3C */ lis r3, __vt__8dScope_c@ha /* 0x803BB6B4@ha */ -/* 801936C8 38 03 B6 B4 */ addi r0, r3, __vt__8dScope_c@l /* 0x803BB6B4@l */ -/* 801936CC 90 1D 00 00 */ stw r0, 0(r29) -/* 801936D0 38 7D 00 48 */ addi r3, r29, 0x48 -/* 801936D4 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 801936D8 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 801936DC 38 A0 00 00 */ li r5, 0 -/* 801936E0 38 C0 00 04 */ li r6, 4 -/* 801936E4 38 E0 00 02 */ li r7, 2 -/* 801936E8 48 1C E6 79 */ bl __construct_array -/* 801936EC 38 7D 00 50 */ addi r3, r29, 0x50 -/* 801936F0 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 801936F4 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 801936F8 38 A0 00 00 */ li r5, 0 -/* 801936FC 38 C0 00 04 */ li r6, 4 -/* 80193700 38 E0 00 02 */ li r7, 2 -/* 80193704 48 1C E6 5D */ bl __construct_array -/* 80193708 38 00 FF FF */ li r0, -1 -/* 8019370C 90 1D 00 58 */ stw r0, 0x58(r29) -/* 80193710 90 1D 00 5C */ stw r0, 0x5c(r29) -/* 80193714 9B DD 00 8D */ stb r30, 0x8d(r29) -/* 80193718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8019371C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80193720 80 7F 5D 30 */ lwz r3, 0x5d30(r31) -/* 80193724 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 80193728 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 8019372C 3C A0 80 39 */ lis r5, d_d_scope__stringBase0@ha /* 0x803949F0@ha */ -/* 80193730 38 A5 49 F0 */ addi r5, r5, d_d_scope__stringBase0@l /* 0x803949F0@l */ -/* 80193734 81 83 00 00 */ lwz r12, 0(r3) -/* 80193738 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8019373C 7D 89 03 A6 */ mtctr r12 -/* 80193740 4E 80 04 21 */ bctrl -/* 80193744 7C 7E 1B 78 */ mr r30, r3 -/* 80193748 38 80 00 00 */ li r4, 0 -/* 8019374C 90 9D 00 04 */ stw r4, 4(r29) -/* 80193750 90 9D 00 0C */ stw r4, 0xc(r29) -/* 80193754 90 9D 00 08 */ stw r4, 8(r29) -/* 80193758 90 9D 00 10 */ stw r4, 0x10(r29) -/* 8019375C 7C 83 23 78 */ mr r3, r4 -/* 80193760 38 00 00 03 */ li r0, 3 -/* 80193764 7C 09 03 A6 */ mtctr r0 -lbl_80193768: -/* 80193768 38 03 00 14 */ addi r0, r3, 0x14 -/* 8019376C 7C 9D 01 2E */ stwx r4, r29, r0 -/* 80193770 38 63 00 04 */ addi r3, r3, 4 -/* 80193774 42 00 FF F4 */ bdnz lbl_80193768 -/* 80193778 38 E0 00 00 */ li r7, 0 -/* 8019377C 38 60 00 00 */ li r3, 0 -/* 80193780 38 C0 00 00 */ li r6, 0 -lbl_80193784: -/* 80193784 38 80 00 00 */ li r4, 0 -/* 80193788 38 00 00 02 */ li r0, 2 -/* 8019378C 7C 09 03 A6 */ mtctr r0 -lbl_80193790: -/* 80193790 7C BD 22 14 */ add r5, r29, r4 -/* 80193794 38 05 00 20 */ addi r0, r5, 0x20 -/* 80193798 7C C3 01 2E */ stwx r6, r3, r0 -/* 8019379C 38 84 00 04 */ addi r4, r4, 4 -/* 801937A0 42 00 FF F0 */ bdnz lbl_80193790 -/* 801937A4 38 E7 00 01 */ addi r7, r7, 1 -/* 801937A8 2C 07 00 03 */ cmpwi r7, 3 -/* 801937AC 38 63 00 08 */ addi r3, r3, 8 -/* 801937B0 41 80 FF D4 */ blt lbl_80193784 -/* 801937B4 38 60 01 50 */ li r3, 0x150 -/* 801937B8 48 13 B4 95 */ bl __nw__FUl -/* 801937BC 7C 60 1B 79 */ or. r0, r3, r3 -/* 801937C0 41 82 00 10 */ beq lbl_801937D0 -/* 801937C4 7F C4 F3 78 */ mr r4, r30 -/* 801937C8 48 16 8F 41 */ bl __ct__10J2DPictureFPC7ResTIMG -/* 801937CC 7C 60 1B 78 */ mr r0, r3 -lbl_801937D0: -/* 801937D0 90 1D 00 38 */ stw r0, 0x38(r29) -/* 801937D4 38 60 00 00 */ li r3, 0 -/* 801937D8 98 61 00 18 */ stb r3, 0x18(r1) -/* 801937DC 98 61 00 19 */ stb r3, 0x19(r1) -/* 801937E0 98 61 00 1A */ stb r3, 0x1a(r1) -/* 801937E4 38 00 00 FF */ li r0, 0xff -/* 801937E8 98 01 00 1B */ stb r0, 0x1b(r1) -/* 801937EC 80 01 00 18 */ lwz r0, 0x18(r1) -/* 801937F0 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801937F4 98 61 00 20 */ stb r3, 0x20(r1) -/* 801937F8 98 61 00 21 */ stb r3, 0x21(r1) -/* 801937FC 98 61 00 22 */ stb r3, 0x22(r1) -/* 80193800 98 61 00 23 */ stb r3, 0x23(r1) -/* 80193804 80 01 00 20 */ lwz r0, 0x20(r1) -/* 80193808 90 01 00 24 */ stw r0, 0x24(r1) -/* 8019380C 80 7D 00 38 */ lwz r3, 0x38(r29) -/* 80193810 38 81 00 24 */ addi r4, r1, 0x24 -/* 80193814 38 A1 00 1C */ addi r5, r1, 0x1c -/* 80193818 81 83 00 00 */ lwz r12, 0(r3) -/* 8019381C 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 80193820 7D 89 03 A6 */ mtctr r12 -/* 80193824 4E 80 04 21 */ bctrl -/* 80193828 A0 1E 00 02 */ lhz r0, 2(r30) -/* 8019382C C8 22 A0 18 */ lfd f1, lit_3759(r2) -/* 80193830 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80193834 3C 60 43 30 */ lis r3, 0x4330 -/* 80193838 90 61 00 28 */ stw r3, 0x28(r1) -/* 8019383C C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80193840 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80193844 D0 1D 00 78 */ stfs f0, 0x78(r29) -/* 80193848 A0 1E 00 04 */ lhz r0, 4(r30) -/* 8019384C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80193850 90 61 00 30 */ stw r3, 0x30(r1) -/* 80193854 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80193858 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8019385C D0 1D 00 7C */ stfs f0, 0x7c(r29) -/* 80193860 80 7F 5D 30 */ lwz r3, 0x5d30(r31) -/* 80193864 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 80193868 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 8019386C 3C A0 80 39 */ lis r5, d_d_scope__stringBase0@ha /* 0x803949F0@ha */ -/* 80193870 38 A5 49 F0 */ addi r5, r5, d_d_scope__stringBase0@l /* 0x803949F0@l */ -/* 80193874 38 A5 00 0C */ addi r5, r5, 0xc -/* 80193878 81 83 00 00 */ lwz r12, 0(r3) -/* 8019387C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80193880 7D 89 03 A6 */ mtctr r12 -/* 80193884 4E 80 04 21 */ bctrl -/* 80193888 7C 7E 1B 78 */ mr r30, r3 -/* 8019388C 38 60 01 50 */ li r3, 0x150 -/* 80193890 48 13 B3 BD */ bl __nw__FUl -/* 80193894 7C 60 1B 79 */ or. r0, r3, r3 -/* 80193898 41 82 00 10 */ beq lbl_801938A8 -/* 8019389C 7F C4 F3 78 */ mr r4, r30 -/* 801938A0 48 16 8E 69 */ bl __ct__10J2DPictureFPC7ResTIMG -/* 801938A4 7C 60 1B 78 */ mr r0, r3 -lbl_801938A8: -/* 801938A8 90 1D 00 3C */ stw r0, 0x3c(r29) -/* 801938AC 38 60 00 00 */ li r3, 0 -/* 801938B0 98 61 00 08 */ stb r3, 8(r1) -/* 801938B4 98 61 00 09 */ stb r3, 9(r1) -/* 801938B8 98 61 00 0A */ stb r3, 0xa(r1) -/* 801938BC 38 00 00 FF */ li r0, 0xff -/* 801938C0 98 01 00 0B */ stb r0, 0xb(r1) -/* 801938C4 80 01 00 08 */ lwz r0, 8(r1) -/* 801938C8 90 01 00 0C */ stw r0, 0xc(r1) -/* 801938CC 98 61 00 10 */ stb r3, 0x10(r1) -/* 801938D0 98 61 00 11 */ stb r3, 0x11(r1) -/* 801938D4 98 61 00 12 */ stb r3, 0x12(r1) -/* 801938D8 98 61 00 13 */ stb r3, 0x13(r1) -/* 801938DC 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801938E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801938E4 80 7D 00 3C */ lwz r3, 0x3c(r29) -/* 801938E8 38 81 00 14 */ addi r4, r1, 0x14 -/* 801938EC 38 A1 00 0C */ addi r5, r1, 0xc -/* 801938F0 81 83 00 00 */ lwz r12, 0(r3) -/* 801938F4 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801938F8 7D 89 03 A6 */ mtctr r12 -/* 801938FC 4E 80 04 21 */ bctrl -/* 80193900 C0 02 A0 10 */ lfs f0, lit_3756(r2) -/* 80193904 D0 1D 00 80 */ stfs f0, 0x80(r29) -/* 80193908 C0 02 A0 14 */ lfs f0, lit_3757(r2) -/* 8019390C D0 1D 00 84 */ stfs f0, 0x84(r29) -/* 80193910 38 00 00 00 */ li r0, 0 -/* 80193914 B0 1D 00 88 */ sth r0, 0x88(r29) -/* 80193918 B0 1D 00 8A */ sth r0, 0x8a(r29) -/* 8019391C 98 1D 00 8C */ stb r0, 0x8c(r29) -/* 80193920 98 1D 00 8E */ stb r0, 0x8e(r29) -/* 80193924 7F A3 EB 78 */ mr r3, r29 -/* 80193928 88 1D 00 8C */ lbz r0, 0x8c(r29) -/* 8019392C 1C A0 00 0C */ mulli r5, r0, 0xc -/* 80193930 3C 80 80 3C */ lis r4, init_process@ha /* 0x803BB648@ha */ -/* 80193934 38 04 B6 48 */ addi r0, r4, init_process@l /* 0x803BB648@l */ -/* 80193938 7D 80 2A 14 */ add r12, r0, r5 -/* 8019393C 48 1C E7 49 */ bl __ptmf_scall -/* 80193940 60 00 00 00 */ nop -/* 80193944 7F A3 EB 78 */ mr r3, r29 -/* 80193948 39 61 00 50 */ addi r11, r1, 0x50 -/* 8019394C 48 1C E8 DD */ bl _restgpr_29 -/* 80193950 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80193954 7C 08 03 A6 */ mtlr r0 -/* 80193958 38 21 00 50 */ addi r1, r1, 0x50 -/* 8019395C 4E 80 00 20 */ blr diff --git a/asm/d/d_scope/__ct__Q28JUtility6TColorFv.s b/asm/d/d_scope/__ct__Q28JUtility6TColorFv.s deleted file mode 100644 index 6641958294..0000000000 --- a/asm/d/d_scope/__ct__Q28JUtility6TColorFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80193960: -/* 80193960 38 00 FF FF */ li r0, -1 -/* 80193964 90 03 00 00 */ stw r0, 0(r3) -/* 80193968 4E 80 00 20 */ blr diff --git a/asm/d/d_scope/__dt__8dScope_cFv.s b/asm/d/d_scope/__dt__8dScope_cFv.s deleted file mode 100644 index 47bd573e71..0000000000 --- a/asm/d/d_scope/__dt__8dScope_cFv.s +++ /dev/null @@ -1,157 +0,0 @@ -lbl_8019396C: -/* 8019396C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80193970 7C 08 02 A6 */ mflr r0 -/* 80193974 90 01 00 34 */ stw r0, 0x34(r1) -/* 80193978 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019397C 48 1C E8 49 */ bl _savegpr_23 -/* 80193980 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80193984 7C 9F 23 78 */ mr r31, r4 -/* 80193988 41 82 01 EC */ beq lbl_80193B74 -/* 8019398C 3C 60 80 3C */ lis r3, __vt__8dScope_c@ha /* 0x803BB6B4@ha */ -/* 80193990 38 03 B6 B4 */ addi r0, r3, __vt__8dScope_c@l /* 0x803BB6B4@l */ -/* 80193994 90 1E 00 00 */ stw r0, 0(r30) -/* 80193998 80 7E 00 04 */ lwz r3, 4(r30) -/* 8019399C 28 03 00 00 */ cmplwi r3, 0 -/* 801939A0 41 82 00 24 */ beq lbl_801939C4 -/* 801939A4 41 82 00 18 */ beq lbl_801939BC -/* 801939A8 38 80 00 01 */ li r4, 1 -/* 801939AC 81 83 00 00 */ lwz r12, 0(r3) -/* 801939B0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801939B4 7D 89 03 A6 */ mtctr r12 -/* 801939B8 4E 80 04 21 */ bctrl -lbl_801939BC: -/* 801939BC 38 00 00 00 */ li r0, 0 -/* 801939C0 90 1E 00 04 */ stw r0, 4(r30) -lbl_801939C4: -/* 801939C4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801939C8 28 03 00 00 */ cmplwi r3, 0 -/* 801939CC 41 82 00 24 */ beq lbl_801939F0 -/* 801939D0 41 82 00 18 */ beq lbl_801939E8 -/* 801939D4 38 80 00 01 */ li r4, 1 -/* 801939D8 81 83 00 00 */ lwz r12, 0(r3) -/* 801939DC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801939E0 7D 89 03 A6 */ mtctr r12 -/* 801939E4 4E 80 04 21 */ bctrl -lbl_801939E8: -/* 801939E8 38 00 00 00 */ li r0, 0 -/* 801939EC 90 1E 00 0C */ stw r0, 0xc(r30) -lbl_801939F0: -/* 801939F0 3B 20 00 00 */ li r25, 0 -/* 801939F4 3B 80 00 00 */ li r28, 0 -/* 801939F8 7F 9B E3 78 */ mr r27, r28 -lbl_801939FC: -/* 801939FC 3B 5C 00 14 */ addi r26, r28, 0x14 -/* 80193A00 7C 7E D0 2E */ lwzx r3, r30, r26 -/* 80193A04 28 03 00 00 */ cmplwi r3, 0 -/* 80193A08 41 82 00 20 */ beq lbl_80193A28 -/* 80193A0C 41 82 00 18 */ beq lbl_80193A24 -/* 80193A10 38 80 00 01 */ li r4, 1 -/* 80193A14 81 83 00 00 */ lwz r12, 0(r3) -/* 80193A18 81 8C 00 08 */ lwz r12, 8(r12) -/* 80193A1C 7D 89 03 A6 */ mtctr r12 -/* 80193A20 4E 80 04 21 */ bctrl -lbl_80193A24: -/* 80193A24 7F 7E D1 2E */ stwx r27, r30, r26 -lbl_80193A28: -/* 80193A28 3B 39 00 01 */ addi r25, r25, 1 -/* 80193A2C 2C 19 00 03 */ cmpwi r25, 3 -/* 80193A30 3B 9C 00 04 */ addi r28, r28, 4 -/* 80193A34 41 80 FF C8 */ blt lbl_801939FC -/* 80193A38 80 7E 00 08 */ lwz r3, 8(r30) -/* 80193A3C 28 03 00 00 */ cmplwi r3, 0 -/* 80193A40 41 82 00 24 */ beq lbl_80193A64 -/* 80193A44 41 82 00 18 */ beq lbl_80193A5C -/* 80193A48 38 80 00 01 */ li r4, 1 -/* 80193A4C 81 83 00 00 */ lwz r12, 0(r3) -/* 80193A50 81 8C 00 08 */ lwz r12, 8(r12) -/* 80193A54 7D 89 03 A6 */ mtctr r12 -/* 80193A58 4E 80 04 21 */ bctrl -lbl_80193A5C: -/* 80193A5C 38 00 00 00 */ li r0, 0 -/* 80193A60 90 1E 00 08 */ stw r0, 8(r30) -lbl_80193A64: -/* 80193A64 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80193A68 28 03 00 00 */ cmplwi r3, 0 -/* 80193A6C 41 82 00 24 */ beq lbl_80193A90 -/* 80193A70 41 82 00 18 */ beq lbl_80193A88 -/* 80193A74 38 80 00 01 */ li r4, 1 -/* 80193A78 81 83 00 00 */ lwz r12, 0(r3) -/* 80193A7C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80193A80 7D 89 03 A6 */ mtctr r12 -/* 80193A84 4E 80 04 21 */ bctrl -lbl_80193A88: -/* 80193A88 38 00 00 00 */ li r0, 0 -/* 80193A8C 90 1E 00 10 */ stw r0, 0x10(r30) -lbl_80193A90: -/* 80193A90 3B 00 00 00 */ li r24, 0 -/* 80193A94 3B A0 00 00 */ li r29, 0 -lbl_80193A98: -/* 80193A98 3A E0 00 00 */ li r23, 0 -/* 80193A9C 3B 80 00 00 */ li r28, 0 -/* 80193AA0 7F 5E EA 14 */ add r26, r30, r29 -/* 80193AA4 3B 60 00 00 */ li r27, 0 -lbl_80193AA8: -/* 80193AA8 3B 3C 00 20 */ addi r25, r28, 0x20 -/* 80193AAC 7C 7A C8 2E */ lwzx r3, r26, r25 -/* 80193AB0 28 03 00 00 */ cmplwi r3, 0 -/* 80193AB4 41 82 00 20 */ beq lbl_80193AD4 -/* 80193AB8 41 82 00 18 */ beq lbl_80193AD0 -/* 80193ABC 38 80 00 01 */ li r4, 1 -/* 80193AC0 81 83 00 00 */ lwz r12, 0(r3) -/* 80193AC4 81 8C 00 08 */ lwz r12, 8(r12) -/* 80193AC8 7D 89 03 A6 */ mtctr r12 -/* 80193ACC 4E 80 04 21 */ bctrl -lbl_80193AD0: -/* 80193AD0 7F 7A C9 2E */ stwx r27, r26, r25 -lbl_80193AD4: -/* 80193AD4 3A F7 00 01 */ addi r23, r23, 1 -/* 80193AD8 2C 17 00 02 */ cmpwi r23, 2 -/* 80193ADC 3B 9C 00 04 */ addi r28, r28, 4 -/* 80193AE0 41 80 FF C8 */ blt lbl_80193AA8 -/* 80193AE4 3B 18 00 01 */ addi r24, r24, 1 -/* 80193AE8 2C 18 00 03 */ cmpwi r24, 3 -/* 80193AEC 3B BD 00 08 */ addi r29, r29, 8 -/* 80193AF0 41 80 FF A8 */ blt lbl_80193A98 -/* 80193AF4 80 7E 00 38 */ lwz r3, 0x38(r30) -/* 80193AF8 28 03 00 00 */ cmplwi r3, 0 -/* 80193AFC 41 82 00 18 */ beq lbl_80193B14 -/* 80193B00 38 80 00 01 */ li r4, 1 -/* 80193B04 81 83 00 00 */ lwz r12, 0(r3) -/* 80193B08 81 8C 00 08 */ lwz r12, 8(r12) -/* 80193B0C 7D 89 03 A6 */ mtctr r12 -/* 80193B10 4E 80 04 21 */ bctrl -lbl_80193B14: -/* 80193B14 38 00 00 00 */ li r0, 0 -/* 80193B18 90 1E 00 38 */ stw r0, 0x38(r30) -/* 80193B1C 80 7E 00 3C */ lwz r3, 0x3c(r30) -/* 80193B20 28 03 00 00 */ cmplwi r3, 0 -/* 80193B24 41 82 00 18 */ beq lbl_80193B3C -/* 80193B28 38 80 00 01 */ li r4, 1 -/* 80193B2C 81 83 00 00 */ lwz r12, 0(r3) -/* 80193B30 81 8C 00 08 */ lwz r12, 8(r12) -/* 80193B34 7D 89 03 A6 */ mtctr r12 -/* 80193B38 4E 80 04 21 */ bctrl -lbl_80193B3C: -/* 80193B3C 38 00 00 00 */ li r0, 0 -/* 80193B40 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 80193B44 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80193B48 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80193B4C 98 03 00 E7 */ stb r0, 0xe7(r3) -/* 80193B50 28 1E 00 00 */ cmplwi r30, 0 -/* 80193B54 41 82 00 10 */ beq lbl_80193B64 -/* 80193B58 3C 60 80 3C */ lis r3, __vt__11dMeterSub_c@ha /* 0x803BB6D4@ha */ -/* 80193B5C 38 03 B6 D4 */ addi r0, r3, __vt__11dMeterSub_c@l /* 0x803BB6D4@l */ -/* 80193B60 90 1E 00 00 */ stw r0, 0(r30) -lbl_80193B64: -/* 80193B64 7F E0 07 35 */ extsh. r0, r31 -/* 80193B68 40 81 00 0C */ ble lbl_80193B74 -/* 80193B6C 7F C3 F3 78 */ mr r3, r30 -/* 80193B70 48 13 B1 CD */ bl __dl__FPv -lbl_80193B74: -/* 80193B74 7F C3 F3 78 */ mr r3, r30 -/* 80193B78 39 61 00 30 */ addi r11, r1, 0x30 -/* 80193B7C 48 1C E6 95 */ bl _restgpr_23 -/* 80193B80 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80193B84 7C 08 03 A6 */ mtlr r0 -/* 80193B88 38 21 00 30 */ addi r1, r1, 0x30 -/* 80193B8C 4E 80 00 20 */ blr diff --git a/asm/d/d_scope/__sinit_d_scope_cpp.s b/asm/d/d_scope/__sinit_d_scope_cpp.s deleted file mode 100644 index 464dcc1e94..0000000000 --- a/asm/d/d_scope/__sinit_d_scope_cpp.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80194140: -/* 80194140 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803BB618@ha */ -/* 80194144 38 A3 B6 18 */ addi r5, r3, cNullVec__6Z2Calc@l /* 0x803BB618@l */ -/* 80194148 80 65 00 0C */ lwz r3, 0xc(r5) -/* 8019414C 80 05 00 10 */ lwz r0, 0x10(r5) -/* 80194150 90 65 00 30 */ stw r3, 0x30(r5) -/* 80194154 90 05 00 34 */ stw r0, 0x34(r5) -/* 80194158 80 05 00 14 */ lwz r0, 0x14(r5) -/* 8019415C 90 05 00 38 */ stw r0, 0x38(r5) -/* 80194160 38 85 00 30 */ addi r4, r5, 0x30 -/* 80194164 80 65 00 18 */ lwz r3, 0x18(r5) -/* 80194168 80 05 00 1C */ lwz r0, 0x1c(r5) -/* 8019416C 90 64 00 0C */ stw r3, 0xc(r4) -/* 80194170 90 04 00 10 */ stw r0, 0x10(r4) -/* 80194174 80 05 00 20 */ lwz r0, 0x20(r5) -/* 80194178 90 04 00 14 */ stw r0, 0x14(r4) -/* 8019417C 80 65 00 24 */ lwz r3, 0x24(r5) -/* 80194180 80 05 00 28 */ lwz r0, 0x28(r5) -/* 80194184 90 64 00 18 */ stw r3, 0x18(r4) -/* 80194188 90 04 00 1C */ stw r0, 0x1c(r4) -/* 8019418C 80 05 00 2C */ lwz r0, 0x2c(r5) -/* 80194190 90 04 00 20 */ stw r0, 0x20(r4) -/* 80194194 80 65 00 54 */ lwz r3, 0x54(r5) -/* 80194198 80 05 00 58 */ lwz r0, 0x58(r5) -/* 8019419C 90 65 00 78 */ stw r3, 0x78(r5) -/* 801941A0 90 05 00 7C */ stw r0, 0x7c(r5) -/* 801941A4 80 05 00 5C */ lwz r0, 0x5c(r5) -/* 801941A8 90 05 00 80 */ stw r0, 0x80(r5) -/* 801941AC 38 85 00 78 */ addi r4, r5, 0x78 -/* 801941B0 80 65 00 60 */ lwz r3, 0x60(r5) -/* 801941B4 80 05 00 64 */ lwz r0, 0x64(r5) -/* 801941B8 90 64 00 0C */ stw r3, 0xc(r4) -/* 801941BC 90 04 00 10 */ stw r0, 0x10(r4) -/* 801941C0 80 05 00 68 */ lwz r0, 0x68(r5) -/* 801941C4 90 04 00 14 */ stw r0, 0x14(r4) -/* 801941C8 80 65 00 6C */ lwz r3, 0x6c(r5) -/* 801941CC 80 05 00 70 */ lwz r0, 0x70(r5) -/* 801941D0 90 64 00 18 */ stw r3, 0x18(r4) -/* 801941D4 90 04 00 1C */ stw r0, 0x1c(r4) -/* 801941D8 80 05 00 74 */ lwz r0, 0x74(r5) -/* 801941DC 90 04 00 20 */ stw r0, 0x20(r4) -/* 801941E0 4E 80 00 20 */ blr diff --git a/asm/d/d_scope/_execute__8dScope_cFUl.s b/asm/d/d_scope/_execute__8dScope_cFUl.s deleted file mode 100644 index 08d9d06d3d..0000000000 --- a/asm/d/d_scope/_execute__8dScope_cFUl.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80193B90: -/* 80193B90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80193B94 7C 08 02 A6 */ mflr r0 -/* 80193B98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80193B9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80193BA0 93 C1 00 08 */ stw r30, 8(r1) -/* 80193BA4 7C 7E 1B 78 */ mr r30, r3 -/* 80193BA8 8B E3 00 8C */ lbz r31, 0x8c(r3) -/* 80193BAC 1C BF 00 0C */ mulli r5, r31, 0xc -/* 80193BB0 3C 80 80 3C */ lis r4, move_process@ha /* 0x803BB690@ha */ -/* 80193BB4 38 04 B6 90 */ addi r0, r4, move_process@l /* 0x803BB690@l */ -/* 80193BB8 7D 80 2A 14 */ add r12, r0, r5 -/* 80193BBC 48 1C E4 C9 */ bl __ptmf_scall -/* 80193BC0 60 00 00 00 */ nop -/* 80193BC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80193BC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80193BCC 80 03 5D 7C */ lwz r0, 0x5d7c(r3) -/* 80193BD0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80193BD4 40 82 00 0C */ bne lbl_80193BE0 -/* 80193BD8 38 00 00 02 */ li r0, 2 -/* 80193BDC 98 1E 00 8C */ stb r0, 0x8c(r30) -lbl_80193BE0: -/* 80193BE0 88 1E 00 8C */ lbz r0, 0x8c(r30) -/* 80193BE4 7C 00 F8 40 */ cmplw r0, r31 -/* 80193BE8 41 82 00 20 */ beq lbl_80193C08 -/* 80193BEC 7F C3 F3 78 */ mr r3, r30 -/* 80193BF0 1C A0 00 0C */ mulli r5, r0, 0xc -/* 80193BF4 3C 80 80 3C */ lis r4, init_process@ha /* 0x803BB648@ha */ -/* 80193BF8 38 04 B6 48 */ addi r0, r4, init_process@l /* 0x803BB648@l */ -/* 80193BFC 7D 80 2A 14 */ add r12, r0, r5 -/* 80193C00 48 1C E4 85 */ bl __ptmf_scall -/* 80193C04 60 00 00 00 */ nop -lbl_80193C08: -/* 80193C08 88 1E 00 8C */ lbz r0, 0x8c(r30) -/* 80193C0C 28 00 00 02 */ cmplwi r0, 2 -/* 80193C10 41 82 00 3C */ beq lbl_80193C4C -/* 80193C14 38 00 00 3D */ li r0, 0x3d -/* 80193C18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80193C1C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80193C20 98 04 5E 3F */ stb r0, 0x5e3f(r4) -/* 80193C24 38 00 00 0A */ li r0, 0xa -/* 80193C28 98 04 5E 31 */ stb r0, 0x5e31(r4) -/* 80193C2C 38 60 00 03 */ li r3, 3 -/* 80193C30 98 64 5E 59 */ stb r3, 0x5e59(r4) -/* 80193C34 80 04 5F 18 */ lwz r0, 0x5f18(r4) -/* 80193C38 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 80193C3C 41 82 00 10 */ beq lbl_80193C4C -/* 80193C40 38 00 00 11 */ li r0, 0x11 -/* 80193C44 98 04 5E 34 */ stb r0, 0x5e34(r4) -/* 80193C48 98 64 5E 4F */ stb r3, 0x5e4f(r4) -lbl_80193C4C: -/* 80193C4C 38 60 00 01 */ li r3, 1 -/* 80193C50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80193C54 83 C1 00 08 */ lwz r30, 8(r1) -/* 80193C58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80193C5C 7C 08 03 A6 */ mtlr r0 -/* 80193C60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80193C64 4E 80 00 20 */ blr diff --git a/asm/d/d_scope/isDead__8dScope_cFv.s b/asm/d/d_scope/isDead__8dScope_cFv.s deleted file mode 100644 index 09e4293ddf..0000000000 --- a/asm/d/d_scope/isDead__8dScope_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80193FA0: -/* 80193FA0 88 63 00 8E */ lbz r3, 0x8e(r3) -/* 80193FA4 30 03 FF FF */ addic r0, r3, -1 -/* 80193FA8 7C 00 19 10 */ subfe r0, r0, r3 -/* 80193FAC 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80193FB0 4E 80 00 20 */ blr diff --git a/asm/d/d_scope/open_init__8dScope_cFv.s b/asm/d/d_scope/open_init__8dScope_cFv.s deleted file mode 100644 index 516781394f..0000000000 --- a/asm/d/d_scope/open_init__8dScope_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80193FB4: -/* 80193FB4 C0 02 A0 10 */ lfs f0, lit_3756(r2) -/* 80193FB8 D0 03 00 80 */ stfs f0, 0x80(r3) -/* 80193FBC C0 02 A0 14 */ lfs f0, lit_3757(r2) -/* 80193FC0 D0 03 00 84 */ stfs f0, 0x84(r3) -/* 80193FC4 38 00 00 00 */ li r0, 0 -/* 80193FC8 B0 03 00 88 */ sth r0, 0x88(r3) -/* 80193FCC 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_graphic/create__13mDoGph_gInf_cFv.s b/asm/m_Do/m_Do_graphic/create__13mDoGph_gInf_cFv.s deleted file mode 100644 index 5294755de4..0000000000 --- a/asm/m_Do/m_Do_graphic/create__13mDoGph_gInf_cFv.s +++ /dev/null @@ -1,85 +0,0 @@ -lbl_80007E44: -/* 80007E44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80007E48 7C 08 02 A6 */ mflr r0 -/* 80007E4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80007E50 38 60 00 00 */ li r3, 0 -/* 80007E54 80 8D 8D F4 */ lwz r4, sCurrentHeap__7JKRHeap(r13) -/* 80007E58 38 A0 00 02 */ li r5, 2 -/* 80007E5C 38 C0 00 01 */ li r6, 1 -/* 80007E60 48 26 A3 7D */ bl createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb -/* 80007E64 38 00 00 01 */ li r0, 1 -/* 80007E68 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80007E6C 90 03 00 18 */ stw r0, 0x18(r3) -/* 80007E70 38 60 00 28 */ li r3, 0x28 -/* 80007E74 48 2C 6D D9 */ bl __nw__FUl -/* 80007E78 7C 60 1B 79 */ or. r0, r3, r3 -/* 80007E7C 41 82 00 44 */ beq lbl_80007EC0 -/* 80007E80 38 00 00 00 */ li r0, 0 -/* 80007E84 98 01 00 08 */ stb r0, 8(r1) -/* 80007E88 98 01 00 09 */ stb r0, 9(r1) -/* 80007E8C 98 01 00 0A */ stb r0, 0xa(r1) -/* 80007E90 98 01 00 0B */ stb r0, 0xb(r1) -/* 80007E94 80 01 00 08 */ lwz r0, 8(r1) -/* 80007E98 90 01 00 0C */ stw r0, 0xc(r1) -/* 80007E9C 80 8D 8F B8 */ lwz r4, sManager__8JUTVideo(r13) -/* 80007EA0 80 E4 00 04 */ lwz r7, 4(r4) -/* 80007EA4 38 80 00 00 */ li r4, 0 -/* 80007EA8 38 A0 00 00 */ li r5, 0 -/* 80007EAC A0 C7 00 04 */ lhz r6, 4(r7) -/* 80007EB0 A0 E7 00 06 */ lhz r7, 6(r7) -/* 80007EB4 39 01 00 0C */ addi r8, r1, 0xc -/* 80007EB8 48 2D D6 79 */ bl __ct__8JUTFaderFiiiiQ28JUtility6TColor -/* 80007EBC 7C 60 1B 78 */ mr r0, r3 -lbl_80007EC0: -/* 80007EC0 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80007EC4 90 03 00 04 */ stw r0, 4(r3) -/* 80007EC8 90 0D 86 48 */ stw r0, mFader__13mDoGph_gInf_c(r13) -/* 80007ECC 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80007ED0 90 03 00 04 */ stw r0, 4(r3) -/* 80007ED4 38 00 00 00 */ li r0, 0 -/* 80007ED8 80 6D 8F D8 */ lwz r3, sManager__10JUTProcBar(r13) -/* 80007EDC 98 03 01 30 */ stb r0, 0x130(r3) -/* 80007EE0 80 6D 8F D8 */ lwz r3, sManager__10JUTProcBar(r13) -/* 80007EE4 98 03 01 0C */ stb r0, 0x10c(r3) -/* 80007EE8 80 6D 8F 48 */ lwz r3, sDebugPrint__10JUTDbPrint(r13) -/* 80007EEC 98 03 00 0C */ stb r0, 0xc(r3) -/* 80007EF0 38 60 01 30 */ li r3, 0x130 -/* 80007EF4 38 80 00 E0 */ li r4, 0xe0 -/* 80007EF8 38 A0 00 06 */ li r5, 6 -/* 80007EFC 4B FF FE A1 */ bl createTimg__FUsUsUl -/* 80007F00 90 6D 86 4C */ stw r3, mFrameBufferTimg__13mDoGph_gInf_c(r13) -/* 80007F04 38 03 00 20 */ addi r0, r3, 0x20 -/* 80007F08 90 0D 86 50 */ stw r0, mFrameBufferTex__13mDoGph_gInf_c(r13) -/* 80007F0C 38 60 01 30 */ li r3, 0x130 -/* 80007F10 38 80 00 E0 */ li r4, 0xe0 -/* 80007F14 38 A0 00 03 */ li r5, 3 -/* 80007F18 4B FF FE 85 */ bl createTimg__FUsUsUl -/* 80007F1C 90 6D 86 54 */ stw r3, mZbufferTimg__13mDoGph_gInf_c(r13) -/* 80007F20 38 03 00 20 */ addi r0, r3, 0x20 -/* 80007F24 90 0D 86 58 */ stw r0, mZbufferTex__13mDoGph_gInf_c(r13) -/* 80007F28 38 60 04 00 */ li r3, 0x400 -/* 80007F2C 48 2E C7 2D */ bl setBuffer__8J2DPrintFUl -/* 80007F30 38 00 00 00 */ li r0, 0 -/* 80007F34 98 0D 86 64 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0(r13) -/* 80007F38 98 0D 86 66 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x2(r13) -/* 80007F3C 88 0D 80 80 */ lbz r0, g_clearColor(r13) -/* 80007F40 98 0D 80 10 */ stb r0, mBackColor__13mDoGph_gInf_c(r13) -/* 80007F44 38 8D 80 80 */ la r4, g_clearColor(r13) /* 80450600-_SDA_BASE_ */ -/* 80007F48 88 A4 00 01 */ lbz r5, 1(r4) -/* 80007F4C 38 6D 80 10 */ la r3, mBackColor__13mDoGph_gInf_c(r13) /* 80450590-_SDA_BASE_ */ -/* 80007F50 98 A3 00 01 */ stb r5, 1(r3) -/* 80007F54 88 C4 00 02 */ lbz r6, 2(r4) -/* 80007F58 98 C3 00 02 */ stb r6, 2(r3) -/* 80007F5C 88 84 00 03 */ lbz r4, 3(r4) -/* 80007F60 98 83 00 03 */ stb r4, 3(r3) -/* 80007F64 98 0D 80 14 */ stb r0, mFadeColor__13mDoGph_gInf_c(r13) -/* 80007F68 38 6D 80 14 */ la r3, mFadeColor__13mDoGph_gInf_c(r13) /* 80450594-_SDA_BASE_ */ -/* 80007F6C 98 A3 00 01 */ stb r5, 1(r3) -/* 80007F70 98 C3 00 02 */ stb r6, 2(r3) -/* 80007F74 98 83 00 03 */ stb r4, 3(r3) -/* 80007F78 38 60 00 01 */ li r3, 1 -/* 80007F7C 48 34 58 C5 */ bl VISetBlack -/* 80007F80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80007F84 7C 08 03 A6 */ mtlr r0 -/* 80007F88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80007F8C 4E 80 00 20 */ blr diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 22b0aa6bd5..a9835b5858 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -469,7 +469,7 @@ public: /* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*); /* 8032BCAC */ virtual ~J3DAnmColor(); - /* 8032BF44 */ virtual bool getKind() const; + /* 8032BF44 */ virtual s32 getKind() const; /* 8032BF4C */ virtual void getColor(u16, _GXColor*) const; u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; } diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index c489742c32..da9e49cfe2 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -41,8 +41,8 @@ public: virtual void diff(u32) = 0; virtual void diffTexMtx() = 0; virtual void diffTexGen() = 0; - /* 803172FC */ virtual bool countDLSize(); - virtual void getType() = 0; + /* 803172FC */ virtual s32 countDLSize(); + virtual u32 getType() = 0; /* 8031741C */ virtual void setTexGenNum(u32 const*); /* 8000E0D0 */ virtual void setTexGenNum(u32); /* 8000DFE8 */ virtual bool getTexGenNum() const; @@ -76,12 +76,12 @@ public: /* 80322E74 */ virtual u32 getType(); /* 80322D3C */ virtual void setTexGenNum(u32 const*); /* 80322D34 */ virtual void setTexGenNum(u32); - /* 80322D48 */ virtual void getTexGenNum() const; + /* 80322D48 */ virtual bool getTexGenNum() const; /* 80322D50 */ virtual void setTexCoord(u32, J3DTexCoord const*); - /* 80322D64 */ virtual void getTexCoord(u32); + /* 80322D64 */ virtual bool getTexCoord(u32); /* 80322D78 */ virtual void setTexMtx(u32, J3DTexMtx*); - /* 80322D88 */ virtual void getTexMtx(u32); - /* 80322D98 */ virtual void getTexMtxOffset() const; + /* 80322D88 */ virtual J3DTexMtx* getTexMtx(u32); + /* 80322D98 */ virtual bool getTexMtxOffset() const; /* 80322DA0 */ virtual void setTexMtxOffset(u32); /* 80317180 */ virtual ~J3DTexGenBlockPatched(); @@ -103,7 +103,7 @@ public: /* 80322C6C */ virtual u32 getType(); /* 80322C9C */ virtual void setNBTScale(J3DNBTScale const*); /* 80322C78 */ virtual void setNBTScale(J3DNBTScale); - /* 80322CC0 */ virtual void getNBTScale(); + /* 80322CC0 */ virtual J3DNBTScale* getNBTScale(); /* 80322CC8 */ virtual ~J3DTexGenBlockBasic(); private: @@ -121,7 +121,7 @@ public: /* 80322DA8 */ virtual u32 getType(); /* 80322DD8 */ virtual void setNBTScale(J3DNBTScale const*); /* 80322DB4 */ virtual void setNBTScale(J3DNBTScale); - /* 80322DFC */ virtual void getNBTScale(); + /* 80322DFC */ virtual J3DNBTScale* getNBTScale(); /* 80322E04 */ virtual ~J3DTexGenBlock4(); private: @@ -144,8 +144,8 @@ public: /* 8000DBC8 */ virtual void patchTexNoAndTexCoordScale(); virtual void ptrToIndex() = 0; virtual void indexToPtr() = 0; - virtual void getType() = 0; - /* 8031730C */ virtual bool countDLSize(); + virtual u32 getType() = 0; + /* 8031730C */ virtual s32 countDLSize(); /* 80323544 */ virtual void setTexNo(u32, u16 const*); /* 8000E0AC */ virtual void setTexNo(u32, u16); /* 8000DF94 */ virtual u32 getTexNo(u32) const; @@ -214,27 +214,27 @@ public: /* 803229E4 */ virtual u32 getTexNo(u32) const; /* 80322A08 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 803229F4 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 80322A1C */ virtual void getTevOrder(u32); + /* 80322A1C */ virtual bool getTevOrder(u32); /* 80322B24 */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 80322AF8 */ virtual void setTevColor(u32, J3DGXColorS10); - /* 80322B50 */ virtual void getTevColor(u32); + /* 80322B50 */ virtual GXColorS10* getTevColor(u32); /* 80322B90 */ virtual void setTevKColor(u32, J3DGXColor const*); /* 80322B64 */ virtual void setTevKColor(u32, J3DGXColor); - /* 80322BBC */ virtual void getTevKColor(u32); + /* 80322BBC */ virtual GXColor* getTevKColor(u32); /* 80322BDC */ virtual void setTevKColorSel(u32, u8 const*); /* 80322BD0 */ virtual void setTevKColorSel(u32, u8); - /* 80322BEC */ virtual void getTevKColorSel(u32); + /* 80322BEC */ virtual bool getTevKColorSel(u32); /* 803229AC */ virtual void setTevStageNum(u8 const*); /* 803229A4 */ virtual void setTevStageNum(u8); - /* 803229B8 */ virtual void getTevStageNum() const; + /* 803229B8 */ virtual u8 getTevStageNum() const; /* 80322A6C */ virtual void setTevStage(u32, J3DTevStage const*); /* 80322A30 */ virtual void setTevStage(u32, J3DTevStage); - /* 80322AA8 */ virtual void getTevStage(u32); + /* 80322AA8 */ virtual bool getTevStage(u32); /* 80322AD0 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); /* 80322ABC */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 80322AE4 */ virtual void getIndTevStage(u32); - /* 80322BF8 */ virtual void getTexNoOffset() const; - /* 80322C00 */ virtual void getTevRegOffset() const; + /* 80322AE4 */ virtual bool getIndTevStage(u32); + /* 80322BF8 */ virtual bool getTexNoOffset() const; + /* 80322C00 */ virtual bool getTevRegOffset() const; /* 80322C08 */ virtual void setTevRegOffset(u32); /* 80322C10 */ virtual ~J3DTevBlockPatched(); @@ -278,35 +278,35 @@ public: /* 80322040 */ virtual u32 getTexNo(u32) const; /* 80322064 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 80322050 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 80322078 */ virtual void getTevOrder(u32); + /* 80322078 */ virtual bool getTevOrder(u32); /* 803220B8 */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 8032208C */ virtual void setTevColor(u32, J3DGXColorS10); - /* 803220E4 */ virtual void getTevColor(u32); + /* 803220E4 */ virtual GXColorS10* getTevColor(u32); /* 80322124 */ virtual void setTevKColor(u32, J3DGXColor const*); /* 803220F8 */ virtual void setTevKColor(u32, J3DGXColor); - /* 80322150 */ virtual void getTevKColor(u32); + /* 80322150 */ virtual GXColor* getTevKColor(u32); /* 80322170 */ virtual void setTevKColorSel(u32, u8 const*); /* 80322164 */ virtual void setTevKColorSel(u32, u8); - /* 80322180 */ virtual void getTevKColorSel(u32); + /* 80322180 */ virtual bool getTevKColorSel(u32); /* 80322198 */ virtual void setTevKAlphaSel(u32, u8 const*); /* 8032218C */ virtual void setTevKAlphaSel(u32, u8); - /* 803221A8 */ virtual void getTevKAlphaSel(u32); + /* 803221A8 */ virtual bool getTevKAlphaSel(u32); /* 803221BC */ virtual void setTevStageNum(u8 const*); /* 803221B4 */ virtual void setTevStageNum(u8); - /* 803221C8 */ virtual void getTevStageNum() const; + /* 803221C8 */ virtual u8 getTevStageNum() const; /* 8032220C */ virtual void setTevStage(u32, J3DTevStage const*); /* 803221D0 */ virtual void setTevStage(u32, J3DTevStage); - /* 80322248 */ virtual void getTevStage(u32); + /* 80322248 */ virtual bool getTevStage(u32); /* 80322294 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*); /* 8032225C */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); /* 803222DC */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); /* 803222CC */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - /* 803222EC */ virtual void getTevSwapModeTable(u32); + /* 803222EC */ virtual bool getTevSwapModeTable(u32); /* 80322310 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); /* 803222FC */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 80322324 */ virtual void getIndTevStage(u32); - /* 80322338 */ virtual void getTexNoOffset() const; - /* 80322340 */ virtual void getTevRegOffset() const; + /* 80322324 */ virtual bool getIndTevStage(u32); + /* 80322338 */ virtual bool getTexNoOffset() const; + /* 80322340 */ virtual bool getTevRegOffset() const; /* 80322348 */ virtual void setTevRegOffset(u32); /* 80322350 */ virtual ~J3DTevBlock4(); @@ -348,35 +348,35 @@ public: /* 80322404 */ virtual u32 getTexNo(u32) const; /* 80322428 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 80322414 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 8032243C */ virtual void getTevOrder(u32); + /* 8032243C */ virtual bool getTevOrder(u32); /* 8032247C */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 80322450 */ virtual void setTevColor(u32, J3DGXColorS10); - /* 803224A8 */ virtual void getTevColor(u32); + /* 803224A8 */ virtual GXColorS10* getTevColor(u32); /* 803224E8 */ virtual void setTevKColor(u32, J3DGXColor const*); /* 803224BC */ virtual void setTevKColor(u32, J3DGXColor); - /* 80322514 */ virtual void getTevKColor(u32); + /* 80322514 */ virtual GXColor* getTevKColor(u32); /* 80322534 */ virtual void setTevKColorSel(u32, u8 const*); /* 80322528 */ virtual void setTevKColorSel(u32, u8); - /* 80322544 */ virtual void getTevKColorSel(u32); + /* 80322544 */ virtual bool getTevKColorSel(u32); /* 8032255C */ virtual void setTevKAlphaSel(u32, u8 const*); /* 80322550 */ virtual void setTevKAlphaSel(u32, u8); - /* 8032256C */ virtual void getTevKAlphaSel(u32); + /* 8032256C */ virtual bool getTevKAlphaSel(u32); /* 80322580 */ virtual void setTevStageNum(u8 const*); /* 80322578 */ virtual void setTevStageNum(u8); - /* 8032258C */ virtual void getTevStageNum() const; + /* 8032258C */ virtual u8 getTevStageNum() const; /* 803225D0 */ virtual void setTevStage(u32, J3DTevStage const*); /* 80322594 */ virtual void setTevStage(u32, J3DTevStage); - /* 8032260C */ virtual void getTevStage(u32); + /* 8032260C */ virtual bool getTevStage(u32); /* 80322658 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*); /* 80322620 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); /* 803226A0 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); /* 80322690 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - /* 803226B0 */ virtual void getTevSwapModeTable(u32); + /* 803226B0 */ virtual bool getTevSwapModeTable(u32); /* 803226D4 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); /* 803226C0 */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 803226E8 */ virtual void getIndTevStage(u32); - /* 803226FC */ virtual void getTexNoOffset() const; - /* 80322704 */ virtual void getTevRegOffset() const; + /* 803226E8 */ virtual bool getIndTevStage(u32); + /* 803226FC */ virtual bool getTexNoOffset() const; + /* 80322704 */ virtual bool getTevRegOffset() const; /* 8032270C */ virtual void setTevRegOffset(u32); /* 80322714 */ virtual ~J3DTevBlock2(); @@ -418,35 +418,35 @@ public: /* 80321C74 */ virtual u32 getTexNo(u32) const; /* 80321C98 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 80321C84 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 80321CAC */ virtual void getTevOrder(u32); + /* 80321CAC */ virtual bool getTevOrder(u32); /* 80321CEC */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 80321CC0 */ virtual void setTevColor(u32, J3DGXColorS10); - /* 80321D18 */ virtual void getTevColor(u32); + /* 80321D18 */ virtual GXColorS10* getTevColor(u32); /* 80321D58 */ virtual void setTevKColor(u32, J3DGXColor const*); /* 80321D2C */ virtual void setTevKColor(u32, J3DGXColor); - /* 80321D84 */ virtual void getTevKColor(u32); + /* 80321D84 */ virtual GXColor* getTevKColor(u32); /* 80321DA4 */ virtual void setTevKColorSel(u32, u8 const*); /* 80321D98 */ virtual void setTevKColorSel(u32, u8); - /* 80321DB4 */ virtual void getTevKColorSel(u32); + /* 80321DB4 */ virtual bool getTevKColorSel(u32); /* 80321DCC */ virtual void setTevKAlphaSel(u32, u8 const*); /* 80321DC0 */ virtual void setTevKAlphaSel(u32, u8); - /* 80321DDC */ virtual void getTevKAlphaSel(u32); + /* 80321DDC */ virtual bool getTevKAlphaSel(u32); /* 80321DE8 */ virtual void setTevStageNum(u8); /* 80321DF0 */ virtual void setTevStageNum(u8 const*); - /* 80321DFC */ virtual void getTevStageNum() const; + /* 80321DFC */ virtual u8 getTevStageNum() const; /* 80321E40 */ virtual void setTevStage(u32, J3DTevStage const*); /* 80321E04 */ virtual void setTevStage(u32, J3DTevStage); - /* 80321E7C */ virtual void getTevStage(u32); + /* 80321E7C */ virtual bool getTevStage(u32); /* 80321EC8 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*); /* 80321E90 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); /* 80321F10 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); /* 80321F00 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - /* 80321F20 */ virtual void getTevSwapModeTable(u32); + /* 80321F20 */ virtual bool getTevSwapModeTable(u32); /* 80321F44 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); /* 80321F30 */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 80321F58 */ virtual void getIndTevStage(u32); - /* 80321F6C */ virtual void getTexNoOffset() const; - /* 80321F74 */ virtual void getTevRegOffset() const; + /* 80321F58 */ virtual bool getIndTevStage(u32); + /* 80321F6C */ virtual bool getTexNoOffset() const; + /* 80321F74 */ virtual bool getTevRegOffset() const; /* 80321F7C */ virtual void setTevRegOffset(u32); /* 80321F84 */ virtual ~J3DTevBlock16(); @@ -488,17 +488,17 @@ public: /* 803227C8 */ virtual u32 getTexNo(u32) const; /* 803227EC */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 803227D8 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 80322800 */ virtual void getTevOrder(u32); + /* 80322800 */ virtual bool getTevOrder(u32); /* 80322818 */ virtual void setTevStageNum(u8 const*); /* 80322814 */ virtual void setTevStageNum(u8); - /* 8032281C */ virtual bool getTevStageNum() const; + /* 8032281C */ virtual u8 getTevStageNum() const; /* 80322860 */ virtual void setTevStage(u32, J3DTevStage const*); /* 80322824 */ virtual void setTevStage(u32, J3DTevStage); - /* 8032289C */ virtual void getTevStage(u32); + /* 8032289C */ virtual bool getTevStage(u32); /* 803228C4 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); /* 803228B0 */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 803228D8 */ virtual void getIndTevStage(u32); - /* 803228EC */ virtual void getTexNoOffset() const; + /* 803228D8 */ virtual bool getIndTevStage(u32); + /* 803228EC */ virtual bool getTexNoOffset() const; /* 803228F4 */ virtual ~J3DTevBlock1(); private: @@ -554,8 +554,8 @@ public: /* 80317344 */ virtual void diff(u32); /* 8031735C */ virtual void diffFog(); /* 80317360 */ virtual void diffBlend(); - virtual bool countDLSize(); - virtual void getType() = 0; + virtual s32 countDLSize(); + virtual u32 getType() = 0; /* 80317368 */ virtual void setFog(J3DFog); /* 80317364 */ virtual void setFog(J3DFog*); /* 8000DF5C */ virtual bool getFog(); @@ -617,23 +617,23 @@ public: /* 8032194C */ virtual u32 getType(); /* 8032197C */ virtual void setFog(J3DFog); /* 80321958 */ virtual void setFog(J3DFog*); - /* 803219A0 */ virtual void getFog(); + /* 803219A0 */ virtual bool getFog(); /* 803219C4 */ virtual void setAlphaComp(J3DAlphaComp const*); /* 803219A8 */ virtual void setAlphaComp(J3DAlphaComp const&); - /* 803219E0 */ virtual void getAlphaComp(); + /* 803219E0 */ virtual bool getAlphaComp(); /* 803219F4 */ virtual void setBlend(J3DBlend const*); /* 803219E8 */ virtual void setBlend(J3DBlend const&); - /* 80321A00 */ virtual void getBlend(); + /* 80321A00 */ virtual bool getBlend(); /* 80321A14 */ virtual void setZMode(J3DZMode const*); /* 80321A08 */ virtual void setZMode(J3DZMode); - /* 80321A20 */ virtual void getZMode(); + /* 80321A20 */ virtual bool getZMode(); /* 80321A30 */ virtual void setZCompLoc(u8 const*); /* 80321A28 */ virtual void setZCompLoc(u8); - /* 80321A3C */ virtual void getZCompLoc() const; + /* 80321A3C */ virtual bool getZCompLoc() const; /* 80321A4C */ virtual void setDither(u8 const*); /* 80321A44 */ virtual void setDither(u8); - /* 80321A58 */ virtual void getDither() const; - /* 80321A60 */ virtual void getFogOffset() const; + /* 80321A58 */ virtual bool getDither() const; + /* 80321A60 */ virtual bool getFogOffset() const; /* 80321A68 */ virtual void setFogOffset(u32); /* 80321A70 */ virtual ~J3DPEBlockFull(); @@ -659,19 +659,19 @@ public: /* 80321B00 */ virtual u32 getType(); /* 80321B28 */ virtual void setAlphaComp(J3DAlphaComp const*); /* 80321B0C */ virtual void setAlphaComp(J3DAlphaComp const&); - /* 80321B44 */ virtual void getAlphaComp(); + /* 80321B44 */ virtual bool getAlphaComp(); /* 80321B58 */ virtual void setBlend(J3DBlend const*); /* 80321B4C */ virtual void setBlend(J3DBlend const&); - /* 80321B64 */ virtual void getBlend(); + /* 80321B64 */ virtual bool getBlend(); /* 80321B78 */ virtual void setZMode(J3DZMode const*); /* 80321B6C */ virtual void setZMode(J3DZMode); - /* 80321B84 */ virtual void getZMode(); + /* 80321B84 */ virtual bool getZMode(); /* 80321B94 */ virtual void setZCompLoc(u8 const*); /* 80321B8C */ virtual void setZCompLoc(u8); - /* 80321BA0 */ virtual void getZCompLoc() const; + /* 80321BA0 */ virtual bool getZCompLoc() const; /* 80321BB0 */ virtual void setDither(u8 const*); /* 80321BA8 */ virtual void setDither(u8); - /* 80321BBC */ virtual void getDither() const; + /* 80321BBC */ virtual bool getDither() const; /* 80321BC4 */ virtual ~J3DPEBlockFogOff(); private: @@ -710,8 +710,8 @@ public: /* 8031734C */ virtual void reset(J3DIndBlock*); virtual void load() = 0; virtual void diff(u32) = 0; - /* 80317314 */ virtual bool countDLSize(); - virtual void getType() = 0; + /* 80317314 */ virtual s32 countDLSize(); + virtual u32 getType() = 0; /* 8000E0A0 */ virtual void setIndTexStageNum(u8); /* 8000DF7C */ virtual bool getIndTexStageNum() const; /* 80317410 */ virtual void setIndTexOrder(u32, J3DIndTexOrder); @@ -736,16 +736,16 @@ public: /* 80317BDC */ virtual s32 countDLSize(); /* 80323390 */ virtual u32 getType(); /* 8032339C */ virtual void setIndTexStageNum(u8); - /* 803233A4 */ virtual void getIndTexStageNum() const; + /* 803233A4 */ virtual bool getIndTexStageNum() const; /* 803233AC */ virtual void setIndTexOrder(u32, J3DIndTexOrder); /* 803233C0 */ virtual void setIndTexOrder(u32, J3DIndTexOrder const*); - /* 803233D4 */ virtual void getIndTexOrder(u32); + /* 803233D4 */ virtual bool getIndTexOrder(u32); /* 8032341C */ virtual void setIndTexMtx(u32, J3DIndTexMtx const*); /* 803233E8 */ virtual void setIndTexMtx(u32, J3DIndTexMtx); - /* 80323450 */ virtual void getIndTexMtx(u32); + /* 80323450 */ virtual bool getIndTexMtx(u32); /* 80323478 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*); /* 80323464 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale); - /* 8032348C */ virtual void getIndTexCoordScale(u32); + /* 8032348C */ virtual bool getIndTexCoordScale(u32); /* 803234A0 */ virtual ~J3DIndBlockFull(); private: @@ -791,8 +791,8 @@ public: /* 8031743C */ virtual void diffMatColor(); /* 80317440 */ virtual void diffColorChan(); /* 80317444 */ virtual void diffLightObj(u32); - /* 80317304 */ virtual bool countDLSize(); - virtual void getType() = 0; + /* 80317304 */ virtual s32 countDLSize(); + virtual u32 getType() = 0; /* 80317448 */ virtual void setMatColor(u32, J3DGXColor const*); /* 8000E0DC */ virtual void setMatColor(u32, J3DGXColor); /* 8000E000 */ virtual _GXColor* getMatColor(u32); @@ -835,23 +835,23 @@ public: /* 80322E80 */ virtual u32 getType(); /* 80322EB8 */ virtual void setMatColor(u32, J3DGXColor const*); /* 80322E8C */ virtual void setMatColor(u32, J3DGXColor); - /* 80322EE4 */ virtual void getMatColor(u32); + /* 80322EE4 */ virtual GXColor* getMatColor(u32); /* 80322F24 */ virtual void setAmbColor(u32, J3DGXColor const*); /* 80322EF8 */ virtual void setAmbColor(u32, J3DGXColor); - /* 80322F50 */ virtual void getAmbColor(u32); + /* 80322F50 */ virtual bool getAmbColor(u32); /* 80322F70 */ virtual void setColorChanNum(u8); /* 80322F64 */ virtual void setColorChanNum(u8 const*); - /* 80322F78 */ virtual void getColorChanNum() const; + /* 80322F78 */ virtual bool getColorChanNum() const; /* 80322F94 */ virtual void setColorChan(u32, J3DColorChan const&); /* 80322F80 */ virtual void setColorChan(u32, J3DColorChan const*); - /* 80322FA8 */ virtual void getColorChan(u32); + /* 80322FA8 */ virtual bool getColorChan(u32); /* 80322FBC */ virtual void setLight(u32, J3DLightObj*); - /* 80322FCC */ virtual void getLight(u32); + /* 80322FCC */ virtual bool getLight(u32); /* 80322FE4 */ virtual void setCullMode(u8 const*); /* 80322FDC */ virtual void setCullMode(u8); - /* 80322FF0 */ virtual void getCullMode() const; - /* 80322FF8 */ virtual void getMatColorOffset() const; - /* 80323000 */ virtual void getColorChanOffset() const; + /* 80322FF0 */ virtual s32 getCullMode() const; + /* 80322FF8 */ virtual bool getMatColorOffset() const; + /* 80323000 */ virtual bool getColorChanOffset() const; /* 80323008 */ virtual void setMatColorOffset(u32); /* 80323010 */ virtual void setColorChanOffset(u32); /* 80323018 */ virtual ~J3DColorBlockLightOn(); @@ -883,18 +883,18 @@ public: /* 80323560 */ virtual u32 getType(); /* 80323184 */ virtual void setMatColor(u32, J3DGXColor const*); /* 80323158 */ virtual void setMatColor(u32, J3DGXColor); - /* 803231B0 */ virtual void getMatColor(u32); + /* 803231B0 */ virtual GXColor* getMatColor(u32); /* 803231D0 */ virtual void setColorChanNum(u8); /* 803231C4 */ virtual void setColorChanNum(u8 const*); - /* 803231D8 */ virtual void getColorChanNum() const; + /* 803231D8 */ virtual bool getColorChanNum() const; /* 803231F4 */ virtual void setColorChan(u32, J3DColorChan const&); /* 803231E0 */ virtual void setColorChan(u32, J3DColorChan const*); - /* 80323208 */ virtual void getColorChan(u32); + /* 80323208 */ virtual bool getColorChan(u32); /* 80323224 */ virtual void setCullMode(u8 const*); /* 8032321C */ virtual void setCullMode(u8); - /* 80323230 */ virtual void getCullMode() const; - /* 80323238 */ virtual void getMatColorOffset() const; - /* 80323240 */ virtual void getColorChanOffset() const; + /* 80323230 */ virtual s32 getCullMode() const; + /* 80323238 */ virtual bool getMatColorOffset() const; + /* 80323240 */ virtual bool getColorChanOffset() const; /* 80323248 */ virtual void setMatColorOffset(u32); /* 80323250 */ virtual void setColorChanOffset(u32); /* 803170DC */ virtual ~J3DColorBlockLightOff(); @@ -918,7 +918,7 @@ public: /* 80323074 */ virtual u32 getType(); /* 803230AC */ virtual void setAmbColor(u32, J3DGXColor const*); /* 80323080 */ virtual void setAmbColor(u32, J3DGXColor); - /* 803230D8 */ virtual void getAmbColor(u32); + /* 803230D8 */ virtual bool getAmbColor(u32); /* 803230EC */ virtual ~J3DColorBlockAmbientOn(); private: diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h index 3a007a1922..d189cd7cde 100644 --- a/include/JSystem/JFramework/JFWDisplay.h +++ b/include/JSystem/JFramework/JFWDisplay.h @@ -82,6 +82,10 @@ public: mFrameRate = 0; } + void setDrawDoneMethod(EDrawDone drawDone) { mDrawDoneMethod = drawDone; } + void setFader(JUTFader* fader) { mFader = fader; } + void setClearColor(JUtility::TColor color) { mClearColor = color; } + static JFWDisplay* sManager; private: diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index 5b6b2c5978..d9fb055f24 100644 --- a/include/JSystem/JMath/JMath.h +++ b/include/JSystem/JMath/JMath.h @@ -21,12 +21,16 @@ inline float __frsqrtes(register double f) { return out; } -inline f32 JMAFastSqrt(f32 input) { +inline f32 JMAFastSqrt(register f32 input) { if (input > 0.0f) { - f32 tmp = __frsqrtes(input); - return tmp * input; + register f32 out; + asm { + frsqrte out, input + } + return out * input; + } else { + return input; } - return input; } namespace JMath { diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h index 5d72c30279..c8379df13e 100644 --- a/include/JSystem/JParticle/JPAParticle.h +++ b/include/JSystem/JParticle/JPAParticle.h @@ -23,6 +23,16 @@ class JPAResourceManager; class JPADrawInfo { public: + JPADrawInfo(Mtx param_0, f32 fovY, f32 aspect) { + PSMTXCopy(param_0, mCamMtx); + C_MTXLightPerspective(mPrjMtx, fovY, aspect, 0.5f, -0.5f, 0.5f, 0.5f); + } + + JPADrawInfo(Mtx param_0, f32 top, f32 bottom, f32 left, f32 right) { + PSMTXCopy(param_0, mCamMtx); + C_MTXLightOrtho(mPrjMtx, top, bottom, left, right, 0.5f, 0.5f, 0.5f, 0.5f); + } + Mtx mCamMtx; Mtx mPrjMtx; diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 778ff90eb3..5404009a9f 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -6334,10 +6334,9 @@ public: if (field_0x84e != 3 && field_0x84e != 4) { if (field_0x84e == 2) { return false; - } else { - return true; } } + return true; } int checkShadowModelDraw() const { diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 3a19fc9d30..229859b2e3 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -578,7 +578,7 @@ public: virtual bool exchangeGrabActor(fopAc_ac_c*); virtual bool setForceGrab(fopAc_ac_c*, int, int); virtual void setForcePutPos(cXyz const&); - virtual bool checkPlayerNoDraw(); + virtual BOOL checkPlayerNoDraw(); virtual bool checkRopeTag(); virtual void voiceStart(u32); virtual void seStartOnlyReverb(u32); @@ -601,7 +601,7 @@ public: virtual void setPlayerPosAndAngle(float (*)[4]); virtual bool setThrowDamage(short, float, float, int, int, int); virtual bool checkSetNpcTks(cXyz*, int, int); - virtual bool setRollJump(float, float, short); + virtual int setRollJump(float, float, short); virtual void playerStartCollisionSE(u32, u32); virtual void changeTextureAnime(u16, u16, int); virtual void cancelChangeTextureAnime(); diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index abe20294b6..033dd088de 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -85,6 +85,7 @@ class daHorse_c; class dPa_control_c; class daAlink_c; class dMsgObject_c; +class J2DOrthoGraph; class dComIfG_play_c { public: @@ -126,7 +127,7 @@ public: dStage_stageDt_c& getStage() { return mStageData; } dEvt_control_c& getEvent() { return mEvent; } daHorse_c* getHorseActor() { return (daHorse_c*)mPlayerPtr[1]; } - J2DGrafContext* getCurrentGrafPort() { return mCurrentGrafPort; } + J2DGrafContext* getCurrentGrafPort() { return (J2DGrafContext*)mCurrentGrafPort; } dVibration_c& getVibration() { return mVibration; } camera_class* getCamera(int idx) { return mCameraInfo[idx].mCamera; } void* getPlayerPtr(int ptrIdx) { return mPlayerPtr[ptrIdx]; } @@ -136,6 +137,11 @@ public: dAttention_c& getAttention() { return mAttention; } dStage_startStage_c* getStartStage() { return &mStartStage; } + void setCurrentGrafPort(J2DOrthoGraph* i_graf) { mCurrentGrafPort = i_graf; } + void setCurrentWindow(dDlst_window_c* i_window) { mCurrentWindow = i_window; } + void setCurrentView(view_class* i_view) { mCurrentView = i_view; } + void setCurrentViewport(view_port_class* i_viewport) { mCurrentViewport = i_viewport; } + void setSelectItem(int idx, u8 i_itemNo) { mSelectItem[idx] = i_itemNo; } u8 getSelectItem(int idx) { return mSelectItem[idx]; } void setSelectEquip(int idx, u8 item_id) { mSelectEquip[idx] = item_id; } @@ -267,6 +273,11 @@ public: mASetFlagForce = flag; } + void setRStatusForce(u8 status, u8 flag) { + mRStatusForce = status; + mRSetFlagForce = flag; + } + void setItemRupeeCount(s32 rupees) { mItemRupeeCount += rupees; } void setItemMagicCount(s16 magic) { mItemMagicCount += magic; } void setItemMaxMagicCount(s16 max) { mItemMaxMagicCount += max; } @@ -401,6 +412,8 @@ public: setCameraAttentionStatus(camIdx, 0); } + f32 getCameraZoomForcus(int i_no) { return mCameraInfo[i_no].mCameraZoomForcus; } + void setMesgCamInfoID(int param_0) { mMesgCamInfo = param_0; } @@ -656,7 +669,7 @@ public: /* 0x0500C */ dDlst_window_c* mCurrentWindow; /* 0x05010 */ view_class* mCurrentView; /* 0x05014 */ view_port_class* mCurrentViewport; - /* 0x05018 */ J2DGrafContext* mCurrentGrafPort; + /* 0x05018 */ J2DOrthoGraph* mCurrentGrafPort; /* 0x0501C */ void* mItemTable; /* 0x0501D */ u8 field_0x501d[4]; /* 0x05024 */ char mLastPlayStageName[8]; @@ -1956,6 +1969,10 @@ inline void dComIfGp_setAStatusForce(u8 status, u8 flag) { g_dComIfG_gameInfo.play.setAStatusForce(status, flag); } +inline void dComIfGp_setRStatusForce(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setRStatusForce(status, flag); +} + inline u8 dComIfGp_getAStatus() { return g_dComIfG_gameInfo.play.getAStatus(); } @@ -2173,6 +2190,10 @@ inline void dComIfGp_setCameraInfo(int camIdx, camera_class* p_cam, int param_2, g_dComIfG_gameInfo.play.setCameraInfo(camIdx, p_cam, param_2, param_3, param_4); } +inline f32 dComIfGp_getCameraZoomForcus(int i_no) { + return g_dComIfG_gameInfo.play.getCameraZoomForcus(i_no); +} + inline void dComIfGp_clearPlayerStatus0(int param_0, u32 flag) { g_dComIfG_gameInfo.play.clearPlayerStatus(param_0, 0, flag); } @@ -2505,6 +2526,22 @@ inline dEvent_manager_c& i_dComIfGp_getEventManager() { return g_dComIfG_gameInfo.play.getEvtManager(); } +inline void dComIfGp_setCurrentGrafPort(J2DOrthoGraph* i_graf) { + g_dComIfG_gameInfo.play.setCurrentGrafPort(i_graf); +} + +inline void dComIfGp_setCurrentWindow(dDlst_window_c* i_window) { + g_dComIfG_gameInfo.play.setCurrentWindow(i_window); +} + +inline void dComIfGp_setCurrentView(view_class* i_view) { + g_dComIfG_gameInfo.play.setCurrentView(i_view); +} + +inline void dComIfGp_setCurrentViewport(view_port_class* i_viewport) { + g_dComIfG_gameInfo.play.setCurrentViewport(i_viewport); +} + inline BOOL dComIfGp_event_compulsory(void* param_0, const char* param_1, u16 param_2) { return g_dComIfG_gameInfo.play.getEvent().compulsory(param_0, param_1, param_2); } @@ -2658,6 +2695,12 @@ inline void dComIfGp_particle_calc2D() { g_dComIfG_gameInfo.play.getParticle()->calc2D(); } +inline void dComIfGp_particle_calcMenu() { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->calcMenu(); + } +} + inline void dComIfGp_particle_cleanup() { g_dComIfG_gameInfo.play.getParticle()->cleanup(); } @@ -2666,6 +2709,120 @@ inline void dComIfGp_particle_removeScene(bool param_0) { g_dComIfG_gameInfo.play.getParticle()->removeScene(param_0); } +inline void dComIfGp_particle_drawFogPri0_B(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawFogPri0_B(i_drawInfo); + } +} + +inline void dComIfGp_particle_drawNormalPri0_B(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawNormalPri0_B(i_drawInfo); + } +} + +inline void dComIfGp_particle_drawFogPri0_A(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawFogPri0_A(i_drawInfo); + } +} + +inline void dComIfGp_particle_drawNormalPri0_A(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawNormalPri0_A(i_drawInfo); + } +} + +inline void dComIfGp_particle_drawFogPri4(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawFogPri4(i_drawInfo); + } +} + +inline void dComIfGp_particle_drawProjection(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawProjection(i_drawInfo); + } +} + +inline void dComIfGp_particle_drawFogPri1(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawFogPri1(i_drawInfo); + } +} + +inline void dComIfGp_particle_draw(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawNormal(i_drawInfo); + } +} + +inline void dComIfGp_particle_drawFogPri2(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawFogPri2(i_drawInfo); + } +} + +inline void dComIfGp_particle_drawFog(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawNormalFog(i_drawInfo); + } +} + +inline void dComIfGp_particle_drawFogPri3(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawFogPri3(i_drawInfo); + } +} + +inline void dComIfGp_particle_drawP1(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawNormalP1(i_drawInfo); + } +} + +inline void dComIfGp_particle_drawDarkworld(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawDarkworld(i_drawInfo); + } +} + +inline void dComIfGp_particle_drawScreen(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->drawFogScreen(i_drawInfo); + } +} + +inline void dComIfGp_particle_draw2Dgame(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->draw2Dgame(i_drawInfo); + } +} + +inline void dComIfGp_particle_draw2Dfore(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->draw2Dfore(i_drawInfo); + } +} + +inline void dComIfGp_particle_draw2Dback(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->draw2Dback(i_drawInfo); + } +} + +inline void dComIfGp_particle_draw2DmenuFore(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->draw2DmenuFore(i_drawInfo); + } +} + +inline void dComIfGp_particle_draw2DmenuBack(JPADrawInfo* i_drawInfo) { + if (g_dComIfG_gameInfo.play.getParticle() != NULL) { + g_dComIfG_gameInfo.play.getParticle()->draw2DmenuBack(i_drawInfo); + } +} + inline int dComIfG_getTimerNowTimeMs() { return g_dComIfG_gameInfo.play.getTimerNowTimeMs(); } @@ -2944,6 +3101,110 @@ inline void dComIfGd_entryZSortListZxlu(J3DPacket* i_packet, cXyz& param_1) { g_dComIfG_gameInfo.drawlist.entryZSortListZxlu(i_packet, param_1); } +inline void dComIfGd_drawCopy2D() { + g_dComIfG_gameInfo.drawlist.drawCopy2D(); +} + +inline void dComIfGd_drawOpaListSky() { + g_dComIfG_gameInfo.drawlist.drawOpaListSky(); +} + +inline void dComIfGd_drawXluListSky() { + g_dComIfG_gameInfo.drawlist.drawXluListSky(); +} + +inline void dComIfGd_drawOpaListBG() { + g_dComIfG_gameInfo.drawlist.drawOpaListBG(); +} + +inline void dComIfGd_drawOpaListDarkBG() { + g_dComIfG_gameInfo.drawlist.drawOpaListDarkBG(); +} + +inline void dComIfGd_drawOpaListMiddle() { + g_dComIfG_gameInfo.drawlist.drawOpaListMiddle(); +} + +inline void dComIfGd_drawOpaList() { + g_dComIfG_gameInfo.drawlist.drawOpaList(); +} + +inline void dComIfGd_drawOpaListDark() { + g_dComIfG_gameInfo.drawlist.drawOpaListDark(); +} + +inline void dComIfGd_drawOpaListPacket() { + g_dComIfG_gameInfo.drawlist.drawOpaListPacket(); +} + +inline void dComIfGd_drawXluListBG() { + g_dComIfG_gameInfo.drawlist.drawXluListBG(); +} + +inline void dComIfGd_drawXluListDarkBG() { + g_dComIfG_gameInfo.drawlist.drawXluListDarkBG(); +} + +inline void dComIfGd_drawXluList() { + g_dComIfG_gameInfo.drawlist.drawXluList(); +} + +inline void dComIfGd_drawXluListDark() { + g_dComIfG_gameInfo.drawlist.drawXluListDark(); +} + +inline void dComIfGd_drawXluListInvisible() { + g_dComIfG_gameInfo.drawlist.drawXluListInvisible(); +} + +inline void dComIfGd_drawOpaListInvisible() { + g_dComIfG_gameInfo.drawlist.drawOpaListInvisible(); +} + +inline void dComIfGd_drawXluListZxlu() { + g_dComIfG_gameInfo.drawlist.drawXluListZxlu(); +} + +inline void dComIfGd_drawXluList2DScreen() { + g_dComIfG_gameInfo.drawlist.drawXluList2DScreen(); +} + +inline void dComIfGd_drawOpaList3Dlast() { + g_dComIfG_gameInfo.drawlist.drawOpaList3Dlast(); +} + +inline void dComIfGd_draw2DOpa() { + g_dComIfG_gameInfo.drawlist.draw2DOpa(); +} + +inline void dComIfGd_draw2DOpaTop() { + g_dComIfG_gameInfo.drawlist.draw2DOpaTop(); +} + +inline void dComIfGd_draw2DXlu() { + g_dComIfG_gameInfo.drawlist.draw2DXlu(); +} + +inline void dComIfGd_drawOpaListFilter() { + g_dComIfG_gameInfo.drawlist.drawOpaListFilter(); +} + +inline void dComIfGd_drawIndScreen() { + g_dComIfG_gameInfo.drawlist.drawOpaListP0(); +} + +inline void dComIfGd_drawListZxlu() { + g_dComIfG_gameInfo.drawlist.drawXluListZxlu(); +} + +inline void dComIfGd_drawShadow(Mtx param_0) { + g_dComIfG_gameInfo.drawlist.drawShadow(param_0); +} + +inline void dComIfGd_imageDrawShadow(Mtx param_0) { + g_dComIfG_gameInfo.drawlist.imageDrawShadow(param_0); +} + inline daPy_py_c* daPy_getLinkPlayerActorClass() { return dComIfGp_getLinkPlayer(); } diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 11384960ec..e787cdd8d7 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -218,7 +218,7 @@ private: /* 0x15EF4 */ void* field_0x15ef4; }; -class dDlst_window_c : public view_port_class { +class dDlst_window_c { public: dDlst_window_c() {} ~dDlst_window_c() {} @@ -228,9 +228,10 @@ public: void setCameraID(int id) { mCameraID = id; } s8 getCameraID() { return mCameraID; } void setMode(int mode) { mMode = mode; } - f32 getViewPort() { return mXOrig; } + view_port_class* getViewPort() { return &mViewport; } private: + /* 0x00 */ view_port_class mViewport; /* 0x28 */ s8 mCameraID; /* 0x29 */ s8 mMode; }; @@ -257,7 +258,7 @@ public: /* 800567C4 */ void draw(dDlst_base_c**, dDlst_base_c**); /* 8005681C */ static void wipeIn(f32 i_wipeSpeed, GXColor& i_wipeColor); /* 800568D8 */ static void wipeIn(f32 i_wipeSpeed); - /* 80056900 */ void calcWipe(); + /* 80056900 */ static void calcWipe(); enum DrawBuffer { /* 0x00 */ DB_OPA_LIST_SKY, @@ -331,9 +332,34 @@ public: mPeekZ.newData(param_0, param_1, param_2); } - view_port_class* getViewport() { - return mViewport; - } + view_port_class* getViewport() { return mViewport; } + + void drawCopy2D() { draw(mpCopy2DDraw[0], mpCopy2DSet[0]); } + void drawOpaListSky() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_SKY]); } + void drawXluListSky() { drawXluDrawList(mDrawBuffers[DB_XLU_LIST_SKY]); } + void drawOpaListBG() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_BG]); } + void drawOpaListDarkBG() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_DARK_BG]); } + void drawOpaListMiddle() { drawOpaDrawList(mDrawBuffers[DB_LIST_MIDDLE]); } + void drawOpaList() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST]); } + void drawOpaListDark() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_DARK]); } + void drawOpaListPacket() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_PACKET]); } + void drawXluListBG() { drawXluDrawList(mDrawBuffers[DB_XLU_LIST_BG]); } + void drawXluListDarkBG() { drawXluDrawList(mDrawBuffers[DB_XLU_LIST_DARK_BG]); } + void drawXluList() { drawXluDrawList(mDrawBuffers[DB_XLU_LIST]); } + void drawXluListDark() { drawXluDrawList(mDrawBuffers[DB_XLU_LIST_DARK]); } + void drawXluListInvisible() { drawXluDrawList(mDrawBuffers[DB_XLU_LIST_INVISIBLE]); } + void drawOpaListInvisible() { drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_INVISIBLE]); } + void drawXluListZxlu() { drawXluDrawList(mDrawBuffers[DB_LIST_Z_XLU]); } + void drawXluList2DScreen() { drawXluDrawList(mDrawBuffers[DB_LIST_2D_SCREEN]); } + void drawOpaList3Dlast() { drawOpaDrawList(mDrawBuffers[DB_LIST_3D_LAST]); } + void drawOpaListFilter() { drawOpaDrawList(mDrawBuffers[DB_LIST_FILTER]); } + void drawOpaListP0() { drawOpaDrawList(mDrawBuffers[DB_LIST_P0]); } + void draw2DOpa() { draw(mp2DOpaDraw[0], mp2DOpaSet[0]); } + void draw2DOpaTop() { draw(mp2DOpaTopDraw[0], mp2DOpaTopSet[0]); } + void draw2DXlu() { draw(mp2DXluDraw[0], mp2DXluSet[0]); } + + void imageDrawShadow(Mtx param_0) { mShadowControl.imageDraw(param_0); } + void drawShadow(Mtx param_0) { mShadowControl.draw(param_0); } static void offWipe() { mWipe = 0; } static f32 getWipeRate() { return mWipeRate; } diff --git a/include/d/d_ky_thunder.h b/include/d/d_ky_thunder.h index fd2049b86c..ab099ac2a0 100644 --- a/include/d/d_ky_thunder.h +++ b/include/d/d_ky_thunder.h @@ -1,38 +1,41 @@ #ifndef D_D_KY_THUNDER_H #define D_D_KY_THUNDER_H -#include "dolphin/types.h" #include "JSystem/JKernel/JKRSolidHeap.h" +#include "f_op/f_op_kankyo.h" #include "m_Do/m_Do_ext.h" -class dThunder_c { -private: - /* 0x00 */ u8 field_0x00[0xf8]; - /* 0xF8 */ JKRSolidHeap* mpHeap; +class dThunder_modelInfo_c { +public: + /* 0x00 */ J3DModel* mpModel; + /* 0x04 */ mDoExt_invisibleModel mInvisModel; + /* 0x0C */ mDoExt_brkAnm mBrk; + /* 0x24 */ mDoExt_btpAnm mBtp; +}; // Size: 0x3C + +class dThunder_c : public kankyo_class { public: /* 801ADF58 */ int createHeap(); /* 801ADFB4 */ void adjustHeap(); /* 801AE458 */ int create(); + inline int draw(); + inline int execute(dThunder_c* i_thunder); + inline int thunder_delete(dThunder_c* i_thunder); - ~dThunder_c() { - mDoExt_destroySolidHeap(mpHeap); - } - + ~dThunder_c() { mDoExt_destroySolidHeap(mpHeap); } + +private: + /* 0x0F8 */ JKRSolidHeap* mpHeap; + /* 0x0FC */ dThunder_modelInfo_c mModelInfo; + /* 0x138 */ cXyz field_0x138; + /* 0x144 */ cXyz mThunderPos; + /* 0x150 */ cXyz field_0x150; + /* 0x15C */ f32 field_0x15c; + /* 0x160 */ u8 unk_0x160[4]; + /* 0x164 */ f32 mBrkSpeed; + /* 0x168 */ s16 field_0x168; + /* 0x16A */ s16 field_0x16a; + /* 0x16C */ s16 field_0x16c; }; -inline int draw() { - // finish -}; - -inline int execute() { - // finish -}; - -inline int thunder_delete(dThunder_c* i_dthunderP) { - if (i_dthunderP) { - delete i_dthunderP; - } - return 1; -} - #endif /* D_D_KY_THUNDER_H */ diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index d55cc9097a..38dc72efc8 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -41,6 +41,7 @@ void dKy_bg_MAxx_proc(void* param_0); void dKy_change_colpat(u8 colpat); void dKy_BossLight_set(cXyz* param_0, _GXColor* param_1, f32 param_2, u8 param_3); void dKy_custom_colset(u8 prevGather, u8 curGather, f32 blend); +void dKy_setLight(); struct LIGHT_INFLUENCE { /* 800CFC7C */ ~LIGHT_INFLUENCE() {} diff --git a/include/d/kankyo/d_kankyo_rain.h b/include/d/kankyo/d_kankyo_rain.h index d9d94e98f3..bcb9548c84 100644 --- a/include/d/kankyo/d_kankyo_rain.h +++ b/include/d/kankyo/d_kankyo_rain.h @@ -39,5 +39,6 @@ void dKyr_star_init(); void dKyr_shstar_init(); void dKyr_star_move(); void dKyr_shstar_move(); +void dKyr_get_vectle_calc(cXyz* param_0, cXyz* param_1, cXyz* param_2); #endif /* D_KANKYO_D_KANKYO_RAIN_H */ diff --git a/include/d/meter/d_meter2.h b/include/d/meter/d_meter2.h index 75198c5793..c959a4876b 100644 --- a/include/d/meter/d_meter2.h +++ b/include/d/meter/d_meter2.h @@ -12,12 +12,20 @@ class dMeterMap_c; class dMeterSub_c : public dDlst_base_c { public: + // these seem to be inlined, but generates in the wrong order in d_scope.cpp + /* 8019412C */ //virtual void draw() {} + /* 801940D4 */ //virtual ~dMeterSub_c() {} + /* 8019411C */ //virtual int _create() { return 0; } + /* 80194130 */ //virtual int _execute(u32) { return 0; } + /* 80194124 */ //virtual int _delete() { return 0; } + /* 80194138 */ //virtual int isDead() { return 0; } + /* 8019412C */ virtual void draw(); - /* 801940D4 */ virtual ~dMeterSub_c(); - /* 8019411C */ virtual bool _create(); - /* 80194130 */ virtual bool _execute(u32); - /* 80194124 */ virtual bool _delete(); - /* 80194138 */ virtual bool isDead(); + /* 801940D4 */ virtual ~dMeterSub_c() {} + /* 8019411C */ virtual int _create(); + /* 80194130 */ virtual int _execute(u32); + /* 80194124 */ virtual int _delete(); + /* 80194138 */ virtual int isDead(); }; class dMeterButton_c : public dDlst_base_c { @@ -130,9 +138,9 @@ public: /* 8020F1B0 */ virtual void draw(); /* 8020EDF4 */ virtual ~dMeterString_c(); - /* 8020EE70 */ virtual bool _create(); - /* 8020F150 */ virtual bool _execute(u32); - /* 8020F49C */ virtual bool _delete(); + /* 8020EE70 */ virtual int _create(); + /* 8020F150 */ virtual int _execute(u32); + /* 8020F49C */ virtual int _delete(); }; class dMeterHaihai_c : public dMeterSub_c { @@ -153,9 +161,9 @@ public: /* 8020B140 */ virtual void draw(); /* 8020AEF0 */ virtual ~dMeterHaihai_c(); - /* 8020AF6C */ virtual bool _create(); - /* 8020B0F4 */ virtual bool _execute(u32); - /* 8020BDAC */ virtual bool _delete(); + /* 8020AF6C */ virtual int _create(); + /* 8020B0F4 */ virtual int _execute(u32); + /* 8020BDAC */ virtual int _delete(); }; class dMeter2_c : public msg_class { diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index b1ebbbc3ba..c36d4dbdb6 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -148,6 +148,7 @@ public: u32 getMsgTimeMs() { return mMsgTimeMs; } u32 getTimeMs() { return mTimeMs; } u8 getNowCount() { return mNowCount; } + void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; } public: /* 0x04 */ u8 unk4[4]; @@ -224,7 +225,7 @@ public: /* 0xE2 */ u8 mGoldWolfMapType; /* 0xE3 */ u8 mLightDropGetFlag[3]; /* 0xE6 */ u8 mLifeGaugeSE; - /* 0xE7 */ u8 unk231; + /* 0xE7 */ u8 mScopeZoomPointer; /* 0xE8 */ u8 mItemExplainWindowStatus; /* 0xE9 */ char mSaveStageName[8]; /* 0xF1 */ bool mFloatingMessageWakuVisible; @@ -518,6 +519,10 @@ inline u8 dMeter2Info_getNowCount() { return g_meter2_info.getNowCount(); } +inline void dMeter2Info_setScopeZoomPointer(u8 param_0) { + g_meter2_info.setScopeZoomPointer(param_0); +} + char* dMeter2Info_getNumberTextureName(int pIndex); void dMeter2Info_recieveLetter(); u8 dMeter2Info_getNewLetterNum(); diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h index 6a3846f1e8..52167cba2b 100644 --- a/include/d/particle/d_particle.h +++ b/include/d/particle/d_particle.h @@ -343,6 +343,26 @@ public: param_9, param_10, param_11, param_12); } + void drawFogPri0_B(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 7); } + void drawNormalPri0_B(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 5); } + void drawFogPri0_A(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 6); } + void drawNormalPri0_A(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 4); } + void drawFogPri4(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 11); } + void drawProjection(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 3); } + void drawFogPri1(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 8); } + void drawNormal(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 0); } + void drawFogPri2(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 9); } + void drawNormalFog(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 1); } + void drawFogPri3(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 10); } + void drawNormalP1(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 2); } + void drawDarkworld(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 12); } + void drawFogScreen(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 13); } + void draw2Dgame(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 14); } + void draw2Dfore(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 15); } + void draw2Dback(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 16); } + void draw2DmenuFore(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 17); } + void draw2DmenuBack(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 18); } + JKRExpHeap* getResHeap() { return m_resHeap; } void levelAllForceOnEventMove() { field_0x210.allForceOnEventMove(); } diff --git a/include/d/save/d_save_init.h b/include/d/save/d_save_init.h index be61da3fe2..e4d6361256 100644 --- a/include/d/save/d_save_init.h +++ b/include/d/save/d_save_init.h @@ -1,6 +1,6 @@ #ifndef D_SAVE_D_SAVE_INIT_H #define D_SAVE_D_SAVE_INIT_H -#include "dolphin/types.h" +void setInitEventBit(); #endif /* D_SAVE_D_SAVE_INIT_H */ diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h index 60f9e23a13..dd739e2603 100644 --- a/include/f_ap/f_ap_game.h +++ b/include/f_ap/f_ap_game.h @@ -43,7 +43,7 @@ public: extern fapGm_HIO_c g_HIO; -inline bool fapGmHIO_isMenu() { +inline BOOL fapGmHIO_isMenu() { return g_HIO.mDisplayPrint & 2; } diff --git a/include/f_op/f_op_view.h b/include/f_op/f_op_view.h index 7d99922076..b61c866212 100644 --- a/include/f_op/f_op_view.h +++ b/include/f_op/f_op_view.h @@ -24,6 +24,13 @@ public: /* 0x18 */ cXyz mUp; }; +struct scissor_class { + /* 0x0 */ f32 mXOrig; + /* 0x4 */ f32 mYOrig; + /* 0x8 */ f32 mWidth; + /* 0xC */ f32 mHeight; +}; + struct view_port_class { /* 0x00 */ f32 mXOrig; /* 0x04 */ f32 mYOrig; @@ -31,10 +38,7 @@ struct view_port_class { /* 0x0C */ f32 mHeight; /* 0x10 */ f32 mNearZ; /* 0x14 */ f32 mFarZ; - /* 0x18 */ f32 mScissorXOrig; - /* 0x1C */ f32 mScissorYOrig; - /* 0x20 */ f32 mScissorWidth; - /* 0x24 */ f32 mScissorHeight; + /* 0x18 */ scissor_class mScissor; }; struct view_class : public leafdraw_class { diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index b5d1196a03..f3c77c5928 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -120,4 +120,8 @@ inline void mDoAud_mEnvse_framework() { g_mEnvSeMgr.framework(); } +inline void mDoAud_mEnvSe_startFarThunderSe(const Vec* param_0) { + g_mEnvSeMgr.startFarThunderSe((Vec*)param_0, 0); +} + #endif /* M_DO_M_DO_AUDIO_H */ diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h index 1607cbc14e..71d79aa0e0 100644 --- a/include/m_Do/m_Do_graphic.h +++ b/include/m_Do/m_Do_graphic.h @@ -22,6 +22,9 @@ public: /* 800095F8 */ void remove(); /* 80009650 */ void draw(); + u8 getEnable() { return mEnable; } + GXColor* getMonoColor() { return &mMonoColor; } + /* 0x00 */ GXColor mBlendColor; /* 0x04 */ GXColor mMonoColor; /* 0x08 */ u8 mEnable; @@ -43,9 +46,16 @@ public: /* 80008330 */ static void calcFade(); static JUTFader* getFader() { return mFader; } + static void setFader(JUTFader* fader) { + JFWDisplay::getManager()->setFader(fader); + mFader = fader; + } + static int startFadeOut(int param_0) { return JFWDisplay::getManager()->startFadeOut(param_0); } static int startFadeIn(int param_0) { return JFWDisplay::getManager()->startFadeIn(param_0); } static void setFadeColor(JUtility::TColor& color) { mFader->setColor(color); } + static void setClearColor(JUtility::TColor color) { JFWDisplay::getManager()->setClearColor(color); } + static void setBackColor(GXColor& color) { mBackColor = color; } static void endFrame() { JFWDisplay::getManager()->endFrame(); } static void offFade() { mFade = 0; } static u8 isFade() { return mFade; } @@ -59,6 +69,8 @@ public: static f32 getHeight() { return 448.0f; } static f32 getMinYF() { return 0.0f; } static f32 getMinXF() { return 0.0f; } + static f32 getMaxYF() { return 448.0f; } + static f32 getMaxXF() { return 608.0f; } static int getMinY() { return 0; } static int getMinX() { return 0; } static int getMaxY() { return 448; } @@ -69,6 +81,8 @@ public: static f32 getFadeRate() { return mFadeRate; } static bloom_c* getBloom() { return &m_bloom; } static GXColor& getFadeColor() { return mFadeColor; } + static GXColor& getBackColor() { return mBackColor; } + static void endRender() { JFWDisplay::getManager()->endRender(); } static GXTexObj mFrameBufferTexObj; static GXTexObj mZbufferTexObj; diff --git a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp index 5a22db2d78..06d359ec41 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp @@ -856,8 +856,8 @@ s32 J3DAnmColorFull::getKind() const { } /* 8032BF44-8032BF4C 326884 0008+00 1/0 0/0 0/0 .text getKind__11J3DAnmColorCFv */ -bool J3DAnmColor::getKind() const { - return true; +s32 J3DAnmColor::getKind() const { + return 1; } /* 8032BF4C-8032BF50 32688C 0004+00 1/0 0/0 0/0 .text getColor__11J3DAnmColorCFUsP8_GXColor */ diff --git a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp index 3d0a4df2cc..6d12a728bc 100644 --- a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -2128,7 +2128,7 @@ asm void J3DPEBlockFull::setFog(J3DFog param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DPEBlockFull::getFog() { +asm bool J3DPEBlockFull::getFog() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getFog__14J3DPEBlockFullFv.s" } @@ -2160,7 +2160,7 @@ asm void J3DPEBlockFull::setAlphaComp(J3DAlphaComp const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DPEBlockFull::getAlphaComp() { +asm bool J3DPEBlockFull::getAlphaComp() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__14J3DPEBlockFullFv.s" } @@ -2190,7 +2190,7 @@ asm void J3DPEBlockFull::setBlend(J3DBlend const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DPEBlockFull::getBlend() { +asm bool J3DPEBlockFull::getBlend() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__14J3DPEBlockFullFv.s" } @@ -2220,7 +2220,7 @@ asm void J3DPEBlockFull::setZMode(J3DZMode const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DPEBlockFull::getZMode() { +asm bool J3DPEBlockFull::getZMode() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getZMode__14J3DPEBlockFullFv.s" } @@ -2246,7 +2246,7 @@ asm void J3DPEBlockFull::setZCompLoc(u8 const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DPEBlockFull::getZCompLoc() const { +asm bool J3DPEBlockFull::getZCompLoc() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getZCompLoc__14J3DPEBlockFullCFv.s" } @@ -2271,7 +2271,7 @@ asm void J3DPEBlockFull::setDither(u8 const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DPEBlockFull::getDither() const { +asm bool J3DPEBlockFull::getDither() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getDither__14J3DPEBlockFullCFv.s" } @@ -2282,7 +2282,7 @@ asm void J3DPEBlockFull::getDither() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DPEBlockFull::getFogOffset() const { +asm bool J3DPEBlockFull::getFogOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getFogOffset__14J3DPEBlockFullCFv.s" } @@ -2382,7 +2382,7 @@ asm void J3DPEBlockFogOff::setAlphaComp(J3DAlphaComp const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DPEBlockFogOff::getAlphaComp() { +asm bool J3DPEBlockFogOff::getAlphaComp() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__16J3DPEBlockFogOffFv.s" } @@ -2412,7 +2412,7 @@ asm void J3DPEBlockFogOff::setBlend(J3DBlend const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DPEBlockFogOff::getBlend() { +asm bool J3DPEBlockFogOff::getBlend() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__16J3DPEBlockFogOffFv.s" } @@ -2442,7 +2442,7 @@ asm void J3DPEBlockFogOff::setZMode(J3DZMode const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DPEBlockFogOff::getZMode() { +asm bool J3DPEBlockFogOff::getZMode() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getZMode__16J3DPEBlockFogOffFv.s" } @@ -2469,7 +2469,7 @@ asm void J3DPEBlockFogOff::setZCompLoc(u8 const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DPEBlockFogOff::getZCompLoc() const { +asm bool J3DPEBlockFogOff::getZCompLoc() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getZCompLoc__16J3DPEBlockFogOffCFv.s" } @@ -2495,7 +2495,7 @@ asm void J3DPEBlockFogOff::setDither(u8 const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DPEBlockFogOff::getDither() const { +asm bool J3DPEBlockFogOff::getDither() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getDither__16J3DPEBlockFogOffCFv.s" } @@ -2618,7 +2618,7 @@ asm void J3DTevBlock16::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock16::getTevOrder(u32 param_0) { +asm bool J3DTevBlock16::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevOrder__13J3DTevBlock16FUl.s" } @@ -2650,7 +2650,7 @@ asm void J3DTevBlock16::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock16::getTevColor(u32 param_0) { +asm GXColorS10* J3DTevBlock16::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevColor__13J3DTevBlock16FUl.s" } @@ -2682,7 +2682,7 @@ asm void J3DTevBlock16::setTevKColor(u32 param_0, J3DGXColor const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock16::getTevKColor(u32 param_0) { +asm GXColor* J3DTevBlock16::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKColor__13J3DTevBlock16FUl.s" } @@ -2713,7 +2713,7 @@ asm void J3DTevBlock16::setTevKColorSel(u32 param_0, u8 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock16::getTevKColorSel(u32 param_0) { +asm bool J3DTevBlock16::getTevKColorSel(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKColorSel__13J3DTevBlock16FUl.s" } @@ -2744,7 +2744,7 @@ asm void J3DTevBlock16::setTevKAlphaSel(u32 param_0, u8 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock16::getTevKAlphaSel(u32 param_0) { +asm bool J3DTevBlock16::getTevKAlphaSel(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKAlphaSel__13J3DTevBlock16FUl.s" } @@ -2771,7 +2771,7 @@ asm void J3DTevBlock16::setTevStageNum(u8 const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock16::getTevStageNum() const { +asm u8 J3DTevBlock16::getTevStageNum() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevStageNum__13J3DTevBlock16CFv.s" } @@ -2803,7 +2803,7 @@ asm void J3DTevBlock16::setTevStage(u32 param_0, J3DTevStage const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock16::getTevStage(u32 param_0) { +asm bool J3DTevBlock16::getTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevStage__13J3DTevBlock16FUl.s" } @@ -2857,7 +2857,7 @@ asm void J3DTevBlock16::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable con #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock16::getTevSwapModeTable(u32 param_0) { +asm bool J3DTevBlock16::getTevSwapModeTable(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevSwapModeTable__13J3DTevBlock16FUl.s" } @@ -2890,7 +2890,7 @@ asm void J3DTevBlock16::setIndTevStage(u32 param_0, J3DIndTevStage const* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock16::getIndTevStage(u32 param_0) { +asm bool J3DTevBlock16::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTevStage__13J3DTevBlock16FUl.s" } @@ -2901,7 +2901,7 @@ asm void J3DTevBlock16::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock16::getTexNoOffset() const { +asm bool J3DTevBlock16::getTexNoOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNoOffset__13J3DTevBlock16CFv.s" } @@ -2912,7 +2912,7 @@ asm void J3DTevBlock16::getTexNoOffset() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock16::getTevRegOffset() const { +asm bool J3DTevBlock16::getTevRegOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevRegOffset__13J3DTevBlock16CFv.s" } @@ -3671,7 +3671,7 @@ asm void J3DTevBlock4::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock4::getTevOrder(u32 param_0) { +asm bool J3DTevBlock4::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevOrder__12J3DTevBlock4FUl.s" } @@ -3703,7 +3703,7 @@ asm void J3DTevBlock4::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock4::getTevColor(u32 param_0) { +asm GXColorS10* J3DTevBlock4::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevColor__12J3DTevBlock4FUl.s" } @@ -3735,7 +3735,7 @@ asm void J3DTevBlock4::setTevKColor(u32 param_0, J3DGXColor const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock4::getTevKColor(u32 param_0) { +asm GXColor* J3DTevBlock4::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKColor__12J3DTevBlock4FUl.s" } @@ -3766,7 +3766,7 @@ asm void J3DTevBlock4::setTevKColorSel(u32 param_0, u8 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock4::getTevKColorSel(u32 param_0) { +asm bool J3DTevBlock4::getTevKColorSel(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKColorSel__12J3DTevBlock4FUl.s" } @@ -3797,7 +3797,7 @@ asm void J3DTevBlock4::setTevKAlphaSel(u32 param_0, u8 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock4::getTevKAlphaSel(u32 param_0) { +asm bool J3DTevBlock4::getTevKAlphaSel(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKAlphaSel__12J3DTevBlock4FUl.s" } @@ -3825,7 +3825,7 @@ asm void J3DTevBlock4::setTevStageNum(u8 const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock4::getTevStageNum() const { +asm u8 J3DTevBlock4::getTevStageNum() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevStageNum__12J3DTevBlock4CFv.s" } @@ -3857,7 +3857,7 @@ asm void J3DTevBlock4::setTevStage(u32 param_0, J3DTevStage const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock4::getTevStage(u32 param_0) { +asm bool J3DTevBlock4::getTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevStage__12J3DTevBlock4FUl.s" } @@ -3911,7 +3911,7 @@ asm void J3DTevBlock4::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable cons #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock4::getTevSwapModeTable(u32 param_0) { +asm bool J3DTevBlock4::getTevSwapModeTable(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevSwapModeTable__12J3DTevBlock4FUl.s" } @@ -3944,7 +3944,7 @@ asm void J3DTevBlock4::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock4::getIndTevStage(u32 param_0) { +asm bool J3DTevBlock4::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTevStage__12J3DTevBlock4FUl.s" } @@ -3955,7 +3955,7 @@ asm void J3DTevBlock4::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock4::getTexNoOffset() const { +asm bool J3DTevBlock4::getTexNoOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNoOffset__12J3DTevBlock4CFv.s" } @@ -3966,7 +3966,7 @@ asm void J3DTevBlock4::getTexNoOffset() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock4::getTevRegOffset() const { +asm bool J3DTevBlock4::getTevRegOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevRegOffset__12J3DTevBlock4CFv.s" } @@ -4064,7 +4064,7 @@ asm void J3DTevBlock2::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock2::getTevOrder(u32 param_0) { +asm bool J3DTevBlock2::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevOrder__12J3DTevBlock2FUl.s" } @@ -4096,7 +4096,7 @@ asm void J3DTevBlock2::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock2::getTevColor(u32 param_0) { +asm GXColorS10* J3DTevBlock2::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevColor__12J3DTevBlock2FUl.s" } @@ -4128,7 +4128,7 @@ asm void J3DTevBlock2::setTevKColor(u32 param_0, J3DGXColor const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock2::getTevKColor(u32 param_0) { +asm GXColor* J3DTevBlock2::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKColor__12J3DTevBlock2FUl.s" } @@ -4159,7 +4159,7 @@ asm void J3DTevBlock2::setTevKColorSel(u32 param_0, u8 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock2::getTevKColorSel(u32 param_0) { +asm bool J3DTevBlock2::getTevKColorSel(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKColorSel__12J3DTevBlock2FUl.s" } @@ -4190,7 +4190,7 @@ asm void J3DTevBlock2::setTevKAlphaSel(u32 param_0, u8 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock2::getTevKAlphaSel(u32 param_0) { +asm bool J3DTevBlock2::getTevKAlphaSel(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKAlphaSel__12J3DTevBlock2FUl.s" } @@ -4218,7 +4218,7 @@ asm void J3DTevBlock2::setTevStageNum(u8 const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock2::getTevStageNum() const { +asm u8 J3DTevBlock2::getTevStageNum() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevStageNum__12J3DTevBlock2CFv.s" } @@ -4250,7 +4250,7 @@ asm void J3DTevBlock2::setTevStage(u32 param_0, J3DTevStage const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock2::getTevStage(u32 param_0) { +asm bool J3DTevBlock2::getTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevStage__12J3DTevBlock2FUl.s" } @@ -4304,7 +4304,7 @@ asm void J3DTevBlock2::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable cons #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock2::getTevSwapModeTable(u32 param_0) { +asm bool J3DTevBlock2::getTevSwapModeTable(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevSwapModeTable__12J3DTevBlock2FUl.s" } @@ -4337,7 +4337,7 @@ asm void J3DTevBlock2::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock2::getIndTevStage(u32 param_0) { +asm bool J3DTevBlock2::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTevStage__12J3DTevBlock2FUl.s" } @@ -4348,7 +4348,7 @@ asm void J3DTevBlock2::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock2::getTexNoOffset() const { +asm bool J3DTevBlock2::getTexNoOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNoOffset__12J3DTevBlock2CFv.s" } @@ -4359,7 +4359,7 @@ asm void J3DTevBlock2::getTexNoOffset() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock2::getTevRegOffset() const { +asm bool J3DTevBlock2::getTevRegOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevRegOffset__12J3DTevBlock2CFv.s" } @@ -4457,7 +4457,7 @@ asm void J3DTevBlock1::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock1::getTevOrder(u32 param_0) { +asm bool J3DTevBlock1::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevOrder__12J3DTevBlock1FUl.s" } @@ -4477,7 +4477,7 @@ void J3DTevBlock1::setTevStageNum(u8 const* param_0) { /* 8032281C-80322824 31D15C 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J3DTevBlock1CFv */ -bool J3DTevBlock1::getTevStageNum() const { +u8 J3DTevBlock1::getTevStageNum() const { return true; } @@ -4507,7 +4507,7 @@ asm void J3DTevBlock1::setTevStage(u32 param_0, J3DTevStage const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock1::getTevStage(u32 param_0) { +asm bool J3DTevBlock1::getTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevStage__12J3DTevBlock1FUl.s" } @@ -4540,7 +4540,7 @@ asm void J3DTevBlock1::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock1::getIndTevStage(u32 param_0) { +asm bool J3DTevBlock1::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTevStage__12J3DTevBlock1FUl.s" } @@ -4551,7 +4551,7 @@ asm void J3DTevBlock1::getIndTevStage(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlock1::getTexNoOffset() const { +asm bool J3DTevBlock1::getTexNoOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNoOffset__12J3DTevBlock1CFv.s" } @@ -4647,7 +4647,7 @@ asm void J3DTevBlockPatched::setTevStageNum(u8 const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlockPatched::getTevStageNum() const { +asm u8 J3DTevBlockPatched::getTevStageNum() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevStageNum__18J3DTevBlockPatchedCFv.s" } @@ -4711,7 +4711,7 @@ asm void J3DTevBlockPatched::setTevOrder(u32 param_0, J3DTevOrder const* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlockPatched::getTevOrder(u32 param_0) { +asm bool J3DTevBlockPatched::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevOrder__18J3DTevBlockPatchedFUl.s" } @@ -4743,7 +4743,7 @@ asm void J3DTevBlockPatched::setTevStage(u32 param_0, J3DTevStage const* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlockPatched::getTevStage(u32 param_0) { +asm bool J3DTevBlockPatched::getTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevStage__18J3DTevBlockPatchedFUl.s" } @@ -4775,7 +4775,7 @@ asm void J3DTevBlockPatched::setIndTevStage(u32 param_0, J3DIndTevStage const* p #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlockPatched::getIndTevStage(u32 param_0) { +asm bool J3DTevBlockPatched::getIndTevStage(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTevStage__18J3DTevBlockPatchedFUl.s" } @@ -4807,7 +4807,7 @@ asm void J3DTevBlockPatched::setTevColor(u32 param_0, J3DGXColorS10 const* param #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlockPatched::getTevColor(u32 param_0) { +asm GXColorS10* J3DTevBlockPatched::getTevColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevColor__18J3DTevBlockPatchedFUl.s" } @@ -4839,7 +4839,7 @@ asm void J3DTevBlockPatched::setTevKColor(u32 param_0, J3DGXColor const* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlockPatched::getTevKColor(u32 param_0) { +asm GXColor* J3DTevBlockPatched::getTevKColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKColor__18J3DTevBlockPatchedFUl.s" } @@ -4871,7 +4871,7 @@ asm void J3DTevBlockPatched::setTevKColorSel(u32 param_0, u8 const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlockPatched::getTevKColorSel(u32 param_0) { +asm bool J3DTevBlockPatched::getTevKColorSel(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevKColorSel__18J3DTevBlockPatchedFUl.s" } @@ -4881,7 +4881,7 @@ asm void J3DTevBlockPatched::getTevKColorSel(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlockPatched::getTexNoOffset() const { +asm bool J3DTevBlockPatched::getTexNoOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNoOffset__18J3DTevBlockPatchedCFv.s" } @@ -4891,7 +4891,7 @@ asm void J3DTevBlockPatched::getTexNoOffset() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTevBlockPatched::getTevRegOffset() const { +asm bool J3DTevBlockPatched::getTevRegOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevRegOffset__18J3DTevBlockPatchedCFv.s" } @@ -4943,7 +4943,7 @@ asm void J3DTexGenBlockBasic::setNBTScale(J3DNBTScale const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTexGenBlockBasic::getNBTScale() { +asm J3DNBTScale* J3DTexGenBlockBasic::getNBTScale() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getNBTScale__19J3DTexGenBlockBasicFv.s" } @@ -4979,7 +4979,7 @@ asm void J3DTexGenBlockPatched::setTexGenNum(u32 const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTexGenBlockPatched::getTexGenNum() const { +asm bool J3DTexGenBlockPatched::getTexGenNum() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexGenNum__21J3DTexGenBlockPatchedCFv.s" } @@ -5000,7 +5000,7 @@ asm void J3DTexGenBlockPatched::setTexCoord(u32 param_0, J3DTexCoord const* para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTexGenBlockPatched::getTexCoord(u32 param_0) { +asm bool J3DTexGenBlockPatched::getTexCoord(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexCoord__21J3DTexGenBlockPatchedFUl.s" } @@ -5021,7 +5021,7 @@ asm void J3DTexGenBlockPatched::setTexMtx(u32 param_0, J3DTexMtx* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTexGenBlockPatched::getTexMtx(u32 param_0) { +asm J3DTexMtx* J3DTexGenBlockPatched::getTexMtx(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexMtx__21J3DTexGenBlockPatchedFUl.s" } @@ -5032,7 +5032,7 @@ asm void J3DTexGenBlockPatched::getTexMtx(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTexGenBlockPatched::getTexMtxOffset() const { +asm bool J3DTexGenBlockPatched::getTexMtxOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexMtxOffset__21J3DTexGenBlockPatchedCFv.s" } @@ -5075,7 +5075,7 @@ asm void J3DTexGenBlock4::setNBTScale(J3DNBTScale const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTexGenBlock4::getNBTScale() { +asm J3DNBTScale* J3DTexGenBlock4::getNBTScale() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getNBTScale__15J3DTexGenBlock4Fv.s" } @@ -5134,7 +5134,7 @@ asm void J3DColorBlockLightOn::setMatColor(u32 param_0, J3DGXColor const* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOn::getMatColor(u32 param_0) { +asm GXColor* J3DColorBlockLightOn::getMatColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColor__20J3DColorBlockLightOnFUl.s" } @@ -5166,7 +5166,7 @@ asm void J3DColorBlockLightOn::setAmbColor(u32 param_0, J3DGXColor const* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOn::getAmbColor(u32 param_0) { +asm bool J3DColorBlockLightOn::getAmbColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getAmbColor__20J3DColorBlockLightOnFUl.s" } @@ -5194,7 +5194,7 @@ void J3DColorBlockLightOn::setColorChanNum(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOn::getColorChanNum() const { +asm bool J3DColorBlockLightOn::getColorChanNum() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanNum__20J3DColorBlockLightOnCFv.s" } @@ -5226,7 +5226,7 @@ asm void J3DColorBlockLightOn::setColorChan(u32 param_0, J3DColorChan const& par #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOn::getColorChan(u32 param_0) { +asm bool J3DColorBlockLightOn::getColorChan(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChan__20J3DColorBlockLightOnFUl.s" } @@ -5248,7 +5248,7 @@ asm void J3DColorBlockLightOn::setLight(u32 param_0, J3DLightObj* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOn::getLight(u32 param_0) { +asm bool J3DColorBlockLightOn::getLight(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getLight__20J3DColorBlockLightOnFUl.s" } @@ -5273,7 +5273,7 @@ asm void J3DColorBlockLightOn::setCullMode(u8 const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOn::getCullMode() const { +asm s32 J3DColorBlockLightOn::getCullMode() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getCullMode__20J3DColorBlockLightOnCFv.s" } @@ -5284,7 +5284,7 @@ asm void J3DColorBlockLightOn::getCullMode() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOn::getMatColorOffset() const { +asm bool J3DColorBlockLightOn::getMatColorOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColorOffset__20J3DColorBlockLightOnCFv.s" } @@ -5295,7 +5295,7 @@ asm void J3DColorBlockLightOn::getMatColorOffset() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOn::getColorChanOffset() const { +asm bool J3DColorBlockLightOn::getColorChanOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanOffset__20J3DColorBlockLightOnCFv.s" } @@ -5355,7 +5355,7 @@ asm void J3DColorBlockAmbientOn::setAmbColor(u32 param_0, J3DGXColor const* para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockAmbientOn::getAmbColor(u32 param_0) { +asm bool J3DColorBlockAmbientOn::getAmbColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getAmbColor__22J3DColorBlockAmbientOnFUl.s" } @@ -5440,7 +5440,7 @@ asm void J3DColorBlockLightOff::setMatColor(u32 param_0, J3DGXColor const* param #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOff::getMatColor(u32 param_0) { +asm GXColor* J3DColorBlockLightOff::getMatColor(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColor__21J3DColorBlockLightOffFUl.s" } @@ -5468,7 +5468,7 @@ void J3DColorBlockLightOff::setColorChanNum(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOff::getColorChanNum() const { +asm bool J3DColorBlockLightOff::getColorChanNum() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanNum__21J3DColorBlockLightOffCFv.s" } @@ -5500,7 +5500,7 @@ asm void J3DColorBlockLightOff::setColorChan(u32 param_0, J3DColorChan const& pa #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOff::getColorChan(u32 param_0) { +asm bool J3DColorBlockLightOff::getColorChan(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChan__21J3DColorBlockLightOffFUl.s" } @@ -5525,7 +5525,7 @@ asm void J3DColorBlockLightOff::setCullMode(u8 const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOff::getCullMode() const { +asm s32 J3DColorBlockLightOff::getCullMode() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getCullMode__21J3DColorBlockLightOffCFv.s" } @@ -5536,7 +5536,7 @@ asm void J3DColorBlockLightOff::getCullMode() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOff::getMatColorOffset() const { +asm bool J3DColorBlockLightOff::getMatColorOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getMatColorOffset__21J3DColorBlockLightOffCFv.s" } @@ -5547,7 +5547,7 @@ asm void J3DColorBlockLightOff::getMatColorOffset() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DColorBlockLightOff::getColorChanOffset() const { +asm bool J3DColorBlockLightOff::getColorChanOffset() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChanOffset__21J3DColorBlockLightOffCFv.s" } @@ -5624,7 +5624,7 @@ void J3DIndBlockFull::setIndTexStageNum(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DIndBlockFull::getIndTexStageNum() const { +asm bool J3DIndBlockFull::getIndTexStageNum() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexStageNum__15J3DIndBlockFullCFv.s" } @@ -5656,7 +5656,7 @@ asm void J3DIndBlockFull::setIndTexOrder(u32 param_0, J3DIndTexOrder const* para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DIndBlockFull::getIndTexOrder(u32 param_0) { +asm bool J3DIndBlockFull::getIndTexOrder(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexOrder__15J3DIndBlockFullFUl.s" } @@ -5689,7 +5689,7 @@ asm void J3DIndBlockFull::setIndTexMtx(u32 param_0, J3DIndTexMtx const* param_1) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DIndBlockFull::getIndTexMtx(u32 param_0) { +asm bool J3DIndBlockFull::getIndTexMtx(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexMtx__15J3DIndBlockFullFUl.s" } @@ -5721,7 +5721,7 @@ asm void J3DIndBlockFull::setIndTexCoordScale(u32 param_0, J3DIndTexCoordScale c #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DIndBlockFull::getIndTexCoordScale(u32 param_0) { +asm bool J3DIndBlockFull::getIndTexCoordScale(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getIndTexCoordScale__15J3DIndBlockFullFUl.s" } diff --git a/libs/JSystem/J3DGraphBase/J3DMaterial.cpp b/libs/JSystem/J3DGraphBase/J3DMaterial.cpp index c7fb85b76b..44a8590204 100644 --- a/libs/JSystem/J3DGraphBase/J3DMaterial.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMaterial.cpp @@ -921,27 +921,27 @@ asm J3DPEBlock::~J3DPEBlock() { #pragma pop /* 803172FC-80317304 311C3C 0008+00 1/0 1/0 0/0 .text countDLSize__14J3DTexGenBlockFv */ -bool J3DTexGenBlock::countDLSize() { +s32 J3DTexGenBlock::countDLSize() { return false; } /* 80317304-8031730C 311C44 0008+00 1/0 1/0 0/0 .text countDLSize__13J3DColorBlockFv */ -bool J3DColorBlock::countDLSize() { +s32 J3DColorBlock::countDLSize() { return false; } /* 8031730C-80317314 311C4C 0008+00 0/0 2/0 0/0 .text countDLSize__11J3DTevBlockFv */ -bool J3DTevBlock::countDLSize() { +s32 J3DTevBlock::countDLSize() { return false; } /* 80317314-8031731C 311C54 0008+00 2/0 0/0 0/0 .text countDLSize__11J3DIndBlockFv */ -bool J3DIndBlock::countDLSize() { +s32 J3DIndBlock::countDLSize() { return false; } /* 8031731C-80317324 311C5C 0008+00 1/0 1/0 0/0 .text countDLSize__10J3DPEBlockFv */ -bool J3DPEBlock::countDLSize() { +s32 J3DPEBlock::countDLSize() { return false; } diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 88a6e69d0e..8bdc9c40ff 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -19628,7 +19628,7 @@ void daPy_py_c::setForcePutPos(cXyz const& param_0) { } /* 801416CC-801416D4 13C00C 0008+00 1/0 0/0 0/0 .text checkPlayerNoDraw__9daPy_py_cFv */ -bool daPy_py_c::checkPlayerNoDraw() { +BOOL daPy_py_c::checkPlayerNoDraw() { return false; } @@ -19742,8 +19742,8 @@ bool daPy_py_c::checkSetNpcTks(cXyz* param_0, int param_1, int param_2) { } /* 8014174C-80141754 13C08C 0008+00 1/0 0/0 0/0 .text setRollJump__9daPy_py_cFffs */ -bool daPy_py_c::setRollJump(f32 param_0, f32 param_1, s16 param_2) { - return false; +int daPy_py_c::setRollJump(f32 param_0, f32 param_1, s16 param_2) { + return 0; } /* 80141754-80141758 13C094 0004+00 1/0 0/0 0/0 .text playerStartCollisionSE__9daPy_py_cFUlUl */ diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index b6b987f295..d3f6192ab6 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -56,11 +56,11 @@ struct dBgS_CamSphChk { // Forward References: // -extern "C" static void func_8015FA2C(); -extern "C" static void func_8015FA4C(); -extern "C" static void func_8015FADC(); -extern "C" static void func_8015FB28(); -extern "C" static void func_8015FBF8(); +extern "C" static void func_8015FA2C(f32 param_0, f32 param_1, f32 param_2); +extern "C" static void func_8015FA4C(fopAc_ac_c* param_0); +extern "C" static void func_8015FADC(f32 param_0, f32 param_1, f32 param_2); +extern "C" static void func_8015FB28(cXyz* param_0, cXyz* param_1, cXyz* param_2); +extern "C" static void func_8015FBF8(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz* param_2, f32 param_3, cSAngle param_4); extern "C" void Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc(); extern "C" void __ct__9dCamera_cFP12camera_class(); extern "C" void func_801602C4(); @@ -125,21 +125,21 @@ extern "C" void bumpCheck__9dCamera_cFUl(); extern "C" void __dt__Q214cCcD_ShapeAttr5ShapeFv(); extern "C" void lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl(); extern "C" void radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c(); -extern "C" static void func_80167CB8(); +extern "C" static void func_80167CB8(fopAc_ac_c* param_0); extern "C" void jutOutCheck__9dCamera_cFP4cXyzf(); extern "C" void tooNearEscape__9dCamera_cFP4cXyz(); extern "C" void getWaterSurfaceHeight__9dCamera_cFP4cXyz(); extern "C" void checkGroundInfo__9dCamera_cFv(); extern "C" void chaseCamera__9dCamera_cFl(); -extern "C" static void func_8016C25C(); +extern "C" static void func_8016C25C(daAlink_c* param_0); extern "C" void Val__7cSAngleCFv(); -extern "C" static void func_8016C2D4(); +extern "C" static void func_8016C2D4(cXyz& param_0); extern "C" void getHoldA__8mDoCPd_cFUl(); -extern "C" static void func_8016C330(); -extern "C" static void func_8016C34C(); -extern "C" static void func_8016C368(); +extern "C" static void func_8016C330(u32 param_0, u32 param_1); +extern "C" static void func_8016C34C(u32 param_0); +extern "C" static void func_8016C368(u32 param_0, u32 param_1); extern "C" void lockonCamera__9dCamera_cFl(); -extern "C" static void func_8016E410(); +extern "C" static void func_8016E410(f32 param_0, f32 param_1, f32 param_2); extern "C" void __ct__7cSGlobeFv(); extern "C" void LockEdge__12dAttention_cFv(); extern "C" void getMsgCmdSpeaker__9dCamera_cFv(); @@ -147,7 +147,7 @@ extern "C" void getMsgCmdCut__9dCamera_cFl(); extern "C" void talktoCamera__9dCamera_cFl(); extern "C" void talkBasePos__9dCamera_cFP10fopAc_ac_c(); extern "C" void talkEyePos__9dCamera_cFP10fopAc_ac_c(); -extern "C" static void func_80174E50(); +extern "C" static void func_80174E50(cXyz param_0, cXyz param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3, fopAc_ac_c* param_4); extern "C" bool CalcSubjectAngle__9dCamera_cFPsPs(); extern "C" void SaveZoomRatio__9dCamera_cFv(); extern "C" void subjectCamera__9dCamera_cFl(); @@ -160,7 +160,7 @@ extern "C" void hookshotCamera__9dCamera_cFl(); extern "C" void railCamera__9dCamera_cFl(); extern "C" void paraRailCamera__9dCamera_cFl(); extern "C" void rideCamera__9dCamera_cFl(); -extern "C" static void func_8017D934(); +extern "C" static void func_8017D934(cXyz& param_0); extern "C" bool manualCamera__9dCamera_cFl(); extern "C" void observeCamera__9dCamera_cFl(); extern "C" void fixedFrameCamera__9dCamera_cFl(); @@ -601,7 +601,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_8015FA2C() { +static asm void func_8015FA2C(f32 param_0, f32 param_1, f32 param_2) { nofralloc #include "asm/d/d_camera/func_8015FA2C.s" } @@ -612,7 +612,7 @@ static asm void func_8015FA2C() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_8015FA4C() { +static asm void func_8015FA4C(fopAc_ac_c* param_0) { nofralloc #include "asm/d/d_camera/func_8015FA4C.s" } @@ -623,7 +623,7 @@ static asm void func_8015FA4C() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_8015FADC() { +static asm void func_8015FADC(f32 param_0, f32 param_1, f32 param_2) { nofralloc #include "asm/d/d_camera/func_8015FADC.s" } @@ -634,7 +634,7 @@ static asm void func_8015FADC() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_8015FB28() { +static asm void func_8015FB28(cXyz* param_0, cXyz* param_1, cXyz* param_2) { nofralloc #include "asm/d/d_camera/func_8015FB28.s" } @@ -656,7 +656,7 @@ SECTION_SDATA2 static f64 lit_4448 = 4503601774854144.0 /* cast s32 to float */; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_8015FBF8() { +static asm void func_8015FBF8(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz* param_2, f32 param_3, cSAngle param_4) { nofralloc #include "asm/d/d_camera/func_8015FBF8.s" } @@ -2409,7 +2409,7 @@ asm void dCamera_c::radiusActorInSight(fopAc_ac_c* param_0, fopAc_ac_c* param_1, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_80167CB8() { +static asm void func_80167CB8(fopAc_ac_c* param_0) { nofralloc #include "asm/d/d_camera/func_80167CB8.s" } @@ -2590,7 +2590,7 @@ asm void dCamera_c::chaseCamera(s32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_8016C25C() { +static asm void func_8016C25C(daAlink_c* param_0) { nofralloc #include "asm/d/d_camera/func_8016C25C.s" } @@ -2611,7 +2611,7 @@ extern "C" asm void Val__7cSAngleCFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_8016C2D4() { +static asm void func_8016C2D4(cXyz& param_0) { nofralloc #include "asm/d/d_camera/func_8016C2D4.s" } @@ -2633,7 +2633,7 @@ extern "C" asm void getHoldA__8mDoCPd_cFUl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_8016C330() { +static asm void func_8016C330(u32 param_0, u32 param_1) { nofralloc #include "asm/d/d_camera/func_8016C330.s" } @@ -2644,7 +2644,7 @@ static asm void func_8016C330() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_8016C34C() { +static asm void func_8016C34C(u32 param_0) { nofralloc #include "asm/d/d_camera/func_8016C34C.s" } @@ -2655,7 +2655,7 @@ static asm void func_8016C34C() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_8016C368() { +static asm void func_8016C368(u32 param_0, u32 param_1) { nofralloc #include "asm/d/d_camera/func_8016C368.s" } @@ -2703,7 +2703,7 @@ asm void dCamera_c::lockonCamera(s32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_8016E410() { +static asm void func_8016E410(f32 param_0, f32 param_1, f32 param_2) { nofralloc #include "asm/d/d_camera/func_8016E410.s" } @@ -2871,7 +2871,7 @@ asm void dCamera_c::talkEyePos(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_80174E50() { +static asm void func_80174E50(cXyz param_0, cXyz param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3, fopAc_ac_c* param_4) { nofralloc #include "asm/d/d_camera/func_80174E50.s" } @@ -3118,7 +3118,7 @@ asm void dCamera_c::rideCamera(s32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void func_8017D934() { +static asm void func_8017D934(cXyz& param_0) { nofralloc #include "asm/d/d_camera/func_8017D934.s" } diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index e52dd6bcdc..208101a886 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -230,21 +230,21 @@ extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; /* 80051AC0-80051ADC 04C400 001C+00 0/0 3/3 0/0 .text setViewPort__14dDlst_window_cFffffff */ void dDlst_window_c::setViewPort(f32 xOrig, f32 yOrig, f32 width, f32 height, f32 nearZ, f32 farZ) { - mXOrig = xOrig; - mYOrig = yOrig; - mWidth = width; - mHeight = height; - mNearZ = nearZ; - mFarZ = farZ; + mViewport.mXOrig = xOrig; + mViewport.mYOrig = yOrig; + mViewport.mWidth = width; + mViewport.mHeight = height; + mViewport.mNearZ = nearZ; + mViewport.mFarZ = farZ; } /* 80051ADC-80051AF0 04C41C 0014+00 0/0 4/4 0/0 .text setScissor__14dDlst_window_cFffff */ void dDlst_window_c::setScissor(f32 xOrig, f32 yOrig, f32 width, f32 height) { - mScissorXOrig = xOrig; - mScissorYOrig = yOrig; - mScissorWidth = width; - mScissorHeight = height; + mViewport.mScissor.mXOrig = xOrig; + mViewport.mScissor.mYOrig = yOrig; + mViewport.mScissor.mWidth = width; + mViewport.mScissor.mHeight = height; } /* 80051AF0-80051CF0 04C430 0200+00 1/0 0/0 0/0 .text draw__13dDlst_2DTri_cFv */ diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 17c9e9841d..f453359feb 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -1,342 +1,293 @@ -// -// Generated By: dol2asm -// Translation Unit: d/d_ky_thunder -// +/** + * d_ky_thunder.cpp + * Environment - Thunder + */ #include "d/d_ky_thunder.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "JSystem/JMath/JMath.h" +#include "SSystem/SComponent/c_counter.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" +#include "d/kankyo/d_kankyo_rain.h" -// -// Types: -// - -struct kankyo_class {}; - - - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -// -// Forward References: -// - -extern "C" void createHeap__10dThunder_cFv(); -extern "C" void adjustHeap__10dThunder_cFv(); -extern "C" static void dThunder_Draw__FP10dThunder_c(); -extern "C" static void dThunder_Execute__FP10dThunder_c(); -extern "C" static bool dThunder_IsDelete__FP10dThunder_c(); -extern "C" static void dThunder_Delete__FP10dThunder_c(); -extern "C" static void dThunder_Create__FP12kankyo_class(); -extern "C" void create__10dThunder_cFv(); -extern "C" extern char const* const d_d_ky_thunder__stringBase0; -extern "C" extern void* g_profile_KY_THUNDER[10 + 1 /* padding */]; - -// -// External References: -// - -extern "C" void __dt__4cXyzFv(); -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_createSolidHeapFromGameToCurrent__FUlUl(); -extern "C" void mDoExt_adjustSolidHeap__FP12JKRSolidHeap(); -extern "C" void mDoExt_destroySolidHeap__FP12JKRSolidHeap(); -extern "C" void mDoExt_restoreCurrentHeap__Fv(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopKyM_Delete__FPv(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz(); -extern "C" void cM_atan2s__Fff(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); -extern "C" void startFarThunderSe__10Z2EnvSeMgrFP3VecSc(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); -extern "C" void __register_global_object(); -extern "C" void _savegpr_27(); -extern "C" void _restgpr_27(); -extern "C" void strcmp(); -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; -extern "C" extern u8 struct_80451070[8]; - -// -// Declarations: -// +#define EF_THUNDER01_BMD 0x1E +#define EF_THUNDER02_BMD 0x1F +#define EF_THUNDER_BRK 0x2F /* 801ADF58-801ADFB4 1A8898 005C+00 1/1 0/0 0/0 .text createHeap__10dThunder_cFv */ int dThunder_c::createHeap() { - if (!mpHeap) { - mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0,0x20); - if (!mpHeap) { + if (mpHeap == NULL) { + mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0, 0x20); + + if (mpHeap == NULL) { return 0; } } + return 1; } /* 801ADFB4-801AE000 1A88F4 004C+00 1/1 0/0 0/0 .text adjustHeap__10dThunder_cFv */ void dThunder_c::adjustHeap() { mDoExt_restoreCurrentHeap(); + if ((s32)mDoExt_adjustSolidHeap(mpHeap) >= 0) { - DCStoreRangeNoSync(mpHeap->getStartAddr(),mpHeap->getHeapSize()); + DCStoreRangeNoSync(mpHeap->getStartAddr(), mpHeap->getHeapSize()); } } -/* ############################################################################################## */ -/* 8042E7F0-8042E7FC 05B510 000C+00 1/1 0/0 0/0 .bss @3816 */ -static u8 lit_3816[12]; +int dThunder_c::draw() { + static cXyz l_offsetPos(0.0f, 40.0f, -250.0f); + static cXyz l_scale(1.0f, 1.0f, 1.0f); -/* 8042E7FC-8042E808 05B51C 000C+00 1/1 0/0 0/0 .bss @3818 */ -static u8 lit_3818[12]; + camera_class* camera_p = dComIfGp_getCamera(0); -/* 8042E808-8042E814 05B528 000C+00 1/1 0/0 0/0 .bss l_offsetPos$localstatic3$draw__10dThunder_cFv - */ -static f32 data_8042E808[3]; + mDoMtx_stack_c::transS(mThunderPos.x, mThunderPos.y, mThunderPos.z); + mDoMtx_stack_c::YrotM(field_0x168); + mDoMtx_stack_c::ZrotM(field_0x15c); + mDoMtx_stack_c::XrotM(field_0x15c); -/* 8042E814-8042E820 05B534 000C+00 1/1 0/0 0/0 .bss l_scale$localstatic5$draw__10dThunder_cFv */ -static f32 data_8042E814[3]; + Mtx m; + PSMTXCopy(mDoMtx_stack_c::get(), m); -/* 80453E70-80453E74 002470 0004+00 2/2 0/0 0/0 .sdata2 @3882 */ -SECTION_SDATA2 static u8 lit_3882[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; + mModelInfo.mpModel->setBaseScale(field_0x138); + mModelInfo.mpModel->i_setBaseTRMtx(m); + mModelInfo.mBrk.entry(mModelInfo.mpModel->getModelData()); -/* 80453E74-80453E78 002474 0004+00 1/1 0/0 0/0 .sdata2 @3883 */ -SECTION_SDATA2 static f32 lit_3883 = 40.0f; - -/* 80453E78-80453E7C 002478 0004+00 1/1 0/0 0/0 .sdata2 @3884 */ -SECTION_SDATA2 static f32 lit_3884 = -250.0f; - -/* 80453E7C-80453E80 00247C 0004+00 3/3 0/0 0/0 .sdata2 @3885 */ -SECTION_SDATA2 static f32 lit_3885 = 1.0f; + dComIfGd_setList(); + mDoExt_modelUpdateDL(mModelInfo.mpModel); + mModelInfo.mBrk.remove(mModelInfo.mpModel->getModelData()); + return 1; +} /* 801AE000-801AE19C 1A8940 019C+00 1/0 0/0 0/0 .text dThunder_Draw__FP10dThunder_c */ -#ifdef NONMATCHING -// needs to have inline defined -void dThunder_Draw(dThunder_c* i_dthunderP) { - i_dthunderP->draw(); +static int dThunder_Draw(dThunder_c* i_this) { + return i_this->draw(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dThunder_Draw(dThunder_c* param_0) { - nofralloc -#include "asm/d/d_ky_thunder/dThunder_Draw__FP10dThunder_c.s" + +int dThunder_c::execute(dThunder_c* i_thunder) { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + + if (env_light->mThunderEff.mStateTimer < 10) { + cLib_addCalc(&mBrkSpeed, 0.1f, 0.05f, 0.017f, 9.999999747378752e-06f); + } + + mModelInfo.mBrk.setPlaySpeed(mBrkSpeed); + if (mModelInfo.mBrk.play()) { + mDoAud_mEnvSe_startFarThunderSe(&mThunderPos); + fopKyM_Delete(i_thunder); + } + + f32 fvar7; + if (dComIfGd_getView() != NULL) { + fvar7 = dComIfGd_getView()->mFovy / 60.0f; + if (fvar7 >= 1.0f) { + fvar7 = 1.0f; + } + + fvar7 = fvar7 * fvar7 * fvar7; + } else { + fvar7 = 1.0f; + } + + fvar7 *= mBrkSpeed; + + if (env_light->mThunderEff.mStateTimer < 10) { + field_0x138.x += fvar7 * field_0x138.x * 0.01f * cM_ssin(field_0x16a); + field_0x138.y += fvar7 * field_0x138.y * 0.01f * cM_scos(field_0x16c); + field_0x16a += -25000; + field_0x16c += 28900; + } else { + field_0x138.x += fvar7 * field_0x138.x * 0.02f * cM_ssin(field_0x16a); + field_0x138.y += fvar7 * field_0x138.y * 0.02f * cM_scos(field_0x16c); + field_0x16a += -35000; + field_0x16c += 38900; + } + + return 1; } -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80453E80-80453E84 002480 0004+00 2/2 0/0 0/0 .sdata2 @3923 */ -SECTION_SDATA2 static f32 lit_3923 = 1.0f / 10.0f; - -/* 80453E84-80453E88 002484 0004+00 1/1 0/0 0/0 .sdata2 @3924 */ -SECTION_SDATA2 static f32 lit_3924 = 1.0f / 20.0f; - -/* 80453E88-80453E8C 002488 0004+00 1/1 0/0 0/0 .sdata2 @3925 */ -SECTION_SDATA2 static f32 lit_3925 = 0.017000000923871994f; - -/* 80453E8C-80453E90 00248C 0004+00 1/1 0/0 0/0 .sdata2 @3926 */ -SECTION_SDATA2 static f32 lit_3926 = 9.999999747378752e-06f; - -/* 80453E90-80453E94 002490 0004+00 1/1 0/0 0/0 .sdata2 @3927 */ -SECTION_SDATA2 static f32 lit_3927 = 60.0f; - -/* 80453E94-80453E98 002494 0004+00 1/1 0/0 0/0 .sdata2 @3928 */ -SECTION_SDATA2 static f32 lit_3928 = 1.0f / 100.0f; - -/* 80453E98-80453E9C 002498 0004+00 1/1 0/0 0/0 .sdata2 @3929 */ -SECTION_SDATA2 static f32 lit_3929 = 1.0f / 50.0f; /* 801AE19C-801AE374 1A8ADC 01D8+00 1/0 0/0 0/0 .text dThunder_Execute__FP10dThunder_c */ -#ifdef NONMATCHING -// needs to have inline defined -void dThunder_Execute(dThunder_c* i_dthunderP) { - i_dthunderP->execute(); +static int dThunder_Execute(dThunder_c* i_this) { + return i_this->execute(i_this); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dThunder_Execute(dThunder_c* param_0) { - nofralloc -#include "asm/d/d_ky_thunder/dThunder_Execute__FP10dThunder_c.s" -} -#pragma pop -#endif /* 801AE374-801AE37C 1A8CB4 0008+00 1/0 0/0 0/0 .text dThunder_IsDelete__FP10dThunder_c */ -static bool dThunder_IsDelete(dThunder_c* param_0) { - return true; +static int dThunder_IsDelete(dThunder_c* i_this) { + return 1; +} + +int dThunder_c::thunder_delete(dThunder_c* i_thunder) { + i_thunder->~dThunder_c(); + return 1; } /* 801AE37C-801AE3FC 1A8CBC 0080+00 1/0 0/0 0/0 .text dThunder_Delete__FP10dThunder_c */ -#ifdef NONMATCHING -// needs to have destructor defined -void dThunder_Delete(dThunder_c* i_dthunderP) { - thunder_delete(i_dthunderP); +static int dThunder_Delete(dThunder_c* i_this) { + return i_this->thunder_delete(i_this); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dThunder_Delete(dThunder_c* param_0) { - nofralloc -#include "asm/d/d_ky_thunder/dThunder_Delete__FP10dThunder_c.s" -} -#pragma pop -#endif /* 801AE3FC-801AE458 1A8D3C 005C+00 1/0 0/0 0/0 .text dThunder_Create__FP12kankyo_class */ -static int dThunder_Create(kankyo_class* param_0) { - dThunder_c* thunder_ptr = (dThunder_c*)param_0; - int ret; +static int dThunder_Create(kankyo_class* i_this) { + dThunder_c* this_ = (dThunder_c*)i_this; - if (thunder_ptr->createHeap() == 0) { - return 5; - } else { - ret = thunder_ptr->create(); - thunder_ptr->adjustHeap(); + if (!this_->createHeap()) { + return cPhs_ERROR_e; } + int ret = this_->create(); + this_->adjustHeap(); + return ret; } -/* ############################################################################################## */ -/* 80394F40-80394F40 0215A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80394F40 = "Always"; -SECTION_DEAD static char const* const stringBase_80394F47 = "R_SP30"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80394F4E = "\0"; -#pragma pop - -/* 80453E9C-80453EA0 00249C 0004+00 1/1 0/0 0/0 .sdata2 @4079 */ -SECTION_SDATA2 static f32 lit_4079 = 0.5f; - -/* 80453EA0-80453EA4 0024A0 0004+00 1/1 0/0 0/0 .sdata2 @4080 */ -SECTION_SDATA2 static f32 lit_4080 = 0.25f; - -/* 80453EA4-80453EA8 0024A4 0004+00 1/1 0/0 0/0 .sdata2 @4081 */ -SECTION_SDATA2 static f32 lit_4081 = 14.0f; - -/* 80453EA8-80453EAC 0024A8 0004+00 1/1 0/0 0/0 .sdata2 @4082 */ -SECTION_SDATA2 static f32 lit_4082 = 20.0f; - -/* 80453EAC-80453EB0 0024AC 0004+00 1/1 0/0 0/0 .sdata2 @4083 */ -SECTION_SDATA2 static f32 lit_4083 = 60000.0f; - -/* 80453EB0-80453EB4 0024B0 0004+00 1/1 0/0 0/0 .sdata2 @4084 */ -SECTION_SDATA2 static f32 lit_4084 = -5000.0f; - -/* 80453EB4-80453EB8 0024B4 0004+00 1/1 0/0 0/0 .sdata2 @4085 */ -SECTION_SDATA2 static f32 lit_4085 = 2000.0f; - -/* 80453EB8-80453EBC 0024B8 0004+00 1/1 0/0 0/0 .sdata2 @4086 */ -SECTION_SDATA2 static f32 lit_4086 = 24.0f; - -/* 80453EBC-80453EC0 0024BC 0004+00 1/1 0/0 0/0 .sdata2 @4087 */ -SECTION_SDATA2 static f32 lit_4087 = 2500.0f; - -/* 80453EC0-80453EC4 0024C0 0004+00 1/1 0/0 0/0 .sdata2 @4088 */ -SECTION_SDATA2 static f32 lit_4088 = 6000.0f; - -/* 80453EC4-80453EC8 0024C4 0004+00 1/1 0/0 0/0 .sdata2 @4089 */ -SECTION_SDATA2 static f32 lit_4089 = 3.0f / 20.0f; - -/* 80453EC8-80453ED0 0024C8 0004+04 1/1 0/0 0/0 .sdata2 @4090 */ -SECTION_SDATA2 static f32 lit_4090[1 + 1 /* padding */] = { - 1.0f / 5.0f, - /* padding */ - 0.0f, -}; - -/* 80453ED0-80453ED8 0024D0 0008+00 1/1 0/0 0/0 .sdata2 @4091 */ -SECTION_SDATA2 static f64 lit_4091 = 0.5; - -/* 80453ED8-80453EDC 0024D8 0004+00 1/1 0/0 0/0 .sdata2 @4092 */ -SECTION_SDATA2 static f32 lit_4092 = -1.0f; - -/* 80453EDC-80453EE0 0024DC 0004+00 1/1 0/0 0/0 .sdata2 @4093 */ -SECTION_SDATA2 static f32 lit_4093 = 100000.0f; - -/* 80453EE0-80453EE4 0024E0 0004+00 1/1 0/0 0/0 .sdata2 @4094 */ -SECTION_SDATA2 static f32 lit_4094 = 19635.0f; - -/* 80453EE4-80453EE8 0024E4 0004+00 1/1 0/0 0/0 .sdata2 @4095 */ -SECTION_SDATA2 static f32 lit_4095 = 260.0f; - -/* 80453EE8-80453EEC 0024E8 0004+00 1/1 0/0 0/0 .sdata2 @4096 */ -SECTION_SDATA2 static f32 lit_4096 = 4592.0f; - -/* 80453EEC-80453EF0 0024EC 0004+00 1/1 0/0 0/0 .sdata2 @4097 */ -SECTION_SDATA2 static f32 lit_4097 = 1507.0f; - -/* 80453EF0-80453EF4 0024F0 0004+00 1/1 0/0 0/0 .sdata2 @4098 */ -SECTION_SDATA2 static f32 lit_4098 = 100.0f; - -/* 80453EF4-80453EF8 0024F4 0004+00 1/1 0/0 0/0 .sdata2 @4099 */ -SECTION_SDATA2 static f32 lit_4099 = 3.0f / 10.0f; - /* 801AE458-801AE938 1A8D98 04E0+00 1/1 0/0 0/0 .text create__10dThunder_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dThunder_c::create() { - nofralloc -#include "asm/d/d_ky_thunder/create__10dThunder_cFv.s" +int dThunder_c::create() { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + camera_class* camera_p = dComIfGp_getCamera(0); + cXyz spB8; + cXyz spC4; + cXyz spD0; + f32 var_f31; + f32 var_f30; + f32 var_f29; + f32 var_f29_2; + f32 var_r28; + f32 var_r27; + + new (this) dThunder_c(); + + J3DModelData* modelData; + if (cM_rndF(1.0f) < 0.5f) { + modelData = (J3DModelData*)dComIfG_getObjectRes("Always", EF_THUNDER01_BMD); + } else { + modelData = (J3DModelData*)dComIfG_getObjectRes("Always", EF_THUNDER02_BMD); + } + + mModelInfo.mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x1000000); + if (mModelInfo.mpModel == NULL) { + return cPhs_ERROR_e; + } + + J3DAnmTevRegKey* canm = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Always", EF_THUNDER_BRK); + if (!mModelInfo.mBrk.init(modelData, canm, TRUE, 0, 1.0f, 0, -1)) { + return cPhs_ERROR_e; + } + + mBrkSpeed = 1.0f; + mModelInfo.mBrk.setPlaySpeed(mBrkSpeed); + + if (env_light->mThunderEff.mStateTimer < 10) { + var_f29 = 1.0f; + } else { + var_f29 = 0.25f; + } + + field_0x168 = cLib_targetAngleY(&camera_p->mLookat.mEye, &camera_p->mLookat.mCenter); + + if (!(g_Counter.mCounter0 & 1)) { + field_0x168 += 0x7FFF; + } + + var_r28 = 14.0f; + var_r27 = 20.0f; + var_f31 = var_r28; + var_f30 = var_r27; + spC4.set(60000.0f, -5000.0f, 0.0f); + field_0x15c = 2000.0f; + + if (env_light->mThunderEff.mStateTimer >= 10) { + var_f31 = var_r27; + var_f30 = 24.0f; + field_0x15c = 2500.0f; + spC4.y = 6000.0f; + } + + if (!strcmp(dComIfGp_getStartStageName(), "R_SP30") && dComIfGp_roomControl_getStayNo() == 4) { + var_r28 = 0.1f; + var_r27 = 0.25f; + var_f31 = 0.15f; + var_f30 = 0.2f; + } + + field_0x15c = var_f29 * cM_rndFX(field_0x15c); + field_0x138.x = var_f29 * (var_r28 + cM_rndF(var_r27 - var_r28)); + + if (cM_rndFX(1.0f) >= 0.5) { + field_0x138.x *= -1.0f; + } + + field_0x138.y = var_f29 * (var_f31 + cM_rndF(var_f30 - var_f31)); + field_0x138.z = 1.0f; + + dKyr_get_vectle_calc(&camera_p->mLookat.mEye, &camera_p->mLookat.mCenter, &spB8); + + // JMAFastSqrt doesn't match here when it should, probably needs to be fixed + // var_f29_2 = JMAFastSqrt(spB8.x * spB8.x + spB8.z * spB8.z); + + var_f29_2 = spB8.x * spB8.x + spB8.z * spB8.z; + if (var_f29_2 > 0.0f) { + f32 tmp = __frsqrtes(var_f29_2); + var_f29_2 = tmp * var_f29_2; + } + + s16 temp_r28 = cM_atan2s(spB8.x, spB8.z); + s16 temp_r31 = cM_atan2s(spB8.y, var_f29_2); + + if (cM_rndFX(1.0f) >= 0.0f) { + temp_r28 += 0x4000; + } else { + temp_r28 -= 0x4000; + } + + spD0.x = cM_scos(temp_r31) * cM_ssin(temp_r28); + spD0.z = cM_scos(temp_r31) * cM_scos(temp_r28); + + f32 temp_f1_3 = cM_rndF(spC4.x); + mThunderPos.x = camera_p->mLookat.mEye.x + (spB8.x * 100000.0f) + (spD0.x * temp_f1_3); + mThunderPos.y = camera_p->mLookat.mEye.y + 2000.0f + cM_rndF(spC4.y); + mThunderPos.z = camera_p->mLookat.mEye.z + (spB8.z * 100000.0f) + (spD0.z * temp_f1_3); + + if (!strcmp(dComIfGp_getStartStageName(), "R_SP30") && dComIfGp_roomControl_getStayNo() == 4) { + mThunderPos.x = cM_rndFX(260.0f) + 19635.0f; + mThunderPos.y = 4592.0f; + mThunderPos.z = cM_rndFX(100.0f) + 1507.0f; + } + + if (cM_rndF(1.0f) < 0.3f) { + field_0x150.x = -mThunderPos.x; + field_0x150.y = -mThunderPos.y; + field_0x150.z = -mThunderPos.z; + mDoAud_mEnvSe_startFarThunderSe(&field_0x150); + } + + return cPhs_COMPLEATE_e; } -#pragma pop /* ############################################################################################## */ /* 803BC1D8-803BC1EC -00001 0014+00 1/0 0/0 0/0 .data l_dThunder_Method */ -SECTION_DATA static void* l_dThunder_Method[5] = { - (void*)dThunder_Create__FP12kankyo_class, (void*)dThunder_Delete__FP10dThunder_c, - (void*)dThunder_Execute__FP10dThunder_c, (void*)dThunder_IsDelete__FP10dThunder_c, - (void*)dThunder_Draw__FP10dThunder_c, +static leafdraw_method_class l_dThunder_Method = { + (process_method_func)dThunder_Create, (process_method_func)dThunder_Delete, + (process_method_func)dThunder_Execute, (process_method_func)dThunder_IsDelete, + (process_method_func)dThunder_Draw, }; /* 803BC1EC-803BC218 -00001 0028+04 0/0 0/0 1/0 .data g_profile_KY_THUNDER */ -SECTION_DATA extern void* g_profile_KY_THUNDER[10 + 1 /* padding */] = { - (void*)0xFFFFFFFD, - (void*)0x0007FFFD, - (void*)0x02D90000, - (void*)&g_fpcLf_Method, - (void*)0x00000170, - (void*)NULL, - (void*)NULL, - (void*)&g_fopKy_Method, - (void*)0x00060000, - (void*)&l_dThunder_Method, - /* padding */ - NULL, +extern kankyo_process_profile_definition g_profile_KY_THUNDER = { + -3, + 7, + -3, + PROC_KY_THUNDER, + 0, + &g_fpcLf_Method.mBase, + sizeof(dThunder_c), + 0, + 0, + &g_fopKy_Method, + 6, + 0, + 0, + &l_dThunder_Method, }; - -/* 80394F40-80394F40 0215A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index 4ae9fc98bb..3b7d2ec08e 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -4,46 +4,59 @@ // #include "d/d_scope.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" -#include "dolphin/types.h" // // Types: // -struct dScope_c { +class dScope_c : public dMeterSub_c { +public: + enum { + /* 0 */ PROC_OPEN, + /* 1 */ PROC_MOVE, + /* 2 */ PROC_CLOSE, + }; + /* 80193690 */ dScope_c(u8); - /* 8019396C */ ~dScope_c(); - /* 80193B90 */ void _execute(u32); - /* 80193C68 */ void draw(); - /* 80193FA0 */ void isDead(); /* 80193FB4 */ void open_init(); /* 80193FD0 */ void open_proc(); /* 80194048 */ void move_init(); /* 8019404C */ void move_proc(); /* 80194050 */ void close_init(); /* 80194054 */ void close_proc(); -}; -struct dMeterSub_c { - /* 801940D4 */ ~dMeterSub_c(); - /* 8019411C */ bool _create(); - /* 80194124 */ bool _delete(); - /* 8019412C */ void draw(); - /* 80194130 */ bool _execute(u32); - /* 80194138 */ bool isDead(); -}; + /* 80193C68 */ virtual void draw(); + /* 8019396C */ virtual ~dScope_c(); + /* 80193B90 */ virtual int _execute(u32); + /* 80193FA0 */ virtual int isDead(); -struct ResTIMG {}; - -struct JUtility { - struct TColor { - /* 80193960 */ TColor(); - }; -}; - -struct J2DPicture { - /* 802FC708 */ J2DPicture(ResTIMG const*); + /* 0x04 */ J2DScreen* mHawkEyeScrn; + /* 0x08 */ J2DScreen* mZoomInOutScrn; + /* 0x0C */ CPaneMgr* mHawkEyeRootPane; + /* 0x10 */ CPaneMgr* mZoomInOutRootPane; + /* 0x14 */ CPaneMgr* mHawkEyePanes[3]; + /* 0x20 */ CPaneMgr* mZoomInOutPanes[3][2]; + /* 0x38 */ J2DPicture* mpWipeTex; + /* 0x3C */ J2DPicture* mpBlackTex; + /* 0x40 */ u8 field_0x40[0x48 - 0x40]; + /* 0x48 */ JUtility::TColor field_0x48[2]; + /* 0x50 */ JUtility::TColor field_0x50[2]; + /* 0x58 */ u32 field_0x58; + /* 0x5C */ u32 field_0x5c; + /* 0x60 */ u8 field_0x60[0x78 - 0x60]; + /* 0x78 */ f32 mWidth; + /* 0x7C */ f32 mHeight; + /* 0x80 */ f32 mScale; + /* 0x84 */ f32 mAlpha; + /* 0x88 */ s16 mOpenTimer; + /* 0x8A */ s16 field_0x8a; + /* 0x8C */ u8 mProcess; + /* 0x8D */ u8 field_0x8d; + /* 0x8E */ u8 mIsDead; + /* 0x8F */ u8 field_0x8f; }; // @@ -63,11 +76,11 @@ extern "C" void move_proc__8dScope_cFv(); extern "C" void close_init__8dScope_cFv(); extern "C" void close_proc__8dScope_cFv(); extern "C" void __dt__11dMeterSub_cFv(); -extern "C" bool _create__11dMeterSub_cFv(); -extern "C" bool _delete__11dMeterSub_cFv(); +extern "C" int _create__11dMeterSub_cFv(); +extern "C" int _delete__11dMeterSub_cFv(); extern "C" void draw__11dMeterSub_cFv(); -extern "C" bool _execute__11dMeterSub_cFUl(); -extern "C" bool isDead__11dMeterSub_cFv(); +extern "C" int _execute__11dMeterSub_cFUl(); +extern "C" int isDead__11dMeterSub_cFv(); extern "C" void __sinit_d_scope_cpp(); extern "C" extern char const* const d_d_scope__stringBase0; @@ -86,102 +99,82 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_23(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; // // Declarations: // -/* ############################################################################################## */ -/* 803949F0-803949F0 021050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803949F0 = "wipe_00.bti"; -SECTION_DEAD static char const* const stringBase_803949FC = "tt_block8x8.bti"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80394A0C = "\0\0\0"; -#pragma pop - /* 803BB618-803BB624 018738 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 803BB624-803BB630 -00001 000C+00 0/1 0/0 0/0 .data @3693 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3693[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)open_init__8dScope_cFv, -}; -#pragma pop - -/* 803BB630-803BB63C -00001 000C+00 0/1 0/0 0/0 .data @3694 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3694[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)move_init__8dScope_cFv, -}; -#pragma pop - -/* 803BB63C-803BB648 -00001 000C+00 0/1 0/0 0/0 .data @3695 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3695[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)close_init__8dScope_cFv, -}; -#pragma pop - /* 803BB648-803BB66C 018768 0024+00 2/3 0/0 0/0 .data init_process */ -SECTION_DATA static u8 init_process[36] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +typedef void (dScope_c::*initFunc)(); +SECTION_DATA initFunc init_process[] = { + &dScope_c::open_init, + &dScope_c::move_init, + &dScope_c::close_init, }; -/* 803BB66C-803BB678 -00001 000C+00 0/1 0/0 0/0 .data @3696 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3696[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)open_proc__8dScope_cFv, -}; -#pragma pop - -/* 803BB678-803BB684 -00001 000C+00 0/1 0/0 0/0 .data @3697 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3697[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)move_proc__8dScope_cFv, -}; -#pragma pop - -/* 803BB684-803BB690 -00001 000C+00 0/1 0/0 0/0 .data @3698 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3698[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)close_proc__8dScope_cFv, -}; -#pragma pop - /* 803BB690-803BB6B4 0187B0 0024+00 1/2 0/0 0/0 .data move_process */ -SECTION_DATA static u8 move_process[36] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +typedef void (dScope_c::*moveFunc)(); +SECTION_DATA moveFunc move_process[] = { + &dScope_c::open_proc, + &dScope_c::move_proc, + &dScope_c::close_proc, }; +/* 80453A10-80453A14 002010 0004+00 4/4 0/0 0/0 .sdata2 @3756 */ +SECTION_SDATA2 static f32 lit_3756 = 3.0f; + +/* 80453A14-80453A18 002014 0004+00 4/4 0/0 0/0 .sdata2 @3757 */ +SECTION_SDATA2 static u8 lit_3757[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; + +extern void* __vt__11dMeterSub_c[8 + 3 /* padding */]; + +/* 80193690-80193960 18DFD0 02D0+00 0/0 1/1 0/0 .text __ct__8dScope_cFUc */ +dScope_c::dScope_c(u8 param_0) : field_0x58(-1), field_0x5c(-1) { + field_0x8d = param_0; + ResTIMG* mp_image = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "wipe_00.bti"); + + mHawkEyeScrn = NULL; + mHawkEyeRootPane = NULL; + mZoomInOutScrn = NULL; + mZoomInOutRootPane = NULL; + + for (int i = 0; i < 3; i++) { + mHawkEyePanes[i] = NULL; + } + + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 2; j++) { + mZoomInOutPanes[i][j] = NULL; + } + } + + mpWipeTex = new J2DPicture(mp_image); + mpWipeTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255)); + mWidth = mp_image->width; + mHeight = mp_image->height; + + mp_image = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); + mpBlackTex = new J2DPicture(mp_image); + mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255)); + mScale = lit_3756; + mAlpha = FLOAT_LABEL(lit_3757); + mOpenTimer = 0; + field_0x8a = 0; + mProcess = PROC_OPEN; + mIsDead = false; + (this->*init_process[mProcess])(); +} + /* 803BB6B4-803BB6D4 0187D4 0020+00 2/2 0/0 0/0 .data __vt__8dScope_c */ SECTION_DATA extern void* __vt__8dScope_c[8] = { (void*)NULL /* RTTI */, (void*)NULL, @@ -206,59 +199,76 @@ SECTION_DATA extern void* __vt__11dMeterSub_c[8 + 3 /* padding */] = { NULL, }; -/* 80453A10-80453A14 002010 0004+00 4/4 0/0 0/0 .sdata2 @3756 */ -SECTION_SDATA2 static f32 lit_3756 = 3.0f; - -/* 80453A14-80453A18 002014 0004+00 4/4 0/0 0/0 .sdata2 @3757 */ -SECTION_SDATA2 static u8 lit_3757[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80453A18-80453A20 002018 0008+00 1/1 0/0 0/0 .sdata2 @3759 */ -SECTION_SDATA2 static f64 lit_3759 = 4503599627370496.0 /* cast u32 to float */; - -/* 80193690-80193960 18DFD0 02D0+00 0/0 1/1 0/0 .text __ct__8dScope_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dScope_c::dScope_c(u8 param_0) { - nofralloc -#include "asm/d/d_scope/__ct__8dScope_cFUc.s" -} -#pragma pop - -/* 80193960-8019396C 18E2A0 000C+00 1/1 20/20 0/0 .text __ct__Q28JUtility6TColorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUtility::TColor::TColor() { - nofralloc -#include "asm/d/d_scope/__ct__Q28JUtility6TColorFv.s" -} -#pragma pop - /* 8019396C-80193B90 18E2AC 0224+00 1/0 0/0 0/0 .text __dt__8dScope_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dScope_c::~dScope_c() { - nofralloc -#include "asm/d/d_scope/__dt__8dScope_cFv.s" +dScope_c::~dScope_c() { + if (mHawkEyeScrn != NULL) { + delete mHawkEyeScrn; + mHawkEyeScrn = NULL; + } + + if (mHawkEyeRootPane != NULL) { + delete mHawkEyeRootPane; + mHawkEyeRootPane = NULL; + } + + for (int i = 0; i < 3; i++) { + if (mHawkEyePanes[i] != NULL) { + delete mHawkEyePanes[i]; + mHawkEyePanes[i] = NULL; + } + } + + if (mZoomInOutScrn != NULL) { + delete mZoomInOutScrn; + mZoomInOutScrn = NULL; + } + + if (mZoomInOutRootPane != NULL) { + delete mZoomInOutRootPane; + mZoomInOutRootPane = NULL; + } + + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 2; j++) { + if (mZoomInOutPanes[i][j] != NULL) { + delete mZoomInOutPanes[i][j]; + mZoomInOutPanes[i][j] = NULL; + } + } + } + + delete mpWipeTex; + mpWipeTex = NULL; + + delete mpBlackTex; + mpBlackTex = NULL; + + dMeter2Info_setScopeZoomPointer(0); } -#pragma pop /* 80193B90-80193C68 18E4D0 00D8+00 1/0 0/0 0/0 .text _execute__8dScope_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScope_c::_execute(u32 param_0) { - nofralloc -#include "asm/d/d_scope/_execute__8dScope_cFUl.s" +int dScope_c::_execute(u32) { + u8 old_proc = mProcess; + (this->*move_process[mProcess])(); + + if (!dComIfGp_checkCameraAttentionStatus(0, 8)) { + mProcess = PROC_CLOSE; + } + + if (mProcess != old_proc) { + (this->*init_process[mProcess])(); + } + + if (mProcess != PROC_CLOSE) { + dComIfGp_setCStickStatusForce(61, 10, 3); + + if (i_dComIfGp_checkPlayerStatus0(0, 0x1000)) { + dComIfGp_setRStatusForce(0x11, 3); + } + } + + return 1; } -#pragma pop /* ############################################################################################## */ /* 80453A20-80453A24 002020 0004+00 1/1 0/0 0/0 .sdata2 @3879 */ @@ -277,34 +287,68 @@ SECTION_SDATA2 static f32 lit_3882 = 224.0f; SECTION_SDATA2 static f32 lit_3883 = 608.0f; /* 80193C68-80193FA0 18E5A8 0338+00 1/0 0/0 0/0 .text draw__8dScope_cFv */ +// matches with literals and when vtables in this TU are fixed +#ifdef NONMATCHING +void dScope_c::draw() { + dComIfGp_getCurrentGrafPort()->setup2D(); + f32 temp_f1 = mScale; + f32 temp_f31 = mWidth * temp_f1; + f32 temp_f30 = mHeight * temp_f1; + u8 alpha = mAlpha * 255.0f; + + if (i_dComIfGp_checkPlayerStatus0(0, 0x1000)) { + J2DDrawLine(304.0f, mDoGph_gInf_c::getMinYF(), 304.0f, mDoGph_gInf_c::getMaxYF(), + JUtility::TColor(255, 0, 0, alpha), 6); + J2DDrawLine(mDoGph_gInf_c::getMinXF(), 224.0f, mDoGph_gInf_c::getMaxXF(), 224.0f, + JUtility::TColor(255, 0, 0, alpha), 6); + } + + mpWipeTex->setAlpha(alpha); + mpBlackTex->setAlpha(alpha); + + f32 temp_f29 = 304.0f - temp_f31; + f32 temp_f28 = 304.0f + temp_f31; + f32 temp_f27 = 224.0f - temp_f30; + f32 temp_f26 = 224.0f + temp_f30; + + mpWipeTex->draw(temp_f29, temp_f27, temp_f31, temp_f30, false, false, false); + mpWipeTex->draw(304.0f, temp_f27, temp_f31, temp_f30, true, false, false); + mpWipeTex->draw(temp_f29, 224.0f, temp_f31, temp_f30, false, true, false); + mpWipeTex->draw(304.0f, 224.0f, temp_f31, temp_f30, true, true, false); + + mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(), + mDoGph_gInf_c::getWidthF(), temp_f27 - mDoGph_gInf_c::getMinYF(), false, false, + false); + mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), temp_f26, mDoGph_gInf_c::getWidthF(), + mDoGph_gInf_c::getMaxYF() - temp_f26, false, false, false); + mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), temp_f27, temp_f29 - mDoGph_gInf_c::getMinXF(), + temp_f26 - temp_f27, false, false, false); + mpBlackTex->draw(temp_f28, temp_f27, mDoGph_gInf_c::getMaxXF() - temp_f28, temp_f26 - temp_f27, + false, false, false); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dScope_c::draw() { +// asm void dScope_c::draw() { +extern "C" asm void draw__8dScope_cFv() { nofralloc #include "asm/d/d_scope/draw__8dScope_cFv.s" } #pragma pop +#endif /* 80193FA0-80193FB4 18E8E0 0014+00 1/0 0/0 0/0 .text isDead__8dScope_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScope_c::isDead() { - nofralloc -#include "asm/d/d_scope/isDead__8dScope_cFv.s" +int dScope_c::isDead() { + return mIsDead != false; } -#pragma pop /* 80193FB4-80193FD0 18E8F4 001C+00 1/0 0/0 0/0 .text open_init__8dScope_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScope_c::open_init() { - nofralloc -#include "asm/d/d_scope/open_init__8dScope_cFv.s" +void dScope_c::open_init() { + mScale = lit_3756; + mAlpha = FLOAT_LABEL(lit_3757); + mOpenTimer = 0; } -#pragma pop /* ############################################################################################## */ /* 80453A34-80453A38 002034 0004+00 2/2 0/0 0/0 .sdata2 @3902 */ @@ -320,6 +364,20 @@ SECTION_SDATA2 static f32 lit_3904 = 1.0f; SECTION_SDATA2 static f64 lit_3906 = 4503601774854144.0 /* cast s32 to float */; /* 80193FD0-80194048 18E910 0078+00 1/0 0/0 0/0 .text open_proc__8dScope_cFv */ +// matches with literals +#ifdef NONMATCHING +void dScope_c::open_proc() { + mOpenTimer++; + mScale = 3.0f - (mOpenTimer / 5.0f) * 1.5f; + mAlpha = 1.0f; + + if (mOpenTimer >= 5) { + mScale = 1.5f; + mAlpha = 1.0f; + mProcess = PROC_MOVE; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -328,23 +386,32 @@ asm void dScope_c::open_proc() { #include "asm/d/d_scope/open_proc__8dScope_cFv.s" } #pragma pop +#endif /* 80194048-8019404C 18E988 0004+00 1/0 0/0 0/0 .text move_init__8dScope_cFv */ -void dScope_c::move_init() { - /* empty function */ -} +void dScope_c::move_init() {} /* 8019404C-80194050 18E98C 0004+00 1/0 0/0 0/0 .text move_proc__8dScope_cFv */ -void dScope_c::move_proc() { - /* empty function */ -} +void dScope_c::move_proc() {} /* 80194050-80194054 18E990 0004+00 1/0 0/0 0/0 .text close_init__8dScope_cFv */ -void dScope_c::close_init() { - /* empty function */ -} +void dScope_c::close_init() {} /* 80194054-801940D4 18E994 0080+00 1/0 0/0 0/0 .text close_proc__8dScope_cFv */ +// matches with literals +#ifdef NONMATCHING +void dScope_c::close_proc() { + if (mOpenTimer > 0) { + mOpenTimer--; + mScale = 3.0f - (mOpenTimer / 5.0f) * 1.5f; + mAlpha = 1.0f; + } else { + mScale = 3.0f; + mAlpha = 0.0f; + mIsDead = true; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -353,55 +420,45 @@ asm void dScope_c::close_proc() { #include "asm/d/d_scope/close_proc__8dScope_cFv.s" } #pragma pop +#endif /* 801940D4-8019411C 18EA14 0048+00 1/0 0/0 0/0 .text __dt__11dMeterSub_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dMeterSub_c::~dMeterSub_c() { +// asm dMeterSub_c::~dMeterSub_c() { +extern "C" asm void __dt__11dMeterSub_cFv() { nofralloc #include "asm/d/d_scope/__dt__11dMeterSub_cFv.s" } #pragma pop /* 8019411C-80194124 18EA5C 0008+00 2/0 0/0 0/0 .text _create__11dMeterSub_cFv */ -bool dMeterSub_c::_create() { +// int dMeterSub_c::_create() { +extern "C" int _create__11dMeterSub_cFv() { return false; } /* 80194124-8019412C 18EA64 0008+00 2/0 0/0 0/0 .text _delete__11dMeterSub_cFv */ -bool dMeterSub_c::_delete() { +// int dMeterSub_c::_delete() { +extern "C" int _delete__11dMeterSub_cFv() { return false; } /* 8019412C-80194130 18EA6C 0004+00 1/0 0/0 0/0 .text draw__11dMeterSub_cFv */ -void dMeterSub_c::draw() { +// void dMeterSub_c::draw() { +extern "C" void draw__11dMeterSub_cFv() { /* empty function */ } /* 80194130-80194138 18EA70 0008+00 1/0 0/0 0/0 .text _execute__11dMeterSub_cFUl */ -bool dMeterSub_c::_execute(u32 param_0) { +// int dMeterSub_c::_execute(u32 param_0) { +extern "C" int _execute__11dMeterSub_cFUl() { return false; } /* 80194138-80194140 18EA78 0008+00 1/0 3/0 0/0 .text isDead__11dMeterSub_cFv */ -bool dMeterSub_c::isDead() { +// int dMeterSub_c::isDead() { +extern "C" int isDead__11dMeterSub_cFv() { return false; } - -/* 80194140-801941E4 18EA80 00A4+00 0/0 1/0 0/0 .text __sinit_d_scope_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_scope_cpp() { - nofralloc -#include "asm/d/d_scope/__sinit_d_scope_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80194140, __sinit_d_scope_cpp); -#pragma pop - -/* 803949F0-803949F0 021050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 45aceb1c4b..111de41c9d 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -4097,12 +4097,3 @@ extern "C" asm void __dt__18dScnKy_env_light_cFv() { #include "asm/d/kankyo/d_kankyo/__dt__18dScnKy_env_light_cFv.s" } #pragma pop - -/* ############################################################################################## */ -/* 80451070-80451078 -00001 0008+00 0/0 1/1 0/0 .sbss None */ -/* 80451070 0001+00 data_80451070 None */ -/* 80451071 0007+00 data_80451071 None */ -extern u8 struct_80451070[8]; -u8 struct_80451070[8]; - -/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp index 6a778ff5eb..23daffdd8c 100644 --- a/src/d/save/d_save.cpp +++ b/src/d/save/d_save.cpp @@ -4,11 +4,11 @@ */ #include "d/save/d_save.h" +#include "d/save/d_save_init.h" #include "Z2AudioLib/Z2AudioMgr.h" #include "d/com/d_com_inf_game.h" #include "d/meter/d_meter2_info.h" #include "dol2asm.h" -#include "dolphin/types.h" #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" // @@ -28,7 +28,6 @@ extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; // External References: // -extern "C" void setInitEventBit__Fv(); extern "C" void _savegpr_22(); extern "C" void _restgpr_22(); extern "C" void __div2i(); @@ -377,26 +376,24 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { return NO_ITEM; } -/* ############################################################################################## */ -/* 803A7270-803A7288 004390 0017+01 1/1 0/0 0/0 .data i_item_lst$4006 */ -static u8 i_item_lst[23] = { - 0x0A, 0x08, 0x06, 0x02, 0x09, 0x04, 0x03, 0x00, 0x01, 0x17, 0x14, 0x05, - 0x0F, 0x10, 0x11, 0x0B, 0x0C, 0x0D, 0x0E, 0x13, 0x12, 0x16, 0x15, -}; - /* 800332F8-80033354 02DC38 005C+00 2/2 0/0 0/0 .text setLineUpItem__17dSv_player_item_cFv */ void dSv_player_item_c::setLineUpItem() { - int i2 = 0; + static u8 i_item_lst[23] = { + 0x0A, 0x08, 0x06, 0x02, 0x09, 0x04, 0x03, 0x00, 0x01, 0x17, 0x14, 0x05, + 0x0F, 0x10, 0x11, 0x0B, 0x0C, 0x0D, 0x0E, 0x13, 0x12, 0x16, 0x15, + }; - for (int i1 = 0; i1 < 24; i1++) { - mItemSlots[i1] = NO_ITEM; + int slot_idx = 0; + + for (int i = 0; i < 24; i++) { + mItemSlots[i] = NO_ITEM; } - for (int i1 = 0; i1 < 23; i1++) { - u32 current = i_item_lst[i1]; + for (int i = 0; i < 23; i++) { + u32 current = i_item_lst[i]; if (mItems[current] != NO_ITEM) { - mItemSlots[i2] = current; - i2++; + mItemSlots[slot_idx] = current; + slot_idx++; } } } @@ -1198,24 +1195,24 @@ void dSv_event_c::init() { for (int i = 0; i < MAX_EVENTS; i++) { mEvent[i] = 0; } - setInitEventBit__Fv(); + setInitEventBit(); } /* 8003498C-800349A4 02F2CC 0018+00 1/1 27/27 58/58 .text onEventBit__11dSv_event_cFUs */ void dSv_event_c::onEventBit(u16 i_no) { - mEvent[(i_no >> 8)] |= (u8)i_no; + mEvent[i_no >> 8] |= (u8)i_no; } /* 800349A4-800349BC 02F2E4 0018+00 1/1 14/14 23/23 .text offEventBit__11dSv_event_cFUs */ void dSv_event_c::offEventBit(u16 i_no) { - mEvent[(i_no >> 8)] &= ~(u8)i_no; + mEvent[i_no >> 8] &= ~(u8)i_no; } /* 800349BC-800349E0 02F2FC 0024+00 3/3 77/77 153/153 .text isEventBit__11dSv_event_cCFUs */ BOOL dSv_event_c::isEventBit(u16 i_no) const { - return mEvent[(i_no >> 8)] & (i_no & 0xFF) ? TRUE : FALSE; + return mEvent[i_no >> 8] & (i_no & 0xFF) ? TRUE : FALSE; } /* 800349E0-80034A04 02F320 0024+00 0/0 12/12 17/17 .text setEventReg__11dSv_event_cFUsUc @@ -1693,18 +1690,20 @@ SECTION_DEAD static char const* const stringBase_8037926C = "SAVE size:%d\n"; int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { BOOL lantern_stolen; BOOL lantern_dropped; + + OSTime start; + OSTime time; OSTime play_time; bool lantern_not_recovered = false; bool tmp_lantern_check = false; u16 current_lantern_oil = 0; - // If haven't gotten then lantern back from the monkey if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) { // Store whether or not it's stolen and dropped - lantern_stolen = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[224]); - lantern_dropped = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[225]); + lantern_dropped = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[224]); + lantern_stolen = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[225]); // Then turn those events off dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[224]); @@ -1730,9 +1729,10 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { card_ptr += dataNum * QUEST_LOG_SIZE; dSv_save_c* savedata = dComIfGs_getSaveData(); - play_time = OSGetTime() - dComIfGs_getSaveStartTime(); - play_time += dComIfGs_getSaveTotalTime(); - // play_time += (); + start = dComIfGs_getSaveStartTime(); + time = OSGetTime(); + + play_time = (time - start) + dComIfGs_getSaveTotalTime(); // 3599940 = 999:59 in seconds if (dComIfGs_getSaveTotalTime() / OS_TIMER_CLOCK < 3599940) { @@ -1740,15 +1740,16 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { } savedata->getPlayer().getPlayerStatusB().setDateIpl(OSGetTime()); + memcpy(card_ptr, savedata, sizeof(dSv_save_c)); printf("Write size:%d\n", sizeof(dSv_save_c)); // Now that we've saved, reset events if needed if (lantern_not_recovered == true) { - if (lantern_stolen) { + if (lantern_dropped) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[224]); } - if (lantern_dropped) { + if (lantern_stolen) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[225]); } } @@ -1774,9 +1775,9 @@ asm int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { #endif /* 80035A04-80035BD0 030344 01CC+00 0/0 2/2 0/0 .text card_to_memory__10dSv_info_cFPci */ -int dSv_info_c::card_to_memory(char* card_ptr, int dataNum) { - card_ptr = card_ptr + dataNum * QUEST_LOG_SIZE; - memcpy(dComIfGs_getSaveData(), card_ptr, sizeof(dSv_save_c)); +int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) { + i_cardPtr = i_cardPtr + i_dataNum * QUEST_LOG_SIZE; + memcpy(dComIfGs_getSaveData(), i_cardPtr, sizeof(dSv_save_c)); if (OSGetSoundMode() == OS_SOUND_MODE_MONO) { g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(OS_SOUND_MODE_MONO); @@ -1795,12 +1796,12 @@ int dSv_info_c::card_to_memory(char* card_ptr, int dataNum) { dComIfGs_setKeyNum(6, 0); - if (dComIfGs_getItem(SLOT_9, 1) == W_HOOKSHOT) { + if (dComIfGs_getItem(SLOT_9, true) == W_HOOKSHOT) { dComIfGs_setItem(SLOT_10, W_HOOKSHOT); dComIfGs_setItem(SLOT_9, NO_ITEM); } - if (dComIfGs_getItem(SLOT_9, 1) == HOOKSHOT && dComIfGs_getItem(SLOT_10, true) == W_HOOKSHOT) { + if (dComIfGs_getItem(SLOT_9, true) == HOOKSHOT && dComIfGs_getItem(SLOT_10, true) == W_HOOKSHOT) { dComIfGs_setItem(SLOT_9, NO_ITEM); } @@ -1818,15 +1819,15 @@ int dSv_info_c::card_to_memory(char* card_ptr, int dataNum) { /* 80035BD0-80035C88 030510 00B8+00 0/0 3/3 0/0 .text initdata_to_card__10dSv_info_cFPci */ -int dSv_info_c::initdata_to_card(char* card_ptr, int dataNum) { - card_ptr = card_ptr + (dataNum * QUEST_LOG_SIZE); - dSv_save_c tmp; +int dSv_info_c::initdata_to_card(char* i_cardPtr, int i_dataNum) { + i_cardPtr = i_cardPtr + (i_dataNum * QUEST_LOG_SIZE); + dSv_save_c save; - tmp.init(); - tmp.getPlayer().getPlayerInfo().setPlayerName(""); - tmp.getPlayer().getPlayerInfo().setHorseName(""); - memcpy(card_ptr, &tmp, 0x958); - printf("INIT size:%d\n", 0x958); + save.init(); + save.getPlayer().getPlayerInfo().setPlayerName(""); + save.getPlayer().getPlayerInfo().setHorseName(""); + memcpy(i_cardPtr, &save, sizeof(dSv_save_c)); + printf("INIT size:%d\n", sizeof(dSv_save_c)); return 0; } diff --git a/src/d/save/d_save_init.cpp b/src/d/save/d_save_init.cpp index 7b0c3029b7..58311e4f3f 100644 --- a/src/d/save/d_save_init.cpp +++ b/src/d/save/d_save_init.cpp @@ -6,6 +6,4 @@ #include "d/save/d_save_init.h" /* 80035C88-80035C8C 0305C8 0004+00 0/0 1/1 0/0 .text setInitEventBit__Fv */ -void setInitEventBit() { - /* empty function */ -} +void setInitEventBit() {} diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 6d65f7954d..ac725f6b12 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -19,7 +19,7 @@ // struct J2DPrint { - /* 802F4658 */ void setBuffer(u32); + /* 802F4658 */ static void setBuffer(u32); }; struct J2DOrthoGraph { @@ -164,10 +164,10 @@ extern "C" u8 sManager__10JUTProcBar[4]; static ResTIMG* createTimg(u16 width, u16 height, u32 format) { u32 bufferSize = GXGetTexBufferSize(width, height, format, GX_FALSE, 0) + 0x20; ResTIMG* timg; - + timg = (ResTIMG*)JKRHeap::alloc(bufferSize, 0x20, NULL); - if (timg==NULL) { + if (timg == NULL) { return NULL; } @@ -239,14 +239,34 @@ bool data_80450BE7; #pragma pop /* 80007E44-80007F90 002784 014C+00 1/1 0/0 0/0 .text create__13mDoGph_gInf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoGph_gInf_c::create() { - nofralloc -#include "asm/m_Do/m_Do_graphic/create__13mDoGph_gInf_cFv.s" +void mDoGph_gInf_c::create() { + JFWDisplay::createManager(NULL, JKRHeap::sCurrentHeap, JUTXfb::UNK_2, true); + JFWDisplay::getManager()->setDrawDoneMethod(JFWDisplay::UNK_METHOD_1); + + JUTFader* faderPtr = new JUTFader(0, 0, JUTVideo::getManager()->getRenderMode()->fb_width, + JUTVideo::getManager()->getRenderMode()->efb_height, + JUtility::TColor(0, 0, 0, 0)); + setFader(faderPtr); + JFWDisplay::getManager()->setFader(faderPtr); + JUTProcBar::getManager()->setVisibleHeapBar(false); + JUTProcBar::getManager()->setVisible(false); + JUTDbPrint::getManager()->setVisible(false); + + mFrameBufferTimg = createTimg(304, 224, 6); + mFrameBufferTex = (char*)mFrameBufferTimg + sizeof(ResTIMG); + + mZbufferTimg = createTimg(304, 224, 3); + mZbufferTex = (char*)mZbufferTimg + sizeof(ResTIMG); + + J2DPrint::setBuffer(0x400); + mBlureFlag = false; + mFade = 0; + + mBackColor = g_clearColor; + mFadeColor = g_clearColor; + + VISetBlack(TRUE); } -#pragma pop /* ############################################################################################## */ /* 80450BE8-80450BF0 0000E8 0008+00 1/1 0/0 0/0 .sbss None */ @@ -257,6 +277,7 @@ void mDoGph_gInf_c::beginRender() { if (data_80450BE8) { JUTXfb::getManager()->setDrawingXfbIndex(-1); } + JFWDisplay::getManager()->beginRender(); } @@ -434,14 +455,10 @@ asm void mDoGph_gInf_c::calcFade() { #endif /* 8000841C-80008420 002D5C 0004+00 0/0 1/0 0/0 .text mDoGph_BlankingON__Fv */ -void mDoGph_BlankingON() { - /* empty function */ -} +void mDoGph_BlankingON() {} /* 80008420-80008424 002D60 0004+00 0/0 1/0 0/0 .text mDoGph_BlankingOFF__Fv */ -void mDoGph_BlankingOFF() { - /* empty function */ -} +void mDoGph_BlankingOFF() {} /* 80008424-80008450 002D64 002C+00 1/1 0/0 0/0 .text dScnPly_BeforeOfPaint__Fv */ static void dScnPly_BeforeOfPaint() { @@ -708,6 +725,38 @@ asm void mDoGph_gInf_c::bloom_c::draw() { /* 8000A160-8000A290 004AA0 0130+00 1/1 0/0 0/0 .text * retry_captue_frame__FP10view_classP15view_port_classi */ +#ifdef NONMATCHING +static void retry_captue_frame(view_class* param_0, view_port_class* param_1, int param_2) { + s16 width; + s16 x_orig; + s16 y_orig; + s16 height; + void* tex; + + x_orig = (int)param_1->mXOrig & 0xFFFFFFF8; + y_orig = (int)param_1->mYOrig & 0xFFFFFFF8; + width = (int)param_1->mWidth & 0xFFFFFFF8; + height = (int)param_1->mHeight & 0xFFFFFFF8; + tex = mDoGph_gInf_c::getFrameBufferTex(); + + if (!dComIfGp_isPauseFlag()) { + if (y_orig < 0) { + height += y_orig; + y_orig = -y_orig >> 1; + tex = (char*)tex + GXGetTexBufferSize(304, y_orig, + mDoGph_gInf_c::getFrameBufferTimg()->format, + GX_FALSE, 0); + } + + GXSetTexCopySrc(x_orig, y_orig, width, height); + GXSetTexCopyDst(width >> 1, height >> 1, mDoGph_gInf_c::getFrameBufferTimg()->format, + GX_TRUE); + GXCopyTex(tex, GX_FALSE); + GXPixModeSync(); + GXInvalidateTexAll(); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -716,6 +765,7 @@ static asm void retry_captue_frame(view_class* param_0, view_port_class* param_1 #include "asm/m_Do/m_Do_graphic/retry_captue_frame__FP10view_classP15view_port_classi.s" } #pragma pop +#endif /* 8000A290-8000A504 004BD0 0274+00 1/1 0/0 0/0 .text motionBlure__FP10view_class */ #pragma push @@ -813,6 +863,237 @@ SECTION_SDATA2 static f32 lit_5031[1 + 1 /* padding */] = { }; /* 8000A604-8000B118 004F44 0B14+00 0/0 1/0 0/0 .text mDoGph_Painter__Fv */ +// lots of regalloc / various issues +#ifdef NONMATCHING +int mDoGph_Painter() { + dComIfGp_particle_calcMenu(); + + JFWDisplay::getManager()->setFader(mDoGph_gInf_c::getFader()); + mDoGph_gInf_c::setClearColor(mDoGph_gInf_c::getBackColor()); + mDoGph_gInf_c::beginRender(); + GXSetAlphaUpdate(GX_DISABLE); + mDoGph_gInf_c::setBackColor(g_clearColor); + + j3dSys.drawInit(); + GXSetDither(GX_ENABLE); + + J2DOrthoGraph ortho(0.0f, 0.0f, 608.0f, 448.0f, -1.0f, 1.0f); + ortho.setOrtho(JGeometry::TBox2(mDoGph_gInf_c::getHeightF(), mDoGph_gInf_c::getWidthF(), + mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getMinXF()), + -1.0f, 1.0f); + ortho.setPort(); + + dComIfGp_setCurrentGrafPort(&ortho); + dComIfGd_drawCopy2D(); + + if (dComIfGp_getWindowNum() != 0) { + dDlst_window_c* window_p = dComIfGp_getWindow(0); + int camera_id = window_p->getCameraID(); + camera_class* camera_p = dComIfGp_getCamera(camera_id); + + if (camera_p != NULL) { + dComIfGd_imageDrawShadow(camera_p->mViewMtx); + view_port_class* view_port = window_p->getViewPort(); + + if (view_port->mXOrig != 0.0f || view_port->mYOrig != 0.0f) { + view_port_class new_port; + new_port.mXOrig = 0.0f; + new_port.mYOrig = 0.0f; + new_port.mWidth = 608.0f; + new_port.mHeight = 448.0f; + new_port.mNearZ = view_port->mNearZ; + new_port.mFarZ = view_port->mFarZ; + new_port.mScissor = view_port->mScissor; + + view_port = &new_port; + } + + GXSetViewport(view_port->mXOrig, view_port->mYOrig, view_port->mWidth, + view_port->mHeight, view_port->mNearZ, view_port->mFarZ); + GXSetScissor(view_port->mXOrig, view_port->mYOrig, view_port->mWidth, + view_port->mHeight); + + JPADrawInfo draw_info(camera_p->mViewMtx, camera_p->mFovy, camera_p->mAspect); + + dComIfGp_setCurrentWindow(window_p); + dComIfGp_setCurrentView(camera_p); + dComIfGp_setCurrentViewport(view_port); + GXSetProjection(camera_p->mProjMtx, GX_PERSPECTIVE); + PPCSync(); + + j3dSys.setViewMtx(camera_p->mViewMtx); + dKy_setLight(); + dComIfGd_drawOpaListSky(); + dComIfGd_drawXluListSky(); + + GXSetClipMode(GX_CLIP_ENABLE); + dComIfGd_drawOpaListBG(); + dComIfGd_drawOpaListDarkBG(); + dComIfGd_drawOpaListMiddle(); + + dComIfGp_particle_drawFogPri0_B(&draw_info); + dComIfGp_particle_drawNormalPri0_B(&draw_info); + + dComIfGd_drawShadow(camera_p->mViewMtx); + + dComIfGd_drawOpaList(); + dComIfGd_drawOpaListDark(); + dComIfGd_drawOpaListPacket(); + dComIfGd_drawXluListBG(); + dComIfGd_drawXluListDarkBG(); + + dComIfGp_particle_drawFogPri0_A(&draw_info); + dComIfGp_particle_drawNormalPri0_A(&draw_info); + + dComIfGd_drawXluList(); + dComIfGd_drawXluListDark(); + + j3dSys.reinitGX(); + GXSetClipMode(GX_CLIP_ENABLE); + + if (!dComIfGp_isPauseFlag()) { + motionBlure(camera_p); + drawDepth2(camera_p, view_port, dComIfGp_getCameraZoomForcus(camera_id)); + GXInvalidateTexAll(); + GXSetClipMode(GX_CLIP_ENABLE); + + if (g_env_light.field_0x12fa == 0) { + dComIfGd_drawOpaListInvisible(); + dComIfGd_drawXluListInvisible(); + } + + dComIfGp_particle_drawFogPri4(&draw_info); + dComIfGp_particle_drawProjection(&draw_info); + + dComIfGd_drawListZxlu(); + GXSetClipMode(GX_CLIP_ENABLE); + + dComIfGd_drawOpaListFilter(); + GXSetClipMode(GX_CLIP_ENABLE); + + dComIfGp_particle_drawFogPri1(&draw_info); + dComIfGp_particle_draw(&draw_info); + dComIfGp_particle_drawFogPri2(&draw_info); + dComIfGp_particle_drawFog(&draw_info); + dComIfGp_particle_drawFogPri3(&draw_info); + dComIfGp_particle_drawP1(&draw_info); + dComIfGp_particle_drawDarkworld(&draw_info); + + retry_captue_frame(camera_p, view_port, dComIfGp_getCameraZoomForcus(camera_id)); + GXSetClipMode(GX_CLIP_ENABLE); + + if (g_env_light.field_0x12fa == 1) { + dComIfGd_drawOpaListInvisible(); + dComIfGd_drawXluListInvisible(); + } + + dComIfGp_particle_drawScreen(&draw_info); + GXSetClipMode(GX_CLIP_ENABLE); + + dComIfGd_drawIndScreen(); + + if (!strcmp(dComIfGp_getStartStageName(), "F_SP124")) { + retry_captue_frame(camera_p, view_port, + dComIfGp_getCameraZoomForcus(camera_id)); + } + + GXSetViewport(0.0f, 0.0f, 608.0f, 448.0f, 0.0f, 1.0f); + + Mtx44 m; + C_MTXPerspective(m, 60.0f, 1.357143f, 1.0f, 100000.0f); + GXSetProjection(m, GX_PERSPECTIVE); + cXyz sp38c(0.0f, 0.0f, -2.0f); + cXyz sp398(0.0f, 1.0f, 0.0f); + + Mtx m2; + mDoMtx_lookAt(m2, &sp38c, &cXyz::Zero, &sp398, 0); + j3dSys.setViewMtx(m2); + dComIfGd_drawXluList2DScreen(); + + j3dSys.setViewMtx(camera_p->mViewMtx); + GXSetProjection(camera_p->mProjMtx, GX_PERSPECTIVE); + j3dSys.reinitGX(); + + if ((g_env_light.mCameraInWater || + !strcmp(dComIfGp_getStartStageName(), "D_MN08")) && + mDoGph_gInf_c::getBloom()->getEnable() && + mDoGph_gInf_c::getBloom()->getMonoColor()) + { + retry_captue_frame(camera_p, view_port, + dComIfGp_getCameraZoomForcus(camera_id)); + } + + mDoGph_gInf_c::getBloom()->draw(); + j3dSys.setViewMtx(camera_p->mViewMtx); + GXSetProjection(camera_p->mProjMtx, GX_PERSPECTIVE); + + dComIfGd_drawOpaList3Dlast(); + ortho.setOrtho( + JGeometry::TBox2(mDoGph_gInf_c::getHeightF(), mDoGph_gInf_c::getWidthF(), + mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getMinXF()), + 100000.0f, -100000.0f); + ortho.setPort(); + + Mtx m3; + PSMTXTrans(m3, 304.0f, 224.0f, 0.0f); + JPADrawInfo draw_info2(m3, 0.0f, 448.0f, 0.0f, 608.0f); + dComIfGp_particle_draw2Dgame(&draw_info2); + + trimming(camera_p, view_port); + + if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && !mDoGph_gInf_c::isFade()) { + mDoGph_gInf_c::calcFade(); + } + } + } + } + + GXSetClipMode(GX_CLIP_ENABLE); + dDlst_list_c::calcWipe(); + j3dSys.reinitGX(); + + ortho.setOrtho(JGeometry::TBox2(mDoGph_gInf_c::getHeightF(), mDoGph_gInf_c::getWidthF(), + mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getMinXF()), + 100000.0f, -100000.0f); + ortho.setPort(); + + Mtx m4; + PSMTXCopy(j3dSys.getViewMtx(), m4); + + Mtx m5; + PSMTXTrans(m5, 304.0f, 224.0f, 0.0f); + + JPADrawInfo draw_info3(m5, 0.0f, 448.0f, 0.0f, 608.0f); + + if (!dComIfGp_isPauseFlag()) { + dComIfGp_particle_draw2Dback(&draw_info3); + } + + dComIfGp_particle_draw2DmenuBack(&draw_info3); + ortho.setPort(); + + dComIfGd_draw2DOpa(); + drawItem3D(); + ortho.setPort(); + + dComIfGd_draw2DOpaTop(); + dComIfGd_draw2DXlu(); + + if (!dComIfGp_isPauseFlag()) { + dComIfGp_particle_draw2Dback(&draw_info3); + } + + if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && !mDoGph_gInf_c::isFade()) { + mDoGph_gInf_c::calcFade(); + } + + dComIfGp_particle_draw2DmenuFore(&draw_info3); + j3dSys.setViewMtx(m4); + + mDoGph_gInf_c::endRender(); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -821,6 +1102,7 @@ asm void mDoGph_Painter() { #include "asm/m_Do/m_Do_graphic/mDoGph_Painter__Fv.s" } #pragma pop +#endif /* 8000B118-8000B174 005A58 005C+00 0/0 1/0 0/0 .text __dt__13J2DOrthoGraphFv */ #pragma push @@ -846,8 +1128,7 @@ int mDoGph_Create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_m_Do_graphic_cpp() { - nofralloc +asm void __sinit_m_Do_graphic_cpp(){nofralloc #include "asm/m_Do/m_Do_graphic/__sinit_m_Do_graphic_cpp.s" } #pragma pop @@ -861,5 +1142,3 @@ REGISTER_CTORS(0x8000B1D0, __sinit_m_Do_graphic_cpp); s32 daPy_py_c::getAtnActorID() const { return -1; } - -/* 80373DD0-80373DD0 000430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */