diff --git a/Progress.md b/Progress.md index c1d5c9d1e08..a1cbdfef2f7 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 52.688307% | 2118424 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 52.688307% | 2118424 | 4020672 -RELs | 36.594134% | 4208444 | 11500324 -Total | 40.763286% | 6326868 | 15520996 +RELs | 36.628812% | 4212432 | 11500324 +Total | 40.788980% | 6330856 | 15520996 ## RELs @@ -433,7 +433,7 @@ d_a_obj_hasu2 | 41.190476% | 1384 | 3360 d_a_obj_hata | 39.059081% | 1428 | 3656 d_a_obj_hb | 29.310936% | 3420 | 11668 d_a_obj_hbombkoya | 78.615196% | 5132 | 6528 -d_a_obj_heavySw | 41.214623% | 2796 | 6784 +d_a_obj_heavySw | 100.000000% | 6784 | 6784 d_a_obj_hfuta | 39.073970% | 2768 | 7084 d_a_obj_hhashi | 33.138856% | 3408 | 10284 d_a_obj_hsTarget | 100.000000% | 2624 | 2624 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 36.594134% | 4208444 | 11500324 +Total | 36.628812% | 4212432 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/CreateHeap__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/CreateHeap__11daHeavySw_cFv.s deleted file mode 100644 index ad9b460723e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/CreateHeap__11daHeavySw_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80C1CC70: -/* 80C1CC70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1CC74 7C 08 02 A6 */ mflr r0 -/* 80C1CC78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1CC7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1CC80 7C 7F 1B 78 */ mr r31, r3 -/* 80C1CC84 3C 60 80 C2 */ lis r3, d_a_obj_heavySw__stringBase0@ha /* 0x80C1DAE0@ha */ -/* 80C1CC88 38 63 DA E0 */ addi r3, r3, d_a_obj_heavySw__stringBase0@l /* 0x80C1DAE0@l */ -/* 80C1CC8C 38 80 00 04 */ li r4, 4 -/* 80C1CC90 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1CC94 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1CC98 3C A5 00 02 */ addis r5, r5, 2 -/* 80C1CC9C 38 C0 00 80 */ li r6, 0x80 -/* 80C1CCA0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C1CCA4 4B 41 F6 49 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C1CCA8 3C 80 00 08 */ lis r4, 8 -/* 80C1CCAC 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C1CCB0 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C1CCB4 4B 3F 7F A1 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C1CCB8 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80C1CCBC 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C1CCC0 30 03 FF FF */ addic r0, r3, -1 -/* 80C1CCC4 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C1CCC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1CCCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1CCD0 7C 08 03 A6 */ mtlr r0 -/* 80C1CCD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1CCD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/Delete__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/Delete__11daHeavySw_cFv.s deleted file mode 100644 index abf1211bfa6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/Delete__11daHeavySw_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C1D91C: -/* 80C1D91C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1D920 7C 08 02 A6 */ mflr r0 -/* 80C1D924 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1D928 3C 80 80 C2 */ lis r4, d_a_obj_heavySw__stringBase0@ha /* 0x80C1DAE0@ha */ -/* 80C1D92C 38 84 DA E0 */ addi r4, r4, d_a_obj_heavySw__stringBase0@l /* 0x80C1DAE0@l */ -/* 80C1D930 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80C1D934 4B 40 F6 D5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C1D938 38 60 00 01 */ li r3, 1 -/* 80C1D93C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1D940 7C 08 03 A6 */ mtlr r0 -/* 80C1D944 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1D948 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/Draw__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/Draw__11daHeavySw_cFv.s deleted file mode 100644 index 8f6ddbfee94..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/Draw__11daHeavySw_cFv.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_80C1D808: -/* 80C1D808 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C1D80C 7C 08 02 A6 */ mflr r0 -/* 80C1D810 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C1D814 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C1D818 4B 74 49 C5 */ bl _savegpr_29 -/* 80C1D81C 7C 7F 1B 78 */ mr r31, r3 -/* 80C1D820 3C 60 80 C2 */ lis r3, lit_3647@ha /* 0x80C1DA94@ha */ -/* 80C1D824 3B A3 DA 94 */ addi r29, r3, lit_3647@l /* 0x80C1DA94@l */ -/* 80C1D828 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C1D82C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C1D830 38 80 00 10 */ li r4, 0x10 -/* 80C1D834 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C1D838 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80C1D83C 4B 58 5F 89 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C1D840 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C1D844 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C1D848 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C1D84C 80 84 00 04 */ lwz r4, 4(r4) -/* 80C1D850 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C1D854 4B 58 75 4D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C1D858 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1D85C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1D860 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C1D864 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C1D868 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C1D86C 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C1D870 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C1D874 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C1D878 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C1D87C 4B 3F 04 49 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C1D880 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1D884 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1D888 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C1D88C 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C1D890 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C1D894 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C1D898 C0 5F 04 D8 */ lfs f2, 0x4d8(r31) -/* 80C1D89C C0 7F 04 D4 */ lfs f3, 0x4d4(r31) -/* 80C1D8A0 C0 3D 00 44 */ lfs f1, 0x44(r29) -/* 80C1D8A4 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80C1D8A8 EC 01 00 2A */ fadds f0, f1, f0 -/* 80C1D8AC D0 01 00 08 */ stfs f0, 8(r1) -/* 80C1D8B0 D0 61 00 0C */ stfs f3, 0xc(r1) -/* 80C1D8B4 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 80C1D8B8 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80C1D8BC D0 61 00 18 */ stfs f3, 0x18(r1) -/* 80C1D8C0 D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 80C1D8C4 80 7F 07 F8 */ lwz r3, 0x7f8(r31) -/* 80C1D8C8 38 80 00 01 */ li r4, 1 -/* 80C1D8CC 80 BF 05 A8 */ lwz r5, 0x5a8(r31) -/* 80C1D8D0 38 C1 00 14 */ addi r6, r1, 0x14 -/* 80C1D8D4 C0 3D 00 48 */ lfs f1, 0x48(r29) -/* 80C1D8D8 C0 5D 00 14 */ lfs f2, 0x14(r29) -/* 80C1D8DC C0 9F 06 B8 */ lfs f4, 0x6b8(r31) -/* 80C1D8E0 38 FF 07 10 */ addi r7, r31, 0x710 -/* 80C1D8E4 39 1F 01 0C */ addi r8, r31, 0x10c -/* 80C1D8E8 39 20 00 00 */ li r9, 0 -/* 80C1D8EC C0 BD 00 28 */ lfs f5, 0x28(r29) -/* 80C1D8F0 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80C1D8F4 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80C1D8F8 4B 41 10 19 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -/* 80C1D8FC 90 7F 07 F8 */ stw r3, 0x7f8(r31) -/* 80C1D900 38 60 00 01 */ li r3, 1 -/* 80C1D904 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C1D908 4B 74 49 21 */ bl _restgpr_29 -/* 80C1D90C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C1D910 7C 08 03 A6 */ mtlr r0 -/* 80C1D914 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C1D918 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/Execute__11daHeavySw_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/Execute__11daHeavySw_cFPPA3_A4_f.s deleted file mode 100644 index 8419b4ca6e3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/Execute__11daHeavySw_cFPPA3_A4_f.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80C1CFC0: -/* 80C1CFC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1CFC4 7C 08 02 A6 */ mflr r0 -/* 80C1CFC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1CFCC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1CFD0 93 C1 00 08 */ stw r30, 8(r1) -/* 80C1CFD4 7C 7E 1B 78 */ mr r30, r3 -/* 80C1CFD8 7C 9F 23 78 */ mr r31, r4 -/* 80C1CFDC 48 00 00 51 */ bl moveSwitch__11daHeavySw_cFv -/* 80C1CFE0 38 7E 06 20 */ addi r3, r30, 0x620 -/* 80C1CFE4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1CFE8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1CFEC 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80C1CFF0 4B 45 9A BD */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80C1CFF4 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C1CFF8 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C1CFFC 90 1F 00 00 */ stw r0, 0(r31) -/* 80C1D000 7F C3 F3 78 */ mr r3, r30 -/* 80C1D004 4B FF FB C5 */ bl setBaseMtx__11daHeavySw_cFv -/* 80C1D008 38 00 00 00 */ li r0, 0 -/* 80C1D00C 98 1E 05 D8 */ stb r0, 0x5d8(r30) -/* 80C1D010 38 60 00 01 */ li r3, 1 -/* 80C1D014 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1D018 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C1D01C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1D020 7C 08 03 A6 */ mtlr r0 -/* 80C1D024 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1D028 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__ct__15daHeavySw_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__ct__15daHeavySw_HIO_cFv.s deleted file mode 100644 index d6cd696f92a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__ct__15daHeavySw_HIO_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80C1CAEC: -/* 80C1CAEC 3C 80 80 C2 */ lis r4, lit_3647@ha /* 0x80C1DA94@ha */ -/* 80C1CAF0 38 A4 DA 94 */ addi r5, r4, lit_3647@l /* 0x80C1DA94@l */ -/* 80C1CAF4 3C 80 80 C2 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80C1DC34@ha */ -/* 80C1CAF8 38 04 DC 34 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80C1DC34@l */ -/* 80C1CAFC 90 03 00 00 */ stw r0, 0(r3) -/* 80C1CB00 3C 80 80 C2 */ lis r4, __vt__15daHeavySw_HIO_c@ha /* 0x80C1DC28@ha */ -/* 80C1CB04 38 04 DC 28 */ addi r0, r4, __vt__15daHeavySw_HIO_c@l /* 0x80C1DC28@l */ -/* 80C1CB08 90 03 00 00 */ stw r0, 0(r3) -/* 80C1CB0C C0 05 00 00 */ lfs f0, 0(r5) -/* 80C1CB10 D0 03 00 04 */ stfs f0, 4(r3) -/* 80C1CB14 C0 05 00 04 */ lfs f0, 4(r5) -/* 80C1CB18 D0 03 00 08 */ stfs f0, 8(r3) -/* 80C1CB1C C0 05 00 08 */ lfs f0, 8(r5) -/* 80C1CB20 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80C1CB24 C0 05 00 0C */ lfs f0, 0xc(r5) -/* 80C1CB28 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80C1CB2C C0 05 00 10 */ lfs f0, 0x10(r5) -/* 80C1CB30 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 80C1CB34 C0 25 00 14 */ lfs f1, 0x14(r5) -/* 80C1CB38 D0 23 00 28 */ stfs f1, 0x28(r3) -/* 80C1CB3C D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 80C1CB40 D0 23 00 18 */ stfs f1, 0x18(r3) -/* 80C1CB44 C0 05 00 18 */ lfs f0, 0x18(r5) -/* 80C1CB48 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80C1CB4C D0 23 00 20 */ stfs f1, 0x20(r3) -/* 80C1CB50 C0 05 00 1C */ lfs f0, 0x1c(r5) -/* 80C1CB54 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 80C1CB58 38 80 00 1E */ li r4, 0x1e -/* 80C1CB5C 98 83 00 30 */ stb r4, 0x30(r3) -/* 80C1CB60 38 00 00 08 */ li r0, 8 -/* 80C1CB64 98 03 00 31 */ stb r0, 0x31(r3) -/* 80C1CB68 98 83 00 32 */ stb r4, 0x32(r3) -/* 80C1CB6C 38 00 00 05 */ li r0, 5 -/* 80C1CB70 98 03 00 33 */ stb r0, 0x33(r3) -/* 80C1CB74 38 00 00 04 */ li r0, 4 -/* 80C1CB78 98 03 00 34 */ stb r0, 0x34(r3) -/* 80C1CB7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index e2955067856..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C1CF20: -/* 80C1CF20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1CF24 7C 08 02 A6 */ mflr r0 -/* 80C1CF28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1CF2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1CF30 93 C1 00 08 */ stw r30, 8(r1) -/* 80C1CF34 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C1CF38 7C 9F 23 78 */ mr r31, r4 -/* 80C1CF3C 41 82 00 38 */ beq lbl_80C1CF74 -/* 80C1CF40 3C 60 80 C2 */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80C1DBD0@ha */ -/* 80C1CF44 38 03 DB D0 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80C1DBD0@l */ -/* 80C1CF48 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80C1CF4C 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80C1CF50 38 80 FF FF */ li r4, -1 -/* 80C1CF54 4B 65 1F C5 */ bl __dt__8cM3dGCirFv -/* 80C1CF58 7F C3 F3 78 */ mr r3, r30 -/* 80C1CF5C 38 80 00 00 */ li r4, 0 -/* 80C1CF60 4B 64 B1 51 */ bl __dt__13cBgS_PolyInfoFv -/* 80C1CF64 7F E0 07 35 */ extsh. r0, r31 -/* 80C1CF68 40 81 00 0C */ ble lbl_80C1CF74 -/* 80C1CF6C 7F C3 F3 78 */ mr r3, r30 -/* 80C1CF70 4B 6B 1D CD */ bl __dl__FPv -lbl_80C1CF74: -/* 80C1CF74 7F C3 F3 78 */ mr r3, r30 -/* 80C1CF78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1CF7C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C1CF80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1CF84 7C 08 03 A6 */ mtlr r0 -/* 80C1CF88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1CF8C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index f87e14fd8b1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C1CEB0: -/* 80C1CEB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1CEB4 7C 08 02 A6 */ mflr r0 -/* 80C1CEB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1CEBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1CEC0 93 C1 00 08 */ stw r30, 8(r1) -/* 80C1CEC4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C1CEC8 7C 9F 23 78 */ mr r31, r4 -/* 80C1CECC 41 82 00 38 */ beq lbl_80C1CF04 -/* 80C1CED0 3C 80 80 C2 */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80C1DBDC@ha */ -/* 80C1CED4 38 84 DB DC */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80C1DBDC@l */ -/* 80C1CED8 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80C1CEDC 38 04 00 0C */ addi r0, r4, 0xc -/* 80C1CEE0 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80C1CEE4 38 04 00 18 */ addi r0, r4, 0x18 -/* 80C1CEE8 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80C1CEEC 38 80 00 00 */ li r4, 0 -/* 80C1CEF0 4B 45 90 A5 */ bl __dt__9dBgS_AcchFv -/* 80C1CEF4 7F E0 07 35 */ extsh. r0, r31 -/* 80C1CEF8 40 81 00 0C */ ble lbl_80C1CF04 -/* 80C1CEFC 7F C3 F3 78 */ mr r3, r30 -/* 80C1CF00 4B 6B 1E 3D */ bl __dl__FPv -lbl_80C1CF04: -/* 80C1CF04 7F C3 F3 78 */ mr r3, r30 -/* 80C1CF08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1CF0C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C1CF10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1CF14 7C 08 03 A6 */ mtlr r0 -/* 80C1CF18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1CF1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index d4c90ec12b5..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C1CB80: -/* 80C1CB80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1CB84 7C 08 02 A6 */ mflr r0 -/* 80C1CB88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1CB8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1CB90 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C1CB94 41 82 00 1C */ beq lbl_80C1CBB0 -/* 80C1CB98 3C A0 80 C2 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80C1DC34@ha */ -/* 80C1CB9C 38 05 DC 34 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80C1DC34@l */ -/* 80C1CBA0 90 1F 00 00 */ stw r0, 0(r31) -/* 80C1CBA4 7C 80 07 35 */ extsh. r0, r4 -/* 80C1CBA8 40 81 00 08 */ ble lbl_80C1CBB0 -/* 80C1CBAC 4B 6B 21 91 */ bl __dl__FPv -lbl_80C1CBB0: -/* 80C1CBB0 7F E3 FB 78 */ mr r3, r31 -/* 80C1CBB4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1CBB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1CBBC 7C 08 03 A6 */ mtlr r0 -/* 80C1CBC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1CBC4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__15daHeavySw_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__15daHeavySw_HIO_cFv.s deleted file mode 100644 index bcaf3f3e825..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__15daHeavySw_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C1D9D8: -/* 80C1D9D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1D9DC 7C 08 02 A6 */ mflr r0 -/* 80C1D9E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1D9E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1D9E8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C1D9EC 41 82 00 30 */ beq lbl_80C1DA1C -/* 80C1D9F0 3C 60 80 C2 */ lis r3, __vt__15daHeavySw_HIO_c@ha /* 0x80C1DC28@ha */ -/* 80C1D9F4 38 03 DC 28 */ addi r0, r3, __vt__15daHeavySw_HIO_c@l /* 0x80C1DC28@l */ -/* 80C1D9F8 90 1F 00 00 */ stw r0, 0(r31) -/* 80C1D9FC 41 82 00 10 */ beq lbl_80C1DA0C -/* 80C1DA00 3C 60 80 C2 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C1DC34@ha */ -/* 80C1DA04 38 03 DC 34 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C1DC34@l */ -/* 80C1DA08 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C1DA0C: -/* 80C1DA0C 7C 80 07 35 */ extsh. r0, r4 -/* 80C1DA10 40 81 00 0C */ ble lbl_80C1DA1C -/* 80C1DA14 7F E3 FB 78 */ mr r3, r31 -/* 80C1DA18 4B 6B 13 25 */ bl __dl__FPv -lbl_80C1DA1C: -/* 80C1DA1C 7F E3 FB 78 */ mr r3, r31 -/* 80C1DA20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1DA24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1DA28 7C 08 03 A6 */ mtlr r0 -/* 80C1DA2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1DA30 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__sinit_d_a_obj_heavySw_cpp.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__sinit_d_a_obj_heavySw_cpp.s deleted file mode 100644 index 5c428f2d742..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__sinit_d_a_obj_heavySw_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80C1DA34: -/* 80C1DA34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1DA38 7C 08 02 A6 */ mflr r0 -/* 80C1DA3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1DA40 3C 60 80 C2 */ lis r3, l_HIO@ha /* 0x80C1DC54@ha */ -/* 80C1DA44 38 63 DC 54 */ addi r3, r3, l_HIO@l /* 0x80C1DC54@l */ -/* 80C1DA48 4B FF F0 A5 */ bl __ct__15daHeavySw_HIO_cFv -/* 80C1DA4C 3C 80 80 C2 */ lis r4, __dt__15daHeavySw_HIO_cFv@ha /* 0x80C1D9D8@ha */ -/* 80C1DA50 38 84 D9 D8 */ addi r4, r4, __dt__15daHeavySw_HIO_cFv@l /* 0x80C1D9D8@l */ -/* 80C1DA54 3C A0 80 C2 */ lis r5, lit_3641@ha /* 0x80C1DC48@ha */ -/* 80C1DA58 38 A5 DC 48 */ addi r5, r5, lit_3641@l /* 0x80C1DC48@l */ -/* 80C1DA5C 4B FF F0 1D */ bl __register_global_object -/* 80C1DA60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1DA64 7C 08 03 A6 */ mtlr r0 -/* 80C1DA68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1DA6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/create__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/create__11daHeavySw_cFv.s deleted file mode 100644 index 9c4a6c1096b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/create__11daHeavySw_cFv.s +++ /dev/null @@ -1,125 +0,0 @@ -lbl_80C1CCDC: -/* 80C1CCDC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C1CCE0 7C 08 02 A6 */ mflr r0 -/* 80C1CCE4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C1CCE8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C1CCEC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80C1CCF0 7C 7E 1B 78 */ mr r30, r3 -/* 80C1CCF4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C1CCF8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C1CCFC 40 82 00 64 */ bne lbl_80C1CD60 -/* 80C1CD00 7F C0 F3 79 */ or. r0, r30, r30 -/* 80C1CD04 41 82 00 50 */ beq lbl_80C1CD54 -/* 80C1CD08 7C 1F 03 78 */ mr r31, r0 -/* 80C1CD0C 4B 45 B9 19 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C1CD10 3C 60 80 C2 */ lis r3, __vt__11daHeavySw_c@ha /* 0x80C1DC00@ha */ -/* 80C1CD14 38 03 DC 00 */ addi r0, r3, __vt__11daHeavySw_c@l /* 0x80C1DC00@l */ -/* 80C1CD18 90 1F 05 9C */ stw r0, 0x59c(r31) -/* 80C1CD1C 38 7F 05 E0 */ addi r3, r31, 0x5e0 -/* 80C1CD20 4B 45 91 8D */ bl __ct__12dBgS_AcchCirFv -/* 80C1CD24 3B FF 06 20 */ addi r31, r31, 0x620 -/* 80C1CD28 7F E3 FB 78 */ mr r3, r31 -/* 80C1CD2C 4B 45 93 75 */ bl __ct__9dBgS_AcchFv -/* 80C1CD30 3C 60 80 C2 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80C1DBDC@ha */ -/* 80C1CD34 38 63 DB DC */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80C1DBDC@l */ -/* 80C1CD38 90 7F 00 10 */ stw r3, 0x10(r31) -/* 80C1CD3C 38 03 00 0C */ addi r0, r3, 0xc -/* 80C1CD40 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80C1CD44 38 03 00 18 */ addi r0, r3, 0x18 -/* 80C1CD48 90 1F 00 24 */ stw r0, 0x24(r31) -/* 80C1CD4C 38 7F 00 14 */ addi r3, r31, 0x14 -/* 80C1CD50 4B 45 C1 19 */ bl SetObj__16dBgS_PolyPassChkFv -lbl_80C1CD54: -/* 80C1CD54 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80C1CD58 60 00 00 08 */ ori r0, r0, 8 -/* 80C1CD5C 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80C1CD60: -/* 80C1CD60 38 7E 05 A0 */ addi r3, r30, 0x5a0 -/* 80C1CD64 3C 80 80 C2 */ lis r4, d_a_obj_heavySw__stringBase0@ha /* 0x80C1DAE0@ha */ -/* 80C1CD68 38 84 DA E0 */ addi r4, r4, d_a_obj_heavySw__stringBase0@l /* 0x80C1DAE0@l */ -/* 80C1CD6C 4B 41 01 51 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C1CD70 7C 7F 1B 78 */ mr r31, r3 -/* 80C1CD74 2C 1F 00 04 */ cmpwi r31, 4 -/* 80C1CD78 40 82 01 1C */ bne lbl_80C1CE94 -/* 80C1CD7C 7F C3 F3 78 */ mr r3, r30 -/* 80C1CD80 3C 80 80 C2 */ lis r4, d_a_obj_heavySw__stringBase0@ha /* 0x80C1DAE0@ha */ -/* 80C1CD84 38 84 DA E0 */ addi r4, r4, d_a_obj_heavySw__stringBase0@l /* 0x80C1DAE0@l */ -/* 80C1CD88 38 A0 00 07 */ li r5, 7 -/* 80C1CD8C 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C1CD90 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C1CD94 38 E0 0C 80 */ li r7, 0xc80 -/* 80C1CD98 39 00 00 00 */ li r8, 0 -/* 80C1CD9C 4B 45 BA 21 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C1CDA0 2C 03 00 05 */ cmpwi r3, 5 -/* 80C1CDA4 40 82 00 0C */ bne lbl_80C1CDB0 -/* 80C1CDA8 38 60 00 05 */ li r3, 5 -/* 80C1CDAC 48 00 00 EC */ b lbl_80C1CE98 -lbl_80C1CDB0: -/* 80C1CDB0 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C1CDB4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C1CDB8 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80C1CDBC 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C1CDC0 80 83 00 04 */ lwz r4, 4(r3) -/* 80C1CDC4 7F C3 F3 78 */ mr r3, r30 -/* 80C1CDC8 4B 3F D7 B1 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C1CDCC 3C 60 80 C2 */ lis r3, rideCallBack__11daHeavySw_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c@ha /* 0x80C1CF90@ha */ -/* 80C1CDD0 38 03 CF 90 */ addi r0, r3, rideCallBack__11daHeavySw_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c@l /* 0x80C1CF90@l */ -/* 80C1CDD4 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80C1CDD8 90 03 00 B4 */ stw r0, 0xb4(r3) -/* 80C1CDDC 38 7E 05 E0 */ addi r3, r30, 0x5e0 -/* 80C1CDE0 3C 80 80 C2 */ lis r4, lit_3652@ha /* 0x80C1DAA8@ha */ -/* 80C1CDE4 C0 24 DA A8 */ lfs f1, lit_3652@l(r4) /* 0x80C1DAA8@l */ -/* 80C1CDE8 FC 40 08 90 */ fmr f2, f1 -/* 80C1CDEC 4B 45 91 6D */ bl SetWall__12dBgS_AcchCirFff -/* 80C1CDF0 38 00 00 00 */ li r0, 0 -/* 80C1CDF4 90 01 00 08 */ stw r0, 8(r1) -/* 80C1CDF8 38 7E 06 20 */ addi r3, r30, 0x620 -/* 80C1CDFC 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80C1CE00 38 BE 04 BC */ addi r5, r30, 0x4bc -/* 80C1CE04 7F C6 F3 78 */ mr r6, r30 -/* 80C1CE08 38 E0 00 01 */ li r7, 1 -/* 80C1CE0C 39 1E 05 E0 */ addi r8, r30, 0x5e0 -/* 80C1CE10 39 3E 04 F8 */ addi r9, r30, 0x4f8 -/* 80C1CE14 39 40 00 00 */ li r10, 0 -/* 80C1CE18 4B 45 94 31 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80C1CE1C 3C 60 80 C2 */ lis r3, lit_3652@ha /* 0x80C1DAA8@ha */ -/* 80C1CE20 C0 03 DA A8 */ lfs f0, lit_3652@l(r3) /* 0x80C1DAA8@l */ -/* 80C1CE24 D0 1E 05 BC */ stfs f0, 0x5bc(r30) -/* 80C1CE28 D0 1E 05 B4 */ stfs f0, 0x5b4(r30) -/* 80C1CE2C 38 00 00 00 */ li r0, 0 -/* 80C1CE30 90 1E 05 C8 */ stw r0, 0x5c8(r30) -/* 80C1CE34 B0 1E 05 CC */ sth r0, 0x5cc(r30) -/* 80C1CE38 B0 1E 05 CE */ sth r0, 0x5ce(r30) -/* 80C1CE3C B0 1E 05 D0 */ sth r0, 0x5d0(r30) -/* 80C1CE40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1CE44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1CE48 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C1CE4C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C1CE50 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C1CE54 7C 05 07 74 */ extsb r5, r0 -/* 80C1CE58 4B 41 85 09 */ bl isSwitch__10dSv_info_cCFii -/* 80C1CE5C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C1CE60 41 82 00 1C */ beq lbl_80C1CE7C -/* 80C1CE64 3C 60 80 C2 */ lis r3, lit_3741@ha /* 0x80C1DAB4@ha */ -/* 80C1CE68 C0 03 DA B4 */ lfs f0, lit_3741@l(r3) /* 0x80C1DAB4@l */ -/* 80C1CE6C D0 1E 05 BC */ stfs f0, 0x5bc(r30) -/* 80C1CE70 7F C3 F3 78 */ mr r3, r30 -/* 80C1CE74 48 00 08 15 */ bl init_modeMoveEnd__11daHeavySw_cFv -/* 80C1CE78 48 00 00 14 */ b lbl_80C1CE8C -lbl_80C1CE7C: -/* 80C1CE7C 38 00 00 00 */ li r0, 0 -/* 80C1CE80 98 1E 05 C5 */ stb r0, 0x5c5(r30) -/* 80C1CE84 7F C3 F3 78 */ mr r3, r30 -/* 80C1CE88 48 00 03 ED */ bl init_modeWait__11daHeavySw_cFv -lbl_80C1CE8C: -/* 80C1CE8C 7F C3 F3 78 */ mr r3, r30 -/* 80C1CE90 4B FF FD 39 */ bl setBaseMtx__11daHeavySw_cFv -lbl_80C1CE94: -/* 80C1CE94 7F E3 FB 78 */ mr r3, r31 -lbl_80C1CE98: -/* 80C1CE98 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C1CE9C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80C1CEA0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C1CEA4 7C 08 03 A6 */ mtlr r0 -/* 80C1CEA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C1CEAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 37246fec3cd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C1D9B8: -/* 80C1D9B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1D9BC 7C 08 02 A6 */ mflr r0 -/* 80C1D9C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1D9C4 4B FF F3 19 */ bl create__11daHeavySw_cFv -/* 80C1D9C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1D9CC 7C 08 03 A6 */ mtlr r0 -/* 80C1D9D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1D9D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Delete__FP11daHeavySw_c.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Delete__FP11daHeavySw_c.s deleted file mode 100644 index 20b5e0e6ad9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Delete__FP11daHeavySw_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C1D998: -/* 80C1D998 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1D99C 7C 08 02 A6 */ mflr r0 -/* 80C1D9A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1D9A4 4B 45 AF 39 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C1D9A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1D9AC 7C 08 03 A6 */ mtlr r0 -/* 80C1D9B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1D9B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Draw__FP11daHeavySw_c.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Draw__FP11daHeavySw_c.s deleted file mode 100644 index 6b14c9c508a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Draw__FP11daHeavySw_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C1D94C: -/* 80C1D94C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1D950 7C 08 02 A6 */ mflr r0 -/* 80C1D954 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1D958 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C1D95C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C1D960 7D 89 03 A6 */ mtctr r12 -/* 80C1D964 4E 80 04 21 */ bctrl -/* 80C1D968 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1D96C 7C 08 03 A6 */ mtlr r0 -/* 80C1D970 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1D974 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Execute__FP11daHeavySw_c.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Execute__FP11daHeavySw_c.s deleted file mode 100644 index 654f17e4dda..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Execute__FP11daHeavySw_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C1D978: -/* 80C1D978 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1D97C 7C 08 02 A6 */ mflr r0 -/* 80C1D980 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1D984 4B 45 AF CD */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C1D988 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1D98C 7C 08 03 A6 */ mtlr r0 -/* 80C1D990 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1D994 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/func_80C1DA70.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/func_80C1DA70.s deleted file mode 100644 index d2ec6464473..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/func_80C1DA70.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80C1DA70: -/* 80C1DA70 38 63 FF DC */ addi r3, r3, -36 -/* 80C1DA74 4B FF F4 3C */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/func_80C1DA78.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/func_80C1DA78.s deleted file mode 100644 index 849aedaef31..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/func_80C1DA78.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80C1DA78: -/* 80C1DA78 38 63 FF EC */ addi r3, r3, -20 -/* 80C1DA7C 4B FF F4 34 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeMoveEnd__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeMoveEnd__11daHeavySw_cFv.s deleted file mode 100644 index 633f53fc8a9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeMoveEnd__11daHeavySw_cFv.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_80C1D688: -/* 80C1D688 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C1D68C 7C 08 02 A6 */ mflr r0 -/* 80C1D690 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C1D694 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C1D698 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80C1D69C 7C 7F 1B 78 */ mr r31, r3 -/* 80C1D6A0 3C 60 80 C2 */ lis r3, lit_3647@ha /* 0x80C1DA94@ha */ -/* 80C1D6A4 3B C3 DA 94 */ addi r30, r3, lit_3647@l /* 0x80C1DA94@l */ -/* 80C1D6A8 38 00 00 01 */ li r0, 1 -/* 80C1D6AC 98 1F 05 C5 */ stb r0, 0x5c5(r31) -/* 80C1D6B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1D6B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1D6B8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C1D6BC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C1D6C0 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C1D6C4 7C 05 07 74 */ extsb r5, r0 -/* 80C1D6C8 4B 41 7C 99 */ bl isSwitch__10dSv_info_cCFii -/* 80C1D6CC 2C 03 00 00 */ cmpwi r3, 0 -/* 80C1D6D0 40 82 00 88 */ bne lbl_80C1D758 -/* 80C1D6D4 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C1D6D8 7C 03 07 74 */ extsb r3, r0 -/* 80C1D6DC 4B 40 F9 91 */ bl dComIfGp_getReverb__Fi -/* 80C1D6E0 7C 67 1B 78 */ mr r7, r3 -/* 80C1D6E4 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008012A@ha */ -/* 80C1D6E8 38 03 01 2A */ addi r0, r3, 0x012A /* 0x0008012A@l */ -/* 80C1D6EC 90 01 00 08 */ stw r0, 8(r1) -/* 80C1D6F0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C1D6F4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C1D6F8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C1D6FC 38 81 00 08 */ addi r4, r1, 8 -/* 80C1D700 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C1D704 38 C0 00 00 */ li r6, 0 -/* 80C1D708 C0 3E 00 28 */ lfs f1, 0x28(r30) -/* 80C1D70C FC 40 08 90 */ fmr f2, f1 -/* 80C1D710 C0 7E 00 2C */ lfs f3, 0x2c(r30) -/* 80C1D714 FC 80 18 90 */ fmr f4, f3 -/* 80C1D718 39 00 00 00 */ li r8, 0 -/* 80C1D71C 4B 68 E2 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C1D720 C0 3E 00 14 */ lfs f1, 0x14(r30) -/* 80C1D724 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80C1D728 C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 80C1D72C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80C1D730 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80C1D734 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1D738 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1D73C 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80C1D740 3C 80 80 C2 */ lis r4, l_HIO@ha /* 0x80C1DC54@ha */ -/* 80C1D744 38 84 DC 54 */ addi r4, r4, l_HIO@l /* 0x80C1DC54@l */ -/* 80C1D748 88 84 00 34 */ lbz r4, 0x34(r4) -/* 80C1D74C 38 A0 00 0F */ li r5, 0xf -/* 80C1D750 38 C1 00 0C */ addi r6, r1, 0xc -/* 80C1D754 4B 45 22 D1 */ bl StartShock__12dVibration_cFii4cXyz -lbl_80C1D758: -/* 80C1D758 3C 60 80 C2 */ lis r3, l_HIO@ha /* 0x80C1DC54@ha */ -/* 80C1D75C 38 63 DC 54 */ addi r3, r3, l_HIO@l /* 0x80C1DC54@l */ -/* 80C1D760 88 03 00 32 */ lbz r0, 0x32(r3) -/* 80C1D764 98 1F 05 C4 */ stb r0, 0x5c4(r31) -/* 80C1D768 38 00 00 04 */ li r0, 4 -/* 80C1D76C 98 1F 05 AC */ stb r0, 0x5ac(r31) -/* 80C1D770 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C1D774 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80C1D778 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C1D77C 7C 08 03 A6 */ mtlr r0 -/* 80C1D780 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C1D784 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeMoveInit__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeMoveInit__11daHeavySw_cFv.s deleted file mode 100644 index cabd245f985..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeMoveInit__11daHeavySw_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C1D408: -/* 80C1D408 3C 80 80 C2 */ lis r4, l_HIO@ha /* 0x80C1DC54@ha */ -/* 80C1D40C 38 84 DC 54 */ addi r4, r4, l_HIO@l /* 0x80C1DC54@l */ -/* 80C1D410 C0 04 00 20 */ lfs f0, 0x20(r4) -/* 80C1D414 D0 03 05 2C */ stfs f0, 0x52c(r3) -/* 80C1D418 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 80C1D41C D0 03 05 D4 */ stfs f0, 0x5d4(r3) -/* 80C1D420 88 04 00 31 */ lbz r0, 0x31(r4) -/* 80C1D424 98 03 05 C4 */ stb r0, 0x5c4(r3) -/* 80C1D428 38 00 00 02 */ li r0, 2 -/* 80C1D42C 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80C1D430 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeMove__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeMove__11daHeavySw_cFv.s deleted file mode 100644 index 811a45ba946..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeMove__11daHeavySw_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80C1D54C: -/* 80C1D54C 3C 80 80 C2 */ lis r4, l_HIO@ha /* 0x80C1DC54@ha */ -/* 80C1D550 38 84 DC 54 */ addi r4, r4, l_HIO@l /* 0x80C1DC54@l */ -/* 80C1D554 C0 04 00 0C */ lfs f0, 0xc(r4) -/* 80C1D558 D0 03 05 B0 */ stfs f0, 0x5b0(r3) -/* 80C1D55C 88 04 00 30 */ lbz r0, 0x30(r4) -/* 80C1D560 98 03 05 C4 */ stb r0, 0x5c4(r3) -/* 80C1D564 C0 04 00 28 */ lfs f0, 0x28(r4) -/* 80C1D568 D0 03 05 2C */ stfs f0, 0x52c(r3) -/* 80C1D56C C0 04 00 2C */ lfs f0, 0x2c(r4) -/* 80C1D570 D0 03 05 D4 */ stfs f0, 0x5d4(r3) -/* 80C1D574 38 00 00 00 */ li r0, 0 -/* 80C1D578 98 03 07 FC */ stb r0, 0x7fc(r3) -/* 80C1D57C 38 00 00 03 */ li r0, 3 -/* 80C1D580 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80C1D584 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeRide__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeRide__11daHeavySw_cFv.s deleted file mode 100644 index 30507f9c25d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeRide__11daHeavySw_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C1D2AC: -/* 80C1D2AC 3C 80 80 C2 */ lis r4, l_HIO@ha /* 0x80C1DC54@ha */ -/* 80C1D2B0 38 84 DC 54 */ addi r4, r4, l_HIO@l /* 0x80C1DC54@l */ -/* 80C1D2B4 88 04 00 33 */ lbz r0, 0x33(r4) -/* 80C1D2B8 98 03 05 C4 */ stb r0, 0x5c4(r3) -/* 80C1D2BC C0 04 00 18 */ lfs f0, 0x18(r4) -/* 80C1D2C0 D0 03 05 2C */ stfs f0, 0x52c(r3) -/* 80C1D2C4 C0 04 00 1C */ lfs f0, 0x1c(r4) -/* 80C1D2C8 D0 03 05 D4 */ stfs f0, 0x5d4(r3) -/* 80C1D2CC 38 00 00 01 */ li r0, 1 -/* 80C1D2D0 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80C1D2D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeWait__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeWait__11daHeavySw_cFv.s deleted file mode 100644 index c69493f2eb2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeWait__11daHeavySw_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80C1D274: -/* 80C1D274 38 00 00 00 */ li r0, 0 -/* 80C1D278 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80C1D27C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeMoveEnd__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeMoveEnd__11daHeavySw_cFv.s deleted file mode 100644 index 3b0dd8948d9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeMoveEnd__11daHeavySw_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80C1D788: -/* 80C1D788 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1D78C 7C 08 02 A6 */ mflr r0 -/* 80C1D790 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1D794 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1D798 7C 7F 1B 78 */ mr r31, r3 -/* 80C1D79C 88 63 05 C4 */ lbz r3, 0x5c4(r3) -/* 80C1D7A0 28 03 00 00 */ cmplwi r3, 0 -/* 80C1D7A4 41 82 00 10 */ beq lbl_80C1D7B4 -/* 80C1D7A8 38 03 FF FF */ addi r0, r3, -1 -/* 80C1D7AC 98 1F 05 C4 */ stb r0, 0x5c4(r31) -/* 80C1D7B0 48 00 00 44 */ b lbl_80C1D7F4 -lbl_80C1D7B4: -/* 80C1D7B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1D7B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1D7BC 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C1D7C0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C1D7C4 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C1D7C8 7C 05 07 74 */ extsb r5, r0 -/* 80C1D7CC 4B 41 7B 95 */ bl isSwitch__10dSv_info_cCFii -/* 80C1D7D0 2C 03 00 00 */ cmpwi r3, 0 -/* 80C1D7D4 40 82 00 20 */ bne lbl_80C1D7F4 -/* 80C1D7D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1D7DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1D7E0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C1D7E4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C1D7E8 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C1D7EC 7C 05 07 74 */ extsb r5, r0 -/* 80C1D7F0 4B 41 7A 11 */ bl onSwitch__10dSv_info_cFii -lbl_80C1D7F4: -/* 80C1D7F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1D7F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1D7FC 7C 08 03 A6 */ mtlr r0 -/* 80C1D800 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1D804 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeMoveInit__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeMoveInit__11daHeavySw_cFv.s deleted file mode 100644 index 012658963eb..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeMoveInit__11daHeavySw_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80C1D434: -/* 80C1D434 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C1D438 7C 08 02 A6 */ mflr r0 -/* 80C1D43C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C1D440 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C1D444 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80C1D448 7C 7E 1B 78 */ mr r30, r3 -/* 80C1D44C 3C 80 80 C2 */ lis r4, lit_3647@ha /* 0x80C1DA94@ha */ -/* 80C1D450 3B E4 DA 94 */ addi r31, r4, lit_3647@l /* 0x80C1DA94@l */ -/* 80C1D454 80 03 05 DC */ lwz r0, 0x5dc(r3) -/* 80C1D458 28 00 00 00 */ cmplwi r0, 0 -/* 80C1D45C 40 82 00 08 */ bne lbl_80C1D464 -/* 80C1D460 4B FF FE 4D */ bl init_modeRide__11daHeavySw_cFv -lbl_80C1D464: -/* 80C1D464 88 7E 05 C4 */ lbz r3, 0x5c4(r30) -/* 80C1D468 28 03 00 00 */ cmplwi r3, 0 -/* 80C1D46C 41 82 00 78 */ beq lbl_80C1D4E4 -/* 80C1D470 38 03 FF FF */ addi r0, r3, -1 -/* 80C1D474 98 1E 05 C4 */ stb r0, 0x5c4(r30) -/* 80C1D478 88 1E 05 C4 */ lbz r0, 0x5c4(r30) -/* 80C1D47C 28 00 00 00 */ cmplwi r0, 0 -/* 80C1D480 40 82 00 B4 */ bne lbl_80C1D534 -/* 80C1D484 3C 60 80 C2 */ lis r3, l_HIO@ha /* 0x80C1DC54@ha */ -/* 80C1D488 38 63 DC 54 */ addi r3, r3, l_HIO@l /* 0x80C1DC54@l */ -/* 80C1D48C C0 03 00 08 */ lfs f0, 8(r3) -/* 80C1D490 D0 1E 05 B0 */ stfs f0, 0x5b0(r30) -/* 80C1D494 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80C1D498 7C 03 07 74 */ extsb r3, r0 -/* 80C1D49C 4B 40 FB D1 */ bl dComIfGp_getReverb__Fi -/* 80C1D4A0 7C 67 1B 78 */ mr r7, r3 -/* 80C1D4A4 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801C0@ha */ -/* 80C1D4A8 38 03 01 C0 */ addi r0, r3, 0x01C0 /* 0x000801C0@l */ -/* 80C1D4AC 90 01 00 08 */ stw r0, 8(r1) -/* 80C1D4B0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C1D4B4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C1D4B8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C1D4BC 38 81 00 08 */ addi r4, r1, 8 -/* 80C1D4C0 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C1D4C4 38 C0 00 00 */ li r6, 0 -/* 80C1D4C8 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80C1D4CC FC 40 08 90 */ fmr f2, f1 -/* 80C1D4D0 C0 7F 00 2C */ lfs f3, 0x2c(r31) -/* 80C1D4D4 FC 80 18 90 */ fmr f4, f3 -/* 80C1D4D8 39 00 00 00 */ li r8, 0 -/* 80C1D4DC 4B 68 E4 A9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C1D4E0 48 00 00 54 */ b lbl_80C1D534 -lbl_80C1D4E4: -/* 80C1D4E4 C0 3E 05 D4 */ lfs f1, 0x5d4(r30) -/* 80C1D4E8 38 7E 05 2C */ addi r3, r30, 0x52c -/* 80C1D4EC C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 80C1D4F0 EC 41 00 24 */ fdivs f2, f1, f0 -/* 80C1D4F4 4B 65 32 4D */ bl cLib_chaseF__FPfff -/* 80C1D4F8 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 80C1D4FC 3C 80 80 C2 */ lis r4, l_HIO@ha /* 0x80C1DC54@ha */ -/* 80C1D500 38 84 DC 54 */ addi r4, r4, l_HIO@l /* 0x80C1DC54@l */ -/* 80C1D504 C0 24 00 10 */ lfs f1, 0x10(r4) -/* 80C1D508 C0 04 00 14 */ lfs f0, 0x14(r4) -/* 80C1D50C EC 21 00 2A */ fadds f1, f1, f0 -/* 80C1D510 C0 5F 00 28 */ lfs f2, 0x28(r31) -/* 80C1D514 C0 7E 05 2C */ lfs f3, 0x52c(r30) -/* 80C1D518 C0 9F 00 3C */ lfs f4, 0x3c(r31) -/* 80C1D51C 4B 65 24 61 */ bl cLib_addCalc__FPfffff -/* 80C1D520 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 80C1D524 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80C1D528 40 82 00 0C */ bne lbl_80C1D534 -/* 80C1D52C 7F C3 F3 78 */ mr r3, r30 -/* 80C1D530 48 00 00 1D */ bl init_modeMove__11daHeavySw_cFv -lbl_80C1D534: -/* 80C1D534 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C1D538 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80C1D53C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C1D540 7C 08 03 A6 */ mtlr r0 -/* 80C1D544 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C1D548 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeMove__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeMove__11daHeavySw_cFv.s deleted file mode 100644 index e9e86fabf4e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeMove__11daHeavySw_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_80C1D588: -/* 80C1D588 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C1D58C 7C 08 02 A6 */ mflr r0 -/* 80C1D590 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C1D594 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C1D598 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80C1D59C 7C 7E 1B 78 */ mr r30, r3 -/* 80C1D5A0 3C 80 80 C2 */ lis r4, lit_3647@ha /* 0x80C1DA94@ha */ -/* 80C1D5A4 3B E4 DA 94 */ addi r31, r4, lit_3647@l /* 0x80C1DA94@l */ -/* 80C1D5A8 80 03 05 DC */ lwz r0, 0x5dc(r3) -/* 80C1D5AC 28 00 00 00 */ cmplwi r0, 0 -/* 80C1D5B0 40 82 00 08 */ bne lbl_80C1D5B8 -/* 80C1D5B4 4B FF FC F9 */ bl init_modeRide__11daHeavySw_cFv -lbl_80C1D5B8: -/* 80C1D5B8 88 7E 05 C4 */ lbz r3, 0x5c4(r30) -/* 80C1D5BC 28 03 00 00 */ cmplwi r3, 0 -/* 80C1D5C0 41 82 00 10 */ beq lbl_80C1D5D0 -/* 80C1D5C4 38 03 FF FF */ addi r0, r3, -1 -/* 80C1D5C8 98 1E 05 C4 */ stb r0, 0x5c4(r30) -/* 80C1D5CC 48 00 00 A4 */ b lbl_80C1D670 -lbl_80C1D5D0: -/* 80C1D5D0 88 1E 07 FC */ lbz r0, 0x7fc(r30) -/* 80C1D5D4 28 00 00 00 */ cmplwi r0, 0 -/* 80C1D5D8 40 82 00 58 */ bne lbl_80C1D630 -/* 80C1D5DC 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80C1D5E0 7C 03 07 74 */ extsb r3, r0 -/* 80C1D5E4 4B 40 FA 89 */ bl dComIfGp_getReverb__Fi -/* 80C1D5E8 7C 67 1B 78 */ mr r7, r3 -/* 80C1D5EC 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080129@ha */ -/* 80C1D5F0 38 03 01 29 */ addi r0, r3, 0x0129 /* 0x00080129@l */ -/* 80C1D5F4 90 01 00 08 */ stw r0, 8(r1) -/* 80C1D5F8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C1D5FC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C1D600 80 63 00 00 */ lwz r3, 0(r3) -/* 80C1D604 38 81 00 08 */ addi r4, r1, 8 -/* 80C1D608 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C1D60C 38 C0 00 00 */ li r6, 0 -/* 80C1D610 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80C1D614 FC 40 08 90 */ fmr f2, f1 -/* 80C1D618 C0 7F 00 2C */ lfs f3, 0x2c(r31) -/* 80C1D61C FC 80 18 90 */ fmr f4, f3 -/* 80C1D620 39 00 00 00 */ li r8, 0 -/* 80C1D624 4B 68 E3 61 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C1D628 38 00 00 01 */ li r0, 1 -/* 80C1D62C 98 1E 07 FC */ stb r0, 0x7fc(r30) -lbl_80C1D630: -/* 80C1D630 C0 3E 05 D4 */ lfs f1, 0x5d4(r30) -/* 80C1D634 38 7E 05 2C */ addi r3, r30, 0x52c -/* 80C1D638 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 80C1D63C EC 41 00 24 */ fdivs f2, f1, f0 -/* 80C1D640 4B 65 31 01 */ bl cLib_chaseF__FPfff -/* 80C1D644 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 80C1D648 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80C1D64C C0 5F 00 28 */ lfs f2, 0x28(r31) -/* 80C1D650 C0 7E 05 2C */ lfs f3, 0x52c(r30) -/* 80C1D654 C0 9F 00 3C */ lfs f4, 0x3c(r31) -/* 80C1D658 4B 65 23 25 */ bl cLib_addCalc__FPfffff -/* 80C1D65C C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 80C1D660 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80C1D664 40 82 00 0C */ bne lbl_80C1D670 -/* 80C1D668 7F C3 F3 78 */ mr r3, r30 -/* 80C1D66C 48 00 00 1D */ bl init_modeMoveEnd__11daHeavySw_cFv -lbl_80C1D670: -/* 80C1D670 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C1D674 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80C1D678 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C1D67C 7C 08 03 A6 */ mtlr r0 -/* 80C1D680 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C1D684 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeRide__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeRide__11daHeavySw_cFv.s deleted file mode 100644 index 26627f43de8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeRide__11daHeavySw_cFv.s +++ /dev/null @@ -1,80 +0,0 @@ -lbl_80C1D2D8: -/* 80C1D2D8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C1D2DC 7C 08 02 A6 */ mflr r0 -/* 80C1D2E0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C1D2E4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C1D2E8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80C1D2EC 7C 7F 1B 78 */ mr r31, r3 -/* 80C1D2F0 3C 60 80 C2 */ lis r3, lit_3647@ha /* 0x80C1DA94@ha */ -/* 80C1D2F4 3B C3 DA 94 */ addi r30, r3, lit_3647@l /* 0x80C1DA94@l */ -/* 80C1D2F8 88 7F 05 C4 */ lbz r3, 0x5c4(r31) -/* 80C1D2FC 28 03 00 00 */ cmplwi r3, 0 -/* 80C1D300 41 82 00 2C */ beq lbl_80C1D32C -/* 80C1D304 38 03 FF FF */ addi r0, r3, -1 -/* 80C1D308 98 1F 05 C4 */ stb r0, 0x5c4(r31) -/* 80C1D30C 88 1F 05 C4 */ lbz r0, 0x5c4(r31) -/* 80C1D310 28 00 00 00 */ cmplwi r0, 0 -/* 80C1D314 40 82 00 DC */ bne lbl_80C1D3F0 -/* 80C1D318 3C 60 80 C2 */ lis r3, l_HIO@ha /* 0x80C1DC54@ha */ -/* 80C1D31C 38 63 DC 54 */ addi r3, r3, l_HIO@l /* 0x80C1DC54@l */ -/* 80C1D320 C0 03 00 04 */ lfs f0, 4(r3) -/* 80C1D324 D0 1F 05 B0 */ stfs f0, 0x5b0(r31) -/* 80C1D328 48 00 00 C8 */ b lbl_80C1D3F0 -lbl_80C1D32C: -/* 80C1D32C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C1D330 7C 03 07 74 */ extsb r3, r0 -/* 80C1D334 4B 40 FD 39 */ bl dComIfGp_getReverb__Fi -/* 80C1D338 7C 67 1B 78 */ mr r7, r3 -/* 80C1D33C 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080127@ha */ -/* 80C1D340 38 03 01 27 */ addi r0, r3, 0x0127 /* 0x00080127@l */ -/* 80C1D344 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C1D348 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C1D34C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C1D350 80 63 00 00 */ lwz r3, 0(r3) -/* 80C1D354 38 81 00 0C */ addi r4, r1, 0xc -/* 80C1D358 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C1D35C 38 C0 00 00 */ li r6, 0 -/* 80C1D360 C0 3E 00 28 */ lfs f1, 0x28(r30) -/* 80C1D364 FC 40 08 90 */ fmr f2, f1 -/* 80C1D368 C0 7E 00 2C */ lfs f3, 0x2c(r30) -/* 80C1D36C FC 80 18 90 */ fmr f4, f3 -/* 80C1D370 39 00 00 00 */ li r8, 0 -/* 80C1D374 4B 68 F1 99 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C1D378 C0 3F 05 D4 */ lfs f1, 0x5d4(r31) -/* 80C1D37C 38 7F 05 2C */ addi r3, r31, 0x52c -/* 80C1D380 C0 1E 00 40 */ lfs f0, 0x40(r30) -/* 80C1D384 EC 41 00 24 */ fdivs f2, f1, f0 -/* 80C1D388 4B 65 33 B9 */ bl cLib_chaseF__FPfff -/* 80C1D38C 38 7F 05 BC */ addi r3, r31, 0x5bc -/* 80C1D390 3C 80 80 C2 */ lis r4, l_HIO@ha /* 0x80C1DC54@ha */ -/* 80C1D394 38 84 DC 54 */ addi r4, r4, l_HIO@l /* 0x80C1DC54@l */ -/* 80C1D398 C0 24 00 10 */ lfs f1, 0x10(r4) -/* 80C1D39C C0 5E 00 28 */ lfs f2, 0x28(r30) -/* 80C1D3A0 C0 7F 05 2C */ lfs f3, 0x52c(r31) -/* 80C1D3A4 C0 9E 00 3C */ lfs f4, 0x3c(r30) -/* 80C1D3A8 4B 65 25 D5 */ bl cLib_addCalc__FPfffff -/* 80C1D3AC C0 1E 00 14 */ lfs f0, 0x14(r30) -/* 80C1D3B0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80C1D3B4 40 82 00 28 */ bne lbl_80C1D3DC -/* 80C1D3B8 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080127@ha */ -/* 80C1D3BC 38 03 01 27 */ addi r0, r3, 0x0127 /* 0x00080127@l */ -/* 80C1D3C0 90 01 00 08 */ stw r0, 8(r1) -/* 80C1D3C4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C1D3C8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C1D3CC 80 63 00 00 */ lwz r3, 0(r3) -/* 80C1D3D0 38 81 00 08 */ addi r4, r1, 8 -/* 80C1D3D4 38 A0 00 00 */ li r5, 0 -/* 80C1D3D8 4B 69 04 D9 */ bl seStop__7Z2SeMgrF10JAISoundIDUl -lbl_80C1D3DC: -/* 80C1D3DC 80 1F 05 DC */ lwz r0, 0x5dc(r31) -/* 80C1D3E0 28 00 00 00 */ cmplwi r0, 0 -/* 80C1D3E4 41 82 00 0C */ beq lbl_80C1D3F0 -/* 80C1D3E8 7F E3 FB 78 */ mr r3, r31 -/* 80C1D3EC 48 00 00 1D */ bl init_modeMoveInit__11daHeavySw_cFv -lbl_80C1D3F0: -/* 80C1D3F0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C1D3F4 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80C1D3F8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C1D3FC 7C 08 03 A6 */ mtlr r0 -/* 80C1D400 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C1D404 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeWait__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeWait__11daHeavySw_cFv.s deleted file mode 100644 index 19287ab96bc..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeWait__11daHeavySw_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C1D280: -/* 80C1D280 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1D284 7C 08 02 A6 */ mflr r0 -/* 80C1D288 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1D28C 88 03 05 D8 */ lbz r0, 0x5d8(r3) -/* 80C1D290 28 00 00 00 */ cmplwi r0, 0 -/* 80C1D294 41 82 00 08 */ beq lbl_80C1D29C -/* 80C1D298 48 00 00 15 */ bl init_modeRide__11daHeavySw_cFv -lbl_80C1D29C: -/* 80C1D29C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1D2A0 7C 08 03 A6 */ mtlr r0 -/* 80C1D2A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1D2A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/moveSwitch__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/moveSwitch__11daHeavySw_cFv.s deleted file mode 100644 index 272d85cb00f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/moveSwitch__11daHeavySw_cFv.s +++ /dev/null @@ -1,151 +0,0 @@ -lbl_80C1D02C: -/* 80C1D02C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C1D030 7C 08 02 A6 */ mflr r0 -/* 80C1D034 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C1D038 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80C1D03C 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80C1D040 7C 7E 1B 78 */ mr r30, r3 -/* 80C1D044 3C 60 80 C2 */ lis r3, cNullVec__6Z2Calc@ha /* 0x80C1DAE8@ha */ -/* 80C1D048 38 83 DA E8 */ addi r4, r3, cNullVec__6Z2Calc@l /* 0x80C1DAE8@l */ -/* 80C1D04C 3C 60 80 C2 */ lis r3, lit_3647@ha /* 0x80C1DA94@ha */ -/* 80C1D050 3B E3 DA 94 */ addi r31, r3, lit_3647@l /* 0x80C1DA94@l */ -/* 80C1D054 3C 60 80 C2 */ lis r3, data_80C1DC8C@ha /* 0x80C1DC8C@ha */ -/* 80C1D058 38 C3 DC 8C */ addi r6, r3, data_80C1DC8C@l /* 0x80C1DC8C@l */ -/* 80C1D05C 88 06 00 00 */ lbz r0, 0(r6) -/* 80C1D060 7C 00 07 75 */ extsb. r0, r0 -/* 80C1D064 40 82 00 88 */ bne lbl_80C1D0EC -/* 80C1D068 80 64 00 20 */ lwz r3, 0x20(r4) -/* 80C1D06C 80 04 00 24 */ lwz r0, 0x24(r4) -/* 80C1D070 90 64 00 5C */ stw r3, 0x5c(r4) -/* 80C1D074 90 04 00 60 */ stw r0, 0x60(r4) -/* 80C1D078 80 04 00 28 */ lwz r0, 0x28(r4) -/* 80C1D07C 90 04 00 64 */ stw r0, 0x64(r4) -/* 80C1D080 38 A4 00 5C */ addi r5, r4, 0x5c -/* 80C1D084 80 64 00 2C */ lwz r3, 0x2c(r4) -/* 80C1D088 80 04 00 30 */ lwz r0, 0x30(r4) -/* 80C1D08C 90 65 00 0C */ stw r3, 0xc(r5) -/* 80C1D090 90 05 00 10 */ stw r0, 0x10(r5) -/* 80C1D094 80 04 00 34 */ lwz r0, 0x34(r4) -/* 80C1D098 90 05 00 14 */ stw r0, 0x14(r5) -/* 80C1D09C 80 64 00 38 */ lwz r3, 0x38(r4) -/* 80C1D0A0 80 04 00 3C */ lwz r0, 0x3c(r4) -/* 80C1D0A4 90 65 00 18 */ stw r3, 0x18(r5) -/* 80C1D0A8 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80C1D0AC 80 04 00 40 */ lwz r0, 0x40(r4) -/* 80C1D0B0 90 05 00 20 */ stw r0, 0x20(r5) -/* 80C1D0B4 80 64 00 44 */ lwz r3, 0x44(r4) -/* 80C1D0B8 80 04 00 48 */ lwz r0, 0x48(r4) -/* 80C1D0BC 90 65 00 24 */ stw r3, 0x24(r5) -/* 80C1D0C0 90 05 00 28 */ stw r0, 0x28(r5) -/* 80C1D0C4 80 04 00 4C */ lwz r0, 0x4c(r4) -/* 80C1D0C8 90 05 00 2C */ stw r0, 0x2c(r5) -/* 80C1D0CC 80 64 00 50 */ lwz r3, 0x50(r4) -/* 80C1D0D0 80 04 00 54 */ lwz r0, 0x54(r4) -/* 80C1D0D4 90 65 00 30 */ stw r3, 0x30(r5) -/* 80C1D0D8 90 05 00 34 */ stw r0, 0x34(r5) -/* 80C1D0DC 80 04 00 58 */ lwz r0, 0x58(r4) -/* 80C1D0E0 90 05 00 38 */ stw r0, 0x38(r5) -/* 80C1D0E4 38 00 00 01 */ li r0, 1 -/* 80C1D0E8 98 06 00 00 */ stb r0, 0(r6) -lbl_80C1D0EC: -/* 80C1D0EC 7F C3 F3 78 */ mr r3, r30 -/* 80C1D0F0 88 1E 05 AC */ lbz r0, 0x5ac(r30) -/* 80C1D0F4 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80C1D0F8 39 84 00 5C */ addi r12, r4, 0x5c -/* 80C1D0FC 7D 8C 02 14 */ add r12, r12, r0 -/* 80C1D100 4B 74 4F 85 */ bl __ptmf_scall -/* 80C1D104 60 00 00 00 */ nop -/* 80C1D108 88 1E 05 D8 */ lbz r0, 0x5d8(r30) -/* 80C1D10C 28 00 00 00 */ cmplwi r0, 0 -/* 80C1D110 40 82 00 D4 */ bne lbl_80C1D1E4 -/* 80C1D114 88 1E 05 C5 */ lbz r0, 0x5c5(r30) -/* 80C1D118 28 00 00 00 */ cmplwi r0, 0 -/* 80C1D11C 40 82 00 C8 */ bne lbl_80C1D1E4 -/* 80C1D120 88 1E 05 AC */ lbz r0, 0x5ac(r30) -/* 80C1D124 28 00 00 00 */ cmplwi r0, 0 -/* 80C1D128 41 82 00 1C */ beq lbl_80C1D144 -/* 80C1D12C 7F C3 F3 78 */ mr r3, r30 -/* 80C1D130 48 00 01 45 */ bl init_modeWait__11daHeavySw_cFv -/* 80C1D134 38 00 00 00 */ li r0, 0 -/* 80C1D138 98 1E 07 FC */ stb r0, 0x7fc(r30) -/* 80C1D13C C0 1E 05 BC */ lfs f0, 0x5bc(r30) -/* 80C1D140 D0 1E 05 B8 */ stfs f0, 0x5b8(r30) -lbl_80C1D144: -/* 80C1D144 88 1E 07 FC */ lbz r0, 0x7fc(r30) -/* 80C1D148 28 00 00 00 */ cmplwi r0, 0 -/* 80C1D14C 40 82 00 70 */ bne lbl_80C1D1BC -/* 80C1D150 C0 5E 05 BC */ lfs f2, 0x5bc(r30) -/* 80C1D154 C0 3E 05 B8 */ lfs f1, 0x5b8(r30) -/* 80C1D158 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 80C1D15C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80C1D160 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80C1D164 40 80 00 58 */ bge lbl_80C1D1BC -/* 80C1D168 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80C1D16C 7C 03 07 74 */ extsb r3, r0 -/* 80C1D170 4B 40 FE FD */ bl dComIfGp_getReverb__Fi -/* 80C1D174 7C 67 1B 78 */ mr r7, r3 -/* 80C1D178 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080128@ha */ -/* 80C1D17C 38 03 01 28 */ addi r0, r3, 0x0128 /* 0x00080128@l */ -/* 80C1D180 90 01 00 08 */ stw r0, 8(r1) -/* 80C1D184 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C1D188 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C1D18C 80 63 00 00 */ lwz r3, 0(r3) -/* 80C1D190 38 81 00 08 */ addi r4, r1, 8 -/* 80C1D194 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C1D198 38 C0 00 00 */ li r6, 0 -/* 80C1D19C C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80C1D1A0 FC 40 08 90 */ fmr f2, f1 -/* 80C1D1A4 C0 7F 00 2C */ lfs f3, 0x2c(r31) -/* 80C1D1A8 FC 80 18 90 */ fmr f4, f3 -/* 80C1D1AC 39 00 00 00 */ li r8, 0 -/* 80C1D1B0 4B 68 E7 D5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C1D1B4 38 00 00 01 */ li r0, 1 -/* 80C1D1B8 98 1E 07 FC */ stb r0, 0x7fc(r30) -lbl_80C1D1BC: -/* 80C1D1BC 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 80C1D1C0 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80C1D1C4 C0 5F 00 34 */ lfs f2, 0x34(r31) -/* 80C1D1C8 4B 65 28 B9 */ bl cLib_addCalc0__FPfff -/* 80C1D1CC C0 3E 05 BC */ lfs f1, 0x5bc(r30) -/* 80C1D1D0 C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80C1D1D4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C1D1D8 40 80 00 0C */ bge lbl_80C1D1E4 -/* 80C1D1DC C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 80C1D1E0 D0 1E 05 BC */ stfs f0, 0x5bc(r30) -lbl_80C1D1E4: -/* 80C1D1E4 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80C1D1E8 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80C1D1EC 80 1E 05 C8 */ lwz r0, 0x5c8(r30) -/* 80C1D1F0 1C 00 30 00 */ mulli r0, r0, 0x3000 -/* 80C1D1F4 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80C1D1F8 7C 64 02 14 */ add r3, r4, r0 -/* 80C1D1FC C0 23 00 04 */ lfs f1, 4(r3) -/* 80C1D200 C0 1E 05 B0 */ lfs f0, 0x5b0(r30) -/* 80C1D204 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80C1D208 FC 00 00 1E */ fctiwz f0, f0 -/* 80C1D20C D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80C1D210 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1D214 B0 1E 05 CC */ sth r0, 0x5cc(r30) -/* 80C1D218 80 1E 05 C8 */ lwz r0, 0x5c8(r30) -/* 80C1D21C 1C 00 30 00 */ mulli r0, r0, 0x3000 -/* 80C1D220 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80C1D224 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80C1D228 C0 1E 05 B0 */ lfs f0, 0x5b0(r30) -/* 80C1D22C EC 00 00 72 */ fmuls f0, f0, f1 -/* 80C1D230 FC 00 00 1E */ fctiwz f0, f0 -/* 80C1D234 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80C1D238 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80C1D23C B0 1E 05 CE */ sth r0, 0x5ce(r30) -/* 80C1D240 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 80C1D244 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80C1D248 C0 5F 00 34 */ lfs f2, 0x34(r31) -/* 80C1D24C 4B 65 28 35 */ bl cLib_addCalc0__FPfff -/* 80C1D250 80 7E 05 C8 */ lwz r3, 0x5c8(r30) -/* 80C1D254 38 03 00 01 */ addi r0, r3, 1 -/* 80C1D258 90 1E 05 C8 */ stw r0, 0x5c8(r30) -/* 80C1D25C 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80C1D260 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80C1D264 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C1D268 7C 08 03 A6 */ mtlr r0 -/* 80C1D26C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C1D270 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/rideCallBack__11daHeavySw_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/rideCallBack__11daHeavySw_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s deleted file mode 100644 index 8fe50e007b1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/rideCallBack__11daHeavySw_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C1CF90: -/* 80C1CF90 A8 05 00 08 */ lha r0, 8(r5) -/* 80C1CF94 2C 00 00 FD */ cmpwi r0, 0xfd -/* 80C1CF98 4C 82 00 20 */ bnelr -/* 80C1CF9C 38 00 00 01 */ li r0, 1 -/* 80C1CFA0 98 04 05 D8 */ stb r0, 0x5d8(r4) -/* 80C1CFA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1CFA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1CFAC 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80C1CFB0 80 03 05 70 */ lwz r0, 0x570(r3) -/* 80C1CFB4 54 00 01 8C */ rlwinm r0, r0, 0, 6, 6 -/* 80C1CFB8 90 04 05 DC */ stw r0, 0x5dc(r4) -/* 80C1CFBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/setBaseMtx__11daHeavySw_cFv.s b/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/setBaseMtx__11daHeavySw_cFv.s deleted file mode 100644 index 745a4017956..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/setBaseMtx__11daHeavySw_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80C1CBC8: -/* 80C1CBC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1CBCC 7C 08 02 A6 */ mflr r0 -/* 80C1CBD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1CBD4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1CBD8 7C 7F 1B 78 */ mr r31, r3 -/* 80C1CBDC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1CBE0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1CBE4 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C1CBE8 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C1CBEC C0 1F 05 BC */ lfs f0, 0x5bc(r31) -/* 80C1CBF0 EC 42 00 28 */ fsubs f2, f2, f0 -/* 80C1CBF4 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C1CBF8 4B 72 9C F1 */ bl PSMTXTrans -/* 80C1CBFC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1CC00 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1CC04 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80C1CC08 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80C1CC0C A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80C1CC10 4B 3E F6 91 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80C1CC14 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1CC18 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1CC1C A8 9F 05 CC */ lha r4, 0x5cc(r31) -/* 80C1CC20 A8 BF 05 CE */ lha r5, 0x5ce(r31) -/* 80C1CC24 A8 DF 05 D0 */ lha r6, 0x5d0(r31) -/* 80C1CC28 4B 3E F6 79 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80C1CC2C 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C1CC30 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80C1CC34 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80C1CC38 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80C1CC3C D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80C1CC40 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80C1CC44 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80C1CC48 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1CC4C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1CC50 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C1CC54 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C1CC58 4B 72 98 59 */ bl PSMTXCopy -/* 80C1CC5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1CC60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1CC64 7C 08 03 A6 */ mtlr r0 -/* 80C1CC68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1CC6C 4E 80 00 20 */ blr diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index ad40461c911..4010865adde 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -87,6 +87,10 @@ inline void i_mDoAud_seStartLevel(u32 i_sfxID, const Vec* i_sePos, u32 param_2, -1.0f, -1.0f, 0); } +inline void mDoAud_seStop(u32 i_sfxID, u32 param_1) { + Z2AudioMgr::getInterface()->seStop(i_sfxID, param_1); +} + inline void mDoAud_messageSePlay(u16 param_0, Vec* position, s8 param_2) { Z2AudioMgr::getInterface()->messageSePlay(param_0, position, param_2); } diff --git a/include/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.h b/include/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.h index 633395ef078..db817f41e5e 100644 --- a/include/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.h +++ b/include/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.h @@ -1,6 +1,78 @@ #ifndef D_A_OBJ_HEAVYSW_H #define D_A_OBJ_HEAVYSW_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_hostIO.h" + +class daHeavySw_c : public dBgS_MoveBgActor { +public: + enum Mode_e { MODE_WAIT, MODE_RIDE, MODE_MOVE_INIT, MODE_MOVE, MODE_MOVE_END }; + + /* 80C1CBC8 */ void setBaseMtx(); + /* 80C1CC70 */ int CreateHeap(); + /* 80C1CCDC */ int create(); + /* 80C1CF90 */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); + /* 80C1CFC0 */ int Execute(Mtx**); + /* 80C1D02C */ void moveSwitch(); + /* 80C1D274 */ void init_modeWait(); + /* 80C1D280 */ void modeWait(); + /* 80C1D2AC */ void init_modeRide(); + /* 80C1D2D8 */ void modeRide(); + /* 80C1D408 */ void init_modeMoveInit(); + /* 80C1D434 */ void modeMoveInit(); + /* 80C1D54C */ void init_modeMove(); + /* 80C1D588 */ void modeMove(); + /* 80C1D688 */ void init_modeMoveEnd(); + /* 80C1D788 */ void modeMoveEnd(); + /* 80C1D808 */ int Draw(); + /* 80C1D91C */ int Delete(); + + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ u8 mMode; + /* 0x5B0 */ f32 field_0x5b0; + /* 0x5B4 */ f32 field_0x5b4; + /* 0x5B8 */ f32 field_0x5b8; + /* 0x5BC */ f32 field_0x5bc; + /* 0x5C0 */ u8 field_0x5C0[0x5C4 - 0x5C0]; + /* 0x5C4 */ u8 field_0x5c4; + /* 0x5C5 */ u8 field_0x5c5; + /* 0x5C8 */ s32 field_0x5c8; + /* 0x5CC */ csXyz field_0x5cc; + /* 0x5D4 */ f32 field_0x5d4; + /* 0x5D8 */ u8 field_0x5d8; + /* 0x5DC */ u32 field_0x5dc; + /* 0x5E0 */ dBgS_AcchCir mAcchCir; + /* 0x620 */ dBgS_ObjAcch mObjAcch; + /* 0x7F8 */ u32 mShadowKey; + /* 0x7FC */ u8 field_0x7fc; +}; + +class daHeavySw_HIO_c : public mDoHIO_entry_c { +public: + /* 80C1CAEC */ daHeavySw_HIO_c(); + /* 80C1D9D8 */ virtual ~daHeavySw_HIO_c() {} + + /* 0x04 */ f32 field_0x04; + /* 0x08 */ f32 field_0x08; + /* 0x0C */ f32 field_0x0c; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ u8 field_0x30; + /* 0x31 */ u8 field_0x31; + /* 0x32 */ u8 field_0x32; + /* 0x33 */ u8 field_0x33; + /* 0x34 */ u8 field_0x34; +}; #endif /* D_A_OBJ_HEAVYSW_H */ diff --git a/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp b/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp index fde8d7f37d5..906378b7b71 100644 --- a/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp +++ b/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp @@ -1,320 +1,23 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_heavySw -// +/** + * d_a_obj_heavySw.cpp + * Object - Heavy Switch (Triggered by Player wearing Iron Boots) + */ #include "rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C1CB80 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct dBgW {}; - -struct daHeavySw_c { - /* 80C1CBC8 */ void setBaseMtx(); - /* 80C1CC70 */ void CreateHeap(); - /* 80C1CCDC */ void create(); - /* 80C1CF90 */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - /* 80C1CFC0 */ void Execute(f32 (**)[3][4]); - /* 80C1D02C */ void moveSwitch(); - /* 80C1D274 */ void init_modeWait(); - /* 80C1D280 */ void modeWait(); - /* 80C1D2AC */ void init_modeRide(); - /* 80C1D2D8 */ void modeRide(); - /* 80C1D408 */ void init_modeMoveInit(); - /* 80C1D434 */ void modeMoveInit(); - /* 80C1D54C */ void init_modeMove(); - /* 80C1D588 */ void modeMove(); - /* 80C1D688 */ void init_modeMoveEnd(); - /* 80C1D788 */ void modeMoveEnd(); - /* 80C1D808 */ void Draw(); - /* 80C1D91C */ void Delete(); -}; - -struct daHeavySw_HIO_c { - /* 80C1CAEC */ daHeavySw_HIO_c(); - /* 80C1D9D8 */ ~daHeavySw_HIO_c(); -}; - -struct cXyz {}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C1CEB0 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80C1CF20 */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct _GXTexObj {}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AD8B0 */ void seStop(JAISoundID, u32); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __ct__15daHeavySw_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__11daHeavySw_cFv(); -extern "C" void CreateHeap__11daHeavySw_cFv(); -extern "C" void create__11daHeavySw_cFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void rideCallBack__11daHeavySw_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); -extern "C" void Execute__11daHeavySw_cFPPA3_A4_f(); -extern "C" void moveSwitch__11daHeavySw_cFv(); -extern "C" void init_modeWait__11daHeavySw_cFv(); -extern "C" void modeWait__11daHeavySw_cFv(); -extern "C" void init_modeRide__11daHeavySw_cFv(); -extern "C" void modeRide__11daHeavySw_cFv(); -extern "C" void init_modeMoveInit__11daHeavySw_cFv(); -extern "C" void modeMoveInit__11daHeavySw_cFv(); -extern "C" void init_modeMove__11daHeavySw_cFv(); -extern "C" void modeMove__11daHeavySw_cFv(); -extern "C" void init_modeMoveEnd__11daHeavySw_cFv(); -extern "C" void modeMoveEnd__11daHeavySw_cFv(); -extern "C" void Draw__11daHeavySw_cFv(); -extern "C" void Delete__11daHeavySw_cFv(); -extern "C" static void daHeavySw_Draw__FP11daHeavySw_c(); -extern "C" static void daHeavySw_Execute__FP11daHeavySw_c(); -extern "C" static void daHeavySw_Delete__FP11daHeavySw_c(); -extern "C" static void daHeavySw_Create__FP10fopAc_ac_c(); -extern "C" void __dt__15daHeavySw_HIO_cFv(); -extern "C" void __sinit_d_a_obj_heavySw_cpp(); -extern "C" static void func_80C1DA70(); -extern "C" static void func_80C1DA78(); -extern "C" extern char const* const d_a_obj_heavySw__stringBase0; - -// -// 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 fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -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 -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -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 StartShock__12dVibration_cFii4cXyz(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -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 __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void cLib_addCalc0__FPfff(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStop__7Z2SeMgrF10JAISoundIDUl(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C1DA94-80C1DA98 000000 0004+00 7/7 0/0 0/0 .rodata @3647 */ -SECTION_RODATA static f32 const lit_3647 = 150.0f; -COMPILER_STRIP_GATE(0x80C1DA94, &lit_3647); - -/* 80C1DA98-80C1DA9C 000004 0004+00 0/1 0/0 0/0 .rodata @3648 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3648 = 450.0f; -COMPILER_STRIP_GATE(0x80C1DA98, &lit_3648); -#pragma pop - -/* 80C1DA9C-80C1DAA0 000008 0004+00 0/1 0/0 0/0 .rodata @3649 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3649 = 100.0f; -COMPILER_STRIP_GATE(0x80C1DA9C, &lit_3649); -#pragma pop - -/* 80C1DAA0-80C1DAA4 00000C 0004+00 0/1 0/0 0/0 .rodata @3650 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3650 = 50.0f; -COMPILER_STRIP_GATE(0x80C1DAA0, &lit_3650); -#pragma pop - -/* 80C1DAA4-80C1DAA8 000010 0004+00 0/1 0/0 0/0 .rodata @3651 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3651 = 20.0f; -COMPILER_STRIP_GATE(0x80C1DAA4, &lit_3651); -#pragma pop - -/* 80C1DAA8-80C1DAAC 000014 0004+00 1/8 0/0 0/0 .rodata @3652 */ -SECTION_RODATA static u8 const lit_3652[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C1DAA8, &lit_3652); - -/* 80C1DAAC-80C1DAB0 000018 0004+00 0/1 0/0 0/0 .rodata @3653 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3653 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(0x80C1DAAC, &lit_3653); -#pragma pop - -/* 80C1DAB0-80C1DAB4 00001C 0004+00 0/1 0/0 0/0 .rodata @3654 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3654 = 15.0f; -COMPILER_STRIP_GATE(0x80C1DAB0, &lit_3654); -#pragma pop +#include "JSystem/JKernel/JKRHeap.h" +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/d_procname.h" /* 80C1DAE8-80C1DAF4 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, }; /* 80C1DAF4-80C1DB08 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, @@ -324,539 +27,329 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 80C1DB08-80C1DB14 -00001 000C+00 0/1 0/0 0/0 .data @3770 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3770[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__11daHeavySw_cFv, -}; -#pragma pop - -/* 80C1DB14-80C1DB20 -00001 000C+00 0/1 0/0 0/0 .data @3771 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3771[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeRide__11daHeavySw_cFv, -}; -#pragma pop - -/* 80C1DB20-80C1DB2C -00001 000C+00 0/1 0/0 0/0 .data @3772 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3772[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeMoveInit__11daHeavySw_cFv, -}; -#pragma pop - -/* 80C1DB2C-80C1DB38 -00001 000C+00 0/1 0/0 0/0 .data @3773 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3773[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeMove__11daHeavySw_cFv, -}; -#pragma pop - -/* 80C1DB38-80C1DB44 -00001 000C+00 0/1 0/0 0/0 .data @3774 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3774[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeMoveEnd__11daHeavySw_cFv, -}; -#pragma pop - -/* 80C1DB44-80C1DB80 00005C 003C+00 0/1 0/0 0/0 .data mode_proc$3769 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[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 - -/* 80C1DB80-80C1DBA0 -00001 0020+00 1/0 0/0 0/0 .data l_daHeavySw_Method */ -SECTION_DATA static void* l_daHeavySw_Method[8] = { - (void*)daHeavySw_Create__FP10fopAc_ac_c, - (void*)daHeavySw_Delete__FP11daHeavySw_c, - (void*)daHeavySw_Execute__FP11daHeavySw_c, - (void*)NULL, - (void*)daHeavySw_Draw__FP11daHeavySw_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80C1DBA0-80C1DBD0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_HeavySw */ -SECTION_DATA extern void* g_profile_Obj_HeavySw[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x003D0000, (void*)&g_fpcLf_Method, - (void*)0x00000800, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01F70000, (void*)&l_daHeavySw_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80C1DBD0-80C1DBDC 0000E8 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, -}; - -/* 80C1DBDC-80C1DC00 0000F4 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_80C1DA78, - (void*)NULL, - (void*)NULL, - (void*)func_80C1DA70, -}; - -/* 80C1DC00-80C1DC28 000118 0028+00 1/1 0/0 0/0 .data __vt__11daHeavySw_c */ -SECTION_DATA extern void* __vt__11daHeavySw_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__11daHeavySw_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__11daHeavySw_cFPPA3_A4_f, - (void*)Draw__11daHeavySw_cFv, - (void*)Delete__11daHeavySw_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C1DC28-80C1DC34 000140 000C+00 2/2 0/0 0/0 .data __vt__15daHeavySw_HIO_c */ -SECTION_DATA extern void* __vt__15daHeavySw_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daHeavySw_HIO_cFv, -}; - -/* 80C1DC34-80C1DC40 00014C 000C+00 3/3 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, -}; - /* 80C1CAEC-80C1CB80 0000EC 0094+00 1/1 0/0 0/0 .text __ct__15daHeavySw_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daHeavySw_HIO_c::daHeavySw_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__ct__15daHeavySw_HIO_cFv.s" +daHeavySw_HIO_c::daHeavySw_HIO_c() { + field_0x04 = 150.0f; + field_0x08 = 450.0f; + field_0x0c = 100.0f; + field_0x10 = 50.0f; + field_0x14 = 20.0f; + field_0x28 = 0.0f; + field_0x2c = 20.0f; + field_0x18 = 0.0f; + field_0x1c = 0.8f; + field_0x20 = 0.0f; + field_0x24 = 15.0f; + field_0x30 = 30; + field_0x31 = 8; + field_0x32 = 30; + field_0x33 = 5; + field_0x34 = 4; } -#pragma pop - -/* 80C1CB80-80C1CBC8 000180 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() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop /* 80C1CBC8-80C1CC70 0001C8 00A8+00 2/2 0/0 0/0 .text setBaseMtx__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/setBaseMtx__11daHeavySw_cFv.s" +void daHeavySw_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y - field_0x5bc, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::ZXYrotM(field_0x5cc.x, field_0x5cc.y, field_0x5cc.z); + mpModel->setBaseScale(scale); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop - -/* ############################################################################################## */ -/* 80C1DAE0-80C1DAE0 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C1DAE0 = "Hswitch"; -#pragma pop /* 80C1CC70-80C1CCDC 000270 006C+00 1/0 0/0 0/0 .text CreateHeap__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/CreateHeap__11daHeavySw_cFv.s" +int daHeavySw_c::CreateHeap() { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("Hswitch", 4); + mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (mpModel != NULL) { + return 1; + } + return 0; } -#pragma pop - -/* ############################################################################################## */ -/* 80C1DAB4-80C1DAB8 000020 0004+00 1/2 0/0 0/0 .rodata @3741 */ -SECTION_RODATA static f32 const lit_3741 = 300.0f; -COMPILER_STRIP_GATE(0x80C1DAB4, &lit_3741); /* 80C1CCDC-80C1CEB0 0002DC 01D4+00 1/1 0/0 0/0 .text create__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/create__11daHeavySw_cFv.s" -} -#pragma pop +int daHeavySw_c::create() { + fopAcM_SetupActor(this, daHeavySw_c); -/* 80C1CEB0-80C1CF20 0004B0 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() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__12dBgS_ObjAcchFv.s" + int phase = dComIfG_resLoad(&mPhaseReq, "Hswitch"); + if (phase == cPhs_COMPLEATE_e) { + int movebg_create = MoveBGCreate("Hswitch", 7, dBgS_MoveBGProc_TypicalRotY, 0xC80, NULL); + if (movebg_create == cPhs_ERROR_e) { + return cPhs_ERROR_e; + } + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + mpBgW->SetRideCallback(rideCallBack); + mAcchCir.SetWall(0.0f, 0.0f); + mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), NULL, NULL); + field_0x5bc = 0.0f; + field_0x5b4 = 0.0f; + field_0x5c8 = 0.0f; + field_0x5cc.x = 0; + field_0x5cc.y = 0; + field_0x5cc.z = 0; + u8 param = fopAcM_GetParam(this); + if (i_fopAcM_isSwitch(this, param)) { + field_0x5bc = 300.0f; + init_modeMoveEnd(); + } else { + field_0x5c5 = 0; + init_modeWait(); + } + setBaseMtx(); + } + return phase; } -#pragma pop - -/* 80C1CF20-80C1CF90 000520 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() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop /* 80C1CF90-80C1CFC0 000590 0030+00 1/1 0/0 0/0 .text * rideCallBack__11daHeavySw_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/rideCallBack__11daHeavySw_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s" +void daHeavySw_c::rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { + if (fopAcM_GetName(param_2) == PROC_ALINK) { + daHeavySw_c* heavySw = static_cast(param_1); + heavySw->field_0x5d8 = 1; + heavySw->field_0x5dc = + static_cast(dComIfGp_getLinkPlayer())->i_checkEquipHeavyBoots(); + } } -#pragma pop /* 80C1CFC0-80C1D02C 0005C0 006C+00 1/0 0/0 0/0 .text Execute__11daHeavySw_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/Execute__11daHeavySw_cFPPA3_A4_f.s" +int daHeavySw_c::Execute(Mtx** i_mtx) { + moveSwitch(); + mObjAcch.CrrPos(dComIfG_Bgsp()); + *i_mtx = &mpModel->getBaseTRMtx(); + setBaseMtx(); + field_0x5d8 = 0; + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80C1DAB8-80C1DABC 000024 0004+00 0/1 0/0 0/0 .rodata @3811 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3811 = 0.5f; -COMPILER_STRIP_GATE(0x80C1DAB8, &lit_3811); -#pragma pop - -/* 80C1DABC-80C1DAC0 000028 0004+00 0/6 0/0 0/0 .rodata @3812 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3812 = 1.0f; -COMPILER_STRIP_GATE(0x80C1DABC, &lit_3812); -#pragma pop - -/* 80C1DAC0-80C1DAC4 00002C 0004+00 0/5 0/0 0/0 .rodata @3813 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3813 = -1.0f; -COMPILER_STRIP_GATE(0x80C1DAC0, &lit_3813); -#pragma pop - -/* 80C1DAC4-80C1DAC8 000030 0004+00 0/1 0/0 0/0 .rodata @3814 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3814 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C1DAC4, &lit_3814); -#pragma pop - -/* 80C1DAC8-80C1DACC 000034 0004+00 0/1 0/0 0/0 .rodata @3815 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3815 = 10.0f; -COMPILER_STRIP_GATE(0x80C1DAC8, &lit_3815); -#pragma pop - -/* 80C1DACC-80C1DAD0 000038 0004+00 0/1 0/0 0/0 .rodata @3816 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3816 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x80C1DACC, &lit_3816); -#pragma pop - -/* 80C1DAD0-80C1DAD4 00003C 0004+00 0/4 0/0 0/0 .rodata @3817 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3817 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C1DAD0, &lit_3817); -#pragma pop - -/* 80C1DC48-80C1DC54 000008 000C+00 1/1 0/0 0/0 .bss @3641 */ -static u8 lit_3641[12]; /* 80C1DC54-80C1DC8C 000014 0038+00 7/7 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[56]; - -/* 80C1DC8C-80C1DC90 00004C 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80C1DC8C[4]; +static daHeavySw_HIO_c l_HIO; /* 80C1D02C-80C1D274 00062C 0248+00 1/1 0/0 0/0 .text moveSwitch__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::moveSwitch() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/moveSwitch__11daHeavySw_cFv.s" +void daHeavySw_c::moveSwitch() { + typedef void (daHeavySw_c::*modeProcessFunc)(); + static modeProcessFunc mode_proc[] = { + &daHeavySw_c::modeWait, &daHeavySw_c::modeRide, &daHeavySw_c::modeMoveInit, + &daHeavySw_c::modeMove, &daHeavySw_c::modeMoveEnd, + }; + + (this->*mode_proc[mMode])(); + if (field_0x5d8 == 0 && field_0x5c5 == 0) { + if (mMode != MODE_WAIT) { + init_modeWait(); + field_0x7fc = 0; + field_0x5b8 = field_0x5bc; + } + if (field_0x7fc == 0 && field_0x5bc < field_0x5b8 / 2) { + s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this)); + mDoAud_seStart(Z2SE_OBJ_HEAVYSW_UP, ¤t.pos, 0, reverb); + field_0x7fc = 1; + } + cLib_addCalc0(&field_0x5bc, 0.3f, 10.0f); + if (field_0x5bc < 0.01f) { + field_0x5bc = 0.0f; + } + } + f32 cos = cM_scos(field_0x5c8 * 0x3000); + field_0x5cc.x = field_0x5b0 * cos; + f32 sin = cM_ssin(field_0x5c8 * 0x3000); + field_0x5cc.y = field_0x5b0 * sin; + cLib_addCalc0(&field_0x5b0, 0.1f, 10.0f); + field_0x5c8++; } -#pragma pop /* 80C1D274-80C1D280 000874 000C+00 2/2 0/0 0/0 .text init_modeWait__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::init_modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeWait__11daHeavySw_cFv.s" +void daHeavySw_c::init_modeWait() { + mMode = MODE_WAIT; } -#pragma pop /* 80C1D280-80C1D2AC 000880 002C+00 1/0 0/0 0/0 .text modeWait__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeWait__11daHeavySw_cFv.s" +void daHeavySw_c::modeWait() { + if (field_0x5d8 != 0) { + init_modeRide(); + } } -#pragma pop /* 80C1D2AC-80C1D2D8 0008AC 002C+00 3/3 0/0 0/0 .text init_modeRide__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::init_modeRide() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeRide__11daHeavySw_cFv.s" +void daHeavySw_c::init_modeRide() { + field_0x5c4 = l_HIO.field_0x33; + fopAcM_SetSpeedF(this, l_HIO.field_0x18); + field_0x5d4 = l_HIO.field_0x1c; + mMode = MODE_RIDE; } -#pragma pop - -/* ############################################################################################## */ -/* 80C1DAD4-80C1DAD8 000040 0004+00 0/3 0/0 0/0 .rodata @3860 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3860 = 30.0f; -COMPILER_STRIP_GATE(0x80C1DAD4, &lit_3860); -#pragma pop /* 80C1D2D8-80C1D408 0008D8 0130+00 1/0 0/0 0/0 .text modeRide__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::modeRide() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeRide__11daHeavySw_cFv.s" +void daHeavySw_c::modeRide() { + if (field_0x5c4 != 0) { + field_0x5c4--; + if (field_0x5c4 == 0) { + field_0x5b0 = l_HIO.field_0x04; + } + } else { + s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this)); + i_mDoAud_seStartLevel(Z2SE_OBJ_HEAVYSW_MOVE, ¤t.pos, 0, reverb); + cLib_chaseF(&speedF, field_0x5d4, field_0x5d4 / 30.0f); + f32 calc = cLib_addCalc(&field_0x5bc, l_HIO.field_0x10, 1.0f, fopAcM_GetSpeedF(this), 0.1f); + if (calc == 0.0f) { + mDoAud_seStop(Z2SE_OBJ_HEAVYSW_MOVE, 0); + } + if (field_0x5dc != 0) { + init_modeMoveInit(); + } + } } -#pragma pop /* 80C1D408-80C1D434 000A08 002C+00 1/1 0/0 0/0 .text init_modeMoveInit__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::init_modeMoveInit() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeMoveInit__11daHeavySw_cFv.s" +void daHeavySw_c::init_modeMoveInit() { + fopAcM_SetSpeedF(this, l_HIO.field_0x20); + field_0x5d4 = l_HIO.field_0x24; + field_0x5c4 = l_HIO.field_0x31; + mMode = MODE_MOVE_INIT; } -#pragma pop /* 80C1D434-80C1D54C 000A34 0118+00 1/0 0/0 0/0 .text modeMoveInit__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::modeMoveInit() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeMoveInit__11daHeavySw_cFv.s" +void daHeavySw_c::modeMoveInit() { + if (field_0x5dc == 0) { + init_modeRide(); + } + if (field_0x5c4 != 0) { + field_0x5c4--; + if (field_0x5c4 == 0) { + field_0x5b0 = l_HIO.field_0x08; + s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this)); + mDoAud_seStart(Z2SE_OBJ_HEAVYSW_ON, ¤t.pos, 0, reverb); + } + } else { + cLib_chaseF(&speedF, field_0x5d4, field_0x5d4 / 30.0f); + f32 calc = cLib_addCalc(&field_0x5bc, l_HIO.field_0x10 + l_HIO.field_0x14, 1.0f, + fopAcM_GetSpeedF(this), 0.1f); + if (calc == 0.0f) { + init_modeMove(); + } + } } -#pragma pop /* 80C1D54C-80C1D588 000B4C 003C+00 1/1 0/0 0/0 .text init_modeMove__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::init_modeMove() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeMove__11daHeavySw_cFv.s" +void daHeavySw_c::init_modeMove() { + field_0x5b0 = l_HIO.field_0x0c; + field_0x5c4 = l_HIO.field_0x30; + fopAcM_SetSpeedF(this, l_HIO.field_0x28); + field_0x5d4 = l_HIO.field_0x2c; + field_0x7fc = 0; + mMode = MODE_MOVE; } -#pragma pop /* 80C1D588-80C1D688 000B88 0100+00 1/0 0/0 0/0 .text modeMove__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::modeMove() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeMove__11daHeavySw_cFv.s" +void daHeavySw_c::modeMove() { + if (field_0x5dc == 0) { + init_modeRide(); + } + if (field_0x5c4 != 0) { + field_0x5c4--; + } else { + if (field_0x7fc == 0) { + s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this)); + mDoAud_seStart(Z2SE_OBJ_HEAVYSW_DOWN, ¤t.pos, 0, reverb); + field_0x7fc = 1; + } + cLib_chaseF(&speedF, field_0x5d4, field_0x5d4 / 30.0f); + f32 calc = cLib_addCalc(&field_0x5bc, 300.0f, 1.0f, fopAcM_GetSpeedF(this), 0.1f); + if (calc == 0.0f) { + init_modeMoveEnd(); + } + } } -#pragma pop /* 80C1D688-80C1D788 000C88 0100+00 2/2 0/0 0/0 .text init_modeMoveEnd__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::init_modeMoveEnd() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/init_modeMoveEnd__11daHeavySw_cFv.s" +void daHeavySw_c::init_modeMoveEnd() { + field_0x5c5 = 1; + u8 param = fopAcM_GetParam(this); + if (!i_fopAcM_isSwitch(this, param)) { + s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this)); + mDoAud_seStart(Z2SE_OBJ_HEAVYSW_STOP, ¤t.pos, 0, reverb); + dComIfGp_getVibration().StartShock(l_HIO.field_0x34, 0xF, cXyz(0.0f, 1.0f, 0.0f)); + } + field_0x5c4 = l_HIO.field_0x32; + mMode = MODE_MOVE_END; } -#pragma pop /* 80C1D788-80C1D808 000D88 0080+00 1/0 0/0 0/0 .text modeMoveEnd__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::modeMoveEnd() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/modeMoveEnd__11daHeavySw_cFv.s" +void daHeavySw_c::modeMoveEnd() { + if (field_0x5c4 != 0) { + field_0x5c4--; + } else { + BOOL is_switch = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); + if (!is_switch) { + i_fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80C1DAD8-80C1DADC 000044 0004+00 0/1 0/0 0/0 .rodata @3998 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3998 = 170.0f; -COMPILER_STRIP_GATE(0x80C1DAD8, &lit_3998); -#pragma pop - -/* 80C1DADC-80C1DAE0 000048 0004+00 0/1 0/0 0/0 .rodata @3999 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3999 = 500.0f; -COMPILER_STRIP_GATE(0x80C1DADC, &lit_3999); -#pragma pop /* 80C1D808-80C1D91C 000E08 0114+00 1/0 0/0 0/0 .text Draw__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/Draw__11daHeavySw_cFv.s" +int daHeavySw_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + cXyz curPos = cXyz(current.pos.x + 170.0f, current.pos.y, current.pos.z); + mShadowKey = dComIfGd_setShadow(mShadowKey, true, mpModel, &curPos, 500.0f, 0.0f, current.pos.y, + mObjAcch.GetGroundH(), mObjAcch.m_gnd, &tevStr, 0, 1.0f, + dDlst_shadowControl_c::getSimpleTex()); + return 1; } -#pragma pop /* 80C1D91C-80C1D94C 000F1C 0030+00 1/0 0/0 0/0 .text Delete__11daHeavySw_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHeavySw_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/Delete__11daHeavySw_cFv.s" +int daHeavySw_c::Delete() { + dComIfG_resDelete(&mPhaseReq, "Hswitch"); + return 1; } -#pragma pop /* 80C1D94C-80C1D978 000F4C 002C+00 1/0 0/0 0/0 .text daHeavySw_Draw__FP11daHeavySw_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daHeavySw_Draw(daHeavySw_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Draw__FP11daHeavySw_c.s" +static int daHeavySw_Draw(daHeavySw_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop /* 80C1D978-80C1D998 000F78 0020+00 1/0 0/0 0/0 .text daHeavySw_Execute__FP11daHeavySw_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daHeavySw_Execute(daHeavySw_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Execute__FP11daHeavySw_c.s" +static int daHeavySw_Execute(daHeavySw_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80C1D998-80C1D9B8 000F98 0020+00 1/0 0/0 0/0 .text daHeavySw_Delete__FP11daHeavySw_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daHeavySw_Delete(daHeavySw_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Delete__FP11daHeavySw_c.s" +static int daHeavySw_Delete(daHeavySw_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80C1D9B8-80C1D9D8 000FB8 0020+00 1/0 0/0 0/0 .text daHeavySw_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daHeavySw_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/daHeavySw_Create__FP10fopAc_ac_c.s" +static int daHeavySw_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop -/* 80C1D9D8-80C1DA34 000FD8 005C+00 2/1 0/0 0/0 .text __dt__15daHeavySw_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daHeavySw_HIO_c::~daHeavySw_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__dt__15daHeavySw_HIO_cFv.s" -} -#pragma pop +/* 80C1DB80-80C1DBA0 -00001 0020+00 1/0 0/0 0/0 .data l_daHeavySw_Method */ +static actor_method_class l_daHeavySw_Method = { + (process_method_func)daHeavySw_Create, (process_method_func)daHeavySw_Delete, + (process_method_func)daHeavySw_Execute, (process_method_func)NULL, + (process_method_func)daHeavySw_Draw, +}; -/* 80C1DA34-80C1DA70 001034 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_heavySw_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_heavySw_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/__sinit_d_a_obj_heavySw_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C1DA34, __sinit_d_a_obj_heavySw_cpp); -#pragma pop - -/* 80C1DA70-80C1DA78 001070 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_80C1DA70() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/func_80C1DA70.s" -} -#pragma pop - -/* 80C1DA78-80C1DA80 001078 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_80C1DA78() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw/func_80C1DA78.s" -} -#pragma pop - -/* 80C1DAE0-80C1DAE0 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C1DBA0-80C1DBD0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_HeavySw */ +extern actor_process_profile_definition g_profile_Obj_HeavySw = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_HeavySw, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daHeavySw_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 503, // mPriority + &l_daHeavySw_Method, // sub_method + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +};