diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-09-09 10:41:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-09 20:41:28 +0300 |
| commit | ee0c0f12acc4c9c6cc63d3c0c943a3b691c5d742 (patch) | |
| tree | b55977c517b025bb833e51c0be8e5672ca94910c | |
| parent | 8386cefa3d5bb177e61f98b650671e93ea1bbe14 (diff) | |
obj_onsenTaru done / cleanup swspinner TUs (#2197)
* clean up swspinner TUs
* d_a_obj_onsenTaru done
* remove asm
49 files changed, 548 insertions, 2390 deletions
diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/CreateHeap__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/CreateHeap__11daOnsTaru_cFv.s deleted file mode 100644 index 45b457bef5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/CreateHeap__11daOnsTaru_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80CA8748: -/* 80CA8748 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA874C 7C 08 02 A6 */ mflr r0 -/* 80CA8750 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA8754 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA8758 7C 7F 1B 78 */ mr r31, r3 -/* 80CA875C 3C 60 80 CB */ lis r3, d_a_obj_onsenTaru__stringBase0@ha /* 0x80CA9BF4@ha */ -/* 80CA8760 38 63 9B F4 */ addi r3, r3, d_a_obj_onsenTaru__stringBase0@l /* 0x80CA9BF4@l */ -/* 80CA8764 38 80 00 03 */ li r4, 3 -/* 80CA8768 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA876C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA8770 3C A5 00 02 */ addis r5, r5, 2 -/* 80CA8774 38 C0 00 80 */ li r6, 0x80 -/* 80CA8778 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80CA877C 4B 39 3B 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CA8780 3C 80 00 08 */ lis r4, 8 -/* 80CA8784 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80CA8788 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80CA878C 4B 36 C4 C9 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CA8790 90 7F 05 74 */ stw r3, 0x574(r31) -/* 80CA8794 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80CA8798 30 03 FF FF */ addic r0, r3, -1 -/* 80CA879C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80CA87A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA87A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA87A8 7C 08 03 A6 */ mtlr r0 -/* 80CA87AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA87B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/Delete__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/Delete__11daOnsTaru_cFv.s deleted file mode 100644 index d63e4f38fb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/Delete__11daOnsTaru_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80CA995C: -/* 80CA995C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA9960 7C 08 02 A6 */ mflr r0 -/* 80CA9964 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA9968 3C 80 80 CB */ lis r4, d_a_obj_onsenTaru__stringBase0@ha /* 0x80CA9BF4@ha */ -/* 80CA996C 38 84 9B F4 */ addi r4, r4, d_a_obj_onsenTaru__stringBase0@l /* 0x80CA9BF4@l */ -/* 80CA9970 38 63 05 6C */ addi r3, r3, 0x56c -/* 80CA9974 4B 38 36 95 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CA9978 38 60 00 01 */ li r3, 1 -/* 80CA997C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA9980 7C 08 03 A6 */ mtlr r0 -/* 80CA9984 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA9988 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/Draw__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/Draw__11daOnsTaru_cFv.s deleted file mode 100644 index 2fcb9bfc34..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/Draw__11daOnsTaru_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80CA98B8: -/* 80CA98B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA98BC 7C 08 02 A6 */ mflr r0 -/* 80CA98C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA98C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA98C8 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA98CC 7C 7E 1B 78 */ mr r30, r3 -/* 80CA98D0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CA98D4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CA98D8 38 80 00 40 */ li r4, 0x40 -/* 80CA98DC 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80CA98E0 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80CA98E4 4B 4F 9E E1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CA98E8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CA98EC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CA98F0 80 9E 05 74 */ lwz r4, 0x574(r30) -/* 80CA98F4 80 84 00 04 */ lwz r4, 4(r4) -/* 80CA98F8 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CA98FC 4B 4F B4 A5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CA9900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA9904 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA9908 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80CA990C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80CA9910 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80CA9914 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80CA9918 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80CA991C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80CA9920 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80CA9924 4B 36 43 A1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CA9928 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA992C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA9930 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80CA9934 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80CA9938 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80CA993C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80CA9940 38 60 00 01 */ li r3, 1 -/* 80CA9944 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA9948 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA994C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA9950 7C 08 03 A6 */ mtlr r0 -/* 80CA9954 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA9958 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/Execute__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/Execute__11daOnsTaru_cFv.s deleted file mode 100644 index c07e8bfed2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/Execute__11daOnsTaru_cFv.s +++ /dev/null @@ -1,154 +0,0 @@ -lbl_80CA8F38: -/* 80CA8F38 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80CA8F3C 7C 08 02 A6 */ mflr r0 -/* 80CA8F40 90 01 00 34 */ stw r0, 0x34(r1) -/* 80CA8F44 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80CA8F48 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80CA8F4C 7C 7E 1B 78 */ mr r30, r3 -/* 80CA8F50 3C 80 80 CB */ lis r4, lit_3655@ha /* 0x80CA9B78@ha */ -/* 80CA8F54 3B E4 9B 78 */ addi r31, r4, lit_3655@l /* 0x80CA9B78@l */ -/* 80CA8F58 C0 03 04 F8 */ lfs f0, 0x4f8(r3) -/* 80CA8F5C D0 03 05 94 */ stfs f0, 0x594(r3) -/* 80CA8F60 C0 03 04 FC */ lfs f0, 0x4fc(r3) -/* 80CA8F64 D0 03 05 98 */ stfs f0, 0x598(r3) -/* 80CA8F68 C0 03 05 00 */ lfs f0, 0x500(r3) -/* 80CA8F6C D0 03 05 9C */ stfs f0, 0x59c(r3) -/* 80CA8F70 48 00 02 15 */ bl mode_proc_call__11daOnsTaru_cFv -/* 80CA8F74 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80CA8F78 D0 1E 05 88 */ stfs f0, 0x588(r30) -/* 80CA8F7C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80CA8F80 D0 1E 05 8C */ stfs f0, 0x58c(r30) -/* 80CA8F84 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80CA8F88 D0 1E 05 90 */ stfs f0, 0x590(r30) -/* 80CA8F8C 38 7E 05 A4 */ addi r3, r30, 0x5a4 -/* 80CA8F90 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA8F94 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA8F98 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80CA8F9C 4B 3C DB 11 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80CA8FA0 38 61 00 08 */ addi r3, r1, 8 -/* 80CA8FA4 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80CA8FA8 38 BE 05 88 */ addi r5, r30, 0x588 -/* 80CA8FAC 4B 5B DB 89 */ bl __mi__4cXyzCFRC3Vec -/* 80CA8FB0 C0 01 00 08 */ lfs f0, 8(r1) -/* 80CA8FB4 D0 1E 05 7C */ stfs f0, 0x57c(r30) -/* 80CA8FB8 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80CA8FBC D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 80CA8FC0 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80CA8FC4 D0 1E 05 84 */ stfs f0, 0x584(r30) -/* 80CA8FC8 88 1E 05 78 */ lbz r0, 0x578(r30) -/* 80CA8FCC 28 00 00 01 */ cmplwi r0, 1 -/* 80CA8FD0 40 82 00 1C */ bne lbl_80CA8FEC -/* 80CA8FD4 C0 1E 05 88 */ lfs f0, 0x588(r30) -/* 80CA8FD8 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 80CA8FDC C0 1E 05 8C */ lfs f0, 0x58c(r30) -/* 80CA8FE0 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80CA8FE4 C0 1E 05 90 */ lfs f0, 0x590(r30) -/* 80CA8FE8 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -lbl_80CA8FEC: -/* 80CA8FEC 7F C3 F3 78 */ mr r3, r30 -/* 80CA8FF0 4B FF FC A5 */ bl bgCheck__11daOnsTaru_cFv -/* 80CA8FF4 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80CA8FF8 D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 80CA8FFC C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80CA9000 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80CA9004 EC 01 00 2A */ fadds f0, f1, f0 -/* 80CA9008 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80CA900C C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80CA9010 D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 80CA9014 C0 1E 05 50 */ lfs f0, 0x550(r30) -/* 80CA9018 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 80CA901C C0 1E 05 54 */ lfs f0, 0x554(r30) -/* 80CA9020 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80CA9024 C0 1E 05 58 */ lfs f0, 0x558(r30) -/* 80CA9028 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 80CA902C 80 1E 05 D0 */ lwz r0, 0x5d0(r30) -/* 80CA9030 54 00 A7 FE */ rlwinm r0, r0, 0x14, 0x1f, 0x1f -/* 80CA9034 98 1E 05 A0 */ stb r0, 0x5a0(r30) -/* 80CA9038 7F C3 F3 78 */ mr r3, r30 -/* 80CA903C 4B FF F6 85 */ bl setBaseMtx__11daOnsTaru_cFv -/* 80CA9040 38 7E 07 F8 */ addi r3, r30, 0x7f8 -/* 80CA9044 4B 3D B2 7D */ bl ChkAtHit__12dCcD_GObjInfFv -/* 80CA9048 28 03 00 00 */ cmplwi r3, 0 -/* 80CA904C 41 82 00 2C */ beq lbl_80CA9078 -/* 80CA9050 38 7E 07 F8 */ addi r3, r30, 0x7f8 -/* 80CA9054 4B 3D B3 55 */ bl GetAtHitGObj__12dCcD_GObjInfFv -/* 80CA9058 80 83 00 28 */ lwz r4, 0x28(r3) -/* 80CA905C 3C 60 D8 FC */ lis r3, 0xD8FC /* 0xD8FBFDFF@ha */ -/* 80CA9060 38 03 FD FF */ addi r0, r3, 0xFDFF /* 0xD8FBFDFF@l */ -/* 80CA9064 7C 80 00 39 */ and. r0, r4, r0 -/* 80CA9068 41 82 00 44 */ beq lbl_80CA90AC -/* 80CA906C 7F C3 F3 78 */ mr r3, r30 -/* 80CA9070 48 00 03 B5 */ bl mode_init_break__11daOnsTaru_cFv -/* 80CA9074 48 00 00 38 */ b lbl_80CA90AC -lbl_80CA9078: -/* 80CA9078 38 7E 07 F8 */ addi r3, r30, 0x7f8 -/* 80CA907C 4B 3D B3 E5 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80CA9080 28 03 00 00 */ cmplwi r3, 0 -/* 80CA9084 41 82 00 28 */ beq lbl_80CA90AC -/* 80CA9088 38 7E 07 F8 */ addi r3, r30, 0x7f8 -/* 80CA908C 4B 3D B4 BD */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80CA9090 80 83 00 10 */ lwz r4, 0x10(r3) -/* 80CA9094 3C 60 D8 FC */ lis r3, 0xD8FC /* 0xD8FBFDFF@ha */ -/* 80CA9098 38 03 FD FF */ addi r0, r3, 0xFDFF /* 0xD8FBFDFF@l */ -/* 80CA909C 7C 80 00 39 */ and. r0, r4, r0 -/* 80CA90A0 41 82 00 0C */ beq lbl_80CA90AC -/* 80CA90A4 7F C3 F3 78 */ mr r3, r30 -/* 80CA90A8 48 00 03 7D */ bl mode_init_break__11daOnsTaru_cFv -lbl_80CA90AC: -/* 80CA90AC 38 7E 09 1C */ addi r3, r30, 0x91c -/* 80CA90B0 C0 3E 09 44 */ lfs f1, 0x944(r30) -/* 80CA90B4 4B 5C 61 4D */ bl SetR__8cM3dGCylFf -/* 80CA90B8 38 7E 09 1C */ addi r3, r30, 0x91c -/* 80CA90BC C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 80CA90C0 4B 5C 61 39 */ bl SetH__8cM3dGCylFf -/* 80CA90C4 38 7E 09 1C */ addi r3, r30, 0x91c -/* 80CA90C8 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80CA90CC 4B 5C 61 11 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80CA90D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA90D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA90D8 38 63 23 3C */ addi r3, r3, 0x233c -/* 80CA90DC 38 9E 07 F8 */ addi r4, r30, 0x7f8 -/* 80CA90E0 4B 5B BA C9 */ bl Set__4cCcSFP8cCcD_Obj -/* 80CA90E4 38 7E 07 D8 */ addi r3, r30, 0x7d8 -/* 80CA90E8 4B 3D A7 49 */ bl Move__10dCcD_GSttsFv -/* 80CA90EC 88 1E 09 36 */ lbz r0, 0x936(r30) -/* 80CA90F0 28 00 00 00 */ cmplwi r0, 0 -/* 80CA90F4 41 82 00 74 */ beq lbl_80CA9168 -/* 80CA90F8 A8 9E 09 34 */ lha r4, 0x934(r30) -/* 80CA90FC 3C 60 80 CB */ lis r3, l_HIO@ha /* 0x80CA9DF4@ha */ -/* 80CA9100 38 63 9D F4 */ addi r3, r3, l_HIO@l /* 0x80CA9DF4@l */ -/* 80CA9104 A8 03 00 04 */ lha r0, 4(r3) -/* 80CA9108 1C 00 00 1E */ mulli r0, r0, 0x1e -/* 80CA910C 7C 00 07 34 */ extsh r0, r0 -/* 80CA9110 7C 04 00 00 */ cmpw r4, r0 -/* 80CA9114 40 80 00 48 */ bge lbl_80CA915C -/* 80CA9118 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA911C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA9120 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 80CA9124 28 00 00 00 */ cmplwi r0, 0 -/* 80CA9128 40 82 00 0C */ bne lbl_80CA9134 -/* 80CA912C 38 04 00 01 */ addi r0, r4, 1 -/* 80CA9130 B0 1E 09 34 */ sth r0, 0x934(r30) -lbl_80CA9134: -/* 80CA9134 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80CA9138 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80CA913C C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80CA9140 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80CA9144 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80CA9148 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80CA914C C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 80CA9150 EC 01 00 2A */ fadds f0, f1, f0 -/* 80CA9154 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80CA9158 48 00 00 10 */ b lbl_80CA9168 -lbl_80CA915C: -/* 80CA915C 38 00 00 00 */ li r0, 0 -/* 80CA9160 98 1E 09 3D */ stb r0, 0x93d(r30) -/* 80CA9164 98 1E 09 36 */ stb r0, 0x936(r30) -lbl_80CA9168: -/* 80CA9168 38 60 00 01 */ li r3, 1 -/* 80CA916C 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80CA9170 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80CA9174 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80CA9178 7C 08 03 A6 */ mtlr r0 -/* 80CA917C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80CA9180 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__ct__15daOnsTaru_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__ct__15daOnsTaru_HIO_cFv.s deleted file mode 100644 index c4cb2148c8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__ct__15daOnsTaru_HIO_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80CA85CC: -/* 80CA85CC 3C 80 80 CB */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80CA9DD4@ha */ -/* 80CA85D0 38 04 9D D4 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80CA9DD4@l */ -/* 80CA85D4 90 03 00 00 */ stw r0, 0(r3) -/* 80CA85D8 3C 80 80 CB */ lis r4, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80CA9DC8@ha */ -/* 80CA85DC 38 04 9D C8 */ addi r0, r4, __vt__18fOpAcm_HIO_entry_c@l /* 0x80CA9DC8@l */ -/* 80CA85E0 90 03 00 00 */ stw r0, 0(r3) -/* 80CA85E4 3C 80 80 CB */ lis r4, __vt__15daOnsTaru_HIO_c@ha /* 0x80CA9DBC@ha */ -/* 80CA85E8 38 04 9D BC */ addi r0, r4, __vt__15daOnsTaru_HIO_c@l /* 0x80CA9DBC@l */ -/* 80CA85EC 90 03 00 00 */ stw r0, 0(r3) -/* 80CA85F0 38 00 00 78 */ li r0, 0x78 -/* 80CA85F4 B0 03 00 04 */ sth r0, 4(r3) -/* 80CA85F8 38 00 00 03 */ li r0, 3 -/* 80CA85FC 98 03 00 06 */ stb r0, 6(r3) -/* 80CA8600 3C 80 80 CB */ lis r4, lit_3655@ha /* 0x80CA9B78@ha */ -/* 80CA8604 C0 04 9B 78 */ lfs f0, lit_3655@l(r4) /* 0x80CA9B78@l */ -/* 80CA8608 D0 03 00 08 */ stfs f0, 8(r3) -/* 80CA860C 3C 80 80 CB */ lis r4, lit_3656@ha /* 0x80CA9B7C@ha */ -/* 80CA8610 C0 04 9B 7C */ lfs f0, lit_3656@l(r4) /* 0x80CA9B7C@l */ -/* 80CA8614 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80CA8618 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 703d42ec16..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CA9A30: -/* 80CA9A30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA9A34 7C 08 02 A6 */ mflr r0 -/* 80CA9A38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA9A3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA9A40 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA9A44 41 82 00 1C */ beq lbl_80CA9A60 -/* 80CA9A48 3C A0 80 CB */ lis r5, __vt__10cCcD_GStts@ha /* 0x80CA9D50@ha */ -/* 80CA9A4C 38 05 9D 50 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80CA9D50@l */ -/* 80CA9A50 90 1F 00 00 */ stw r0, 0(r31) -/* 80CA9A54 7C 80 07 35 */ extsh. r0, r4 -/* 80CA9A58 40 81 00 08 */ ble lbl_80CA9A60 -/* 80CA9A5C 4B 62 52 E1 */ bl __dl__FPv -lbl_80CA9A60: -/* 80CA9A60 7F E3 FB 78 */ mr r3, r31 -/* 80CA9A64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA9A68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA9A6C 7C 08 03 A6 */ mtlr r0 -/* 80CA9A70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA9A74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 0c95a37943..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CA8AE4: -/* 80CA8AE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA8AE8 7C 08 02 A6 */ mflr r0 -/* 80CA8AEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA8AF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA8AF4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA8AF8 41 82 00 30 */ beq lbl_80CA8B28 -/* 80CA8AFC 3C 60 80 CB */ lis r3, __vt__10dCcD_GStts@ha /* 0x80CA9D5C@ha */ -/* 80CA8B00 38 03 9D 5C */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80CA9D5C@l */ -/* 80CA8B04 90 1F 00 00 */ stw r0, 0(r31) -/* 80CA8B08 41 82 00 10 */ beq lbl_80CA8B18 -/* 80CA8B0C 3C 60 80 CB */ lis r3, __vt__10cCcD_GStts@ha /* 0x80CA9D50@ha */ -/* 80CA8B10 38 03 9D 50 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80CA9D50@l */ -/* 80CA8B14 90 1F 00 00 */ stw r0, 0(r31) -lbl_80CA8B18: -/* 80CA8B18 7C 80 07 35 */ extsh. r0, r4 -/* 80CA8B1C 40 81 00 0C */ ble lbl_80CA8B28 -/* 80CA8B20 7F E3 FB 78 */ mr r3, r31 -/* 80CA8B24 4B 62 62 19 */ bl __dl__FPv -lbl_80CA8B28: -/* 80CA8B28 7F E3 FB 78 */ mr r3, r31 -/* 80CA8B2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA8B30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA8B34 7C 08 03 A6 */ mtlr r0 -/* 80CA8B38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA8B3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index bfed9d838f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80CA8B40: -/* 80CA8B40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA8B44 7C 08 02 A6 */ mflr r0 -/* 80CA8B48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA8B4C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA8B50 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA8B54 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CA8B58 7C 9F 23 78 */ mr r31, r4 -/* 80CA8B5C 41 82 00 38 */ beq lbl_80CA8B94 -/* 80CA8B60 3C 60 80 CB */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80CA9D44@ha */ -/* 80CA8B64 38 03 9D 44 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80CA9D44@l */ -/* 80CA8B68 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80CA8B6C 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80CA8B70 38 80 FF FF */ li r4, -1 -/* 80CA8B74 4B 5C 63 A5 */ bl __dt__8cM3dGCirFv -/* 80CA8B78 7F C3 F3 78 */ mr r3, r30 -/* 80CA8B7C 38 80 00 00 */ li r4, 0 -/* 80CA8B80 4B 5B F5 31 */ bl __dt__13cBgS_PolyInfoFv -/* 80CA8B84 7F E0 07 35 */ extsh. r0, r31 -/* 80CA8B88 40 81 00 0C */ ble lbl_80CA8B94 -/* 80CA8B8C 7F C3 F3 78 */ mr r3, r30 -/* 80CA8B90 4B 62 61 AD */ bl __dl__FPv -lbl_80CA8B94: -/* 80CA8B94 7F C3 F3 78 */ mr r3, r30 -/* 80CA8B98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA8B9C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA8BA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA8BA4 7C 08 03 A6 */ mtlr r0 -/* 80CA8BA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA8BAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index b250048072..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80CA8BB0: -/* 80CA8BB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA8BB4 7C 08 02 A6 */ mflr r0 -/* 80CA8BB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA8BBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA8BC0 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA8BC4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CA8BC8 7C 9F 23 78 */ mr r31, r4 -/* 80CA8BCC 41 82 00 38 */ beq lbl_80CA8C04 -/* 80CA8BD0 3C 80 80 CB */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80CA9D80@ha */ -/* 80CA8BD4 38 84 9D 80 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80CA9D80@l */ -/* 80CA8BD8 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80CA8BDC 38 04 00 0C */ addi r0, r4, 0xc -/* 80CA8BE0 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80CA8BE4 38 04 00 18 */ addi r0, r4, 0x18 -/* 80CA8BE8 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80CA8BEC 38 80 00 00 */ li r4, 0 -/* 80CA8BF0 4B 3C D3 A5 */ bl __dt__9dBgS_AcchFv -/* 80CA8BF4 7F E0 07 35 */ extsh. r0, r31 -/* 80CA8BF8 40 81 00 0C */ ble lbl_80CA8C04 -/* 80CA8BFC 7F C3 F3 78 */ mr r3, r30 -/* 80CA8C00 4B 62 61 3D */ bl __dl__FPv -lbl_80CA8C04: -/* 80CA8C04 7F C3 F3 78 */ mr r3, r30 -/* 80CA8C08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA8C0C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA8C10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA8C14 7C 08 03 A6 */ mtlr r0 -/* 80CA8C18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA8C1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index fd6fc82005..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CA8678: -/* 80CA8678 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA867C 7C 08 02 A6 */ mflr r0 -/* 80CA8680 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA8684 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA8688 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA868C 41 82 00 1C */ beq lbl_80CA86A8 -/* 80CA8690 3C A0 80 CB */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80CA9DD4@ha */ -/* 80CA8694 38 05 9D D4 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80CA9DD4@l */ -/* 80CA8698 90 1F 00 00 */ stw r0, 0(r31) -/* 80CA869C 7C 80 07 35 */ extsh. r0, r4 -/* 80CA86A0 40 81 00 08 */ ble lbl_80CA86A8 -/* 80CA86A4 4B 62 66 99 */ bl __dl__FPv -lbl_80CA86A8: -/* 80CA86A8 7F E3 FB 78 */ mr r3, r31 -/* 80CA86AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA86B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA86B4 7C 08 03 A6 */ mtlr r0 -/* 80CA86B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA86BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__15daOnsTaru_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__15daOnsTaru_HIO_cFv.s deleted file mode 100644 index bf7d34a29a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__15daOnsTaru_HIO_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80CA9A78: -/* 80CA9A78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA9A7C 7C 08 02 A6 */ mflr r0 -/* 80CA9A80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA9A84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA9A88 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA9A8C 41 82 00 40 */ beq lbl_80CA9ACC -/* 80CA9A90 3C 60 80 CB */ lis r3, __vt__15daOnsTaru_HIO_c@ha /* 0x80CA9DBC@ha */ -/* 80CA9A94 38 03 9D BC */ addi r0, r3, __vt__15daOnsTaru_HIO_c@l /* 0x80CA9DBC@l */ -/* 80CA9A98 90 1F 00 00 */ stw r0, 0(r31) -/* 80CA9A9C 41 82 00 20 */ beq lbl_80CA9ABC -/* 80CA9AA0 3C 60 80 CB */ lis r3, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80CA9DC8@ha */ -/* 80CA9AA4 38 03 9D C8 */ addi r0, r3, __vt__18fOpAcm_HIO_entry_c@l /* 0x80CA9DC8@l */ -/* 80CA9AA8 90 1F 00 00 */ stw r0, 0(r31) -/* 80CA9AAC 41 82 00 10 */ beq lbl_80CA9ABC -/* 80CA9AB0 3C 60 80 CB */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80CA9DD4@ha */ -/* 80CA9AB4 38 03 9D D4 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80CA9DD4@l */ -/* 80CA9AB8 90 1F 00 00 */ stw r0, 0(r31) -lbl_80CA9ABC: -/* 80CA9ABC 7C 80 07 35 */ extsh. r0, r4 -/* 80CA9AC0 40 81 00 0C */ ble lbl_80CA9ACC -/* 80CA9AC4 7F E3 FB 78 */ mr r3, r31 -/* 80CA9AC8 4B 62 52 75 */ bl __dl__FPv -lbl_80CA9ACC: -/* 80CA9ACC 7F E3 FB 78 */ mr r3, r31 -/* 80CA9AD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA9AD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA9AD8 7C 08 03 A6 */ mtlr r0 -/* 80CA9ADC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA9AE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__18fOpAcm_HIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__18fOpAcm_HIO_entry_cFv.s deleted file mode 100644 index d1ec585e2b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__18fOpAcm_HIO_entry_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CA861C: -/* 80CA861C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA8620 7C 08 02 A6 */ mflr r0 -/* 80CA8624 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA8628 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA862C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA8630 41 82 00 30 */ beq lbl_80CA8660 -/* 80CA8634 3C 60 80 CB */ lis r3, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80CA9DC8@ha */ -/* 80CA8638 38 03 9D C8 */ addi r0, r3, __vt__18fOpAcm_HIO_entry_c@l /* 0x80CA9DC8@l */ -/* 80CA863C 90 1F 00 00 */ stw r0, 0(r31) -/* 80CA8640 41 82 00 10 */ beq lbl_80CA8650 -/* 80CA8644 3C 60 80 CB */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80CA9DD4@ha */ -/* 80CA8648 38 03 9D D4 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80CA9DD4@l */ -/* 80CA864C 90 1F 00 00 */ stw r0, 0(r31) -lbl_80CA8650: -/* 80CA8650 7C 80 07 35 */ extsh. r0, r4 -/* 80CA8654 40 81 00 0C */ ble lbl_80CA8660 -/* 80CA8658 7F E3 FB 78 */ mr r3, r31 -/* 80CA865C 4B 62 66 E1 */ bl __dl__FPv -lbl_80CA8660: -/* 80CA8660 7F E3 FB 78 */ mr r3, r31 -/* 80CA8664 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA8668 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA866C 7C 08 03 A6 */ mtlr r0 -/* 80CA8670 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA8674 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__8cM3dGAabFv.s deleted file mode 100644 index ee84b57192..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CA8A9C: -/* 80CA8A9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA8AA0 7C 08 02 A6 */ mflr r0 -/* 80CA8AA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA8AA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA8AAC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA8AB0 41 82 00 1C */ beq lbl_80CA8ACC -/* 80CA8AB4 3C A0 80 CB */ lis r5, __vt__8cM3dGAab@ha /* 0x80CA9D74@ha */ -/* 80CA8AB8 38 05 9D 74 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80CA9D74@l */ -/* 80CA8ABC 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80CA8AC0 7C 80 07 35 */ extsh. r0, r4 -/* 80CA8AC4 40 81 00 08 */ ble lbl_80CA8ACC -/* 80CA8AC8 4B 62 62 75 */ bl __dl__FPv -lbl_80CA8ACC: -/* 80CA8ACC 7F E3 FB 78 */ mr r3, r31 -/* 80CA8AD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA8AD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA8AD8 7C 08 03 A6 */ mtlr r0 -/* 80CA8ADC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA8AE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__8cM3dGCylFv.s deleted file mode 100644 index d7f2dada54..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CA8A54: -/* 80CA8A54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA8A58 7C 08 02 A6 */ mflr r0 -/* 80CA8A5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA8A60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA8A64 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA8A68 41 82 00 1C */ beq lbl_80CA8A84 -/* 80CA8A6C 3C A0 80 CB */ lis r5, __vt__8cM3dGCyl@ha /* 0x80CA9D68@ha */ -/* 80CA8A70 38 05 9D 68 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80CA9D68@l */ -/* 80CA8A74 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80CA8A78 7C 80 07 35 */ extsh. r0, r4 -/* 80CA8A7C 40 81 00 08 */ ble lbl_80CA8A84 -/* 80CA8A80 4B 62 62 BD */ bl __dl__FPv -lbl_80CA8A84: -/* 80CA8A84 7F E3 FB 78 */ mr r3, r31 -/* 80CA8A88 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA8A8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA8A90 7C 08 03 A6 */ mtlr r0 -/* 80CA8A94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA8A98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__sinit_d_a_obj_onsenTaru_cpp.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__sinit_d_a_obj_onsenTaru_cpp.s deleted file mode 100644 index 3c6b691e28..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__sinit_d_a_obj_onsenTaru_cpp.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80CA9AE4: -/* 80CA9AE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA9AE8 7C 08 02 A6 */ mflr r0 -/* 80CA9AEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA9AF0 3C 60 80 CB */ lis r3, l_HIO@ha /* 0x80CA9DF4@ha */ -/* 80CA9AF4 38 63 9D F4 */ addi r3, r3, l_HIO@l /* 0x80CA9DF4@l */ -/* 80CA9AF8 4B FF EA D5 */ bl __ct__15daOnsTaru_HIO_cFv -/* 80CA9AFC 3C 80 80 CB */ lis r4, __dt__15daOnsTaru_HIO_cFv@ha /* 0x80CA9A78@ha */ -/* 80CA9B00 38 84 9A 78 */ addi r4, r4, __dt__15daOnsTaru_HIO_cFv@l /* 0x80CA9A78@l */ -/* 80CA9B04 3C A0 80 CB */ lis r5, lit_3647@ha /* 0x80CA9DE8@ha */ -/* 80CA9B08 38 A5 9D E8 */ addi r5, r5, lit_3647@l /* 0x80CA9DE8@l */ -/* 80CA9B0C 4B FF EA 4D */ bl __register_global_object -/* 80CA9B10 3C 60 80 CB */ lis r3, mCcDCyl__11daOnsTaru_c@ha /* 0x80CA9C38@ha */ -/* 80CA9B14 38 63 9C 38 */ addi r3, r3, mCcDCyl__11daOnsTaru_c@l /* 0x80CA9C38@l */ -/* 80CA9B18 38 A3 FF FC */ addi r5, r3, -4 -/* 80CA9B1C 3C 60 80 CB */ lis r3, mCcDObjInfo__11daOnsTaru_c@ha /* 0x80CA9B80@ha */ -/* 80CA9B20 38 63 9B 80 */ addi r3, r3, mCcDObjInfo__11daOnsTaru_c@l /* 0x80CA9B80@l */ -/* 80CA9B24 38 83 FF FC */ addi r4, r3, -4 -/* 80CA9B28 38 00 00 06 */ li r0, 6 -/* 80CA9B2C 7C 09 03 A6 */ mtctr r0 -lbl_80CA9B30: -/* 80CA9B30 80 64 00 04 */ lwz r3, 4(r4) -/* 80CA9B34 84 04 00 08 */ lwzu r0, 8(r4) -/* 80CA9B38 90 65 00 04 */ stw r3, 4(r5) -/* 80CA9B3C 94 05 00 08 */ stwu r0, 8(r5) -/* 80CA9B40 42 00 FF F0 */ bdnz lbl_80CA9B30 -/* 80CA9B44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA9B48 7C 08 03 A6 */ mtlr r0 -/* 80CA9B4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA9B50 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/bgCheck__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/bgCheck__11daOnsTaru_cFv.s deleted file mode 100644 index 1a431cdfd3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/bgCheck__11daOnsTaru_cFv.s +++ /dev/null @@ -1,181 +0,0 @@ -lbl_80CA8C94: -/* 80CA8C94 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80CA8C98 7C 08 02 A6 */ mflr r0 -/* 80CA8C9C 90 01 00 64 */ stw r0, 0x64(r1) -/* 80CA8CA0 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 80CA8CA4 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 80CA8CA8 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 80CA8CAC F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 80CA8CB0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80CA8CB4 4B 6B 95 21 */ bl _savegpr_27 -/* 80CA8CB8 7C 7B 1B 78 */ mr r27, r3 -/* 80CA8CBC 3C 60 80 CB */ lis r3, lit_3655@ha /* 0x80CA9B78@ha */ -/* 80CA8CC0 3B E3 9B 78 */ addi r31, r3, lit_3655@l /* 0x80CA9B78@l */ -/* 80CA8CC4 80 1B 05 D0 */ lwz r0, 0x5d0(r27) -/* 80CA8CC8 54 04 BF FE */ rlwinm r4, r0, 0x17, 0x1f, 0x1f -/* 80CA8CCC 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 80CA8CD0 54 05 CF FE */ rlwinm r5, r0, 0x19, 0x1f, 0x1f -/* 80CA8CD4 54 1E DF FE */ rlwinm r30, r0, 0x1b, 0x1f, 0x1f -/* 80CA8CD8 54 1D AF FE */ rlwinm r29, r0, 0x15, 0x1f, 0x1f -/* 80CA8CDC 54 1C A7 FE */ rlwinm r28, r0, 0x14, 0x1f, 0x1f -/* 80CA8CE0 88 1B 05 78 */ lbz r0, 0x578(r27) -/* 80CA8CE4 28 00 00 02 */ cmplwi r0, 2 -/* 80CA8CE8 40 82 00 28 */ bne lbl_80CA8D10 -/* 80CA8CEC 28 03 00 00 */ cmplwi r3, 0 -/* 80CA8CF0 40 82 00 14 */ bne lbl_80CA8D04 -/* 80CA8CF4 28 05 00 00 */ cmplwi r5, 0 -/* 80CA8CF8 40 82 00 0C */ bne lbl_80CA8D04 -/* 80CA8CFC 28 04 00 00 */ cmplwi r4, 0 -/* 80CA8D00 41 82 00 98 */ beq lbl_80CA8D98 -lbl_80CA8D04: -/* 80CA8D04 7F 63 DB 78 */ mr r3, r27 -/* 80CA8D08 48 00 07 1D */ bl mode_init_break__11daOnsTaru_cFv -/* 80CA8D0C 48 00 00 8C */ b lbl_80CA8D98 -lbl_80CA8D10: -/* 80CA8D10 28 1E 00 00 */ cmplwi r30, 0 -/* 80CA8D14 41 82 00 7C */ beq lbl_80CA8D90 -/* 80CA8D18 28 1D 00 00 */ cmplwi r29, 0 -/* 80CA8D1C 40 82 00 7C */ bne lbl_80CA8D98 -/* 80CA8D20 88 1B 09 3E */ lbz r0, 0x93e(r27) -/* 80CA8D24 28 00 00 00 */ cmplwi r0, 0 -/* 80CA8D28 40 82 00 70 */ bne lbl_80CA8D98 -/* 80CA8D2C 88 1B 04 E2 */ lbz r0, 0x4e2(r27) -/* 80CA8D30 7C 03 07 74 */ extsb r3, r0 -/* 80CA8D34 4B 38 43 39 */ bl dComIfGp_getReverb__Fi -/* 80CA8D38 7C 67 1B 78 */ mr r7, r3 -/* 80CA8D3C 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080038@ha */ -/* 80CA8D40 38 03 00 38 */ addi r0, r3, 0x0038 /* 0x00080038@l */ -/* 80CA8D44 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CA8D48 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CA8D4C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CA8D50 80 63 00 00 */ lwz r3, 0(r3) -/* 80CA8D54 38 81 00 0C */ addi r4, r1, 0xc -/* 80CA8D58 38 BB 05 38 */ addi r5, r27, 0x538 -/* 80CA8D5C 38 C0 00 00 */ li r6, 0 -/* 80CA8D60 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80CA8D64 FC 40 08 90 */ fmr f2, f1 -/* 80CA8D68 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 80CA8D6C FC 80 18 90 */ fmr f4, f3 -/* 80CA8D70 39 00 00 00 */ li r8, 0 -/* 80CA8D74 4B 60 2C 11 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CA8D78 80 1B 08 24 */ lwz r0, 0x824(r27) -/* 80CA8D7C 60 00 00 01 */ ori r0, r0, 1 -/* 80CA8D80 90 1B 08 24 */ stw r0, 0x824(r27) -/* 80CA8D84 38 00 00 01 */ li r0, 1 -/* 80CA8D88 98 1B 09 3E */ stb r0, 0x93e(r27) -/* 80CA8D8C 48 00 00 0C */ b lbl_80CA8D98 -lbl_80CA8D90: -/* 80CA8D90 38 00 00 00 */ li r0, 0 -/* 80CA8D94 98 1B 09 3E */ stb r0, 0x93e(r27) -lbl_80CA8D98: -/* 80CA8D98 88 1B 05 78 */ lbz r0, 0x578(r27) -/* 80CA8D9C 28 00 00 00 */ cmplwi r0, 0 -/* 80CA8DA0 41 82 00 14 */ beq lbl_80CA8DB4 -/* 80CA8DA4 28 00 00 02 */ cmplwi r0, 2 -/* 80CA8DA8 41 82 00 0C */ beq lbl_80CA8DB4 -/* 80CA8DAC 28 00 00 01 */ cmplwi r0, 1 -/* 80CA8DB0 40 82 00 D0 */ bne lbl_80CA8E80 -lbl_80CA8DB4: -/* 80CA8DB4 C3 FB 07 70 */ lfs f31, 0x770(r27) -/* 80CA8DB8 28 1D 00 00 */ cmplwi r29, 0 -/* 80CA8DBC 41 82 00 C4 */ beq lbl_80CA8E80 -/* 80CA8DC0 C3 DB 04 FC */ lfs f30, 0x4fc(r27) -/* 80CA8DC4 7F 63 DB 78 */ mr r3, r27 -/* 80CA8DC8 4B FF FE A9 */ bl chkWaterLineIn__11daOnsTaru_cFv -/* 80CA8DCC 2C 03 00 00 */ cmpwi r3, 0 -/* 80CA8DD0 41 82 00 18 */ beq lbl_80CA8DE8 -/* 80CA8DD4 88 1B 05 78 */ lbz r0, 0x578(r27) -/* 80CA8DD8 28 00 00 01 */ cmplwi r0, 1 -/* 80CA8DDC 41 82 00 0C */ beq lbl_80CA8DE8 -/* 80CA8DE0 7F 63 DB 78 */ mr r3, r27 -/* 80CA8DE4 48 00 07 35 */ bl mode_init_sink__11daOnsTaru_cFv -lbl_80CA8DE8: -/* 80CA8DE8 28 1C 00 00 */ cmplwi r28, 0 -/* 80CA8DEC 41 82 00 94 */ beq lbl_80CA8E80 -/* 80CA8DF0 88 1B 05 A0 */ lbz r0, 0x5a0(r27) -/* 80CA8DF4 28 00 00 00 */ cmplwi r0, 0 -/* 80CA8DF8 40 82 00 88 */ bne lbl_80CA8E80 -/* 80CA8DFC C0 1B 04 D0 */ lfs f0, 0x4d0(r27) -/* 80CA8E00 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80CA8E04 C0 1B 04 D4 */ lfs f0, 0x4d4(r27) -/* 80CA8E08 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80CA8E0C C0 1B 04 D8 */ lfs f0, 0x4d8(r27) -/* 80CA8E10 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80CA8E14 D3 E1 00 20 */ stfs f31, 0x20(r1) -/* 80CA8E18 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80CA8E1C FC 1E 00 40 */ fcmpo cr0, f30, f0 -/* 80CA8E20 40 80 00 60 */ bge lbl_80CA8E80 -/* 80CA8E24 38 61 00 1C */ addi r3, r1, 0x1c -/* 80CA8E28 C0 3F 00 58 */ lfs f1, 0x58(r31) -/* 80CA8E2C 38 80 00 00 */ li r4, 0 -/* 80CA8E30 4B 37 6A 4D */ bl fopKyM_createWpillar__FPC4cXyzfi -/* 80CA8E34 88 1B 04 E2 */ lbz r0, 0x4e2(r27) -/* 80CA8E38 7C 03 07 74 */ extsb r3, r0 -/* 80CA8E3C 4B 38 42 31 */ bl dComIfGp_getReverb__Fi -/* 80CA8E40 7C 67 1B 78 */ mr r7, r3 -/* 80CA8E44 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008002A@ha */ -/* 80CA8E48 38 03 00 2A */ addi r0, r3, 0x002A /* 0x0008002A@l */ -/* 80CA8E4C 90 01 00 08 */ stw r0, 8(r1) -/* 80CA8E50 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CA8E54 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CA8E58 80 63 00 00 */ lwz r3, 0(r3) -/* 80CA8E5C 38 81 00 08 */ addi r4, r1, 8 -/* 80CA8E60 38 BB 05 38 */ addi r5, r27, 0x538 -/* 80CA8E64 38 C0 00 00 */ li r6, 0 -/* 80CA8E68 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80CA8E6C FC 40 08 90 */ fmr f2, f1 -/* 80CA8E70 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 80CA8E74 FC 80 18 90 */ fmr f4, f3 -/* 80CA8E78 39 00 00 00 */ li r8, 0 -/* 80CA8E7C 4B 60 2B 09 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80CA8E80: -/* 80CA8E80 C0 1B 04 D0 */ lfs f0, 0x4d0(r27) -/* 80CA8E84 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CA8E88 C0 1B 04 D4 */ lfs f0, 0x4d4(r27) -/* 80CA8E8C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80CA8E90 C0 1B 04 D8 */ lfs f0, 0x4d8(r27) -/* 80CA8E94 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80CA8E98 C0 3B 07 70 */ lfs f1, 0x770(r27) -/* 80CA8E9C D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80CA8EA0 C0 1B 04 D4 */ lfs f0, 0x4d4(r27) -/* 80CA8EA4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CA8EA8 40 81 00 68 */ ble lbl_80CA8F10 -/* 80CA8EAC 88 1B 05 78 */ lbz r0, 0x578(r27) -/* 80CA8EB0 28 00 00 04 */ cmplwi r0, 4 -/* 80CA8EB4 40 82 00 14 */ bne lbl_80CA8EC8 -/* 80CA8EB8 7F 63 DB 78 */ mr r3, r27 -/* 80CA8EBC 4B FF FD 91 */ bl chkSinkAll__11daOnsTaru_cFv -/* 80CA8EC0 2C 03 00 00 */ cmpwi r3, 0 -/* 80CA8EC4 41 82 00 38 */ beq lbl_80CA8EFC -lbl_80CA8EC8: -/* 80CA8EC8 88 1B 05 78 */ lbz r0, 0x578(r27) -/* 80CA8ECC 28 00 00 00 */ cmplwi r0, 0 -/* 80CA8ED0 40 82 00 0C */ bne lbl_80CA8EDC -/* 80CA8ED4 28 1E 00 00 */ cmplwi r30, 0 -/* 80CA8ED8 40 82 00 24 */ bne lbl_80CA8EFC -lbl_80CA8EDC: -/* 80CA8EDC 28 00 00 01 */ cmplwi r0, 1 -/* 80CA8EE0 40 82 00 30 */ bne lbl_80CA8F10 -/* 80CA8EE4 28 1C 00 00 */ cmplwi r28, 0 -/* 80CA8EE8 41 82 00 28 */ beq lbl_80CA8F10 -/* 80CA8EEC 7F 63 DB 78 */ mr r3, r27 -/* 80CA8EF0 4B FF FD 5D */ bl chkSinkAll__11daOnsTaru_cFv -/* 80CA8EF4 2C 03 00 00 */ cmpwi r3, 0 -/* 80CA8EF8 40 82 00 18 */ bne lbl_80CA8F10 -lbl_80CA8EFC: -/* 80CA8EFC 38 7B 09 38 */ addi r3, r27, 0x938 -/* 80CA8F00 38 81 00 10 */ addi r4, r1, 0x10 -/* 80CA8F04 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80CA8F08 C0 5F 00 5C */ lfs f2, 0x5c(r31) -/* 80CA8F0C 4B 37 42 01 */ bl fopAcM_effHamonSet__FPUlPC4cXyzff -lbl_80CA8F10: -/* 80CA8F10 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 80CA8F14 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 80CA8F18 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 80CA8F1C CB C1 00 40 */ lfd f30, 0x40(r1) -/* 80CA8F20 39 61 00 40 */ addi r11, r1, 0x40 -/* 80CA8F24 4B 6B 92 FD */ bl _restgpr_27 -/* 80CA8F28 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80CA8F2C 7C 08 03 A6 */ mtlr r0 -/* 80CA8F30 38 21 00 60 */ addi r1, r1, 0x60 -/* 80CA8F34 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/breakEffSet__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/breakEffSet__11daOnsTaru_cFv.s deleted file mode 100644 index 4e516e9fd9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/breakEffSet__11daOnsTaru_cFv.s +++ /dev/null @@ -1,169 +0,0 @@ -lbl_80CA9620: -/* 80CA9620 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80CA9624 7C 08 02 A6 */ mflr r0 -/* 80CA9628 90 01 00 54 */ stw r0, 0x54(r1) -/* 80CA962C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80CA9630 4B 6B 8B AD */ bl _savegpr_29 -/* 80CA9634 7C 7E 1B 78 */ mr r30, r3 -/* 80CA9638 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA963C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA9640 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80CA9644 38 80 00 00 */ li r4, 0 -/* 80CA9648 90 81 00 08 */ stw r4, 8(r1) -/* 80CA964C 38 00 FF FF */ li r0, -1 -/* 80CA9650 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CA9654 90 81 00 10 */ stw r4, 0x10(r1) -/* 80CA9658 90 81 00 14 */ stw r4, 0x14(r1) -/* 80CA965C 90 81 00 18 */ stw r4, 0x18(r1) -/* 80CA9660 38 80 00 00 */ li r4, 0 -/* 80CA9664 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008A9A@ha */ -/* 80CA9668 38 A5 8A 9A */ addi r5, r5, 0x8A9A /* 0x00008A9A@l */ -/* 80CA966C 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80CA9670 38 E0 00 00 */ li r7, 0 -/* 80CA9674 39 00 00 00 */ li r8, 0 -/* 80CA9678 39 20 00 00 */ li r9, 0 -/* 80CA967C 39 40 00 FF */ li r10, 0xff -/* 80CA9680 3D 60 80 CB */ lis r11, lit_3655@ha /* 0x80CA9B78@ha */ -/* 80CA9684 C0 2B 9B 78 */ lfs f1, lit_3655@l(r11) /* 0x80CA9B78@l */ -/* 80CA9688 4B 3A 34 09 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80CA968C 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80CA9690 38 80 00 00 */ li r4, 0 -/* 80CA9694 90 81 00 08 */ stw r4, 8(r1) -/* 80CA9698 38 00 FF FF */ li r0, -1 -/* 80CA969C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CA96A0 90 81 00 10 */ stw r4, 0x10(r1) -/* 80CA96A4 90 81 00 14 */ stw r4, 0x14(r1) -/* 80CA96A8 90 81 00 18 */ stw r4, 0x18(r1) -/* 80CA96AC 38 80 00 00 */ li r4, 0 -/* 80CA96B0 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008A9B@ha */ -/* 80CA96B4 38 A5 8A 9B */ addi r5, r5, 0x8A9B /* 0x00008A9B@l */ -/* 80CA96B8 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80CA96BC 38 E0 00 00 */ li r7, 0 -/* 80CA96C0 39 00 00 00 */ li r8, 0 -/* 80CA96C4 39 20 00 00 */ li r9, 0 -/* 80CA96C8 39 40 00 FF */ li r10, 0xff -/* 80CA96CC 3D 60 80 CB */ lis r11, lit_3655@ha /* 0x80CA9B78@ha */ -/* 80CA96D0 C0 2B 9B 78 */ lfs f1, lit_3655@l(r11) /* 0x80CA9B78@l */ -/* 80CA96D4 4B 3A 33 BD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80CA96D8 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80CA96DC 38 80 00 00 */ li r4, 0 -/* 80CA96E0 90 81 00 08 */ stw r4, 8(r1) -/* 80CA96E4 38 00 FF FF */ li r0, -1 -/* 80CA96E8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CA96EC 90 81 00 10 */ stw r4, 0x10(r1) -/* 80CA96F0 90 81 00 14 */ stw r4, 0x14(r1) -/* 80CA96F4 90 81 00 18 */ stw r4, 0x18(r1) -/* 80CA96F8 38 80 00 00 */ li r4, 0 -/* 80CA96FC 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008A9C@ha */ -/* 80CA9700 38 A5 8A 9C */ addi r5, r5, 0x8A9C /* 0x00008A9C@l */ -/* 80CA9704 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80CA9708 38 E0 00 00 */ li r7, 0 -/* 80CA970C 39 00 00 00 */ li r8, 0 -/* 80CA9710 39 20 00 00 */ li r9, 0 -/* 80CA9714 39 40 00 FF */ li r10, 0xff -/* 80CA9718 3D 60 80 CB */ lis r11, lit_3655@ha /* 0x80CA9B78@ha */ -/* 80CA971C C0 2B 9B 78 */ lfs f1, lit_3655@l(r11) /* 0x80CA9B78@l */ -/* 80CA9720 4B 3A 33 71 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80CA9724 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80CA9728 38 80 00 00 */ li r4, 0 -/* 80CA972C 90 81 00 08 */ stw r4, 8(r1) -/* 80CA9730 38 00 FF FF */ li r0, -1 -/* 80CA9734 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CA9738 90 81 00 10 */ stw r4, 0x10(r1) -/* 80CA973C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80CA9740 90 81 00 18 */ stw r4, 0x18(r1) -/* 80CA9744 38 80 00 00 */ li r4, 0 -/* 80CA9748 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008A9D@ha */ -/* 80CA974C 38 A5 8A 9D */ addi r5, r5, 0x8A9D /* 0x00008A9D@l */ -/* 80CA9750 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80CA9754 38 E0 00 00 */ li r7, 0 -/* 80CA9758 39 00 00 00 */ li r8, 0 -/* 80CA975C 39 20 00 00 */ li r9, 0 -/* 80CA9760 39 40 00 FF */ li r10, 0xff -/* 80CA9764 3D 60 80 CB */ lis r11, lit_3655@ha /* 0x80CA9B78@ha */ -/* 80CA9768 C0 2B 9B 78 */ lfs f1, lit_3655@l(r11) /* 0x80CA9B78@l */ -/* 80CA976C 4B 3A 33 25 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80CA9770 88 1E 09 3D */ lbz r0, 0x93d(r30) -/* 80CA9774 28 00 00 00 */ cmplwi r0, 0 -/* 80CA9778 41 82 00 50 */ beq lbl_80CA97C8 -/* 80CA977C 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80CA9780 38 80 00 00 */ li r4, 0 -/* 80CA9784 90 81 00 08 */ stw r4, 8(r1) -/* 80CA9788 38 00 FF FF */ li r0, -1 -/* 80CA978C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CA9790 90 81 00 10 */ stw r4, 0x10(r1) -/* 80CA9794 90 81 00 14 */ stw r4, 0x14(r1) -/* 80CA9798 90 81 00 18 */ stw r4, 0x18(r1) -/* 80CA979C 38 80 00 00 */ li r4, 0 -/* 80CA97A0 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008A9E@ha */ -/* 80CA97A4 38 A5 8A 9E */ addi r5, r5, 0x8A9E /* 0x00008A9E@l */ -/* 80CA97A8 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80CA97AC 38 E0 00 00 */ li r7, 0 -/* 80CA97B0 39 00 00 00 */ li r8, 0 -/* 80CA97B4 39 20 00 00 */ li r9, 0 -/* 80CA97B8 39 40 00 FF */ li r10, 0xff -/* 80CA97BC 3D 60 80 CB */ lis r11, lit_3655@ha /* 0x80CA9B78@ha */ -/* 80CA97C0 C0 2B 9B 78 */ lfs f1, lit_3655@l(r11) /* 0x80CA9B78@l */ -/* 80CA97C4 4B 3A 32 CD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -lbl_80CA97C8: -/* 80CA97C8 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80CA97CC D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80CA97D0 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80CA97D4 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80CA97D8 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80CA97DC D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80CA97E0 3C 60 80 CB */ lis r3, lit_4186@ha /* 0x80CA9BF0@ha */ -/* 80CA97E4 C0 03 9B F0 */ lfs f0, lit_4186@l(r3) /* 0x80CA9BF0@l */ -/* 80CA97E8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80CA97EC D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80CA97F0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80CA97F4 3C 60 80 CB */ lis r3, d_a_obj_onsenTaru__stringBase0@ha /* 0x80CA9BF4@ha */ -/* 80CA97F8 38 83 9B F4 */ addi r4, r3, d_a_obj_onsenTaru__stringBase0@l /* 0x80CA9BF4@l */ -/* 80CA97FC 38 64 00 09 */ addi r3, r4, 9 -/* 80CA9800 38 84 00 10 */ addi r4, r4, 0x10 -/* 80CA9804 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA9808 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA980C 3C A5 00 02 */ addis r5, r5, 2 -/* 80CA9810 38 C0 00 80 */ li r6, 0x80 -/* 80CA9814 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80CA9818 4B 39 2B 65 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80CA981C 7C 7D 1B 78 */ mr r29, r3 -/* 80CA9820 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80CA9824 7C 05 07 74 */ extsb r5, r0 -/* 80CA9828 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80CA982C 3C 80 80 45 */ lis r4, mEcallback__18dPa_modelEcallBack@ha /* 0x80450E90@ha */ -/* 80CA9830 38 04 0E 90 */ addi r0, r4, mEcallback__18dPa_modelEcallBack@l /* 0x80450E90@l */ -/* 80CA9834 90 01 00 08 */ stw r0, 8(r1) -/* 80CA9838 90 A1 00 0C */ stw r5, 0xc(r1) -/* 80CA983C 38 00 00 00 */ li r0, 0 -/* 80CA9840 90 01 00 10 */ stw r0, 0x10(r1) -/* 80CA9844 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA9848 38 01 00 20 */ addi r0, r1, 0x20 -/* 80CA984C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80CA9850 38 80 00 00 */ li r4, 0 -/* 80CA9854 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008A99@ha */ -/* 80CA9858 38 A5 8A 99 */ addi r5, r5, 0x8A99 /* 0x00008A99@l */ -/* 80CA985C 38 C1 00 2C */ addi r6, r1, 0x2c -/* 80CA9860 38 E0 00 00 */ li r7, 0 -/* 80CA9864 39 00 00 00 */ li r8, 0 -/* 80CA9868 39 20 00 00 */ li r9, 0 -/* 80CA986C 39 40 00 FF */ li r10, 0xff -/* 80CA9870 3D 60 80 CB */ lis r11, lit_3655@ha /* 0x80CA9B78@ha */ -/* 80CA9874 C0 2B 9B 78 */ lfs f1, lit_3655@l(r11) /* 0x80CA9B78@l */ -/* 80CA9878 4B 3A 32 19 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80CA987C 28 03 00 00 */ cmplwi r3, 0 -/* 80CA9880 41 82 00 20 */ beq lbl_80CA98A0 -/* 80CA9884 7F A4 EB 78 */ mr r4, r29 -/* 80CA9888 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CA988C 38 C0 00 03 */ li r6, 3 -/* 80CA9890 38 E0 00 00 */ li r7, 0 -/* 80CA9894 39 00 00 00 */ li r8, 0 -/* 80CA9898 39 20 00 00 */ li r9, 0 -/* 80CA989C 4B 3A 13 65 */ bl setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc -lbl_80CA98A0: -/* 80CA98A0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80CA98A4 4B 6B 89 85 */ bl _restgpr_29 -/* 80CA98A8 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80CA98AC 7C 08 03 A6 */ mtlr r0 -/* 80CA98B0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80CA98B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/chkSinkAll__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/chkSinkAll__11daOnsTaru_cFv.s deleted file mode 100644 index 97f1d34df5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/chkSinkAll__11daOnsTaru_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80CA8C4C: -/* 80CA8C4C C0 43 07 70 */ lfs f2, 0x770(r3) -/* 80CA8C50 3C 80 80 CB */ lis r4, lit_3863@ha /* 0x80CA9BC0@ha */ -/* 80CA8C54 C0 24 9B C0 */ lfs f1, lit_3863@l(r4) /* 0x80CA9BC0@l */ -/* 80CA8C58 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80CA8C5C EC 01 00 2A */ fadds f0, f1, f0 -/* 80CA8C60 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80CA8C64 7C 00 00 26 */ mfcr r0 -/* 80CA8C68 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 80CA8C6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/chkWaterLineIn__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/chkWaterLineIn__11daOnsTaru_cFv.s deleted file mode 100644 index bd6328933c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/chkWaterLineIn__11daOnsTaru_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80CA8C70: -/* 80CA8C70 C0 43 07 70 */ lfs f2, 0x770(r3) -/* 80CA8C74 3C 80 80 CB */ lis r4, lit_3869@ha /* 0x80CA9BC4@ha */ -/* 80CA8C78 C0 24 9B C4 */ lfs f1, lit_3869@l(r4) /* 0x80CA9BC4@l */ -/* 80CA8C7C C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80CA8C80 EC 01 00 2A */ fadds f0, f1, f0 -/* 80CA8C84 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80CA8C88 7C 00 00 26 */ mfcr r0 -/* 80CA8C8C 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 80CA8C90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/createHeapCallBack__11daOnsTaru_cFP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/createHeapCallBack__11daOnsTaru_cFP10fopAc_ac_c.s deleted file mode 100644 index 0672887f06..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/createHeapCallBack__11daOnsTaru_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80CA8C20: -/* 80CA8C20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA8C24 7C 08 02 A6 */ mflr r0 -/* 80CA8C28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA8C2C 81 83 05 68 */ lwz r12, 0x568(r3) -/* 80CA8C30 81 8C 00 08 */ lwz r12, 8(r12) -/* 80CA8C34 7D 89 03 A6 */ mtctr r12 -/* 80CA8C38 4E 80 04 21 */ bctrl -/* 80CA8C3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA8C40 7C 08 03 A6 */ mtlr r0 -/* 80CA8C44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA8C48 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/create__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/create__11daOnsTaru_cFv.s deleted file mode 100644 index cfdea1d9ba..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/create__11daOnsTaru_cFv.s +++ /dev/null @@ -1,175 +0,0 @@ -lbl_80CA87B4: -/* 80CA87B4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CA87B8 7C 08 02 A6 */ mflr r0 -/* 80CA87BC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CA87C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CA87C4 4B 6B 9A 15 */ bl _savegpr_28 -/* 80CA87C8 7C 7D 1B 78 */ mr r29, r3 -/* 80CA87CC 3C 80 80 CB */ lis r4, lit_3655@ha /* 0x80CA9B78@ha */ -/* 80CA87D0 3B E4 9B 78 */ addi r31, r4, lit_3655@l /* 0x80CA9B78@l */ -/* 80CA87D4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CA87D8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CA87DC 40 82 00 EC */ bne lbl_80CA88C8 -/* 80CA87E0 7F A0 EB 79 */ or. r0, r29, r29 -/* 80CA87E4 41 82 00 D8 */ beq lbl_80CA88BC -/* 80CA87E8 7C 1E 03 78 */ mr r30, r0 -/* 80CA87EC 4B 37 03 79 */ bl __ct__10fopAc_ac_cFv -/* 80CA87F0 3C 60 80 CB */ lis r3, __vt__11daOnsTaru_c@ha /* 0x80CA9DA4@ha */ -/* 80CA87F4 38 03 9D A4 */ addi r0, r3, __vt__11daOnsTaru_c@l /* 0x80CA9DA4@l */ -/* 80CA87F8 90 1E 05 68 */ stw r0, 0x568(r30) -/* 80CA87FC 3B 9E 05 A4 */ addi r28, r30, 0x5a4 -/* 80CA8800 7F 83 E3 78 */ mr r3, r28 -/* 80CA8804 4B 3C D8 9D */ bl __ct__9dBgS_AcchFv -/* 80CA8808 3C 60 80 CB */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80CA9D80@ha */ -/* 80CA880C 38 63 9D 80 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80CA9D80@l */ -/* 80CA8810 90 7C 00 10 */ stw r3, 0x10(r28) -/* 80CA8814 38 03 00 0C */ addi r0, r3, 0xc -/* 80CA8818 90 1C 00 14 */ stw r0, 0x14(r28) -/* 80CA881C 38 03 00 18 */ addi r0, r3, 0x18 -/* 80CA8820 90 1C 00 24 */ stw r0, 0x24(r28) -/* 80CA8824 38 7C 00 14 */ addi r3, r28, 0x14 -/* 80CA8828 4B 3D 06 41 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80CA882C 38 7E 07 7C */ addi r3, r30, 0x77c -/* 80CA8830 4B 3C D6 7D */ bl __ct__12dBgS_AcchCirFv -/* 80CA8834 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80CA8838 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80CA883C 90 1E 07 D4 */ stw r0, 0x7d4(r30) -/* 80CA8840 38 7E 07 D8 */ addi r3, r30, 0x7d8 -/* 80CA8844 4B 3D AF 1D */ bl __ct__10dCcD_GSttsFv -/* 80CA8848 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80CA884C 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80CA8850 90 7E 07 D4 */ stw r3, 0x7d4(r30) -/* 80CA8854 38 03 00 20 */ addi r0, r3, 0x20 -/* 80CA8858 90 1E 07 D8 */ stw r0, 0x7d8(r30) -/* 80CA885C 3B 9E 07 F8 */ addi r28, r30, 0x7f8 -/* 80CA8860 7F 83 E3 78 */ mr r3, r28 -/* 80CA8864 4B 3D B1 C5 */ bl __ct__12dCcD_GObjInfFv -/* 80CA8868 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CA886C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CA8870 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80CA8874 3C 60 80 CB */ lis r3, __vt__8cM3dGAab@ha /* 0x80CA9D74@ha */ -/* 80CA8878 38 03 9D 74 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CA9D74@l */ -/* 80CA887C 90 1C 01 1C */ stw r0, 0x11c(r28) -/* 80CA8880 3C 60 80 CB */ lis r3, __vt__8cM3dGCyl@ha /* 0x80CA9D68@ha */ -/* 80CA8884 38 03 9D 68 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80CA9D68@l */ -/* 80CA8888 90 1C 01 38 */ stw r0, 0x138(r28) -/* 80CA888C 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80CA8890 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80CA8894 90 7C 01 20 */ stw r3, 0x120(r28) -/* 80CA8898 38 03 00 58 */ addi r0, r3, 0x58 -/* 80CA889C 90 1C 01 38 */ stw r0, 0x138(r28) -/* 80CA88A0 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80CA88A4 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80CA88A8 90 7C 00 3C */ stw r3, 0x3c(r28) -/* 80CA88AC 38 03 00 2C */ addi r0, r3, 0x2c -/* 80CA88B0 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80CA88B4 38 03 00 84 */ addi r0, r3, 0x84 -/* 80CA88B8 90 1C 01 38 */ stw r0, 0x138(r28) -lbl_80CA88BC: -/* 80CA88BC 80 1D 04 A0 */ lwz r0, 0x4a0(r29) -/* 80CA88C0 60 00 00 08 */ ori r0, r0, 8 -/* 80CA88C4 90 1D 04 A0 */ stw r0, 0x4a0(r29) -lbl_80CA88C8: -/* 80CA88C8 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80CA88CC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80CA88D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA88D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA88D8 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80CA88DC 7C 05 07 74 */ extsb r5, r0 -/* 80CA88E0 4B 38 CA 81 */ bl isSwitch__10dSv_info_cCFii -/* 80CA88E4 2C 03 00 00 */ cmpwi r3, 0 -/* 80CA88E8 41 82 00 0C */ beq lbl_80CA88F4 -/* 80CA88EC 38 60 00 05 */ li r3, 5 -/* 80CA88F0 48 00 01 4C */ b lbl_80CA8A3C -lbl_80CA88F4: -/* 80CA88F4 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80CA88F8 3C 80 80 CB */ lis r4, d_a_obj_onsenTaru__stringBase0@ha /* 0x80CA9BF4@ha */ -/* 80CA88FC 38 84 9B F4 */ addi r4, r4, d_a_obj_onsenTaru__stringBase0@l /* 0x80CA9BF4@l */ -/* 80CA8900 4B 38 45 BD */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80CA8904 7C 7E 1B 78 */ mr r30, r3 -/* 80CA8908 2C 1E 00 04 */ cmpwi r30, 4 -/* 80CA890C 40 82 01 2C */ bne lbl_80CA8A38 -/* 80CA8910 7F A3 EB 78 */ mr r3, r29 -/* 80CA8914 3C 80 80 CB */ lis r4, createHeapCallBack__11daOnsTaru_cFP10fopAc_ac_c@ha /* 0x80CA8C20@ha */ -/* 80CA8918 38 84 8C 20 */ addi r4, r4, createHeapCallBack__11daOnsTaru_cFP10fopAc_ac_c@l /* 0x80CA8C20@l */ -/* 80CA891C 38 A0 0F 00 */ li r5, 0xf00 -/* 80CA8920 4B 37 1B 91 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80CA8924 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CA8928 40 82 00 0C */ bne lbl_80CA8934 -/* 80CA892C 38 60 00 05 */ li r3, 5 -/* 80CA8930 48 00 01 0C */ b lbl_80CA8A3C -lbl_80CA8934: -/* 80CA8934 7F A3 EB 78 */ mr r3, r29 -/* 80CA8938 4B FF FD 89 */ bl setBaseMtx__11daOnsTaru_cFv -/* 80CA893C 80 7D 05 74 */ lwz r3, 0x574(r29) -/* 80CA8940 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CA8944 90 1D 05 04 */ stw r0, 0x504(r29) -/* 80CA8948 80 7D 05 74 */ lwz r3, 0x574(r29) -/* 80CA894C 80 83 00 04 */ lwz r4, 4(r3) -/* 80CA8950 7F A3 EB 78 */ mr r3, r29 -/* 80CA8954 4B 37 1C 25 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80CA8958 38 7D 07 7C */ addi r3, r29, 0x77c -/* 80CA895C C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 80CA8960 C0 5F 00 3C */ lfs f2, 0x3c(r31) -/* 80CA8964 4B 3C D5 F5 */ bl SetWall__12dBgS_AcchCirFff -/* 80CA8968 38 00 00 00 */ li r0, 0 -/* 80CA896C 90 01 00 08 */ stw r0, 8(r1) -/* 80CA8970 38 7D 05 A4 */ addi r3, r29, 0x5a4 -/* 80CA8974 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80CA8978 38 BD 04 BC */ addi r5, r29, 0x4bc -/* 80CA897C 7F A6 EB 78 */ mr r6, r29 -/* 80CA8980 38 E0 00 01 */ li r7, 1 -/* 80CA8984 39 1D 07 7C */ addi r8, r29, 0x77c -/* 80CA8988 39 3D 04 F8 */ addi r9, r29, 0x4f8 -/* 80CA898C 39 40 00 00 */ li r10, 0 -/* 80CA8990 4B 3C D8 B9 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80CA8994 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 80CA8998 D0 1D 05 30 */ stfs f0, 0x530(r29) -/* 80CA899C C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80CA89A0 D0 1D 05 34 */ stfs f0, 0x534(r29) -/* 80CA89A4 80 1D 05 74 */ lwz r0, 0x574(r29) -/* 80CA89A8 90 1D 05 24 */ stw r0, 0x524(r29) -/* 80CA89AC 38 7D 07 BC */ addi r3, r29, 0x7bc -/* 80CA89B0 38 80 00 C8 */ li r4, 0xc8 -/* 80CA89B4 38 A0 00 FF */ li r5, 0xff -/* 80CA89B8 7F A6 EB 78 */ mr r6, r29 -/* 80CA89BC 4B 3D AE A5 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80CA89C0 38 7D 07 F8 */ addi r3, r29, 0x7f8 -/* 80CA89C4 3C 80 80 CB */ lis r4, mCcDCyl__11daOnsTaru_c@ha /* 0x80CA9C38@ha */ -/* 80CA89C8 38 84 9C 38 */ addi r4, r4, mCcDCyl__11daOnsTaru_c@l /* 0x80CA9C38@l */ -/* 80CA89CC 4B 3D BE E9 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80CA89D0 38 1D 07 BC */ addi r0, r29, 0x7bc -/* 80CA89D4 90 1D 08 3C */ stw r0, 0x83c(r29) -/* 80CA89D8 80 1D 07 F8 */ lwz r0, 0x7f8(r29) -/* 80CA89DC 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80CA89E0 90 1D 07 F8 */ stw r0, 0x7f8(r29) -/* 80CA89E4 88 1D 04 9A */ lbz r0, 0x49a(r29) -/* 80CA89E8 60 00 00 01 */ ori r0, r0, 1 -/* 80CA89EC 98 1D 04 9A */ stb r0, 0x49a(r29) -/* 80CA89F0 80 1D 05 5C */ lwz r0, 0x55c(r29) -/* 80CA89F4 60 00 00 10 */ ori r0, r0, 0x10 -/* 80CA89F8 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 80CA89FC 38 00 00 2A */ li r0, 0x2a -/* 80CA8A00 98 1D 05 48 */ stb r0, 0x548(r29) -/* 80CA8A04 80 1D 04 9C */ lwz r0, 0x49c(r29) -/* 80CA8A08 54 00 9F FE */ rlwinm r0, r0, 0x13, 0x1f, 0x1f -/* 80CA8A0C 98 1D 05 79 */ stb r0, 0x579(r29) -/* 80CA8A10 7F A3 EB 78 */ mr r3, r29 -/* 80CA8A14 48 00 08 89 */ bl mode_init_wait__11daOnsTaru_cFv -/* 80CA8A18 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 80CA8A1C D0 1D 09 44 */ stfs f0, 0x944(r29) -/* 80CA8A20 38 00 00 00 */ li r0, 0 -/* 80CA8A24 B0 1D 09 34 */ sth r0, 0x934(r29) -/* 80CA8A28 98 1D 09 36 */ stb r0, 0x936(r29) -/* 80CA8A2C 38 00 00 01 */ li r0, 1 -/* 80CA8A30 98 1D 09 3D */ stb r0, 0x93d(r29) -/* 80CA8A34 98 1D 09 3E */ stb r0, 0x93e(r29) -lbl_80CA8A38: -/* 80CA8A38 7F C3 F3 78 */ mr r3, r30 -lbl_80CA8A3C: -/* 80CA8A3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CA8A40 4B 6B 97 E5 */ bl _restgpr_28 -/* 80CA8A44 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CA8A48 7C 08 03 A6 */ mtlr r0 -/* 80CA8A4C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CA8A50 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 2b9fddfcc5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CA9A10: -/* 80CA9A10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA9A14 7C 08 02 A6 */ mflr r0 -/* 80CA9A18 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA9A1C 4B FF ED 99 */ bl create__11daOnsTaru_cFv -/* 80CA9A20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA9A24 7C 08 03 A6 */ mtlr r0 -/* 80CA9A28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA9A2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Delete__FP11daOnsTaru_c.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Delete__FP11daOnsTaru_c.s deleted file mode 100644 index ad00bb8f83..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Delete__FP11daOnsTaru_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80CA99E4: -/* 80CA99E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA99E8 7C 08 02 A6 */ mflr r0 -/* 80CA99EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA99F0 81 83 05 68 */ lwz r12, 0x568(r3) -/* 80CA99F4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80CA99F8 7D 89 03 A6 */ mtctr r12 -/* 80CA99FC 4E 80 04 21 */ bctrl -/* 80CA9A00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA9A04 7C 08 03 A6 */ mtlr r0 -/* 80CA9A08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA9A0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Draw__FP11daOnsTaru_c.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Draw__FP11daOnsTaru_c.s deleted file mode 100644 index 2e37c0dbc0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Draw__FP11daOnsTaru_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80CA998C: -/* 80CA998C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA9990 7C 08 02 A6 */ mflr r0 -/* 80CA9994 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA9998 81 83 05 68 */ lwz r12, 0x568(r3) -/* 80CA999C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80CA99A0 7D 89 03 A6 */ mtctr r12 -/* 80CA99A4 4E 80 04 21 */ bctrl -/* 80CA99A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA99AC 7C 08 03 A6 */ mtlr r0 -/* 80CA99B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA99B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Execute__FP11daOnsTaru_c.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Execute__FP11daOnsTaru_c.s deleted file mode 100644 index a69b9852c4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Execute__FP11daOnsTaru_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80CA99B8: -/* 80CA99B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA99BC 7C 08 02 A6 */ mflr r0 -/* 80CA99C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA99C4 81 83 05 68 */ lwz r12, 0x568(r3) -/* 80CA99C8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80CA99CC 7D 89 03 A6 */ mtctr r12 -/* 80CA99D0 4E 80 04 21 */ bctrl -/* 80CA99D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA99D8 7C 08 03 A6 */ mtlr r0 -/* 80CA99DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA99E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/func_80CA9B54.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/func_80CA9B54.s deleted file mode 100644 index d6a689137a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/func_80CA9B54.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80CA9B54: -/* 80CA9B54 38 63 FF DC */ addi r3, r3, -36 -/* 80CA9B58 4B FF F0 58 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/func_80CA9B5C.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/func_80CA9B5C.s deleted file mode 100644 index 3e255eca56..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/func_80CA9B5C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80CA9B5C: -/* 80CA9B5C 38 63 FF EC */ addi r3, r3, -20 -/* 80CA9B60 4B FF F0 50 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_break__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_break__11daOnsTaru_cFv.s deleted file mode 100644 index 7b215704f2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_break__11daOnsTaru_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80CA9424: -/* 80CA9424 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CA9428 7C 08 02 A6 */ mflr r0 -/* 80CA942C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CA9430 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CA9434 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80CA9438 7C 7F 1B 78 */ mr r31, r3 -/* 80CA943C 3C 60 80 CB */ lis r3, lit_3655@ha /* 0x80CA9B78@ha */ -/* 80CA9440 3B C3 9B 78 */ addi r30, r3, lit_3655@l /* 0x80CA9B78@l */ -/* 80CA9444 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80CA9448 7C 03 07 74 */ extsb r3, r0 -/* 80CA944C 4B 38 3C 21 */ bl dComIfGp_getReverb__Fi -/* 80CA9450 7C 67 1B 78 */ mr r7, r3 -/* 80CA9454 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080267@ha */ -/* 80CA9458 38 03 02 67 */ addi r0, r3, 0x0267 /* 0x00080267@l */ -/* 80CA945C 90 01 00 08 */ stw r0, 8(r1) -/* 80CA9460 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CA9464 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CA9468 80 63 00 00 */ lwz r3, 0(r3) -/* 80CA946C 38 81 00 08 */ addi r4, r1, 8 -/* 80CA9470 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80CA9474 38 C0 00 00 */ li r6, 0 -/* 80CA9478 C0 3E 00 00 */ lfs f1, 0(r30) -/* 80CA947C FC 40 08 90 */ fmr f2, f1 -/* 80CA9480 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80CA9484 FC 80 18 90 */ fmr f4, f3 -/* 80CA9488 39 00 00 00 */ li r8, 0 -/* 80CA948C 4B 60 24 F9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CA9490 C0 3E 00 60 */ lfs f1, 0x60(r30) -/* 80CA9494 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80CA9498 C0 1E 00 00 */ lfs f0, 0(r30) -/* 80CA949C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CA94A0 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80CA94A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA94A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA94AC 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80CA94B0 3C 80 80 CB */ lis r4, l_HIO@ha /* 0x80CA9DF4@ha */ -/* 80CA94B4 38 84 9D F4 */ addi r4, r4, l_HIO@l /* 0x80CA9DF4@l */ -/* 80CA94B8 88 84 00 06 */ lbz r4, 6(r4) -/* 80CA94BC 38 A0 00 0F */ li r5, 0xf -/* 80CA94C0 38 C1 00 0C */ addi r6, r1, 0xc -/* 80CA94C4 4B 3C 65 61 */ bl StartShock__12dVibration_cFii4cXyz -/* 80CA94C8 7F E3 FB 78 */ mr r3, r31 -/* 80CA94CC 48 00 01 55 */ bl breakEffSet__11daOnsTaru_cFv -/* 80CA94D0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CA94D4 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80CA94D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA94DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA94E0 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CA94E4 7C 05 07 74 */ extsb r5, r0 -/* 80CA94E8 4B 38 BD 19 */ bl onSwitch__10dSv_info_cFii -/* 80CA94EC 7F E3 FB 78 */ mr r3, r31 -/* 80CA94F0 4B 37 07 8D */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80CA94F4 38 00 00 03 */ li r0, 3 -/* 80CA94F8 98 1F 05 78 */ stb r0, 0x578(r31) -/* 80CA94FC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CA9500 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80CA9504 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CA9508 7C 08 03 A6 */ mtlr r0 -/* 80CA950C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CA9510 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_carry__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_carry__11daOnsTaru_cFv.s deleted file mode 100644 index aea028414a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_carry__11daOnsTaru_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80CA92F0: -/* 80CA92F0 80 03 08 24 */ lwz r0, 0x824(r3) -/* 80CA92F4 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80CA92F8 90 03 08 24 */ stw r0, 0x824(r3) -/* 80CA92FC 80 03 05 5C */ lwz r0, 0x55c(r3) -/* 80CA9300 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 80CA9304 90 03 05 5C */ stw r0, 0x55c(r3) -/* 80CA9308 3C 80 80 CB */ lis r4, lit_4020@ha /* 0x80CA9BD8@ha */ -/* 80CA930C C0 04 9B D8 */ lfs f0, lit_4020@l(r4) /* 0x80CA9BD8@l */ -/* 80CA9310 D0 03 05 2C */ stfs f0, 0x52c(r3) -/* 80CA9314 38 00 00 01 */ li r0, 1 -/* 80CA9318 98 03 05 78 */ stb r0, 0x578(r3) -/* 80CA931C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_drop__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_drop__11daOnsTaru_cFv.s deleted file mode 100644 index d7c7312191..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_drop__11daOnsTaru_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80CA93C0: -/* 80CA93C0 80 03 07 F8 */ lwz r0, 0x7f8(r3) -/* 80CA93C4 60 00 00 01 */ ori r0, r0, 1 -/* 80CA93C8 90 03 07 F8 */ stw r0, 0x7f8(r3) -/* 80CA93CC 3C 80 80 CB */ lis r4, l_HIO@ha /* 0x80CA9DF4@ha */ -/* 80CA93D0 38 84 9D F4 */ addi r4, r4, l_HIO@l /* 0x80CA9DF4@l */ -/* 80CA93D4 C0 04 00 0C */ lfs f0, 0xc(r4) -/* 80CA93D8 D0 03 09 44 */ stfs f0, 0x944(r3) -/* 80CA93DC 80 03 05 5C */ lwz r0, 0x55c(r3) -/* 80CA93E0 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 80CA93E4 90 03 05 5C */ stw r0, 0x55c(r3) -/* 80CA93E8 3C 80 80 CB */ lis r4, lit_3774@ha /* 0x80CA9BB8@ha */ -/* 80CA93EC C0 04 9B B8 */ lfs f0, lit_3774@l(r4) /* 0x80CA9BB8@l */ -/* 80CA93F0 D0 03 05 30 */ stfs f0, 0x530(r3) -/* 80CA93F4 38 00 00 02 */ li r0, 2 -/* 80CA93F8 98 03 05 78 */ stb r0, 0x578(r3) -/* 80CA93FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_sink__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_sink__11daOnsTaru_cFv.s deleted file mode 100644 index 18d8368bc7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_sink__11daOnsTaru_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80CA9518: -/* 80CA9518 80 03 05 5C */ lwz r0, 0x55c(r3) -/* 80CA951C 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 80CA9520 90 03 05 5C */ stw r0, 0x55c(r3) -/* 80CA9524 38 00 00 04 */ li r0, 4 -/* 80CA9528 98 03 05 78 */ stb r0, 0x578(r3) -/* 80CA952C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_wait__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_wait__11daOnsTaru_cFv.s deleted file mode 100644 index cbd9621f53..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_wait__11daOnsTaru_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80CA929C: -/* 80CA929C 80 03 05 5C */ lwz r0, 0x55c(r3) -/* 80CA92A0 60 00 00 10 */ ori r0, r0, 0x10 -/* 80CA92A4 90 03 05 5C */ stw r0, 0x55c(r3) -/* 80CA92A8 3C 80 80 CB */ lis r4, lit_4020@ha /* 0x80CA9BD8@ha */ -/* 80CA92AC C0 04 9B D8 */ lfs f0, lit_4020@l(r4) /* 0x80CA9BD8@l */ -/* 80CA92B0 D0 03 05 2C */ stfs f0, 0x52c(r3) -/* 80CA92B4 3C 80 80 CB */ lis r4, lit_3774@ha /* 0x80CA9BB8@ha */ -/* 80CA92B8 C0 04 9B B8 */ lfs f0, lit_3774@l(r4) /* 0x80CA9BB8@l */ -/* 80CA92BC D0 03 05 30 */ stfs f0, 0x530(r3) -/* 80CA92C0 38 00 00 00 */ li r0, 0 -/* 80CA92C4 98 03 05 78 */ stb r0, 0x578(r3) -/* 80CA92C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_call__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_call__11daOnsTaru_cFv.s deleted file mode 100644 index 5fc97dd09c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_call__11daOnsTaru_cFv.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_80CA9184: -/* 80CA9184 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA9188 7C 08 02 A6 */ mflr r0 -/* 80CA918C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA9190 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA9194 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA9198 7C 7E 1B 78 */ mr r30, r3 -/* 80CA919C 3C 60 80 CB */ lis r3, cNullVec__6Z2Calc@ha /* 0x80CA9C18@ha */ -/* 80CA91A0 3B E3 9C 18 */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x80CA9C18@l */ -/* 80CA91A4 3C 60 80 CB */ lis r3, data_80CA9E04@ha /* 0x80CA9E04@ha */ -/* 80CA91A8 38 A3 9E 04 */ addi r5, r3, data_80CA9E04@l /* 0x80CA9E04@l */ -/* 80CA91AC 88 05 00 00 */ lbz r0, 0(r5) -/* 80CA91B0 7C 00 07 75 */ extsb. r0, r0 -/* 80CA91B4 40 82 00 88 */ bne lbl_80CA923C -/* 80CA91B8 80 7F 00 64 */ lwz r3, 0x64(r31) -/* 80CA91BC 80 1F 00 68 */ lwz r0, 0x68(r31) -/* 80CA91C0 90 7F 00 A0 */ stw r3, 0xa0(r31) -/* 80CA91C4 90 1F 00 A4 */ stw r0, 0xa4(r31) -/* 80CA91C8 80 1F 00 6C */ lwz r0, 0x6c(r31) -/* 80CA91CC 90 1F 00 A8 */ stw r0, 0xa8(r31) -/* 80CA91D0 38 9F 00 A0 */ addi r4, r31, 0xa0 -/* 80CA91D4 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 80CA91D8 80 1F 00 74 */ lwz r0, 0x74(r31) -/* 80CA91DC 90 64 00 0C */ stw r3, 0xc(r4) -/* 80CA91E0 90 04 00 10 */ stw r0, 0x10(r4) -/* 80CA91E4 80 1F 00 78 */ lwz r0, 0x78(r31) -/* 80CA91E8 90 04 00 14 */ stw r0, 0x14(r4) -/* 80CA91EC 80 7F 00 7C */ lwz r3, 0x7c(r31) -/* 80CA91F0 80 1F 00 80 */ lwz r0, 0x80(r31) -/* 80CA91F4 90 64 00 18 */ stw r3, 0x18(r4) -/* 80CA91F8 90 04 00 1C */ stw r0, 0x1c(r4) -/* 80CA91FC 80 1F 00 84 */ lwz r0, 0x84(r31) -/* 80CA9200 90 04 00 20 */ stw r0, 0x20(r4) -/* 80CA9204 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 80CA9208 80 1F 00 8C */ lwz r0, 0x8c(r31) -/* 80CA920C 90 64 00 24 */ stw r3, 0x24(r4) -/* 80CA9210 90 04 00 28 */ stw r0, 0x28(r4) -/* 80CA9214 80 1F 00 90 */ lwz r0, 0x90(r31) -/* 80CA9218 90 04 00 2C */ stw r0, 0x2c(r4) -/* 80CA921C 80 7F 00 94 */ lwz r3, 0x94(r31) -/* 80CA9220 80 1F 00 98 */ lwz r0, 0x98(r31) -/* 80CA9224 90 64 00 30 */ stw r3, 0x30(r4) -/* 80CA9228 90 04 00 34 */ stw r0, 0x34(r4) -/* 80CA922C 80 1F 00 9C */ lwz r0, 0x9c(r31) -/* 80CA9230 90 04 00 38 */ stw r0, 0x38(r4) -/* 80CA9234 38 00 00 01 */ li r0, 1 -/* 80CA9238 98 05 00 00 */ stb r0, 0(r5) -lbl_80CA923C: -/* 80CA923C 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 80CA9240 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80CA9244 41 82 00 18 */ beq lbl_80CA925C -/* 80CA9248 88 1E 05 79 */ lbz r0, 0x579(r30) -/* 80CA924C 28 00 00 00 */ cmplwi r0, 0 -/* 80CA9250 40 82 00 0C */ bne lbl_80CA925C -/* 80CA9254 7F C3 F3 78 */ mr r3, r30 -/* 80CA9258 48 00 00 99 */ bl mode_init_carry__11daOnsTaru_cFv -lbl_80CA925C: -/* 80CA925C 7F C3 F3 78 */ mr r3, r30 -/* 80CA9260 88 1E 05 78 */ lbz r0, 0x578(r30) -/* 80CA9264 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80CA9268 39 9F 00 A0 */ addi r12, r31, 0xa0 -/* 80CA926C 7D 8C 02 14 */ add r12, r12, r0 -/* 80CA9270 4B 6B 8E 15 */ bl __ptmf_scall -/* 80CA9274 60 00 00 00 */ nop -/* 80CA9278 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 80CA927C 54 00 9F FE */ rlwinm r0, r0, 0x13, 0x1f, 0x1f -/* 80CA9280 98 1E 05 79 */ stb r0, 0x579(r30) -/* 80CA9284 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA9288 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA928C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA9290 7C 08 03 A6 */ mtlr r0 -/* 80CA9294 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA9298 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_carry__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_carry__11daOnsTaru_cFv.s deleted file mode 100644 index 81f158f3a4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_carry__11daOnsTaru_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80CA9320: -/* 80CA9320 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA9324 7C 08 02 A6 */ mflr r0 -/* 80CA9328 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA932C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA9330 7C 7F 1B 78 */ mr r31, r3 -/* 80CA9334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA9338 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA933C 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80CA9340 C0 3F 05 7C */ lfs f1, 0x57c(r31) -/* 80CA9344 C0 5F 05 84 */ lfs f2, 0x584(r31) -/* 80CA9348 38 80 00 00 */ li r4, 0 -/* 80CA934C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80CA9350 81 8C 01 24 */ lwz r12, 0x124(r12) -/* 80CA9354 7D 89 03 A6 */ mtctr r12 -/* 80CA9358 4E 80 04 21 */ bctrl -/* 80CA935C 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 80CA9360 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80CA9364 40 82 00 48 */ bne lbl_80CA93AC -/* 80CA9368 7F E3 FB 78 */ mr r3, r31 -/* 80CA936C 4B FF F9 05 */ bl chkWaterLineIn__11daOnsTaru_cFv -/* 80CA9370 2C 03 00 00 */ cmpwi r3, 0 -/* 80CA9374 41 82 00 10 */ beq lbl_80CA9384 -/* 80CA9378 7F E3 FB 78 */ mr r3, r31 -/* 80CA937C 48 00 01 9D */ bl mode_init_sink__11daOnsTaru_cFv -/* 80CA9380 48 00 00 2C */ b lbl_80CA93AC -lbl_80CA9384: -/* 80CA9384 3C 60 80 CB */ lis r3, lit_4020@ha /* 0x80CA9BD8@ha */ -/* 80CA9388 C0 23 9B D8 */ lfs f1, lit_4020@l(r3) /* 0x80CA9BD8@l */ -/* 80CA938C C0 1F 05 2C */ lfs f0, 0x52c(r31) -/* 80CA9390 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80CA9394 41 82 00 10 */ beq lbl_80CA93A4 -/* 80CA9398 7F E3 FB 78 */ mr r3, r31 -/* 80CA939C 48 00 00 25 */ bl mode_init_drop__11daOnsTaru_cFv -/* 80CA93A0 48 00 00 0C */ b lbl_80CA93AC -lbl_80CA93A4: -/* 80CA93A4 7F E3 FB 78 */ mr r3, r31 -/* 80CA93A8 4B FF FE F5 */ bl mode_init_wait__11daOnsTaru_cFv -lbl_80CA93AC: -/* 80CA93AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA93B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA93B4 7C 08 03 A6 */ mtlr r0 -/* 80CA93B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA93BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_drop__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_drop__11daOnsTaru_cFv.s deleted file mode 100644 index a9f97604f1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_drop__11daOnsTaru_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80CA9400: -/* 80CA9400 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA9404 7C 08 02 A6 */ mflr r0 -/* 80CA9408 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA940C 38 83 07 BC */ addi r4, r3, 0x7bc -/* 80CA9410 4B 37 12 BD */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -/* 80CA9414 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA9418 7C 08 03 A6 */ mtlr r0 -/* 80CA941C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA9420 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_sink__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_sink__11daOnsTaru_cFv.s deleted file mode 100644 index 76c11d363d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_sink__11daOnsTaru_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_80CA9530: -/* 80CA9530 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA9534 7C 08 02 A6 */ mflr r0 -/* 80CA9538 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA953C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA9540 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA9544 7C 7E 1B 78 */ mr r30, r3 -/* 80CA9548 3C 60 80 CB */ lis r3, lit_3655@ha /* 0x80CA9B78@ha */ -/* 80CA954C 3B E3 9B 78 */ addi r31, r3, lit_3655@l /* 0x80CA9B78@l */ -/* 80CA9550 38 7E 05 2C */ addi r3, r30, 0x52c -/* 80CA9554 C0 3F 00 60 */ lfs f1, 0x60(r31) -/* 80CA9558 C0 5F 00 64 */ lfs f2, 0x64(r31) -/* 80CA955C C0 7F 00 5C */ lfs f3, 0x5c(r31) -/* 80CA9560 C0 9F 00 68 */ lfs f4, 0x68(r31) -/* 80CA9564 4B 5C 64 19 */ bl cLib_addCalc__FPfffff -/* 80CA9568 C0 1E 04 FC */ lfs f0, 0x4fc(r30) -/* 80CA956C C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 80CA9570 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CA9574 40 80 00 08 */ bge lbl_80CA957C -/* 80CA9578 48 00 00 18 */ b lbl_80CA9590 -lbl_80CA957C: -/* 80CA957C C0 3F 00 6C */ lfs f1, 0x6c(r31) -/* 80CA9580 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CA9584 40 81 00 08 */ ble lbl_80CA958C -/* 80CA9588 48 00 00 08 */ b lbl_80CA9590 -lbl_80CA958C: -/* 80CA958C FC 20 00 90 */ fmr f1, f0 -lbl_80CA9590: -/* 80CA9590 D0 3E 04 FC */ stfs f1, 0x4fc(r30) -/* 80CA9594 80 1E 05 D0 */ lwz r0, 0x5d0(r30) -/* 80CA9598 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80CA959C 41 82 00 14 */ beq lbl_80CA95B0 -/* 80CA95A0 C0 3E 05 2C */ lfs f1, 0x52c(r30) -/* 80CA95A4 C0 1F 00 70 */ lfs f0, 0x70(r31) -/* 80CA95A8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80CA95AC D0 1E 05 2C */ stfs f0, 0x52c(r30) -lbl_80CA95B0: -/* 80CA95B0 7F C3 F3 78 */ mr r3, r30 -/* 80CA95B4 4B FF F6 BD */ bl chkWaterLineIn__11daOnsTaru_cFv -/* 80CA95B8 2C 03 00 00 */ cmpwi r3, 0 -/* 80CA95BC 41 82 00 10 */ beq lbl_80CA95CC -/* 80CA95C0 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 80CA95C4 D0 1E 05 30 */ stfs f0, 0x530(r30) -/* 80CA95C8 48 00 00 0C */ b lbl_80CA95D4 -lbl_80CA95CC: -/* 80CA95CC C0 1F 00 74 */ lfs f0, 0x74(r31) -/* 80CA95D0 D0 1E 05 30 */ stfs f0, 0x530(r30) -lbl_80CA95D4: -/* 80CA95D4 7F C3 F3 78 */ mr r3, r30 -/* 80CA95D8 38 9E 07 BC */ addi r4, r30, 0x7bc -/* 80CA95DC 4B 37 10 F1 */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -/* 80CA95E0 80 1E 05 D0 */ lwz r0, 0x5d0(r30) -/* 80CA95E4 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80CA95E8 41 82 00 14 */ beq lbl_80CA95FC -/* 80CA95EC 80 1E 05 5C */ lwz r0, 0x55c(r30) -/* 80CA95F0 60 00 00 10 */ ori r0, r0, 0x10 -/* 80CA95F4 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 80CA95F8 48 00 00 10 */ b lbl_80CA9608 -lbl_80CA95FC: -/* 80CA95FC 80 1E 05 5C */ lwz r0, 0x55c(r30) -/* 80CA9600 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 80CA9604 90 1E 05 5C */ stw r0, 0x55c(r30) -lbl_80CA9608: -/* 80CA9608 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA960C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA9610 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA9614 7C 08 03 A6 */ mtlr r0 -/* 80CA9618 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA961C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_wait__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_wait__11daOnsTaru_cFv.s deleted file mode 100644 index f44eabf5a0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_wait__11daOnsTaru_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80CA92CC: -/* 80CA92CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA92D0 7C 08 02 A6 */ mflr r0 -/* 80CA92D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA92D8 38 83 07 BC */ addi r4, r3, 0x7bc -/* 80CA92DC 4B 37 13 F1 */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -/* 80CA92E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA92E4 7C 08 03 A6 */ mtlr r0 -/* 80CA92E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA92EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/setBaseMtx__11daOnsTaru_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/setBaseMtx__11daOnsTaru_cFv.s deleted file mode 100644 index 66a7c6dac1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/setBaseMtx__11daOnsTaru_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80CA86C0: -/* 80CA86C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA86C4 7C 08 02 A6 */ mflr r0 -/* 80CA86C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA86CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA86D0 7C 7F 1B 78 */ mr r31, r3 -/* 80CA86D4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CA86D8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CA86DC C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80CA86E0 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CA86E4 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80CA86E8 4B 69 E2 01 */ bl PSMTXTrans -/* 80CA86EC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CA86F0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CA86F4 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80CA86F8 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80CA86FC A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80CA8700 4B 36 3B A1 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80CA8704 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80CA8708 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80CA870C D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80CA8710 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80CA8714 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80CA8718 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80CA871C D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80CA8720 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CA8724 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CA8728 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80CA872C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CA8730 4B 69 DD 81 */ bl PSMTXCopy -/* 80CA8734 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA8738 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA873C 7C 08 03 A6 */ mtlr r0 -/* 80CA8740 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA8744 4E 80 00 20 */ blr diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index 3e2840ad27..9886e6fc2e 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -52,6 +52,12 @@ inline T cLib_checkBit(T value, T bit) { template <typename T> inline T cLib_minMaxLimit(T val, T min, T max) { + return (T)((T)val < (T)min ? (T)min : ((T)val > (T)max ? (T)max : (T)val)); +} + +// fake function, replace usages with cLib_minMaxLimit when possible +template <typename T> +inline T cLib_minMaxLimit2(T val, T min, T max) { T ret; T var_r30; diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h index 75ae38a9ef..dcc6d7a338 100644 --- a/include/d/particle/d_particle.h +++ b/include/d/particle/d_particle.h @@ -193,9 +193,9 @@ public: setModel(param_0, param_1, param_2, param_3, param_4, param_5); } - // Should be dPa_modelEcallBack - static dPa_modelEcallBack* getEcallback() { return mEcallback; } - static dPa_modelEcallBack* mEcallback; + static dPa_modelEcallBack& getEcallback() { return (dPa_modelEcallBack&)mEcallback; } + static dPa_modelEcallBack* mEcallback; // Should be dPa_modelEcallBack + static u8 mPcallback[4]; static model_c* mModel; }; diff --git a/include/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h b/include/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h index 4a5e25ae70..47ebf3a9fa 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h +++ b/include/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h @@ -36,8 +36,8 @@ private: /* 0x570 */ J3DModel* mpModel; /* 0x574 */ s16 mTarget; /* 0x576 */ s16 mSpeed; - /* 0x578 */ s16 field_0x578; - /* 0x57C */ int mProcID; + /* 0x578 */ s16 mRotation; + /* 0x57C */ fpc_ProcID mSwActorID; /* 0x580 */ u16 mCount; /* 0x582 */ u8 mType; }; diff --git a/include/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h b/include/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h index 98ae6b4d13..b676e3a590 100644 --- a/include/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h +++ b/include/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h @@ -2,25 +2,33 @@ #define D_A_OBJ_ONSENTARU_H #include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" /** * @ingroup actors-objects * @class daOnsTaru_c - * @brief Hot Spring Water Barrel + * @brief Hotspring Water Barrel * * @details * */ class daOnsTaru_c : public fopAc_ac_c { public: + enum MODE_e { + MODE_WAIT_e, + MODE_CARRY_e, + MODE_DROP_e, + MODE_BREAK_e, + MODE_SINK_e, + }; + /* 80CA86C0 */ void setBaseMtx(); - /* 80CA8748 */ void CreateHeap(); - /* 80CA87B4 */ void create(); - /* 80CA8C20 */ void createHeapCallBack(fopAc_ac_c*); - /* 80CA8C4C */ void chkSinkAll(); - /* 80CA8C70 */ void chkWaterLineIn(); + /* 80CA87B4 */ int create(); + /* 80CA8C20 */ static int createHeapCallBack(fopAc_ac_c*); + /* 80CA8C4C */ BOOL chkSinkAll(); + /* 80CA8C70 */ BOOL chkWaterLineIn(); /* 80CA8C94 */ void bgCheck(); - /* 80CA8F38 */ void Execute(); /* 80CA9184 */ void mode_proc_call(); /* 80CA929C */ void mode_init_wait(); /* 80CA92CC */ void mode_proc_wait(); @@ -33,22 +41,51 @@ public: /* 80CA9518 */ void mode_init_sink(); /* 80CA9530 */ void mode_proc_sink(); /* 80CA9620 */ void breakEffSet(); - /* 80CA98B8 */ void Draw(); - /* 80CA995C */ void Delete(); - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; + /* 80CA8748 */ virtual int CreateHeap(); + /* 80CA8F38 */ virtual int Execute(); + /* 80CA98B8 */ virtual int Draw(); + /* 80CA995C */ virtual int Delete(); + + int getSw() { return fopAcM_GetParamBit(this, 0, 8); } + int getSw2() { return fopAcM_GetParamBit(this, 8, 8); } -private: - /* 0x568 */ u8 field_0x568[0x948 - 0x568]; + static dCcD_SrcGObjInf const mCcDObjInfo; + static dCcD_SrcCyl mCcDCyl; + + /* 0x56C */ request_of_phase_process_class mPhase; + /* 0x574 */ J3DModel* mpModel; + /* 0x578 */ u8 mMode; + /* 0x579 */ bool mIsCarryNow; + /* 0x57C */ cXyz mGrabOffset; + /* 0x588 */ cXyz mPrevPos; + /* 0x594 */ cXyz field_0x594; + /* 0x5A0 */ u8 mInWater; + /* 0x5A4 */ dBgS_ObjAcch mAcch; + /* 0x77C */ dBgS_AcchCir mAcchCir; + /* 0x7BC */ dCcD_Stts mCcStts; + /* 0x7F8 */ dCcD_Cyl mCcCyl; + /* 0x934 */ s16 mTimer; + /* 0x936 */ bool mStartTimer; + /* 0x938 */ u32 mHamonEmtrID; + /* 0x93C */ u8 field_0x93c; + /* 0x93D */ u8 mTempStat; + /* 0x93E */ u8 field_0x93e; + /* 0x93F */ u8 field_0x93F[0x944 - 0x93F]; + /* 0x944 */ f32 mCollisionRadius; }; STATIC_ASSERT(sizeof(daOnsTaru_c) == 0x948); -class daOnsTaru_HIO_c { +class daOnsTaru_HIO_c : public fOpAcm_HIO_entry_c { public: /* 80CA85CC */ daOnsTaru_HIO_c(); - /* 80CA9A78 */ ~daOnsTaru_HIO_c(); + /* 80CA9A78 */ virtual ~daOnsTaru_HIO_c() {} + + /* 0x04 */ s16 mCoolTime; + /* 0x06 */ u8 mVibration; + /* 0x08 */ f32 mSmokeScale; + /* 0x0C */ f32 mCollisionRadius; }; diff --git a/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h b/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h index 31a5b933c9..432d0fe152 100644 --- a/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h +++ b/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h @@ -27,18 +27,19 @@ public: u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); } u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); } int GetRotSpeedY() { return mRotSpeedY; } + f32 GetR() { return 100.0f; } /* 0x5A0 */ request_of_phase_process_class mPhase; - /* 0x5A8 */ J3DModel* mpModel1; - /* 0x5AC */ J3DModel* mpModel2; + /* 0x5A8 */ J3DModel* mpModelA; + /* 0x5AC */ J3DModel* mpModelB; /* 0x5B0 */ dBgW* mpBgW2; /* 0x5B4 */ Mtx mMtx; - /* 0x5E4 */ f32 field_0x5e4; - /* 0x5E8 */ u8 field_0x5e8; - /* 0x5E9 */ u8 field_0x5e9; - /* 0x5EA */ u8 field_0x5ea; - /* 0x5EB */ u8 field_0x5eb; - /* 0x5EC */ s16 mShapeAngleY; + /* 0x5E4 */ f32 mPartBHeight; + /* 0x5E8 */ bool mSpinnerIn; + /* 0x5E9 */ bool mPrevSpinnerIn; + /* 0x5EA */ bool mCanUse; + /* 0x5EB */ bool mPrevIsSwbit2; + /* 0x5EC */ s16 mPrevAngle; /* 0x5EE */ s16 mRotSpeedY; /* 0x5F0 */ s16 mCount; }; diff --git a/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp b/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp index f371d4f6b4..c70afa3c8f 100644 --- a/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp +++ b/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp @@ -12,32 +12,30 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { } /* 80C67F38-80C67FB4 000098 007C+00 1/1 0/0 0/0 .text searchSwSpinSub__FPvPv */ -static void* searchSwSpinSub(void* param_0, void* param_1) { - daObjSwSpinner_c* swspinner = (daObjSwSpinner_c*)param_0; - daObjLv4Gear_c* gear = (daObjLv4Gear_c*)param_1; - - if (swspinner != NULL && fopAc_IsActor(swspinner) && - fpcM_GetProfName(swspinner) == PROC_Obj_SwSpinner) - { - u8 sw_bit = swspinner->getSwBit(); +static void* searchSwSpinSub(void* i_actor, void* i_data) { + daObjSwSpinner_c* sw = (daObjSwSpinner_c*)i_actor; + daObjLv4Gear_c* gear = (daObjLv4Gear_c*)i_data; + + if (sw != NULL && fopAc_IsActor(sw) && fpcM_GetProfName(sw) == PROC_Obj_SwSpinner) { + u8 sw_bit = sw->getSwBit(); if (sw_bit != 0xFF && sw_bit == gear->getSwBit()) { - return swspinner; + return sw; } } - return 0; + return NULL; } /* 80C67FB4-80C67FF0 000114 003C+00 1/1 0/0 0/0 .text initBaseMtx__14daObjLv4Gear_cFv */ void daObjLv4Gear_c::initBaseMtx() { - mpModel->mBaseScale = scale; + mpModel->setBaseScale(scale); setBaseMtx(); } /* 80C67FF0-80C68050 000150 0060+00 2/2 0/0 0/0 .text setBaseMtx__14daObjLv4Gear_cFv */ void daObjLv4Gear_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); - mDoMtx_stack_c::YrotM(shape_angle.y + field_0x578); + mDoMtx_stack_c::YrotM(shape_angle.y + mRotation); MTXCopy(mDoMtx_stack_c::get(), mpModel->mBaseTransformMtx); } @@ -46,36 +44,36 @@ int daObjLv4Gear_c::Create() { initBaseMtx(); fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); fopAcM_setCullSizeBox2(this, mpModel->getModelData()); - mProcID = -1; + mSwActorID = fpcM_ERROR_PROCESS_ID_e; return 1; } -/* ############################################################################################## */ /* 80C68500-80C68508 000000 0008+00 2/2 0/0 0/0 .rodata l_bmd */ -static int const l_bmd[] = {0x00000004, 0x00000003}; +static int const l_bmd[] = {4, 3}; /* 80C6852C-80C68530 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "P_Gear"; /* 80C680A4-80C68124 000204 0080+00 1/1 0/0 0/0 .text CreateHeap__14daObjLv4Gear_cFv */ int daObjLv4Gear_c::CreateHeap() { - mpModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[mType]), - 0x80000, 0x11000084); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[mType]); + JUT_ASSERT(213, modelData != 0); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return 0; } + return 1; } -/* ############################################################################################## */ /* 80C68508-80C68510 000008 0008+00 0/0 0/0 0/0 .rodata l_size */ static int const l_size[] = {0x42C80000, 0x43960000}; /* 80C68510-80C68514 000010 0004+00 0/1 0/0 0/0 .rodata l_rot_start_time */ -static s16 const l_rot_start_time[] = {0x000F, 0x0064}; +static s16 const l_rot_start_time[] = {15, 100}; /* 80C68514-80C6851C 000014 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ -static int const l_heap_size[] = {0x00000F00, 0x00000F00}; +static int const l_heap_size[] = {0xF00, 0xF00}; /* 80C68124-80C681F4 000284 00D0+00 1/1 0/0 0/0 .text create__14daObjLv4Gear_cFv */ int daObjLv4Gear_c::create() { @@ -97,26 +95,25 @@ int daObjLv4Gear_c::create() { return phase; } -/* ############################################################################################## */ /* 80C681F4-80C683E0 000354 01EC+00 1/1 0/0 0/0 .text execute__14daObjLv4Gear_cFv */ int daObjLv4Gear_c::execute() { mTarget = 0; - if (mProcID == 0xFFFFFFFF) { - base_process_class* proc = fpcEx_Search(searchSwSpinSub, this); - if (proc != NULL) { - mProcID = (proc != NULL) ? proc->mBsPcId : -1; + if (mSwActorID == fpcM_ERROR_PROCESS_ID_e) { + fopAc_ac_c* sw_actor = (fopAc_ac_c*)fpcM_Search(searchSwSpinSub, this); + if (sw_actor != NULL) { + mSwActorID = fopAcM_GetID(sw_actor); } } else { - daObjSwSpinner_c* swspinner = (daObjSwSpinner_c*)fopAcM_SearchByID(mProcID); - if (swspinner != NULL) { - mTarget = swspinner->GetRotSpeedY(); + daObjSwSpinner_c* sw = (daObjSwSpinner_c*)fopAcM_SearchByID(mSwActorID); + if (sw != NULL) { + mTarget = sw->GetRotSpeedY(); } if (mTarget == 0) { mCount = 0; } else { - mCount += 1; + mCount++; } if (mCount > l_rot_start_time[mType]) { @@ -134,9 +131,8 @@ int daObjLv4Gear_c::execute() { } } - field_0x578 += mSpeed; + mRotation += mSpeed; setBaseMtx(); - return 1; } @@ -144,6 +140,7 @@ int daObjLv4Gear_c::execute() { int daObjLv4Gear_c::draw() { g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + mDoExt_modelUpdateDL(mpModel); return 1; } @@ -174,7 +171,6 @@ static int daObjLv4Gear_Create(daObjLv4Gear_c* i_this) { return i_this->create(); } -/* ############################################################################################## */ /* 80C68530-80C68550 -00001 0020+00 1/0 0/0 0/0 .data l_daObjLv4Gear_Method */ static actor_method_class l_daObjLv4Gear_Method = { (process_method_func)daObjLv4Gear_Create, (process_method_func)daObjLv4Gear_Delete, @@ -199,5 +195,3 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Gear = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C68524-80C68524 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp b/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp index 572ee6a380..d63ec7fd9f 100644 --- a/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp +++ b/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp @@ -1,154 +1,23 @@ /** * @file d_a_obj_onsenTaru.cpp - * -*/ + * Object - Hotspring Water Barrel + */ #include "rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.h" -#include "dol2asm.h" - - - -// -// Forward References: -// - -extern "C" void __ct__15daOnsTaru_HIO_cFv(); -extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__11daOnsTaru_cFv(); -extern "C" void CreateHeap__11daOnsTaru_cFv(); -extern "C" void create__11daOnsTaru_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void createHeapCallBack__11daOnsTaru_cFP10fopAc_ac_c(); -extern "C" void chkSinkAll__11daOnsTaru_cFv(); -extern "C" void chkWaterLineIn__11daOnsTaru_cFv(); -extern "C" void bgCheck__11daOnsTaru_cFv(); -extern "C" void Execute__11daOnsTaru_cFv(); -extern "C" void mode_proc_call__11daOnsTaru_cFv(); -extern "C" void mode_init_wait__11daOnsTaru_cFv(); -extern "C" void mode_proc_wait__11daOnsTaru_cFv(); -extern "C" void mode_init_carry__11daOnsTaru_cFv(); -extern "C" void mode_proc_carry__11daOnsTaru_cFv(); -extern "C" void mode_init_drop__11daOnsTaru_cFv(); -extern "C" void mode_proc_drop__11daOnsTaru_cFv(); -extern "C" void mode_init_break__11daOnsTaru_cFv(); -extern "C" void mode_proc_break__11daOnsTaru_cFv(); -extern "C" void mode_init_sink__11daOnsTaru_cFv(); -extern "C" void mode_proc_sink__11daOnsTaru_cFv(); -extern "C" void breakEffSet__11daOnsTaru_cFv(); -extern "C" void Draw__11daOnsTaru_cFv(); -extern "C" void Delete__11daOnsTaru_cFv(); -extern "C" static void daOnsTaru_Draw__FP11daOnsTaru_c(); -extern "C" static void daOnsTaru_Execute__FP11daOnsTaru_c(); -extern "C" static void daOnsTaru_Delete__FP11daOnsTaru_c(); -extern "C" static void daOnsTaru_Create__FP10fopAc_ac_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__15daOnsTaru_HIO_cFv(); -extern "C" void __sinit_d_a_obj_onsenTaru_cpp(); -extern "C" static void func_80CA9B54(); -extern "C" static void func_80CA9B5C(); -extern "C" u8 const mCcDObjInfo__11daOnsTaru_c[48]; -extern "C" extern char const* const d_a_obj_onsenTaru__stringBase0; -extern "C" u8 mCcDCyl__11daOnsTaru_c[68]; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(); -extern "C" void fopAcM_effHamonSet__FPUlPC4cXyzff(); -extern "C" void fopKyM_createWpillar__FPC4cXyzfi(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void -setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Move__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkAtHit__12dCcD_GObjInfFv(); -extern "C" void GetAtHitGObj__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitGObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80CA9B78-80CA9B7C 000000 0004+00 7/7 0/0 0/0 .rodata @3655 */ -SECTION_RODATA static f32 const lit_3655 = 1.0f; -COMPILER_STRIP_GATE(0x80CA9B78, &lit_3655); - -/* 80CA9B7C-80CA9B80 000004 0004+00 1/2 0/0 0/0 .rodata @3656 */ -SECTION_RODATA static f32 const lit_3656 = 125.0f; -COMPILER_STRIP_GATE(0x80CA9B7C, &lit_3656); +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/s/d_s_play.h" +#include "f_op/f_op_kankyo_mng.h" /* 80CA9C18-80CA9C24 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80CA9C24-80CA9C38 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -158,730 +27,427 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 80CA9C38-80CA9C7C 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__11daOnsTaru_c */ -SECTION_DATA u8 daOnsTaru_c::mCcDCyl[68] = { - 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, 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, -}; - -/* 80CA9C7C-80CA9C88 -00001 000C+00 0/1 0/0 0/0 .data @4002 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4002[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_proc_wait__11daOnsTaru_cFv, -}; -#pragma pop - -/* 80CA9C88-80CA9C94 -00001 000C+00 0/1 0/0 0/0 .data @4003 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4003[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_proc_carry__11daOnsTaru_cFv, -}; -#pragma pop - -/* 80CA9C94-80CA9CA0 -00001 000C+00 0/1 0/0 0/0 .data @4004 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4004[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_proc_drop__11daOnsTaru_cFv, -}; -#pragma pop - -/* 80CA9CA0-80CA9CAC -00001 000C+00 0/1 0/0 0/0 .data @4005 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4005[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_proc_break__11daOnsTaru_cFv, -}; -#pragma pop - -/* 80CA9CAC-80CA9CB8 -00001 000C+00 0/1 0/0 0/0 .data @4006 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4006[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_proc_sink__11daOnsTaru_cFv, -}; -#pragma pop - -/* 80CA9CB8-80CA9CF4 0000A0 003C+00 0/1 0/0 0/0 .data l_mode_func$4001 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_mode_func[60] = { - 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80CA9CF4-80CA9D14 -00001 0020+00 1/0 0/0 0/0 .data l_daOnsTaru_Method */ -static actor_method_class l_daOnsTaru_Method = { - (process_method_func)daOnsTaru_Create__FP10fopAc_ac_c, - (process_method_func)daOnsTaru_Delete__FP11daOnsTaru_c, - (process_method_func)daOnsTaru_Execute__FP11daOnsTaru_c, - 0, - (process_method_func)daOnsTaru_Draw__FP11daOnsTaru_c, -}; - -/* 80CA9D14-80CA9D44 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_OnsenTaru */ -extern actor_process_profile_definition g_profile_Obj_OnsenTaru = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_OnsenTaru, // mProcName - &g_fpcLf_Method.mBase, // sub_method - sizeof(daOnsTaru_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 510, // mPriority - &l_daOnsTaru_Method, // sub_method - 0x00040020, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - -/* 80CA9D44-80CA9D50 00012C 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80CA9D50-80CA9D5C 000138 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80CA9D5C-80CA9D68 000144 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80CA9D68-80CA9D74 000150 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80CA9D74-80CA9D80 00015C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80CA9D80-80CA9DA4 000168 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80CA9B5C, - (void*)NULL, - (void*)NULL, - (void*)func_80CA9B54, -}; - -/* 80CA9DA4-80CA9DBC 00018C 0018+00 1/1 0/0 0/0 .data __vt__11daOnsTaru_c */ -SECTION_DATA extern void* __vt__11daOnsTaru_c[6] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__11daOnsTaru_cFv, - (void*)Execute__11daOnsTaru_cFv, - (void*)Draw__11daOnsTaru_cFv, - (void*)Delete__11daOnsTaru_cFv, -}; +/* 80CA85CC-80CA861C 0000EC 0050+00 1/1 0/0 0/0 .text __ct__15daOnsTaru_HIO_cFv */ +daOnsTaru_HIO_c::daOnsTaru_HIO_c() { + mCoolTime = 120; + mVibration = 3; + mSmokeScale = 1.0f; + mCollisionRadius = 125.0f; +} -/* 80CA9DBC-80CA9DC8 0001A4 000C+00 2/2 0/0 0/0 .data __vt__15daOnsTaru_HIO_c */ -SECTION_DATA extern void* __vt__15daOnsTaru_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daOnsTaru_HIO_cFv, -}; +/* 80CA9DF4-80CA9E04 000014 0010+00 4/4 0/0 0/0 .bss l_HIO */ +static daOnsTaru_HIO_c l_HIO; -/* 80CA9DC8-80CA9DD4 0001B0 000C+00 3/3 0/0 0/0 .data __vt__18fOpAcm_HIO_entry_c */ -SECTION_DATA extern void* __vt__18fOpAcm_HIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18fOpAcm_HIO_entry_cFv, +/* 80CA9B80-80CA9BB0 000008 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__11daOnsTaru_c */ +const dCcD_SrcGObjInf daOnsTaru_c::mCcDObjInfo = { + {0, {{8, 0, 0x1F}, {0xD8FADDAF, 0x1F}, {0x79}}}, + {dCcD_SE_NONE, 0, 1, 0, 0}, + {dCcD_SE_NONE, 0, 0, 0, 2}, + {0}, }; -/* 80CA9DD4-80CA9DE0 0001BC 000C+00 4/4 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, +/* 80CA9C38-80CA9C7C 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__11daOnsTaru_c */ +dCcD_SrcCyl daOnsTaru_c::mCcDCyl = { + daOnsTaru_c::mCcDObjInfo, + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl }; -/* 80CA85CC-80CA861C 0000EC 0050+00 1/1 0/0 0/0 .text __ct__15daOnsTaru_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daOnsTaru_HIO_c::daOnsTaru_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__ct__15daOnsTaru_HIO_cFv.s" -} -#pragma pop - -/* 80CA861C-80CA8678 00013C 005C+00 1/0 0/0 0/0 .text __dt__18fOpAcm_HIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { -extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__18fOpAcm_HIO_entry_cFv.s" -} -#pragma pop - -/* 80CA8678-80CA86C0 000198 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm mDoHIO_entry_c::~mDoHIO_entry_c() { -extern "C" asm void __dt__14mDoHIO_entry_cFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop - /* 80CA86C0-80CA8748 0001E0 0088+00 2/2 0/0 0/0 .text setBaseMtx__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/setBaseMtx__11daOnsTaru_cFv.s" +void daOnsTaru_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mpModel->setBaseScale(scale); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop - -/* ############################################################################################## */ -/* 80CA9BF4-80CA9BF4 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CA9BF4 = "maroTaru"; -#pragma pop /* 80CA8748-80CA87B4 000268 006C+00 1/0 0/0 0/0 .text CreateHeap__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/CreateHeap__11daOnsTaru_cFv.s" -} -#pragma pop +int daOnsTaru_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("maroTaru", 3); + JUT_ASSERT(231, modelData != 0); -/* ############################################################################################## */ -/* 80CA9B80-80CA9BB0 000008 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__11daOnsTaru_c */ -SECTION_RODATA u8 const daOnsTaru_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, - 0xD8, 0xFA, 0xDD, 0xAF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CA9B80, &daOnsTaru_c::mCcDObjInfo); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } -/* 80CA9BB0-80CA9BB4 000038 0004+00 0/2 0/0 0/0 .rodata @3772 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3772 = 110.0f; -COMPILER_STRIP_GATE(0x80CA9BB0, &lit_3772); -#pragma pop + return 1; +} -/* 80CA9BB4-80CA9BB8 00003C 0004+00 0/2 0/0 0/0 .rodata @3773 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3773 = 50.0f; -COMPILER_STRIP_GATE(0x80CA9BB4, &lit_3773); -#pragma pop +/* 80CA87B4-80CA8A54 0002D4 02A0+00 1/1 0/0 0/0 .text create__11daOnsTaru_cFv */ +int daOnsTaru_c::create() { + fopAcM_SetupActor(this, daOnsTaru_c); -/* 80CA9BB8-80CA9BBC 000040 0004+00 2/4 0/0 0/0 .rodata @3774 */ -SECTION_RODATA static f32 const lit_3774 = -7.0f; -COMPILER_STRIP_GATE(0x80CA9BB8, &lit_3774); + if (fopAcM_isSwitch(this, getSw())) { + return cPhs_ERROR_e; + } -/* 80CA9BBC-80CA9BC0 000044 0004+00 0/1 0/0 0/0 .rodata @3775 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3775 = -100.0f; -COMPILER_STRIP_GATE(0x80CA9BBC, &lit_3775); -#pragma pop + int phase_state = dComIfG_resLoad(&mPhase, "maroTaru"); + if (phase_state == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0xF00)) { + return cPhs_ERROR_e; + } -/* 80CA87B4-80CA8A54 0002D4 02A0+00 1/1 0/0 0/0 .text create__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/create__11daOnsTaru_cFv.s" -} -#pragma pop + setBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); -/* 80CA8A54-80CA8A9C 000574 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__8cM3dGCylFv.s" -} -#pragma pop + mAcchCir.SetWall(110.0f, 50.0f); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), NULL, NULL); -/* 80CA8A9C-80CA8AE4 0005BC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__8cM3dGAabFv.s" -} -#pragma pop + fopAcM_SetGravity(this, -7.0f); + fopAcM_SetMaxFallSpeed(this, -100.0f); + fopAcM_SetModel(this, mpModel); -/* 80CA8AE4-80CA8B40 000604 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_GStts::~dCcD_GStts() { -extern "C" asm void __dt__10dCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__10dCcD_GSttsFv.s" -} -#pragma pop + mCcStts.Init(200, 0xFF, this); + mCcCyl.Set(mCcDCyl); + mCcCyl.SetStts(&mCcStts); + mCcCyl.OffAtSetBit(); -/* 80CA8B40-80CA8BB0 000660 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_AcchCir::~dBgS_AcchCir() { -extern "C" asm void __dt__12dBgS_AcchCirFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop + fopAcM_OnCarryType(this, fopAcM_CARRY_TYPE_1); + cLib_onBit<u32>(attention_info.flags, 0x10); + attention_info.distances[fopAc_attn_CARRY_e] = 42; + mIsCarryNow = fopAcM_checkCarryNow(this); -/* 80CA8BB0-80CA8C20 0006D0 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_ObjAcch::~dBgS_ObjAcch() { -extern "C" asm void __dt__12dBgS_ObjAcchFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__12dBgS_ObjAcchFv.s" + mode_init_wait(); + mCollisionRadius = 50.0f; + mTimer = 0; + mStartTimer = false; + mTempStat = 1; + field_0x93e = 1; + } + + return phase_state; } -#pragma pop /* 80CA8C20-80CA8C4C 000740 002C+00 1/1 0/0 0/0 .text * createHeapCallBack__11daOnsTaru_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::createHeapCallBack(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/createHeapCallBack__11daOnsTaru_cFP10fopAc_ac_c.s" +int daOnsTaru_c::createHeapCallBack(fopAc_ac_c* i_this) { + return ((daOnsTaru_c*)i_this)->CreateHeap(); } -#pragma pop - -/* ############################################################################################## */ -/* 80CA9BC0-80CA9BC4 000048 0004+00 1/2 0/0 0/0 .rodata @3863 */ -SECTION_RODATA static f32 const lit_3863 = 100.0f; -COMPILER_STRIP_GATE(0x80CA9BC0, &lit_3863); /* 80CA8C4C-80CA8C70 00076C 0024+00 1/1 0/0 0/0 .text chkSinkAll__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::chkSinkAll() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/chkSinkAll__11daOnsTaru_cFv.s" +BOOL daOnsTaru_c::chkSinkAll() { + return mAcch.m_wtr.GetHeight() > current.pos.y + 100.0f; } -#pragma pop - -/* ############################################################################################## */ -/* 80CA9BC4-80CA9BC8 00004C 0004+00 1/1 0/0 0/0 .rodata @3869 */ -SECTION_RODATA static f32 const lit_3869 = 40.0f; -COMPILER_STRIP_GATE(0x80CA9BC4, &lit_3869); /* 80CA8C70-80CA8C94 000790 0024+00 3/3 0/0 0/0 .text chkWaterLineIn__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::chkWaterLineIn() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/chkWaterLineIn__11daOnsTaru_cFv.s" +BOOL daOnsTaru_c::chkWaterLineIn() { + return mAcch.m_wtr.GetHeight() > current.pos.y + 40.0f; } -#pragma pop - -/* ############################################################################################## */ -/* 80CA9BC8-80CA9BCC 000050 0004+00 0/2 0/0 0/0 .rodata @3950 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3950 = -1.0f; -COMPILER_STRIP_GATE(0x80CA9BC8, &lit_3950); -#pragma pop - -/* 80CA9BCC-80CA9BD0 000054 0004+00 0/2 0/0 0/0 .rodata @3951 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3951 = -15.0f; -COMPILER_STRIP_GATE(0x80CA9BCC, &lit_3951); -#pragma pop - -/* 80CA9BD0-80CA9BD4 000058 0004+00 0/1 0/0 0/0 .rodata @3952 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3952 = 2.0f; -COMPILER_STRIP_GATE(0x80CA9BD0, &lit_3952); -#pragma pop - -/* 80CA9BD4-80CA9BD8 00005C 0004+00 0/2 0/0 0/0 .rodata @3953 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3953 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80CA9BD4, &lit_3953); -#pragma pop /* 80CA8C94-80CA8F38 0007B4 02A4+00 1/1 0/0 0/0 .text bgCheck__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::bgCheck() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/bgCheck__11daOnsTaru_cFv.s" +void daOnsTaru_c::bgCheck() { + bool roof_hit = mAcch.ChkRoofHit(); + bool wall_hit = mAcch.ChkWallHit(); + bool gnd_land = mAcch.ChkGroundLanding() != 0; + bool gnd_hit = mAcch.ChkGroundHit() != 0; + bool wtr_hit = mAcch.ChkWaterHit() != 0; + bool wtr_in = mAcch.ChkWaterIn() != 0; + + if (mMode == MODE_DROP_e) { + if (wall_hit || gnd_land || roof_hit) { + mode_init_break(); + } + } else if (gnd_hit) { + if (!wtr_hit && field_0x93e == 0) { + fopAcM_seStart(this, JA_SE_OBJ_PUT_WBOX_S, 0); + mCcCyl.OnCoSetBit(); + field_0x93e = 1; + } + } else { + field_0x93e = 0; + } + + if (mMode == MODE_WAIT_e || mMode == MODE_DROP_e || mMode == MODE_CARRY_e) { + f32 water_height = mAcch.m_wtr.GetHeight(); + if (wtr_hit) { + f32 var_f30 = speed.y; + + if (chkWaterLineIn() && mMode != MODE_CARRY_e) { + mode_init_sink(); + } + + if (wtr_in && !mInWater) { + cXyz sp5C(current.pos); + sp5C.y = water_height; + + if (var_f30 < -15.0f) { + fopKyM_createWpillar(&sp5C, 2.0f, 0); + fopAcM_seStart(this, Z2SE_OBJ_FALL_WATER_M, 0); + } + } + } + } + + cXyz pos(current.pos); + pos.y = mAcch.m_wtr.GetHeight(); + + if (pos.y > current.pos.y && + ((mMode == MODE_SINK_e && !chkSinkAll()) || (mMode == MODE_WAIT_e && gnd_hit) || + (mMode == MODE_CARRY_e && wtr_in && !chkSinkAll()))) + { + fopAcM_effHamonSet(&mHamonEmtrID, &pos, 1.0f, 0.1f); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80CA9DE8-80CA9DF4 000008 000C+00 1/1 0/0 0/0 .bss @3647 */ -static u8 lit_3647[12]; - -/* 80CA9DF4-80CA9E04 000014 0010+00 4/4 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[16]; /* 80CA8F38-80CA9184 000A58 024C+00 1/0 0/0 0/0 .text Execute__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/Execute__11daOnsTaru_cFv.s" +int daOnsTaru_c::Execute() { + field_0x594 = speed; + mode_proc_call(); + + mPrevPos = current.pos; + mAcch.CrrPos(dComIfG_Bgsp()); + mGrabOffset = current.pos - mPrevPos; + + if (mMode == MODE_CARRY_e) { + current.pos = mPrevPos; + } + + bgCheck(); + attention_info.position.x = current.pos.x; + attention_info.position.y = current.pos.y + 50.0f; + attention_info.position.z = current.pos.z; + eyePos = attention_info.position; + + mInWater = mAcch.ChkWaterIn(); + setBaseMtx(); + + if (mCcCyl.ChkAtHit()) { + if (mCcCyl.GetAtHitGObj()->GetTgType() & 0xD8FBFDFF) { + mode_init_break(); + } + } else if (mCcCyl.ChkTgHit()) { + if (mCcCyl.GetTgHitGObj()->GetAtType() & 0xD8FBFDFF) { + mode_init_break(); + } + } + + mCcCyl.SetR(mCollisionRadius + oREG_F(2)); + mCcCyl.SetH(110.0f + oREG_F(3)); + mCcCyl.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCcCyl); + mCcStts.Move(); + + if (mStartTimer) { + if (mTimer < (s16)(l_HIO.mCoolTime * 30)) { + if (!g_dComIfG_gameInfo.play.mEvent.runCheck()) { + mTimer++; + } + + cXyz sp2C(current.pos); + sp2C.y += 100.0f; + } else { + mTempStat = 0; + mStartTimer = false; + } + } + + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80CA9E04-80CA9E08 000024 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80CA9E04[4]; /* 80CA9184-80CA929C 000CA4 0118+00 1/1 0/0 0/0 .text mode_proc_call__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::mode_proc_call() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_call__11daOnsTaru_cFv.s" -} -#pragma pop +void daOnsTaru_c::mode_proc_call() { + typedef void (daOnsTaru_c::*mode_func)(); + static mode_func l_mode_func[] = { + &daOnsTaru_c::mode_proc_wait, &daOnsTaru_c::mode_proc_carry, &daOnsTaru_c::mode_proc_drop, + &daOnsTaru_c::mode_proc_break, &daOnsTaru_c::mode_proc_sink, + }; -/* ############################################################################################## */ -/* 80CA9BD8-80CA9BDC 000060 0004+00 3/5 0/0 0/0 .rodata @4020 */ -SECTION_RODATA static u8 const lit_4020[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CA9BD8, &lit_4020); + if (fopAcM_checkCarryNow(this) && !mIsCarryNow) { + mode_init_carry(); + } + + (this->*l_mode_func[mMode])(); + + mIsCarryNow = fopAcM_checkCarryNow(this); +} /* 80CA929C-80CA92CC 000DBC 0030+00 2/2 0/0 0/0 .text mode_init_wait__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::mode_init_wait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_wait__11daOnsTaru_cFv.s" +void daOnsTaru_c::mode_init_wait() { + cLib_onBit<u32>(attention_info.flags, 0x10); + speedF = 0.0f; + gravity = -7.0f; + mMode = MODE_WAIT_e; } -#pragma pop /* 80CA92CC-80CA92F0 000DEC 0024+00 1/0 0/0 0/0 .text mode_proc_wait__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::mode_proc_wait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_wait__11daOnsTaru_cFv.s" +void daOnsTaru_c::mode_proc_wait() { + fopAcM_posMoveF(this, mCcStts.GetCCMoveP()); } -#pragma pop /* 80CA92F0-80CA9320 000E10 0030+00 1/1 0/0 0/0 .text mode_init_carry__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::mode_init_carry() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_carry__11daOnsTaru_cFv.s" +void daOnsTaru_c::mode_init_carry() { + mCcCyl.OffCoSetBit(); + cLib_offBit<u32>(attention_info.flags, 0x10); + speedF = 0.0f; + mMode = MODE_CARRY_e; } -#pragma pop /* 80CA9320-80CA93C0 000E40 00A0+00 1/0 0/0 0/0 .text mode_proc_carry__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::mode_proc_carry() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_carry__11daOnsTaru_cFv.s" +void daOnsTaru_c::mode_proc_carry() { + daPy_getPlayerActorClass()->setGrabCollisionOffset(mGrabOffset.x, mGrabOffset.z, NULL); + + if (!fopAcM_checkCarryNow(this)) { + if (chkWaterLineIn()) { + mode_init_sink(); + } else if (fopAcM_GetSpeedF(this) != 0.0f) { + mode_init_drop(); + } else { + mode_init_wait(); + } + } } -#pragma pop /* 80CA93C0-80CA9400 000EE0 0040+00 1/1 0/0 0/0 .text mode_init_drop__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::mode_init_drop() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_drop__11daOnsTaru_cFv.s" +void daOnsTaru_c::mode_init_drop() { + mCcCyl.OnAtSetBit(); + mCollisionRadius = l_HIO.mCollisionRadius; + cLib_offBit<u32>(attention_info.flags, 0x10); + gravity = -7.0f; + mMode = MODE_DROP_e; } -#pragma pop /* 80CA9400-80CA9424 000F20 0024+00 1/0 0/0 0/0 .text mode_proc_drop__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::mode_proc_drop() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_drop__11daOnsTaru_cFv.s" +void daOnsTaru_c::mode_proc_drop() { + fopAcM_posMoveF(this, mCcStts.GetCCMoveP()); } -#pragma pop /* 80CA9424-80CA9514 000F44 00F0+00 2/2 0/0 0/0 .text mode_init_break__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::mode_init_break() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_break__11daOnsTaru_cFv.s" +void daOnsTaru_c::mode_init_break() { + mDoAud_seStart(Z2SE_OBJ_ONSEN_TARU_BRK, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + dComIfGp_getVibration().StartShock(l_HIO.mVibration, 15, cXyz(0.0f, 1.0f, 0.0f)); + breakEffSet(); + + fopAcM_onSwitch(this, getSw2()); + fopAcM_delete(this); + mMode = MODE_BREAK_e; } -#pragma pop /* 80CA9514-80CA9518 001034 0004+00 1/0 0/0 0/0 .text mode_proc_break__11daOnsTaru_cFv */ -void daOnsTaru_c::mode_proc_break() { - /* empty function */ -} +void daOnsTaru_c::mode_proc_break() {} /* 80CA9518-80CA9530 001038 0018+00 2/2 0/0 0/0 .text mode_init_sink__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::mode_init_sink() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_init_sink__11daOnsTaru_cFv.s" +void daOnsTaru_c::mode_init_sink() { + cLib_offBit<u32>(attention_info.flags, 0x10); + mMode = MODE_SINK_e; } -#pragma pop -/* ############################################################################################## */ -/* 80CA9BDC-80CA9BE0 000064 0004+00 0/1 0/0 0/0 .rodata @4132 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4132 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80CA9BDC, &lit_4132); -#pragma pop - -/* 80CA9BE0-80CA9BE4 000068 0004+00 0/1 0/0 0/0 .rodata @4133 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4133 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x80CA9BE0, &lit_4133); -#pragma pop +/* 80CA9530-80CA9620 001050 00F0+00 1/0 0/0 0/0 .text mode_proc_sink__11daOnsTaru_cFv */ +void daOnsTaru_c::mode_proc_sink() { + cLib_addCalc(&speedF, 0.0f, 0.05f, 0.1f, 0.01f); + speed.y = cLib_minMaxLimit<f32>(speed.y, -15.0f, 13.0f); -/* 80CA9BE4-80CA9BE8 00006C 0004+00 0/1 0/0 0/0 .rodata @4134 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4134 = 13.0f; -COMPILER_STRIP_GATE(0x80CA9BE4, &lit_4134); -#pragma pop + if (mAcch.ChkGroundHit()) { + speedF *= 0.9f; + } -/* 80CA9BE8-80CA9BEC 000070 0004+00 0/1 0/0 0/0 .rodata @4135 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4135 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(0x80CA9BE8, &lit_4135); -#pragma pop + if (chkWaterLineIn()) { + gravity = -7.0f; + } else { + gravity = -6.0f; + } -/* 80CA9BEC-80CA9BF0 000074 0004+00 0/1 0/0 0/0 .rodata @4136 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4136 = -6.0f; -COMPILER_STRIP_GATE(0x80CA9BEC, &lit_4136); -#pragma pop + fopAcM_posMoveF(this, mCcStts.GetCCMoveP()); -/* 80CA9530-80CA9620 001050 00F0+00 1/0 0/0 0/0 .text mode_proc_sink__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::mode_proc_sink() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/mode_proc_sink__11daOnsTaru_cFv.s" + if (mAcch.ChkGroundHit()) { + cLib_onBit<u32>(attention_info.flags, 0x10); + } else { + cLib_offBit<u32>(attention_info.flags, 0x10); + } } -#pragma pop -/* ############################################################################################## */ -/* 80CA9BF0-80CA9BF4 000078 0004+00 1/1 0/0 0/0 .rodata @4186 */ -SECTION_RODATA static f32 const lit_4186 = 0.75f; -COMPILER_STRIP_GATE(0x80CA9BF0, &lit_4186); +/* 80CA9620-80CA98B8 001140 0298+00 1/1 0/0 0/0 .text breakEffSet__11daOnsTaru_cFv */ +void daOnsTaru_c::breakEffSet() { + dComIfGp_particle_set(0x8A9A, ¤t.pos, NULL, NULL); + dComIfGp_particle_set(0x8A9B, ¤t.pos, NULL, NULL); + dComIfGp_particle_set(0x8A9C, ¤t.pos, NULL, NULL); + dComIfGp_particle_set(0x8A9D, ¤t.pos, NULL, NULL); -/* 80CA9BF4-80CA9BF4 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CA9BFD = "Always"; -SECTION_DEAD static char const* const stringBase_80CA9C04 = "BreakWoodBox.bmd"; -#pragma pop + if (mTempStat != 0) { + dComIfGp_particle_set(0x8A9E, ¤t.pos, NULL, NULL); + } -/* 80CA9620-80CA98B8 001140 0298+00 1/1 0/0 0/0 .text breakEffSet__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::breakEffSet() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/breakEffSet__11daOnsTaru_cFv.s" + cXyz pos(current.pos); + cXyz scale(0.75f, 0.75f, 0.75f); + + J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd"); + JUT_ASSERT(0x310, kibako_bmd != 0); + + s32 room_no = fopAcM_GetRoomNo(this); + JPABaseEmitter* emitter = + dComIfGp_particle_set(0x8A99, &pos, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(), + room_no, NULL, NULL, &scale); + if (emitter != NULL) { + dPa_modelEcallBack::setModel(emitter, kibako_bmd, tevStr, 3, NULL, 0, 0); + } } -#pragma pop /* 80CA98B8-80CA995C 0013D8 00A4+00 1/0 0/0 0/0 .text Draw__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/Draw__11daOnsTaru_cFv.s" +int daOnsTaru_c::Draw() { + g_env_light.settingTevStruct(0x40, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80CA995C-80CA998C 00147C 0030+00 1/0 0/0 0/0 .text Delete__11daOnsTaru_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daOnsTaru_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/Delete__11daOnsTaru_cFv.s" +int daOnsTaru_c::Delete() { + dComIfG_resDelete(&mPhase, "maroTaru"); + return 1; } -#pragma pop /* 80CA998C-80CA99B8 0014AC 002C+00 1/0 0/0 0/0 .text daOnsTaru_Draw__FP11daOnsTaru_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daOnsTaru_Draw(daOnsTaru_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Draw__FP11daOnsTaru_c.s" +static int daOnsTaru_Draw(daOnsTaru_c* i_this) { + return i_this->Draw(); } -#pragma pop /* 80CA99B8-80CA99E4 0014D8 002C+00 1/0 0/0 0/0 .text daOnsTaru_Execute__FP11daOnsTaru_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daOnsTaru_Execute(daOnsTaru_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Execute__FP11daOnsTaru_c.s" +static int daOnsTaru_Execute(daOnsTaru_c* i_this) { + return i_this->Execute(); } -#pragma pop /* 80CA99E4-80CA9A10 001504 002C+00 1/0 0/0 0/0 .text daOnsTaru_Delete__FP11daOnsTaru_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daOnsTaru_Delete(daOnsTaru_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Delete__FP11daOnsTaru_c.s" +static int daOnsTaru_Delete(daOnsTaru_c* i_this) { + return i_this->Delete(); } -#pragma pop /* 80CA9A10-80CA9A30 001530 0020+00 1/0 0/0 0/0 .text daOnsTaru_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daOnsTaru_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/daOnsTaru_Create__FP10fopAc_ac_c.s" +static int daOnsTaru_Create(fopAc_ac_c* i_this) { + return ((daOnsTaru_c*)i_this)->create(); } -#pragma pop - -/* 80CA9A30-80CA9A78 001550 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_GStts::~cCcD_GStts() { -extern "C" asm void __dt__10cCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* 80CA9A78-80CA9AE4 001598 006C+00 2/1 0/0 0/0 .text __dt__15daOnsTaru_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daOnsTaru_HIO_c::~daOnsTaru_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__dt__15daOnsTaru_HIO_cFv.s" -} -#pragma pop - -/* 80CA9AE4-80CA9B54 001604 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_onsenTaru_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_onsenTaru_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/__sinit_d_a_obj_onsenTaru_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80CA9AE4, __sinit_d_a_obj_onsenTaru_cpp); -#pragma pop - -/* 80CA9B54-80CA9B5C 001674 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80CA9B54() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/func_80CA9B54.s" -} -#pragma pop -/* 80CA9B5C-80CA9B64 00167C 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80CA9B5C() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru/func_80CA9B5C.s" -} -#pragma pop +/* 80CA9CF4-80CA9D14 -00001 0020+00 1/0 0/0 0/0 .data l_daOnsTaru_Method */ +static actor_method_class l_daOnsTaru_Method = { + (process_method_func)daOnsTaru_Create, (process_method_func)daOnsTaru_Delete, + (process_method_func)daOnsTaru_Execute, (process_method_func)NULL, + (process_method_func)daOnsTaru_Draw, +}; -/* 80CA9BF4-80CA9BF4 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80CA9D14-80CA9D44 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_OnsenTaru */ +extern actor_process_profile_definition g_profile_Obj_OnsenTaru = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_OnsenTaru, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daOnsTaru_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 510, // mPriority + &l_daOnsTaru_Method, // sub_method + 0x00040020, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; diff --git a/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp b/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp index 0763d865a0..fe148f3871 100644 --- a/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp +++ b/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp @@ -1,28 +1,28 @@ -// -// d_a_obj_swspinner.cpp -// Object - swspinner -// +/** + * d_a_obj_swspinner.cpp + * Object - Spinner Switch + */ #include "rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h" #include "d/d_procname.h" -/* ############################################################################################## */ /* 80CFFF78-80D00174 000078 01FC+00 1/1 0/0 0/0 .text search_spinner_sub__FPvPv */ -static void* search_spinner_sub(void* param_0, void* param_1) { - daSpinner_c* spinner = (daSpinner_c*)param_0; - daObjSwSpinner_c* swspinner = (daObjSwSpinner_c*)param_1; +static void* search_spinner_sub(void* i_actor, void* i_data) { + daSpinner_c* spinner = (daSpinner_c*)i_actor; + daObjSwSpinner_c* sw = (daObjSwSpinner_c*)i_data; if (spinner != NULL && fopAc_IsActor(spinner) && fpcM_GetProfName(spinner) == PROC_SPINNER) { - if (spinner->current.pos.absXZ(swspinner->current.pos) < 100.0f) { - if (swspinner->field_0x5e8 == NULL) { - swspinner->field_0x5e8 = 1; + if (spinner->current.pos.absXZ(sw->current.pos) < sw->GetR()) { + if (!sw->mSpinnerIn) { + sw->mSpinnerIn = true; } - spinner->setSpinnerTag(swspinner->attention_info.position); + spinner->setSpinnerTag(sw->attention_info.position); return spinner; } - if (swspinner->field_0x5e8 != NULL) { + + if (sw->mSpinnerIn) { spinner->offSpinnerTag(); - swspinner->field_0x5e8 = NULL; + sw->mSpinnerIn = false; } } @@ -32,8 +32,8 @@ static void* search_spinner_sub(void* param_0, void* param_1) { /* 80D00174-80D001CC 000274 0058+00 1/1 0/0 0/0 .text initBaseMtx__16daObjSwSpinner_cFv */ void daObjSwSpinner_c::initBaseMtx() { - mpModel1->setBaseScale(scale); - mpModel2->setBaseScale(scale); + mpModelA->setBaseScale(scale); + mpModelB->setBaseScale(scale); setBaseMtx(); } @@ -42,53 +42,53 @@ void daObjSwSpinner_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel1->setBaseTRMtx(mDoMtx_stack_c::get()); + mpModelA->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mMtx); - MTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y + field_0x5e4, current.pos.z); + MTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y + mPartBHeight, current.pos.z); mDoMtx_stack_c::YrotM(home.angle.y); + mpModelB->setBaseTRMtx(mDoMtx_stack_c::get()); - mpModel2->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -/* ############################################################################################## */ /* 80D00284-80D0035C 000384 00D8+00 1/0 0/0 0/0 .text Create__16daObjSwSpinner_cFv */ int daObjSwSpinner_c::Create() { if (fopAcM_isSwitch(this, getSwBit2())) { - field_0x5e4 = 50.0f; - field_0x5ea = 0; + mPartBHeight = 50.0f; + mCanUse = false; } else { - field_0x5e4 = 30.0f; - field_0x5ea = 1; + mPartBHeight = 30.0f; + mCanUse = true; } + attention_info.position.y -= 100.0f; initBaseMtx(); - fopAcM_SetMtx(this, mpModel1->getBaseTRMtx()); - fopAcM_setCullSizeBox2(this, mpModel1->getModelData()); + fopAcM_SetMtx(this, mpModelA->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModelA->getModelData()); dComIfG_Bgsp().Regist(mpBgW2, this); mpBgW2->Move(); - return 1; } -/* ############################################################################################## */ /* 80D00AE0-80D00AE4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "P_Sswitch"; /* 80D0035C-80D00498 00045C 013C+00 1/0 0/0 0/0 .text CreateHeap__16daObjSwSpinner_cFv */ int daObjSwSpinner_c::CreateHeap() { - mpModel1 = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, 4), 0x80000, - 0x11000084); - if (mpModel1 == NULL) { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); + JUT_ASSERT(0xED, modelData != 0); + mpModelA = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModelA == NULL) { return 0; } - mpModel2 = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, 5), 0x80000, - 0x11000084); - if (mpModel2 == NULL) { + modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); + JUT_ASSERT(0xF8, modelData != 0); + mpModelB = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModelB == NULL) { return 0; } @@ -110,47 +110,50 @@ int daObjSwSpinner_c::create1st() { return phase; } } + return phase; } -/* ############################################################################################## */ /* 80D00518-80D00890 000618 0378+00 1/0 0/0 0/0 .text Execute__16daObjSwSpinner_cFPPA3_A4_f */ int daObjSwSpinner_c::Execute(Mtx** param_0) { daSpinner_c* spinner = NULL; - mShapeAngleY = shape_angle.y; + mPrevAngle = shape_angle.y; - if (field_0x5ea != NULL) { + if (mCanUse) { spinner = (daSpinner_c*)fopAcM_Search((fopAcIt_JudgeFunc)search_spinner_sub, this); if (spinner != NULL) { - if ((field_0x5e8 != NULL && spinner->checkSpinnerTagInto()) || - spinner->checkSpinnerTagIntoIncRot()) { + if ((mSpinnerIn && spinner->checkSpinnerTagInto()) || + spinner->checkSpinnerTagIntoIncRot()) + { shape_angle.y = spinner->getAngleY(); } } else { - field_0x5e8 = NULL; + mSpinnerIn = false; } } - mRotSpeedY = cLib_distanceAngleS(shape_angle.y, mShapeAngleY); + mRotSpeedY = cLib_distanceAngleS(shape_angle.y, mPrevAngle); if (mRotSpeedY == 0) { mCount = 0; } else { - mCount += 1; + mCount++; } if (fopAcM_isSwitch(this, getSwBit2())) { - if (cLib_addCalc(&field_0x5e4, 50.0f, 0.1f, 10.0f, 2.0f) == 0.0f && field_0x5ea != NULL) { - if (field_0x5e8 != NULL) { + if (cLib_addCalc(&mPartBHeight, 50.0f, 0.1f, 10.0f, 2.0f) == 0.0f && mCanUse) { + if (mSpinnerIn) { spinner->offSpinnerTag(); - field_0x5e8 = NULL; + mSpinnerIn = false; } + shape_angle.y = home.angle.y; - field_0x5ea = NULL; + mCanUse = false; } - if (field_0x5eb == NULL) { + + if (!mPrevIsSwbit2) { fopAcM_seStart(this, Z2SE_OBJ_SPNR_SW_CL, 0); } - } else if (field_0x5e8 != NULL) { + } else if (mSpinnerIn) { if (mCount > 200) { if (mRotSpeedY > 3000) { fopAcM_onSwitch(this, getSwBit()); @@ -159,11 +162,13 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) { } } } else { - dComIfGs_offSwitch(getSwBit() & 0XFF, fopAcM_GetHomeRoomNo(this)); + dComIfGs_offSwitch(getSwBit() & 0xFF, fopAcM_GetHomeRoomNo(this)); } - if (field_0x5e8 != NULL && field_0x5e9 == NULL) { + + if (mSpinnerIn && !mPrevSpinnerIn) { fopAcM_seStart(this, Z2SE_OBJ_SPNR_SW_FIT, 0); } + if (mRotSpeedY != 0) { fopAcM_seStartLevel(this, Z2SE_OBJ_SPNR_SW_RL, mRotSpeedY); } @@ -171,25 +176,25 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) { *param_0 = &mBgMtx; setBaseMtx(); mpBgW2->Move(); + attention_info.position = current.pos; attention_info.position.y -= 100.0f; - field_0x5eb = fopAcM_isSwitch(this, getSwBit2()) ? 1 : 0; - field_0x5e9 = field_0x5e8; + mPrevIsSwbit2 = fopAcM_isSwitch(this, getSwBit2()); + mPrevSpinnerIn = mSpinnerIn; return 1; } /* 80D00890-80D00954 000990 00C4+00 1/0 0/0 0/0 .text Draw__16daObjSwSpinner_cFv */ int daObjSwSpinner_c::Draw() { g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); - g_env_light.setLightTevColorType_MAJI(mpModel1, &tevStr); - g_env_light.setLightTevColorType_MAJI(mpModel2, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModelA, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModelB, &tevStr); dComIfGd_setListBG(); - mDoExt_modelUpdateDL(mpModel1); - mDoExt_modelUpdateDL(mpModel2); + mDoExt_modelUpdateDL(mpModelA); + mDoExt_modelUpdateDL(mpModelB); dComIfGd_setList(); - return 1; } @@ -198,11 +203,11 @@ int daObjSwSpinner_c::Delete() { if (mpBgW2 != NULL && mpBgW2->ChkUsed()) { dComIfG_Bgsp().Release(mpBgW2); } + dComIfG_resDelete(&mPhase, l_arcName); return 1; } -/* ############################################################################################## */ /* 80D009C0-80D00A20 000AC0 0060+00 1/0 0/0 0/0 .text * daObjSwSpinner_create1st__FP16daObjSwSpinner_c */ static int daObjSwSpinner_create1st(daObjSwSpinner_c* i_this) { @@ -254,5 +259,3 @@ extern actor_process_profile_definition g_profile_Obj_SwSpinner = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80D00AD4-80D00AD4 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp index ab55f5b95f..f0dad16c93 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp @@ -27,12 +27,12 @@ static char const* l_arcName = "MR-Screw"; /* 80C9975C-80C99774 000000 0018+00 3/3 0/0 0/0 .rodata M_attr__18daObjMirrorScrew_c */ daObjMirrorScrew_c::attr const daObjMirrorScrew_c::M_attr = { - -2710.0f, // mDownDist - 0.6f, // mRotSpeedThreshold - 45, // mSpinCount - 0, // mResetSpinCount - 5.0f, // mSpedStep - -3.375f, // mDownSpeed + -2710.0f, // mDownDist + 0.6f, // mRotSpeedThreshold + 45, // mSpinCount + 0, // mResetSpinCount + 5.0f, // mSpedStep + -3.375f, // mDownSpeed }; /* 80C997F4-80C99824 000054 0030+00 2/3 0/0 0/0 .data ActionTable__18daObjMirrorScrew_c @@ -57,9 +57,10 @@ void daObjMirrorScrew_c::initWait() { */ void daObjMirrorScrew_c::executeWait() { if (mpSwSpinner != NULL) { - if (mpSwSpinner->GetRotSpeedY() / 4096.0f > M_attr.mRotSpeedThreshold) { + if (mpSwSpinner->GetRotSpeedY() / (f32)0x1000 > M_attr.mRotSpeedThreshold) { mSpinCount++; dComIfGp_getVibration().StartQuake(4, 0xf, cXyz(0.0f, 1.0f, 0.0f)); + if (mSpinCount > M_attr.mSpinCount) { setAction(ACT_DOWN); } @@ -74,19 +75,23 @@ void daObjMirrorScrew_c::executeWait() { void daObjMirrorScrew_c::initDown() { speedF = 0.0f; mSpinCount = M_attr.mResetSpinCount; + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[361]); + dComIfGp_getVibration().StartShock(8, 0xf, cXyz(0.0f, 1.0f, 0.0f)); dComIfGp_getVibration().StartQuake(6, 0xf, cXyz(0.0f, 1.0f, 0.0f)); Z2GetAudioMgr()->seStart(Z2SE_OBJ_MR_SCRW_ON, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - fopAcM_orderMapToolEvent(this, getEventID(), 0xff, 0xffff, 1, 0); + + fopAcM_orderMapToolEvent(this, getEventID(), 0xFF, 0xFFFF, 1, 0); + cXyz pos(0.0f, 0.0f, 0.0f); csXyz angle(0, 0, 0); - dComIfGp_particle_set(0x8aca, &pos, &angle, NULL); - dComIfGp_particle_set(0x8acb, &pos, &angle, NULL); - dComIfGp_particle_set(0x8ace, &pos, &angle, NULL); - dComIfGp_particle_set(0x8acf, &pos, &angle, NULL); - dComIfGp_particle_set(0x8ad0, &pos, &angle, NULL); - dComIfGp_particle_set(0x8ad1, &pos, &angle, NULL); + dComIfGp_particle_set(0x8ACA, &pos, &angle, NULL); + dComIfGp_particle_set(0x8ACB, &pos, &angle, NULL); + dComIfGp_particle_set(0x8ACE, &pos, &angle, NULL); + dComIfGp_particle_set(0x8ACF, &pos, &angle, NULL); + dComIfGp_particle_set(0x8AD0, &pos, &angle, NULL); + dComIfGp_particle_set(0x8AD1, &pos, &angle, NULL); } /* 80C98F04-80C99154 0004A4 0250+00 1/0 0/0 0/0 .text executeDown__18daObjMirrorScrew_cFv @@ -96,7 +101,7 @@ void daObjMirrorScrew_c::executeDown() { if (dComIfGp_event_runCheck()) { daPy_py_c* player = daPy_getPlayerActorClass(); player->changeOriginalDemo(); - player->changeDemoMode(0xe, 1, 0, 0); + player->changeDemoMode(14, 1, 0, 0); } if (mSpinCount >= 0) { @@ -105,12 +110,15 @@ void daObjMirrorScrew_c::executeDown() { if (mpChain != NULL) { mpChain->setAnmSpeed(1.0f); } + if (mpTable != NULL) { mpTable->setAnmSpeed(1.0f); } + if (mp6Pole != NULL) { mp6Pole->setAnmSpeed(1.0f); } + if (mpSand != NULL) { mpSand->setAnmSpeed(1.0f); } @@ -120,20 +128,23 @@ void daObjMirrorScrew_c::executeDown() { cLib_chaseF(&speedF, M_attr.mDownSpeed, M_attr.mSpeedStep); current.pos.y += speedF; mpSwSpinner->current.pos = cXyz(current.pos.x, current.pos.y + 2636.121f, current.pos.z); - Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_MR_SCRW_MV, ¤t.pos, - 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_MR_SCRW_MV, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); if (current.pos.y <= home.pos.y + M_attr.mDownDist) { current.pos.y = home.pos.y + M_attr.mDownDist; + // fake match: these should be dComIfGp_getVibration() gameinfo->play.getVibration().StartShock(8, 0xf, cXyz(0.0f, 1.0f, 0.0f)); gameinfo->play.getVibration().StopQuake(0x1f); - Z2GetAudioMgr()->seStart(Z2SE_OBJ_MR_SCRW_OFF, ¤t.pos, - 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + Z2GetAudioMgr()->seStart(Z2SE_OBJ_MR_SCRW_OFF, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); + u8 sw = getSwitchNo(); - if (sw != 0xff) { + if (sw != 0xFF) { fopAcM_onSwitch(this, sw); } + fopAcM_delete(this); } } @@ -165,12 +176,13 @@ static int daObjMirrorScrew_Delete(daObjMirrorScrew_c* i_this) { cPhs__Step daObjMirrorScrew_c::create() { fopAcM_SetupActor(this, daObjMirrorScrew_c); - if (fopAcM_isSwitch(this, getSwitchNo()) - || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) - || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) + if (fopAcM_isSwitch(this, getSwitchNo()) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { return cPhs_ERROR_e; } + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName); if (step == cPhs_COMPLEATE_e) { step = (cPhs__Step)MoveBGCreate(l_arcName, 7, dBgS_MoveBGProc_TypicalRotY, 0xc760, NULL); @@ -178,6 +190,7 @@ cPhs__Step daObjMirrorScrew_c::create() { return step; } } + return step; } @@ -211,15 +224,18 @@ void daObjMirrorScrew_c::initBaseMtx() { int daObjMirrorScrew_c::Create() { fopAcM_setCullSizeBox2(this, mpModel->getModelData()); initBaseMtx(); - cXyz pos(current.pos.x, current.pos.y + 2636.121f, current.pos.z); - fopAcM_createChild(PROC_Obj_SwSpinner, fopAcM_GetID(this), getSwitchNo() << 8, &pos, + + cXyz sw_pos(current.pos.x, current.pos.y + 2636.121f, current.pos.z); + fopAcM_createChild(PROC_Obj_SwSpinner, fopAcM_GetID(this), getSwitchNo() << 8, &sw_pos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); + mpSwSpinner = NULL; mpSpPath = NULL; mpChain = NULL; mpTable = NULL; mp6Pole = NULL; mpSand = NULL; + setAction(ACT_WAIT); return cPhs_COMPLEATE_e; } @@ -229,21 +245,27 @@ int daObjMirrorScrew_c::Execute(Mtx** i_mtxP) { if (mpSwSpinner == NULL) { mpSwSpinner = static_cast<daObjSwSpinner_c*>(fopAcM_SearchByName(PROC_Obj_SwSpinner)); } + if (mpSpPath == NULL) { mpSpPath = static_cast<daTagSppath_c*>(fopAcM_SearchByName(PROC_Tag_Sppath)); } + if (mpChain == NULL) { mpChain = static_cast<daObjMirrorChain_c*>(fopAcM_SearchByName(PROC_Obj_MirrorChain)); } + if (mpTable == NULL) { mpTable = static_cast<daObjMirrorTable_c*>(fopAcM_SearchByName(PROC_Obj_MirrorTable)); } + if (mp6Pole == NULL) { mp6Pole = static_cast<daObjMirror6Pole_c*>(fopAcM_SearchByName(PROC_Obj_Mirror6Pole)); } + if (mpSand == NULL) { mpSand = static_cast<daObjMirrorSand_c*>(fopAcM_SearchByName(PROC_Obj_MirrorSand)); } + callExecute(); setBaseMtx(); *i_mtxP = &mBgMtx; @@ -254,6 +276,7 @@ int daObjMirrorScrew_c::Execute(Mtx** i_mtxP) { int daObjMirrorScrew_c::Draw() { g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); @@ -268,10 +291,8 @@ int daObjMirrorScrew_c::Delete() { /* 80C99824-80C99844 -00001 0020+00 1/0 0/0 0/0 .data l_daObjMirrorScrew_Method */ static actor_method_class l_daObjMirrorScrew_Method = { - (process_method_func)daObjMirrorScrew_Create, - (process_method_func)daObjMirrorScrew_Delete, - (process_method_func)daObjMirrorScrew_Execute, - (process_method_func)daObjMirrorScrew_IsDelete, + (process_method_func)daObjMirrorScrew_Create, (process_method_func)daObjMirrorScrew_Delete, + (process_method_func)daObjMirrorScrew_Execute, (process_method_func)daObjMirrorScrew_IsDelete, (process_method_func)daObjMirrorScrew_Draw, }; diff --git a/src/d/a/d_a_alink_link.inc b/src/d/a/d_a_alink_link.inc index 35396269ba..ee064b8957 100644 --- a/src/d/a/d_a_alink_link.inc +++ b/src/d/a/d_a_alink_link.inc @@ -283,7 +283,7 @@ int daAlink_c::procMove() { setBlendMoveAnime(lit_6041); if (field_0x3174 != 8) { field_0x30a0 = - cLib_minMaxLimit((s16)(field_0x2ff0 >> 1), daAlinkHIO_basic_c0::m.mNeckMaxUp, + cLib_minMaxLimit2((s16)(field_0x2ff0 >> 1), daAlinkHIO_basic_c0::m.mNeckMaxUp, daAlinkHIO_basic_c0::m.mNeckMaxDown); } } diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index 88d3fd9f20..64001a1be4 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -52,7 +52,7 @@ void dEyeHL_mng_c::update() { for (; obj != NULL; obj = obj->m_next) { ResTIMG* timg = obj->m_timg; timg->LODBias = obj->m_lodBias + tmp; - timg->LODBias = (s16)cLib_minMaxLimit((s16)timg->LODBias, (s16)-400, (s16)399); + timg->LODBias = cLib_minMaxLimit<s16>(timg->LODBias, -400, 399); } } } |