diff --git a/Progress.md b/Progress.md index 23b7a59e5a..099a2bde10 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 54.398767% | 2187196 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 54.398767% | 2187196 | 4020672 -RELs | 38.064667% | 4377560 | 11500324 -Total | 42.295971% | 6564756 | 15520996 +RELs | 38.442673% | 4421032 | 11500324 +Total | 42.576056% | 6608228 | 15520996 ## RELs @@ -81,7 +81,7 @@ d_a_door_dbdoor00 | 100.000000% | 7620 | 7620 d_a_door_knob00 | 100.000000% | 12288 | 12288 d_a_door_mbossL1 | 53.077230% | 15972 | 30092 d_a_door_push | 100.000000% | 7032 | 7032 -d_a_door_shutter | 37.465797% | 14240 | 38008 +d_a_door_shutter | 100.000000% | 38008 | 38008 d_a_door_spiral | 100.000000% | 504 | 504 d_a_dshutter | 94.779772% | 4648 | 4904 d_a_e_ai | 28.308171% | 5100 | 18016 @@ -191,20 +191,20 @@ d_a_horse | 22.301298% | 15668 | 70256 d_a_hozelda | 28.805621% | 4920 | 17080 d_a_izumi_gate | 100.000000% | 2044 | 2044 d_a_kago | 24.588671% | 15124 | 61508 -d_a_kytag00 | 40.656852% | 2872 | 7064 -d_a_kytag01 | 35.156250% | 1260 | 3584 +d_a_kytag00 | 100.000000% | 7064 | 7064 +d_a_kytag01 | 100.000000% | 3584 | 3584 d_a_kytag02 | 100.000000% | 1800 | 1800 d_a_kytag03 | 23.399898% | 1828 | 7812 -d_a_kytag04 | 36.357481% | 2148 | 5908 +d_a_kytag04 | 100.000000% | 5908 | 5908 d_a_kytag05 | 100.000000% | 816 | 816 d_a_kytag06 | 100.000000% | 14140 | 14140 d_a_kytag07 | 100.000000% | 1272 | 1272 -d_a_kytag08 | 35.590421% | 1724 | 4844 +d_a_kytag08 | 100.000000% | 4844 | 4844 d_a_kytag09 | 100.000000% | 3172 | 3172 -d_a_kytag10 | 43.413978% | 1292 | 2976 +d_a_kytag10 | 100.000000% | 2976 | 2976 d_a_kytag11 | 100.000000% | 1816 | 1816 -d_a_kytag12 | 20.217129% | 3352 | 16580 -d_a_kytag13 | 30.696576% | 2080 | 6776 +d_a_kytag12 | 22.484922% | 3728 | 16580 +d_a_kytag13 | 40.141677% | 2720 | 6776 d_a_kytag14 | 100.000000% | 1408 | 1408 d_a_kytag15 | 100.000000% | 2516 | 2516 d_a_kytag16 | 100.000000% | 2296 | 2296 @@ -346,7 +346,7 @@ d_a_obj_Y_taihou | 37.379068% | 3400 | 9096 d_a_obj_amiShutter | 42.478422% | 2756 | 6488 d_a_obj_ari | 31.622322% | 5372 | 16988 d_a_obj_automata | 40.573951% | 3676 | 9060 -d_a_obj_avalanche | 41.881443% | 2600 | 6208 +d_a_obj_avalanche | 100.000000% | 6208 | 6208 d_a_obj_balloon | 42.722710% | 2724 | 6376 d_a_obj_barDesk | 100.000000% | 4972 | 4972 d_a_obj_batta | 31.886560% | 5172 | 16220 @@ -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 | 38.064667% | 4377560 | 11500324 +Total | 38.442673% | 4421032 | 11500324 diff --git a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 2682b6a987..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,120 +0,0 @@ -lbl_8046C7BC: -/* 8046C7BC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8046C7C0 7C 08 02 A6 */ mflr r0 -/* 8046C7C4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8046C7C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8046C7CC 4B EF 5A 11 */ bl _savegpr_29 -/* 8046C7D0 7C 7E 1B 78 */ mr r30, r3 -/* 8046C7D4 3C 80 80 47 */ lis r4, lit_3798@ha /* 0x8046C980@ha */ -/* 8046C7D8 3B E4 C9 80 */ addi r31, r4, lit_3798@l /* 0x8046C980@l */ -/* 8046C7DC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8046C7E0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8046C7E4 40 82 00 1C */ bne lbl_8046C800 -/* 8046C7E8 28 1E 00 00 */ cmplwi r30, 0 -/* 8046C7EC 41 82 00 08 */ beq lbl_8046C7F4 -/* 8046C7F0 4B BA C3 75 */ bl __ct__10fopAc_ac_cFv -lbl_8046C7F4: -/* 8046C7F4 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 8046C7F8 60 00 00 08 */ ori r0, r0, 8 -/* 8046C7FC 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_8046C800: -/* 8046C800 38 00 00 00 */ li r0, 0 -/* 8046C804 98 1E 05 6E */ stb r0, 0x56e(r30) -/* 8046C808 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8046C80C 98 1E 05 6F */ stb r0, 0x56f(r30) -/* 8046C810 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8046C814 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8046C818 98 1E 05 70 */ stb r0, 0x570(r30) -/* 8046C81C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8046C820 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 8046C824 90 1E 05 78 */ stw r0, 0x578(r30) -/* 8046C828 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8046C82C 54 00 46 3E */ srwi r0, r0, 0x18 -/* 8046C830 90 1E 05 7C */ stw r0, 0x57c(r30) -/* 8046C834 A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 8046C838 98 1E 05 71 */ stb r0, 0x571(r30) -/* 8046C83C A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 8046C840 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8046C844 98 1E 05 72 */ stb r0, 0x572(r30) -/* 8046C848 3B A0 00 01 */ li r29, 1 -/* 8046C84C 88 9E 05 71 */ lbz r4, 0x571(r30) -/* 8046C850 28 04 00 FF */ cmplwi r4, 0xff -/* 8046C854 41 82 00 2C */ beq lbl_8046C880 -/* 8046C858 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046C85C 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8046C860 7C A5 07 74 */ extsb r5, r5 -/* 8046C864 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046C868 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046C86C 4B BC 8A F5 */ bl isSwitch__10dSv_info_cCFii -/* 8046C870 2C 03 00 00 */ cmpwi r3, 0 -/* 8046C874 41 82 00 0C */ beq lbl_8046C880 -/* 8046C878 3B A0 00 00 */ li r29, 0 -/* 8046C87C 48 00 00 34 */ b lbl_8046C8B0 -lbl_8046C880: -/* 8046C880 88 9E 05 72 */ lbz r4, 0x572(r30) -/* 8046C884 28 04 00 FF */ cmplwi r4, 0xff -/* 8046C888 41 82 00 28 */ beq lbl_8046C8B0 -/* 8046C88C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046C890 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8046C894 7C A5 07 74 */ extsb r5, r5 -/* 8046C898 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046C89C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046C8A0 4B BC 8A C1 */ bl isSwitch__10dSv_info_cCFii -/* 8046C8A4 2C 03 00 00 */ cmpwi r3, 0 -/* 8046C8A8 40 82 00 08 */ bne lbl_8046C8B0 -/* 8046C8AC 3B A0 00 00 */ li r29, 0 -lbl_8046C8B0: -/* 8046C8B0 2C 1D 00 01 */ cmpwi r29, 1 -/* 8046C8B4 40 82 00 10 */ bne lbl_8046C8C4 -/* 8046C8B8 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 8046C8BC D0 1E 05 88 */ stfs f0, 0x588(r30) -/* 8046C8C0 48 00 00 0C */ b lbl_8046C8CC -lbl_8046C8C4: -/* 8046C8C4 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8046C8C8 D0 1E 05 88 */ stfs f0, 0x588(r30) -lbl_8046C8CC: -/* 8046C8CC 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 8046C8D0 2C 00 00 FF */ cmpwi r0, 0xff -/* 8046C8D4 40 82 00 0C */ bne lbl_8046C8E0 -/* 8046C8D8 38 00 00 0A */ li r0, 0xa -/* 8046C8DC 90 1E 05 78 */ stw r0, 0x578(r30) -lbl_8046C8E0: -/* 8046C8E0 80 1E 05 7C */ lwz r0, 0x57c(r30) -/* 8046C8E4 2C 00 00 FF */ cmpwi r0, 0xff -/* 8046C8E8 40 82 00 0C */ bne lbl_8046C8F4 -/* 8046C8EC 38 00 00 0A */ li r0, 0xa -/* 8046C8F0 90 1E 05 7C */ stw r0, 0x57c(r30) -lbl_8046C8F4: -/* 8046C8F4 C0 3F 00 24 */ lfs f1, 0x24(r31) -/* 8046C8F8 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 8046C8FC EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C900 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 8046C904 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 8046C908 EC 61 00 32 */ fmuls f3, f1, f0 -/* 8046C90C C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 8046C910 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 8046C914 C8 3F 00 30 */ lfd f1, 0x30(r31) -/* 8046C918 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8046C91C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8046C920 3C 00 43 30 */ lis r0, 0x4330 -/* 8046C924 90 01 00 08 */ stw r0, 8(r1) -/* 8046C928 C8 01 00 08 */ lfd f0, 8(r1) -/* 8046C92C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8046C930 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8046C934 EC 03 00 2A */ fadds f0, f3, f0 -/* 8046C938 D0 1E 05 84 */ stfs f0, 0x584(r30) -/* 8046C93C 38 00 00 00 */ li r0, 0 -/* 8046C940 98 1E 05 6C */ stb r0, 0x56c(r30) -/* 8046C944 98 1E 05 6D */ stb r0, 0x56d(r30) -/* 8046C948 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C94C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C950 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8046C954 7F C3 F3 78 */ mr r3, r30 -/* 8046C958 4B FF F5 61 */ bl wether_tag_efect_move__FP13kytag00_class -/* 8046C95C 38 60 00 04 */ li r3, 4 -/* 8046C960 39 61 00 20 */ addi r11, r1, 0x20 -/* 8046C964 4B EF 58 C5 */ bl _restgpr_29 -/* 8046C968 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8046C96C 7C 08 03 A6 */ mtlr r0 -/* 8046C970 38 21 00 20 */ addi r1, r1, 0x20 -/* 8046C974 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Execute__FP13kytag00_class.s b/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Execute__FP13kytag00_class.s deleted file mode 100644 index 7e0589ba84..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Execute__FP13kytag00_class.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_8046C684: -/* 8046C684 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8046C688 7C 08 02 A6 */ mflr r0 -/* 8046C68C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8046C690 39 61 00 20 */ addi r11, r1, 0x20 -/* 8046C694 4B EF 5B 49 */ bl _savegpr_29 -/* 8046C698 7C 7D 1B 78 */ mr r29, r3 -/* 8046C69C 3C 60 80 47 */ lis r3, lit_3798@ha /* 0x8046C980@ha */ -/* 8046C6A0 3B E3 C9 80 */ addi r31, r3, lit_3798@l /* 0x8046C980@l */ -/* 8046C6A4 3B C0 00 01 */ li r30, 1 -/* 8046C6A8 88 9D 05 71 */ lbz r4, 0x571(r29) -/* 8046C6AC 28 04 00 FF */ cmplwi r4, 0xff -/* 8046C6B0 41 82 00 2C */ beq lbl_8046C6DC -/* 8046C6B4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046C6B8 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8046C6BC 7C A5 07 74 */ extsb r5, r5 -/* 8046C6C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046C6C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046C6C8 4B BC 8C 99 */ bl isSwitch__10dSv_info_cCFii -/* 8046C6CC 2C 03 00 00 */ cmpwi r3, 0 -/* 8046C6D0 41 82 00 0C */ beq lbl_8046C6DC -/* 8046C6D4 3B C0 00 00 */ li r30, 0 -/* 8046C6D8 48 00 00 34 */ b lbl_8046C70C -lbl_8046C6DC: -/* 8046C6DC 88 9D 05 72 */ lbz r4, 0x572(r29) -/* 8046C6E0 28 04 00 FF */ cmplwi r4, 0xff -/* 8046C6E4 41 82 00 28 */ beq lbl_8046C70C -/* 8046C6E8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046C6EC 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8046C6F0 7C A5 07 74 */ extsb r5, r5 -/* 8046C6F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046C6F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046C6FC 4B BC 8C 65 */ bl isSwitch__10dSv_info_cCFii -/* 8046C700 2C 03 00 00 */ cmpwi r3, 0 -/* 8046C704 40 82 00 08 */ bne lbl_8046C70C -/* 8046C708 3B C0 00 00 */ li r30, 0 -lbl_8046C70C: -/* 8046C70C 2C 1E 00 01 */ cmpwi r30, 1 -/* 8046C710 40 82 00 20 */ bne lbl_8046C730 -/* 8046C714 38 7D 05 88 */ addi r3, r29, 0x588 -/* 8046C718 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 8046C71C C0 5F 00 54 */ lfs f2, 0x54(r31) -/* 8046C720 C0 7F 00 58 */ lfs f3, 0x58(r31) -/* 8046C724 C0 9F 00 5C */ lfs f4, 0x5c(r31) -/* 8046C728 4B E0 32 55 */ bl cLib_addCalc__FPfffff -/* 8046C72C 48 00 00 1C */ b lbl_8046C748 -lbl_8046C730: -/* 8046C730 38 7D 05 88 */ addi r3, r29, 0x588 -/* 8046C734 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8046C738 C0 5F 00 54 */ lfs f2, 0x54(r31) -/* 8046C73C C0 7F 00 58 */ lfs f3, 0x58(r31) -/* 8046C740 C0 9F 00 5C */ lfs f4, 0x5c(r31) -/* 8046C744 4B E0 32 39 */ bl cLib_addCalc__FPfffff -lbl_8046C748: -/* 8046C748 7F A3 EB 78 */ mr r3, r29 -/* 8046C74C 4B FF F2 C5 */ bl wether_tag_move__FP13kytag00_class -/* 8046C750 38 60 00 01 */ li r3, 1 -/* 8046C754 39 61 00 20 */ addi r11, r1, 0x20 -/* 8046C758 4B EF 5A D1 */ bl _restgpr_29 -/* 8046C75C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8046C760 7C 08 03 A6 */ mtlr r0 -/* 8046C764 38 21 00 20 */ addi r1, r1, 0x20 -/* 8046C768 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/get_check_pos__FP13kytag00_class.s b/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/get_check_pos__FP13kytag00_class.s deleted file mode 100644 index 514b52fce2..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/get_check_pos__FP13kytag00_class.s +++ /dev/null @@ -1,199 +0,0 @@ -lbl_8046B718: -/* 8046B718 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8046B71C 7C 08 02 A6 */ mflr r0 -/* 8046B720 90 01 00 54 */ stw r0, 0x54(r1) -/* 8046B724 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8046B728 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 8046B72C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8046B730 4B EF 6A A5 */ bl _savegpr_27 -/* 8046B734 7C 7C 1B 78 */ mr r28, r3 -/* 8046B738 7C 9D 23 78 */ mr r29, r4 -/* 8046B73C 3C 60 80 47 */ lis r3, lit_3798@ha /* 0x8046C980@ha */ -/* 8046B740 3B 63 C9 80 */ addi r27, r3, lit_3798@l /* 0x8046C980@l */ -/* 8046B744 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046B748 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046B74C 83 C3 5D 74 */ lwz r30, 0x5d74(r3) -/* 8046B750 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 8046B754 28 1F 00 00 */ cmplwi r31, 0 -/* 8046B758 41 82 02 3C */ beq lbl_8046B994 -/* 8046B75C 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 8046B760 38 9E 00 D8 */ addi r4, r30, 0xd8 -/* 8046B764 4B ED BC 39 */ bl PSVECSquareDistance -/* 8046B768 C0 1B 00 00 */ lfs f0, 0(r27) -/* 8046B76C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046B770 40 81 00 58 */ ble lbl_8046B7C8 -/* 8046B774 FC 00 08 34 */ frsqrte f0, f1 -/* 8046B778 C8 9B 00 08 */ lfd f4, 8(r27) -/* 8046B77C FC 44 00 32 */ fmul f2, f4, f0 -/* 8046B780 C8 7B 00 10 */ lfd f3, 0x10(r27) -/* 8046B784 FC 00 00 32 */ fmul f0, f0, f0 -/* 8046B788 FC 01 00 32 */ fmul f0, f1, f0 -/* 8046B78C FC 03 00 28 */ fsub f0, f3, f0 -/* 8046B790 FC 02 00 32 */ fmul f0, f2, f0 -/* 8046B794 FC 44 00 32 */ fmul f2, f4, f0 -/* 8046B798 FC 00 00 32 */ fmul f0, f0, f0 -/* 8046B79C FC 01 00 32 */ fmul f0, f1, f0 -/* 8046B7A0 FC 03 00 28 */ fsub f0, f3, f0 -/* 8046B7A4 FC 02 00 32 */ fmul f0, f2, f0 -/* 8046B7A8 FC 44 00 32 */ fmul f2, f4, f0 -/* 8046B7AC FC 00 00 32 */ fmul f0, f0, f0 -/* 8046B7B0 FC 01 00 32 */ fmul f0, f1, f0 -/* 8046B7B4 FC 03 00 28 */ fsub f0, f3, f0 -/* 8046B7B8 FC 02 00 32 */ fmul f0, f2, f0 -/* 8046B7BC FF E1 00 32 */ fmul f31, f1, f0 -/* 8046B7C0 FF E0 F8 18 */ frsp f31, f31 -/* 8046B7C4 48 00 00 90 */ b lbl_8046B854 -lbl_8046B7C8: -/* 8046B7C8 C8 1B 00 18 */ lfd f0, 0x18(r27) -/* 8046B7CC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046B7D0 40 80 00 10 */ bge lbl_8046B7E0 -/* 8046B7D4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8046B7D8 C3 E3 0A E0 */ lfs f31, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8046B7DC 48 00 00 78 */ b lbl_8046B854 -lbl_8046B7E0: -/* 8046B7E0 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 8046B7E4 80 81 00 0C */ lwz r4, 0xc(r1) -/* 8046B7E8 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8046B7EC 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8046B7F0 7C 03 00 00 */ cmpw r3, r0 -/* 8046B7F4 41 82 00 14 */ beq lbl_8046B808 -/* 8046B7F8 40 80 00 40 */ bge lbl_8046B838 -/* 8046B7FC 2C 03 00 00 */ cmpwi r3, 0 -/* 8046B800 41 82 00 20 */ beq lbl_8046B820 -/* 8046B804 48 00 00 34 */ b lbl_8046B838 -lbl_8046B808: -/* 8046B808 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8046B80C 41 82 00 0C */ beq lbl_8046B818 -/* 8046B810 38 00 00 01 */ li r0, 1 -/* 8046B814 48 00 00 28 */ b lbl_8046B83C -lbl_8046B818: -/* 8046B818 38 00 00 02 */ li r0, 2 -/* 8046B81C 48 00 00 20 */ b lbl_8046B83C -lbl_8046B820: -/* 8046B820 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8046B824 41 82 00 0C */ beq lbl_8046B830 -/* 8046B828 38 00 00 05 */ li r0, 5 -/* 8046B82C 48 00 00 10 */ b lbl_8046B83C -lbl_8046B830: -/* 8046B830 38 00 00 03 */ li r0, 3 -/* 8046B834 48 00 00 08 */ b lbl_8046B83C -lbl_8046B838: -/* 8046B838 38 00 00 04 */ li r0, 4 -lbl_8046B83C: -/* 8046B83C 2C 00 00 01 */ cmpwi r0, 1 -/* 8046B840 40 82 00 10 */ bne lbl_8046B850 -/* 8046B844 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8046B848 C3 E3 0A E0 */ lfs f31, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8046B84C 48 00 00 08 */ b lbl_8046B854 -lbl_8046B850: -/* 8046B850 FF E0 08 90 */ fmr f31, f1 -lbl_8046B854: -/* 8046B854 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 8046B858 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 8046B85C 4B ED BB 41 */ bl PSVECSquareDistance -/* 8046B860 C0 1B 00 00 */ lfs f0, 0(r27) -/* 8046B864 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046B868 40 81 00 58 */ ble lbl_8046B8C0 -/* 8046B86C FC 00 08 34 */ frsqrte f0, f1 -/* 8046B870 C8 9B 00 08 */ lfd f4, 8(r27) -/* 8046B874 FC 44 00 32 */ fmul f2, f4, f0 -/* 8046B878 C8 7B 00 10 */ lfd f3, 0x10(r27) -/* 8046B87C FC 00 00 32 */ fmul f0, f0, f0 -/* 8046B880 FC 01 00 32 */ fmul f0, f1, f0 -/* 8046B884 FC 03 00 28 */ fsub f0, f3, f0 -/* 8046B888 FC 02 00 32 */ fmul f0, f2, f0 -/* 8046B88C FC 44 00 32 */ fmul f2, f4, f0 -/* 8046B890 FC 00 00 32 */ fmul f0, f0, f0 -/* 8046B894 FC 01 00 32 */ fmul f0, f1, f0 -/* 8046B898 FC 03 00 28 */ fsub f0, f3, f0 -/* 8046B89C FC 02 00 32 */ fmul f0, f2, f0 -/* 8046B8A0 FC 44 00 32 */ fmul f2, f4, f0 -/* 8046B8A4 FC 00 00 32 */ fmul f0, f0, f0 -/* 8046B8A8 FC 01 00 32 */ fmul f0, f1, f0 -/* 8046B8AC FC 03 00 28 */ fsub f0, f3, f0 -/* 8046B8B0 FC 02 00 32 */ fmul f0, f2, f0 -/* 8046B8B4 FC 21 00 32 */ fmul f1, f1, f0 -/* 8046B8B8 FC 20 08 18 */ frsp f1, f1 -/* 8046B8BC 48 00 00 88 */ b lbl_8046B944 -lbl_8046B8C0: -/* 8046B8C0 C8 1B 00 18 */ lfd f0, 0x18(r27) -/* 8046B8C4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046B8C8 40 80 00 10 */ bge lbl_8046B8D8 -/* 8046B8CC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8046B8D0 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8046B8D4 48 00 00 70 */ b lbl_8046B944 -lbl_8046B8D8: -/* 8046B8D8 D0 21 00 08 */ stfs f1, 8(r1) -/* 8046B8DC 80 81 00 08 */ lwz r4, 8(r1) -/* 8046B8E0 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8046B8E4 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8046B8E8 7C 03 00 00 */ cmpw r3, r0 -/* 8046B8EC 41 82 00 14 */ beq lbl_8046B900 -/* 8046B8F0 40 80 00 40 */ bge lbl_8046B930 -/* 8046B8F4 2C 03 00 00 */ cmpwi r3, 0 -/* 8046B8F8 41 82 00 20 */ beq lbl_8046B918 -/* 8046B8FC 48 00 00 34 */ b lbl_8046B930 -lbl_8046B900: -/* 8046B900 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8046B904 41 82 00 0C */ beq lbl_8046B910 -/* 8046B908 38 00 00 01 */ li r0, 1 -/* 8046B90C 48 00 00 28 */ b lbl_8046B934 -lbl_8046B910: -/* 8046B910 38 00 00 02 */ li r0, 2 -/* 8046B914 48 00 00 20 */ b lbl_8046B934 -lbl_8046B918: -/* 8046B918 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8046B91C 41 82 00 0C */ beq lbl_8046B928 -/* 8046B920 38 00 00 05 */ li r0, 5 -/* 8046B924 48 00 00 10 */ b lbl_8046B934 -lbl_8046B928: -/* 8046B928 38 00 00 03 */ li r0, 3 -/* 8046B92C 48 00 00 08 */ b lbl_8046B934 -lbl_8046B930: -/* 8046B930 38 00 00 04 */ li r0, 4 -lbl_8046B934: -/* 8046B934 2C 00 00 01 */ cmpwi r0, 1 -/* 8046B938 40 82 00 0C */ bne lbl_8046B944 -/* 8046B93C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8046B940 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8046B944: -/* 8046B944 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 8046B948 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8046B94C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 8046B950 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8046B954 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 8046B958 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8046B95C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046B960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046B964 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 8046B968 28 00 00 00 */ cmplwi r0, 0 -/* 8046B96C 41 82 00 38 */ beq lbl_8046B9A4 -/* 8046B970 FC 1F 08 40 */ fcmpo cr0, f31, f1 -/* 8046B974 40 80 00 30 */ bge lbl_8046B9A4 -/* 8046B978 C0 1E 00 D8 */ lfs f0, 0xd8(r30) -/* 8046B97C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8046B980 C0 1E 00 DC */ lfs f0, 0xdc(r30) -/* 8046B984 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8046B988 C0 1E 00 E0 */ lfs f0, 0xe0(r30) -/* 8046B98C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8046B990 48 00 00 14 */ b lbl_8046B9A4 -lbl_8046B994: -/* 8046B994 C0 1B 00 00 */ lfs f0, 0(r27) -/* 8046B998 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8046B99C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8046B9A0 D0 01 00 18 */ stfs f0, 0x18(r1) -lbl_8046B9A4: -/* 8046B9A4 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8046B9A8 D0 1C 00 00 */ stfs f0, 0(r28) -/* 8046B9AC C0 01 00 14 */ lfs f0, 0x14(r1) -/* 8046B9B0 D0 1C 00 04 */ stfs f0, 4(r28) -/* 8046B9B4 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 8046B9B8 D0 1C 00 08 */ stfs f0, 8(r28) -/* 8046B9BC E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 8046B9C0 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 8046B9C4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8046B9C8 4B EF 68 59 */ bl _restgpr_27 -/* 8046B9CC 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8046B9D0 7C 08 03 A6 */ mtlr r0 -/* 8046B9D4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8046B9D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_efect_move__FP13kytag00_class.s b/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_efect_move__FP13kytag00_class.s deleted file mode 100644 index bb0134e937..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_efect_move__FP13kytag00_class.s +++ /dev/null @@ -1,533 +0,0 @@ -lbl_8046BEB8: -/* 8046BEB8 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8046BEBC 7C 08 02 A6 */ mflr r0 -/* 8046BEC0 90 01 00 54 */ stw r0, 0x54(r1) -/* 8046BEC4 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8046BEC8 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 8046BECC 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 8046BED0 93 C1 00 38 */ stw r30, 0x38(r1) -/* 8046BED4 7C 7E 1B 78 */ mr r30, r3 -/* 8046BED8 3C 60 80 47 */ lis r3, lit_3798@ha /* 0x8046C980@ha */ -/* 8046BEDC 3B E3 C9 80 */ addi r31, r3, lit_3798@l /* 0x8046C980@l */ -/* 8046BEE0 38 61 00 0C */ addi r3, r1, 0xc -/* 8046BEE4 7F C4 F3 78 */ mr r4, r30 -/* 8046BEE8 4B FF F8 31 */ bl get_check_pos__FP13kytag00_class -/* 8046BEEC C0 81 00 0C */ lfs f4, 0xc(r1) -/* 8046BEF0 D0 81 00 18 */ stfs f4, 0x18(r1) -/* 8046BEF4 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8046BEF8 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8046BEFC C0 61 00 14 */ lfs f3, 0x14(r1) -/* 8046BF00 D0 61 00 20 */ stfs f3, 0x20(r1) -/* 8046BF04 C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 8046BF08 80 1E 05 7C */ lwz r0, 0x57c(r30) -/* 8046BF0C C8 3F 00 30 */ lfd f1, 0x30(r31) -/* 8046BF10 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8046BF14 90 01 00 34 */ stw r0, 0x34(r1) -/* 8046BF18 3C 00 43 30 */ lis r0, 0x4330 -/* 8046BF1C 90 01 00 30 */ stw r0, 0x30(r1) -/* 8046BF20 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8046BF24 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8046BF28 EF E2 00 32 */ fmuls f31, f2, f0 -/* 8046BF2C D0 81 00 24 */ stfs f4, 0x24(r1) -/* 8046BF30 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 8046BF34 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8046BF38 D0 61 00 2C */ stfs f3, 0x2c(r1) -/* 8046BF3C 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 8046BF40 38 81 00 24 */ addi r4, r1, 0x24 -/* 8046BF44 4B ED B4 59 */ bl PSVECSquareDistance -/* 8046BF48 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8046BF4C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046BF50 40 81 00 58 */ ble lbl_8046BFA8 -/* 8046BF54 FC 00 08 34 */ frsqrte f0, f1 -/* 8046BF58 C8 9F 00 08 */ lfd f4, 8(r31) -/* 8046BF5C FC 44 00 32 */ fmul f2, f4, f0 -/* 8046BF60 C8 7F 00 10 */ lfd f3, 0x10(r31) -/* 8046BF64 FC 00 00 32 */ fmul f0, f0, f0 -/* 8046BF68 FC 01 00 32 */ fmul f0, f1, f0 -/* 8046BF6C FC 03 00 28 */ fsub f0, f3, f0 -/* 8046BF70 FC 02 00 32 */ fmul f0, f2, f0 -/* 8046BF74 FC 44 00 32 */ fmul f2, f4, f0 -/* 8046BF78 FC 00 00 32 */ fmul f0, f0, f0 -/* 8046BF7C FC 01 00 32 */ fmul f0, f1, f0 -/* 8046BF80 FC 03 00 28 */ fsub f0, f3, f0 -/* 8046BF84 FC 02 00 32 */ fmul f0, f2, f0 -/* 8046BF88 FC 44 00 32 */ fmul f2, f4, f0 -/* 8046BF8C FC 00 00 32 */ fmul f0, f0, f0 -/* 8046BF90 FC 01 00 32 */ fmul f0, f1, f0 -/* 8046BF94 FC 03 00 28 */ fsub f0, f3, f0 -/* 8046BF98 FC 02 00 32 */ fmul f0, f2, f0 -/* 8046BF9C FC 21 00 32 */ fmul f1, f1, f0 -/* 8046BFA0 FC 20 08 18 */ frsp f1, f1 -/* 8046BFA4 48 00 00 88 */ b lbl_8046C02C -lbl_8046BFA8: -/* 8046BFA8 C8 1F 00 18 */ lfd f0, 0x18(r31) -/* 8046BFAC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046BFB0 40 80 00 10 */ bge lbl_8046BFC0 -/* 8046BFB4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8046BFB8 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8046BFBC 48 00 00 70 */ b lbl_8046C02C -lbl_8046BFC0: -/* 8046BFC0 D0 21 00 08 */ stfs f1, 8(r1) -/* 8046BFC4 80 81 00 08 */ lwz r4, 8(r1) -/* 8046BFC8 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8046BFCC 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8046BFD0 7C 03 00 00 */ cmpw r3, r0 -/* 8046BFD4 41 82 00 14 */ beq lbl_8046BFE8 -/* 8046BFD8 40 80 00 40 */ bge lbl_8046C018 -/* 8046BFDC 2C 03 00 00 */ cmpwi r3, 0 -/* 8046BFE0 41 82 00 20 */ beq lbl_8046C000 -/* 8046BFE4 48 00 00 34 */ b lbl_8046C018 -lbl_8046BFE8: -/* 8046BFE8 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8046BFEC 41 82 00 0C */ beq lbl_8046BFF8 -/* 8046BFF0 38 00 00 01 */ li r0, 1 -/* 8046BFF4 48 00 00 28 */ b lbl_8046C01C -lbl_8046BFF8: -/* 8046BFF8 38 00 00 02 */ li r0, 2 -/* 8046BFFC 48 00 00 20 */ b lbl_8046C01C -lbl_8046C000: -/* 8046C000 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8046C004 41 82 00 0C */ beq lbl_8046C010 -/* 8046C008 38 00 00 05 */ li r0, 5 -/* 8046C00C 48 00 00 10 */ b lbl_8046C01C -lbl_8046C010: -/* 8046C010 38 00 00 03 */ li r0, 3 -/* 8046C014 48 00 00 08 */ b lbl_8046C01C -lbl_8046C018: -/* 8046C018 38 00 00 04 */ li r0, 4 -lbl_8046C01C: -/* 8046C01C 2C 00 00 01 */ cmpwi r0, 1 -/* 8046C020 40 82 00 0C */ bne lbl_8046C02C -/* 8046C024 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8046C028 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8046C02C: -/* 8046C02C C0 1E 05 84 */ lfs f0, 0x584(r30) -/* 8046C030 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046C034 40 80 05 F8 */ bge lbl_8046C62C -/* 8046C038 C0 81 00 1C */ lfs f4, 0x1c(r1) -/* 8046C03C C0 7E 04 D4 */ lfs f3, 0x4d4(r30) -/* 8046C040 EC 03 F8 28 */ fsubs f0, f3, f31 -/* 8046C044 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 8046C048 4C 41 13 82 */ cror 2, 1, 2 -/* 8046C04C 40 82 05 E0 */ bne lbl_8046C62C -/* 8046C050 C0 5F 00 24 */ lfs f2, 0x24(r31) -/* 8046C054 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 8046C058 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8046C05C EC 03 00 2A */ fadds f0, f3, f0 -/* 8046C060 EC 1F 00 2A */ fadds f0, f31, f0 -/* 8046C064 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 8046C068 40 80 05 C4 */ bge lbl_8046C62C -/* 8046C06C C0 1E 05 88 */ lfs f0, 0x588(r30) -/* 8046C070 C0 7F 00 00 */ lfs f3, 0(r31) -/* 8046C074 FC 00 18 40 */ fcmpo cr0, f0, f3 -/* 8046C078 40 81 05 B4 */ ble lbl_8046C62C -/* 8046C07C C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 8046C080 FC C0 00 90 */ fmr f6, f0 -/* 8046C084 38 00 00 01 */ li r0, 1 -/* 8046C088 98 1E 05 6C */ stb r0, 0x56c(r30) -/* 8046C08C C0 9E 05 84 */ lfs f4, 0x584(r30) -/* 8046C090 C0 5E 05 80 */ lfs f2, 0x580(r30) -/* 8046C094 EC 44 10 28 */ fsubs f2, f4, f2 -/* 8046C098 FC 03 10 00 */ fcmpu cr0, f3, f2 -/* 8046C09C 41 82 00 18 */ beq lbl_8046C0B4 -/* 8046C0A0 EC 04 08 28 */ fsubs f0, f4, f1 -/* 8046C0A4 EC 00 10 24 */ fdivs f0, f0, f2 -/* 8046C0A8 FC 00 30 40 */ fcmpo cr0, f0, f6 -/* 8046C0AC 40 81 00 08 */ ble lbl_8046C0B4 -/* 8046C0B0 FC 00 30 90 */ fmr f0, f6 -lbl_8046C0B4: -/* 8046C0B4 C0 81 00 1C */ lfs f4, 0x1c(r1) -/* 8046C0B8 C0 BE 04 D4 */ lfs f5, 0x4d4(r30) -/* 8046C0BC FC 04 28 40 */ fcmpo cr0, f4, f5 -/* 8046C0C0 4C 40 13 82 */ cror 2, 0, 2 -/* 8046C0C4 40 82 00 30 */ bne lbl_8046C0F4 -/* 8046C0C8 C0 5F 00 00 */ lfs f2, 0(r31) -/* 8046C0CC FC 02 F8 00 */ fcmpu cr0, f2, f31 -/* 8046C0D0 41 82 00 5C */ beq lbl_8046C12C -/* 8046C0D4 EC 25 20 28 */ fsubs f1, f5, f4 -/* 8046C0D8 EC 61 F8 24 */ fdivs f3, f1, f31 -/* 8046C0DC FC 03 10 40 */ fcmpo cr0, f3, f2 -/* 8046C0E0 40 80 00 08 */ bge lbl_8046C0E8 -/* 8046C0E4 FC 60 10 90 */ fmr f3, f2 -lbl_8046C0E8: -/* 8046C0E8 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 8046C0EC EC C1 18 28 */ fsubs f6, f1, f3 -/* 8046C0F0 48 00 00 3C */ b lbl_8046C12C -lbl_8046C0F4: -/* 8046C0F4 C0 7F 00 00 */ lfs f3, 0(r31) -/* 8046C0F8 FC 03 F8 00 */ fcmpu cr0, f3, f31 -/* 8046C0FC 41 82 00 30 */ beq lbl_8046C12C -/* 8046C100 C0 5F 00 24 */ lfs f2, 0x24(r31) -/* 8046C104 C0 3E 04 F0 */ lfs f1, 0x4f0(r30) -/* 8046C108 EC 22 00 72 */ fmuls f1, f2, f1 -/* 8046C10C EC 25 08 2A */ fadds f1, f5, f1 -/* 8046C110 EC 24 08 28 */ fsubs f1, f4, f1 -/* 8046C114 EC 41 F8 24 */ fdivs f2, f1, f31 -/* 8046C118 FC 02 18 40 */ fcmpo cr0, f2, f3 -/* 8046C11C 40 80 00 08 */ bge lbl_8046C124 -/* 8046C120 FC 40 18 90 */ fmr f2, f3 -lbl_8046C124: -/* 8046C124 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 8046C128 EC C1 10 28 */ fsubs f6, f1, f2 -lbl_8046C12C: -/* 8046C12C C0 3E 05 88 */ lfs f1, 0x588(r30) -/* 8046C130 EC 26 00 72 */ fmuls f1, f6, f1 -/* 8046C134 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8046C138 88 1E 05 70 */ lbz r0, 0x570(r30) -/* 8046C13C 28 00 00 12 */ cmplwi r0, 0x12 -/* 8046C140 41 81 05 00 */ bgt lbl_8046C640 -/* 8046C144 3C 60 80 47 */ lis r3, lit_4108@ha /* 0x8046CA2C@ha */ -/* 8046C148 38 63 CA 2C */ addi r3, r3, lit_4108@l /* 0x8046CA2C@l */ -/* 8046C14C 54 00 10 3A */ slwi r0, r0, 2 -/* 8046C150 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8046C154 7C 09 03 A6 */ mtctr r0 -/* 8046C158 4E 80 04 20 */ bctr -lbl_8046C15C: -/* 8046C15C FC 20 00 90 */ fmr f1, f0 -/* 8046C160 4B FF FC 01 */ bl raincnt_set__Ff -/* 8046C164 48 00 04 DC */ b lbl_8046C640 -lbl_8046C168: -/* 8046C168 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 8046C16C 7C 04 07 74 */ extsb r4, r0 -/* 8046C170 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046C174 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8046C178 7C 00 07 74 */ extsb r0, r0 -/* 8046C17C 7C 04 00 00 */ cmpw r4, r0 -/* 8046C180 40 82 00 B8 */ bne lbl_8046C238 -/* 8046C184 38 00 00 00 */ li r0, 0 -/* 8046C188 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C18C 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C190 98 04 0E 92 */ stb r0, 0xe92(r4) -/* 8046C194 80 64 0E 8C */ lwz r3, 0xe8c(r4) -/* 8046C198 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 8046C19C EC 41 00 32 */ fmuls f2, f1, f0 -/* 8046C1A0 FC 20 10 1E */ fctiwz f1, f2 -/* 8046C1A4 D8 21 00 30 */ stfd f1, 0x30(r1) -/* 8046C1A8 80 A1 00 34 */ lwz r5, 0x34(r1) -/* 8046C1AC 7C 03 28 00 */ cmpw r3, r5 -/* 8046C1B0 40 80 00 2C */ bge lbl_8046C1DC -/* 8046C1B4 C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 8046C1B8 EC 21 00 B2 */ fmuls f1, f1, f2 -/* 8046C1BC FC 20 08 1E */ fctiwz f1, f1 -/* 8046C1C0 D8 21 00 30 */ stfd f1, 0x30(r1) -/* 8046C1C4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C1C8 7C 03 02 14 */ add r0, r3, r0 -/* 8046C1CC 90 04 0E 8C */ stw r0, 0xe8c(r4) -/* 8046C1D0 7C 00 28 00 */ cmpw r0, r5 -/* 8046C1D4 40 81 00 08 */ ble lbl_8046C1DC -/* 8046C1D8 90 A4 0E 8C */ stw r5, 0xe8c(r4) -lbl_8046C1DC: -/* 8046C1DC 38 00 00 00 */ li r0, 0 -/* 8046C1E0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C1E4 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C1E8 98 04 0E B5 */ stb r0, 0xeb5(r4) -/* 8046C1EC 80 64 0E B8 */ lwz r3, 0xeb8(r4) -/* 8046C1F0 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 8046C1F4 EC 41 00 32 */ fmuls f2, f1, f0 -/* 8046C1F8 FC 20 10 1E */ fctiwz f1, f2 -/* 8046C1FC D8 21 00 30 */ stfd f1, 0x30(r1) -/* 8046C200 80 A1 00 34 */ lwz r5, 0x34(r1) -/* 8046C204 7C 03 28 00 */ cmpw r3, r5 -/* 8046C208 40 80 00 44 */ bge lbl_8046C24C -/* 8046C20C C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 8046C210 EC 21 00 B2 */ fmuls f1, f1, f2 -/* 8046C214 FC 20 08 1E */ fctiwz f1, f1 -/* 8046C218 D8 21 00 30 */ stfd f1, 0x30(r1) -/* 8046C21C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C220 7C 03 02 14 */ add r0, r3, r0 -/* 8046C224 90 04 0E B8 */ stw r0, 0xeb8(r4) -/* 8046C228 7C 00 28 00 */ cmpw r0, r5 -/* 8046C22C 40 81 00 20 */ ble lbl_8046C24C -/* 8046C230 90 A4 0E B8 */ stw r5, 0xeb8(r4) -/* 8046C234 48 00 00 18 */ b lbl_8046C24C -lbl_8046C238: -/* 8046C238 38 00 00 00 */ li r0, 0 -/* 8046C23C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C240 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C244 90 03 0E 8C */ stw r0, 0xe8c(r3) -/* 8046C248 90 03 0E B8 */ stw r0, 0xeb8(r3) -lbl_8046C24C: -/* 8046C24C 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */ -/* 8046C250 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ -/* 8046C254 C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 8046C258 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C25C FC 00 00 1E */ fctiwz f0, f0 -/* 8046C260 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C264 80 81 00 34 */ lwz r4, 0x34(r1) -/* 8046C268 4B E5 BD 4D */ bl setSnowPower__10Z2EnvSeMgrFSc -/* 8046C26C 48 00 03 D4 */ b lbl_8046C640 -lbl_8046C270: -/* 8046C270 38 C0 00 00 */ li r6, 0 -/* 8046C274 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C278 38 A3 CA 54 */ addi r5, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C27C 98 C5 0E A9 */ stb r6, 0xea9(r5) -/* 8046C280 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 8046C284 7C 04 07 74 */ extsb r4, r0 -/* 8046C288 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046C28C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8046C290 7C 00 07 74 */ extsb r0, r0 -/* 8046C294 7C 04 00 00 */ cmpw r4, r0 -/* 8046C298 40 82 00 20 */ bne lbl_8046C2B8 -/* 8046C29C C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 8046C2A0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C2A4 FC 00 00 1E */ fctiwz f0, f0 -/* 8046C2A8 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C2AC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C2B0 90 05 0E AC */ stw r0, 0xeac(r5) -/* 8046C2B4 48 00 00 08 */ b lbl_8046C2BC -lbl_8046C2B8: -/* 8046C2B8 90 C5 0E AC */ stw r6, 0xeac(r5) -lbl_8046C2BC: -/* 8046C2BC 88 1E 05 70 */ lbz r0, 0x570(r30) -/* 8046C2C0 28 00 00 0E */ cmplwi r0, 0xe -/* 8046C2C4 40 82 03 7C */ bne lbl_8046C640 -/* 8046C2C8 38 00 00 01 */ li r0, 1 -/* 8046C2CC 98 05 0E A9 */ stb r0, 0xea9(r5) -/* 8046C2D0 48 00 03 70 */ b lbl_8046C640 -lbl_8046C2D4: -/* 8046C2D4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C2D8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C2DC 80 03 0E D8 */ lwz r0, 0xed8(r3) -/* 8046C2E0 2C 00 00 00 */ cmpwi r0, 0 -/* 8046C2E4 40 82 03 5C */ bne lbl_8046C640 -/* 8046C2E8 38 00 00 02 */ li r0, 2 -/* 8046C2EC 90 03 0E D8 */ stw r0, 0xed8(r3) -/* 8046C2F0 48 00 03 50 */ b lbl_8046C640 -lbl_8046C2F4: -/* 8046C2F4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C2F8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C2FC 80 03 0E D8 */ lwz r0, 0xed8(r3) -/* 8046C300 2C 00 00 00 */ cmpwi r0, 0 -/* 8046C304 40 82 00 0C */ bne lbl_8046C310 -/* 8046C308 38 00 00 02 */ li r0, 2 -/* 8046C30C 90 03 0E D8 */ stw r0, 0xed8(r3) -lbl_8046C310: -/* 8046C310 FC 20 00 90 */ fmr f1, f0 -/* 8046C314 4B FF FA 4D */ bl raincnt_set__Ff -/* 8046C318 48 00 03 28 */ b lbl_8046C640 -lbl_8046C31C: -/* 8046C31C 38 00 00 01 */ li r0, 1 -/* 8046C320 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C324 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C328 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 8046C32C C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 8046C330 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8046C334 FC 20 08 1E */ fctiwz f1, f1 -/* 8046C338 D8 21 00 30 */ stfd f1, 0x30(r1) -/* 8046C33C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C340 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8046C344 FC 20 00 90 */ fmr f1, f0 -/* 8046C348 4B FF FA 19 */ bl raincnt_set__Ff -/* 8046C34C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C350 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C354 80 03 0E D8 */ lwz r0, 0xed8(r3) -/* 8046C358 2C 00 00 00 */ cmpwi r0, 0 -/* 8046C35C 40 82 02 E4 */ bne lbl_8046C640 -/* 8046C360 38 00 00 02 */ li r0, 2 -/* 8046C364 90 03 0E D8 */ stw r0, 0xed8(r3) -/* 8046C368 48 00 02 D8 */ b lbl_8046C640 -lbl_8046C36C: -/* 8046C36C 38 00 00 00 */ li r0, 0 -/* 8046C370 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C374 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C378 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 8046C37C C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 8046C380 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C384 FC 00 00 1E */ fctiwz f0, f0 -/* 8046C388 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C38C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C390 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8046C394 48 00 02 AC */ b lbl_8046C640 -lbl_8046C398: -/* 8046C398 38 00 00 01 */ li r0, 1 -/* 8046C39C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C3A0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C3A4 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 8046C3A8 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 8046C3AC EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C3B0 FC 00 00 1E */ fctiwz f0, f0 -/* 8046C3B4 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C3B8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C3BC 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8046C3C0 48 00 02 80 */ b lbl_8046C640 -lbl_8046C3C4: -/* 8046C3C4 38 00 00 02 */ li r0, 2 -/* 8046C3C8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C3CC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C3D0 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 8046C3D4 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 8046C3D8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C3DC FC 00 00 1E */ fctiwz f0, f0 -/* 8046C3E0 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C3E4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C3E8 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8046C3EC 48 00 02 54 */ b lbl_8046C640 -lbl_8046C3F0: -/* 8046C3F0 38 00 00 03 */ li r0, 3 -/* 8046C3F4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C3F8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C3FC 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 8046C400 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 8046C404 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C408 FC 00 00 1E */ fctiwz f0, f0 -/* 8046C40C D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C410 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C414 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8046C418 48 00 02 28 */ b lbl_8046C640 -lbl_8046C41C: -/* 8046C41C 38 00 00 32 */ li r0, 0x32 -/* 8046C420 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C424 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C428 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 8046C42C C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 8046C430 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8046C434 C0 03 0F 40 */ lfs f0, 0xf40(r3) -/* 8046C438 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C43C FC 00 00 1E */ fctiwz f0, f0 -/* 8046C440 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C444 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C448 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8046C44C 48 00 01 F4 */ b lbl_8046C640 -lbl_8046C450: -/* 8046C450 38 00 00 05 */ li r0, 5 -/* 8046C454 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C458 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C45C 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 8046C460 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 8046C464 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C468 FC 00 00 1E */ fctiwz f0, f0 -/* 8046C46C D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C470 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C474 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8046C478 48 00 01 C8 */ b lbl_8046C640 -lbl_8046C47C: -/* 8046C47C 38 00 00 06 */ li r0, 6 -/* 8046C480 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C484 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C488 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 8046C48C C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 8046C490 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C494 FC 00 00 1E */ fctiwz f0, f0 -/* 8046C498 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C49C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C4A0 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8046C4A4 48 00 01 9C */ b lbl_8046C640 -lbl_8046C4A8: -/* 8046C4A8 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 8046C4AC EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C4B0 FC 00 00 1E */ fctiwz f0, f0 -/* 8046C4B4 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C4B8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C4BC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C4C0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C4C4 90 03 10 48 */ stw r0, 0x1048(r3) -/* 8046C4C8 48 00 01 78 */ b lbl_8046C640 -lbl_8046C4CC: -/* 8046C4CC 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 8046C4D0 7C 04 07 74 */ extsb r4, r0 -/* 8046C4D4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046C4D8 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8046C4DC 7C 00 07 74 */ extsb r0, r0 -/* 8046C4E0 7C 04 00 00 */ cmpw r4, r0 -/* 8046C4E4 40 82 00 B8 */ bne lbl_8046C59C -/* 8046C4E8 38 00 00 01 */ li r0, 1 -/* 8046C4EC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C4F0 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C4F4 98 04 0E 92 */ stb r0, 0xe92(r4) -/* 8046C4F8 80 64 0E 8C */ lwz r3, 0xe8c(r4) -/* 8046C4FC C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 8046C500 EC 41 00 32 */ fmuls f2, f1, f0 -/* 8046C504 FC 20 10 1E */ fctiwz f1, f2 -/* 8046C508 D8 21 00 30 */ stfd f1, 0x30(r1) -/* 8046C50C 80 A1 00 34 */ lwz r5, 0x34(r1) -/* 8046C510 7C 03 28 00 */ cmpw r3, r5 -/* 8046C514 40 80 00 2C */ bge lbl_8046C540 -/* 8046C518 C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 8046C51C EC 21 00 B2 */ fmuls f1, f1, f2 -/* 8046C520 FC 20 08 1E */ fctiwz f1, f1 -/* 8046C524 D8 21 00 30 */ stfd f1, 0x30(r1) -/* 8046C528 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C52C 7C 03 02 14 */ add r0, r3, r0 -/* 8046C530 90 04 0E 8C */ stw r0, 0xe8c(r4) -/* 8046C534 7C 00 28 00 */ cmpw r0, r5 -/* 8046C538 40 81 00 08 */ ble lbl_8046C540 -/* 8046C53C 90 A4 0E 8C */ stw r5, 0xe8c(r4) -lbl_8046C540: -/* 8046C540 38 00 00 00 */ li r0, 0 -/* 8046C544 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C548 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C54C 98 04 0E B5 */ stb r0, 0xeb5(r4) -/* 8046C550 80 64 0E B8 */ lwz r3, 0xeb8(r4) -/* 8046C554 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 8046C558 EC 41 00 32 */ fmuls f2, f1, f0 -/* 8046C55C FC 20 10 1E */ fctiwz f1, f2 -/* 8046C560 D8 21 00 30 */ stfd f1, 0x30(r1) -/* 8046C564 80 A1 00 34 */ lwz r5, 0x34(r1) -/* 8046C568 7C 03 28 00 */ cmpw r3, r5 -/* 8046C56C 40 80 00 44 */ bge lbl_8046C5B0 -/* 8046C570 C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 8046C574 EC 21 00 B2 */ fmuls f1, f1, f2 -/* 8046C578 FC 20 08 1E */ fctiwz f1, f1 -/* 8046C57C D8 21 00 30 */ stfd f1, 0x30(r1) -/* 8046C580 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C584 7C 03 02 14 */ add r0, r3, r0 -/* 8046C588 90 04 0E B8 */ stw r0, 0xeb8(r4) -/* 8046C58C 7C 00 28 00 */ cmpw r0, r5 -/* 8046C590 40 81 00 20 */ ble lbl_8046C5B0 -/* 8046C594 90 A4 0E B8 */ stw r5, 0xeb8(r4) -/* 8046C598 48 00 00 18 */ b lbl_8046C5B0 -lbl_8046C59C: -/* 8046C59C 38 00 00 00 */ li r0, 0 -/* 8046C5A0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C5A4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C5A8 90 03 0E 8C */ stw r0, 0xe8c(r3) -/* 8046C5AC 90 03 0E B8 */ stw r0, 0xeb8(r3) -lbl_8046C5B0: -/* 8046C5B0 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */ -/* 8046C5B4 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ -/* 8046C5B8 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 8046C5BC EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C5C0 FC 00 00 1E */ fctiwz f0, f0 -/* 8046C5C4 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C5C8 80 81 00 34 */ lwz r4, 0x34(r1) -/* 8046C5CC 4B E5 B9 E9 */ bl setSnowPower__10Z2EnvSeMgrFSc -/* 8046C5D0 48 00 00 70 */ b lbl_8046C640 -lbl_8046C5D4: -/* 8046C5D4 38 00 00 08 */ li r0, 8 -/* 8046C5D8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C5DC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C5E0 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 8046C5E4 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 8046C5E8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C5EC FC 00 00 1E */ fctiwz f0, f0 -/* 8046C5F0 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C5F4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C5F8 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8046C5FC 48 00 00 44 */ b lbl_8046C640 -lbl_8046C600: -/* 8046C600 38 00 00 09 */ li r0, 9 -/* 8046C604 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046C608 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046C60C 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 8046C610 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 8046C614 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8046C618 FC 00 00 1E */ fctiwz f0, f0 -/* 8046C61C D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8046C620 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046C624 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8046C628 48 00 00 18 */ b lbl_8046C640 -lbl_8046C62C: -/* 8046C62C 88 1E 05 6C */ lbz r0, 0x56c(r30) -/* 8046C630 28 00 00 00 */ cmplwi r0, 0 -/* 8046C634 41 82 00 0C */ beq lbl_8046C640 -/* 8046C638 7F C3 F3 78 */ mr r3, r30 -/* 8046C63C 4B FF F7 7D */ bl wether_tag_efect_reset__FP13kytag00_class -lbl_8046C640: -/* 8046C640 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 8046C644 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 8046C648 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 8046C64C 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 8046C650 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8046C654 7C 08 03 A6 */ mtlr r0 -/* 8046C658 38 21 00 50 */ addi r1, r1, 0x50 -/* 8046C65C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_move__FP13kytag00_class.s b/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_move__FP13kytag00_class.s deleted file mode 100644 index b5e9830b9c..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_move__FP13kytag00_class.s +++ /dev/null @@ -1,234 +0,0 @@ -lbl_8046BA10: -/* 8046BA10 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8046BA14 7C 08 02 A6 */ mflr r0 -/* 8046BA18 90 01 00 54 */ stw r0, 0x54(r1) -/* 8046BA1C DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8046BA20 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 8046BA24 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 8046BA28 93 C1 00 38 */ stw r30, 0x38(r1) -/* 8046BA2C 7C 7E 1B 78 */ mr r30, r3 -/* 8046BA30 3C 60 80 47 */ lis r3, lit_3798@ha /* 0x8046C980@ha */ -/* 8046BA34 3B E3 C9 80 */ addi r31, r3, lit_3798@l /* 0x8046C980@l */ -/* 8046BA38 38 61 00 0C */ addi r3, r1, 0xc -/* 8046BA3C 7F C4 F3 78 */ mr r4, r30 -/* 8046BA40 4B FF FC D9 */ bl get_check_pos__FP13kytag00_class -/* 8046BA44 C0 81 00 0C */ lfs f4, 0xc(r1) -/* 8046BA48 D0 81 00 18 */ stfs f4, 0x18(r1) -/* 8046BA4C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8046BA50 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8046BA54 C0 61 00 14 */ lfs f3, 0x14(r1) -/* 8046BA58 D0 61 00 20 */ stfs f3, 0x20(r1) -/* 8046BA5C C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 8046BA60 80 1E 05 7C */ lwz r0, 0x57c(r30) -/* 8046BA64 C8 3F 00 30 */ lfd f1, 0x30(r31) -/* 8046BA68 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8046BA6C 90 01 00 34 */ stw r0, 0x34(r1) -/* 8046BA70 3C 00 43 30 */ lis r0, 0x4330 -/* 8046BA74 90 01 00 30 */ stw r0, 0x30(r1) -/* 8046BA78 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8046BA7C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8046BA80 EF E2 00 32 */ fmuls f31, f2, f0 -/* 8046BA84 D0 81 00 24 */ stfs f4, 0x24(r1) -/* 8046BA88 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 8046BA8C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8046BA90 D0 61 00 2C */ stfs f3, 0x2c(r1) -/* 8046BA94 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 8046BA98 38 81 00 24 */ addi r4, r1, 0x24 -/* 8046BA9C 4B ED B9 01 */ bl PSVECSquareDistance -/* 8046BAA0 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8046BAA4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046BAA8 40 81 00 58 */ ble lbl_8046BB00 -/* 8046BAAC FC 00 08 34 */ frsqrte f0, f1 -/* 8046BAB0 C8 9F 00 08 */ lfd f4, 8(r31) -/* 8046BAB4 FC 44 00 32 */ fmul f2, f4, f0 -/* 8046BAB8 C8 7F 00 10 */ lfd f3, 0x10(r31) -/* 8046BABC FC 00 00 32 */ fmul f0, f0, f0 -/* 8046BAC0 FC 01 00 32 */ fmul f0, f1, f0 -/* 8046BAC4 FC 03 00 28 */ fsub f0, f3, f0 -/* 8046BAC8 FC 02 00 32 */ fmul f0, f2, f0 -/* 8046BACC FC 44 00 32 */ fmul f2, f4, f0 -/* 8046BAD0 FC 00 00 32 */ fmul f0, f0, f0 -/* 8046BAD4 FC 01 00 32 */ fmul f0, f1, f0 -/* 8046BAD8 FC 03 00 28 */ fsub f0, f3, f0 -/* 8046BADC FC 02 00 32 */ fmul f0, f2, f0 -/* 8046BAE0 FC 44 00 32 */ fmul f2, f4, f0 -/* 8046BAE4 FC 00 00 32 */ fmul f0, f0, f0 -/* 8046BAE8 FC 01 00 32 */ fmul f0, f1, f0 -/* 8046BAEC FC 03 00 28 */ fsub f0, f3, f0 -/* 8046BAF0 FC 02 00 32 */ fmul f0, f2, f0 -/* 8046BAF4 FC 21 00 32 */ fmul f1, f1, f0 -/* 8046BAF8 FC 20 08 18 */ frsp f1, f1 -/* 8046BAFC 48 00 00 88 */ b lbl_8046BB84 -lbl_8046BB00: -/* 8046BB00 C8 1F 00 18 */ lfd f0, 0x18(r31) -/* 8046BB04 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046BB08 40 80 00 10 */ bge lbl_8046BB18 -/* 8046BB0C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8046BB10 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8046BB14 48 00 00 70 */ b lbl_8046BB84 -lbl_8046BB18: -/* 8046BB18 D0 21 00 08 */ stfs f1, 8(r1) -/* 8046BB1C 80 81 00 08 */ lwz r4, 8(r1) -/* 8046BB20 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8046BB24 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8046BB28 7C 03 00 00 */ cmpw r3, r0 -/* 8046BB2C 41 82 00 14 */ beq lbl_8046BB40 -/* 8046BB30 40 80 00 40 */ bge lbl_8046BB70 -/* 8046BB34 2C 03 00 00 */ cmpwi r3, 0 -/* 8046BB38 41 82 00 20 */ beq lbl_8046BB58 -/* 8046BB3C 48 00 00 34 */ b lbl_8046BB70 -lbl_8046BB40: -/* 8046BB40 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8046BB44 41 82 00 0C */ beq lbl_8046BB50 -/* 8046BB48 38 00 00 01 */ li r0, 1 -/* 8046BB4C 48 00 00 28 */ b lbl_8046BB74 -lbl_8046BB50: -/* 8046BB50 38 00 00 02 */ li r0, 2 -/* 8046BB54 48 00 00 20 */ b lbl_8046BB74 -lbl_8046BB58: -/* 8046BB58 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8046BB5C 41 82 00 0C */ beq lbl_8046BB68 -/* 8046BB60 38 00 00 05 */ li r0, 5 -/* 8046BB64 48 00 00 10 */ b lbl_8046BB74 -lbl_8046BB68: -/* 8046BB68 38 00 00 03 */ li r0, 3 -/* 8046BB6C 48 00 00 08 */ b lbl_8046BB74 -lbl_8046BB70: -/* 8046BB70 38 00 00 04 */ li r0, 4 -lbl_8046BB74: -/* 8046BB74 2C 00 00 01 */ cmpwi r0, 1 -/* 8046BB78 40 82 00 0C */ bne lbl_8046BB84 -/* 8046BB7C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8046BB80 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8046BB84: -/* 8046BB84 C0 BE 05 84 */ lfs f5, 0x584(r30) -/* 8046BB88 FC 01 28 40 */ fcmpo cr0, f1, f5 -/* 8046BB8C 40 80 01 A0 */ bge lbl_8046BD2C -/* 8046BB90 C0 81 00 1C */ lfs f4, 0x1c(r1) -/* 8046BB94 C0 7E 04 D4 */ lfs f3, 0x4d4(r30) -/* 8046BB98 EC 03 F8 28 */ fsubs f0, f3, f31 -/* 8046BB9C FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 8046BBA0 4C 41 13 82 */ cror 2, 1, 2 -/* 8046BBA4 40 82 01 88 */ bne lbl_8046BD2C -/* 8046BBA8 C0 5F 00 24 */ lfs f2, 0x24(r31) -/* 8046BBAC C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 8046BBB0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8046BBB4 EC C3 00 2A */ fadds f6, f3, f0 -/* 8046BBB8 EC 1F 30 2A */ fadds f0, f31, f6 -/* 8046BBBC FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 8046BBC0 40 80 01 6C */ bge lbl_8046BD2C -/* 8046BBC4 C0 FE 05 88 */ lfs f7, 0x588(r30) -/* 8046BBC8 C0 5F 00 00 */ lfs f2, 0(r31) -/* 8046BBCC FC 07 10 40 */ fcmpo cr0, f7, f2 -/* 8046BBD0 40 81 01 5C */ ble lbl_8046BD2C -/* 8046BBD4 C1 3F 00 28 */ lfs f9, 0x28(r31) -/* 8046BBD8 FD 00 48 90 */ fmr f8, f9 -/* 8046BBDC C0 1E 05 80 */ lfs f0, 0x580(r30) -/* 8046BBE0 ED 45 00 28 */ fsubs f10, f5, f0 -/* 8046BBE4 FC 02 50 00 */ fcmpu cr0, f2, f10 -/* 8046BBE8 41 82 00 18 */ beq lbl_8046BC00 -/* 8046BBEC EC 05 08 28 */ fsubs f0, f5, f1 -/* 8046BBF0 ED 20 50 24 */ fdivs f9, f0, f10 -/* 8046BBF4 FC 09 40 40 */ fcmpo cr0, f9, f8 -/* 8046BBF8 40 81 00 08 */ ble lbl_8046BC00 -/* 8046BBFC FD 20 40 90 */ fmr f9, f8 -lbl_8046BC00: -/* 8046BC00 FC 04 18 40 */ fcmpo cr0, f4, f3 -/* 8046BC04 4C 40 13 82 */ cror 2, 0, 2 -/* 8046BC08 40 82 00 30 */ bne lbl_8046BC38 -/* 8046BC0C C0 3F 00 00 */ lfs f1, 0(r31) -/* 8046BC10 FC 01 F8 00 */ fcmpu cr0, f1, f31 -/* 8046BC14 41 82 00 4C */ beq lbl_8046BC60 -/* 8046BC18 EC 03 20 28 */ fsubs f0, f3, f4 -/* 8046BC1C EC 40 F8 24 */ fdivs f2, f0, f31 -/* 8046BC20 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 8046BC24 40 80 00 08 */ bge lbl_8046BC2C -/* 8046BC28 FC 40 08 90 */ fmr f2, f1 -lbl_8046BC2C: -/* 8046BC2C C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 8046BC30 ED 00 10 28 */ fsubs f8, f0, f2 -/* 8046BC34 48 00 00 2C */ b lbl_8046BC60 -lbl_8046BC38: -/* 8046BC38 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8046BC3C FC 01 F8 00 */ fcmpu cr0, f1, f31 -/* 8046BC40 41 82 00 20 */ beq lbl_8046BC60 -/* 8046BC44 EC 04 30 28 */ fsubs f0, f4, f6 -/* 8046BC48 EC 40 F8 24 */ fdivs f2, f0, f31 -/* 8046BC4C FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 8046BC50 40 80 00 08 */ bge lbl_8046BC58 -/* 8046BC54 FC 40 08 90 */ fmr f2, f1 -lbl_8046BC58: -/* 8046BC58 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 8046BC5C ED 00 10 28 */ fsubs f8, f0, f2 -lbl_8046BC60: -/* 8046BC60 EC 08 01 F2 */ fmuls f0, f8, f7 -/* 8046BC64 ED 29 00 32 */ fmuls f9, f9, f0 -/* 8046BC68 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046BC6C 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046BC70 88 64 12 C6 */ lbz r3, 0x12c6(r4) -/* 8046BC74 88 04 12 C7 */ lbz r0, 0x12c7(r4) -/* 8046BC78 7C 03 00 40 */ cmplw r3, r0 -/* 8046BC7C 40 82 00 C4 */ bne lbl_8046BD40 -/* 8046BC80 38 60 00 01 */ li r3, 1 -/* 8046BC84 98 7E 05 6D */ stb r3, 0x56d(r30) -/* 8046BC88 88 BE 05 6F */ lbz r5, 0x56f(r30) -/* 8046BC8C 2C 05 00 00 */ cmpwi r5, 0 -/* 8046BC90 41 82 00 14 */ beq lbl_8046BCA4 -/* 8046BC94 41 80 00 8C */ blt lbl_8046BD20 -/* 8046BC98 2C 05 00 10 */ cmpwi r5, 0x10 -/* 8046BC9C 40 80 00 84 */ bge lbl_8046BD20 -/* 8046BCA0 48 00 00 20 */ b lbl_8046BCC0 -lbl_8046BCA4: -/* 8046BCA4 88 04 12 C8 */ lbz r0, 0x12c8(r4) -/* 8046BCA8 98 04 12 C4 */ stb r0, 0x12c4(r4) -/* 8046BCAC 38 00 00 00 */ li r0, 0 -/* 8046BCB0 98 04 12 C5 */ stb r0, 0x12c5(r4) -/* 8046BCB4 D1 24 11 E0 */ stfs f9, 0x11e0(r4) -/* 8046BCB8 98 64 12 CE */ stb r3, 0x12ce(r4) -/* 8046BCBC 48 00 00 84 */ b lbl_8046BD40 -lbl_8046BCC0: -/* 8046BCC0 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 8046BCC4 FC 09 00 40 */ fcmpo cr0, f9, f0 -/* 8046BCC8 40 81 00 2C */ ble lbl_8046BCF4 -/* 8046BCCC 88 04 12 C8 */ lbz r0, 0x12c8(r4) -/* 8046BCD0 98 04 12 C4 */ stb r0, 0x12c4(r4) -/* 8046BCD4 98 A4 12 C5 */ stb r5, 0x12c5(r4) -/* 8046BCD8 D1 24 11 E0 */ stfs f9, 0x11e0(r4) -/* 8046BCDC C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 8046BCE0 FC 09 00 40 */ fcmpo cr0, f9, f0 -/* 8046BCE4 4C 41 13 82 */ cror 2, 1, 2 -/* 8046BCE8 40 82 00 24 */ bne lbl_8046BD0C -/* 8046BCEC 98 A4 12 C4 */ stb r5, 0x12c4(r4) -/* 8046BCF0 48 00 00 1C */ b lbl_8046BD0C -lbl_8046BCF4: -/* 8046BCF4 98 A4 12 C4 */ stb r5, 0x12c4(r4) -/* 8046BCF8 88 04 12 C8 */ lbz r0, 0x12c8(r4) -/* 8046BCFC 98 04 12 C5 */ stb r0, 0x12c5(r4) -/* 8046BD00 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 8046BD04 EC 00 48 28 */ fsubs f0, f0, f9 -/* 8046BD08 D0 04 11 E0 */ stfs f0, 0x11e0(r4) -lbl_8046BD0C: -/* 8046BD0C 38 00 00 01 */ li r0, 1 -/* 8046BD10 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8046BD14 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8046BD18 98 03 12 CE */ stb r0, 0x12ce(r3) -/* 8046BD1C 48 00 00 24 */ b lbl_8046BD40 -lbl_8046BD20: -/* 8046BD20 38 00 00 00 */ li r0, 0 -/* 8046BD24 98 1E 05 6D */ stb r0, 0x56d(r30) -/* 8046BD28 48 00 00 18 */ b lbl_8046BD40 -lbl_8046BD2C: -/* 8046BD2C 88 1E 05 6D */ lbz r0, 0x56d(r30) -/* 8046BD30 28 00 00 00 */ cmplwi r0, 0 -/* 8046BD34 41 82 00 0C */ beq lbl_8046BD40 -/* 8046BD38 7F C3 F3 78 */ mr r3, r30 -/* 8046BD3C 4B FF FC A1 */ bl wether_tag_reset__FP13kytag00_class -lbl_8046BD40: -/* 8046BD40 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 8046BD44 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 8046BD48 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 8046BD4C 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 8046BD50 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8046BD54 7C 08 03 A6 */ mtlr r0 -/* 8046BD58 38 21 00 50 */ addi r1, r1, 0x50 -/* 8046BD5C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Create__FP10fopAc_ac_c.s deleted file mode 100644 index b310ea615b..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,109 +0,0 @@ -lbl_808557EC: -/* 808557EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 808557F0 7C 08 02 A6 */ mflr r0 -/* 808557F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 808557F8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 808557FC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80855800 7C 7E 1B 78 */ mr r30, r3 -/* 80855804 3C 80 80 85 */ lis r4, lit_3796@ha /* 0x8085598C@ha */ -/* 80855808 3B E4 59 8C */ addi r31, r4, lit_3796@l /* 0x8085598C@l */ -/* 8085580C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80855810 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80855814 40 82 00 1C */ bne lbl_80855830 -/* 80855818 28 1E 00 00 */ cmplwi r30, 0 -/* 8085581C 41 82 00 08 */ beq lbl_80855824 -/* 80855820 4B 7C 33 45 */ bl __ct__10fopAc_ac_cFv -lbl_80855824: -/* 80855824 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80855828 60 00 00 08 */ ori r0, r0, 8 -/* 8085582C 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80855830: -/* 80855830 88 1E 04 99 */ lbz r0, 0x499(r30) -/* 80855834 2C 00 00 02 */ cmpwi r0, 2 -/* 80855838 40 82 00 80 */ bne lbl_808558B8 -/* 8085583C C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80855840 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80855844 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80855848 D0 1E 05 88 */ stfs f0, 0x588(r30) -/* 8085584C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80855850 98 1E 05 9D */ stb r0, 0x59d(r30) -/* 80855854 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80855858 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8085585C 98 1E 05 9F */ stb r0, 0x59f(r30) -/* 80855860 88 9E 05 9F */ lbz r4, 0x59f(r30) -/* 80855864 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80855868 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085586C A8 03 0D B8 */ lha r0, 0xdb8(r3) -/* 80855870 7C 04 00 00 */ cmpw r4, r0 -/* 80855874 40 82 00 F4 */ bne lbl_80855968 -/* 80855878 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 8085587C 7C 04 07 74 */ extsb r4, r0 -/* 80855880 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80855884 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80855888 7C 00 07 74 */ extsb r0, r0 -/* 8085588C 7C 04 00 00 */ cmpw r4, r0 -/* 80855890 40 82 00 D8 */ bne lbl_80855968 -/* 80855894 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80855898 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085589C 88 03 12 C2 */ lbz r0, 0x12c2(r3) -/* 808558A0 98 1E 05 9E */ stb r0, 0x59e(r30) -/* 808558A4 88 1E 05 9D */ lbz r0, 0x59d(r30) -/* 808558A8 98 03 12 C8 */ stb r0, 0x12c8(r3) -/* 808558AC 98 03 12 C2 */ stb r0, 0x12c2(r3) -/* 808558B0 98 03 12 C3 */ stb r0, 0x12c3(r3) -/* 808558B4 48 00 00 B4 */ b lbl_80855968 -lbl_808558B8: -/* 808558B8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 808558BC 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 808558C0 C8 3F 00 40 */ lfd f1, 0x40(r31) -/* 808558C4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 808558C8 90 01 00 0C */ stw r0, 0xc(r1) -/* 808558CC 3C 00 43 30 */ lis r0, 0x4330 -/* 808558D0 90 01 00 08 */ stw r0, 8(r1) -/* 808558D4 C8 01 00 08 */ lfd f0, 8(r1) -/* 808558D8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 808558DC D0 1E 05 90 */ stfs f0, 0x590(r30) -/* 808558E0 A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 808558E4 98 1E 05 98 */ stb r0, 0x598(r30) -/* 808558E8 A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 808558EC 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 808558F0 98 1E 05 99 */ stb r0, 0x599(r30) -/* 808558F4 C0 1F 00 00 */ lfs f0, 0(r31) -/* 808558F8 D0 1E 05 94 */ stfs f0, 0x594(r30) -/* 808558FC 88 1E 04 99 */ lbz r0, 0x499(r30) -/* 80855900 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80855904 40 82 00 64 */ bne lbl_80855968 -/* 80855908 C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 8085590C C0 1E 05 90 */ lfs f0, 0x590(r30) -/* 80855910 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80855914 40 82 00 0C */ bne lbl_80855920 -/* 80855918 C0 1F 00 58 */ lfs f0, 0x58(r31) -/* 8085591C D0 1E 05 90 */ stfs f0, 0x590(r30) -lbl_80855920: -/* 80855920 C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 80855924 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80855928 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8085592C D0 1E 05 88 */ stfs f0, 0x588(r30) -/* 80855930 C0 3E 05 88 */ lfs f1, 0x588(r30) -/* 80855934 C0 1E 05 90 */ lfs f0, 0x590(r30) -/* 80855938 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8085593C EC 01 00 2A */ fadds f0, f1, f0 -/* 80855940 D0 1E 05 8C */ stfs f0, 0x58c(r30) -/* 80855944 C0 1E 05 88 */ lfs f0, 0x588(r30) -/* 80855948 EC 22 00 2A */ fadds f1, f2, f0 -/* 8085594C C0 1E 05 8C */ lfs f0, 0x58c(r30) -/* 80855950 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80855954 4C 41 13 82 */ cror 2, 1, 2 -/* 80855958 40 82 00 08 */ bne lbl_80855960 -/* 8085595C D0 3E 05 8C */ stfs f1, 0x58c(r30) -lbl_80855960: -/* 80855960 38 00 00 00 */ li r0, 0 -/* 80855964 98 1E 05 9C */ stb r0, 0x59c(r30) -lbl_80855968: -/* 80855968 38 60 00 04 */ li r3, 4 -/* 8085596C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80855970 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80855974 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80855978 7C 08 03 A6 */ mtlr r0 -/* 8085597C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80855980 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Execute__FP13kytag01_class.s b/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Execute__FP13kytag01_class.s deleted file mode 100644 index 07762b330e..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Execute__FP13kytag01_class.s +++ /dev/null @@ -1,110 +0,0 @@ -lbl_80855640: -/* 80855640 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80855644 7C 08 02 A6 */ mflr r0 -/* 80855648 90 01 00 14 */ stw r0, 0x14(r1) -/* 8085564C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80855650 93 C1 00 08 */ stw r30, 8(r1) -/* 80855654 7C 7E 1B 78 */ mr r30, r3 -/* 80855658 3C 60 80 85 */ lis r3, lit_3796@ha /* 0x8085598C@ha */ -/* 8085565C 3B E3 59 8C */ addi r31, r3, lit_3796@l /* 0x8085598C@l */ -/* 80855660 88 1E 04 99 */ lbz r0, 0x499(r30) -/* 80855664 2C 00 00 02 */ cmpwi r0, 2 -/* 80855668 40 82 00 30 */ bne lbl_80855698 -/* 8085566C 88 9E 05 9F */ lbz r4, 0x59f(r30) -/* 80855670 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80855674 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80855678 A8 03 0D B8 */ lha r0, 0xdb8(r3) -/* 8085567C 7C 04 00 00 */ cmpw r4, r0 -/* 80855680 40 82 01 40 */ bne lbl_808557C0 -/* 80855684 38 00 00 FF */ li r0, 0xff -/* 80855688 98 1E 05 9F */ stb r0, 0x59f(r30) -/* 8085568C 88 7E 05 9E */ lbz r3, 0x59e(r30) -/* 80855690 4B 95 31 55 */ bl dKy_change_colpat__FUc -/* 80855694 48 00 01 2C */ b lbl_808557C0 -lbl_80855698: -/* 80855698 2C 00 00 00 */ cmpwi r0, 0 -/* 8085569C 40 82 01 24 */ bne lbl_808557C0 -/* 808556A0 88 BE 04 BA */ lbz r5, 0x4ba(r30) -/* 808556A4 7C A5 07 74 */ extsb r5, r5 -/* 808556A8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 808556AC 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 808556B0 7C 00 07 74 */ extsb r0, r0 -/* 808556B4 7C 05 00 00 */ cmpw r5, r0 -/* 808556B8 40 82 01 08 */ bne lbl_808557C0 -/* 808556BC 88 9E 05 98 */ lbz r4, 0x598(r30) -/* 808556C0 28 04 00 FF */ cmplwi r4, 0xff -/* 808556C4 41 82 00 D0 */ beq lbl_80855794 -/* 808556C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 808556CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 808556D0 4B 7D FC 91 */ bl isSwitch__10dSv_info_cCFii -/* 808556D4 2C 03 00 00 */ cmpwi r3, 0 -/* 808556D8 41 82 00 A4 */ beq lbl_8085577C -/* 808556DC 88 9E 05 99 */ lbz r4, 0x599(r30) -/* 808556E0 28 04 00 FF */ cmplwi r4, 0xff -/* 808556E4 41 82 00 7C */ beq lbl_80855760 -/* 808556E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 808556EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 808556F0 88 BE 04 BA */ lbz r5, 0x4ba(r30) -/* 808556F4 7C A5 07 74 */ extsb r5, r5 -/* 808556F8 4B 7D FC 69 */ bl isSwitch__10dSv_info_cCFii -/* 808556FC 2C 03 00 00 */ cmpwi r3, 0 -/* 80855700 41 82 00 60 */ beq lbl_80855760 -/* 80855704 38 7E 05 94 */ addi r3, r30, 0x594 -/* 80855708 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8085570C C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 80855710 C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80855714 C0 9F 00 50 */ lfs f4, 0x50(r31) -/* 80855718 4B A1 A2 65 */ bl cLib_addCalc__FPfffff -/* 8085571C C0 3E 05 94 */ lfs f1, 0x594(r30) -/* 80855720 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80855724 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80855728 4C 40 13 82 */ cror 2, 0, 2 -/* 8085572C 40 82 00 68 */ bne lbl_80855794 -/* 80855730 38 80 00 00 */ li r4, 0 -/* 80855734 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80855738 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085573C 98 83 12 C4 */ stb r4, 0x12c4(r3) -/* 80855740 98 83 12 C5 */ stb r4, 0x12c5(r3) -/* 80855744 D0 03 11 E0 */ stfs f0, 0x11e0(r3) -/* 80855748 38 00 00 01 */ li r0, 1 -/* 8085574C 98 03 12 CE */ stb r0, 0x12ce(r3) -/* 80855750 90 83 0E B8 */ stw r4, 0xeb8(r3) -/* 80855754 7F C3 F3 78 */ mr r3, r30 -/* 80855758 4B 7C 45 25 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 8085575C 48 00 00 38 */ b lbl_80855794 -lbl_80855760: -/* 80855760 38 7E 05 94 */ addi r3, r30, 0x594 -/* 80855764 C0 3F 00 24 */ lfs f1, 0x24(r31) -/* 80855768 C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 8085576C C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80855770 C0 9F 00 50 */ lfs f4, 0x50(r31) -/* 80855774 4B A1 A2 09 */ bl cLib_addCalc__FPfffff -/* 80855778 48 00 00 1C */ b lbl_80855794 -lbl_8085577C: -/* 8085577C 38 7E 05 94 */ addi r3, r30, 0x594 -/* 80855780 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80855784 C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 80855788 C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 8085578C C0 9F 00 50 */ lfs f4, 0x50(r31) -/* 80855790 4B A1 A1 ED */ bl cLib_addCalc__FPfffff -lbl_80855794: -/* 80855794 88 1E 05 9C */ lbz r0, 0x59c(r30) -/* 80855798 28 00 00 02 */ cmplwi r0, 2 -/* 8085579C 40 82 00 0C */ bne lbl_808557A8 -/* 808557A0 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 808557A4 D0 1E 05 94 */ stfs f0, 0x594(r30) -lbl_808557A8: -/* 808557A8 C0 3E 05 94 */ lfs f1, 0x594(r30) -/* 808557AC C0 1F 00 00 */ lfs f0, 0(r31) -/* 808557B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808557B4 40 81 00 0C */ ble lbl_808557C0 -/* 808557B8 7F C3 F3 78 */ mr r3, r30 -/* 808557BC 4B FF FB 65 */ bl mist_tag_move__FP13kytag01_class -lbl_808557C0: -/* 808557C0 38 60 00 01 */ li r3, 1 -/* 808557C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 808557C8 83 C1 00 08 */ lwz r30, 8(r1) -/* 808557CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808557D0 7C 08 03 A6 */ mtlr r0 -/* 808557D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 808557D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/get_check_pos__FP13kytag01_class.s b/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/get_check_pos__FP13kytag01_class.s deleted file mode 100644 index 975572d871..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/get_check_pos__FP13kytag01_class.s +++ /dev/null @@ -1,201 +0,0 @@ -lbl_80855058: -/* 80855058 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8085505C 7C 08 02 A6 */ mflr r0 -/* 80855060 90 01 00 54 */ stw r0, 0x54(r1) -/* 80855064 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80855068 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 8085506C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80855070 4B B0 D1 65 */ bl _savegpr_27 -/* 80855074 7C 7C 1B 78 */ mr r28, r3 -/* 80855078 7C 9D 23 78 */ mr r29, r4 -/* 8085507C 3C 60 80 85 */ lis r3, lit_3796@ha /* 0x8085598C@ha */ -/* 80855080 3B 63 59 8C */ addi r27, r3, lit_3796@l /* 0x8085598C@l */ -/* 80855084 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80855088 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085508C 83 C3 5D 74 */ lwz r30, 0x5d74(r3) -/* 80855090 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 80855094 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80855098 38 9E 00 D8 */ addi r4, r30, 0xd8 -/* 8085509C 4B AF 23 01 */ bl PSVECSquareDistance -/* 808550A0 C0 1B 00 00 */ lfs f0, 0(r27) -/* 808550A4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808550A8 40 81 00 58 */ ble lbl_80855100 -/* 808550AC FC 00 08 34 */ frsqrte f0, f1 -/* 808550B0 C8 9B 00 08 */ lfd f4, 8(r27) -/* 808550B4 FC 44 00 32 */ fmul f2, f4, f0 -/* 808550B8 C8 7B 00 10 */ lfd f3, 0x10(r27) -/* 808550BC FC 00 00 32 */ fmul f0, f0, f0 -/* 808550C0 FC 01 00 32 */ fmul f0, f1, f0 -/* 808550C4 FC 03 00 28 */ fsub f0, f3, f0 -/* 808550C8 FC 02 00 32 */ fmul f0, f2, f0 -/* 808550CC FC 44 00 32 */ fmul f2, f4, f0 -/* 808550D0 FC 00 00 32 */ fmul f0, f0, f0 -/* 808550D4 FC 01 00 32 */ fmul f0, f1, f0 -/* 808550D8 FC 03 00 28 */ fsub f0, f3, f0 -/* 808550DC FC 02 00 32 */ fmul f0, f2, f0 -/* 808550E0 FC 44 00 32 */ fmul f2, f4, f0 -/* 808550E4 FC 00 00 32 */ fmul f0, f0, f0 -/* 808550E8 FC 01 00 32 */ fmul f0, f1, f0 -/* 808550EC FC 03 00 28 */ fsub f0, f3, f0 -/* 808550F0 FC 02 00 32 */ fmul f0, f2, f0 -/* 808550F4 FF E1 00 32 */ fmul f31, f1, f0 -/* 808550F8 FF E0 F8 18 */ frsp f31, f31 -/* 808550FC 48 00 00 90 */ b lbl_8085518C -lbl_80855100: -/* 80855100 C8 1B 00 18 */ lfd f0, 0x18(r27) -/* 80855104 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80855108 40 80 00 10 */ bge lbl_80855118 -/* 8085510C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80855110 C3 E3 0A E0 */ lfs f31, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80855114 48 00 00 78 */ b lbl_8085518C -lbl_80855118: -/* 80855118 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 8085511C 80 81 00 0C */ lwz r4, 0xc(r1) -/* 80855120 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80855124 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80855128 7C 03 00 00 */ cmpw r3, r0 -/* 8085512C 41 82 00 14 */ beq lbl_80855140 -/* 80855130 40 80 00 40 */ bge lbl_80855170 -/* 80855134 2C 03 00 00 */ cmpwi r3, 0 -/* 80855138 41 82 00 20 */ beq lbl_80855158 -/* 8085513C 48 00 00 34 */ b lbl_80855170 -lbl_80855140: -/* 80855140 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80855144 41 82 00 0C */ beq lbl_80855150 -/* 80855148 38 00 00 01 */ li r0, 1 -/* 8085514C 48 00 00 28 */ b lbl_80855174 -lbl_80855150: -/* 80855150 38 00 00 02 */ li r0, 2 -/* 80855154 48 00 00 20 */ b lbl_80855174 -lbl_80855158: -/* 80855158 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8085515C 41 82 00 0C */ beq lbl_80855168 -/* 80855160 38 00 00 05 */ li r0, 5 -/* 80855164 48 00 00 10 */ b lbl_80855174 -lbl_80855168: -/* 80855168 38 00 00 03 */ li r0, 3 -/* 8085516C 48 00 00 08 */ b lbl_80855174 -lbl_80855170: -/* 80855170 38 00 00 04 */ li r0, 4 -lbl_80855174: -/* 80855174 2C 00 00 01 */ cmpwi r0, 1 -/* 80855178 40 82 00 10 */ bne lbl_80855188 -/* 8085517C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80855180 C3 E3 0A E0 */ lfs f31, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80855184 48 00 00 08 */ b lbl_8085518C -lbl_80855188: -/* 80855188 FF E0 08 90 */ fmr f31, f1 -lbl_8085518C: -/* 8085518C 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80855190 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80855194 4B AF 22 09 */ bl PSVECSquareDistance -/* 80855198 C0 1B 00 00 */ lfs f0, 0(r27) -/* 8085519C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808551A0 40 81 00 58 */ ble lbl_808551F8 -/* 808551A4 FC 00 08 34 */ frsqrte f0, f1 -/* 808551A8 C8 9B 00 08 */ lfd f4, 8(r27) -/* 808551AC FC 44 00 32 */ fmul f2, f4, f0 -/* 808551B0 C8 7B 00 10 */ lfd f3, 0x10(r27) -/* 808551B4 FC 00 00 32 */ fmul f0, f0, f0 -/* 808551B8 FC 01 00 32 */ fmul f0, f1, f0 -/* 808551BC FC 03 00 28 */ fsub f0, f3, f0 -/* 808551C0 FC 02 00 32 */ fmul f0, f2, f0 -/* 808551C4 FC 44 00 32 */ fmul f2, f4, f0 -/* 808551C8 FC 00 00 32 */ fmul f0, f0, f0 -/* 808551CC FC 01 00 32 */ fmul f0, f1, f0 -/* 808551D0 FC 03 00 28 */ fsub f0, f3, f0 -/* 808551D4 FC 02 00 32 */ fmul f0, f2, f0 -/* 808551D8 FC 44 00 32 */ fmul f2, f4, f0 -/* 808551DC FC 00 00 32 */ fmul f0, f0, f0 -/* 808551E0 FC 01 00 32 */ fmul f0, f1, f0 -/* 808551E4 FC 03 00 28 */ fsub f0, f3, f0 -/* 808551E8 FC 02 00 32 */ fmul f0, f2, f0 -/* 808551EC FC 21 00 32 */ fmul f1, f1, f0 -/* 808551F0 FC 20 08 18 */ frsp f1, f1 -/* 808551F4 48 00 00 88 */ b lbl_8085527C -lbl_808551F8: -/* 808551F8 C8 1B 00 18 */ lfd f0, 0x18(r27) -/* 808551FC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80855200 40 80 00 10 */ bge lbl_80855210 -/* 80855204 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80855208 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8085520C 48 00 00 70 */ b lbl_8085527C -lbl_80855210: -/* 80855210 D0 21 00 08 */ stfs f1, 8(r1) -/* 80855214 80 81 00 08 */ lwz r4, 8(r1) -/* 80855218 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8085521C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80855220 7C 03 00 00 */ cmpw r3, r0 -/* 80855224 41 82 00 14 */ beq lbl_80855238 -/* 80855228 40 80 00 40 */ bge lbl_80855268 -/* 8085522C 2C 03 00 00 */ cmpwi r3, 0 -/* 80855230 41 82 00 20 */ beq lbl_80855250 -/* 80855234 48 00 00 34 */ b lbl_80855268 -lbl_80855238: -/* 80855238 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8085523C 41 82 00 0C */ beq lbl_80855248 -/* 80855240 38 00 00 01 */ li r0, 1 -/* 80855244 48 00 00 28 */ b lbl_8085526C -lbl_80855248: -/* 80855248 38 00 00 02 */ li r0, 2 -/* 8085524C 48 00 00 20 */ b lbl_8085526C -lbl_80855250: -/* 80855250 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80855254 41 82 00 0C */ beq lbl_80855260 -/* 80855258 38 00 00 05 */ li r0, 5 -/* 8085525C 48 00 00 10 */ b lbl_8085526C -lbl_80855260: -/* 80855260 38 00 00 03 */ li r0, 3 -/* 80855264 48 00 00 08 */ b lbl_8085526C -lbl_80855268: -/* 80855268 38 00 00 04 */ li r0, 4 -lbl_8085526C: -/* 8085526C 2C 00 00 01 */ cmpwi r0, 1 -/* 80855270 40 82 00 0C */ bne lbl_8085527C -/* 80855274 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80855278 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8085527C: -/* 8085527C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80855280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80855284 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 80855288 28 00 00 00 */ cmplwi r0, 0 -/* 8085528C 41 82 00 44 */ beq lbl_808552D0 -/* 80855290 FC 1F 08 40 */ fcmpo cr0, f31, f1 -/* 80855294 40 80 00 20 */ bge lbl_808552B4 -/* 80855298 C0 1E 00 D8 */ lfs f0, 0xd8(r30) -/* 8085529C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 808552A0 C0 1E 00 DC */ lfs f0, 0xdc(r30) -/* 808552A4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 808552A8 C0 1E 00 E0 */ lfs f0, 0xe0(r30) -/* 808552AC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 808552B0 48 00 00 38 */ b lbl_808552E8 -lbl_808552B4: -/* 808552B4 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 808552B8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 808552BC C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 808552C0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 808552C4 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 808552C8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 808552CC 48 00 00 1C */ b lbl_808552E8 -lbl_808552D0: -/* 808552D0 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 808552D4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 808552D8 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 808552DC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 808552E0 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 808552E4 D0 01 00 18 */ stfs f0, 0x18(r1) -lbl_808552E8: -/* 808552E8 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 808552EC D0 1C 00 00 */ stfs f0, 0(r28) -/* 808552F0 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 808552F4 D0 1C 00 04 */ stfs f0, 4(r28) -/* 808552F8 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 808552FC D0 1C 00 08 */ stfs f0, 8(r28) -/* 80855300 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80855304 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80855308 39 61 00 40 */ addi r11, r1, 0x40 -/* 8085530C 4B B0 CF 15 */ bl _restgpr_27 -/* 80855310 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80855314 7C 08 03 A6 */ mtlr r0 -/* 80855318 38 21 00 50 */ addi r1, r1, 0x50 -/* 8085531C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/mist_tag_move__FP13kytag01_class.s b/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/mist_tag_move__FP13kytag01_class.s deleted file mode 100644 index 6979225db1..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/mist_tag_move__FP13kytag01_class.s +++ /dev/null @@ -1,214 +0,0 @@ -lbl_80855320: -/* 80855320 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80855324 7C 08 02 A6 */ mflr r0 -/* 80855328 90 01 00 94 */ stw r0, 0x94(r1) -/* 8085532C DB E1 00 80 */ stfd f31, 0x80(r1) -/* 80855330 F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* qr0 */ -/* 80855334 39 61 00 80 */ addi r11, r1, 0x80 -/* 80855338 4B B0 CE A5 */ bl _savegpr_29 -/* 8085533C 7C 7E 1B 78 */ mr r30, r3 -/* 80855340 3C 60 80 85 */ lis r3, lit_3796@ha /* 0x8085598C@ha */ -/* 80855344 3B E3 59 8C */ addi r31, r3, lit_3796@l /* 0x8085598C@l */ -/* 80855348 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085534C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80855350 83 A3 5D 74 */ lwz r29, 0x5d74(r3) -/* 80855354 38 61 00 0C */ addi r3, r1, 0xc -/* 80855358 7F C4 F3 78 */ mr r4, r30 -/* 8085535C 4B FF FC FD */ bl get_check_pos__FP13kytag01_class -/* 80855360 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80855364 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80855368 C0 21 00 10 */ lfs f1, 0x10(r1) -/* 8085536C D0 21 00 40 */ stfs f1, 0x40(r1) -/* 80855370 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80855374 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80855378 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 8085537C D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80855380 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80855384 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80855388 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 8085538C D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80855390 D0 21 00 4C */ stfs f1, 0x4c(r1) -/* 80855394 38 61 00 48 */ addi r3, r1, 0x48 -/* 80855398 38 81 00 3C */ addi r4, r1, 0x3c -/* 8085539C 4B AF 20 01 */ bl PSVECSquareDistance -/* 808553A0 C0 1F 00 00 */ lfs f0, 0(r31) -/* 808553A4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808553A8 40 81 00 58 */ ble lbl_80855400 -/* 808553AC FC 00 08 34 */ frsqrte f0, f1 -/* 808553B0 C8 9F 00 08 */ lfd f4, 8(r31) -/* 808553B4 FC 44 00 32 */ fmul f2, f4, f0 -/* 808553B8 C8 7F 00 10 */ lfd f3, 0x10(r31) -/* 808553BC FC 00 00 32 */ fmul f0, f0, f0 -/* 808553C0 FC 01 00 32 */ fmul f0, f1, f0 -/* 808553C4 FC 03 00 28 */ fsub f0, f3, f0 -/* 808553C8 FC 02 00 32 */ fmul f0, f2, f0 -/* 808553CC FC 44 00 32 */ fmul f2, f4, f0 -/* 808553D0 FC 00 00 32 */ fmul f0, f0, f0 -/* 808553D4 FC 01 00 32 */ fmul f0, f1, f0 -/* 808553D8 FC 03 00 28 */ fsub f0, f3, f0 -/* 808553DC FC 02 00 32 */ fmul f0, f2, f0 -/* 808553E0 FC 44 00 32 */ fmul f2, f4, f0 -/* 808553E4 FC 00 00 32 */ fmul f0, f0, f0 -/* 808553E8 FC 01 00 32 */ fmul f0, f1, f0 -/* 808553EC FC 03 00 28 */ fsub f0, f3, f0 -/* 808553F0 FC 02 00 32 */ fmul f0, f2, f0 -/* 808553F4 FC 21 00 32 */ fmul f1, f1, f0 -/* 808553F8 FC 20 08 18 */ frsp f1, f1 -/* 808553FC 48 00 00 88 */ b lbl_80855484 -lbl_80855400: -/* 80855400 C8 1F 00 18 */ lfd f0, 0x18(r31) -/* 80855404 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80855408 40 80 00 10 */ bge lbl_80855418 -/* 8085540C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80855410 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80855414 48 00 00 70 */ b lbl_80855484 -lbl_80855418: -/* 80855418 D0 21 00 08 */ stfs f1, 8(r1) -/* 8085541C 80 81 00 08 */ lwz r4, 8(r1) -/* 80855420 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80855424 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80855428 7C 03 00 00 */ cmpw r3, r0 -/* 8085542C 41 82 00 14 */ beq lbl_80855440 -/* 80855430 40 80 00 40 */ bge lbl_80855470 -/* 80855434 2C 03 00 00 */ cmpwi r3, 0 -/* 80855438 41 82 00 20 */ beq lbl_80855458 -/* 8085543C 48 00 00 34 */ b lbl_80855470 -lbl_80855440: -/* 80855440 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80855444 41 82 00 0C */ beq lbl_80855450 -/* 80855448 38 00 00 01 */ li r0, 1 -/* 8085544C 48 00 00 28 */ b lbl_80855474 -lbl_80855450: -/* 80855450 38 00 00 02 */ li r0, 2 -/* 80855454 48 00 00 20 */ b lbl_80855474 -lbl_80855458: -/* 80855458 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8085545C 41 82 00 0C */ beq lbl_80855468 -/* 80855460 38 00 00 05 */ li r0, 5 -/* 80855464 48 00 00 10 */ b lbl_80855474 -lbl_80855468: -/* 80855468 38 00 00 03 */ li r0, 3 -/* 8085546C 48 00 00 08 */ b lbl_80855474 -lbl_80855470: -/* 80855470 38 00 00 04 */ li r0, 4 -lbl_80855474: -/* 80855474 2C 00 00 01 */ cmpwi r0, 1 -/* 80855478 40 82 00 0C */ bne lbl_80855484 -/* 8085547C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80855480 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80855484: -/* 80855484 C0 1E 05 88 */ lfs f0, 0x588(r30) -/* 80855488 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085548C 40 81 00 48 */ ble lbl_808554D4 -/* 80855490 C0 5E 05 8C */ lfs f2, 0x58c(r30) -/* 80855494 FC 01 10 40 */ fcmpo cr0, f1, f2 -/* 80855498 40 81 00 24 */ ble lbl_808554BC -/* 8085549C C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 808554A0 EC 00 10 2A */ fadds f0, f0, f2 -/* 808554A4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808554A8 40 81 00 0C */ ble lbl_808554B4 -/* 808554AC C3 FF 00 24 */ lfs f31, 0x24(r31) -/* 808554B0 48 00 00 30 */ b lbl_808554E0 -lbl_808554B4: -/* 808554B4 C3 FF 00 24 */ lfs f31, 0x24(r31) -/* 808554B8 48 00 00 28 */ b lbl_808554E0 -lbl_808554BC: -/* 808554BC EC 21 00 28 */ fsubs f1, f1, f0 -/* 808554C0 EC 02 00 28 */ fsubs f0, f2, f0 -/* 808554C4 EF E1 00 24 */ fdivs f31, f1, f0 -/* 808554C8 38 00 00 01 */ li r0, 1 -/* 808554CC 98 1E 05 9C */ stb r0, 0x59c(r30) -/* 808554D0 48 00 00 10 */ b lbl_808554E0 -lbl_808554D4: -/* 808554D4 C3 FF 00 00 */ lfs f31, 0(r31) -/* 808554D8 38 00 00 01 */ li r0, 1 -/* 808554DC 98 1E 05 9C */ stb r0, 0x59c(r30) -lbl_808554E0: -/* 808554E0 C0 1E 05 94 */ lfs f0, 0x594(r30) -/* 808554E4 EF FF 00 32 */ fmuls f31, f31, f0 -/* 808554E8 C0 1D 00 E4 */ lfs f0, 0xe4(r29) -/* 808554EC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 808554F0 C0 1D 00 E8 */ lfs f0, 0xe8(r29) -/* 808554F4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 808554F8 C0 1D 00 EC */ lfs f0, 0xec(r29) -/* 808554FC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80855500 C0 1D 00 DC */ lfs f0, 0xdc(r29) -/* 80855504 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80855508 38 7D 00 D8 */ addi r3, r29, 0xd8 -/* 8085550C 38 81 00 18 */ addi r4, r1, 0x18 -/* 80855510 38 A1 00 30 */ addi r5, r1, 0x30 -/* 80855514 4B 80 62 4D */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz -/* 80855518 C0 1D 00 DC */ lfs f0, 0xdc(r29) -/* 8085551C D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80855520 38 7D 00 D8 */ addi r3, r29, 0xd8 -/* 80855524 38 81 00 48 */ addi r4, r1, 0x48 -/* 80855528 38 A1 00 24 */ addi r5, r1, 0x24 -/* 8085552C 4B 80 62 35 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz -/* 80855530 C0 21 00 30 */ lfs f1, 0x30(r1) -/* 80855534 C0 41 00 38 */ lfs f2, 0x38(r1) -/* 80855538 4B A1 21 3D */ bl cM_atan2s__Fff -/* 8085553C 7C 7D 1B 78 */ mr r29, r3 -/* 80855540 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 80855544 C0 41 00 2C */ lfs f2, 0x2c(r1) -/* 80855548 4B A1 21 2D */ bl cM_atan2s__Fff -/* 8085554C 7C 03 E8 50 */ subf r0, r3, r29 -/* 80855550 7C 03 07 34 */ extsh r3, r0 -/* 80855554 4B B0 FB 7D */ bl abs -/* 80855558 7C 60 07 34 */ extsh r0, r3 -/* 8085555C C8 3F 00 40 */ lfd f1, 0x40(r31) -/* 80855560 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80855564 90 01 00 5C */ stw r0, 0x5c(r1) -/* 80855568 3C 00 43 30 */ lis r0, 0x4330 -/* 8085556C 90 01 00 58 */ stw r0, 0x58(r1) -/* 80855570 C8 01 00 58 */ lfd f0, 0x58(r1) -/* 80855574 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80855578 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 8085557C EC 01 00 24 */ fdivs f0, f1, f0 -/* 80855580 C0 3F 00 24 */ lfs f1, 0x24(r31) -/* 80855584 EC 41 00 28 */ fsubs f2, f1, f0 -/* 80855588 EC 02 00 B2 */ fmuls f0, f2, f2 -/* 8085558C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80855590 EC 42 00 32 */ fmuls f2, f2, f0 -/* 80855594 EC 61 10 28 */ fsubs f3, f1, f2 -/* 80855598 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 8085559C EC 63 00 2A */ fadds f3, f3, f0 -/* 808555A0 FC 03 08 40 */ fcmpo cr0, f3, f1 -/* 808555A4 40 81 00 08 */ ble lbl_808555AC -/* 808555A8 FC 60 08 90 */ fmr f3, f1 -lbl_808555AC: -/* 808555AC C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 808555B0 C0 5F 00 34 */ lfs f2, 0x34(r31) -/* 808555B4 EC 7F 00 F2 */ fmuls f3, f31, f3 -/* 808555B8 4B 95 2B 19 */ bl dKy_fog_startendz_set__Ffff -/* 808555BC C0 3E 05 94 */ lfs f1, 0x594(r30) -/* 808555C0 38 00 00 00 */ li r0, 0 -/* 808555C4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 808555C8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 808555CC 98 03 12 C4 */ stb r0, 0x12c4(r3) -/* 808555D0 38 00 00 01 */ li r0, 1 -/* 808555D4 98 03 12 C5 */ stb r0, 0x12c5(r3) -/* 808555D8 D0 23 11 E0 */ stfs f1, 0x11e0(r3) -/* 808555DC 98 03 12 CE */ stb r0, 0x12ce(r3) -/* 808555E0 38 00 00 03 */ li r0, 3 -/* 808555E4 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 808555E8 C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 808555EC EC 00 00 72 */ fmuls f0, f0, f1 -/* 808555F0 FC 00 00 1E */ fctiwz f0, f0 -/* 808555F4 D8 01 00 60 */ stfd f0, 0x60(r1) -/* 808555F8 80 01 00 64 */ lwz r0, 0x64(r1) -/* 808555FC 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 80855600 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 80855604 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80855608 40 81 00 10 */ ble lbl_80855618 -/* 8085560C 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */ -/* 80855610 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ -/* 80855614 4B A7 3D ED */ bl startFogSe__10Z2EnvSeMgrFv -lbl_80855618: -/* 80855618 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* qr0 */ -/* 8085561C CB E1 00 80 */ lfd f31, 0x80(r1) -/* 80855620 39 61 00 80 */ addi r11, r1, 0x80 -/* 80855624 4B B0 CC 05 */ bl _restgpr_29 -/* 80855628 80 01 00 94 */ lwz r0, 0x94(r1) -/* 8085562C 7C 08 03 A6 */ mtlr r0 -/* 80855630 38 21 00 90 */ addi r1, r1, 0x90 -/* 80855634 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index ab69d0faec..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8046D9C8: -/* 8046D9C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8046D9CC 7C 08 02 A6 */ mflr r0 -/* 8046D9D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8046D9D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8046D9D8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8046D9DC 41 82 00 1C */ beq lbl_8046D9F8 -/* 8046D9E0 3C A0 80 47 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x8046DAC8@ha */ -/* 8046D9E4 38 05 DA C8 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x8046DAC8@l */ -/* 8046D9E8 90 1F 00 00 */ stw r0, 0(r31) -/* 8046D9EC 7C 80 07 35 */ extsh. r0, r4 -/* 8046D9F0 40 81 00 08 */ ble lbl_8046D9F8 -/* 8046D9F4 4B E6 13 49 */ bl __dl__FPv -lbl_8046D9F8: -/* 8046D9F8 7F E3 FB 78 */ mr r3, r31 -/* 8046D9FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8046DA00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8046DA04 7C 08 03 A6 */ mtlr r0 -/* 8046DA08 38 21 00 10 */ addi r1, r1, 0x10 -/* 8046DA0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 5c404e620c..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,280 +0,0 @@ -lbl_8046D59C: -/* 8046D59C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8046D5A0 7C 08 02 A6 */ mflr r0 -/* 8046D5A4 90 01 00 34 */ stw r0, 0x34(r1) -/* 8046D5A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8046D5AC 4B EF 4C 31 */ bl _savegpr_29 -/* 8046D5B0 7C 7F 1B 78 */ mr r31, r3 -/* 8046D5B4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8046D5B8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8046D5BC 40 82 00 64 */ bne lbl_8046D620 -/* 8046D5C0 7F E0 FB 79 */ or. r0, r31, r31 -/* 8046D5C4 41 82 00 50 */ beq lbl_8046D614 -/* 8046D5C8 7C 1D 03 78 */ mr r29, r0 -/* 8046D5CC 4B BA B5 99 */ bl __ct__10fopAc_ac_cFv -/* 8046D5D0 3B DD 05 6C */ addi r30, r29, 0x56c -/* 8046D5D4 3C 60 80 47 */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x8046DAC8@ha */ -/* 8046D5D8 38 03 DA C8 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x8046DAC8@l */ -/* 8046D5DC 90 1D 05 6C */ stw r0, 0x56c(r29) -/* 8046D5E0 7F C3 F3 78 */ mr r3, r30 -/* 8046D5E4 38 80 00 00 */ li r4, 0 -/* 8046D5E8 4B EB AE 15 */ bl init__12J3DFrameCtrlFs -/* 8046D5EC 38 00 00 00 */ li r0, 0 -/* 8046D5F0 90 1E 00 14 */ stw r0, 0x14(r30) -/* 8046D5F4 3C 60 80 47 */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x8046DAC8@ha */ -/* 8046D5F8 38 03 DA C8 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x8046DAC8@l */ -/* 8046D5FC 94 1D 05 84 */ stwu r0, 0x584(r29) -/* 8046D600 7F A3 EB 78 */ mr r3, r29 -/* 8046D604 38 80 00 00 */ li r4, 0 -/* 8046D608 4B EB AD F5 */ bl init__12J3DFrameCtrlFs -/* 8046D60C 38 00 00 00 */ li r0, 0 -/* 8046D610 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_8046D614: -/* 8046D614 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8046D618 60 00 00 08 */ ori r0, r0, 8 -/* 8046D61C 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8046D620: -/* 8046D620 A8 1F 04 E0 */ lha r0, 0x4e0(r31) -/* 8046D624 98 1F 05 C6 */ stb r0, 0x5c6(r31) -/* 8046D628 38 7F 05 9C */ addi r3, r31, 0x59c -/* 8046D62C 3C 80 80 47 */ lis r4, d_a_kytag04__stringBase0@ha /* 0x8046DA50@ha */ -/* 8046D630 38 84 DA 50 */ addi r4, r4, d_a_kytag04__stringBase0@l /* 0x8046DA50@l */ -/* 8046D634 38 84 00 16 */ addi r4, r4, 0x16 -/* 8046D638 4B BB F8 85 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8046D63C 7C 7E 1B 78 */ mr r30, r3 -/* 8046D640 2C 1E 00 04 */ cmpwi r30, 4 -/* 8046D644 40 82 03 68 */ bne lbl_8046D9AC -/* 8046D648 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8046D64C 54 00 C7 7E */ rlwinm r0, r0, 0x18, 0x1d, 0x1f -/* 8046D650 98 1F 05 B4 */ stb r0, 0x5b4(r31) -/* 8046D654 A8 1F 04 E0 */ lha r0, 0x4e0(r31) -/* 8046D658 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8046D65C 90 1F 05 B0 */ stw r0, 0x5b0(r31) -/* 8046D660 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8046D664 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8046D668 90 1F 05 BC */ stw r0, 0x5bc(r31) -/* 8046D66C A8 1F 04 E0 */ lha r0, 0x4e0(r31) -/* 8046D670 98 1F 05 C6 */ stb r0, 0x5c6(r31) -/* 8046D674 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8046D678 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 8046D67C 98 1F 05 B5 */ stb r0, 0x5b5(r31) -/* 8046D680 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8046D684 54 00 46 3E */ srwi r0, r0, 0x18 -/* 8046D688 98 1F 05 B6 */ stb r0, 0x5b6(r31) -/* 8046D68C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D690 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D694 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 8046D698 3C 80 80 47 */ lis r4, d_a_kytag04__stringBase0@ha /* 0x8046DA50@ha */ -/* 8046D69C 38 84 DA 50 */ addi r4, r4, d_a_kytag04__stringBase0@l /* 0x8046DA50@l */ -/* 8046D6A0 38 84 00 1E */ addi r4, r4, 0x1e -/* 8046D6A4 4B EF B2 F1 */ bl strcmp -/* 8046D6A8 2C 03 00 00 */ cmpwi r3, 0 -/* 8046D6AC 40 82 00 30 */ bne lbl_8046D6DC -/* 8046D6B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D6B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D6B8 88 03 4E 0A */ lbz r0, 0x4e0a(r3) -/* 8046D6BC 7C 00 07 75 */ extsb. r0, r0 -/* 8046D6C0 40 82 00 1C */ bne lbl_8046D6DC -/* 8046D6C4 38 60 00 00 */ li r3, 0 -/* 8046D6C8 4B BB F2 B5 */ bl getLayerNo__14dComIfG_play_cFi -/* 8046D6CC 2C 03 00 08 */ cmpwi r3, 8 -/* 8046D6D0 40 82 00 0C */ bne lbl_8046D6DC -/* 8046D6D4 38 00 00 FF */ li r0, 0xff -/* 8046D6D8 98 1F 05 B5 */ stb r0, 0x5b5(r31) -lbl_8046D6DC: -/* 8046D6DC 38 00 FF FF */ li r0, -1 -/* 8046D6E0 98 1F 05 B7 */ stb r0, 0x5b7(r31) -/* 8046D6E4 38 00 00 00 */ li r0, 0 -/* 8046D6E8 98 1F 05 B8 */ stb r0, 0x5b8(r31) -/* 8046D6EC 98 1F 05 B9 */ stb r0, 0x5b9(r31) -/* 8046D6F0 90 1F 05 C0 */ stw r0, 0x5c0(r31) -/* 8046D6F4 98 1F 05 C4 */ stb r0, 0x5c4(r31) -/* 8046D6F8 98 1F 05 C5 */ stb r0, 0x5c5(r31) -/* 8046D6FC 3C 60 80 47 */ lis r3, lit_3962@ha /* 0x8046DA20@ha */ -/* 8046D700 C0 03 DA 20 */ lfs f0, lit_3962@l(r3) /* 0x8046DA20@l */ -/* 8046D704 D0 1F 05 C8 */ stfs f0, 0x5c8(r31) -/* 8046D708 90 1F 05 CC */ stw r0, 0x5cc(r31) -/* 8046D70C 98 1F 05 D0 */ stb r0, 0x5d0(r31) -/* 8046D710 98 1F 05 D1 */ stb r0, 0x5d1(r31) -/* 8046D714 90 1F 05 A4 */ stw r0, 0x5a4(r31) -/* 8046D718 90 1F 05 A8 */ stw r0, 0x5a8(r31) -/* 8046D71C 90 1F 05 AC */ stw r0, 0x5ac(r31) -/* 8046D720 88 1F 05 B4 */ lbz r0, 0x5b4(r31) -/* 8046D724 28 00 00 01 */ cmplwi r0, 1 -/* 8046D728 40 82 00 BC */ bne lbl_8046D7E4 -/* 8046D72C 88 1F 05 C6 */ lbz r0, 0x5c6(r31) -/* 8046D730 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D734 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D738 98 1D 5E A1 */ stb r0, 0x5ea1(r29) -/* 8046D73C 88 9F 05 B5 */ lbz r4, 0x5b5(r31) -/* 8046D740 28 04 00 FF */ cmplwi r4, 0xff -/* 8046D744 41 82 00 28 */ beq lbl_8046D76C -/* 8046D748 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046D74C 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8046D750 7C A5 07 74 */ extsb r5, r5 -/* 8046D754 7F A3 EB 78 */ mr r3, r29 -/* 8046D758 4B BC 7C 09 */ bl isSwitch__10dSv_info_cCFii -/* 8046D75C 2C 03 00 00 */ cmpwi r3, 0 -/* 8046D760 41 82 00 0C */ beq lbl_8046D76C -/* 8046D764 38 00 00 01 */ li r0, 1 -/* 8046D768 98 1F 05 B7 */ stb r0, 0x5b7(r31) -lbl_8046D76C: -/* 8046D76C 4B D3 EE 11 */ bl dKy_darkworld_check__Fv -/* 8046D770 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8046D774 41 82 01 18 */ beq lbl_8046D88C -/* 8046D778 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D77C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D780 38 64 01 14 */ addi r3, r4, 0x114 -/* 8046D784 88 84 4E 0C */ lbz r4, 0x4e0c(r4) -/* 8046D788 4B BC 6B B9 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 8046D78C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8046D790 88 1D 5E A1 */ lbz r0, 0x5ea1(r29) -/* 8046D794 7C 03 00 40 */ cmplw r3, r0 -/* 8046D798 41 80 00 F4 */ blt lbl_8046D88C -/* 8046D79C 38 60 00 00 */ li r3, 0 -/* 8046D7A0 4B BB F1 DD */ bl getLayerNo__14dComIfG_play_cFi -/* 8046D7A4 2C 03 00 0D */ cmpwi r3, 0xd -/* 8046D7A8 41 82 00 14 */ beq lbl_8046D7BC -/* 8046D7AC 38 60 00 00 */ li r3, 0 -/* 8046D7B0 4B BB F1 CD */ bl getLayerNo__14dComIfG_play_cFi -/* 8046D7B4 2C 03 00 0E */ cmpwi r3, 0xe -/* 8046D7B8 40 82 00 D4 */ bne lbl_8046D88C -lbl_8046D7BC: -/* 8046D7BC 38 00 FF FF */ li r0, -1 -/* 8046D7C0 98 1F 05 B7 */ stb r0, 0x5b7(r31) -/* 8046D7C4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046D7C8 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8046D7CC 7C A5 07 74 */ extsb r5, r5 -/* 8046D7D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D7D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D7D8 88 9F 05 B5 */ lbz r4, 0x5b5(r31) -/* 8046D7DC 4B BC 7A 25 */ bl onSwitch__10dSv_info_cFii -/* 8046D7E0 48 00 00 AC */ b lbl_8046D88C -lbl_8046D7E4: -/* 8046D7E4 28 00 00 04 */ cmplwi r0, 4 -/* 8046D7E8 40 82 00 50 */ bne lbl_8046D838 -/* 8046D7EC 88 9F 05 B5 */ lbz r4, 0x5b5(r31) -/* 8046D7F0 28 04 00 FF */ cmplwi r4, 0xff -/* 8046D7F4 41 82 00 98 */ beq lbl_8046D88C -/* 8046D7F8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046D7FC 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8046D800 7C A5 07 74 */ extsb r5, r5 -/* 8046D804 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D808 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D80C 4B BC 7B 55 */ bl isSwitch__10dSv_info_cCFii -/* 8046D810 2C 03 00 00 */ cmpwi r3, 0 -/* 8046D814 41 82 00 78 */ beq lbl_8046D88C -/* 8046D818 38 00 00 01 */ li r0, 1 -/* 8046D81C 98 1F 05 D1 */ stb r0, 0x5d1(r31) -/* 8046D820 3C 60 80 47 */ lis r3, lit_3963@ha /* 0x8046DA24@ha */ -/* 8046D824 C0 03 DA 24 */ lfs f0, lit_3963@l(r3) /* 0x8046DA24@l */ -/* 8046D828 D0 1F 05 C8 */ stfs f0, 0x5c8(r31) -/* 8046D82C 38 00 00 14 */ li r0, 0x14 -/* 8046D830 90 1F 05 CC */ stw r0, 0x5cc(r31) -/* 8046D834 48 00 00 58 */ b lbl_8046D88C -lbl_8046D838: -/* 8046D838 28 00 00 05 */ cmplwi r0, 5 -/* 8046D83C 40 82 00 50 */ bne lbl_8046D88C -/* 8046D840 88 9F 05 B5 */ lbz r4, 0x5b5(r31) -/* 8046D844 28 04 00 FF */ cmplwi r4, 0xff -/* 8046D848 41 82 00 44 */ beq lbl_8046D88C -/* 8046D84C 80 1F 05 B0 */ lwz r0, 0x5b0(r31) -/* 8046D850 54 05 28 34 */ slwi r5, r0, 5 -/* 8046D854 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D858 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D85C 7C 60 2A 14 */ add r3, r0, r5 -/* 8046D860 38 63 01 F0 */ addi r3, r3, 0x1f0 -/* 8046D864 4B BC 6F FD */ bl isSwitch__12dSv_memBit_cCFi -/* 8046D868 2C 03 00 00 */ cmpwi r3, 0 -/* 8046D86C 41 82 00 20 */ beq lbl_8046D88C -/* 8046D870 38 00 00 01 */ li r0, 1 -/* 8046D874 98 1F 05 D1 */ stb r0, 0x5d1(r31) -/* 8046D878 3C 60 80 47 */ lis r3, lit_3963@ha /* 0x8046DA24@ha */ -/* 8046D87C C0 03 DA 24 */ lfs f0, lit_3963@l(r3) /* 0x8046DA24@l */ -/* 8046D880 D0 1F 05 C8 */ stfs f0, 0x5c8(r31) -/* 8046D884 38 00 00 14 */ li r0, 0x14 -/* 8046D888 90 1F 05 CC */ stw r0, 0x5cc(r31) -lbl_8046D88C: -/* 8046D88C 7F E3 FB 78 */ mr r3, r31 -/* 8046D890 3C 80 80 47 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x8046D474@ha */ -/* 8046D894 38 84 D4 74 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x8046D474@l */ -/* 8046D898 38 A0 11 50 */ li r5, 0x1150 -/* 8046D89C 4B BA CC 15 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 8046D8A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8046D8A4 40 82 00 0C */ bne lbl_8046D8B0 -/* 8046D8A8 38 60 00 05 */ li r3, 5 -/* 8046D8AC 48 00 01 04 */ b lbl_8046D9B0 -lbl_8046D8B0: -/* 8046D8B0 88 1F 05 B4 */ lbz r0, 0x5b4(r31) -/* 8046D8B4 28 00 00 04 */ cmplwi r0, 4 -/* 8046D8B8 40 82 00 74 */ bne lbl_8046D92C -/* 8046D8BC 88 9F 05 B5 */ lbz r4, 0x5b5(r31) -/* 8046D8C0 28 04 00 FF */ cmplwi r4, 0xff -/* 8046D8C4 41 82 00 68 */ beq lbl_8046D92C -/* 8046D8C8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046D8CC 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8046D8D0 7C A5 07 74 */ extsb r5, r5 -/* 8046D8D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D8D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D8DC 4B BC 7A 85 */ bl isSwitch__10dSv_info_cCFii -/* 8046D8E0 2C 03 00 00 */ cmpwi r3, 0 -/* 8046D8E4 41 82 00 48 */ beq lbl_8046D92C -/* 8046D8E8 A8 1F 05 74 */ lha r0, 0x574(r31) -/* 8046D8EC 3C 60 80 47 */ lis r3, lit_4326@ha /* 0x8046DA48@ha */ -/* 8046D8F0 C8 23 DA 48 */ lfd f1, lit_4326@l(r3) /* 0x8046DA48@l */ -/* 8046D8F4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8046D8F8 90 01 00 0C */ stw r0, 0xc(r1) -/* 8046D8FC 3C 60 43 30 */ lis r3, 0x4330 -/* 8046D900 90 61 00 08 */ stw r3, 8(r1) -/* 8046D904 C8 01 00 08 */ lfd f0, 8(r1) -/* 8046D908 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8046D90C D0 1F 05 7C */ stfs f0, 0x57c(r31) -/* 8046D910 A8 1F 05 8C */ lha r0, 0x58c(r31) -/* 8046D914 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8046D918 90 01 00 14 */ stw r0, 0x14(r1) -/* 8046D91C 90 61 00 10 */ stw r3, 0x10(r1) -/* 8046D920 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8046D924 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8046D928 D0 1F 05 94 */ stfs f0, 0x594(r31) -lbl_8046D92C: -/* 8046D92C 88 1F 05 B4 */ lbz r0, 0x5b4(r31) -/* 8046D930 28 00 00 05 */ cmplwi r0, 5 -/* 8046D934 40 82 00 78 */ bne lbl_8046D9AC -/* 8046D938 88 9F 05 B5 */ lbz r4, 0x5b5(r31) -/* 8046D93C 28 04 00 FF */ cmplwi r4, 0xff -/* 8046D940 41 82 00 6C */ beq lbl_8046D9AC -/* 8046D944 80 1F 05 B0 */ lwz r0, 0x5b0(r31) -/* 8046D948 54 05 28 34 */ slwi r5, r0, 5 -/* 8046D94C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D950 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D954 7C 60 2A 14 */ add r3, r0, r5 -/* 8046D958 38 63 01 F0 */ addi r3, r3, 0x1f0 -/* 8046D95C 4B BC 6F 05 */ bl isSwitch__12dSv_memBit_cCFi -/* 8046D960 2C 03 00 00 */ cmpwi r3, 0 -/* 8046D964 41 82 00 48 */ beq lbl_8046D9AC -/* 8046D968 A8 1F 05 74 */ lha r0, 0x574(r31) -/* 8046D96C 3C 60 80 47 */ lis r3, lit_4326@ha /* 0x8046DA48@ha */ -/* 8046D970 C8 23 DA 48 */ lfd f1, lit_4326@l(r3) /* 0x8046DA48@l */ -/* 8046D974 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8046D978 90 01 00 14 */ stw r0, 0x14(r1) -/* 8046D97C 3C 60 43 30 */ lis r3, 0x4330 -/* 8046D980 90 61 00 10 */ stw r3, 0x10(r1) -/* 8046D984 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8046D988 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8046D98C D0 1F 05 7C */ stfs f0, 0x57c(r31) -/* 8046D990 A8 1F 05 8C */ lha r0, 0x58c(r31) -/* 8046D994 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8046D998 90 01 00 0C */ stw r0, 0xc(r1) -/* 8046D99C 90 61 00 08 */ stw r3, 8(r1) -/* 8046D9A0 C8 01 00 08 */ lfd f0, 8(r1) -/* 8046D9A4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8046D9A8 D0 1F 05 94 */ stfs f0, 0x594(r31) -lbl_8046D9AC: -/* 8046D9AC 7F C3 F3 78 */ mr r3, r30 -lbl_8046D9B0: -/* 8046D9B0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8046D9B4 4B EF 48 75 */ bl _restgpr_29 -/* 8046D9B8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046D9BC 7C 08 03 A6 */ mtlr r0 -/* 8046D9C0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8046D9C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Delete__FP13kytag04_class.s b/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Delete__FP13kytag04_class.s deleted file mode 100644 index 3e16d08818..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Delete__FP13kytag04_class.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_8046D35C: -/* 8046D35C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8046D360 7C 08 02 A6 */ mflr r0 -/* 8046D364 90 01 00 14 */ stw r0, 0x14(r1) -/* 8046D368 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8046D36C 7C 7F 1B 78 */ mr r31, r3 -/* 8046D370 38 7F 05 9C */ addi r3, r31, 0x59c -/* 8046D374 3C 80 80 47 */ lis r4, d_a_kytag04__stringBase0@ha /* 0x8046DA50@ha */ -/* 8046D378 38 84 DA 50 */ addi r4, r4, d_a_kytag04__stringBase0@l /* 0x8046DA50@l */ -/* 8046D37C 38 84 00 16 */ addi r4, r4, 0x16 -/* 8046D380 4B BB FC 89 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8046D384 80 7F 05 A4 */ lwz r3, 0x5a4(r31) -/* 8046D388 28 03 00 00 */ cmplwi r3, 0 -/* 8046D38C 41 82 00 40 */ beq lbl_8046D3CC -/* 8046D390 4B E1 18 D1 */ bl deleteAllParticle__14JPABaseEmitterFv -/* 8046D394 80 7F 05 A4 */ lwz r3, 0x5a4(r31) -/* 8046D398 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8046D39C 60 00 00 01 */ ori r0, r0, 1 -/* 8046D3A0 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8046D3A4 38 00 00 01 */ li r0, 1 -/* 8046D3A8 90 03 00 24 */ stw r0, 0x24(r3) -/* 8046D3AC 80 7F 05 A4 */ lwz r3, 0x5a4(r31) -/* 8046D3B0 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8046D3B4 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 8046D3B8 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8046D3BC 38 00 00 00 */ li r0, 0 -/* 8046D3C0 80 7F 05 A4 */ lwz r3, 0x5a4(r31) -/* 8046D3C4 90 03 00 EC */ stw r0, 0xec(r3) -/* 8046D3C8 90 1F 05 A4 */ stw r0, 0x5a4(r31) -lbl_8046D3CC: -/* 8046D3CC 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 8046D3D0 28 03 00 00 */ cmplwi r3, 0 -/* 8046D3D4 41 82 00 40 */ beq lbl_8046D414 -/* 8046D3D8 4B E1 18 89 */ bl deleteAllParticle__14JPABaseEmitterFv -/* 8046D3DC 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 8046D3E0 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8046D3E4 60 00 00 01 */ ori r0, r0, 1 -/* 8046D3E8 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8046D3EC 38 00 00 01 */ li r0, 1 -/* 8046D3F0 90 03 00 24 */ stw r0, 0x24(r3) -/* 8046D3F4 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 8046D3F8 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8046D3FC 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 8046D400 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8046D404 38 00 00 00 */ li r0, 0 -/* 8046D408 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 8046D40C 90 03 00 EC */ stw r0, 0xec(r3) -/* 8046D410 90 1F 05 A8 */ stw r0, 0x5a8(r31) -lbl_8046D414: -/* 8046D414 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 8046D418 28 03 00 00 */ cmplwi r3, 0 -/* 8046D41C 41 82 00 40 */ beq lbl_8046D45C -/* 8046D420 4B E1 18 41 */ bl deleteAllParticle__14JPABaseEmitterFv -/* 8046D424 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 8046D428 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8046D42C 60 00 00 01 */ ori r0, r0, 1 -/* 8046D430 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8046D434 38 00 00 01 */ li r0, 1 -/* 8046D438 90 03 00 24 */ stw r0, 0x24(r3) -/* 8046D43C 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 8046D440 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8046D444 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 8046D448 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8046D44C 38 00 00 00 */ li r0, 0 -/* 8046D450 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 8046D454 90 03 00 EC */ stw r0, 0xec(r3) -/* 8046D458 90 1F 05 AC */ stw r0, 0x5ac(r31) -lbl_8046D45C: -/* 8046D45C 38 60 00 01 */ li r3, 1 -/* 8046D460 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8046D464 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8046D468 7C 08 03 A6 */ mtlr r0 -/* 8046D46C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8046D470 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Draw__FP13kytag04_class.s b/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Draw__FP13kytag04_class.s deleted file mode 100644 index 6b92086db0..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Draw__FP13kytag04_class.s +++ /dev/null @@ -1,305 +0,0 @@ -lbl_8046CB58: -/* 8046CB58 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 8046CB5C 7C 08 02 A6 */ mflr r0 -/* 8046CB60 90 01 00 94 */ stw r0, 0x94(r1) -/* 8046CB64 39 61 00 90 */ addi r11, r1, 0x90 -/* 8046CB68 4B EF 56 75 */ bl _savegpr_29 -/* 8046CB6C 7C 7D 1B 78 */ mr r29, r3 -/* 8046CB70 3C 60 80 47 */ lis r3, lit_3960@ha /* 0x8046DA18@ha */ -/* 8046CB74 3B E3 DA 18 */ addi r31, r3, lit_3960@l /* 0x8046DA18@l */ -/* 8046CB78 3B C0 00 00 */ li r30, 0 -/* 8046CB7C C0 1F 00 00 */ lfs f0, 0(r31) -/* 8046CB80 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8046CB84 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 8046CB88 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 8046CB8C C0 5D 04 D0 */ lfs f2, 0x4d0(r29) -/* 8046CB90 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 8046CB94 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 8046CB98 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 8046CB9C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 8046CBA0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8046CBA4 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8046CBA8 EC 01 00 2A */ fadds f0, f1, f0 -/* 8046CBAC D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8046CBB0 D0 5D 05 50 */ stfs f2, 0x550(r29) -/* 8046CBB4 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 8046CBB8 D0 1D 05 54 */ stfs f0, 0x554(r29) -/* 8046CBBC C0 01 00 28 */ lfs f0, 0x28(r1) -/* 8046CBC0 D0 1D 05 58 */ stfs f0, 0x558(r29) -/* 8046CBC4 C0 1D 05 50 */ lfs f0, 0x550(r29) -/* 8046CBC8 D0 1D 05 38 */ stfs f0, 0x538(r29) -/* 8046CBCC C0 1D 05 54 */ lfs f0, 0x554(r29) -/* 8046CBD0 D0 1D 05 3C */ stfs f0, 0x53c(r29) -/* 8046CBD4 C0 1D 05 58 */ lfs f0, 0x558(r29) -/* 8046CBD8 D0 1D 05 40 */ stfs f0, 0x540(r29) -/* 8046CBDC 88 1D 05 B4 */ lbz r0, 0x5b4(r29) -/* 8046CBE0 28 00 00 04 */ cmplwi r0, 4 -/* 8046CBE4 41 82 00 0C */ beq lbl_8046CBF0 -/* 8046CBE8 28 00 00 05 */ cmplwi r0, 5 -/* 8046CBEC 40 82 03 E0 */ bne lbl_8046CFCC -lbl_8046CBF0: -/* 8046CBF0 28 00 00 04 */ cmplwi r0, 4 -/* 8046CBF4 40 82 00 44 */ bne lbl_8046CC38 -/* 8046CBF8 88 9D 05 B5 */ lbz r4, 0x5b5(r29) -/* 8046CBFC 28 04 00 FF */ cmplwi r4, 0xff -/* 8046CC00 41 82 00 78 */ beq lbl_8046CC78 -/* 8046CC04 88 1D 05 D1 */ lbz r0, 0x5d1(r29) -/* 8046CC08 28 00 00 01 */ cmplwi r0, 1 -/* 8046CC0C 40 82 00 6C */ bne lbl_8046CC78 -/* 8046CC10 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046CC14 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8046CC18 7C A5 07 74 */ extsb r5, r5 -/* 8046CC1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046CC20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046CC24 4B BC 87 3D */ bl isSwitch__10dSv_info_cCFii -/* 8046CC28 2C 03 00 00 */ cmpwi r3, 0 -/* 8046CC2C 41 82 00 4C */ beq lbl_8046CC78 -/* 8046CC30 3B C0 00 01 */ li r30, 1 -/* 8046CC34 48 00 00 44 */ b lbl_8046CC78 -lbl_8046CC38: -/* 8046CC38 88 9D 05 B5 */ lbz r4, 0x5b5(r29) -/* 8046CC3C 28 04 00 FF */ cmplwi r4, 0xff -/* 8046CC40 41 82 00 38 */ beq lbl_8046CC78 -/* 8046CC44 88 1D 05 D1 */ lbz r0, 0x5d1(r29) -/* 8046CC48 28 00 00 01 */ cmplwi r0, 1 -/* 8046CC4C 40 82 00 2C */ bne lbl_8046CC78 -/* 8046CC50 80 1D 05 B0 */ lwz r0, 0x5b0(r29) -/* 8046CC54 54 05 28 34 */ slwi r5, r0, 5 -/* 8046CC58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046CC5C 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046CC60 7C 60 2A 14 */ add r3, r0, r5 -/* 8046CC64 38 63 01 F0 */ addi r3, r3, 0x1f0 -/* 8046CC68 4B BC 7B F9 */ bl isSwitch__12dSv_memBit_cCFi -/* 8046CC6C 2C 03 00 00 */ cmpwi r3, 0 -/* 8046CC70 41 82 00 08 */ beq lbl_8046CC78 -/* 8046CC74 3B C0 00 01 */ li r30, 1 -lbl_8046CC78: -/* 8046CC78 2C 1E 00 00 */ cmpwi r30, 0 -/* 8046CC7C 41 82 02 44 */ beq lbl_8046CEC0 -/* 8046CC80 C0 3D 05 C8 */ lfs f1, 0x5c8(r29) -/* 8046CC84 C0 1F 00 08 */ lfs f0, 8(r31) -/* 8046CC88 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046CC8C 4C 40 13 82 */ cror 2, 0, 2 -/* 8046CC90 41 82 00 14 */ beq lbl_8046CCA4 -/* 8046CC94 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 8046CC98 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046CC9C 4C 41 13 82 */ cror 2, 1, 2 -/* 8046CCA0 40 82 01 1C */ bne lbl_8046CDBC -lbl_8046CCA4: -/* 8046CCA4 C0 1F 00 08 */ lfs f0, 8(r31) -/* 8046CCA8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046CCAC 4C 40 13 82 */ cror 2, 0, 2 -/* 8046CCB0 40 82 00 58 */ bne lbl_8046CD08 -/* 8046CCB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046CCB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046CCBC 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 8046CCC0 38 80 00 00 */ li r4, 0 -/* 8046CCC4 90 81 00 08 */ stw r4, 8(r1) -/* 8046CCC8 38 00 FF FF */ li r0, -1 -/* 8046CCCC 90 01 00 0C */ stw r0, 0xc(r1) -/* 8046CCD0 90 81 00 10 */ stw r4, 0x10(r1) -/* 8046CCD4 90 81 00 14 */ stw r4, 0x14(r1) -/* 8046CCD8 90 81 00 18 */ stw r4, 0x18(r1) -/* 8046CCDC 38 80 00 00 */ li r4, 0 -/* 8046CCE0 3C A0 00 01 */ lis r5, 0x0001 /* 0x000084A5@ha */ -/* 8046CCE4 38 A5 84 A5 */ addi r5, r5, 0x84A5 /* 0x000084A5@l */ -/* 8046CCE8 38 C1 00 20 */ addi r6, r1, 0x20 -/* 8046CCEC 38 E0 00 00 */ li r7, 0 -/* 8046CCF0 39 00 00 00 */ li r8, 0 -/* 8046CCF4 39 21 00 2C */ addi r9, r1, 0x2c -/* 8046CCF8 39 40 00 FF */ li r10, 0xff -/* 8046CCFC C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8046CD00 4B BD FD 91 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8046CD04 90 7D 05 A4 */ stw r3, 0x5a4(r29) -lbl_8046CD08: -/* 8046CD08 C0 3D 05 C8 */ lfs f1, 0x5c8(r29) -/* 8046CD0C C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 8046CD10 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046CD14 4C 41 13 82 */ cror 2, 1, 2 -/* 8046CD18 40 82 00 A4 */ bne lbl_8046CDBC -/* 8046CD1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046CD20 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046CD24 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 8046CD28 38 80 00 00 */ li r4, 0 -/* 8046CD2C 90 81 00 08 */ stw r4, 8(r1) -/* 8046CD30 38 00 FF FF */ li r0, -1 -/* 8046CD34 90 01 00 0C */ stw r0, 0xc(r1) -/* 8046CD38 90 81 00 10 */ stw r4, 0x10(r1) -/* 8046CD3C 90 81 00 14 */ stw r4, 0x14(r1) -/* 8046CD40 90 81 00 18 */ stw r4, 0x18(r1) -/* 8046CD44 38 80 00 00 */ li r4, 0 -/* 8046CD48 3C A0 00 01 */ lis r5, 0x0001 /* 0x000084A6@ha */ -/* 8046CD4C 38 A5 84 A6 */ addi r5, r5, 0x84A6 /* 0x000084A6@l */ -/* 8046CD50 38 C1 00 20 */ addi r6, r1, 0x20 -/* 8046CD54 38 E0 00 00 */ li r7, 0 -/* 8046CD58 39 00 00 00 */ li r8, 0 -/* 8046CD5C 39 21 00 2C */ addi r9, r1, 0x2c -/* 8046CD60 39 40 00 FF */ li r10, 0xff -/* 8046CD64 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8046CD68 4B BD FD 29 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8046CD6C 90 7D 05 A8 */ stw r3, 0x5a8(r29) -/* 8046CD70 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 8046CD74 38 80 00 00 */ li r4, 0 -/* 8046CD78 90 81 00 08 */ stw r4, 8(r1) -/* 8046CD7C 38 00 FF FF */ li r0, -1 -/* 8046CD80 90 01 00 0C */ stw r0, 0xc(r1) -/* 8046CD84 90 81 00 10 */ stw r4, 0x10(r1) -/* 8046CD88 90 81 00 14 */ stw r4, 0x14(r1) -/* 8046CD8C 90 81 00 18 */ stw r4, 0x18(r1) -/* 8046CD90 38 80 00 00 */ li r4, 0 -/* 8046CD94 3C A0 00 01 */ lis r5, 0x0001 /* 0x000084A7@ha */ -/* 8046CD98 38 A5 84 A7 */ addi r5, r5, 0x84A7 /* 0x000084A7@l */ -/* 8046CD9C 38 C1 00 20 */ addi r6, r1, 0x20 -/* 8046CDA0 38 E0 00 00 */ li r7, 0 -/* 8046CDA4 39 00 00 00 */ li r8, 0 -/* 8046CDA8 39 21 00 2C */ addi r9, r1, 0x2c -/* 8046CDAC 39 40 00 FF */ li r10, 0xff -/* 8046CDB0 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8046CDB4 4B BD FC DD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8046CDB8 90 7D 05 AC */ stw r3, 0x5ac(r29) -lbl_8046CDBC: -/* 8046CDBC 80 7D 05 CC */ lwz r3, 0x5cc(r29) -/* 8046CDC0 2C 03 00 00 */ cmpwi r3, 0 -/* 8046CDC4 41 82 00 E0 */ beq lbl_8046CEA4 -/* 8046CDC8 2C 03 00 14 */ cmpwi r3, 0x14 -/* 8046CDCC 40 80 00 D8 */ bge lbl_8046CEA4 -/* 8046CDD0 38 03 00 01 */ addi r0, r3, 1 -/* 8046CDD4 90 1D 05 CC */ stw r0, 0x5cc(r29) -/* 8046CDD8 80 1D 05 CC */ lwz r0, 0x5cc(r29) -/* 8046CDDC 2C 00 00 0F */ cmpwi r0, 0xf -/* 8046CDE0 40 82 00 C4 */ bne lbl_8046CEA4 -/* 8046CDE4 80 1D 05 A8 */ lwz r0, 0x5a8(r29) -/* 8046CDE8 28 00 00 00 */ cmplwi r0, 0 -/* 8046CDEC 40 82 00 58 */ bne lbl_8046CE44 -/* 8046CDF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046CDF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046CDF8 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 8046CDFC 38 80 00 00 */ li r4, 0 -/* 8046CE00 90 81 00 08 */ stw r4, 8(r1) -/* 8046CE04 38 00 FF FF */ li r0, -1 -/* 8046CE08 90 01 00 0C */ stw r0, 0xc(r1) -/* 8046CE0C 90 81 00 10 */ stw r4, 0x10(r1) -/* 8046CE10 90 81 00 14 */ stw r4, 0x14(r1) -/* 8046CE14 90 81 00 18 */ stw r4, 0x18(r1) -/* 8046CE18 38 80 00 00 */ li r4, 0 -/* 8046CE1C 3C A0 00 01 */ lis r5, 0x0001 /* 0x000084A6@ha */ -/* 8046CE20 38 A5 84 A6 */ addi r5, r5, 0x84A6 /* 0x000084A6@l */ -/* 8046CE24 38 C1 00 20 */ addi r6, r1, 0x20 -/* 8046CE28 38 E0 00 00 */ li r7, 0 -/* 8046CE2C 39 00 00 00 */ li r8, 0 -/* 8046CE30 39 21 00 2C */ addi r9, r1, 0x2c -/* 8046CE34 39 40 00 FF */ li r10, 0xff -/* 8046CE38 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8046CE3C 4B BD FC 55 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8046CE40 90 7D 05 A8 */ stw r3, 0x5a8(r29) -lbl_8046CE44: -/* 8046CE44 80 1D 05 AC */ lwz r0, 0x5ac(r29) -/* 8046CE48 28 00 00 00 */ cmplwi r0, 0 -/* 8046CE4C 40 82 00 58 */ bne lbl_8046CEA4 -/* 8046CE50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046CE54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046CE58 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 8046CE5C 38 80 00 00 */ li r4, 0 -/* 8046CE60 90 81 00 08 */ stw r4, 8(r1) -/* 8046CE64 38 00 FF FF */ li r0, -1 -/* 8046CE68 90 01 00 0C */ stw r0, 0xc(r1) -/* 8046CE6C 90 81 00 10 */ stw r4, 0x10(r1) -/* 8046CE70 90 81 00 14 */ stw r4, 0x14(r1) -/* 8046CE74 90 81 00 18 */ stw r4, 0x18(r1) -/* 8046CE78 38 80 00 00 */ li r4, 0 -/* 8046CE7C 3C A0 00 01 */ lis r5, 0x0001 /* 0x000084A7@ha */ -/* 8046CE80 38 A5 84 A7 */ addi r5, r5, 0x84A7 /* 0x000084A7@l */ -/* 8046CE84 38 C1 00 20 */ addi r6, r1, 0x20 -/* 8046CE88 38 E0 00 00 */ li r7, 0 -/* 8046CE8C 39 00 00 00 */ li r8, 0 -/* 8046CE90 39 21 00 2C */ addi r9, r1, 0x2c -/* 8046CE94 39 40 00 FF */ li r10, 0xff -/* 8046CE98 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8046CE9C 4B BD FB F5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8046CEA0 90 7D 05 AC */ stw r3, 0x5ac(r29) -lbl_8046CEA4: -/* 8046CEA4 38 7D 05 C8 */ addi r3, r29, 0x5c8 -/* 8046CEA8 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8046CEAC C0 5F 00 14 */ lfs f2, 0x14(r31) -/* 8046CEB0 C0 7F 00 18 */ lfs f3, 0x18(r31) -/* 8046CEB4 C0 9F 00 1C */ lfs f4, 0x1c(r31) -/* 8046CEB8 4B E0 2A C5 */ bl cLib_addCalc__FPfffff -/* 8046CEBC 48 00 00 1C */ b lbl_8046CED8 -lbl_8046CEC0: -/* 8046CEC0 38 7D 05 C8 */ addi r3, r29, 0x5c8 -/* 8046CEC4 C0 3F 00 08 */ lfs f1, 8(r31) -/* 8046CEC8 C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 8046CECC C0 7F 00 24 */ lfs f3, 0x24(r31) -/* 8046CED0 C0 9F 00 1C */ lfs f4, 0x1c(r31) -/* 8046CED4 4B E0 2A A9 */ bl cLib_addCalc__FPfffff -lbl_8046CED8: -/* 8046CED8 C0 3D 05 C8 */ lfs f1, 0x5c8(r29) -/* 8046CEDC C0 1F 00 08 */ lfs f0, 8(r31) -/* 8046CEE0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8046CEE4 40 81 00 E8 */ ble lbl_8046CFCC -/* 8046CEE8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8046CEEC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8046CEF0 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 8046CEF4 C0 41 00 24 */ lfs f2, 0x24(r1) -/* 8046CEF8 C0 61 00 28 */ lfs f3, 0x28(r1) -/* 8046CEFC 4B ED 99 ED */ bl PSMTXTrans -/* 8046CF00 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8046CF04 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8046CF08 38 81 00 44 */ addi r4, r1, 0x44 -/* 8046CF0C 4B ED 95 A5 */ bl PSMTXCopy -/* 8046CF10 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8046CF14 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 8046CF18 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 8046CF1C D0 01 00 40 */ stfs f0, 0x40(r1) -/* 8046CF20 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 8046CF24 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8046CF28 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 8046CF2C D0 03 00 20 */ stfs f0, 0x20(r3) -/* 8046CF30 38 61 00 44 */ addi r3, r1, 0x44 -/* 8046CF34 80 9D 05 68 */ lwz r4, 0x568(r29) -/* 8046CF38 38 84 00 24 */ addi r4, r4, 0x24 -/* 8046CF3C 4B ED 95 75 */ bl PSMTXCopy -/* 8046CF40 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 8046CF44 80 83 00 04 */ lwz r4, 4(r3) -/* 8046CF48 C0 3D 05 7C */ lfs f1, 0x57c(r29) -/* 8046CF4C 38 7D 05 6C */ addi r3, r29, 0x56c -/* 8046CF50 38 84 00 58 */ addi r4, r4, 0x58 -/* 8046CF54 4B BA 07 85 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 8046CF58 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 8046CF5C 80 83 00 04 */ lwz r4, 4(r3) -/* 8046CF60 C0 3D 05 94 */ lfs f1, 0x594(r29) -/* 8046CF64 38 7D 05 84 */ addi r3, r29, 0x584 -/* 8046CF68 38 84 00 58 */ addi r4, r4, 0x58 -/* 8046CF6C 4B BA 08 3D */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 8046CF70 80 1D 05 CC */ lwz r0, 0x5cc(r29) -/* 8046CF74 2C 00 00 0F */ cmpwi r0, 0xf -/* 8046CF78 41 80 00 14 */ blt lbl_8046CF8C -/* 8046CF7C 38 7D 05 6C */ addi r3, r29, 0x56c -/* 8046CF80 4B BA 04 A9 */ bl play__14mDoExt_baseAnmFv -/* 8046CF84 38 7D 05 84 */ addi r3, r29, 0x584 -/* 8046CF88 4B BA 04 A1 */ bl play__14mDoExt_baseAnmFv -lbl_8046CF8C: -/* 8046CF8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046CF90 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046CF94 80 04 5F 88 */ lwz r0, 0x5f88(r4) -/* 8046CF98 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8046CF9C 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8046CFA0 90 1E 00 48 */ stw r0, 0x48(r30) -/* 8046CFA4 80 04 5F 8C */ lwz r0, 0x5f8c(r4) -/* 8046CFA8 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 8046CFAC 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 8046CFB0 4B BA 0D 15 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 8046CFB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046CFB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046CFBC 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 8046CFC0 90 1E 00 48 */ stw r0, 0x48(r30) -/* 8046CFC4 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 8046CFC8 90 1E 00 4C */ stw r0, 0x4c(r30) -lbl_8046CFCC: -/* 8046CFCC 38 60 00 01 */ li r3, 1 -/* 8046CFD0 39 61 00 90 */ addi r11, r1, 0x90 -/* 8046CFD4 4B EF 52 55 */ bl _restgpr_29 -/* 8046CFD8 80 01 00 94 */ lwz r0, 0x94(r1) -/* 8046CFDC 7C 08 03 A6 */ mtlr r0 -/* 8046CFE0 38 21 00 90 */ addi r1, r1, 0x90 -/* 8046CFE4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Execute__FP13kytag04_class.s b/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Execute__FP13kytag04_class.s deleted file mode 100644 index 606be694b3..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Execute__FP13kytag04_class.s +++ /dev/null @@ -1,235 +0,0 @@ -lbl_8046CFE8: -/* 8046CFE8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8046CFEC 7C 08 02 A6 */ mflr r0 -/* 8046CFF0 90 01 00 34 */ stw r0, 0x34(r1) -/* 8046CFF4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8046CFF8 4B EF 51 E5 */ bl _savegpr_29 -/* 8046CFFC 7C 7E 1B 78 */ mr r30, r3 -/* 8046D000 3C 60 80 47 */ lis r3, lit_3960@ha /* 0x8046DA18@ha */ -/* 8046D004 3B E3 DA 18 */ addi r31, r3, lit_3960@l /* 0x8046DA18@l */ -/* 8046D008 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D00C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D010 83 A3 5D AC */ lwz r29, 0x5dac(r3) -/* 8046D014 88 1E 05 B4 */ lbz r0, 0x5b4(r30) -/* 8046D018 2C 00 00 04 */ cmpwi r0, 4 -/* 8046D01C 41 82 00 14 */ beq lbl_8046D030 -/* 8046D020 40 80 03 18 */ bge lbl_8046D338 -/* 8046D024 2C 00 00 01 */ cmpwi r0, 1 -/* 8046D028 41 82 02 1C */ beq lbl_8046D244 -/* 8046D02C 48 00 03 0C */ b lbl_8046D338 -lbl_8046D030: -/* 8046D030 88 1E 05 D1 */ lbz r0, 0x5d1(r30) -/* 8046D034 28 00 00 00 */ cmplwi r0, 0 -/* 8046D038 40 82 00 DC */ bne lbl_8046D114 -/* 8046D03C 88 9E 05 B5 */ lbz r4, 0x5b5(r30) -/* 8046D040 28 04 00 FF */ cmplwi r4, 0xff -/* 8046D044 41 82 00 D0 */ beq lbl_8046D114 -/* 8046D048 3C A0 80 45 */ lis r5, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046D04C 38 A5 0D 64 */ addi r5, r5, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ -/* 8046D050 88 A5 00 00 */ lbz r5, 0(r5) -/* 8046D054 7C A5 07 74 */ extsb r5, r5 -/* 8046D058 4B BC 83 09 */ bl isSwitch__10dSv_info_cCFii -/* 8046D05C 2C 03 00 00 */ cmpwi r3, 0 -/* 8046D060 41 82 00 B4 */ beq lbl_8046D114 -/* 8046D064 88 1E 05 D0 */ lbz r0, 0x5d0(r30) -/* 8046D068 28 00 00 00 */ cmplwi r0, 0 -/* 8046D06C 40 82 00 A8 */ bne lbl_8046D114 -/* 8046D070 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D074 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D078 38 00 00 00 */ li r0, 0 -/* 8046D07C 88 63 4F AD */ lbz r3, 0x4fad(r3) -/* 8046D080 28 03 00 00 */ cmplwi r3, 0 -/* 8046D084 41 82 00 0C */ beq lbl_8046D090 -/* 8046D088 28 03 00 02 */ cmplwi r3, 2 -/* 8046D08C 40 82 00 08 */ bne lbl_8046D094 -lbl_8046D090: -/* 8046D090 38 00 00 01 */ li r0, 1 -lbl_8046D094: -/* 8046D094 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8046D098 41 82 00 7C */ beq lbl_8046D114 -/* 8046D09C 7F C3 F3 78 */ mr r3, r30 -/* 8046D0A0 3C 80 80 47 */ lis r4, d_a_kytag04__stringBase0@ha /* 0x8046DA50@ha */ -/* 8046D0A4 38 84 DA 50 */ addi r4, r4, d_a_kytag04__stringBase0@l /* 0x8046DA50@l */ -/* 8046D0A8 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 8046D0AC 38 A5 FF FF */ addi r5, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 8046D0B0 38 C0 00 01 */ li r6, 1 -/* 8046D0B4 38 E0 00 00 */ li r7, 0 -/* 8046D0B8 4B BA E3 15 */ bl fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs -/* 8046D0BC 2C 03 00 00 */ cmpwi r3, 0 -/* 8046D0C0 41 82 00 54 */ beq lbl_8046D114 -/* 8046D0C4 38 00 00 01 */ li r0, 1 -/* 8046D0C8 98 1E 05 D1 */ stb r0, 0x5d1(r30) -/* 8046D0CC 98 1E 05 D0 */ stb r0, 0x5d0(r30) -/* 8046D0D0 90 1E 05 CC */ stw r0, 0x5cc(r30) -/* 8046D0D4 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800EA@ha */ -/* 8046D0D8 38 03 00 EA */ addi r0, r3, 0x00EA /* 0x000800EA@l */ -/* 8046D0DC 90 01 00 08 */ stw r0, 8(r1) -/* 8046D0E0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8046D0E4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 8046D0E8 80 63 00 00 */ lwz r3, 0(r3) -/* 8046D0EC 38 81 00 08 */ addi r4, r1, 8 -/* 8046D0F0 38 A0 00 00 */ li r5, 0 -/* 8046D0F4 38 C0 00 00 */ li r6, 0 -/* 8046D0F8 38 E0 00 00 */ li r7, 0 -/* 8046D0FC C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8046D100 FC 40 08 90 */ fmr f2, f1 -/* 8046D104 C0 7F 00 28 */ lfs f3, 0x28(r31) -/* 8046D108 FC 80 18 90 */ fmr f4, f3 -/* 8046D10C 39 00 00 00 */ li r8, 0 -/* 8046D110 4B E3 E8 75 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_8046D114: -/* 8046D114 88 1E 05 D0 */ lbz r0, 0x5d0(r30) -/* 8046D118 28 00 00 00 */ cmplwi r0, 0 -/* 8046D11C 41 82 02 1C */ beq lbl_8046D338 -/* 8046D120 28 00 00 0A */ cmplwi r0, 0xa -/* 8046D124 40 82 00 B4 */ bne lbl_8046D1D8 -/* 8046D128 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 8046D12C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8046D130 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 8046D134 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8046D138 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 8046D13C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8046D140 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 8046D144 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8046D148 88 7E 05 C6 */ lbz r3, 0x5c6(r30) -/* 8046D14C 28 03 00 FF */ cmplwi r3, 0xff -/* 8046D150 40 82 00 28 */ bne lbl_8046D178 -/* 8046D154 80 7E 05 B0 */ lwz r3, 0x5b0(r30) -/* 8046D158 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046D15C 38 84 0D 64 */ addi r4, r4, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ -/* 8046D160 88 84 00 00 */ lbz r4, 0(r4) -/* 8046D164 7C 84 07 74 */ extsb r4, r4 -/* 8046D168 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8046D16C 38 C1 00 0C */ addi r6, r1, 0xc -/* 8046D170 4B CE 86 05 */ bl daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz -/* 8046D174 48 00 00 20 */ b lbl_8046D194 -lbl_8046D178: -/* 8046D178 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046D17C 38 84 0D 64 */ addi r4, r4, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ -/* 8046D180 88 84 00 00 */ lbz r4, 0(r4) -/* 8046D184 7C 84 07 74 */ extsb r4, r4 -/* 8046D188 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8046D18C 38 C1 00 0C */ addi r6, r1, 0xc -/* 8046D190 4B CE 85 E5 */ bl daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz -lbl_8046D194: -/* 8046D194 7F A3 EB 78 */ mr r3, r29 -/* 8046D198 38 81 00 14 */ addi r4, r1, 0x14 -/* 8046D19C A8 BE 04 DE */ lha r5, 0x4de(r30) -/* 8046D1A0 38 C0 00 00 */ li r6, 0 -/* 8046D1A4 81 9D 06 28 */ lwz r12, 0x628(r29) -/* 8046D1A8 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 8046D1AC 7D 89 03 A6 */ mtctr r12 -/* 8046D1B0 4E 80 04 21 */ bctrl -/* 8046D1B4 38 00 00 03 */ li r0, 3 -/* 8046D1B8 B0 1D 06 04 */ sth r0, 0x604(r29) -/* 8046D1BC 38 60 00 00 */ li r3, 0 -/* 8046D1C0 90 7D 06 0C */ stw r3, 0x60c(r29) -/* 8046D1C4 38 00 00 04 */ li r0, 4 -/* 8046D1C8 90 1D 06 14 */ stw r0, 0x614(r29) -/* 8046D1CC 90 7D 06 0C */ stw r3, 0x60c(r29) -/* 8046D1D0 90 7D 06 10 */ stw r3, 0x610(r29) -/* 8046D1D4 B0 7D 06 0A */ sth r3, 0x60a(r29) -lbl_8046D1D8: -/* 8046D1D8 88 7E 05 D0 */ lbz r3, 0x5d0(r30) -/* 8046D1DC 28 03 00 50 */ cmplwi r3, 0x50 -/* 8046D1E0 40 80 00 10 */ bge lbl_8046D1F0 -/* 8046D1E4 38 03 00 01 */ addi r0, r3, 1 -/* 8046D1E8 98 1E 05 D0 */ stb r0, 0x5d0(r30) -/* 8046D1EC 48 00 01 4C */ b lbl_8046D338 -lbl_8046D1F0: -/* 8046D1F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D1F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D1F8 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 8046D1FC 3C 80 80 47 */ lis r4, d_a_kytag04__stringBase0@ha /* 0x8046DA50@ha */ -/* 8046D200 38 84 DA 50 */ addi r4, r4, d_a_kytag04__stringBase0@l /* 0x8046DA50@l */ -/* 8046D204 38 84 00 0E */ addi r4, r4, 0xe -/* 8046D208 4B EF B7 8D */ bl strcmp -/* 8046D20C 2C 03 00 00 */ cmpwi r3, 0 -/* 8046D210 40 82 00 28 */ bne lbl_8046D238 -/* 8046D214 38 60 00 03 */ li r3, 3 -/* 8046D218 C0 3F 00 08 */ lfs f1, 8(r31) -/* 8046D21C 38 80 00 00 */ li r4, 0 -/* 8046D220 3C A0 80 45 */ lis r5, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046D224 88 05 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r5) /* 0x80450D64@l */ -/* 8046D228 7C 05 07 74 */ extsb r5, r0 -/* 8046D22C 38 C0 00 00 */ li r6, 0 -/* 8046D230 38 E0 FF FF */ li r7, -1 -/* 8046D234 4B BB 9F 3D */ bl dStage_changeScene__FifUlScsi -lbl_8046D238: -/* 8046D238 38 00 00 00 */ li r0, 0 -/* 8046D23C 98 1E 05 D0 */ stb r0, 0x5d0(r30) -/* 8046D240 48 00 00 F8 */ b lbl_8046D338 -lbl_8046D244: -/* 8046D244 88 9E 05 B5 */ lbz r4, 0x5b5(r30) -/* 8046D248 28 04 00 FF */ cmplwi r4, 0xff -/* 8046D24C 41 82 00 EC */ beq lbl_8046D338 -/* 8046D250 3C A0 80 45 */ lis r5, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8046D254 38 A5 0D 64 */ addi r5, r5, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ -/* 8046D258 88 A5 00 00 */ lbz r5, 0(r5) -/* 8046D25C 7C A5 07 74 */ extsb r5, r5 -/* 8046D260 4B BC 81 01 */ bl isSwitch__10dSv_info_cCFii -/* 8046D264 2C 03 00 00 */ cmpwi r3, 0 -/* 8046D268 41 82 00 D0 */ beq lbl_8046D338 -/* 8046D26C 88 7E 05 B7 */ lbz r3, 0x5b7(r30) -/* 8046D270 7C 60 07 75 */ extsb. r0, r3 -/* 8046D274 41 82 00 C4 */ beq lbl_8046D338 -/* 8046D278 7C 60 07 74 */ extsb r0, r3 -/* 8046D27C 2C 00 00 01 */ cmpwi r0, 1 -/* 8046D280 41 82 00 B8 */ beq lbl_8046D338 -/* 8046D284 88 1E 05 C4 */ lbz r0, 0x5c4(r30) -/* 8046D288 2C 00 00 01 */ cmpwi r0, 1 -/* 8046D28C 41 82 00 70 */ beq lbl_8046D2FC -/* 8046D290 40 80 00 A8 */ bge lbl_8046D338 -/* 8046D294 2C 00 00 00 */ cmpwi r0, 0 -/* 8046D298 40 80 00 08 */ bge lbl_8046D2A0 -/* 8046D29C 48 00 00 9C */ b lbl_8046D338 -lbl_8046D2A0: -/* 8046D2A0 A0 1E 00 F8 */ lhz r0, 0xf8(r30) -/* 8046D2A4 28 00 00 02 */ cmplwi r0, 2 -/* 8046D2A8 41 82 00 34 */ beq lbl_8046D2DC -/* 8046D2AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D2B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D2B4 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 8046D2B8 7F C4 F3 78 */ mr r4, r30 -/* 8046D2BC 4B BD 52 5D */ bl reset__14dEvt_control_cFPv -/* 8046D2C0 7F C3 F3 78 */ mr r3, r30 -/* 8046D2C4 38 80 04 00 */ li r4, 0x400 -/* 8046D2C8 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 8046D2CC 38 A5 FF FF */ addi r5, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 8046D2D0 38 C0 00 00 */ li r6, 0 -/* 8046D2D4 4B BA E6 35 */ bl fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs -/* 8046D2D8 48 00 00 60 */ b lbl_8046D338 -lbl_8046D2DC: -/* 8046D2DC 38 00 00 01 */ li r0, 1 -/* 8046D2E0 98 1E 05 C5 */ stb r0, 0x5c5(r30) -/* 8046D2E4 38 00 00 0A */ li r0, 0xa -/* 8046D2E8 90 1E 05 C0 */ stw r0, 0x5c0(r30) -/* 8046D2EC 88 7E 05 C4 */ lbz r3, 0x5c4(r30) -/* 8046D2F0 38 03 00 01 */ addi r0, r3, 1 -/* 8046D2F4 98 1E 05 C4 */ stb r0, 0x5c4(r30) -/* 8046D2F8 48 00 00 40 */ b lbl_8046D338 -lbl_8046D2FC: -/* 8046D2FC 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8046D300 2C 03 00 00 */ cmpwi r3, 0 -/* 8046D304 41 81 00 2C */ bgt lbl_8046D330 -/* 8046D308 80 7E 05 BC */ lwz r3, 0x5bc(r30) -/* 8046D30C C0 3F 00 08 */ lfs f1, 8(r31) -/* 8046D310 38 80 00 00 */ li r4, 0 -/* 8046D314 88 BE 04 E2 */ lbz r5, 0x4e2(r30) -/* 8046D318 38 C0 00 00 */ li r6, 0 -/* 8046D31C 38 E0 FF FF */ li r7, -1 -/* 8046D320 4B BB 9E 51 */ bl dStage_changeScene__FifUlScsi -/* 8046D324 38 00 00 01 */ li r0, 1 -/* 8046D328 98 1E 05 B7 */ stb r0, 0x5b7(r30) -/* 8046D32C 48 00 00 0C */ b lbl_8046D338 -lbl_8046D330: -/* 8046D330 38 03 FF FF */ addi r0, r3, -1 -/* 8046D334 90 1E 05 C0 */ stw r0, 0x5c0(r30) -lbl_8046D338: -/* 8046D338 38 60 00 01 */ li r3, 1 -/* 8046D33C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8046D340 4B EF 4E E9 */ bl _restgpr_29 -/* 8046D344 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046D348 7C 08 03 A6 */ mtlr r0 -/* 8046D34C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8046D350 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 7ec08fcecc..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_8046D474: -/* 8046D474 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8046D478 7C 08 02 A6 */ mflr r0 -/* 8046D47C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8046D480 39 61 00 20 */ addi r11, r1, 0x20 -/* 8046D484 4B EF 4D 59 */ bl _savegpr_29 -/* 8046D488 7C 7F 1B 78 */ mr r31, r3 -/* 8046D48C 3C 60 80 47 */ lis r3, d_a_kytag04__stringBase0@ha /* 0x8046DA50@ha */ -/* 8046D490 38 63 DA 50 */ addi r3, r3, d_a_kytag04__stringBase0@l /* 0x8046DA50@l */ -/* 8046D494 38 63 00 16 */ addi r3, r3, 0x16 -/* 8046D498 38 80 00 05 */ li r4, 5 -/* 8046D49C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8046D4A0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8046D4A4 3F A5 00 02 */ addis r29, r5, 2 -/* 8046D4A8 3B BD C2 F8 */ addi r29, r29, -15624 -/* 8046D4AC 7F A5 EB 78 */ mr r5, r29 -/* 8046D4B0 38 C0 00 80 */ li r6, 0x80 -/* 8046D4B4 4B BC EE 39 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8046D4B8 7C 7E 1B 78 */ mr r30, r3 -/* 8046D4BC 3C 80 00 08 */ lis r4, 8 -/* 8046D4C0 3C A0 11 02 */ lis r5, 0x1102 /* 0x11020202@ha */ -/* 8046D4C4 38 A5 02 02 */ addi r5, r5, 0x0202 /* 0x11020202@l */ -/* 8046D4C8 4B BA 77 8D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8046D4CC 90 7F 05 68 */ stw r3, 0x568(r31) -/* 8046D4D0 80 1F 05 68 */ lwz r0, 0x568(r31) -/* 8046D4D4 28 00 00 00 */ cmplwi r0, 0 -/* 8046D4D8 41 82 00 A8 */ beq lbl_8046D580 -/* 8046D4DC 3C 60 80 47 */ lis r3, d_a_kytag04__stringBase0@ha /* 0x8046DA50@ha */ -/* 8046D4E0 38 63 DA 50 */ addi r3, r3, d_a_kytag04__stringBase0@l /* 0x8046DA50@l */ -/* 8046D4E4 38 63 00 16 */ addi r3, r3, 0x16 -/* 8046D4E8 38 80 00 0E */ li r4, 0xe -/* 8046D4EC 7F A5 EB 78 */ mr r5, r29 -/* 8046D4F0 38 C0 00 80 */ li r6, 0x80 -/* 8046D4F4 4B BC ED F9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8046D4F8 7C 65 1B 78 */ mr r5, r3 -/* 8046D4FC 38 7F 05 6C */ addi r3, r31, 0x56c -/* 8046D500 38 9E 00 58 */ addi r4, r30, 0x58 -/* 8046D504 38 C0 00 01 */ li r6, 1 -/* 8046D508 38 E0 00 02 */ li r7, 2 -/* 8046D50C 3D 00 80 47 */ lis r8, lit_3964@ha /* 0x8046DA28@ha */ -/* 8046D510 C0 28 DA 28 */ lfs f1, lit_3964@l(r8) /* 0x8046DA28@l */ -/* 8046D514 39 00 00 00 */ li r8, 0 -/* 8046D518 39 20 FF FF */ li r9, -1 -/* 8046D51C 4B BA 01 21 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 8046D520 2C 03 00 00 */ cmpwi r3, 0 -/* 8046D524 40 82 00 0C */ bne lbl_8046D530 -/* 8046D528 38 60 00 00 */ li r3, 0 -/* 8046D52C 48 00 00 58 */ b lbl_8046D584 -lbl_8046D530: -/* 8046D530 3C 60 80 47 */ lis r3, d_a_kytag04__stringBase0@ha /* 0x8046DA50@ha */ -/* 8046D534 38 63 DA 50 */ addi r3, r3, d_a_kytag04__stringBase0@l /* 0x8046DA50@l */ -/* 8046D538 38 63 00 16 */ addi r3, r3, 0x16 -/* 8046D53C 38 80 00 08 */ li r4, 8 -/* 8046D540 7F A5 EB 78 */ mr r5, r29 -/* 8046D544 38 C0 00 80 */ li r6, 0x80 -/* 8046D548 4B BC ED A5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8046D54C 7C 65 1B 78 */ mr r5, r3 -/* 8046D550 38 7F 05 84 */ addi r3, r31, 0x584 -/* 8046D554 38 9E 00 58 */ addi r4, r30, 0x58 -/* 8046D558 38 C0 00 01 */ li r6, 1 -/* 8046D55C 38 E0 00 00 */ li r7, 0 -/* 8046D560 3D 00 80 47 */ lis r8, lit_3964@ha /* 0x8046DA28@ha */ -/* 8046D564 C0 28 DA 28 */ lfs f1, lit_3964@l(r8) /* 0x8046DA28@l */ -/* 8046D568 39 00 00 00 */ li r8, 0 -/* 8046D56C 39 20 FF FF */ li r9, -1 -/* 8046D570 4B BA 01 9D */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 8046D574 30 03 FF FF */ addic r0, r3, -1 -/* 8046D578 7C 60 19 10 */ subfe r3, r0, r3 -/* 8046D57C 48 00 00 08 */ b lbl_8046D584 -lbl_8046D580: -/* 8046D580 38 60 00 00 */ li r3, 0 -lbl_8046D584: -/* 8046D584 39 61 00 20 */ addi r11, r1, 0x20 -/* 8046D588 4B EF 4C A1 */ bl _restgpr_29 -/* 8046D58C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8046D590 7C 08 03 A6 */ mtlr r0 -/* 8046D594 38 21 00 20 */ addi r1, r1, 0x20 -/* 8046D598 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 6dee9c6d56..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8085B23C: -/* 8085B23C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8085B240 7C 08 02 A6 */ mflr r0 -/* 8085B244 90 01 00 14 */ stw r0, 0x14(r1) -/* 8085B248 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8085B24C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8085B250 41 82 00 1C */ beq lbl_8085B26C -/* 8085B254 3C A0 80 86 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x8085B368@ha */ -/* 8085B258 38 05 B3 68 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x8085B368@l */ -/* 8085B25C 90 1F 00 00 */ stw r0, 0(r31) -/* 8085B260 7C 80 07 35 */ extsh. r0, r4 -/* 8085B264 40 81 00 08 */ ble lbl_8085B26C -/* 8085B268 4B A7 3A D5 */ bl __dl__FPv -lbl_8085B26C: -/* 8085B26C 7F E3 FB 78 */ mr r3, r31 -/* 8085B270 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8085B274 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8085B278 7C 08 03 A6 */ mtlr r0 -/* 8085B27C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8085B280 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/daKytag08_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/daKytag08_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 36f082159b..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/daKytag08_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,156 +0,0 @@ -lbl_8085AFEC: -/* 8085AFEC 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8085AFF0 7C 08 02 A6 */ mflr r0 -/* 8085AFF4 90 01 00 54 */ stw r0, 0x54(r1) -/* 8085AFF8 39 61 00 50 */ addi r11, r1, 0x50 -/* 8085AFFC 4B B0 71 D9 */ bl _savegpr_27 -/* 8085B000 7C 7D 1B 78 */ mr r29, r3 -/* 8085B004 3C 80 80 86 */ lis r4, lit_4012@ha /* 0x8085B28C@ha */ -/* 8085B008 3B C4 B2 8C */ addi r30, r4, lit_4012@l /* 0x8085B28C@l */ -/* 8085B00C C0 1E 00 50 */ lfs f0, 0x50(r30) -/* 8085B010 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8085B014 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8085B018 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8085B01C 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085B020 3B E4 CA 54 */ addi r31, r4, g_env_light@l /* 0x8042CA54@l */ -/* 8085B024 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8085B028 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8085B02C 40 82 00 64 */ bne lbl_8085B090 -/* 8085B030 7F A0 EB 79 */ or. r0, r29, r29 -/* 8085B034 41 82 00 50 */ beq lbl_8085B084 -/* 8085B038 7C 1B 03 78 */ mr r27, r0 -/* 8085B03C 4B 7B DB 29 */ bl __ct__10fopAc_ac_cFv -/* 8085B040 3B 9B 05 6C */ addi r28, r27, 0x56c -/* 8085B044 3C 60 80 86 */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x8085B368@ha */ -/* 8085B048 38 03 B3 68 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x8085B368@l */ -/* 8085B04C 90 1B 05 6C */ stw r0, 0x56c(r27) -/* 8085B050 7F 83 E3 78 */ mr r3, r28 -/* 8085B054 38 80 00 00 */ li r4, 0 -/* 8085B058 4B AC D3 A5 */ bl init__12J3DFrameCtrlFs -/* 8085B05C 38 00 00 00 */ li r0, 0 -/* 8085B060 90 1C 00 14 */ stw r0, 0x14(r28) -/* 8085B064 3C 60 80 86 */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x8085B368@ha */ -/* 8085B068 38 03 B3 68 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x8085B368@l */ -/* 8085B06C 94 1B 05 84 */ stwu r0, 0x584(r27) -/* 8085B070 7F 63 DB 78 */ mr r3, r27 -/* 8085B074 38 80 00 00 */ li r4, 0 -/* 8085B078 4B AC D3 85 */ bl init__12J3DFrameCtrlFs -/* 8085B07C 38 00 00 00 */ li r0, 0 -/* 8085B080 90 1B 00 14 */ stw r0, 0x14(r27) -lbl_8085B084: -/* 8085B084 80 1D 04 A0 */ lwz r0, 0x4a0(r29) -/* 8085B088 60 00 00 08 */ ori r0, r0, 8 -/* 8085B08C 90 1D 04 A0 */ stw r0, 0x4a0(r29) -lbl_8085B090: -/* 8085B090 38 7D 05 A4 */ addi r3, r29, 0x5a4 -/* 8085B094 3C 80 80 86 */ lis r4, d_a_kytag08__stringBase0@ha /* 0x8085B310@ha */ -/* 8085B098 38 84 B3 10 */ addi r4, r4, d_a_kytag08__stringBase0@l /* 0x8085B310@l */ -/* 8085B09C 4B 7D 1E 21 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8085B0A0 7C 7C 1B 78 */ mr r28, r3 -/* 8085B0A4 2C 1C 00 04 */ cmpwi r28, 4 -/* 8085B0A8 40 82 01 78 */ bne lbl_8085B220 -/* 8085B0AC 7F A3 EB 78 */ mr r3, r29 -/* 8085B0B0 3C 80 80 86 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x8085AF74@ha */ -/* 8085B0B4 38 84 AF 74 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x8085AF74@l */ -/* 8085B0B8 38 A0 05 50 */ li r5, 0x550 -/* 8085B0BC 4B 7B F3 F5 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 8085B0C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8085B0C4 40 82 00 0C */ bne lbl_8085B0D0 -/* 8085B0C8 38 60 00 05 */ li r3, 5 -/* 8085B0CC 48 00 01 58 */ b lbl_8085B224 -lbl_8085B0D0: -/* 8085B0D0 C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 8085B0D4 D0 1D 05 AC */ stfs f0, 0x5ac(r29) -/* 8085B0D8 D0 1D 05 B0 */ stfs f0, 0x5b0(r29) -/* 8085B0DC D0 1D 05 B4 */ stfs f0, 0x5b4(r29) -/* 8085B0E0 C0 1E 00 04 */ lfs f0, 4(r30) -/* 8085B0E4 D0 1D 05 D0 */ stfs f0, 0x5d0(r29) -/* 8085B0E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085B0EC 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085B0F0 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) -/* 8085B0F4 38 80 00 00 */ li r4, 0 -/* 8085B0F8 90 81 00 08 */ stw r4, 8(r1) -/* 8085B0FC 38 00 FF FF */ li r0, -1 -/* 8085B100 90 01 00 0C */ stw r0, 0xc(r1) -/* 8085B104 90 81 00 10 */ stw r4, 0x10(r1) -/* 8085B108 90 81 00 14 */ stw r4, 0x14(r1) -/* 8085B10C 90 81 00 18 */ stw r4, 0x18(r1) -/* 8085B110 38 80 00 00 */ li r4, 0 -/* 8085B114 3C A0 00 01 */ lis r5, 0x0001 /* 0x000084A0@ha */ -/* 8085B118 38 A5 84 A0 */ addi r5, r5, 0x84A0 /* 0x000084A0@l */ -/* 8085B11C 38 DD 04 D0 */ addi r6, r29, 0x4d0 -/* 8085B120 38 E0 00 00 */ li r7, 0 -/* 8085B124 39 00 00 00 */ li r8, 0 -/* 8085B128 39 21 00 20 */ addi r9, r1, 0x20 -/* 8085B12C 39 40 00 FF */ li r10, 0xff -/* 8085B130 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8085B134 4B 7F 19 5D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8085B138 90 7D 05 9C */ stw r3, 0x59c(r29) -/* 8085B13C 4B 95 14 41 */ bl dKy_darkworld_check__Fv -/* 8085B140 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8085B144 40 82 00 54 */ bne lbl_8085B198 -/* 8085B148 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) -/* 8085B14C 38 80 00 00 */ li r4, 0 -/* 8085B150 90 81 00 08 */ stw r4, 8(r1) -/* 8085B154 38 00 FF FF */ li r0, -1 -/* 8085B158 90 01 00 0C */ stw r0, 0xc(r1) -/* 8085B15C 90 81 00 10 */ stw r4, 0x10(r1) -/* 8085B160 90 81 00 14 */ stw r4, 0x14(r1) -/* 8085B164 90 81 00 18 */ stw r4, 0x18(r1) -/* 8085B168 38 80 00 00 */ li r4, 0 -/* 8085B16C 3C A0 00 01 */ lis r5, 0x0001 /* 0x000084A1@ha */ -/* 8085B170 38 A5 84 A1 */ addi r5, r5, 0x84A1 /* 0x000084A1@l */ -/* 8085B174 38 DD 04 D0 */ addi r6, r29, 0x4d0 -/* 8085B178 38 E0 00 00 */ li r7, 0 -/* 8085B17C 39 00 00 00 */ li r8, 0 -/* 8085B180 39 21 00 20 */ addi r9, r1, 0x20 -/* 8085B184 39 40 00 FF */ li r10, 0xff -/* 8085B188 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8085B18C 4B 7F 19 05 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8085B190 90 7D 05 A0 */ stw r3, 0x5a0(r29) -/* 8085B194 48 00 00 50 */ b lbl_8085B1E4 -lbl_8085B198: -/* 8085B198 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) -/* 8085B19C 38 80 00 00 */ li r4, 0 -/* 8085B1A0 90 81 00 08 */ stw r4, 8(r1) -/* 8085B1A4 38 00 FF FF */ li r0, -1 -/* 8085B1A8 90 01 00 0C */ stw r0, 0xc(r1) -/* 8085B1AC 90 81 00 10 */ stw r4, 0x10(r1) -/* 8085B1B0 90 81 00 14 */ stw r4, 0x14(r1) -/* 8085B1B4 90 81 00 18 */ stw r4, 0x18(r1) -/* 8085B1B8 38 80 00 00 */ li r4, 0 -/* 8085B1BC 3C A0 00 01 */ lis r5, 0x0001 /* 0x000084A2@ha */ -/* 8085B1C0 38 A5 84 A2 */ addi r5, r5, 0x84A2 /* 0x000084A2@l */ -/* 8085B1C4 38 DD 04 D0 */ addi r6, r29, 0x4d0 -/* 8085B1C8 38 E0 00 00 */ li r7, 0 -/* 8085B1CC 39 00 00 00 */ li r8, 0 -/* 8085B1D0 39 21 00 20 */ addi r9, r1, 0x20 -/* 8085B1D4 39 40 00 FF */ li r10, 0xff -/* 8085B1D8 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8085B1DC 4B 7F 18 B5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8085B1E0 90 7D 05 A0 */ stw r3, 0x5a0(r29) -lbl_8085B1E4: -/* 8085B1E4 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8085B1E8 D0 1D 05 B8 */ stfs f0, 0x5b8(r29) -/* 8085B1EC C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 8085B1F0 D0 1D 05 BC */ stfs f0, 0x5bc(r29) -/* 8085B1F4 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 8085B1F8 D0 1D 05 C0 */ stfs f0, 0x5c0(r29) -/* 8085B1FC C0 1E 00 00 */ lfs f0, 0(r30) -/* 8085B200 D0 1D 05 BC */ stfs f0, 0x5bc(r29) -/* 8085B204 C0 1D 05 B8 */ lfs f0, 0x5b8(r29) -/* 8085B208 D0 1D 05 C4 */ stfs f0, 0x5c4(r29) -/* 8085B20C C0 1D 05 BC */ lfs f0, 0x5bc(r29) -/* 8085B210 D0 1D 05 C8 */ stfs f0, 0x5c8(r29) -/* 8085B214 C0 1D 05 C0 */ lfs f0, 0x5c0(r29) -/* 8085B218 D0 1D 05 CC */ stfs f0, 0x5cc(r29) -/* 8085B21C 93 BF 10 60 */ stw r29, 0x1060(r31) -lbl_8085B220: -/* 8085B220 7F 83 E3 78 */ mr r3, r28 -lbl_8085B224: -/* 8085B224 39 61 00 50 */ addi r11, r1, 0x50 -/* 8085B228 4B B0 6F F9 */ bl _restgpr_27 -/* 8085B22C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8085B230 7C 08 03 A6 */ mtlr r0 -/* 8085B234 38 21 00 50 */ addi r1, r1, 0x50 -/* 8085B238 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/daKytag08_Execute__FP13kytag08_class.s b/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/daKytag08_Execute__FP13kytag08_class.s deleted file mode 100644 index 4f005dda69..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/daKytag08_Execute__FP13kytag08_class.s +++ /dev/null @@ -1,651 +0,0 @@ -lbl_8085A580: -/* 8085A580 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8085A584 7C 08 02 A6 */ mflr r0 -/* 8085A588 90 01 00 74 */ stw r0, 0x74(r1) -/* 8085A58C DB E1 00 60 */ stfd f31, 0x60(r1) -/* 8085A590 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 8085A594 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 8085A598 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 8085A59C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8085A5A0 4B B0 7C 39 */ bl _savegpr_28 -/* 8085A5A4 7C 7C 1B 78 */ mr r28, r3 -/* 8085A5A8 3C 60 80 86 */ lis r3, lit_4012@ha /* 0x8085B28C@ha */ -/* 8085A5AC 3B C3 B2 8C */ addi r30, r3, lit_4012@l /* 0x8085B28C@l */ -/* 8085A5B0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085A5B4 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085A5B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085A5BC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085A5C0 83 BF 5D AC */ lwz r29, 0x5dac(r31) -/* 8085A5C4 38 00 00 01 */ li r0, 1 -/* 8085A5C8 98 1C 05 D8 */ stb r0, 0x5d8(r28) -/* 8085A5CC 88 1C 05 D8 */ lbz r0, 0x5d8(r28) -/* 8085A5D0 28 00 00 00 */ cmplwi r0, 0 -/* 8085A5D4 40 82 00 20 */ bne lbl_8085A5F4 -/* 8085A5D8 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8085A5DC D0 1C 04 D0 */ stfs f0, 0x4d0(r28) -/* 8085A5E0 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8085A5E4 D0 1C 04 D4 */ stfs f0, 0x4d4(r28) -/* 8085A5E8 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 8085A5EC D0 1C 04 D8 */ stfs f0, 0x4d8(r28) -/* 8085A5F0 48 00 00 28 */ b lbl_8085A618 -lbl_8085A5F4: -/* 8085A5F4 88 04 0C 3E */ lbz r0, 0xc3e(r4) -/* 8085A5F8 28 00 00 01 */ cmplwi r0, 1 -/* 8085A5FC 40 82 00 1C */ bne lbl_8085A618 -/* 8085A600 C0 04 0C 18 */ lfs f0, 0xc18(r4) -/* 8085A604 D0 1C 04 D0 */ stfs f0, 0x4d0(r28) -/* 8085A608 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8085A60C D0 1C 04 D4 */ stfs f0, 0x4d4(r28) -/* 8085A610 C0 04 0C 20 */ lfs f0, 0xc20(r4) -/* 8085A614 D0 1C 04 D8 */ stfs f0, 0x4d8(r28) -lbl_8085A618: -/* 8085A618 38 7C 05 B8 */ addi r3, r28, 0x5b8 -/* 8085A61C 38 9C 04 D0 */ addi r4, r28, 0x4d0 -/* 8085A620 4B AE CD 7D */ bl PSVECSquareDistance -/* 8085A624 C0 1E 00 04 */ lfs f0, 4(r30) -/* 8085A628 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085A62C 40 81 00 58 */ ble lbl_8085A684 -/* 8085A630 FC 00 08 34 */ frsqrte f0, f1 -/* 8085A634 C8 9E 00 08 */ lfd f4, 8(r30) -/* 8085A638 FC 44 00 32 */ fmul f2, f4, f0 -/* 8085A63C C8 7E 00 10 */ lfd f3, 0x10(r30) -/* 8085A640 FC 00 00 32 */ fmul f0, f0, f0 -/* 8085A644 FC 01 00 32 */ fmul f0, f1, f0 -/* 8085A648 FC 03 00 28 */ fsub f0, f3, f0 -/* 8085A64C FC 02 00 32 */ fmul f0, f2, f0 -/* 8085A650 FC 44 00 32 */ fmul f2, f4, f0 -/* 8085A654 FC 00 00 32 */ fmul f0, f0, f0 -/* 8085A658 FC 01 00 32 */ fmul f0, f1, f0 -/* 8085A65C FC 03 00 28 */ fsub f0, f3, f0 -/* 8085A660 FC 02 00 32 */ fmul f0, f2, f0 -/* 8085A664 FC 44 00 32 */ fmul f2, f4, f0 -/* 8085A668 FC 00 00 32 */ fmul f0, f0, f0 -/* 8085A66C FC 01 00 32 */ fmul f0, f1, f0 -/* 8085A670 FC 03 00 28 */ fsub f0, f3, f0 -/* 8085A674 FC 02 00 32 */ fmul f0, f2, f0 -/* 8085A678 FC 21 00 32 */ fmul f1, f1, f0 -/* 8085A67C FC 20 08 18 */ frsp f1, f1 -/* 8085A680 48 00 00 88 */ b lbl_8085A708 -lbl_8085A684: -/* 8085A684 C8 1E 00 18 */ lfd f0, 0x18(r30) -/* 8085A688 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085A68C 40 80 00 10 */ bge lbl_8085A69C -/* 8085A690 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8085A694 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8085A698 48 00 00 70 */ b lbl_8085A708 -lbl_8085A69C: -/* 8085A69C D0 21 00 14 */ stfs f1, 0x14(r1) -/* 8085A6A0 80 81 00 14 */ lwz r4, 0x14(r1) -/* 8085A6A4 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8085A6A8 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8085A6AC 7C 03 00 00 */ cmpw r3, r0 -/* 8085A6B0 41 82 00 14 */ beq lbl_8085A6C4 -/* 8085A6B4 40 80 00 40 */ bge lbl_8085A6F4 -/* 8085A6B8 2C 03 00 00 */ cmpwi r3, 0 -/* 8085A6BC 41 82 00 20 */ beq lbl_8085A6DC -/* 8085A6C0 48 00 00 34 */ b lbl_8085A6F4 -lbl_8085A6C4: -/* 8085A6C4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8085A6C8 41 82 00 0C */ beq lbl_8085A6D4 -/* 8085A6CC 38 00 00 01 */ li r0, 1 -/* 8085A6D0 48 00 00 28 */ b lbl_8085A6F8 -lbl_8085A6D4: -/* 8085A6D4 38 00 00 02 */ li r0, 2 -/* 8085A6D8 48 00 00 20 */ b lbl_8085A6F8 -lbl_8085A6DC: -/* 8085A6DC 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8085A6E0 41 82 00 0C */ beq lbl_8085A6EC -/* 8085A6E4 38 00 00 05 */ li r0, 5 -/* 8085A6E8 48 00 00 10 */ b lbl_8085A6F8 -lbl_8085A6EC: -/* 8085A6EC 38 00 00 03 */ li r0, 3 -/* 8085A6F0 48 00 00 08 */ b lbl_8085A6F8 -lbl_8085A6F4: -/* 8085A6F4 38 00 00 04 */ li r0, 4 -lbl_8085A6F8: -/* 8085A6F8 2C 00 00 01 */ cmpwi r0, 1 -/* 8085A6FC 40 82 00 0C */ bne lbl_8085A708 -/* 8085A700 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8085A704 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8085A708: -/* 8085A708 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 8085A70C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085A710 40 80 00 CC */ bge lbl_8085A7DC -/* 8085A714 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085A718 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085A71C 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 8085A720 28 00 00 00 */ cmplwi r0, 0 -/* 8085A724 40 82 00 B8 */ bne lbl_8085A7DC -/* 8085A728 80 1C 05 D4 */ lwz r0, 0x5d4(r28) -/* 8085A72C 2C 00 00 64 */ cmpwi r0, 0x64 -/* 8085A730 40 81 00 58 */ ble lbl_8085A788 -/* 8085A734 88 1C 05 D8 */ lbz r0, 0x5d8(r28) -/* 8085A738 28 00 00 00 */ cmplwi r0, 0 -/* 8085A73C 41 82 00 10 */ beq lbl_8085A74C -/* 8085A740 C3 DE 00 24 */ lfs f30, 0x24(r30) -/* 8085A744 C3 FE 00 28 */ lfs f31, 0x28(r30) -/* 8085A748 48 00 00 0C */ b lbl_8085A754 -lbl_8085A74C: -/* 8085A74C C3 DE 00 2C */ lfs f30, 0x2c(r30) -/* 8085A750 C3 FE 00 30 */ lfs f31, 0x30(r30) -lbl_8085A754: -/* 8085A754 38 7C 05 B8 */ addi r3, r28, 0x5b8 -/* 8085A758 C0 3C 05 C4 */ lfs f1, 0x5c4(r28) -/* 8085A75C FC 40 F8 90 */ fmr f2, f31 -/* 8085A760 FC 60 F0 90 */ fmr f3, f30 -/* 8085A764 C0 9E 00 34 */ lfs f4, 0x34(r30) -/* 8085A768 4B A1 52 15 */ bl cLib_addCalc__FPfffff -/* 8085A76C 38 7C 05 C0 */ addi r3, r28, 0x5c0 -/* 8085A770 C0 3C 05 CC */ lfs f1, 0x5cc(r28) -/* 8085A774 FC 40 F8 90 */ fmr f2, f31 -/* 8085A778 FC 60 F0 90 */ fmr f3, f30 -/* 8085A77C C0 9E 00 34 */ lfs f4, 0x34(r30) -/* 8085A780 4B A1 51 FD */ bl cLib_addCalc__FPfffff -/* 8085A784 48 00 00 68 */ b lbl_8085A7EC -lbl_8085A788: -/* 8085A788 88 1C 05 D8 */ lbz r0, 0x5d8(r28) -/* 8085A78C 28 00 00 00 */ cmplwi r0, 0 -/* 8085A790 41 82 00 10 */ beq lbl_8085A7A0 -/* 8085A794 C3 DE 00 38 */ lfs f30, 0x38(r30) -/* 8085A798 C3 FE 00 3C */ lfs f31, 0x3c(r30) -/* 8085A79C 48 00 00 0C */ b lbl_8085A7A8 -lbl_8085A7A0: -/* 8085A7A0 C3 DE 00 40 */ lfs f30, 0x40(r30) -/* 8085A7A4 C3 FE 00 44 */ lfs f31, 0x44(r30) -lbl_8085A7A8: -/* 8085A7A8 38 7C 05 B8 */ addi r3, r28, 0x5b8 -/* 8085A7AC C0 3C 05 C4 */ lfs f1, 0x5c4(r28) -/* 8085A7B0 FC 40 F8 90 */ fmr f2, f31 -/* 8085A7B4 FC 60 F0 90 */ fmr f3, f30 -/* 8085A7B8 C0 9E 00 28 */ lfs f4, 0x28(r30) -/* 8085A7BC 4B A1 51 C1 */ bl cLib_addCalc__FPfffff -/* 8085A7C0 38 7C 05 C0 */ addi r3, r28, 0x5c0 -/* 8085A7C4 C0 3C 05 CC */ lfs f1, 0x5cc(r28) -/* 8085A7C8 FC 40 F8 90 */ fmr f2, f31 -/* 8085A7CC FC 60 F0 90 */ fmr f3, f30 -/* 8085A7D0 C0 9E 00 28 */ lfs f4, 0x28(r30) -/* 8085A7D4 4B A1 51 A9 */ bl cLib_addCalc__FPfffff -/* 8085A7D8 48 00 00 14 */ b lbl_8085A7EC -lbl_8085A7DC: -/* 8085A7DC C0 1C 04 D0 */ lfs f0, 0x4d0(r28) -/* 8085A7E0 D0 1C 05 B8 */ stfs f0, 0x5b8(r28) -/* 8085A7E4 C0 1C 04 D8 */ lfs f0, 0x4d8(r28) -/* 8085A7E8 D0 1C 05 C0 */ stfs f0, 0x5c0(r28) -lbl_8085A7EC: -/* 8085A7EC 38 60 00 02 */ li r3, 2 -/* 8085A7F0 4B 95 25 1D */ bl dKy_shadow_mode_check__FUc -/* 8085A7F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8085A7F8 40 82 00 34 */ bne lbl_8085A82C -/* 8085A7FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085A800 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085A804 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 8085A808 28 00 00 00 */ cmplwi r0, 0 -/* 8085A80C 40 82 00 74 */ bne lbl_8085A880 -/* 8085A810 38 7C 05 D0 */ addi r3, r28, 0x5d0 -/* 8085A814 C0 3E 00 04 */ lfs f1, 4(r30) -/* 8085A818 C0 5E 00 30 */ lfs f2, 0x30(r30) -/* 8085A81C C0 7E 00 48 */ lfs f3, 0x48(r30) -/* 8085A820 C0 9E 00 4C */ lfs f4, 0x4c(r30) -/* 8085A824 4B A1 51 59 */ bl cLib_addCalc__FPfffff -/* 8085A828 48 00 00 58 */ b lbl_8085A880 -lbl_8085A82C: -/* 8085A82C 80 1C 05 D4 */ lwz r0, 0x5d4(r28) -/* 8085A830 2C 00 00 00 */ cmpwi r0, 0 -/* 8085A834 41 82 00 20 */ beq lbl_8085A854 -/* 8085A838 38 7C 05 D0 */ addi r3, r28, 0x5d0 -/* 8085A83C C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8085A840 C0 5E 00 54 */ lfs f2, 0x54(r30) -/* 8085A844 C0 7E 00 58 */ lfs f3, 0x58(r30) -/* 8085A848 C0 9E 00 4C */ lfs f4, 0x4c(r30) -/* 8085A84C 4B A1 51 31 */ bl cLib_addCalc__FPfffff -/* 8085A850 48 00 00 30 */ b lbl_8085A880 -lbl_8085A854: -/* 8085A854 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085A858 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085A85C 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 8085A860 28 00 00 00 */ cmplwi r0, 0 -/* 8085A864 40 82 00 1C */ bne lbl_8085A880 -/* 8085A868 38 7C 05 D0 */ addi r3, r28, 0x5d0 -/* 8085A86C C0 3E 00 5C */ lfs f1, 0x5c(r30) -/* 8085A870 C0 5E 00 58 */ lfs f2, 0x58(r30) -/* 8085A874 C0 7E 00 60 */ lfs f3, 0x60(r30) -/* 8085A878 C0 9E 00 4C */ lfs f4, 0x4c(r30) -/* 8085A87C 4B A1 51 01 */ bl cLib_addCalc__FPfffff -lbl_8085A880: -/* 8085A880 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */ -/* 8085A884 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ -/* 8085A888 C0 3C 05 D0 */ lfs f1, 0x5d0(r28) -/* 8085A88C 4B A6 EB 15 */ bl setFogWipeWidth__10Z2EnvSeMgrFf -/* 8085A890 88 1C 05 D8 */ lbz r0, 0x5d8(r28) -/* 8085A894 28 00 00 00 */ cmplwi r0, 0 -/* 8085A898 41 82 01 18 */ beq lbl_8085A9B0 -/* 8085A89C 38 7C 05 B8 */ addi r3, r28, 0x5b8 -/* 8085A8A0 38 9C 04 D0 */ addi r4, r28, 0x4d0 -/* 8085A8A4 4B AE CA F9 */ bl PSVECSquareDistance -/* 8085A8A8 C0 1E 00 04 */ lfs f0, 4(r30) -/* 8085A8AC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085A8B0 40 81 00 58 */ ble lbl_8085A908 -/* 8085A8B4 FC 00 08 34 */ frsqrte f0, f1 -/* 8085A8B8 C8 9E 00 08 */ lfd f4, 8(r30) -/* 8085A8BC FC 44 00 32 */ fmul f2, f4, f0 -/* 8085A8C0 C8 7E 00 10 */ lfd f3, 0x10(r30) -/* 8085A8C4 FC 00 00 32 */ fmul f0, f0, f0 -/* 8085A8C8 FC 01 00 32 */ fmul f0, f1, f0 -/* 8085A8CC FC 03 00 28 */ fsub f0, f3, f0 -/* 8085A8D0 FC 02 00 32 */ fmul f0, f2, f0 -/* 8085A8D4 FC 44 00 32 */ fmul f2, f4, f0 -/* 8085A8D8 FC 00 00 32 */ fmul f0, f0, f0 -/* 8085A8DC FC 01 00 32 */ fmul f0, f1, f0 -/* 8085A8E0 FC 03 00 28 */ fsub f0, f3, f0 -/* 8085A8E4 FC 02 00 32 */ fmul f0, f2, f0 -/* 8085A8E8 FC 44 00 32 */ fmul f2, f4, f0 -/* 8085A8EC FC 00 00 32 */ fmul f0, f0, f0 -/* 8085A8F0 FC 01 00 32 */ fmul f0, f1, f0 -/* 8085A8F4 FC 03 00 28 */ fsub f0, f3, f0 -/* 8085A8F8 FC 02 00 32 */ fmul f0, f2, f0 -/* 8085A8FC FC 21 00 32 */ fmul f1, f1, f0 -/* 8085A900 FC 20 08 18 */ frsp f1, f1 -/* 8085A904 48 00 00 88 */ b lbl_8085A98C -lbl_8085A908: -/* 8085A908 C8 1E 00 18 */ lfd f0, 0x18(r30) -/* 8085A90C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085A910 40 80 00 10 */ bge lbl_8085A920 -/* 8085A914 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8085A918 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8085A91C 48 00 00 70 */ b lbl_8085A98C -lbl_8085A920: -/* 8085A920 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8085A924 80 81 00 10 */ lwz r4, 0x10(r1) -/* 8085A928 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8085A92C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8085A930 7C 03 00 00 */ cmpw r3, r0 -/* 8085A934 41 82 00 14 */ beq lbl_8085A948 -/* 8085A938 40 80 00 40 */ bge lbl_8085A978 -/* 8085A93C 2C 03 00 00 */ cmpwi r3, 0 -/* 8085A940 41 82 00 20 */ beq lbl_8085A960 -/* 8085A944 48 00 00 34 */ b lbl_8085A978 -lbl_8085A948: -/* 8085A948 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8085A94C 41 82 00 0C */ beq lbl_8085A958 -/* 8085A950 38 00 00 01 */ li r0, 1 -/* 8085A954 48 00 00 28 */ b lbl_8085A97C -lbl_8085A958: -/* 8085A958 38 00 00 02 */ li r0, 2 -/* 8085A95C 48 00 00 20 */ b lbl_8085A97C -lbl_8085A960: -/* 8085A960 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8085A964 41 82 00 0C */ beq lbl_8085A970 -/* 8085A968 38 00 00 05 */ li r0, 5 -/* 8085A96C 48 00 00 10 */ b lbl_8085A97C -lbl_8085A970: -/* 8085A970 38 00 00 03 */ li r0, 3 -/* 8085A974 48 00 00 08 */ b lbl_8085A97C -lbl_8085A978: -/* 8085A978 38 00 00 04 */ li r0, 4 -lbl_8085A97C: -/* 8085A97C 2C 00 00 01 */ cmpwi r0, 1 -/* 8085A980 40 82 00 0C */ bne lbl_8085A98C -/* 8085A984 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8085A988 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8085A98C: -/* 8085A98C C0 7C 05 D0 */ lfs f3, 0x5d0(r28) -/* 8085A990 C0 5C 05 AC */ lfs f2, 0x5ac(r28) -/* 8085A994 C0 1E 00 64 */ lfs f0, 0x64(r30) -/* 8085A998 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8085A99C EC 03 00 32 */ fmuls f0, f3, f0 -/* 8085A9A0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085A9A4 40 81 00 0C */ ble lbl_8085A9B0 -/* 8085A9A8 38 60 00 02 */ li r3, 2 -/* 8085A9AC 4B 7D 2F 51 */ bl dComIfGs_BossLife_public_Set__FSc -lbl_8085A9B0: -/* 8085A9B0 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 8085A9B4 38 80 00 01 */ li r4, 1 -/* 8085A9B8 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8085A9BC 81 8C 01 B8 */ lwz r12, 0x1b8(r12) -/* 8085A9C0 7D 89 03 A6 */ mtctr r12 -/* 8085A9C4 4E 80 04 21 */ bctrl -/* 8085A9C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8085A9CC 41 82 00 10 */ beq lbl_8085A9DC -/* 8085A9D0 80 1C 05 D4 */ lwz r0, 0x5d4(r28) -/* 8085A9D4 2C 00 00 64 */ cmpwi r0, 0x64 -/* 8085A9D8 41 80 00 14 */ blt lbl_8085A9EC -lbl_8085A9DC: -/* 8085A9DC 4B 7D 2F 35 */ bl dComIfGs_BossLife_public_Get__Fv -/* 8085A9E0 7C 60 07 74 */ extsb r0, r3 -/* 8085A9E4 2C 00 00 01 */ cmpwi r0, 1 -/* 8085A9E8 40 82 00 40 */ bne lbl_8085AA28 -lbl_8085A9EC: -/* 8085A9EC 38 60 00 00 */ li r3, 0 -/* 8085A9F0 4B 7D 2F 0D */ bl dComIfGs_BossLife_public_Set__FSc -/* 8085A9F4 C0 1C 04 D0 */ lfs f0, 0x4d0(r28) -/* 8085A9F8 D0 1C 05 C4 */ stfs f0, 0x5c4(r28) -/* 8085A9FC C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 8085AA00 D0 1C 05 C8 */ stfs f0, 0x5c8(r28) -/* 8085AA04 C0 1C 04 D8 */ lfs f0, 0x4d8(r28) -/* 8085AA08 D0 1C 05 CC */ stfs f0, 0x5cc(r28) -/* 8085AA0C 38 00 00 B4 */ li r0, 0xb4 -/* 8085AA10 90 1C 05 D4 */ stw r0, 0x5d4(r28) -/* 8085AA14 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */ -/* 8085AA18 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ -/* 8085AA1C 38 9C 04 D0 */ addi r4, r28, 0x4d0 -/* 8085AA20 4B A6 E8 CD */ bl startFogWipeTrigger__10Z2EnvSeMgrFP3Vec -/* 8085AA24 48 00 00 54 */ b lbl_8085AA78 -lbl_8085AA28: -/* 8085AA28 88 1C 05 D8 */ lbz r0, 0x5d8(r28) -/* 8085AA2C 28 00 00 00 */ cmplwi r0, 0 -/* 8085AA30 41 82 00 10 */ beq lbl_8085AA40 -/* 8085AA34 C3 DE 00 68 */ lfs f30, 0x68(r30) -/* 8085AA38 C3 FE 00 54 */ lfs f31, 0x54(r30) -/* 8085AA3C 48 00 00 0C */ b lbl_8085AA48 -lbl_8085AA40: -/* 8085AA40 C3 DE 00 6C */ lfs f30, 0x6c(r30) -/* 8085AA44 C3 FE 00 70 */ lfs f31, 0x70(r30) -lbl_8085AA48: -/* 8085AA48 38 7C 05 C4 */ addi r3, r28, 0x5c4 -/* 8085AA4C C0 3C 04 D0 */ lfs f1, 0x4d0(r28) -/* 8085AA50 FC 40 F8 90 */ fmr f2, f31 -/* 8085AA54 FC 60 F0 90 */ fmr f3, f30 -/* 8085AA58 C0 9E 00 58 */ lfs f4, 0x58(r30) -/* 8085AA5C 4B A1 4F 21 */ bl cLib_addCalc__FPfffff -/* 8085AA60 38 7C 05 CC */ addi r3, r28, 0x5cc -/* 8085AA64 C0 3C 04 D8 */ lfs f1, 0x4d8(r28) -/* 8085AA68 FC 40 F8 90 */ fmr f2, f31 -/* 8085AA6C FC 60 F0 90 */ fmr f3, f30 -/* 8085AA70 C0 9E 00 58 */ lfs f4, 0x58(r30) -/* 8085AA74 4B A1 4F 09 */ bl cLib_addCalc__FPfffff -lbl_8085AA78: -/* 8085AA78 80 7C 05 D4 */ lwz r3, 0x5d4(r28) -/* 8085AA7C 2C 03 00 00 */ cmpwi r3, 0 -/* 8085AA80 41 82 00 0C */ beq lbl_8085AA8C -/* 8085AA84 38 03 FF FF */ addi r0, r3, -1 -/* 8085AA88 90 1C 05 D4 */ stw r0, 0x5d4(r28) -lbl_8085AA8C: -/* 8085AA8C 80 7C 05 9C */ lwz r3, 0x59c(r28) -/* 8085AA90 28 03 00 00 */ cmplwi r3, 0 -/* 8085AA94 41 82 00 64 */ beq lbl_8085AAF8 -/* 8085AA98 C0 5C 05 C0 */ lfs f2, 0x5c0(r28) -/* 8085AA9C C0 3C 05 BC */ lfs f1, 0x5bc(r28) -/* 8085AAA0 C0 1C 05 B8 */ lfs f0, 0x5b8(r28) -/* 8085AAA4 D0 03 00 A4 */ stfs f0, 0xa4(r3) -/* 8085AAA8 D0 23 00 A8 */ stfs f1, 0xa8(r3) -/* 8085AAAC D0 43 00 AC */ stfs f2, 0xac(r3) -/* 8085AAB0 C0 3E 00 74 */ lfs f1, 0x74(r30) -/* 8085AAB4 C0 1C 05 AC */ lfs f0, 0x5ac(r28) -/* 8085AAB8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8085AABC C0 1C 05 D0 */ lfs f0, 0x5d0(r28) -/* 8085AAC0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8085AAC4 FC 00 00 1E */ fctiwz f0, f0 -/* 8085AAC8 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8085AACC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8085AAD0 80 7C 05 9C */ lwz r3, 0x59c(r28) -/* 8085AAD4 B0 03 00 54 */ sth r0, 0x54(r3) -/* 8085AAD8 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8085AADC C0 1C 05 D0 */ lfs f0, 0x5d0(r28) -/* 8085AAE0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8085AAE4 EC 00 00 32 */ fmuls f0, f0, f0 -/* 8085AAE8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8085AAEC 80 7C 05 9C */ lwz r3, 0x59c(r28) -/* 8085AAF0 D0 03 00 B0 */ stfs f0, 0xb0(r3) -/* 8085AAF4 D0 03 00 B4 */ stfs f0, 0xb4(r3) -lbl_8085AAF8: -/* 8085AAF8 C0 3C 05 D0 */ lfs f1, 0x5d0(r28) -/* 8085AAFC C0 1E 00 4C */ lfs f0, 0x4c(r30) -/* 8085AB00 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085AB04 4C 40 13 82 */ cror 2, 0, 2 -/* 8085AB08 40 82 00 2C */ bne lbl_8085AB34 -/* 8085AB0C C0 1C 04 D0 */ lfs f0, 0x4d0(r28) -/* 8085AB10 D0 1C 05 B8 */ stfs f0, 0x5b8(r28) -/* 8085AB14 C0 1C 04 D8 */ lfs f0, 0x4d8(r28) -/* 8085AB18 D0 1C 05 C0 */ stfs f0, 0x5c0(r28) -/* 8085AB1C C0 1C 05 B8 */ lfs f0, 0x5b8(r28) -/* 8085AB20 D0 1C 05 C4 */ stfs f0, 0x5c4(r28) -/* 8085AB24 C0 1C 05 BC */ lfs f0, 0x5bc(r28) -/* 8085AB28 D0 1C 05 C8 */ stfs f0, 0x5c8(r28) -/* 8085AB2C C0 1C 05 C0 */ lfs f0, 0x5c0(r28) -/* 8085AB30 D0 1C 05 CC */ stfs f0, 0x5cc(r28) -lbl_8085AB34: -/* 8085AB34 C3 DE 00 24 */ lfs f30, 0x24(r30) -/* 8085AB38 4B 95 1A 45 */ bl dKy_darkworld_check__Fv -/* 8085AB3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8085AB40 41 82 00 08 */ beq lbl_8085AB48 -/* 8085AB44 C3 DE 00 78 */ lfs f30, 0x78(r30) -lbl_8085AB48: -/* 8085AB48 7F A3 EB 78 */ mr r3, r29 -/* 8085AB4C 81 9D 06 28 */ lwz r12, 0x628(r29) -/* 8085AB50 81 8C 01 9C */ lwz r12, 0x19c(r12) -/* 8085AB54 7D 89 03 A6 */ mtctr r12 -/* 8085AB58 4E 80 04 21 */ bctrl -/* 8085AB5C 28 03 00 00 */ cmplwi r3, 0 -/* 8085AB60 41 82 00 20 */ beq lbl_8085AB80 -/* 8085AB64 7F A3 EB 78 */ mr r3, r29 -/* 8085AB68 81 9D 06 28 */ lwz r12, 0x628(r29) -/* 8085AB6C 81 8C 01 9C */ lwz r12, 0x19c(r12) -/* 8085AB70 7D 89 03 A6 */ mtctr r12 -/* 8085AB74 4E 80 04 21 */ bctrl -/* 8085AB78 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 8085AB7C 48 00 00 08 */ b lbl_8085AB84 -lbl_8085AB80: -/* 8085AB80 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -lbl_8085AB84: -/* 8085AB84 FC 00 F0 40 */ fcmpo cr0, f0, f30 -/* 8085AB88 40 80 01 4C */ bge lbl_8085ACD4 -/* 8085AB8C C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8085AB90 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8085AB94 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 8085AB98 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8085AB9C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 8085ABA0 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8085ABA4 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8085ABA8 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8085ABAC 38 7C 05 B8 */ addi r3, r28, 0x5b8 -/* 8085ABB0 38 81 00 24 */ addi r4, r1, 0x24 -/* 8085ABB4 4B AE C7 E9 */ bl PSVECSquareDistance -/* 8085ABB8 C0 1E 00 04 */ lfs f0, 4(r30) -/* 8085ABBC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085ABC0 40 81 00 58 */ ble lbl_8085AC18 -/* 8085ABC4 FC 00 08 34 */ frsqrte f0, f1 -/* 8085ABC8 C8 9E 00 08 */ lfd f4, 8(r30) -/* 8085ABCC FC 44 00 32 */ fmul f2, f4, f0 -/* 8085ABD0 C8 7E 00 10 */ lfd f3, 0x10(r30) -/* 8085ABD4 FC 00 00 32 */ fmul f0, f0, f0 -/* 8085ABD8 FC 01 00 32 */ fmul f0, f1, f0 -/* 8085ABDC FC 03 00 28 */ fsub f0, f3, f0 -/* 8085ABE0 FC 02 00 32 */ fmul f0, f2, f0 -/* 8085ABE4 FC 44 00 32 */ fmul f2, f4, f0 -/* 8085ABE8 FC 00 00 32 */ fmul f0, f0, f0 -/* 8085ABEC FC 01 00 32 */ fmul f0, f1, f0 -/* 8085ABF0 FC 03 00 28 */ fsub f0, f3, f0 -/* 8085ABF4 FC 02 00 32 */ fmul f0, f2, f0 -/* 8085ABF8 FC 44 00 32 */ fmul f2, f4, f0 -/* 8085ABFC FC 00 00 32 */ fmul f0, f0, f0 -/* 8085AC00 FC 01 00 32 */ fmul f0, f1, f0 -/* 8085AC04 FC 03 00 28 */ fsub f0, f3, f0 -/* 8085AC08 FC 02 00 32 */ fmul f0, f2, f0 -/* 8085AC0C FC 21 00 32 */ fmul f1, f1, f0 -/* 8085AC10 FC 20 08 18 */ frsp f1, f1 -/* 8085AC14 48 00 00 88 */ b lbl_8085AC9C -lbl_8085AC18: -/* 8085AC18 C8 1E 00 18 */ lfd f0, 0x18(r30) -/* 8085AC1C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085AC20 40 80 00 10 */ bge lbl_8085AC30 -/* 8085AC24 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8085AC28 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8085AC2C 48 00 00 70 */ b lbl_8085AC9C -lbl_8085AC30: -/* 8085AC30 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 8085AC34 80 81 00 0C */ lwz r4, 0xc(r1) -/* 8085AC38 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8085AC3C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8085AC40 7C 03 00 00 */ cmpw r3, r0 -/* 8085AC44 41 82 00 14 */ beq lbl_8085AC58 -/* 8085AC48 40 80 00 40 */ bge lbl_8085AC88 -/* 8085AC4C 2C 03 00 00 */ cmpwi r3, 0 -/* 8085AC50 41 82 00 20 */ beq lbl_8085AC70 -/* 8085AC54 48 00 00 34 */ b lbl_8085AC88 -lbl_8085AC58: -/* 8085AC58 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8085AC5C 41 82 00 0C */ beq lbl_8085AC68 -/* 8085AC60 38 00 00 01 */ li r0, 1 -/* 8085AC64 48 00 00 28 */ b lbl_8085AC8C -lbl_8085AC68: -/* 8085AC68 38 00 00 02 */ li r0, 2 -/* 8085AC6C 48 00 00 20 */ b lbl_8085AC8C -lbl_8085AC70: -/* 8085AC70 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8085AC74 41 82 00 0C */ beq lbl_8085AC80 -/* 8085AC78 38 00 00 05 */ li r0, 5 -/* 8085AC7C 48 00 00 10 */ b lbl_8085AC8C -lbl_8085AC80: -/* 8085AC80 38 00 00 03 */ li r0, 3 -/* 8085AC84 48 00 00 08 */ b lbl_8085AC8C -lbl_8085AC88: -/* 8085AC88 38 00 00 04 */ li r0, 4 -lbl_8085AC8C: -/* 8085AC8C 2C 00 00 01 */ cmpwi r0, 1 -/* 8085AC90 40 82 00 0C */ bne lbl_8085AC9C -/* 8085AC94 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8085AC98 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8085AC9C: -/* 8085AC9C C0 5E 00 7C */ lfs f2, 0x7c(r30) -/* 8085ACA0 C0 1C 05 AC */ lfs f0, 0x5ac(r28) -/* 8085ACA4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8085ACA8 C0 5C 05 D0 */ lfs f2, 0x5d0(r28) -/* 8085ACAC EC 00 00 B2 */ fmuls f0, f0, f2 -/* 8085ACB0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085ACB4 41 81 00 14 */ bgt lbl_8085ACC8 -/* 8085ACB8 C0 1E 00 58 */ lfs f0, 0x58(r30) -/* 8085ACBC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8085ACC0 4C 40 13 82 */ cror 2, 0, 2 -/* 8085ACC4 40 82 00 10 */ bne lbl_8085ACD4 -lbl_8085ACC8: -/* 8085ACC8 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 8085ACCC 60 00 40 00 */ ori r0, r0, 0x4000 -/* 8085ACD0 90 1D 05 78 */ stw r0, 0x578(r29) -lbl_8085ACD4: -/* 8085ACD4 28 1D 00 00 */ cmplwi r29, 0 -/* 8085ACD8 41 82 01 9C */ beq lbl_8085AE74 -/* 8085ACDC 80 7C 05 A0 */ lwz r3, 0x5a0(r28) -/* 8085ACE0 28 03 00 00 */ cmplwi r3, 0 -/* 8085ACE4 41 82 01 90 */ beq lbl_8085AE74 -/* 8085ACE8 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) -/* 8085ACEC C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8085ACF0 D0 03 00 A4 */ stfs f0, 0xa4(r3) -/* 8085ACF4 C0 3E 00 00 */ lfs f1, 0(r30) -/* 8085ACF8 D0 23 00 A8 */ stfs f1, 0xa8(r3) -/* 8085ACFC D0 43 00 AC */ stfs f2, 0xac(r3) -/* 8085AD00 C3 FE 00 04 */ lfs f31, 4(r30) -/* 8085AD04 FF C0 F8 90 */ fmr f30, f31 -/* 8085AD08 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 8085AD0C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8085AD10 40 80 01 58 */ bge lbl_8085AE68 -/* 8085AD14 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8085AD18 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8085AD1C C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 8085AD20 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8085AD24 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 8085AD28 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8085AD2C D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 8085AD30 38 7C 05 B8 */ addi r3, r28, 0x5b8 -/* 8085AD34 38 81 00 18 */ addi r4, r1, 0x18 -/* 8085AD38 4B AE C6 65 */ bl PSVECSquareDistance -/* 8085AD3C FC 00 F8 90 */ fmr f0, f31 -/* 8085AD40 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085AD44 40 81 00 58 */ ble lbl_8085AD9C -/* 8085AD48 FC 00 08 34 */ frsqrte f0, f1 -/* 8085AD4C C8 9E 00 08 */ lfd f4, 8(r30) -/* 8085AD50 FC 44 00 32 */ fmul f2, f4, f0 -/* 8085AD54 C8 7E 00 10 */ lfd f3, 0x10(r30) -/* 8085AD58 FC 00 00 32 */ fmul f0, f0, f0 -/* 8085AD5C FC 01 00 32 */ fmul f0, f1, f0 -/* 8085AD60 FC 03 00 28 */ fsub f0, f3, f0 -/* 8085AD64 FC 02 00 32 */ fmul f0, f2, f0 -/* 8085AD68 FC 44 00 32 */ fmul f2, f4, f0 -/* 8085AD6C FC 00 00 32 */ fmul f0, f0, f0 -/* 8085AD70 FC 01 00 32 */ fmul f0, f1, f0 -/* 8085AD74 FC 03 00 28 */ fsub f0, f3, f0 -/* 8085AD78 FC 02 00 32 */ fmul f0, f2, f0 -/* 8085AD7C FC 44 00 32 */ fmul f2, f4, f0 -/* 8085AD80 FC 00 00 32 */ fmul f0, f0, f0 -/* 8085AD84 FC 01 00 32 */ fmul f0, f1, f0 -/* 8085AD88 FC 03 00 28 */ fsub f0, f3, f0 -/* 8085AD8C FC 02 00 32 */ fmul f0, f2, f0 -/* 8085AD90 FC 21 00 32 */ fmul f1, f1, f0 -/* 8085AD94 FC 20 08 18 */ frsp f1, f1 -/* 8085AD98 48 00 00 88 */ b lbl_8085AE20 -lbl_8085AD9C: -/* 8085AD9C C8 1E 00 18 */ lfd f0, 0x18(r30) -/* 8085ADA0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085ADA4 40 80 00 10 */ bge lbl_8085ADB4 -/* 8085ADA8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8085ADAC C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8085ADB0 48 00 00 70 */ b lbl_8085AE20 -lbl_8085ADB4: -/* 8085ADB4 D0 21 00 08 */ stfs f1, 8(r1) -/* 8085ADB8 80 81 00 08 */ lwz r4, 8(r1) -/* 8085ADBC 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8085ADC0 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8085ADC4 7C 03 00 00 */ cmpw r3, r0 -/* 8085ADC8 41 82 00 14 */ beq lbl_8085ADDC -/* 8085ADCC 40 80 00 40 */ bge lbl_8085AE0C -/* 8085ADD0 2C 03 00 00 */ cmpwi r3, 0 -/* 8085ADD4 41 82 00 20 */ beq lbl_8085ADF4 -/* 8085ADD8 48 00 00 34 */ b lbl_8085AE0C -lbl_8085ADDC: -/* 8085ADDC 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8085ADE0 41 82 00 0C */ beq lbl_8085ADEC -/* 8085ADE4 38 00 00 01 */ li r0, 1 -/* 8085ADE8 48 00 00 28 */ b lbl_8085AE10 -lbl_8085ADEC: -/* 8085ADEC 38 00 00 02 */ li r0, 2 -/* 8085ADF0 48 00 00 20 */ b lbl_8085AE10 -lbl_8085ADF4: -/* 8085ADF4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8085ADF8 41 82 00 0C */ beq lbl_8085AE04 -/* 8085ADFC 38 00 00 05 */ li r0, 5 -/* 8085AE00 48 00 00 10 */ b lbl_8085AE10 -lbl_8085AE04: -/* 8085AE04 38 00 00 03 */ li r0, 3 -/* 8085AE08 48 00 00 08 */ b lbl_8085AE10 -lbl_8085AE0C: -/* 8085AE0C 38 00 00 04 */ li r0, 4 -lbl_8085AE10: -/* 8085AE10 2C 00 00 01 */ cmpwi r0, 1 -/* 8085AE14 40 82 00 0C */ bne lbl_8085AE20 -/* 8085AE18 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8085AE1C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8085AE20: -/* 8085AE20 C0 5E 00 7C */ lfs f2, 0x7c(r30) -/* 8085AE24 C0 1C 05 AC */ lfs f0, 0x5ac(r28) -/* 8085AE28 EC 42 00 32 */ fmuls f2, f2, f0 -/* 8085AE2C C0 1C 05 D0 */ lfs f0, 0x5d0(r28) -/* 8085AE30 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8085AE34 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085AE38 40 81 00 30 */ ble lbl_8085AE68 -/* 8085AE3C C0 3E 00 00 */ lfs f1, 0(r30) -/* 8085AE40 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 8085AE44 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8085AE48 C0 1E 00 80 */ lfs f0, 0x80(r30) -/* 8085AE4C EC 21 00 24 */ fdivs f1, f1, f0 -/* 8085AE50 C0 1E 00 50 */ lfs f0, 0x50(r30) -/* 8085AE54 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085AE58 40 81 00 08 */ ble lbl_8085AE60 -/* 8085AE5C FC 20 00 90 */ fmr f1, f0 -lbl_8085AE60: -/* 8085AE60 FF E0 08 90 */ fmr f31, f1 -/* 8085AE64 FF C0 08 90 */ fmr f30, f1 -lbl_8085AE68: -/* 8085AE68 80 7C 05 A0 */ lwz r3, 0x5a0(r28) -/* 8085AE6C D3 C3 00 B0 */ stfs f30, 0xb0(r3) -/* 8085AE70 D3 E3 00 B4 */ stfs f31, 0xb4(r3) -lbl_8085AE74: -/* 8085AE74 38 60 00 01 */ li r3, 1 -/* 8085AE78 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 8085AE7C CB E1 00 60 */ lfd f31, 0x60(r1) -/* 8085AE80 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 8085AE84 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 8085AE88 39 61 00 50 */ addi r11, r1, 0x50 -/* 8085AE8C 4B B0 73 99 */ bl _restgpr_28 -/* 8085AE90 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8085AE94 7C 08 03 A6 */ mtlr r0 -/* 8085AE98 38 21 00 70 */ addi r1, r1, 0x70 -/* 8085AE9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index b95561ae46..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8085AF74: -/* 8085AF74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8085AF78 7C 08 02 A6 */ mflr r0 -/* 8085AF7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8085AF80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8085AF84 7C 7F 1B 78 */ mr r31, r3 -/* 8085AF88 3C 60 80 86 */ lis r3, d_a_kytag08__stringBase0@ha /* 0x8085B310@ha */ -/* 8085AF8C 38 63 B3 10 */ addi r3, r3, d_a_kytag08__stringBase0@l /* 0x8085B310@l */ -/* 8085AF90 38 80 00 03 */ li r4, 3 -/* 8085AF94 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085AF98 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085AF9C 3C A5 00 02 */ addis r5, r5, 2 -/* 8085AFA0 38 C0 00 80 */ li r6, 0x80 -/* 8085AFA4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8085AFA8 4B 7E 13 45 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8085AFAC 3C 80 00 08 */ lis r4, 8 -/* 8085AFB0 3C A0 11 02 */ lis r5, 0x1102 /* 0x11020202@ha */ -/* 8085AFB4 38 A5 02 02 */ addi r5, r5, 0x0202 /* 0x11020202@l */ -/* 8085AFB8 4B 7B 9C 9D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8085AFBC 90 7F 05 68 */ stw r3, 0x568(r31) -/* 8085AFC0 80 1F 05 68 */ lwz r0, 0x568(r31) -/* 8085AFC4 28 00 00 00 */ cmplwi r0, 0 -/* 8085AFC8 40 82 00 0C */ bne lbl_8085AFD4 -/* 8085AFCC 38 60 00 00 */ li r3, 0 -/* 8085AFD0 48 00 00 08 */ b lbl_8085AFD8 -lbl_8085AFD4: -/* 8085AFD4 38 60 00 01 */ li r3, 1 -lbl_8085AFD8: -/* 8085AFD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8085AFDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8085AFE0 7C 08 03 A6 */ mtlr r0 -/* 8085AFE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8085AFE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag10/d_a_kytag10/daKytag10_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag10/d_a_kytag10/daKytag10_Create__FP10fopAc_ac_c.s deleted file mode 100644 index c5583451e1..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag10/d_a_kytag10/daKytag10_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,114 +0,0 @@ -lbl_80529248: -/* 80529248 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8052924C 7C 08 02 A6 */ mflr r0 -/* 80529250 90 01 00 44 */ stw r0, 0x44(r1) -/* 80529254 39 61 00 40 */ addi r11, r1, 0x40 -/* 80529258 4B E3 8F 85 */ bl _savegpr_29 -/* 8052925C 7C 7E 1B 78 */ mr r30, r3 -/* 80529260 3C 80 80 53 */ lis r4, lit_3788@ha /* 0x80529400@ha */ -/* 80529264 3B E4 94 00 */ addi r31, r4, lit_3788@l /* 0x80529400@l */ -/* 80529268 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8052926C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80529270 40 82 00 1C */ bne lbl_8052928C -/* 80529274 28 1E 00 00 */ cmplwi r30, 0 -/* 80529278 41 82 00 08 */ beq lbl_80529280 -/* 8052927C 4B AE F8 E9 */ bl __ct__10fopAc_ac_cFv -lbl_80529280: -/* 80529280 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80529284 60 00 00 08 */ ori r0, r0, 8 -/* 80529288 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_8052928C: -/* 8052928C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80529290 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80529294 28 00 00 FF */ cmplwi r0, 0xff -/* 80529298 40 82 00 08 */ bne lbl_805292A0 -/* 8052929C 38 00 00 0A */ li r0, 0xa -lbl_805292A0: -/* 805292A0 C0 5F 00 44 */ lfs f2, 0x44(r31) -/* 805292A4 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 805292A8 C8 3F 00 38 */ lfd f1, 0x38(r31) -/* 805292AC 90 01 00 24 */ stw r0, 0x24(r1) -/* 805292B0 3C 00 43 30 */ lis r0, 0x4330 -/* 805292B4 90 01 00 20 */ stw r0, 0x20(r1) -/* 805292B8 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 805292BC EC 00 08 28 */ fsubs f0, f0, f1 -/* 805292C0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 805292C4 D0 1E 05 7C */ stfs f0, 0x57c(r30) -/* 805292C8 D0 1E 05 78 */ stfs f0, 0x578(r30) -/* 805292CC D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 805292D0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 805292D4 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 805292D8 7C 00 07 34 */ extsh r0, r0 -/* 805292DC 2C 00 00 FF */ cmpwi r0, 0xff -/* 805292E0 40 82 00 08 */ bne lbl_805292E8 -/* 805292E4 38 00 00 00 */ li r0, 0 -lbl_805292E8: -/* 805292E8 1C 00 00 0A */ mulli r0, r0, 0xa -/* 805292EC B0 1E 05 80 */ sth r0, 0x580(r30) -/* 805292F0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 805292F4 54 00 46 3E */ srwi r0, r0, 0x18 -/* 805292F8 7C 00 07 34 */ extsh r0, r0 -/* 805292FC 2C 00 00 FF */ cmpwi r0, 0xff -/* 80529300 40 82 00 08 */ bne lbl_80529308 -/* 80529304 38 00 00 0F */ li r0, 0xf -lbl_80529308: -/* 80529308 1C 00 00 0A */ mulli r0, r0, 0xa -/* 8052930C B0 1E 05 82 */ sth r0, 0x582(r30) -/* 80529310 A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 80529314 98 1E 05 84 */ stb r0, 0x584(r30) -/* 80529318 38 00 00 00 */ li r0, 0 -/* 8052931C 90 1E 05 6C */ stw r0, 0x56c(r30) -/* 80529320 90 1E 05 70 */ stw r0, 0x570(r30) -/* 80529324 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80529328 D0 1E 05 94 */ stfs f0, 0x594(r30) -/* 8052932C 90 1E 05 98 */ stw r0, 0x598(r30) -/* 80529330 7F C3 F3 78 */ mr r3, r30 -/* 80529334 4B FF F9 D9 */ bl set_path_info__FP10fopAc_ac_c -/* 80529338 90 7E 05 68 */ stw r3, 0x568(r30) -/* 8052933C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80529340 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80529344 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80529348 38 80 00 00 */ li r4, 0 -/* 8052934C 90 81 00 08 */ stw r4, 8(r1) -/* 80529350 38 00 FF FF */ li r0, -1 -/* 80529354 90 01 00 0C */ stw r0, 0xc(r1) -/* 80529358 90 81 00 10 */ stw r4, 0x10(r1) -/* 8052935C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80529360 90 81 00 18 */ stw r4, 0x18(r1) -/* 80529364 38 80 00 00 */ li r4, 0 -/* 80529368 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000852B@ha */ -/* 8052936C 38 A5 85 2B */ addi r5, r5, 0x852B /* 0x0000852B@l */ -/* 80529370 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80529374 38 E0 00 00 */ li r7, 0 -/* 80529378 39 00 00 00 */ li r8, 0 -/* 8052937C 39 20 00 00 */ li r9, 0 -/* 80529380 39 40 00 FF */ li r10, 0xff -/* 80529384 C0 3F 00 08 */ lfs f1, 8(r31) -/* 80529388 4B B2 37 09 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8052938C 90 7E 05 6C */ stw r3, 0x56c(r30) -/* 80529390 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80529394 38 80 00 00 */ li r4, 0 -/* 80529398 90 81 00 08 */ stw r4, 8(r1) -/* 8052939C 38 00 FF FF */ li r0, -1 -/* 805293A0 90 01 00 0C */ stw r0, 0xc(r1) -/* 805293A4 90 81 00 10 */ stw r4, 0x10(r1) -/* 805293A8 90 81 00 14 */ stw r4, 0x14(r1) -/* 805293AC 90 81 00 18 */ stw r4, 0x18(r1) -/* 805293B0 38 80 00 00 */ li r4, 0 -/* 805293B4 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000852C@ha */ -/* 805293B8 38 A5 85 2C */ addi r5, r5, 0x852C /* 0x0000852C@l */ -/* 805293BC 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 805293C0 38 E0 00 00 */ li r7, 0 -/* 805293C4 39 00 00 00 */ li r8, 0 -/* 805293C8 39 20 00 00 */ li r9, 0 -/* 805293CC 39 40 00 FF */ li r10, 0xff -/* 805293D0 C0 3F 00 08 */ lfs f1, 8(r31) -/* 805293D4 4B B2 36 BD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 805293D8 90 7E 05 70 */ stw r3, 0x570(r30) -/* 805293DC 38 60 00 04 */ li r3, 4 -/* 805293E0 39 61 00 40 */ addi r11, r1, 0x40 -/* 805293E4 4B E3 8E 45 */ bl _restgpr_29 -/* 805293E8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 805293EC 7C 08 03 A6 */ mtlr r0 -/* 805293F0 38 21 00 40 */ addi r1, r1, 0x40 -/* 805293F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag10/d_a_kytag10/get_rail_ratio_pos__FP5dPathifPsPs.s b/asm/rel/d/a/kytag/d_a_kytag10/d_a_kytag10/get_rail_ratio_pos__FP5dPathifPsPs.s deleted file mode 100644 index 1e8a6e68d2..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag10/d_a_kytag10/get_rail_ratio_pos__FP5dPathifPsPs.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_80528BF8: -/* 80528BF8 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80528BFC 7C 08 02 A6 */ mflr r0 -/* 80528C00 90 01 00 54 */ stw r0, 0x54(r1) -/* 80528C04 39 61 00 50 */ addi r11, r1, 0x50 -/* 80528C08 4B E3 95 D5 */ bl _savegpr_29 -/* 80528C0C 7C 7D 1B 78 */ mr r29, r3 -/* 80528C10 7C DE 33 78 */ mr r30, r6 -/* 80528C14 7C FF 3B 78 */ mr r31, r7 -/* 80528C18 80 04 00 08 */ lwz r0, 8(r4) -/* 80528C1C 54 A3 20 36 */ slwi r3, r5, 4 -/* 80528C20 7C 60 1A 14 */ add r3, r0, r3 -/* 80528C24 C0 C3 00 04 */ lfs f6, 4(r3) -/* 80528C28 D0 C1 00 2C */ stfs f6, 0x2c(r1) -/* 80528C2C C0 A3 00 08 */ lfs f5, 8(r3) -/* 80528C30 D0 A1 00 30 */ stfs f5, 0x30(r1) -/* 80528C34 C0 83 00 0C */ lfs f4, 0xc(r3) -/* 80528C38 D0 81 00 34 */ stfs f4, 0x34(r1) -/* 80528C3C C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80528C40 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80528C44 C0 63 00 18 */ lfs f3, 0x18(r3) -/* 80528C48 D0 61 00 24 */ stfs f3, 0x24(r1) -/* 80528C4C C0 43 00 1C */ lfs f2, 0x1c(r3) -/* 80528C50 D0 41 00 28 */ stfs f2, 0x28(r1) -/* 80528C54 EC 00 30 28 */ fsubs f0, f0, f6 -/* 80528C58 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80528C5C EC 06 00 2A */ fadds f0, f6, f0 -/* 80528C60 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80528C64 EC 03 28 28 */ fsubs f0, f3, f5 -/* 80528C68 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80528C6C EC 05 00 2A */ fadds f0, f5, f0 -/* 80528C70 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80528C74 EC 02 20 28 */ fsubs f0, f2, f4 -/* 80528C78 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80528C7C EC 04 00 2A */ fadds f0, f4, f0 -/* 80528C80 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80528C84 38 61 00 2C */ addi r3, r1, 0x2c -/* 80528C88 38 81 00 20 */ addi r4, r1, 0x20 -/* 80528C8C 38 A1 00 08 */ addi r5, r1, 8 -/* 80528C90 4B B3 2A D1 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz -/* 80528C94 C0 01 00 08 */ lfs f0, 8(r1) -/* 80528C98 EC 20 00 32 */ fmuls f1, f0, f0 -/* 80528C9C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80528CA0 EC 00 00 32 */ fmuls f0, f0, f0 -/* 80528CA4 EC 21 00 2A */ fadds f1, f1, f0 -/* 80528CA8 3C 60 80 53 */ lis r3, lit_3788@ha /* 0x80529400@ha */ -/* 80528CAC C0 03 94 00 */ lfs f0, lit_3788@l(r3) /* 0x80529400@l */ -/* 80528CB0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80528CB4 40 81 00 0C */ ble lbl_80528CC0 -/* 80528CB8 FC 00 08 34 */ frsqrte f0, f1 -/* 80528CBC EC 20 00 72 */ fmuls f1, f0, f1 -lbl_80528CC0: -/* 80528CC0 C0 41 00 0C */ lfs f2, 0xc(r1) -/* 80528CC4 4B D3 E9 B1 */ bl cM_atan2s__Fff -/* 80528CC8 B0 7E 00 00 */ sth r3, 0(r30) -/* 80528CCC C0 21 00 08 */ lfs f1, 8(r1) -/* 80528CD0 C0 41 00 10 */ lfs f2, 0x10(r1) -/* 80528CD4 4B D3 E9 A1 */ bl cM_atan2s__Fff -/* 80528CD8 B0 7F 00 00 */ sth r3, 0(r31) -/* 80528CDC C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80528CE0 D0 1D 00 00 */ stfs f0, 0(r29) -/* 80528CE4 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80528CE8 D0 1D 00 04 */ stfs f0, 4(r29) -/* 80528CEC C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80528CF0 D0 1D 00 08 */ stfs f0, 8(r29) -/* 80528CF4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80528CF8 4B E3 95 31 */ bl _restgpr_29 -/* 80528CFC 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80528D00 7C 08 03 A6 */ mtlr r0 -/* 80528D04 38 21 00 50 */ addi r1, r1, 0x50 -/* 80528D08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag10/d_a_kytag10/sparks_move__FP13kytag10_class.s b/asm/rel/d/a/kytag/d_a_kytag10/d_a_kytag10/sparks_move__FP13kytag10_class.s deleted file mode 100644 index 3f196560b6..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag10/d_a_kytag10/sparks_move__FP13kytag10_class.s +++ /dev/null @@ -1,259 +0,0 @@ -lbl_80528D78: -/* 80528D78 94 21 FF 20 */ stwu r1, -0xe0(r1) -/* 80528D7C 7C 08 02 A6 */ mflr r0 -/* 80528D80 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 80528D84 DB E1 00 D0 */ stfd f31, 0xd0(r1) -/* 80528D88 F3 E1 00 D8 */ psq_st f31, 216(r1), 0, 0 /* qr0 */ -/* 80528D8C 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 80528D90 4B E3 94 45 */ bl _savegpr_27 -/* 80528D94 7C 7E 1B 78 */ mr r30, r3 -/* 80528D98 3C 80 80 53 */ lis r4, lit_3788@ha /* 0x80529400@ha */ -/* 80528D9C 3B E4 94 00 */ addi r31, r4, lit_3788@l /* 0x80529400@l */ -/* 80528DA0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80528DA4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80528DA8 83 A4 5D 74 */ lwz r29, 0x5d74(r4) -/* 80528DAC 83 83 05 68 */ lwz r28, 0x568(r3) -/* 80528DB0 28 1C 00 00 */ cmplwi r28, 0 -/* 80528DB4 41 82 03 74 */ beq lbl_80529128 -/* 80528DB8 7F 84 E3 78 */ mr r4, r28 -/* 80528DBC 38 BD 00 D8 */ addi r5, r29, 0xd8 -/* 80528DC0 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80528DC4 38 C1 00 14 */ addi r6, r1, 0x14 -/* 80528DC8 4B FF FF 8D */ bl get_Extent_pos_start_get__FP13kytag10_classP5dPathP4cXyzfPi -/* 80528DCC 7C 7B 1B 78 */ mr r27, r3 -/* 80528DD0 7F C3 F3 78 */ mr r3, r30 -/* 80528DD4 7F 84 E3 78 */ mr r4, r28 -/* 80528DD8 38 BD 00 D8 */ addi r5, r29, 0xd8 -/* 80528DDC C0 3F 00 04 */ lfs f1, 4(r31) -/* 80528DE0 38 C1 00 10 */ addi r6, r1, 0x10 -/* 80528DE4 4B FF FF 81 */ bl get_Extent_pos_end_get__FP13kytag10_classP5dPathP4cXyzfPi -/* 80528DE8 7C 7C 1B 78 */ mr r28, r3 -/* 80528DEC 38 61 00 60 */ addi r3, r1, 0x60 -/* 80528DF0 7F 64 DB 78 */ mr r4, r27 -/* 80528DF4 38 A0 00 00 */ li r5, 0 -/* 80528DF8 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80528DFC 38 C1 00 0A */ addi r6, r1, 0xa -/* 80528E00 38 E1 00 08 */ addi r7, r1, 8 -/* 80528E04 4B FF FD F5 */ bl get_rail_ratio_pos__FP5dPathifPsPs -/* 80528E08 C0 01 00 60 */ lfs f0, 0x60(r1) -/* 80528E0C D0 01 00 9C */ stfs f0, 0x9c(r1) -/* 80528E10 C0 01 00 64 */ lfs f0, 0x64(r1) -/* 80528E14 D0 01 00 A0 */ stfs f0, 0xa0(r1) -/* 80528E18 C0 01 00 68 */ lfs f0, 0x68(r1) -/* 80528E1C D0 01 00 A4 */ stfs f0, 0xa4(r1) -/* 80528E20 38 61 00 54 */ addi r3, r1, 0x54 -/* 80528E24 7F 84 E3 78 */ mr r4, r28 -/* 80528E28 80 A1 00 10 */ lwz r5, 0x10(r1) -/* 80528E2C 38 A5 FF FF */ addi r5, r5, -1 -/* 80528E30 C0 3F 00 08 */ lfs f1, 8(r31) -/* 80528E34 38 C1 00 0A */ addi r6, r1, 0xa -/* 80528E38 38 E1 00 08 */ addi r7, r1, 8 -/* 80528E3C 4B FF FD BD */ bl get_rail_ratio_pos__FP5dPathifPsPs -/* 80528E40 C0 01 00 54 */ lfs f0, 0x54(r1) -/* 80528E44 D0 01 00 90 */ stfs f0, 0x90(r1) -/* 80528E48 C0 01 00 58 */ lfs f0, 0x58(r1) -/* 80528E4C D0 01 00 94 */ stfs f0, 0x94(r1) -/* 80528E50 C0 01 00 5C */ lfs f0, 0x5c(r1) -/* 80528E54 D0 01 00 98 */ stfs f0, 0x98(r1) -/* 80528E58 38 61 00 48 */ addi r3, r1, 0x48 -/* 80528E5C 7F 64 DB 78 */ mr r4, r27 -/* 80528E60 80 BE 05 98 */ lwz r5, 0x598(r30) -/* 80528E64 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80528E68 38 C1 00 0A */ addi r6, r1, 0xa -/* 80528E6C 38 E1 00 08 */ addi r7, r1, 8 -/* 80528E70 4B FF FD 89 */ bl get_rail_ratio_pos__FP5dPathifPsPs -/* 80528E74 C0 01 00 48 */ lfs f0, 0x48(r1) -/* 80528E78 D0 01 00 78 */ stfs f0, 0x78(r1) -/* 80528E7C C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 80528E80 D0 01 00 7C */ stfs f0, 0x7c(r1) -/* 80528E84 C0 01 00 50 */ lfs f0, 0x50(r1) -/* 80528E88 D0 01 00 80 */ stfs f0, 0x80(r1) -/* 80528E8C 38 61 00 3C */ addi r3, r1, 0x3c -/* 80528E90 7F 64 DB 78 */ mr r4, r27 -/* 80528E94 80 BE 05 98 */ lwz r5, 0x598(r30) -/* 80528E98 C0 3F 00 08 */ lfs f1, 8(r31) -/* 80528E9C 38 C1 00 0A */ addi r6, r1, 0xa -/* 80528EA0 38 E1 00 08 */ addi r7, r1, 8 -/* 80528EA4 4B FF FD 55 */ bl get_rail_ratio_pos__FP5dPathifPsPs -/* 80528EA8 C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 80528EAC D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 80528EB0 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 80528EB4 D0 01 00 70 */ stfs f0, 0x70(r1) -/* 80528EB8 C0 01 00 44 */ lfs f0, 0x44(r1) -/* 80528EBC D0 01 00 74 */ stfs f0, 0x74(r1) -/* 80528EC0 38 61 00 78 */ addi r3, r1, 0x78 -/* 80528EC4 38 81 00 6C */ addi r4, r1, 0x6c -/* 80528EC8 4B E1 E4 D5 */ bl PSVECSquareDistance -/* 80528ECC C0 1F 00 00 */ lfs f0, 0(r31) -/* 80528ED0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80528ED4 40 81 00 58 */ ble lbl_80528F2C -/* 80528ED8 FC 00 08 34 */ frsqrte f0, f1 -/* 80528EDC C8 9F 00 10 */ lfd f4, 0x10(r31) -/* 80528EE0 FC 44 00 32 */ fmul f2, f4, f0 -/* 80528EE4 C8 7F 00 18 */ lfd f3, 0x18(r31) -/* 80528EE8 FC 00 00 32 */ fmul f0, f0, f0 -/* 80528EEC FC 01 00 32 */ fmul f0, f1, f0 -/* 80528EF0 FC 03 00 28 */ fsub f0, f3, f0 -/* 80528EF4 FC 02 00 32 */ fmul f0, f2, f0 -/* 80528EF8 FC 44 00 32 */ fmul f2, f4, f0 -/* 80528EFC FC 00 00 32 */ fmul f0, f0, f0 -/* 80528F00 FC 01 00 32 */ fmul f0, f1, f0 -/* 80528F04 FC 03 00 28 */ fsub f0, f3, f0 -/* 80528F08 FC 02 00 32 */ fmul f0, f2, f0 -/* 80528F0C FC 44 00 32 */ fmul f2, f4, f0 -/* 80528F10 FC 00 00 32 */ fmul f0, f0, f0 -/* 80528F14 FC 01 00 32 */ fmul f0, f1, f0 -/* 80528F18 FC 03 00 28 */ fsub f0, f3, f0 -/* 80528F1C FC 02 00 32 */ fmul f0, f2, f0 -/* 80528F20 FC 21 00 32 */ fmul f1, f1, f0 -/* 80528F24 FC 20 08 18 */ frsp f1, f1 -/* 80528F28 48 00 00 88 */ b lbl_80528FB0 -lbl_80528F2C: -/* 80528F2C C8 1F 00 20 */ lfd f0, 0x20(r31) -/* 80528F30 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80528F34 40 80 00 10 */ bge lbl_80528F44 -/* 80528F38 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80528F3C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80528F40 48 00 00 70 */ b lbl_80528FB0 -lbl_80528F44: -/* 80528F44 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80528F48 80 81 00 0C */ lwz r4, 0xc(r1) -/* 80528F4C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80528F50 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80528F54 7C 03 00 00 */ cmpw r3, r0 -/* 80528F58 41 82 00 14 */ beq lbl_80528F6C -/* 80528F5C 40 80 00 40 */ bge lbl_80528F9C -/* 80528F60 2C 03 00 00 */ cmpwi r3, 0 -/* 80528F64 41 82 00 20 */ beq lbl_80528F84 -/* 80528F68 48 00 00 34 */ b lbl_80528F9C -lbl_80528F6C: -/* 80528F6C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80528F70 41 82 00 0C */ beq lbl_80528F7C -/* 80528F74 38 00 00 01 */ li r0, 1 -/* 80528F78 48 00 00 28 */ b lbl_80528FA0 -lbl_80528F7C: -/* 80528F7C 38 00 00 02 */ li r0, 2 -/* 80528F80 48 00 00 20 */ b lbl_80528FA0 -lbl_80528F84: -/* 80528F84 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80528F88 41 82 00 0C */ beq lbl_80528F94 -/* 80528F8C 38 00 00 05 */ li r0, 5 -/* 80528F90 48 00 00 10 */ b lbl_80528FA0 -lbl_80528F94: -/* 80528F94 38 00 00 03 */ li r0, 3 -/* 80528F98 48 00 00 08 */ b lbl_80528FA0 -lbl_80528F9C: -/* 80528F9C 38 00 00 04 */ li r0, 4 -lbl_80528FA0: -/* 80528FA0 2C 00 00 01 */ cmpwi r0, 1 -/* 80528FA4 40 82 00 0C */ bne lbl_80528FB0 -/* 80528FA8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80528FAC C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80528FB0: -/* 80528FB0 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 80528FB4 EF E0 08 24 */ fdivs f31, f0, f1 -/* 80528FB8 38 61 00 30 */ addi r3, r1, 0x30 -/* 80528FBC 7F 64 DB 78 */ mr r4, r27 -/* 80528FC0 80 BE 05 98 */ lwz r5, 0x598(r30) -/* 80528FC4 C0 3E 05 94 */ lfs f1, 0x594(r30) -/* 80528FC8 38 C1 00 0A */ addi r6, r1, 0xa -/* 80528FCC 38 E1 00 08 */ addi r7, r1, 8 -/* 80528FD0 4B FF FC 29 */ bl get_rail_ratio_pos__FP5dPathifPsPs -/* 80528FD4 C0 41 00 30 */ lfs f2, 0x30(r1) -/* 80528FD8 D0 41 00 84 */ stfs f2, 0x84(r1) -/* 80528FDC C0 21 00 34 */ lfs f1, 0x34(r1) -/* 80528FE0 D0 21 00 88 */ stfs f1, 0x88(r1) -/* 80528FE4 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 80528FE8 D0 01 00 8C */ stfs f0, 0x8c(r1) -/* 80528FEC D0 5E 05 88 */ stfs f2, 0x588(r30) -/* 80528FF0 D0 3E 05 8C */ stfs f1, 0x58c(r30) -/* 80528FF4 D0 1E 05 90 */ stfs f0, 0x590(r30) -/* 80528FF8 80 7E 05 6C */ lwz r3, 0x56c(r30) -/* 80528FFC D0 43 00 A4 */ stfs f2, 0xa4(r3) -/* 80529000 D0 23 00 A8 */ stfs f1, 0xa8(r3) -/* 80529004 D0 03 00 AC */ stfs f0, 0xac(r3) -/* 80529008 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 8052900C D0 43 00 A4 */ stfs f2, 0xa4(r3) -/* 80529010 D0 23 00 A8 */ stfs f1, 0xa8(r3) -/* 80529014 D0 03 00 AC */ stfs f0, 0xac(r3) -/* 80529018 A8 1E 05 80 */ lha r0, 0x580(r30) -/* 8052901C 80 7E 05 6C */ lwz r3, 0x56c(r30) -/* 80529020 B0 03 00 54 */ sth r0, 0x54(r3) -/* 80529024 A8 1E 05 82 */ lha r0, 0x582(r30) -/* 80529028 80 7E 05 6C */ lwz r3, 0x56c(r30) -/* 8052902C B0 03 00 52 */ sth r0, 0x52(r3) -/* 80529030 A8 1E 05 80 */ lha r0, 0x580(r30) -/* 80529034 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80529038 B0 03 00 54 */ sth r0, 0x54(r3) -/* 8052903C A8 1E 05 82 */ lha r0, 0x582(r30) -/* 80529040 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80529044 B0 03 00 52 */ sth r0, 0x52(r3) -/* 80529048 E0 3E 05 74 */ psq_l f1, 1396(r30), 0, 0 /* qr0 */ -/* 8052904C C0 1E 05 7C */ lfs f0, 0x57c(r30) -/* 80529050 F0 21 00 24 */ psq_st f1, 36(r1), 0, 0 /* qr0 */ -/* 80529054 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80529058 80 7E 05 6C */ lwz r3, 0x56c(r30) -/* 8052905C C0 21 00 28 */ lfs f1, 0x28(r1) -/* 80529060 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80529064 D0 03 00 B0 */ stfs f0, 0xb0(r3) -/* 80529068 D0 23 00 B4 */ stfs f1, 0xb4(r3) -/* 8052906C E0 3E 05 74 */ psq_l f1, 1396(r30), 0, 0 /* qr0 */ -/* 80529070 C0 1E 05 7C */ lfs f0, 0x57c(r30) -/* 80529074 F0 21 00 18 */ psq_st f1, 24(r1), 0, 0 /* qr0 */ -/* 80529078 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8052907C 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80529080 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 80529084 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80529088 D0 03 00 B0 */ stfs f0, 0xb0(r3) -/* 8052908C D0 23 00 B4 */ stfs f1, 0xb4(r3) -/* 80529090 88 1E 05 84 */ lbz r0, 0x584(r30) -/* 80529094 28 00 00 FF */ cmplwi r0, 0xff -/* 80529098 41 82 00 34 */ beq lbl_805290CC -/* 8052909C C8 3F 00 38 */ lfd f1, 0x38(r31) -/* 805290A0 90 01 00 AC */ stw r0, 0xac(r1) -/* 805290A4 3C 00 43 30 */ lis r0, 0x4330 -/* 805290A8 90 01 00 A8 */ stw r0, 0xa8(r1) -/* 805290AC C8 01 00 A8 */ lfd f0, 0xa8(r1) -/* 805290B0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 805290B4 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 805290B8 EC 01 00 24 */ fdivs f0, f1, f0 -/* 805290BC 80 7E 05 6C */ lwz r3, 0x56c(r30) -/* 805290C0 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 805290C4 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 805290C8 D0 03 00 28 */ stfs f0, 0x28(r3) -lbl_805290CC: -/* 805290CC C0 5E 05 94 */ lfs f2, 0x594(r30) -/* 805290D0 C0 3F 00 08 */ lfs f1, 8(r31) -/* 805290D4 C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 805290D8 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 805290DC EC 01 00 28 */ fsubs f0, f1, f0 -/* 805290E0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 805290E4 4C 40 13 82 */ cror 2, 0, 2 -/* 805290E8 40 82 00 10 */ bne lbl_805290F8 -/* 805290EC EC 02 F8 2A */ fadds f0, f2, f31 -/* 805290F0 D0 1E 05 94 */ stfs f0, 0x594(r30) -/* 805290F4 48 00 00 34 */ b lbl_80529128 -lbl_805290F8: -/* 805290F8 80 9E 05 98 */ lwz r4, 0x598(r30) -/* 805290FC 80 61 00 10 */ lwz r3, 0x10(r1) -/* 80529100 38 03 FF FF */ addi r0, r3, -1 -/* 80529104 7C 04 00 00 */ cmpw r4, r0 -/* 80529108 41 80 00 10 */ blt lbl_80529118 -/* 8052910C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80529110 90 1E 05 98 */ stw r0, 0x598(r30) -/* 80529114 48 00 00 0C */ b lbl_80529120 -lbl_80529118: -/* 80529118 38 04 00 01 */ addi r0, r4, 1 -/* 8052911C 90 1E 05 98 */ stw r0, 0x598(r30) -lbl_80529120: -/* 80529120 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80529124 D0 1E 05 94 */ stfs f0, 0x594(r30) -lbl_80529128: -/* 80529128 E3 E1 00 D8 */ psq_l f31, 216(r1), 0, 0 /* qr0 */ -/* 8052912C CB E1 00 D0 */ lfd f31, 0xd0(r1) -/* 80529130 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 80529134 4B E3 90 ED */ bl _restgpr_27 -/* 80529138 80 01 00 E4 */ lwz r0, 0xe4(r1) -/* 8052913C 7C 08 03 A6 */ mtlr r0 -/* 80529140 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80529144 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/d_kytag12_cut_normal_check__Fv.s b/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/d_kytag12_cut_normal_check__Fv.s deleted file mode 100644 index cd70da841c..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/d_kytag12_cut_normal_check__Fv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8085BB80: -/* 8085BB80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085BB84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085BB88 80 83 5D AC */ lwz r4, 0x5dac(r3) -/* 8085BB8C 38 60 00 01 */ li r3, 1 -/* 8085BB90 28 04 00 00 */ cmplwi r4, 0 -/* 8085BB94 4D 82 00 20 */ beqlr -/* 8085BB98 88 04 05 68 */ lbz r0, 0x568(r4) -/* 8085BB9C 28 00 00 28 */ cmplwi r0, 0x28 -/* 8085BBA0 41 82 00 10 */ beq lbl_8085BBB0 -/* 8085BBA4 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8085BBA8 28 00 00 29 */ cmplwi r0, 0x29 -/* 8085BBAC 4C 82 00 20 */ bnelr -lbl_8085BBB0: -/* 8085BBB0 38 60 00 00 */ li r3, 0 -/* 8085BBB4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/d_kytag12_cut_turn_check__Fv.s b/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/d_kytag12_cut_turn_check__Fv.s deleted file mode 100644 index 95b9a9281c..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/d_kytag12_cut_turn_check__Fv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8085BB38: -/* 8085BB38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085BB3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8085BB40 80 83 5D AC */ lwz r4, 0x5dac(r3) -/* 8085BB44 38 60 00 00 */ li r3, 0 -/* 8085BB48 28 04 00 00 */ cmplwi r4, 0 -/* 8085BB4C 4D 82 00 20 */ beqlr -/* 8085BB50 88 04 05 68 */ lbz r0, 0x568(r4) -/* 8085BB54 28 00 00 08 */ cmplwi r0, 8 -/* 8085BB58 41 82 00 20 */ beq lbl_8085BB78 -/* 8085BB5C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8085BB60 28 00 00 16 */ cmplwi r0, 0x16 -/* 8085BB64 41 82 00 14 */ beq lbl_8085BB78 -/* 8085BB68 28 00 00 17 */ cmplwi r0, 0x17 -/* 8085BB6C 41 82 00 0C */ beq lbl_8085BB78 -/* 8085BB70 28 00 00 18 */ cmplwi r0, 0x18 -/* 8085BB74 4C 82 00 20 */ bnelr -lbl_8085BB78: -/* 8085BB78 38 60 00 01 */ li r3, 1 -/* 8085BB7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Delete__FP13kytag12_class.s b/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Delete__FP13kytag12_class.s deleted file mode 100644 index 7ab103a34e..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Delete__FP13kytag12_class.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_8085EE30: -/* 8085EE30 38 00 00 00 */ li r0, 0 -/* 8085EE34 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085EE38 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085EE3C 90 03 10 54 */ stw r0, 0x1054(r3) -/* 8085EE40 38 60 00 01 */ li r3, 1 -/* 8085EE44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute__FP13kytag12_class.s b/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute__FP13kytag12_class.s deleted file mode 100644 index 72c5a429ac..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute__FP13kytag12_class.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_8085ED48: -/* 8085ED48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8085ED4C 7C 08 02 A6 */ mflr r0 -/* 8085ED50 90 01 00 14 */ stw r0, 0x14(r1) -/* 8085ED54 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085ED58 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ -/* 8085ED5C 88 04 10 51 */ lbz r0, 0x1051(r4) -/* 8085ED60 88 A3 04 BA */ lbz r5, 0x4ba(r3) -/* 8085ED64 7C A5 07 74 */ extsb r5, r5 -/* 8085ED68 7C 00 28 00 */ cmpw r0, r5 -/* 8085ED6C 41 82 00 0C */ beq lbl_8085ED78 -/* 8085ED70 38 60 00 00 */ li r3, 0 -/* 8085ED74 48 00 00 A4 */ b lbl_8085EE18 -lbl_8085ED78: -/* 8085ED78 2C 05 00 0B */ cmpwi r5, 0xb -/* 8085ED7C 41 82 00 4C */ beq lbl_8085EDC8 -/* 8085ED80 40 80 00 1C */ bge lbl_8085ED9C -/* 8085ED84 2C 05 00 02 */ cmpwi r5, 2 -/* 8085ED88 41 82 00 34 */ beq lbl_8085EDBC -/* 8085ED8C 40 80 00 50 */ bge lbl_8085EDDC -/* 8085ED90 2C 05 00 00 */ cmpwi r5, 0 -/* 8085ED94 40 80 00 1C */ bge lbl_8085EDB0 -/* 8085ED98 48 00 00 44 */ b lbl_8085EDDC -lbl_8085ED9C: -/* 8085ED9C 2C 05 00 35 */ cmpwi r5, 0x35 -/* 8085EDA0 40 80 00 3C */ bge lbl_8085EDDC -/* 8085EDA4 2C 05 00 33 */ cmpwi r5, 0x33 -/* 8085EDA8 40 80 00 20 */ bge lbl_8085EDC8 -/* 8085EDAC 48 00 00 30 */ b lbl_8085EDDC -lbl_8085EDB0: -/* 8085EDB0 38 00 07 D0 */ li r0, 0x7d0 -/* 8085EDB4 90 04 10 54 */ stw r0, 0x1054(r4) -/* 8085EDB8 48 00 00 34 */ b lbl_8085EDEC -lbl_8085EDBC: -/* 8085EDBC 38 00 01 F4 */ li r0, 0x1f4 -/* 8085EDC0 90 04 10 54 */ stw r0, 0x1054(r4) -/* 8085EDC4 48 00 00 28 */ b lbl_8085EDEC -lbl_8085EDC8: -/* 8085EDC8 38 00 03 E8 */ li r0, 0x3e8 -/* 8085EDCC 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085EDD0 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ -/* 8085EDD4 90 04 10 54 */ stw r0, 0x1054(r4) -/* 8085EDD8 48 00 00 14 */ b lbl_8085EDEC -lbl_8085EDDC: -/* 8085EDDC 38 00 01 F4 */ li r0, 0x1f4 -/* 8085EDE0 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085EDE4 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ -/* 8085EDE8 90 04 10 54 */ stw r0, 0x1054(r4) -lbl_8085EDEC: -/* 8085EDEC 88 03 05 74 */ lbz r0, 0x574(r3) -/* 8085EDF0 28 00 00 01 */ cmplwi r0, 1 -/* 8085EDF4 40 82 00 0C */ bne lbl_8085EE00 -/* 8085EDF8 4B FF E3 E5 */ bl daKytag12_Execute_arrival__FP13kytag12_class -/* 8085EDFC 48 00 00 18 */ b lbl_8085EE14 -lbl_8085EE00: -/* 8085EE00 28 00 00 02 */ cmplwi r0, 2 -/* 8085EE04 40 82 00 0C */ bne lbl_8085EE10 -/* 8085EE08 4B FF F1 E9 */ bl daKytag12_Execute_R00__FP13kytag12_class -/* 8085EE0C 48 00 00 08 */ b lbl_8085EE14 -lbl_8085EE10: -/* 8085EE10 4B FF CE FD */ bl daKytag12_Execute_standard__FP13kytag12_class -lbl_8085EE14: -/* 8085EE14 38 60 00 01 */ li r3, 1 -lbl_8085EE18: -/* 8085EE18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8085EE1C 7C 08 03 A6 */ mtlr r0 -/* 8085EE20 38 21 00 10 */ addi r1, r1, 0x10 -/* 8085EE24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 9d02e676f2..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,156 +0,0 @@ -lbl_80860210: -/* 80860210 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80860214 7C 08 02 A6 */ mflr r0 -/* 80860218 90 01 00 24 */ stw r0, 0x24(r1) -/* 8086021C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80860220 7C 7F 1B 78 */ mr r31, r3 -/* 80860224 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80860228 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8086022C 40 82 00 1C */ bne lbl_80860248 -/* 80860230 28 1F 00 00 */ cmplwi r31, 0 -/* 80860234 41 82 00 08 */ beq lbl_8086023C -/* 80860238 4B 7B 89 2D */ bl __ct__10fopAc_ac_cFv -lbl_8086023C: -/* 8086023C 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80860240 60 00 00 08 */ ori r0, r0, 8 -/* 80860244 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80860248: -/* 80860248 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8086024C 7C 04 07 74 */ extsb r4, r0 -/* 80860250 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80860254 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80860258 7C 00 07 74 */ extsb r0, r0 -/* 8086025C 7C 04 00 00 */ cmpw r4, r0 -/* 80860260 41 82 00 0C */ beq lbl_8086026C -/* 80860264 38 60 00 00 */ li r3, 0 -/* 80860268 48 00 01 D4 */ b lbl_8086043C -lbl_8086026C: -/* 8086026C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80860270 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80860274 B0 1F 05 78 */ sth r0, 0x578(r31) -/* 80860278 A0 1F 05 78 */ lhz r0, 0x578(r31) -/* 8086027C 28 00 00 07 */ cmplwi r0, 7 -/* 80860280 40 81 00 0C */ ble lbl_8086028C -/* 80860284 38 00 00 07 */ li r0, 7 -/* 80860288 B0 1F 05 78 */ sth r0, 0x578(r31) -lbl_8086028C: -/* 8086028C A0 1F 05 78 */ lhz r0, 0x578(r31) -/* 80860290 1C 00 00 47 */ mulli r0, r0, 0x47 -/* 80860294 B0 1F 05 78 */ sth r0, 0x578(r31) -/* 80860298 A0 1F 05 78 */ lhz r0, 0x578(r31) -/* 8086029C 28 00 01 F4 */ cmplwi r0, 0x1f4 -/* 808602A0 40 81 00 0C */ ble lbl_808602AC -/* 808602A4 38 00 01 F4 */ li r0, 0x1f4 -/* 808602A8 B0 1F 05 78 */ sth r0, 0x578(r31) -lbl_808602AC: -/* 808602AC A0 7F 05 78 */ lhz r3, 0x578(r31) -/* 808602B0 38 00 00 0A */ li r0, 0xa -/* 808602B4 7C 03 03 D6 */ divw r0, r3, r0 -/* 808602B8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 808602BC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 808602C0 98 03 0E 90 */ stb r0, 0xe90(r3) -/* 808602C4 88 03 0E 88 */ lbz r0, 0xe88(r3) -/* 808602C8 28 00 00 00 */ cmplwi r0, 0 -/* 808602CC 41 82 00 3C */ beq lbl_80860308 -/* 808602D0 38 C0 00 00 */ li r6, 0 -/* 808602D4 90 C3 0E 8C */ stw r6, 0xe8c(r3) -/* 808602D8 80 83 0E 94 */ lwz r4, 0xe94(r3) -/* 808602DC 28 04 00 00 */ cmplwi r4, 0 -/* 808602E0 41 82 00 28 */ beq lbl_80860308 -/* 808602E4 B0 C4 6D 88 */ sth r6, 0x6d88(r4) -/* 808602E8 7C C4 33 78 */ mr r4, r6 -/* 808602EC 38 00 01 F4 */ li r0, 0x1f4 -/* 808602F0 7C 09 03 A6 */ mtctr r0 -lbl_808602F4: -/* 808602F4 80 A3 0E 94 */ lwz r5, 0xe94(r3) -/* 808602F8 38 04 00 14 */ addi r0, r4, 0x14 -/* 808602FC 7C C5 01 AE */ stbx r6, r5, r0 -/* 80860300 38 84 00 38 */ addi r4, r4, 0x38 -/* 80860304 42 00 FF F0 */ bdnz lbl_808602F4 -lbl_80860308: -/* 80860308 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8086030C 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80860310 3C 80 80 86 */ lis r4, lit_4337@ha /* 0x80860530@ha */ -/* 80860314 C8 24 05 30 */ lfd f1, lit_4337@l(r4) /* 0x80860530@l */ -/* 80860318 90 01 00 0C */ stw r0, 0xc(r1) -/* 8086031C 3C 00 43 30 */ lis r0, 0x4330 -/* 80860320 90 01 00 08 */ stw r0, 8(r1) -/* 80860324 C8 01 00 08 */ lfd f0, 8(r1) -/* 80860328 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8086032C 3C 80 80 86 */ lis r4, lit_4335@ha /* 0x8086052C@ha */ -/* 80860330 C0 04 05 2C */ lfs f0, lit_4335@l(r4) /* 0x8086052C@l */ -/* 80860334 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80860338 D0 1F 05 74 */ stfs f0, 0x574(r31) -/* 8086033C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80860340 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 80860344 98 1F 05 7A */ stb r0, 0x57a(r31) -/* 80860348 38 00 00 00 */ li r0, 0 -/* 8086034C B0 1F 05 7C */ sth r0, 0x57c(r31) -/* 80860350 88 03 0E 90 */ lbz r0, 0xe90(r3) -/* 80860354 1C 00 00 0A */ mulli r0, r0, 0xa -/* 80860358 B0 1F 05 7E */ sth r0, 0x57e(r31) -/* 8086035C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80860360 7C 00 07 74 */ extsb r0, r0 -/* 80860364 2C 00 00 09 */ cmpwi r0, 9 -/* 80860368 40 82 00 44 */ bne lbl_808603AC -/* 8086036C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80860370 54 04 27 3E */ srwi r4, r0, 0x1c -/* 80860374 1C 04 00 7D */ mulli r0, r4, 0x7d -/* 80860378 B0 1F 05 7C */ sth r0, 0x57c(r31) -/* 8086037C 38 04 00 01 */ addi r0, r4, 1 -/* 80860380 1C 00 00 7D */ mulli r0, r0, 0x7d -/* 80860384 B0 1F 05 7E */ sth r0, 0x57e(r31) -/* 80860388 88 03 0E 90 */ lbz r0, 0xe90(r3) -/* 8086038C 1C 00 00 0A */ mulli r0, r0, 0xa -/* 80860390 A0 9F 05 7E */ lhz r4, 0x57e(r31) -/* 80860394 7C 00 20 00 */ cmpw r0, r4 -/* 80860398 40 80 00 A0 */ bge lbl_80860438 -/* 8086039C 38 00 00 0A */ li r0, 0xa -/* 808603A0 7C 04 03 D6 */ divw r0, r4, r0 -/* 808603A4 98 03 0E 90 */ stb r0, 0xe90(r3) -/* 808603A8 48 00 00 90 */ b lbl_80860438 -lbl_808603AC: -/* 808603AC 2C 00 00 07 */ cmpwi r0, 7 -/* 808603B0 40 82 00 44 */ bne lbl_808603F4 -/* 808603B4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 808603B8 54 04 27 3E */ srwi r4, r0, 0x1c -/* 808603BC 1C 04 00 FA */ mulli r0, r4, 0xfa -/* 808603C0 B0 1F 05 7C */ sth r0, 0x57c(r31) -/* 808603C4 38 04 00 01 */ addi r0, r4, 1 -/* 808603C8 1C 00 00 FA */ mulli r0, r0, 0xfa -/* 808603CC B0 1F 05 7E */ sth r0, 0x57e(r31) -/* 808603D0 88 03 0E 90 */ lbz r0, 0xe90(r3) -/* 808603D4 1C 00 00 0A */ mulli r0, r0, 0xa -/* 808603D8 A0 9F 05 7E */ lhz r4, 0x57e(r31) -/* 808603DC 7C 00 20 00 */ cmpw r0, r4 -/* 808603E0 40 80 00 58 */ bge lbl_80860438 -/* 808603E4 38 00 00 0A */ li r0, 0xa -/* 808603E8 7C 04 03 D6 */ divw r0, r4, r0 -/* 808603EC 98 03 0E 90 */ stb r0, 0xe90(r3) -/* 808603F0 48 00 00 48 */ b lbl_80860438 -lbl_808603F4: -/* 808603F4 2C 00 00 0D */ cmpwi r0, 0xd -/* 808603F8 40 82 00 40 */ bne lbl_80860438 -/* 808603FC 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80860400 54 04 27 3E */ srwi r4, r0, 0x1c -/* 80860404 1C 04 00 47 */ mulli r0, r4, 0x47 -/* 80860408 B0 1F 05 7C */ sth r0, 0x57c(r31) -/* 8086040C 38 04 00 01 */ addi r0, r4, 1 -/* 80860410 1C 00 00 47 */ mulli r0, r0, 0x47 -/* 80860414 B0 1F 05 7E */ sth r0, 0x57e(r31) -/* 80860418 88 03 0E 90 */ lbz r0, 0xe90(r3) -/* 8086041C 1C 00 00 0A */ mulli r0, r0, 0xa -/* 80860420 A0 9F 05 7E */ lhz r4, 0x57e(r31) -/* 80860424 7C 00 20 00 */ cmpw r0, r4 -/* 80860428 40 80 00 10 */ bge lbl_80860438 -/* 8086042C 38 00 00 0A */ li r0, 0xa -/* 80860430 7C 04 03 D6 */ divw r0, r4, r0 -/* 80860434 98 03 0E 90 */ stb r0, 0xe90(r3) -lbl_80860438: -/* 80860438 38 60 00 04 */ li r3, 4 -lbl_8086043C: -/* 8086043C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80860440 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80860444 7C 08 03 A6 */ mtlr r0 -/* 80860448 38 21 00 20 */ addi r1, r1, 0x20 -/* 8086044C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute__FP13kytag13_class.s b/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute__FP13kytag13_class.s deleted file mode 100644 index 218400cbf4..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute__FP13kytag13_class.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_808601C0: -/* 808601C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 808601C4 7C 08 02 A6 */ mflr r0 -/* 808601C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 808601CC 88 03 04 BA */ lbz r0, 0x4ba(r3) -/* 808601D0 7C 05 07 74 */ extsb r5, r0 -/* 808601D4 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 808601D8 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ -/* 808601DC 7C 00 07 74 */ extsb r0, r0 -/* 808601E0 7C 05 00 00 */ cmpw r5, r0 -/* 808601E4 40 82 00 08 */ bne lbl_808601EC -/* 808601E8 4B FF F0 C9 */ bl daKytag13_Execute_standard__FP13kytag13_class -lbl_808601EC: -/* 808601EC 38 60 00 01 */ li r3, 1 -/* 808601F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808601F4 7C 08 03 A6 */ mtlr r0 -/* 808601F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 808601FC 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index a4a51062a5..d15a6ba4cf 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -829,6 +829,7 @@ public: void offPlayerShadowNoDraw() { offNoResetFlg2(FLG2_PLAYER_SHADOW); } void onLightSwordGetEffect() { onEndResetFlg2(ERFLG2_UNK_10); } void onForceGameOver() { onNoResetFlg2(FLG2_FORCE_GAMEOVER); } + void onForceWolfChange() { onEndResetFlg0(ERFLG0_UNK_2); } u32 checkBoarSingleBattle() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); } u32 checkWolfDashAutoJump() const { return checkNoResetFlg2(FLG2_WOLF_DASH_AUTO_JUMP); } diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 11121ec5b8..72f55ba6ca 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -385,6 +385,7 @@ public: s16 getItemPachinkoNumCount() { return mItemPachinkoNumCount; } void clearItemPachinkoNumCount() { mItemPachinkoNumCount = 0; } u8 getNeedLightDropNum() { return mNeedLightDropNum; } + void setNeedLightDropNum(u8 i_num) { mNeedLightDropNum = i_num; } u8 getWolfAbility(int i_idx) { return mWolfAbility[i_idx]; } const char* getStartStageName() { return mStartStage.getName(); } @@ -2698,6 +2699,10 @@ inline u8 dComIfGp_getNeedLightDropNum() { return g_dComIfG_gameInfo.play.getNeedLightDropNum(); } +inline void dComIfGp_setNeedLightDropNum(u8 i_num) { + g_dComIfG_gameInfo.play.setNeedLightDropNum(i_num); +} + inline void dComIfGp_setItemNowOil(s32 oil) { g_dComIfG_gameInfo.play.setItemNowOil(oil); } diff --git a/include/d/kankyo/d_kankyo_wether.h b/include/d/kankyo/d_kankyo_wether.h index db05ee731e..42e8a5b982 100644 --- a/include/d/kankyo/d_kankyo_wether.h +++ b/include/d/kankyo/d_kankyo_wether.h @@ -32,6 +32,9 @@ void dKyw_get_AllWind_vec(cXyz* i_position, cXyz* i_direction, f32* i_power); void dKyw_pntwind_cut(WIND_INFLUENCE* i_pntwind); cXyz dKyw_pntwind_get_vecpow(cXyz* param_0); void dKyw_pntwind_set(WIND_INFLUENCE* i_pntwind); +void dKyw_pntlight_collision_get_info(cXyz* param_0, cXyz* param_1, f32* param_2); +void dKyw_plight_collision_set(cXyz* param_0, s16 param_1, s16 param_2, f32 param_3, f32 param_4, + f32 param_5, f32 param_6, f32 param_7); class dKankyo_sun_Packet : public J3DPacket { public: @@ -308,11 +311,19 @@ struct EF_EVIL_EFF { /* 8005706C */ ~EF_EVIL_EFF(); /* 800570A8 */ EF_EVIL_EFF(); - /* 0x00 */ u8 mStatus; + /* 0x00 */ s8 mStatus; /* 0x04 */ cXyz mPosition; /* 0x10 */ cXyz mBasePos; /* 0x1C */ csXyz field_0x1c; - /* 0x22 */ u8 field_0x22[0x22]; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ u8 field_0x30[0x38 - 0x30]; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ u16 field_0x3c; + /* 0x3E */ u16 field_0x3e; + /* 0x40 */ u16 field_0x40; + /* 0x42 */ u16 field_0x42; }; // Size: 0x44 class dKankyo_evil_Packet : public J3DPacket { diff --git a/include/dolphin/os.h b/include/dolphin/os.h index 2f436afe8b..f108fae541 100644 --- a/include/dolphin/os.h +++ b/include/dolphin/os.h @@ -100,6 +100,7 @@ void OSReportInit(void); #define ASSERT(cond) ((cond) || (OSPanic(__FILE__, line, "Failed assertion " #cond), 0)) #else #define OS_REPORT(...) +#define OS_WARNING(...) #define OS_REPORT_ERROR(...) #define OS_PANIC(...) #define ASSERTMSG(exp, msg) ((void)0) diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 44513cac21..04acba7d4f 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -234,4 +234,8 @@ inline void mDoAud_setHyrulSewerOpen(bool i_close) { g_mEnvSeMgr.setHyrulSewerOpen(i_close); } +inline void mDoAud_startFogSe() { + g_mEnvSeMgr.startFogSe(); +} + #endif /* M_DO_M_DO_AUDIO_H */ diff --git a/include/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.h b/include/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.h index ec1dfc4095..2305ade918 100644 --- a/include/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.h +++ b/include/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.h @@ -1,6 +1,22 @@ #ifndef D_A_KYTAG01_H #define D_A_KYTAG01_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class kytag01_class : public fopAc_ac_c { +public: + /* 0x568 */ u8 field_0x568[0x588 - 0x568]; + /* 0x588 */ f32 mNamiInnerRange; + /* 0x58C */ f32 mNamiOuterRange; + /* 0x590 */ f32 mNamiSize; + /* 0x594 */ f32 field_0x594; + /* 0x598 */ u8 mSwNo1; + /* 0x599 */ u8 mSwNo2; + /* 0x59A */ u8 field_0x59A[0x59C - 0x59A]; + /* 0x59C */ u8 field_0x59c; + /* 0x59D */ u8 field_0x59d; + /* 0x59E */ u8 field_0x59e; + /* 0x59F */ u8 mStartPoint; +}; #endif /* D_A_KYTAG01_H */ diff --git a/include/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.h b/include/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.h index 622b3fb501..0ca0e0ba2a 100644 --- a/include/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.h +++ b/include/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.h @@ -1,13 +1,14 @@ #ifndef D_A_KYTAG04_H #define D_A_KYTAG04_H +#include "f_op/f_op_actor_mng.h" class kytag04_class : public fopAc_ac_c { public: /* 0x568 */ J3DModel* mpModel; /* 0x56C */ mDoExt_btkAnm mBtk; /* 0x584 */ mDoExt_brkAnm mBrk; - /* 0x59C */ request_of_phase_process_class mPhaseReq; + /* 0x59C */ request_of_phase_process_class mPhase; /* 0x5A4 */ JPABaseEmitter* field_0x5a4; /* 0x5A8 */ JPABaseEmitter* field_0x5a8; /* 0x5AC */ JPABaseEmitter* field_0x5ac; @@ -15,7 +16,7 @@ public: /* 0x5B4 */ u8 field_0x5b4; /* 0x5B5 */ u8 field_0x5b5; /* 0x5B6 */ u8 field_0x5b6; - /* 0x5B7 */ u8 field_0x5b7; + /* 0x5B7 */ s8 field_0x5b7; /* 0x5B8 */ u8 field_0x5b8; /* 0x5B9 */ u8 field_0x5b9; /* 0x5BC */ u32 mExitID; diff --git a/include/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.h b/include/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.h index 3e2fd206e8..a5a3f59639 100644 --- a/include/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.h +++ b/include/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.h @@ -11,11 +11,11 @@ public: /* 0x59C */ JPABaseEmitter* mpEmitter1; /* 0x5A0 */ JPABaseEmitter* mpEmitter2; /* 0x5A4 */ request_of_phase_process_class mPhase; - /* 0x5AC */ cXyz field_0x5ac; - /* 0x5B8 */ cXyz field_0x5b8; - /* 0x5C4 */ cXyz field_0x5c4; - /* 0x5D0 */ f32 field_0x5d0; - /* 0x5D4 */ int field_0x5d4; + /* 0x5AC */ cXyz mSize; + /* 0x5B8 */ cXyz mAvoidPos; + /* 0x5C4 */ cXyz mTargetAvoidPos; + /* 0x5D0 */ f32 mSizeScale; + /* 0x5D4 */ int mSizeTimer; /* 0x5D8 */ u8 field_0x5d8; }; diff --git a/include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h b/include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h index 57bf6472eb..16336db8f3 100644 --- a/include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h +++ b/include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h @@ -7,10 +7,10 @@ class kytag16_class : public fopAc_ac_c { public: /* 0x568 */ f32 field_0x568; /* 0x56C */ u8 field_0x56c; - /* 0x56D */ GXColor field_0x56d; + /* 0x56D */ GXColor mColor; /* 0x571 */ u8 field_0x571; /* 0x572 */ u8 field_0x572; - /* 0x573 */ u8 field_0x573; + /* 0x573 */ u8 mSwitch; /* 0x574 */ f32 field_0x574; /* 0x578 */ f32 field_0x578; /* 0x57C */ f32 field_0x57c; diff --git a/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp b/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp index 1c734ac363..ffa13796e3 100644 --- a/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp +++ b/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp @@ -1,120 +1,32 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_kytag00 -// +/** + * d_a_kytag00.cpp + * +*/ #include "rel/d/a/kytag/d_a_kytag00/d_a_kytag00.h" #include "d/com/d_com_inf_game.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" static void get_check_pos__FP13kytag00_class(); -extern "C" static void wether_tag_reset__FP13kytag00_class(); -extern "C" static void wether_tag_move__FP13kytag00_class(); -extern "C" static void raincnt_set__Ff(); -extern "C" static void raincnt_cut__Fv(); -extern "C" static void wether_tag_efect_reset__FP13kytag00_class(); -extern "C" static void wether_tag_efect_move__FP13kytag00_class(); -extern "C" static void daKytag00_Draw__FP13kytag00_class(); -extern "C" static void daKytag00_Execute__FP13kytag00_class(); -extern "C" static bool daKytag00_IsDelete__FP13kytag00_class(); -extern "C" static void daKytag00_Delete__FP13kytag00_class(); -extern "C" static void daKytag00_Create__FP10fopAc_ac_c(); - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void setSnowPower__10Z2EnvSeMgrFSc(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8046C980-8046C988 000000 0004+04 6/6 0/0 0/0 .rodata @3798 */ -SECTION_RODATA static u8 const lit_3798[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8046C980, &lit_3798); - -/* 8046C988-8046C990 000008 0008+00 0/3 0/0 0/0 .rodata @3799 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3799[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8046C988, &lit_3799); -#pragma pop - -/* 8046C990-8046C998 000010 0008+00 0/3 0/0 0/0 .rodata @3800 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3800[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8046C990, &lit_3800); -#pragma pop - -/* 8046C998-8046C9A0 000018 0008+00 0/3 0/0 0/0 .rodata @3801 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3801[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8046C998, &lit_3801); -#pragma pop /* 8046B718-8046B9DC 000078 02C4+00 2/2 0/0 0/0 .text get_check_pos__FP13kytag00_class */ -// reg r31/r30 swap -#ifdef NONMATCHING static cXyz get_check_pos(kytag00_class* i_this) { - camera_class* camera_p = dComIfGp_getCamera(0); + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + camera_class* camera_p = (camera_class*)dComIfGp_getCamera(0); fopAc_ac_c* player_p = dComIfGp_getPlayer(0); - cXyz ret; + cXyz pos; if (player_p != NULL) { - f32 temp_f = i_this->current.pos.abs(camera_p->mLookat.mEye); - f32 temp_f2 = i_this->current.pos.abs(player_p->current.pos); + f32 dist_to_cameye = a_this->current.pos.abs(camera_p->mLookat.mEye); + f32 dist_to_player = a_this->current.pos.abs(player_p->current.pos); - ret = player_p->current.pos; - if (dComIfGp_event_runCheck() && temp_f < temp_f2) { - ret = camera_p->mLookat.mEye; + pos = player_p->current.pos; + if (dComIfGp_event_runCheck() && dist_to_cameye < dist_to_player) { + pos = camera_p->mLookat.mEye; } } else { - ret.set(0.0f, 0.0f, 0.0f); + pos.set(0.0f, 0.0f, 0.0f); } - return ret; + return pos; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm cXyz get_check_pos(kytag00_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/get_check_pos__FP13kytag00_class.s" -} -#pragma pop -#endif /* 8046B9DC-8046BA10 00033C 0034+00 2/2 0/0 0/0 .text wether_tag_reset__FP13kytag00_class */ @@ -123,52 +35,12 @@ static void wether_tag_reset(kytag00_class* i_this) { g_env_light.mColpatPrevGather = g_env_light.mColpatWeather; g_env_light.mColpatCurrGather = g_env_light.mColpatWeather; - g_env_light.mColPatBlendGather = FLOAT_LABEL(lit_3798); + g_env_light.mColPatBlendGather = 0.0f; g_env_light.mColPatModeGather = 1; } -/* ############################################################################################## */ -/* 8046C9A0-8046C9A4 000020 0004+00 0/3 0/0 0/0 .rodata @3906 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3906 = 100.0f; -COMPILER_STRIP_GATE(0x8046C9A0, &lit_3906); -#pragma pop - -/* 8046C9A4-8046C9A8 000024 0004+00 0/3 0/0 0/0 .rodata @3907 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3907 = 5000.0f; -COMPILER_STRIP_GATE(0x8046C9A4, &lit_3907); -#pragma pop - -/* 8046C9A8-8046C9AC 000028 0004+00 0/4 0/0 0/0 .rodata @3908 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3908 = 1.0f; -COMPILER_STRIP_GATE(0x8046C9A8, &lit_3908); -#pragma pop - -/* 8046C9AC-8046C9B0 00002C 0004+00 0/1 0/0 0/0 .rodata @3909 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3909 = 0.5f; -COMPILER_STRIP_GATE(0x8046C9AC, &lit_3909); -#pragma pop - -/* 8046C9B0-8046C9B8 000030 0008+00 0/3 0/0 0/0 .rodata @3911 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3911[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8046C9B0, &lit_3911); -#pragma pop - /* 8046BA10-8046BD60 000370 0350+00 1/1 0/0 0/0 .text wether_tag_move__FP13kytag00_class */ -// regswaps, but should be equivalent -#ifdef NONMATCHING static void wether_tag_move(kytag00_class* i_this) { cXyz spC; cXyz check_pos = get_check_pos(i_this); @@ -184,8 +56,10 @@ static void wether_tag_move(kytag00_class* i_this) { check_pos.y < temp_f31 + (i_this->current.pos.y + (5000.0f * i_this->scale.y)) && i_this->field_0x588 > 0.0f) { - f32 var_f9 = 1.0f; - f32 var_f8 = 1.0f; + f32 var_f8; + f32 var_f9; + var_f9 = 1.0f; + var_f8 = 1.0f; f32 temp_f10 = i_this->field_0x584 - i_this->field_0x580; if (0.0f != temp_f10) { @@ -262,16 +136,6 @@ static void wether_tag_move(kytag00_class* i_this) { wether_tag_reset(i_this); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void wether_tag_move(kytag00_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_move__FP13kytag00_class.s" -} -#pragma pop -#endif /* 8046BD60-8046BDA4 0006C0 0044+00 1/1 0/0 0/0 .text raincnt_set__Ff */ static void raincnt_set(f32 param_0) { @@ -336,33 +200,7 @@ static void wether_tag_efect_reset(kytag00_class* i_this) { } } -/* ############################################################################################## */ -/* 8046CA2C-8046CA78 -00001 004C+00 1/1 0/0 0/0 .data @4108 */ -SECTION_DATA static void* lit_4108[19] = { - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x788), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x2A4), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x2B0), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x3B8), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x41C), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x43C), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x464), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x4B4), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x4E0), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x50C), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x538), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x564), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x598), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x5C4), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x3B8), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x5F0), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x614), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x71C), - (void*)(((char*)wether_tag_efect_move__FP13kytag00_class) + 0x748), -}; - /* 8046BEB8-8046C660 000818 07A8+00 3/2 0/0 0/0 .text wether_tag_efect_move__FP13kytag00_class */ -// matches with literals -#ifdef NONMATCHING static void wether_tag_efect_move(kytag00_class* i_this) { cXyz spC; cXyz check_pos = get_check_pos(i_this); @@ -547,16 +385,6 @@ static void wether_tag_efect_move(kytag00_class* i_this) { wether_tag_efect_reset(i_this); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void wether_tag_efect_move(kytag00_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_efect_move__FP13kytag00_class.s" -} -#pragma pop -#endif /* 8046C660-8046C684 000FC0 0024+00 1/0 0/0 0/0 .text daKytag00_Draw__FP13kytag00_class */ @@ -565,73 +393,7 @@ static int daKytag00_Draw(kytag00_class* i_this) { return 1; } -/* ############################################################################################## */ -/* 8046C9BC-8046C9C0 00003C 0004+00 0/0 0/0 0/0 .rodata @4101 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4101 = 500.0f; -COMPILER_STRIP_GATE(0x8046C9BC, &lit_4101); -#pragma pop - -/* 8046C9C0-8046C9C4 000040 0004+00 0/0 0/0 0/0 .rodata @4102 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4102 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x8046C9C0, &lit_4102); -#pragma pop - -/* 8046C9C4-8046C9C8 000044 0004+00 0/0 0/0 0/0 .rodata @4103 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4103 = 50.0f; -COMPILER_STRIP_GATE(0x8046C9C4, &lit_4103); -#pragma pop - -/* 8046C9C8-8046C9CC 000048 0004+00 0/0 0/0 0/0 .rodata @4104 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4104 = 63.0f; -COMPILER_STRIP_GATE(0x8046C9C8, &lit_4104); -#pragma pop - -/* 8046C9CC-8046C9D0 00004C 0004+00 0/0 0/0 0/0 .rodata @4105 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4105 = 300.0f; -COMPILER_STRIP_GATE(0x8046C9CC, &lit_4105); -#pragma pop - -/* 8046C9D0-8046C9D4 000050 0004+00 0/0 0/0 0/0 .rodata @4106 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4106 = 127.0f; -COMPILER_STRIP_GATE(0x8046C9D0, &lit_4106); -#pragma pop - -/* 8046C9D4-8046C9D8 000054 0004+00 0/1 0/0 0/0 .rodata @4145 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4145 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x8046C9D4, &lit_4145); -#pragma pop - -/* 8046C9D8-8046C9DC 000058 0004+00 0/1 0/0 0/0 .rodata @4146 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4146 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x8046C9D8, &lit_4146); -#pragma pop - -/* 8046C9DC-8046C9E0 00005C 0004+00 0/1 0/0 0/0 .rodata @4147 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4147 = 0x38D1B717; -COMPILER_STRIP_GATE(0x8046C9DC, &lit_4147); -#pragma pop - /* 8046C684-8046C76C 000FE4 00E8+00 1/0 0/0 0/0 .text daKytag00_Execute__FP13kytag00_class */ -// matches with literals -#ifdef NONMATCHING static int daKytag00_Execute(kytag00_class* i_this) { BOOL var_r30 = true; @@ -639,14 +401,18 @@ static int daKytag00_Execute(kytag00_class* i_this) { s32 room_no = dComIfGp_roomControl_getStayNo(); if (dComIfGs_isSwitch(i_this->field_0x571, room_no)) { var_r30 = 0; + goto label; } - } else if (i_this->field_0x572 != 0xFF) { + } + + if (i_this->field_0x572 != 0xFF) { s32 room_no = dComIfGp_roomControl_getStayNo(); if (!dComIfGs_isSwitch(i_this->field_0x572, room_no)) { var_r30 = 0; } } +label: if (var_r30 == TRUE) { cLib_addCalc(&i_this->field_0x588, 1.0f, 0.1f, 0.01f, 0.0001f); } else { @@ -656,16 +422,6 @@ static int daKytag00_Execute(kytag00_class* i_this) { wether_tag_move(i_this); return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daKytag00_Execute(kytag00_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Execute__FP13kytag00_class.s" -} -#pragma pop -#endif /* 8046C76C-8046C774 0010CC 0008+00 1/0 0/0 0/0 .text daKytag00_IsDelete__FP13kytag00_class */ static int daKytag00_IsDelete(kytag00_class* i_this) { @@ -678,13 +434,10 @@ static int daKytag00_Delete(kytag00_class* i_this) { wether_tag_reset(i_this); wether_tag_efect_reset(i_this); g_env_light.mMoyaCount = 0; - return 1; } /* 8046C7BC-8046C978 00111C 01BC+00 1/0 0/0 0/0 .text daKytag00_Create__FP10fopAc_ac_c */ -// matches with literals -#ifdef NONMATCHING static int daKytag00_Create(fopAc_ac_c* i_this) { fopAcM_SetupActor(i_this, kytag00_class); kytag00_class* a_this = (kytag00_class*)i_this; @@ -703,14 +456,18 @@ static int daKytag00_Create(fopAc_ac_c* i_this) { s32 room_no = dComIfGp_roomControl_getStayNo(); if (dComIfGs_isSwitch(a_this->field_0x571, room_no)) { var_r30 = 0; + goto label; } - } else if (a_this->field_0x572 != 0xFF) { + } + + if (a_this->field_0x572 != 0xFF) { s32 room_no = dComIfGp_roomControl_getStayNo(); if (!dComIfGs_isSwitch(a_this->field_0x572, room_no)) { var_r30 = 0; } } +label: if (var_r30 == TRUE) { a_this->field_0x588 = 1.0f; } else { @@ -734,18 +491,7 @@ static int daKytag00_Create(fopAc_ac_c* i_this) { wether_tag_efect_move(a_this); return cPhs_COMPLEATE_e; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daKytag00_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Create__FP10fopAc_ac_c.s" -} -#pragma pop -#endif -/* ############################################################################################## */ /* 8046CA78-8046CA98 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag00_Method */ static actor_method_class l_daKytag00_Method = { (process_method_func)daKytag00_Create, (process_method_func)daKytag00_Delete, diff --git a/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp b/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp index f60ac24d88..f3de1ca6e8 100644 --- a/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp +++ b/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp @@ -1,296 +1,247 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_kytag01 -// +/** + * d_a_kytag01.cpp + * Sacred Grove Mist Tag + */ #include "rel/d/a/kytag/d_a_kytag01/d_a_kytag01.h" -#include "dol2asm.h" - -// -// Types: -// - -struct kytag01_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct cXyz {}; - -struct Z2EnvSeMgr { - /* 802C9400 */ void startFogSe(); -}; - -// -// Forward References: -// - -extern "C" static void get_check_pos__FP13kytag01_class(); -extern "C" static void mist_tag_move__FP13kytag01_class(); -extern "C" static bool daKytag01_Draw__FP13kytag01_class(); -extern "C" static void daKytag01_Execute__FP13kytag01_class(); -extern "C" static bool daKytag01_IsDelete__FP13kytag01_class(); -extern "C" static bool daKytag01_Delete__FP13kytag01_class(); -extern "C" static void daKytag01_Create__FP10fopAc_ac_c(); -extern "C" extern void* g_profile_KYTAG01[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz(); -extern "C" void dKy_fog_startendz_set__Ffff(); -extern "C" void dKy_change_colpat__FUc(); -extern "C" void cM_atan2s__Fff(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void startFogSe__10Z2EnvSeMgrFv(); -extern "C" void PSVECSquareDistance(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); -extern "C" void abs(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8085598C-80855994 000000 0004+04 4/4 0/0 0/0 .rodata @3796 */ -SECTION_RODATA static u8 const lit_3796[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8085598C, &lit_3796); - -/* 80855994-8085599C 000008 0008+00 0/2 0/0 0/0 .rodata @3797 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3797[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80855994, &lit_3797); -#pragma pop - -/* 8085599C-808559A4 000010 0008+00 0/2 0/0 0/0 .rodata @3798 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3798[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8085599C, &lit_3798); -#pragma pop - -/* 808559A4-808559AC 000018 0008+00 0/2 0/0 0/0 .rodata @3799 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3799[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x808559A4, &lit_3799); -#pragma pop +#include "SSystem/SComponent/c_math.h" +#include "Z2AudioLib/Z2EnvSeMgr.h" +#include "d/com/d_com_inf_game.h" +#include "d/kankyo/d_kankyo_rain.h" /* 80855058-80855320 000078 02C8+00 1/1 0/0 0/0 .text get_check_pos__FP13kytag01_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void get_check_pos(kytag01_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/get_check_pos__FP13kytag01_class.s" +static cXyz get_check_pos(kytag01_class* i_this) { + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + camera_class* camera = (camera_class*)dComIfGp_getCamera(0); + fopAc_ac_c* player = dComIfGp_getPlayer(0); + + cXyz pos; + f32 dist_to_cameye = a_this->current.pos.abs(camera->mLookat.mEye); + f32 dist_to_player = a_this->current.pos.abs(player->current.pos); + + if (dComIfGp_event_runCheck()) { + if (dist_to_cameye < dist_to_player) { + pos = camera->mLookat.mEye; + } else { + pos = player->current.pos; + } + } else { + pos = player->current.pos; + } + + return pos; } -#pragma pop - -/* ############################################################################################## */ -/* 808559AC-808559B0 000020 0004+00 0/2 0/0 0/0 .rodata @3879 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3879 = 100.0f; -COMPILER_STRIP_GATE(0x808559AC, &lit_3879); -#pragma pop - -/* 808559B0-808559B4 000024 0004+00 0/2 0/0 0/0 .rodata @3880 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3880 = 1.0f; -COMPILER_STRIP_GATE(0x808559B0, &lit_3880); -#pragma pop - -/* 808559B4-808559B8 000028 0004+00 0/1 0/0 0/0 .rodata @3881 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3881 = 32768.0f; -COMPILER_STRIP_GATE(0x808559B4, &lit_3881); -#pragma pop - -/* 808559B8-808559BC 00002C 0004+00 0/1 0/0 0/0 .rodata @3882 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3882 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x808559B8, &lit_3882); -#pragma pop - -/* 808559BC-808559C0 000030 0004+00 0/1 0/0 0/0 .rodata @3883 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3883 = -2000.0f; -COMPILER_STRIP_GATE(0x808559BC, &lit_3883); -#pragma pop - -/* 808559C0-808559C4 000034 0004+00 0/1 0/0 0/0 .rodata @3884 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3884 = 200.0f; -COMPILER_STRIP_GATE(0x808559C0, &lit_3884); -#pragma pop - -/* 808559C4-808559C8 000038 0004+00 0/1 0/0 0/0 .rodata @3885 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3885 = 50.0f; -COMPILER_STRIP_GATE(0x808559C4, &lit_3885); -#pragma pop - -/* 808559C8-808559CC 00003C 0004+00 0/1 0/0 0/0 .rodata @3886 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3886 = 0.5f; -COMPILER_STRIP_GATE(0x808559C8, &lit_3886); -#pragma pop - -/* 808559CC-808559D4 000040 0008+00 0/2 0/0 0/0 .rodata @3888 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3888[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x808559CC, &lit_3888); -#pragma pop /* 80855320-80855638 000340 0318+00 1/1 0/0 0/0 .text mist_tag_move__FP13kytag01_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void mist_tag_move(kytag01_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/mist_tag_move__FP13kytag01_class.s" +static void mist_tag_move(kytag01_class* i_this) { + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + camera_class* camera = (camera_class*)dComIfGp_getCamera(0); + fopAc_ac_c* player = dComIfGp_getPlayer(0); + + cXyz sp80; + cXyz check_pos; + cXyz sp98; + cXyz spA4; + cXyz spB0; + cXyz spBC; + + check_pos = get_check_pos(i_this); + sp80 = a_this->current.pos; + sp80.y = check_pos.y; + + f32 var_f31 = sp80.abs(check_pos); + if (var_f31 > i_this->mNamiInnerRange) { + if (var_f31 > i_this->mNamiOuterRange) { + if (var_f31 > i_this->mNamiOuterRange + 100.0f) { + var_f31 = 1.0f; + } else { + var_f31 = 1.0f; + } + } else { + var_f31 = (var_f31 - i_this->mNamiInnerRange) / + (i_this->mNamiOuterRange - i_this->mNamiInnerRange); + i_this->field_0x59c = 1; + } + } else { + var_f31 = 0.0f; + i_this->field_0x59c = 1; + } + + var_f31 *= i_this->field_0x594; + + spBC = camera->mLookat.mCenter; + spBC.y = camera->mLookat.mEye.y; + + dKyr_get_vectle_calc(&camera->mLookat.mEye, &spBC, &sp98); + sp80.y = camera->mLookat.mEye.y; + + dKyr_get_vectle_calc(&camera->mLookat.mEye, &sp80, &spA4); + + s16 var_r29_2 = cM_atan2s(sp98.x, sp98.z); + s16 var_r26 = cM_atan2s(spA4.x, spA4.z); + + f32 temp_f2_2 = 1.0f - ((f32)(s16)abs((s16)(var_r29_2 - var_r26)) / 32768.0f); + temp_f2_2 *= temp_f2_2 * temp_f2_2 * temp_f2_2; + + f32 var_f3 = 1.0f - temp_f2_2; + var_f3 += 0.2f; + + if (var_f3 > 1.0f) { + var_f3 = 1.0f; + } + + dKy_fog_startendz_set(-2000.0f, 200.0f, var_f31 * var_f3); + f32 temp_f1 = i_this->field_0x594; + g_env_light.mColpatPrevGather = 0; + g_env_light.mColpatCurrGather = 1; + g_env_light.mColPatBlendGather = temp_f1; + g_env_light.mColPatModeGather = 1; + g_env_light.mMoyaMode = 3; + g_env_light.mMoyaCount = g_env_light.mColPatBlendGather * 50.0f; + + if (g_env_light.mColPatBlendGather > 0.5f) { + mDoAud_startFogSe(); + } } -#pragma pop /* 80855638-80855640 000658 0008+00 1/0 0/0 0/0 .text daKytag01_Draw__FP13kytag01_class */ -static bool daKytag01_Draw(kytag01_class* param_0) { - return true; +static int daKytag01_Draw(kytag01_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 808559D4-808559D8 000048 0004+00 0/1 0/0 0/0 .rodata @3946 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3946 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x808559D4, &lit_3946); -#pragma pop - -/* 808559D8-808559DC 00004C 0004+00 0/1 0/0 0/0 .rodata @3947 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3947 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(0x808559D8, &lit_3947); -#pragma pop - -/* 808559DC-808559E0 000050 0004+00 0/1 0/0 0/0 .rodata @3948 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3948 = 0x38D1B717; -COMPILER_STRIP_GATE(0x808559DC, &lit_3948); -#pragma pop - /* 80855640-808557DC 000660 019C+00 1/0 0/0 0/0 .text daKytag01_Execute__FP13kytag01_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag01_Execute(kytag01_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Execute__FP13kytag01_class.s" +static int daKytag01_Execute(kytag01_class* i_this) { + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + camera_class* camera = dComIfGp_getCamera(0); + fopAc_ac_c* player = dComIfGp_getPlayer(0); + + if ((a_this->subtype & 0xFF) == 2) { + if (i_this->mStartPoint == dComIfGs_getStartPoint()) { + i_this->mStartPoint = 0xFF; + dKy_change_colpat(i_this->field_0x59e); + } + } else if ((a_this->subtype & 0xFF) == 0) { + if (a_this->home.roomNo == dComIfGp_roomControl_getStayNo()) { + if (i_this->mSwNo1 != 0xFF) { + if (dComIfGs_isSwitch(i_this->mSwNo1, a_this->home.roomNo)) { + if (i_this->mSwNo2 != 0xFF && + dComIfGs_isSwitch(i_this->mSwNo2, a_this->home.roomNo)) + { + cLib_addCalc(&i_this->field_0x594, 0.0f, 0.05f, 0.02f, 0.0001f); + + if (i_this->field_0x594 <= 0.0f) { + g_env_light.mColpatPrevGather = 0; + g_env_light.mColpatCurrGather = 0; + g_env_light.mColPatBlendGather = 0.0f; + g_env_light.mColPatModeGather = 1; + g_env_light.mMoyaCount = 0; + fopAcM_delete(i_this); + } + } else { + cLib_addCalc(&i_this->field_0x594, 1.0f, 0.05f, 0.02f, 0.0001f); + } + } else { + cLib_addCalc(&i_this->field_0x594, 0.0f, 0.05f, 0.02f, 0.0001f); + } + } + + if (i_this->field_0x59c == 2) { + i_this->field_0x594 = 1.0f; + } + + if (i_this->field_0x594 > 0.0f) { + mist_tag_move(i_this); + } + } + } + + return 1; } -#pragma pop /* 808557DC-808557E4 0007FC 0008+00 1/0 0/0 0/0 .text daKytag01_IsDelete__FP13kytag01_class */ -static bool daKytag01_IsDelete(kytag01_class* param_0) { - return true; +static int daKytag01_IsDelete(kytag01_class* i_this) { + return 1; } /* 808557E4-808557EC 000804 0008+00 1/0 0/0 0/0 .text daKytag01_Delete__FP13kytag01_class */ -static bool daKytag01_Delete(kytag01_class* param_0) { - return true; +static int daKytag01_Delete(kytag01_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 808559E0-808559E4 000054 0004+00 0/1 0/0 0/0 .rodata @4016 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4016 = 255.0f; -COMPILER_STRIP_GATE(0x808559E0, &lit_4016); -#pragma pop - -/* 808559E4-808559E8 000058 0004+00 0/1 0/0 0/0 .rodata @4017 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4017 = 10.0f; -COMPILER_STRIP_GATE(0x808559E4, &lit_4017); -#pragma pop - /* 808557EC-80855984 00080C 0198+00 1/0 0/0 0/0 .text daKytag01_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag01_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Create__FP10fopAc_ac_c.s" -} -#pragma pop +static int daKytag01_Create(fopAc_ac_c* i_this) { + kytag01_class* a_this = (kytag01_class*)i_this; + fopAcM_SetupActor(i_this, kytag01_class); + + if ((a_this->subtype & 0xFF) == 2) { + a_this->mNamiInnerRange = i_this->scale.x * 100.0f; + a_this->field_0x59d = fopAcM_GetParam(i_this); + a_this->mStartPoint = fopAcM_GetParam(i_this) >> 8; + + if (a_this->mStartPoint == dComIfGs_getStartPoint() && + i_this->home.roomNo == dComIfGp_roomControl_getStayNo()) + { + a_this->field_0x59e = g_env_light.mColPatPrev; + g_env_light.mColpatWeather = a_this->field_0x59d; + g_env_light.mColPatPrev = a_this->field_0x59d; + g_env_light.mColPatCurr = g_env_light.mColPatPrev; + } + } else { + a_this->mNamiSize = (int)((fopAcM_GetParam(i_this) >> 0x10) & 0xFF); + a_this->mSwNo1 = i_this->current.angle.x & 0xFF; + a_this->mSwNo2 = (i_this->current.angle.x >> 8) & 0xFF; + a_this->field_0x594 = 0.0f; + + if ((a_this->subtype & 0xFF) == 0) { + if (a_this->mNamiSize == 255.0f) { + a_this->mNamiSize = 10.0f; + } + + a_this->mNamiInnerRange = i_this->scale.x * 100.0f; + a_this->mNamiOuterRange = a_this->mNamiInnerRange + a_this->mNamiSize * 100.0f; + + if (a_this->mNamiInnerRange + 100.0f >= a_this->mNamiOuterRange) { + OS_REPORT("\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + // "\nLost Woods Fog Tag scale range is too narrow so force fix!" + OS_REPORT("\n迷いの森　霧タグのスケールでの範囲指定が狭すぎなので強制修正!"); + OS_REPORT("\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + + OS_REPORT("\nnami utigawa=[%f]", a_this->mNamiInnerRange); + OS_REPORT("\nnami sotogawa=[%f]", a_this->mNamiOuterRange); + + a_this->mNamiOuterRange = a_this->mNamiInnerRange + 100.0f; + } + + a_this->field_0x59c = 0; + } + } + + return cPhs_COMPLEATE_e; +} -/* ############################################################################################## */ /* 808559E8-80855A08 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag01_Method */ -SECTION_DATA static void* l_daKytag01_Method[8] = { - (void*)daKytag01_Create__FP10fopAc_ac_c, - (void*)daKytag01_Delete__FP13kytag01_class, - (void*)daKytag01_Execute__FP13kytag01_class, - (void*)daKytag01_IsDelete__FP13kytag01_class, - (void*)daKytag01_Draw__FP13kytag01_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daKytag01_Method = { + (process_method_func)daKytag01_Create, (process_method_func)daKytag01_Delete, + (process_method_func)daKytag01_Execute, (process_method_func)daKytag01_IsDelete, + (process_method_func)daKytag01_Draw, }; /* 80855A08-80855A38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG01 */ -SECTION_DATA extern void* g_profile_KYTAG01[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02AB0000, (void*)&g_fpcLf_Method, - (void*)0x000005A0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x005F0000, (void*)&l_daKytag01_Method, - (void*)0x00040000, (void*)NULL, +extern actor_process_profile_definition g_profile_KYTAG01 = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_KYTAG01, + &g_fpcLf_Method.mBase, + sizeof(kytag01_class), + 0, + 0, + &g_fopAc_Method.base, + 95, + &l_daKytag01_Method, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp index 604abc8cb8..1038f85313 100644 --- a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp +++ b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp @@ -103,21 +103,21 @@ static int daKytag02_Create(fopAc_ac_c* i_this) { dKyw_get_wind_vec(); fopAcM_SetupActor(i_this, kytag02_class); - kytag02_class* this_ = (kytag02_class*)i_this; + kytag02_class* a_this = (kytag02_class*)i_this; - this_->field_0x574 = 0; - this_->field_0x576 = 0; - this_->field_0x577 = this_->current.angle.x & 0xFF; + a_this->field_0x574 = 0; + a_this->field_0x576 = 0; + a_this->field_0x577 = a_this->current.angle.x & 0xFF; env_light->custom_windpower = 0.0f; - this_->field_0x578 = fopAcM_GetParam(this_) & 0xFF; + a_this->field_0x578 = fopAcM_GetParam(a_this) & 0xFF; - if (dComIfGs_isSwitch(this_->field_0x577, this_->home.roomNo)) { + if (dComIfGs_isSwitch(a_this->field_0x577, a_this->home.roomNo)) { dKyw_evt_wind_set_go(); - dKyw_evt_wind_set(0, this_->current.angle.y); + dKyw_evt_wind_set(0, a_this->current.angle.y); - if (this_->field_0x578 == 99) { + if (a_this->field_0x578 == 99) { env_light->mTeachWindExist = 0xFF; } else { env_light->mTeachWindExist = 1; @@ -126,14 +126,13 @@ static int daKytag02_Create(fopAc_ac_c* i_this) { } } - if (this_->field_0x578 != 99) { + if (a_this->field_0x578 != 99) { mDoAud_mEnvse_initStrongWind(); } return cPhs_COMPLEATE_e; } -/* ############################################################################################## */ /* 80855E0C-80855E2C -00001 0020+00 1/0 0/0 0/0 .data l_daKytag02_Method */ static actor_method_class l_daKytag02_Method = { (process_method_func)daKytag02_Create, (process_method_func)daKytag02_Delete, diff --git a/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp b/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp index 5ee006a768..502e9d4680 100644 --- a/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp +++ b/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp @@ -1,377 +1,389 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_kytag04 -// +/** + * d_a_kytag04.cpp + * + */ -// #include "rel/d/a/kytag/d_a_kytag04/d_a_kytag04.h" -#include "dolphin/types.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct kytag04_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dSv_memBit_c { - /* 80034860 */ void isSwitch(int) const; -}; - -struct dSv_light_drop_c { - /* 80034340 */ void getLightDropNum(u8) const; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct dKy_tevstr_c {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct cXyz {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dEvt_control_c { - /* 80042518 */ void reset(void*); -}; - -struct dComIfG_play_c { - /* 8002C97C */ void getLayerNo(int); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JPABaseEmitter { - /* 8027EC60 */ void deleteAllParticle(); -}; - -struct J3DModelData {}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8046D9C8 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" static void daKytag04_Draw__FP13kytag04_class(); -extern "C" static void daKytag04_Execute__FP13kytag04_class(); -extern "C" static bool daKytag04_IsDelete__FP13kytag04_class(); -extern "C" static void daKytag04_Delete__FP13kytag04_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daKytag04_Create__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" extern char const* const d_a_kytag04__stringBase0; - -// -// External References: -// - -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs(); -extern "C" void fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs(); -extern "C" void dStage_changeScene__FifUlScsi(); -extern "C" void getLayerNo__14dComIfG_play_cFi(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getLightDropNum__16dSv_light_drop_cCFUc(); -extern "C" void isSwitch__12dSv_memBit_cCFi(); -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 reset__14dEvt_control_cFPv(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz(); -extern "C" void dKy_darkworld_check__Fv(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void deleteAllParticle__14JPABaseEmitterFv(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" void strcmp(); -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" extern u8 j3dSys[284]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8046DA18-8046DA1C 000000 0004+00 2/2 0/0 0/0 .rodata @3960 */ -SECTION_RODATA static f32 const lit_3960 = 20.0f; -COMPILER_STRIP_GATE(0x8046DA18, &lit_3960); - -/* 8046DA1C-8046DA20 000004 0004+00 0/1 0/0 0/0 .rodata @3961 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3961 = 6000.0f; -COMPILER_STRIP_GATE(0x8046DA1C, &lit_3961); -#pragma pop - -/* 8046DA20-8046DA24 000008 0004+00 1/3 0/0 0/0 .rodata @3962 */ -SECTION_RODATA static u8 const lit_3962[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8046DA20, &lit_3962); - -/* 8046DA24-8046DA28 00000C 0004+00 1/2 0/0 0/0 .rodata @3963 */ -SECTION_RODATA static f32 const lit_3963 = 999.0f; -COMPILER_STRIP_GATE(0x8046DA24, &lit_3963); - -/* 8046DA28-8046DA2C 000010 0004+00 1/3 0/0 0/0 .rodata @3964 */ -SECTION_RODATA static f32 const lit_3964 = 1.0f; -COMPILER_STRIP_GATE(0x8046DA28, &lit_3964); - -/* 8046DA2C-8046DA30 000014 0004+00 0/1 0/0 0/0 .rodata @3965 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3965 = 0.25f; -COMPILER_STRIP_GATE(0x8046DA2C, &lit_3965); -#pragma pop - -/* 8046DA30-8046DA34 000018 0004+00 0/1 0/0 0/0 .rodata @3966 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3966 = 1.0f / 80.0f; -COMPILER_STRIP_GATE(0x8046DA30, &lit_3966); -#pragma pop - -/* 8046DA34-8046DA38 00001C 0004+00 0/1 0/0 0/0 .rodata @3967 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3967 = 0x38D1B717; -COMPILER_STRIP_GATE(0x8046DA34, &lit_3967); -#pragma pop - -/* 8046DA38-8046DA3C 000020 0004+00 0/1 0/0 0/0 .rodata @3968 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3968 = 0.5f; -COMPILER_STRIP_GATE(0x8046DA38, &lit_3968); -#pragma pop - -/* 8046DA3C-8046DA40 000024 0004+00 0/1 0/0 0/0 .rodata @3969 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3969 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(0x8046DA3C, &lit_3969); -#pragma pop +#include "rel/d/a/kytag/d_a_kytag04/d_a_kytag04.h" +#include "d/a/d_a_npc.h" +#include "d/com/d_com_inf_game.h" /* 8046CB58-8046CFE8 000078 0490+00 1/0 0/0 0/0 .text daKytag04_Draw__FP13kytag04_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag04_Draw(kytag04_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Draw__FP13kytag04_class.s" +static int daKytag04_Draw(kytag04_class* i_this) { + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + camera_class* camera = dComIfGp_getCamera(0); + Mtx sp40; + cXyz sp50; + cXyz sp5C; + + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + + cXyz sp68; + BOOL var_r30 = false; + + sp5C.x = 20.0f; + sp5C.y = 20.0f; + sp5C.z = 20.0f; + + sp68 = a_this->current.pos; + sp68.y += 6000.0f; + + a_this->attention_info.position = sp68; + a_this->eyePos = a_this->attention_info.position; + + if (i_this->field_0x5b4 == 4 || i_this->field_0x5b4 == 5) { + if (i_this->field_0x5b4 == 4) { + if (i_this->field_0x5b5 != 0xFF && i_this->field_0x5d1 == 1) { + s32 room_no = dComIfGp_roomControl_getStayNo(); + if (dComIfGs_isSwitch(i_this->field_0x5b5, room_no)) { + var_r30 = 1; + } + } + } else { + if (i_this->field_0x5b5 != 0xFF && i_this->field_0x5d1 == 1 && + dComIfGs_isSaveSwitch(i_this->mStageNo, i_this->field_0x5b5)) + { + var_r30 = 1; + } + } + + if (var_r30 != 0) { + if (i_this->field_0x5c8 <= 0.0f || i_this->field_0x5c8 >= 999.0f) { + if (i_this->field_0x5c8 <= 0.0f) { + i_this->field_0x5a4 = dComIfGp_particle_set(0x84A5, &sp68, NULL, &sp5C); + } + + if (i_this->field_0x5c8 >= 999.0f) { + i_this->field_0x5a8 = dComIfGp_particle_set(0x84A6, &sp68, NULL, &sp5C); + i_this->field_0x5ac = dComIfGp_particle_set(0x84A7, &sp68, NULL, &sp5C); + } + } + + if (i_this->field_0x5cc != 0 && i_this->field_0x5cc < 20) { + i_this->field_0x5cc++; + + if (i_this->field_0x5cc == 15) { + if (i_this->field_0x5a8 == NULL) { + i_this->field_0x5a8 = dComIfGp_particle_set(0x84A6, &sp68, NULL, &sp5C); + } + + if (i_this->field_0x5ac == NULL) { + i_this->field_0x5ac = dComIfGp_particle_set(0x84A7, &sp68, NULL, &sp5C); + } + } + } + + cLib_addCalc(&i_this->field_0x5c8, 1.0f, 0.25f, 0.0125f, 0.0001f); + } else { + cLib_addCalc(&i_this->field_0x5c8, 0.0f, 0.5f, 0.02f, 0.0001f); + } + + if (i_this->field_0x5c8 > 0.0f) { + mDoMtx_stack_c::transS(sp68.x, sp68.y, sp68.z); + cMtx_copy(mDoMtx_stack_c::get(), sp40); + sp50.x = 20.0f; + sp50.y = 20.0f; + sp50.z = 20.0f; + + i_this->mpModel->setBaseScale(sp50); + i_this->mpModel->setBaseTRMtx(sp40); + i_this->mBtk.entry(i_this->mpModel->getModelData()); + i_this->mBrk.entry(i_this->mpModel->getModelData()); + + if (i_this->field_0x5cc >= 15) { + i_this->mBtk.play(); + i_this->mBrk.play(); + } + + dComIfGd_setListDark(); + mDoExt_modelUpdateDL(i_this->mpModel); + dComIfGd_setList(); + } + } + + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 8046DA40-8046DA48 000028 0004+04 0/1 0/0 0/0 .rodata @4066 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4066[1 + 1 /* padding */] = { - -1.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x8046DA40, &lit_4066); -#pragma pop - -/* 8046DA50-8046DA50 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8046DA50 = "WITHWARP_OPEN"; -SECTION_DEAD static char const* const stringBase_8046DA5E = "F_SP104"; -#pragma pop /* 8046CFE8-8046D354 000508 036C+00 1/0 0/0 0/0 .text daKytag04_Execute__FP13kytag04_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag04_Execute(kytag04_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Execute__FP13kytag04_class.s" +static int daKytag04_Execute(kytag04_class* i_this) { + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + cXyz sp20; + csXyz sp28; + + switch (i_this->field_0x5b4) { + case 4: + if (i_this->field_0x5d1 == 0 && i_this->field_0x5b5 != 0xFF) { + s32 room_no = dComIfGp_roomControl_getStayNo(); + + if (dComIfGs_isSwitch(i_this->field_0x5b5, room_no) && i_this->field_0x5d0 == 0) { + if (dComIfGp_getEvent().isOrderOK() && + fopAcM_orderOtherEvent(i_this, "WITHWARP_OPEN", 0xFFFF, 1, 0)) + { + i_this->field_0x5d1 = 1; + i_this->field_0x5d0 = 1; + i_this->field_0x5cc = 1; + + mDoAud_seStart(Z2SE_WARP_HOLE_OPEN, NULL, 0, 0); + } + } + } + + if (i_this->field_0x5d0 != 0) { + if (i_this->field_0x5d0 == 10) { + sp20 = a_this->current.pos; + sp20.y = a_this->current.pos.y; + + if (i_this->mNeedDropNum == 0xFF) { + daNpcF_getPlayerInfoFromPlayerList( + i_this->mStageNo, dComIfGp_roomControl_getStayNo(), sp20, sp28); + } else { + daNpcF_getPlayerInfoFromPlayerList( + i_this->mNeedDropNum, dComIfGp_roomControl_getStayNo(), sp20, sp28); + } + + player->setPlayerPosAndAngle(&sp20, a_this->current.angle.y, 0); + player->changeOriginalDemo(); + player->changeDemoMode(4, 0, 0, 0); + } + + if (i_this->field_0x5d0 < 80) { + i_this->field_0x5d0++; + break; + } + + if (strcmp(dComIfGp_getStartStageName(), "F_SP104") == 0) { + dStage_changeScene(3, 0.0f, 0, dComIfGp_roomControl_getStayNo(), 0, -1); + } + + i_this->field_0x5d0 = 0; + } + break; + case 1: + if (i_this->field_0x5b5 != 0xFF) { + s32 room_no = dComIfGp_roomControl_getStayNo(); + + if (dComIfGs_isSwitch(i_this->field_0x5b5, room_no) && i_this->field_0x5b7 != 0 && + i_this->field_0x5b7 != 1) + { + switch (i_this->field_0x5c4) { + case 0: + if (!a_this->eventInfo.i_checkCommandDemoAccrpt()) { + dComIfGp_getEvent().reset(a_this); + fopAcM_orderPotentialEvent(a_this, 0x400, 0xFFFF, 0); + } else { + i_this->field_0x5c5 = 1; + i_this->field_0x5c0 = 10; + i_this->field_0x5c4++; + } + break; + case 1: + if (i_this->field_0x5c0 <= 0) { + dStage_changeScene(i_this->mExitID, 0.0f, 0, i_this->current.roomNo, 0, -1); + i_this->field_0x5b7 = 1; + } else { + i_this->field_0x5c0--; + } + break; + } + } + } + break; + } + + return 1; } -#pragma pop /* 8046D354-8046D35C 000874 0008+00 1/0 0/0 0/0 .text daKytag04_IsDelete__FP13kytag04_class */ -static bool daKytag04_IsDelete(kytag04_class* param_0) { - return true; +static int daKytag04_IsDelete(kytag04_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 8046DA50-8046DA50 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8046DA66 = "Kytag04"; -#pragma pop - /* 8046D35C-8046D474 00087C 0118+00 1/0 0/0 0/0 .text daKytag04_Delete__FP13kytag04_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag04_Delete(kytag04_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Delete__FP13kytag04_class.s" +static int daKytag04_Delete(kytag04_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "Kytag04"); + + if (i_this->field_0x5a4 != NULL) { + i_this->field_0x5a4->deleteAllParticle(); + i_this->field_0x5a4->becomeInvalidEmitter(); + i_this->field_0x5a4->quitImmortalEmitter(); + i_this->field_0x5a4->setEmitterCallBackPtr(NULL); + i_this->field_0x5a4 = NULL; + } + + if (i_this->field_0x5a8 != NULL) { + i_this->field_0x5a8->deleteAllParticle(); + i_this->field_0x5a8->becomeInvalidEmitter(); + i_this->field_0x5a8->quitImmortalEmitter(); + i_this->field_0x5a8->setEmitterCallBackPtr(NULL); + i_this->field_0x5a8 = NULL; + } + + if (i_this->field_0x5ac != NULL) { + i_this->field_0x5ac->deleteAllParticle(); + i_this->field_0x5ac->becomeInvalidEmitter(); + i_this->field_0x5ac->quitImmortalEmitter(); + i_this->field_0x5ac->setEmitterCallBackPtr(NULL); + i_this->field_0x5ac = NULL; + } + + return 1; } -#pragma pop /* 8046D474-8046D59C 000994 0128+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + kytag04_class* a_this = (kytag04_class*)i_this; + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kytag04", 5); + JUT_ASSERT(modelData != 0); + + a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202); + if (a_this->mpModel != NULL) { + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Kytag04", 14); + if (!a_this->mBtk.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) { + OS_REPORT("\nkytag04 btk FALSE!!\n"); + return 0; + } + + J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Kytag04", 8); + if (!a_this->mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1)) { + OS_REPORT("\nkytag04 brk FALSE!!\n"); + return 0; + } + } else { + return 0; + } + + return 1; } -#pragma pop -/* ############################################################################################## */ -/* 8046DA48-8046DA50 000030 0008+00 1/1 0/0 0/0 .rodata @4326 */ -SECTION_RODATA static u8 const lit_4326[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8046DA48, &lit_4326); +/* 8046D59C-8046D9C8 000ABC 042C+00 1/0 0/0 0/0 .text daKytag04_Create__FP10fopAc_ac_c */ +static int daKytag04_Create(fopAc_ac_c* i_this) { + kytag04_class* a_this = (kytag04_class*)i_this; + fopAcM_SetupActor(i_this, kytag04_class); -/* 8046DA50-8046DA50 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8046DA6E = "F_SP110"; -#pragma pop + a_this->mNeedDropNum = i_this->current.angle.z & 0xFF; + + int phase_state = dComIfG_resLoad(&a_this->mPhase, "Kytag04"); + if (phase_state == cPhs_COMPLEATE_e) { + a_this->field_0x5b4 = (fopAcM_GetParam(i_this) >> 8) & 7; + a_this->mStageNo = (i_this->current.angle.z >> 8) & 0xFF; + a_this->mExitID = fopAcM_GetParam(i_this) & 0xFF; + a_this->mNeedDropNum = i_this->current.angle.z & 0xFF; + a_this->field_0x5b5 = fopAcM_GetParam(i_this) >> 0x10; + a_this->field_0x5b6 = fopAcM_GetParam(i_this) >> 0x18; + + if (strcmp(dComIfGp_getStartStageName(), "F_SP110") == 0 && + dComIfGp_getStartStageRoomNo() == 0 && dComIfG_play_c::getLayerNo(0) == 8) + { + a_this->field_0x5b5 = 0xFF; + } + + a_this->field_0x5b7 = 0xFF; + a_this->field_0x5b8 = 0; + a_this->field_0x5b9 = 0; + a_this->field_0x5c0 = 0; + a_this->field_0x5c4 = 0; + a_this->field_0x5c5 = 0; + a_this->field_0x5c8 = 0.0f; + a_this->field_0x5cc = 0; + a_this->field_0x5d0 = 0; + a_this->field_0x5d1 = 0; + + a_this->field_0x5a4 = NULL; + a_this->field_0x5a8 = NULL; + a_this->field_0x5ac = NULL; + + if (a_this->field_0x5b4 == 1) { + // "\nArg2 is [%d]" + OS_REPORT("\n引数２は[%d]", a_this->mNeedDropNum); + dComIfGp_setNeedLightDropNum(a_this->mNeedDropNum); + + if (a_this->field_0x5b5 != 0xFF) { + s32 room_no = dComIfGp_roomControl_getStayNo(); + if (dComIfGs_isSwitch(a_this->field_0x5b5, room_no)) { + a_this->field_0x5b7 = 1; + } + } + + if (dKy_darkworld_check()) { + if (dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()) >= + dComIfGp_getNeedLightDropNum() && + (dComIfG_play_c::getLayerNo(0) == 13 || dComIfG_play_c::getLayerNo(0) == 14)) + { + // "\nEmergency!! All drops collected but still in dark world, so force + // advance]" + OS_WARNING("\n緊急事態！！　雫がそろってるのにまだ闇世界なので強引に進めます]"); + a_this->field_0x5b7 = -1; + + s32 room_no = dComIfGp_roomControl_getStayNo(); + dComIfGs_onSwitch(a_this->field_0x5b5, room_no); + } + } + } else if (a_this->field_0x5b4 == 4) { + if (a_this->field_0x5b5 != 0xFF) { + s32 room_no = dComIfGp_roomControl_getStayNo(); + if (dComIfGs_isSwitch(a_this->field_0x5b5, room_no)) { + a_this->field_0x5d1 = 1; + a_this->field_0x5c8 = 999.0f; + a_this->field_0x5cc = 20; + } + } + } else if (a_this->field_0x5b4 == 5) { + if (a_this->field_0x5b5 != 0xFF) { + if (dComIfGs_isSaveSwitch(a_this->mStageNo, a_this->field_0x5b5)) { + a_this->field_0x5d1 = 1; + a_this->field_0x5c8 = 999.0f; + a_this->field_0x5cc = 20; + } + } + } + + if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x1150)) { + return cPhs_ERROR_e; + } + + if (a_this->field_0x5b4 == 4 && a_this->field_0x5b5 != 0xFF) { + s32 room_no = dComIfGp_roomControl_getStayNo(); + if (dComIfGs_isSwitch(a_this->field_0x5b5, room_no)) { + a_this->mBtk.setFrame(a_this->mBtk.getEndFrame()); + a_this->mBrk.setFrame(a_this->mBrk.getEndFrame()); + } + } + + if (a_this->field_0x5b4 == 5 && a_this->field_0x5b5 != 0xFF) { + if (dComIfGs_isSaveSwitch(a_this->mStageNo, a_this->field_0x5b5)) { + a_this->mBtk.setFrame(a_this->mBtk.getEndFrame()); + a_this->mBrk.setFrame(a_this->mBrk.getEndFrame()); + } + } + } + + return phase_state; +} /* 8046DA78-8046DA98 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag04_Method */ -SECTION_DATA static void* l_daKytag04_Method[8] = { - (void*)daKytag04_Create__FP10fopAc_ac_c, - (void*)daKytag04_Delete__FP13kytag04_class, - (void*)daKytag04_Execute__FP13kytag04_class, - (void*)daKytag04_IsDelete__FP13kytag04_class, - (void*)daKytag04_Draw__FP13kytag04_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daKytag04_Method = { + (process_method_func)daKytag04_Create, (process_method_func)daKytag04_Delete, + (process_method_func)daKytag04_Execute, (process_method_func)daKytag04_IsDelete, + (process_method_func)daKytag04_Draw, }; /* 8046DA98-8046DAC8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG04 */ -SECTION_DATA extern void* g_profile_KYTAG04[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02AE0000, (void*)&g_fpcLf_Method, - (void*)0x000005D4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00620000, (void*)&l_daKytag04_Method, - (void*)0x00044000, (void*)NULL, +extern actor_process_profile_definition g_profile_KYTAG04 = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_KYTAG04, + &g_fpcLf_Method.mBase, + sizeof(kytag04_class), + 0, + 0, + &g_fopAc_Method.base, + 98, + &l_daKytag04_Method, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; - -/* 8046DAC8-8046DAD4 000050 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 8046D59C-8046D9C8 000ABC 042C+00 1/0 0/0 0/0 .text daKytag04_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag04_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 8046D9C8-8046DA10 000EE8 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* 8046DA50-8046DA50 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp index 3c1945b35b..1d6cedc570 100644 --- a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp +++ b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp @@ -45,7 +45,6 @@ static int daKytag05_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -/* ############################################################################################## */ /* 80528B1C-80528B3C -00001 0020+00 1/0 0/0 0/0 .data l_daKytag05_Method */ static actor_method_class l_daKytag05_Method = { (process_method_func)daKytag05_Create, (process_method_func)daKytag05_Delete, diff --git a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp index f612a4bfb2..87c4c37497 100644 --- a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp +++ b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp @@ -280,11 +280,11 @@ static void daKytag06_type_04_Execute(kytag06_class*) { /* 80857F48-80857F8C 0007C8 0044+00 1/1 0/0 0/0 .text set_path_info__FP10fopAc_ac_c */ static dPath* set_path_info(fopAc_ac_c* i_this) { - kytag06_class* this_ = (kytag06_class*)i_this; + kytag06_class* a_this = (kytag06_class*)i_this; dPath* room_path = NULL; - if (this_->mPathNo != 0xFF) { - room_path = dPath_GetRoomPath(this_->mPathNo, fopAcM_GetRoomNo(this_)); + if (a_this->mPathNo != 0xFF) { + room_path = dPath_GetRoomPath(a_this->mPathNo, fopAcM_GetRoomNo(a_this)); } return room_path; @@ -1209,60 +1209,60 @@ static int daKytag06_Delete(kytag06_class* i_this) { /* 80859AD0-80859AF0 002350 0020+00 1/1 0/0 0/0 .text daKytag06_type04_init__FP10fopAc_ac_c */ static void daKytag06_type04_init(fopAc_ac_c* i_this) { - kytag06_class* this_ = (kytag06_class*)i_this; + kytag06_class* a_this = (kytag06_class*)i_this; - this_->mSwNo = fopAcM_GetParam(this_) >> 8; - this_->field_0x591 = fopAcM_GetParam(this_) & 0xFF; - this_->mMode = 0; + a_this->mSwNo = fopAcM_GetParam(a_this) >> 8; + a_this->field_0x591 = fopAcM_GetParam(a_this) & 0xFF; + a_this->mMode = 0; } /* 80859AF0-80859B14 002370 0024+00 1/1 0/0 0/0 .text daKytag06_type06_init__FP10fopAc_ac_c */ static void daKytag06_type06_init(fopAc_ac_c* i_this) { - kytag06_class* this_ = (kytag06_class*)i_this; + kytag06_class* a_this = (kytag06_class*)i_this; - this_->mSwNo = fopAcM_GetParam(this_) >> 8; - this_->field_0x591 = fopAcM_GetParam(this_) & 0xFF; - this_->mMode = 0; - this_->field_0x598 = 0; + a_this->mSwNo = fopAcM_GetParam(a_this) >> 8; + a_this->field_0x591 = fopAcM_GetParam(a_this) & 0xFF; + a_this->mMode = 0; + a_this->field_0x598 = 0; } /* 80859B14-80859B34 002394 0020+00 1/1 0/0 0/0 .text daKytag06_type02_init__FP10fopAc_ac_c */ static void daKytag06_type02_init(fopAc_ac_c* i_this) { - kytag06_class* this_ = (kytag06_class*)i_this; + kytag06_class* a_this = (kytag06_class*)i_this; - this_->mSwNo = fopAcM_GetParam(this_) >> 8; - this_->field_0x591 = fopAcM_GetParam(this_) & 0xFF; - this_->mMode = 0; + a_this->mSwNo = fopAcM_GetParam(a_this) >> 8; + a_this->field_0x591 = fopAcM_GetParam(a_this) & 0xFF; + a_this->mMode = 0; } /* 80859B34-80859C88 0023B4 0154+00 1/1 0/0 0/0 .text daKytag06_type03_init__FP10fopAc_ac_c */ static void daKytag06_type03_init(fopAc_ac_c* i_this) { - kytag06_class* this_ = (kytag06_class*)i_this; + kytag06_class* a_this = (kytag06_class*)i_this; - this_->mSwNo = fopAcM_GetParam(this_) >> 8; - this_->field_0x591 = fopAcM_GetParam(this_) & 0xFF; - this_->mMode = 0; + a_this->mSwNo = fopAcM_GetParam(a_this) >> 8; + a_this->field_0x591 = fopAcM_GetParam(a_this) & 0xFF; + a_this->mMode = 0; - if (this_->field_0x597 == 0) { + if (a_this->field_0x597 == 0) { // 0C01: Midna's Desperate Hour started 1E08: Midna's Desperate Hour Completed - if (dComIfGs_isEventBit(0x0C01) && !dComIfGs_isEventBit(0x1E08) && this_->mSwNo != 0xFF) + if (dComIfGs_isEventBit(0x0C01) && !dComIfGs_isEventBit(0x1E08) && a_this->mSwNo != 0xFF) { s32 stayNo = dComIfGp_roomControl_getStayNo(); - if (dComIfGs_isSwitch(this_->mSwNo, stayNo)) { - this_->mMode = 9; + if (dComIfGs_isSwitch(a_this->mSwNo, stayNo)) { + a_this->mMode = 9; g_env_light.mRainCount = 250; - g_env_light.mColpatWeather = this_->field_0x591; - g_env_light.mColPatPrev = this_->field_0x591; - g_env_light.mColPatCurr = this_->field_0x591; + g_env_light.mColpatWeather = a_this->field_0x591; + g_env_light.mColPatPrev = a_this->field_0x591; + g_env_light.mColPatCurr = a_this->field_0x591; } } - } else if (this_->field_0x597 == 2 && dComIfGp_roomControl_getStayNo() != 0) { - if (this_->mSwNo != 0xFF && !dComIfGs_isSwitch(this_->mSwNo, this_->current.roomNo)) { - dKy_custom_colset(0, this_->field_0x591, 1.0f); - g_env_light.mColpatWeather = this_->field_0x591; + } else if (a_this->field_0x597 == 2 && dComIfGp_roomControl_getStayNo() != 0) { + if (a_this->mSwNo != 0xFF && !dComIfGs_isSwitch(a_this->mSwNo, a_this->current.roomNo)) { + dKy_custom_colset(0, a_this->field_0x591, 1.0f); + g_env_light.mColpatWeather = a_this->field_0x591; } else { - this_->mMode = 1; + a_this->mMode = 1; } } } @@ -1270,52 +1270,52 @@ static void daKytag06_type03_init(fopAc_ac_c* i_this) { /* 80859C88-80859E68 002508 01E0+00 2/0 0/0 0/0 .text daKytag06_Create__FP10fopAc_ac_c */ static int daKytag06_Create(fopAc_ac_c* i_this) { fopAcM_SetupActor(i_this, kytag06_class); - kytag06_class* this_ = static_cast(i_this); + kytag06_class* a_this = static_cast(i_this); - this_->mType = (fopAcM_GetParam(this_) >> 0x18) & 0xF; - this_->field_0x597 = (fopAcM_GetParam(this_) >> 0x1C); - this_->mWindPower = 0.0f; - this_->field_0x570 = 0.0f; + a_this->mType = (fopAcM_GetParam(a_this) >> 0x18) & 0xF; + a_this->field_0x597 = (fopAcM_GetParam(a_this) >> 0x1C); + a_this->mWindPower = 0.0f; + a_this->field_0x570 = 0.0f; - switch (this_->mType) { + switch (a_this->mType) { case 1: - this_->mPathNo = fopAcM_GetParam(this_) >> 0x10; - this_->mpPath = set_path_info(this_); + a_this->mPathNo = fopAcM_GetParam(a_this) >> 0x10; + a_this->mpPath = set_path_info(a_this); break; case 2: - daKytag06_type02_init(this_); + daKytag06_type02_init(a_this); break; case 3: - daKytag06_type03_init(this_); + daKytag06_type03_init(a_this); break; case 4: - daKytag06_type04_init(this_); + daKytag06_type04_init(a_this); break; case 6: - daKytag06_type06_init(this_); + daKytag06_type06_init(a_this); break; case 7: - this_->mMode = 0; - this_->field_0x591 = 0; - this_->field_0x574 = 0; + a_this->mMode = 0; + a_this->field_0x591 = 0; + a_this->field_0x574 = 0; break; case 8: - daKytag06_type06_init(this_); + daKytag06_type06_init(a_this); g_env_light.mMoyaMode = 9; g_env_light.mMoyaCount = 50; break; case 9: - daKytag06_type06_init(this_); + daKytag06_type06_init(a_this); break; case 10: if (strcmp(dComIfGp_getStartStageName(), "F_SP114") != 0) { - daKytag06_type06_init(this_); + daKytag06_type06_init(a_this); } else { - daKytag06_type03_init(this_); + daKytag06_type03_init(a_this); } break; case 11: - daKytag06_type06_init(this_); + daKytag06_type06_init(a_this); break; default: if (strcmp(dComIfGp_getStartStageName(), "T_MUKAO") != 0) { @@ -1326,11 +1326,11 @@ static int daKytag06_Create(fopAc_ac_c* i_this) { dComIfGs_setTime(210.0f); } - this_->field_0x578 = 0; - this_->field_0x57c = 0; - this_->mMode = 0; - this_->field_0x591 = 0; - this_->field_0x574 = 640; + a_this->field_0x578 = 0; + a_this->field_0x57c = 0; + a_this->mMode = 0; + a_this->field_0x591 = 0; + a_this->field_0x574 = 640; break; case 5: break; diff --git a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp index a427e9a032..8f128e7de8 100644 --- a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp +++ b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp @@ -9,17 +9,17 @@ /* 8085A278-8085A280 000078 0008+00 1/0 0/0 0/0 .text daKytag07_Draw__FP13kytag07_class */ -static int daKytag07_Draw(kytag07_class* param_0) { +static int daKytag07_Draw(kytag07_class* i_this) { return 1; } /* 8085A280-8085A334 000080 00B4+00 1/0 0/0 0/0 .text daKytag07_Execute__FP13kytag07_class */ static int daKytag07_Execute(kytag07_class* i_this) { if (i_this->field_0x58c != 99) { - cLib_addCalc(&i_this->mLightInfluence.mPow,i_this->field_0x588,0.1f,1000.0f,0.001f); + cLib_addCalc(&i_this->mLightInfluence.mPow, i_this->field_0x588, 0.1f, 1000.0f, 0.001f); } else { if (i_this->home.roomNo != dStage_roomControl_c::getStayNo()) { - cLib_addCalc(&i_this->mLightInfluence.mPow,0.0f,0.25f,10000.0f,1.0f); + cLib_addCalc(&i_this->mLightInfluence.mPow, 0.0f, 0.25f, 10000.0f, 1.0f); } if (i_this->mLightInfluence.mPow <= 0.01f) { @@ -50,48 +50,43 @@ static int daKytag07_Delete(kytag07_class* i_this) { /* 8085A3B0-8085A47C 0001B0 00CC+00 1/0 0/0 0/0 .text daKytag07_Create__FP10fopAc_ac_c */ static int daKytag07_Create(fopAc_ac_c* i_this) { - kytag07_class* kytag07 = (kytag07_class*)i_this; - - fopAcM_SetupActor(kytag07, kytag07_class); + kytag07_class* a_this = (kytag07_class*)i_this; - kytag07->mLightInfluence.mPosition = kytag07->current.pos; - kytag07->mLightInfluence.mColor.r = fopAcM_GetParam(i_this) & 0xFF; - kytag07->mLightInfluence.mColor.g = fopAcM_GetParam(i_this) >> 8 & 0xFF; - kytag07->mLightInfluence.mColor.b = fopAcM_GetParam(i_this) >> 16 & 0xFF; - kytag07->mLightInfluence.mPow = 1e-10; - kytag07->mLightInfluence.mFluctuation = 1.0f; - kytag07->field_0x588 = 1000.0f * kytag07->scale.x; - kytag07->field_0x58c = 0; + fopAcM_SetupActor(a_this, kytag07_class); + a_this->mLightInfluence.mPosition = i_this->current.pos; + a_this->mLightInfluence.mColor.r = fopAcM_GetParam(i_this) & 0xFF; + a_this->mLightInfluence.mColor.g = fopAcM_GetParam(i_this) >> 8 & 0xFF; + a_this->mLightInfluence.mColor.b = fopAcM_GetParam(i_this) >> 16 & 0xFF; + a_this->mLightInfluence.mPow = 1e-10; + a_this->mLightInfluence.mFluctuation = 1.0f; + a_this->field_0x588 = 1000.0f * i_this->scale.x; + a_this->field_0x58c = 0; - dKy_plight_priority_set(&kytag07->mLightInfluence); + dKy_plight_priority_set(&a_this->mLightInfluence); return cPhs_COMPLEATE_e; } -/* ############################################################################################## */ /* 8085A4A8-8085A4C8 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag07_Method */ static actor_method_class l_daKytag07_Method = { - (process_method_func)daKytag07_Create, - (process_method_func)daKytag07_Delete, - (process_method_func)daKytag07_Execute, - (process_method_func)daKytag07_IsDelete, - (process_method_func)daKytag07_Draw -}; + (process_method_func)daKytag07_Create, (process_method_func)daKytag07_Delete, + (process_method_func)daKytag07_Execute, (process_method_func)daKytag07_IsDelete, + (process_method_func)daKytag07_Draw}; /* 8085A4C8-8085A4F8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG07 */ extern actor_process_profile_definition g_profile_KYTAG07 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KYTAG07, // mProcName - &g_fpcLf_Method.mBase, // sub_method - sizeof(kytag07_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 101, // mPriority - &l_daKytag07_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_KYTAG07, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(kytag07_class), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 101, // mPriority + &l_daKytag07_Method, // sub_method + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // cullType }; diff --git a/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp b/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp index 7d9f5c4e12..4d2ca7544f 100644 --- a/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp +++ b/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp @@ -1,59 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_kytag08 -// +/** + * d_a_kytag08.cpp + * Fog Avoidance Tag + */ #include "rel/d/a/kytag/d_a_kytag08/d_a_kytag08.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" -#include "dol2asm.h" - -// -// Types: -// - -// -// Forward References: -// - -extern "C" static bool daKytag08_Draw__FP13kytag08_class(); -extern "C" static void daKytag08_Execute__FP13kytag08_class(); -extern "C" static bool daKytag08_IsDelete__FP13kytag08_class(); -extern "C" static void daKytag08_Delete__FP13kytag08_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daKytag08_Create__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" extern char const* const d_a_kytag08__stringBase0; - -// -// External References: -// - -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGs_BossLife_public_Set__FSc(); -extern "C" void dComIfGs_BossLife_public_Get__Fv(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dKy_darkworld_check__Fv(); -extern "C" void dKy_shadow_mode_check__FUc(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void deleteAllParticle__14JPABaseEmitterFv(); -extern "C" void startFogWipeTrigger__10Z2EnvSeMgrFP3Vec(); -extern "C" void setFogWipeWidth__10Z2EnvSeMgrFf(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); - -// -// Declarations: -// +#include "rel/d/a/d_a_spinner/d_a_spinner.h" /* 8085A578-8085A580 000078 0008+00 1/0 0/0 0/0 .text daKytag08_Draw__FP13kytag08_class */ @@ -61,228 +14,7 @@ static int daKytag08_Draw(kytag08_class* i_this) { return 1; } -/* ############################################################################################## */ -/* 8085B28C-8085B290 000000 0004+00 2/2 0/0 0/0 .rodata @4012 */ -SECTION_RODATA static f32 const lit_4012 = 100.0f; -COMPILER_STRIP_GATE(0x8085B28C, &lit_4012); - -/* 8085B290-8085B294 000004 0004+00 0/2 0/0 0/0 .rodata @4013 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4013[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8085B290, &lit_4013); -#pragma pop - -/* 8085B294-8085B29C 000008 0008+00 0/1 0/0 0/0 .rodata @4014 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4014[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8085B294, &lit_4014); -#pragma pop - -/* 8085B29C-8085B2A4 000010 0008+00 0/1 0/0 0/0 .rodata @4015 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4015[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8085B29C, &lit_4015); -#pragma pop - -/* 8085B2A4-8085B2AC 000018 0008+00 0/1 0/0 0/0 .rodata @4016 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4016[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8085B2A4, &lit_4016); -#pragma pop - -/* 8085B2AC-8085B2B0 000020 0004+00 0/1 0/0 0/0 .rodata @4017 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4017 = 2000.0f; -COMPILER_STRIP_GATE(0x8085B2AC, &lit_4017); -#pragma pop - -/* 8085B2B0-8085B2B4 000024 0004+00 0/2 0/0 0/0 .rodata @4018 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4018 = 20.0f; -COMPILER_STRIP_GATE(0x8085B2B0, &lit_4018); -#pragma pop - -/* 8085B2B4-8085B2B8 000028 0004+00 0/1 0/0 0/0 .rodata @4019 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4019 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x8085B2B4, &lit_4019); -#pragma pop - -/* 8085B2B8-8085B2BC 00002C 0004+00 0/1 0/0 0/0 .rodata @4020 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4020 = 10.0f; -COMPILER_STRIP_GATE(0x8085B2B8, &lit_4020); -#pragma pop - -/* 8085B2BC-8085B2C0 000030 0004+00 0/1 0/0 0/0 .rodata @4021 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4021 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x8085B2BC, &lit_4021); -#pragma pop - -/* 8085B2C0-8085B2C4 000034 0004+00 0/1 0/0 0/0 .rodata @4022 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4022 = 0x3727C5AC; -COMPILER_STRIP_GATE(0x8085B2C0, &lit_4022); -#pragma pop - -/* 8085B2C4-8085B2C8 000038 0004+00 0/1 0/0 0/0 .rodata @4023 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4023 = 5.0f; -COMPILER_STRIP_GATE(0x8085B2C4, &lit_4023); -#pragma pop - -/* 8085B2C8-8085B2CC 00003C 0004+00 0/1 0/0 0/0 .rodata @4024 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4024 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(0x8085B2C8, &lit_4024); -#pragma pop - -/* 8085B2CC-8085B2D0 000040 0004+00 0/1 0/0 0/0 .rodata @4025 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4025 = 8.0f; -COMPILER_STRIP_GATE(0x8085B2CC, &lit_4025); -#pragma pop - -/* 8085B2D0-8085B2D4 000044 0004+00 0/1 0/0 0/0 .rodata @4026 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4026 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x8085B2D0, &lit_4026); -#pragma pop - -/* 8085B2D4-8085B2D8 000048 0004+00 0/1 0/0 0/0 .rodata @4027 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4027 = 0x3BA3D70A; -COMPILER_STRIP_GATE(0x8085B2D4, &lit_4027); -#pragma pop - -/* 8085B2D8-8085B2DC 00004C 0004+00 0/1 0/0 0/0 .rodata @4028 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4028 = 0x3A83126F; -COMPILER_STRIP_GATE(0x8085B2D8, &lit_4028); -#pragma pop - -/* 8085B2DC-8085B2E0 000050 0004+00 0/2 0/0 0/0 .rodata @4029 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4029 = 1.0f; -COMPILER_STRIP_GATE(0x8085B2DC, &lit_4029); -#pragma pop - -/* 8085B2E0-8085B2E4 000054 0004+00 0/1 0/0 0/0 .rodata @4030 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4030 = 0.5f; -COMPILER_STRIP_GATE(0x8085B2E0, &lit_4030); -#pragma pop - -/* 8085B2E4-8085B2E8 000058 0004+00 0/1 0/0 0/0 .rodata @4031 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4031 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x8085B2E4, &lit_4031); -#pragma pop - -/* 8085B2E8-8085B2EC 00005C 0004+00 0/1 0/0 0/0 .rodata @4032 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4032 = 0.25f; -COMPILER_STRIP_GATE(0x8085B2E8, &lit_4032); -#pragma pop - -/* 8085B2EC-8085B2F0 000060 0004+00 0/1 0/0 0/0 .rodata @4033 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4033 = 0x3B03126F; -COMPILER_STRIP_GATE(0x8085B2EC, &lit_4033); -#pragma pop - -/* 8085B2F0-8085B2F4 000064 0004+00 0/1 0/0 0/0 .rodata @4034 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4034 = 37.5f; -COMPILER_STRIP_GATE(0x8085B2F0, &lit_4034); -#pragma pop - -/* 8085B2F4-8085B2F8 000068 0004+00 0/1 0/0 0/0 .rodata @4035 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4035 = 4000.0f; -COMPILER_STRIP_GATE(0x8085B2F4, &lit_4035); -#pragma pop - -/* 8085B2F8-8085B2FC 00006C 0004+00 0/1 0/0 0/0 .rodata @4036 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4036 = 4.0f; -COMPILER_STRIP_GATE(0x8085B2F8, &lit_4036); -#pragma pop - -/* 8085B2FC-8085B300 000070 0004+00 0/1 0/0 0/0 .rodata @4037 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4037 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(0x8085B2FC, &lit_4037); -#pragma pop - -/* 8085B300-8085B304 000074 0004+00 0/1 0/0 0/0 .rodata @4038 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4038 = 50.0f; -COMPILER_STRIP_GATE(0x8085B300, &lit_4038); -#pragma pop - -/* 8085B304-8085B308 000078 0004+00 0/1 0/0 0/0 .rodata @4039 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4039 = 56.0f; -COMPILER_STRIP_GATE(0x8085B304, &lit_4039); -#pragma pop - -/* 8085B308-8085B30C 00007C 0004+00 0/1 0/0 0/0 .rodata @4040 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4040 = 45.0f; -COMPILER_STRIP_GATE(0x8085B308, &lit_4040); -#pragma pop - -/* 8085B30C-8085B310 000080 0004+00 0/1 0/0 0/0 .rodata @4041 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4041 = 30.0f; -COMPILER_STRIP_GATE(0x8085B30C, &lit_4041); -#pragma pop - /* 8085A580-8085AEA0 000080 0920+00 1/0 0/0 0/0 .text daKytag08_Execute__FP13kytag08_class */ -// matches with literals -#ifdef NONMATCHING static int daKytag08_Execute(kytag08_class* i_this) { dScnKy_env_light_c* env_light = dKy_getEnvlight(); daPy_py_c* player_p = daPy_getPlayerActorClass(); @@ -299,123 +31,129 @@ static int daKytag08_Execute(kytag08_class* i_this) { i_this->current.pos.z = env_light->field_0x0c18[0].mPos.z; } - if (i_this->field_0x5b8.abs(i_this->current.pos) < 2000.0f && !dComIfGp_event_runCheck()) { - if (i_this->field_0x5d4 > 100) { - f32 var_f30; - f32 var_f31; + if (i_this->mAvoidPos.abs(i_this->current.pos) < 2000.0f && !dComIfGp_event_runCheck()) { + if (i_this->mSizeTimer > 100) { + f32 max_step; + f32 accel_rate; if (i_this->field_0x5d8 != 0) { - var_f30 = 20.0f; - var_f31 = 0.1f; + max_step = 20.0f; + accel_rate = 0.1f; } else { - var_f30 = 10.0f; - var_f31 = 0.2f; + max_step = 10.0f; + accel_rate = 0.2f; } - cLib_addCalc(&i_this->field_0x5b8.x, i_this->field_0x5c4.x, var_f31, var_f30, 1.0E-5f); - cLib_addCalc(&i_this->field_0x5b8.z, i_this->field_0x5c4.z, var_f31, var_f30, 1.0E-5f); + cLib_addCalc(&i_this->mAvoidPos.x, i_this->mTargetAvoidPos.x, accel_rate, max_step, + 0.00001f); + cLib_addCalc(&i_this->mAvoidPos.z, i_this->mTargetAvoidPos.z, accel_rate, max_step, + 0.00001f); } else { - f32 var_f30; - f32 var_f31; + f32 max_step; + f32 accel_rate; if (i_this->field_0x5d8 != 0) { - var_f30 = 20.0f; - var_f31 = 0.1f; + max_step = 5.0f; + accel_rate = 0.02f; } else { - var_f30 = 10.0f; - var_f31 = 0.2f; + max_step = 8.0f; + accel_rate = 0.05f; } - cLib_addCalc(&i_this->field_0x5b8.x, i_this->field_0x5c4.x, var_f31, var_f30, 1.0E-5f); - cLib_addCalc(&i_this->field_0x5b8.z, i_this->field_0x5c4.z, var_f31, var_f30, 1.0E-5f); + cLib_addCalc(&i_this->mAvoidPos.x, i_this->mTargetAvoidPos.x, accel_rate, max_step, + 0.1f); + cLib_addCalc(&i_this->mAvoidPos.z, i_this->mTargetAvoidPos.z, accel_rate, max_step, + 0.1f); } } else { - i_this->field_0x5b8.x = i_this->current.pos.x; - i_this->field_0x5b8.z = i_this->current.pos.z; + i_this->mAvoidPos.x = i_this->current.pos.x; + i_this->mAvoidPos.z = i_this->current.pos.z; } if (!dKy_shadow_mode_check(2)) { if (!dComIfGp_event_runCheck()) { - cLib_addCalc(&i_this->field_0x5d0, 0.0f, 0.2f, 0.005f, 0.001f); + cLib_addCalc(&i_this->mSizeScale, 0.0f, 0.2f, 0.005f, 0.001f); } - } else if (i_this->field_0x5d4 != 0) { - cLib_addCalc(&i_this->field_0x5d0, 1.0f, 0.5f, 0.01f, 0.001f); + } else if (i_this->mSizeTimer != 0) { + cLib_addCalc(&i_this->mSizeScale, 1.0f, 0.5f, 0.01f, 0.001f); } else if (!dComIfGp_event_runCheck()) { - cLib_addCalc(&i_this->field_0x5d0, 0.25f, 0.01f, 0.002f, 0.001f); + cLib_addCalc(&i_this->mSizeScale, 0.25f, 0.01f, 0.002f, 0.001f); } - mDoAud_setFogWipeWidth(i_this->field_0x5d0); + mDoAud_setFogWipeWidth(i_this->mSizeScale); if (i_this->field_0x5d8 != 0) { - f32 tmp2 = 37.5f; - if (i_this->field_0x5b8.abs(i_this->current.pos) > - i_this->field_0x5d0 * tmp2 * i_this->field_0x5ac.x) + f32 width = 37.5f; + if (i_this->mAvoidPos.abs(i_this->current.pos) > + i_this->mSize.x * width * i_this->mSizeScale) { dComIfGs_BossLife_public_Set(2); } } - if ((daPy_getPlayerActorClass()->checkKandelaarSwing(1) && i_this->field_0x5d4 < 100) || + if ((daPy_getPlayerActorClass()->checkKandelaarSwing(TRUE) && i_this->mSizeTimer < 100) || dComIfGs_BossLife_public_Get() == 1) { dComIfGs_BossLife_public_Set(0); - i_this->field_0x5c4 = i_this->current.pos; - i_this->field_0x5d4 = 180; + i_this->mTargetAvoidPos = i_this->current.pos; + i_this->mSizeTimer = 180; mDoAud_startFogWipeTrigger(&i_this->current.pos); } else { - f32 var_f30_3; - f32 var_f31_3; + f32 max_step; + f32 accel_rate; if (i_this->field_0x5d8 != 0) { - var_f30_3 = 4000.0f; - var_f31_3 = 0.5f; + max_step = 4000.0f; + accel_rate = 0.5f; } else { - var_f30_3 = 4.0f; - var_f31_3 = 0.025f; + max_step = 4.0f; + accel_rate = 0.025f; } - cLib_addCalc(&i_this->field_0x5c4.x, i_this->current.pos.x, var_f31_3, var_f30_3, 0.01f); - cLib_addCalc(&i_this->field_0x5c4.z, i_this->current.pos.z, var_f31_3, var_f30_3, 0.01f); + cLib_addCalc(&i_this->mTargetAvoidPos.x, i_this->current.pos.x, accel_rate, max_step, + 0.01f); + cLib_addCalc(&i_this->mTargetAvoidPos.z, i_this->current.pos.z, accel_rate, max_step, + 0.01f); } - if (i_this->field_0x5d4 != 0) { - i_this->field_0x5d4--; + if (i_this->mSizeTimer != 0) { + i_this->mSizeTimer--; } if (i_this->mpEmitter1 != NULL) { - i_this->mpEmitter1->setGlobalTranslation(i_this->field_0x5b8.x, i_this->field_0x5b8.y, - i_this->field_0x5b8.z); - i_this->mpEmitter1->setVolumeSize(i_this->field_0x5ac.x * 50.0f * i_this->field_0x5d0); + i_this->mpEmitter1->setGlobalTranslation(i_this->mAvoidPos.x, i_this->mAvoidPos.y, + i_this->mAvoidPos.z); + i_this->mpEmitter1->setVolumeSize(i_this->mSize.x * 50.0f * i_this->mSizeScale); - f32 temp_f0_7 = 1.0f - i_this->field_0x5d0; + f32 temp_f0_7 = 1.0f - i_this->mSizeScale; particle_scale.x = 1.0f - (temp_f0_7 * temp_f0_7); particle_scale.y = 1.0f - (temp_f0_7 * temp_f0_7); particle_scale.z = 1.0f - (temp_f0_7 * temp_f0_7); i_this->mpEmitter1->setGlobalParticleScale(particle_scale); } - if (i_this->field_0x5d0 <= 0.001f) { - i_this->field_0x5b8.x = i_this->current.pos.x; - i_this->field_0x5b8.z = i_this->current.pos.z; + if (i_this->mSizeScale <= 0.001f) { + i_this->mAvoidPos.x = i_this->current.pos.x; + i_this->mAvoidPos.z = i_this->current.pos.z; - i_this->field_0x5c4 = i_this->field_0x5b8; + i_this->mTargetAvoidPos = i_this->mAvoidPos; } - f32 var_f30_4 = 20.0f; + f32 fog_height = 20.0f; if (dKy_darkworld_check()) { - var_f30_4 = 56.0f; + fog_height = 56.0f; } - f32 var_f0; + f32 player_y_pos; if (player_p->getSpinnerActor()) { - var_f0 = player_p->getSpinnerActor()->current.pos.y; + player_y_pos = player_p->getSpinnerActor()->current.pos.y; } else { - var_f0 = player_p->current.pos.y; + player_y_pos = player_p->current.pos.y; } - if (var_f0 < var_f30_4) { - cXyz sp24(player_p->current.pos); - sp24.y = 100.0f; + if (player_y_pos < fog_height) { + cXyz player_pos(player_p->current.pos); + player_pos.y = 100.0f; - if (i_this->field_0x5b8.abs(sp24) > i_this->field_0x5ac.x * 45.0f * i_this->field_0x5d0 || - i_this->field_0x5d0 <= 0.01f) + if (i_this->mAvoidPos.abs(player_pos) > i_this->mSize.x * 45.0f * i_this->mSizeScale || + i_this->mSizeScale <= 0.01f) { player_p->onFogFade(); } @@ -423,18 +161,17 @@ static int daKytag08_Execute(kytag08_class* i_this) { if (player_p != NULL && i_this->mpEmitter2 != NULL) { i_this->mpEmitter2->setGlobalTranslation(player_p->current.pos.x, 100.0f, - player_p->current.pos.z); + player_p->current.pos.z); particle_scale.z = 0.0f; particle_scale.y = 0.0f; particle_scale.x = 0.0f; if (player_p->current.pos.y < 100.0f) { - cXyz sp18(player_p->current.pos); - sp18.y = 100.0f; + cXyz player_pos(player_p->current.pos); + player_pos.y = 100.0f; - if (i_this->field_0x5b8.abs(sp18) > i_this->field_0x5ac.x * 45.0f * i_this->field_0x5d0) - { + if (i_this->mAvoidPos.abs(player_pos) > i_this->mSize.x * 45.0f * i_this->mSizeScale) { f32 scale_factor = (100.0f - player_p->current.pos.y) / 30.0f; if (scale_factor > 1.0f) { @@ -452,16 +189,6 @@ static int daKytag08_Execute(kytag08_class* i_this) { return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daKytag08_Execute(kytag08_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/daKytag08_Execute__FP13kytag08_class.s" -} -#pragma pop -#endif /* 8085AEA0-8085AEA8 0009A0 0008+00 1/0 0/0 0/0 .text daKytag08_IsDelete__FP13kytag08_class */ static int daKytag08_IsDelete(kytag08_class* i_this) { @@ -492,119 +219,81 @@ static int daKytag08_Delete(kytag08_class* i_this) { } /* 8085AF74-8085AFEC 000A74 0078+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -// getting optimized when it shouldnt be? -#ifdef NONMATCHING static int useHeapInit(fopAc_ac_c* i_this) { - kytag08_class* this_ = (kytag08_class*)i_this; + kytag08_class* a_this = (kytag08_class*)i_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kytag08", 3); - this_->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202); - if (this_->mpModel == NULL) { - return 0; - } + JUT_ASSERT(modelData != 0); + a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202); + + // wtf, necessary to match + if (a_this->mpModel == NULL) { + return 0; + } else if (a_this->mpModel != NULL) { + return 1; + } return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/useHeapInit__FP10fopAc_ac_c.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 8085B318-8085B338 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag08_Method */ -SECTION_DATA static void* l_daKytag08_Method[8] = { - (void*)daKytag08_Create__FP10fopAc_ac_c, - (void*)daKytag08_Delete__FP13kytag08_class, - (void*)daKytag08_Execute__FP13kytag08_class, - (void*)daKytag08_IsDelete__FP13kytag08_class, - (void*)daKytag08_Draw__FP13kytag08_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 8085B338-8085B368 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG08 */ -SECTION_DATA extern void* g_profile_KYTAG08[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02B20000, (void*)&g_fpcLf_Method, - (void*)0x000005DC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00660000, (void*)&l_daKytag08_Method, - (void*)0x00044000, (void*)NULL, -}; - -/* 8085B368-8085B374 000050 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; /* 8085AFEC-8085B23C 000AEC 0250+00 1/0 0/0 0/0 .text daKytag08_Create__FP10fopAc_ac_c */ -// regswap -#ifdef NONMATCHING static int daKytag08_Create(fopAc_ac_c* i_this) { - cXyz sp(1.0f, 1.0f, 1.0f); + kytag08_class* a_this = (kytag08_class*)i_this; + cXyz scale(1.0f, 1.0f, 1.0f); dScnKy_env_light_c* env_light = dKy_getEnvlight(); - - fopAcM_SetupActor(i_this, kytag08_class); - - kytag08_class* this_ = (kytag08_class*)i_this; - int phase = dComIfG_resLoad(&this_->mPhase, "Kytag08"); + fopAcM_SetupActor(a_this, kytag08_class); + + int phase = dComIfG_resLoad(&a_this->mPhase, "Kytag08"); if (phase == cPhs_COMPLEATE_e) { - if (!fopAcM_entrySolidHeap(this_, useHeapInit, 0x550)) { + if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x550)) { return cPhs_ERROR_e; } - this_->field_0x5ac.x = 20.0f; - this_->field_0x5ac.y = 20.0f; - this_->field_0x5ac.z = 20.0f; - this_->field_0x5d0 = 0.0f; + a_this->mSize.x = 20.0f; + a_this->mSize.y = 20.0f; + a_this->mSize.z = 20.0f; + a_this->mSizeScale = 0.0f; - this_->mpEmitter1 = dComIfGp_particle_set(0x84A0, &this_->current.pos, NULL, &sp); + a_this->mpEmitter1 = dComIfGp_particle_set(0x84A0, &i_this->current.pos, NULL, &scale); if (!dKy_darkworld_check()) { - this_->mpEmitter2 = dComIfGp_particle_set(0x84A1, &this_->current.pos, NULL, &sp); + a_this->mpEmitter2 = dComIfGp_particle_set(0x84A1, &i_this->current.pos, NULL, &scale); } else { - this_->mpEmitter2 = dComIfGp_particle_set(0x84A2, &this_->current.pos, NULL, &sp); + a_this->mpEmitter2 = dComIfGp_particle_set(0x84A2, &i_this->current.pos, NULL, &scale); } - this_->field_0x5b8 = this_->current.pos; - this_->field_0x5b8.y = 100.0f; - this_->field_0x5c4 = this_->field_0x5b8; + a_this->mAvoidPos = i_this->current.pos; + a_this->mAvoidPos.y = 100.0f; + a_this->mTargetAvoidPos = a_this->mAvoidPos; - env_light->field_0x1060 = this_; + env_light->field_0x1060 = a_this; } return phase; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daKytag08_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/daKytag08_Create__FP10fopAc_ac_c.s" -} -#pragma pop -#endif -/* 8085B23C-8085B284 000D3C 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" asm void __dt__12J3DFrameCtrlFv() { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag08/d_a_kytag08/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop +/* 8085B318-8085B338 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag08_Method */ +static actor_method_class l_daKytag08_Method = { + (process_method_func)daKytag08_Create, (process_method_func)daKytag08_Delete, + (process_method_func)daKytag08_Execute, (process_method_func)daKytag08_IsDelete, + (process_method_func)daKytag08_Draw, +}; -/* 8085B310-8085B310 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 8085B338-8085B368 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG08 */ +extern actor_process_profile_definition g_profile_KYTAG08 = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_KYTAG08, + &g_fpcLf_Method.mBase, + sizeof(kytag08_class), + 0, + 0, + &g_fopAc_Method.base, + 102, + &l_daKytag08_Method, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, +}; diff --git a/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp b/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp index 6981384a90..79f50542b3 100644 --- a/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp +++ b/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp @@ -76,28 +76,28 @@ static int daKytag09_Delete(kytag09_class* i_this) { /* 8085B658-8085B7C0 0002D8 0168+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ static int useHeapInit(fopAc_ac_c* i_this) { - kytag09_class* this_ = (kytag09_class*)i_this; + kytag09_class* a_this = (kytag09_class*)i_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kytag09", 4); J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes("Kytag09", 5); - this_->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); - if (this_->mpModel == NULL) { + a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (a_this->mpModel == NULL) { return 0; } J3DAnmTextureSRTKey* btkp = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Kytag09", 9); - if (!this_->mBtk_2.init(modelData, btkp, TRUE, 2, 1.0f, 0, -1)) { + if (!a_this->mBtk_2.init(modelData, btkp, TRUE, 2, 1.0f, 0, -1)) { return 0; } - this_->mpModel2 = mDoExt_J3DModel__create(modelData2, 0x80000, 0x11000284); - if (this_->mpModel2 == NULL) { + a_this->mpModel2 = mDoExt_J3DModel__create(modelData2, 0x80000, 0x11000284); + if (a_this->mpModel2 == NULL) { return 0; } J3DAnmTextureSRTKey* btk2p = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Kytag09", 10); - if (!this_->mBtk.init(modelData2, btk2p, TRUE, 2, 1.0f, 0, -1)) { + if (!a_this->mBtk.init(modelData2, btk2p, TRUE, 2, 1.0f, 0, -1)) { return 0; } @@ -106,16 +106,16 @@ static int useHeapInit(fopAc_ac_c* i_this) { /* 8085B7C0-8085B894 000440 00D4+00 1/1 0/0 0/0 .text useHeapInit2__FP10fopAc_ac_c */ static int useHeapInit2(fopAc_ac_c* i_this) { - kytag09_class* this_ = (kytag09_class*)i_this; + kytag09_class* a_this = (kytag09_class*)i_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("kytag09_2", 4); - this_->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); - if (this_->mpModel == NULL) { + a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (a_this->mpModel == NULL) { return 0; } J3DAnmTextureSRTKey* btkp = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("kytag09_2", 7); - if (!this_->mBtk_2.init(modelData, btkp, TRUE, 2, 1.0f, 0, -1)) { + if (!a_this->mBtk_2.init(modelData, btkp, TRUE, 2, 1.0f, 0, -1)) { return 0; } @@ -124,20 +124,20 @@ static int useHeapInit2(fopAc_ac_c* i_this) { /* 8085B894-8085B9F4 000514 0160+00 1/0 0/0 0/0 .text daKytag09_Create__FP10fopAc_ac_c */ static int daKytag09_Create(fopAc_ac_c* i_this) { - kytag09_class* this_ = (kytag09_class*)i_this; - this_->mType = fopAcM_GetParam(this_) & 0xFF; + kytag09_class* a_this = (kytag09_class*)i_this; + a_this->mType = fopAcM_GetParam(i_this) & 0xFF; - fopAcM_SetupActor(this_, kytag09_class); + fopAcM_SetupActor(a_this, kytag09_class); int phase; - if (this_->mType != 1) { - phase = dComIfG_resLoad(&this_->mPhase, "Kytag09"); - if (phase == cPhs_COMPLEATE_e && !fopAcM_entrySolidHeap(this_, useHeapInit, 0x5EB0)) { + if (a_this->mType != 1) { + phase = dComIfG_resLoad(&a_this->mPhase, "Kytag09"); + if (phase == cPhs_COMPLEATE_e && !fopAcM_entrySolidHeap(i_this, useHeapInit, 0x5EB0)) { return cPhs_ERROR_e; } } else { - phase = dComIfG_resLoad(&this_->mPhase, "kytag09_2"); - if (phase == cPhs_COMPLEATE_e && !fopAcM_entrySolidHeap(this_, useHeapInit2, 0x1880)) { + phase = dComIfG_resLoad(&a_this->mPhase, "kytag09_2"); + if (phase == cPhs_COMPLEATE_e && !fopAcM_entrySolidHeap(i_this, useHeapInit2, 0x1880)) { return cPhs_ERROR_e; } } diff --git a/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp b/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp index a19d3f788e..90b7eb5328 100644 --- a/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp +++ b/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp @@ -4,59 +4,13 @@ */ #include "rel/d/a/kytag/d_a_kytag10/d_a_kytag10.h" +#include "SSystem/SComponent/c_math.h" #include "d/com/d_com_inf_game.h" #include "d/d_path.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" static void get_rail_ratio_pos__FP5dPathifPsPs(); -extern "C" static void set_path_info__FP10fopAc_ac_c(); -extern "C" static void get_Extent_pos_start_get__FP13kytag10_classP5dPathP4cXyzfPi(); -extern "C" static void get_Extent_pos_end_get__FP13kytag10_classP5dPathP4cXyzfPi(); -extern "C" static void sparks_move__FP13kytag10_class(); -extern "C" static bool daKytag10_Draw__FP13kytag10_class(); -extern "C" static void daKytag10_Execute__FP13kytag10_class(); -extern "C" static bool daKytag10_IsDelete__FP13kytag10_class(); -extern "C" static void daKytag10_Delete__FP13kytag10_class(); -extern "C" static void daKytag10_Create__FP10fopAc_ac_c(); - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dPath_GetRoomPath__Fii(); -extern "C" void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz(); -extern "C" void cM_atan2s__Fff(); -extern "C" void deleteAllParticle__14JPABaseEmitterFv(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80529400-80529404 000000 0004+00 3/3 0/0 0/0 .rodata @3788 */ -SECTION_RODATA static u8 const lit_3788[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80529400, &lit_3788); +#include "d/kankyo/d_kankyo_rain.h" /* 80528BF8-80528D0C 000078 0114+00 1/1 0/0 0/0 .text get_rail_ratio_pos__FP5dPathifPsPs */ -// matches with literals -#ifdef NONMATCHING static cXyz get_rail_ratio_pos(dPath* i_path, int i_pointIdx, f32 param_2, s16* param_3, s16* param_4) { cXyz point_a; @@ -84,17 +38,6 @@ static cXyz get_rail_ratio_pos(dPath* i_path, int i_pointIdx, f32 param_2, s16* return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm cXyz get_rail_ratio_pos(dPath* param_0, int param_1, f32 param_2, s16* param_3, - s16* param_4) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag10/d_a_kytag10/get_rail_ratio_pos__FP5dPathifPsPs.s" -} -#pragma pop -#endif /* 80528D0C-80528D54 00018C 0048+00 1/1 0/0 0/0 .text set_path_info__FP10fopAc_ac_c */ static dPath* set_path_info(fopAc_ac_c* i_actor) { @@ -118,95 +61,13 @@ static dPath* get_Extent_pos_start_get(kytag10_class* i_this, dPath* i_path, cXy /* 80528D64-80528D78 0001E4 0014+00 1/1 0/0 0/0 .text * get_Extent_pos_end_get__FP13kytag10_classP5dPathP4cXyzfPi */ -static dPath* get_Extent_pos_end_get(kytag10_class* param_0, dPath* i_path, cXyz*, f32, +static dPath* get_Extent_pos_end_get(kytag10_class* i_this, dPath* i_path, cXyz*, f32, int* param_4) { *param_4 = i_path->m_num - 1; return i_path; } -/* ############################################################################################## */ -/* 80529404-80529408 000004 0004+00 0/1 0/0 0/0 .rodata @3950 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3950 = 1000.0f; -COMPILER_STRIP_GATE(0x80529404, &lit_3950); -#pragma pop - -/* 80529408-80529410 000008 0004+04 0/2 0/0 0/0 .rodata @3951 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3951[1 + 1 /* padding */] = { - 1.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80529408, &lit_3951); -#pragma pop - -/* 80529410-80529418 000010 0008+00 0/1 0/0 0/0 .rodata @3952 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3952[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80529410, &lit_3952); -#pragma pop - -/* 80529418-80529420 000018 0008+00 0/1 0/0 0/0 .rodata @3953 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3953[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80529418, &lit_3953); -#pragma pop - -/* 80529420-80529428 000020 0008+00 0/1 0/0 0/0 .rodata @3954 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3954[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80529420, &lit_3954); -#pragma pop - -/* 80529428-8052942C 000028 0004+00 0/1 0/0 0/0 .rodata @3955 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3955 = 250.0f; -COMPILER_STRIP_GATE(0x80529428, &lit_3955); -#pragma pop - -/* 8052942C-80529430 00002C 0004+00 0/1 0/0 0/0 .rodata @3956 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3956 = 100.0f; -COMPILER_STRIP_GATE(0x8052942C, &lit_3956); -#pragma pop - -/* 80529430-80529438 000030 0004+04 0/1 0/0 0/0 .rodata @3957 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3957[1 + 1 /* padding */] = { - 1.5f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80529430, &lit_3957); -#pragma pop - -/* 80529438-80529440 000038 0008+00 0/2 0/0 0/0 .rodata @3959 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3959[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80529438, &lit_3959); -#pragma pop - /* 80528D78-80529148 0001F8 03D0+00 1/1 0/0 0/0 .text sparks_move__FP13kytag10_class */ -// TVec3 constructors need to be setup -#ifdef NONMATCHING static void sparks_move(kytag10_class* i_this) { camera_class* camera_p = dComIfGp_getCamera(0); @@ -258,7 +119,7 @@ static void sparks_move(kytag10_class* i_this) { i_this->mpEmitter2->setRate(rate); } - if (i_this->field_0x594 <= 1.0f - (250.0f * temp_f)) { + if (i_this->field_0x594 <= 1.0f - temp_f * 1.5f) { i_this->field_0x594 += temp_f; return; } else if (i_this->mPathPoint >= end_point_idx - 1) { @@ -270,20 +131,11 @@ static void sparks_move(kytag10_class* i_this) { i_this->field_0x594 = 0.0f; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void sparks_move(kytag10_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag10/d_a_kytag10/sparks_move__FP13kytag10_class.s" -} -#pragma pop -#endif /* 80529148-80529150 0005C8 0008+00 1/0 0/0 0/0 .text daKytag10_Draw__FP13kytag10_class */ static int daKytag10_Draw(kytag10_class* i_this) { + GXColor sphere_color = {0xFF, 0xFF, 0xFF, 0xFF}; return 1; } @@ -322,25 +174,9 @@ static int daKytag10_Delete(kytag10_class* i_this) { return 1; } -/* ############################################################################################## */ -/* 80529440-80529444 000040 0004+00 0/0 0/0 0/0 .rodata @3971 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3971 = 0xFFFFFFFF; -COMPILER_STRIP_GATE(0x80529440, &lit_3971); -#pragma pop - -/* 80529444-80529448 000044 0004+00 0/1 0/0 0/0 .rodata @4058 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4058 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80529444, &lit_4058); -#pragma pop - /* 80529248-805293F8 0006C8 01B0+00 1/0 0/0 0/0 .text daKytag10_Create__FP10fopAc_ac_c */ -// matches with literals -#ifdef NONMATCHING static int daKytag10_Create(fopAc_ac_c* i_this) { + kytag10_class* a_this = (kytag10_class*)i_this; fopAcM_SetupActor(i_this, kytag10_class); u8 prm0 = fopAcM_GetParam(i_this); @@ -348,48 +184,34 @@ static int daKytag10_Create(fopAc_ac_c* i_this) { prm0 = 10; } - ((kytag10_class*)i_this)->mEmitterPtclScale.z = prm0 * 0.1f; - ((kytag10_class*)i_this)->mEmitterPtclScale.y = prm0 * 0.1f; - ((kytag10_class*)i_this)->mEmitterPtclScale.x = prm0 * 0.1f; + a_this->mEmitterPtclScale.z = prm0 * 0.1f; + a_this->mEmitterPtclScale.y = prm0 * 0.1f; + a_this->mEmitterPtclScale.x = prm0 * 0.1f; s16 prm1 = (fopAcM_GetParam(i_this) >> 8) & 0xFF; if (prm1 == 0xFF) { prm1 = 0; } - ((kytag10_class*)i_this)->mEmitterVolSize = prm1 * 10; + a_this->mEmitterVolSize = prm1 * 10; s16 prm3 = (fopAcM_GetParam(i_this) >> 0x18) & 0xFF; if (prm3 == 0xFF) { prm3 = 15; } - ((kytag10_class*)i_this)->mEmitterLifeTime = prm3 * 10; - ((kytag10_class*)i_this)->field_0x584 = i_this->current.angle.x & 0xFF; - ((kytag10_class*)i_this)->mpEmitter1 = NULL; - ((kytag10_class*)i_this)->mpEmitter2 = NULL; - ((kytag10_class*)i_this)->field_0x594 = 0.0f; - ((kytag10_class*)i_this)->mPathPoint = 0; - ((kytag10_class*)i_this)->mpPath = set_path_info(i_this); - ((kytag10_class*)i_this)->mpEmitter1 = - dComIfGp_particle_set(0x852B, &i_this->current.pos, NULL, NULL); - ((kytag10_class*)i_this)->mpEmitter2 = - dComIfGp_particle_set(0x852C, &i_this->current.pos, NULL, NULL); - + a_this->mEmitterLifeTime = prm3 * 10; + a_this->field_0x584 = i_this->current.angle.x & 0xFF; + a_this->mpEmitter1 = NULL; + a_this->mpEmitter2 = NULL; + a_this->field_0x594 = 0.0f; + a_this->mPathPoint = 0; + a_this->mpPath = set_path_info(i_this); + a_this->mpEmitter1 = dComIfGp_particle_set(0x852B, &i_this->current.pos, NULL, NULL); + a_this->mpEmitter2 = dComIfGp_particle_set(0x852C, &i_this->current.pos, NULL, NULL); return cPhs_COMPLEATE_e; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daKytag10_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag10/d_a_kytag10/daKytag10_Create__FP10fopAc_ac_c.s" -} -#pragma pop -#endif -/* ############################################################################################## */ /* 80529448-80529468 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag10_Method */ static actor_method_class l_daKytag10_Method = { (process_method_func)daKytag10_Create, (process_method_func)daKytag10_Delete, diff --git a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp index 734fbb3402..7e77519a1f 100644 --- a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp +++ b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp @@ -98,33 +98,22 @@ static int daKytag11_Delete(kytag11_class* i_this) { /* 805297A8-80529854 000308 00AC+00 1/0 0/0 0/0 .text daKytag11_Create__FP10fopAc_ac_c */ static int daKytag11_Create(fopAc_ac_c* i_this) { + kytag11_class* a_this = (kytag11_class*)i_this; fopAcM_SetupActor(i_this, kytag11_class); - kytag11_class* this_ = (kytag11_class*)i_this; - - this_->mNewTime = fopAcM_GetParam(this_) & 0x1F; - this_->mStopTime = (fopAcM_GetParam(this_) >> 5) & 0x1F; - this_->mEnvTime = (fopAcM_GetParam(this_) >> 10) & 0xFF; - this_->mOnEventID = this_->current.angle.x & 0xFFF; - this_->mOffEventID = this_->current.angle.y & 0xFFF; - this_->mOnSwitchNo = this_->current.angle.z & 0xFF; - this_->mOffSwitchNo = (this_->current.angle.z >> 8) & 0xFF; - this_->mChangeTime = false; - this_->mInitTimeChange = false; + a_this->mNewTime = fopAcM_GetParam(i_this) & 0x1F; + a_this->mStopTime = (fopAcM_GetParam(i_this) >> 5) & 0x1F; + a_this->mEnvTime = (fopAcM_GetParam(i_this) >> 10) & 0xFF; + a_this->mOnEventID = i_this->current.angle.x & 0xFFF; + a_this->mOffEventID = i_this->current.angle.y & 0xFFF; + a_this->mOnSwitchNo = i_this->current.angle.z & 0xFF; + a_this->mOffSwitchNo = (i_this->current.angle.z >> 8) & 0xFF; + a_this->mChangeTime = false; + a_this->mInitTimeChange = false; return cPhs_COMPLEATE_e; } -/* 80529854-8052988C 0003B4 0038+00 1/1 0/0 0/0 .text dKankyo_DayProc__Fv */ -// this is a weak func that should be compiler generated, unsure how to make it do that for now -/* #pragma push -#pragma force_active on -extern "C" void dKankyo_DayProc__Fv() { - dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[91]); -} -#pragma pop */ - -/* ############################################################################################## */ /* 805298B4-805298D4 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag11_Method */ static actor_method_class l_daKytag11_Method = { (process_method_func)daKytag11_Create, (process_method_func)daKytag11_Delete, diff --git a/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp b/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp index c55175be45..c48876dc11 100644 --- a/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp +++ b/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp @@ -4,39 +4,25 @@ // #include "rel/d/a/kytag/d_a_kytag12/d_a_kytag12.h" +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/kankyo/d_kankyo_rain.h" +#include "d/kankyo/d_kankyo_wether.h" #include "dol2asm.h" // // Types: // -struct kytag12_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 8085BCD0 */ ~cXyz(); - /* 8085EEF4 */ cXyz(); -}; - -struct JAISoundID {}; - -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); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; +class kytag12_class : public fopAc_ac_c { +public: + /* 0x568 */ u8 field_0x568[0x574 - 0x568]; + /* 0x574 */ u8 field_0x574; + /* 0x575 */ u8 field_0x575; + /* 0x576 */ u16 field_0x576; + /* 0x578 */ s16 field_0x578; + /* 0x57C */ cXyz field_0x57c[5]; }; // @@ -74,21 +60,13 @@ extern "C" void cLib_addCalc__FPfffff(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSVECSquareDistance(); extern "C" void __construct_array(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_14(); extern "C" void _savegpr_18(); extern "C" void _restgpr_14(); extern "C" void _restgpr_18(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -96,29 +74,37 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* 8085BB38-8085BB80 000078 0048+00 2/2 0/0 0/0 .text d_kytag12_cut_turn_check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void d_kytag12_cut_turn_check() { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/d_kytag12_cut_turn_check__Fv.s" +static BOOL d_kytag12_cut_turn_check() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + BOOL var_r3 = false; + if (player != NULL && (player->getCutType() == daPy_py_c::CUT_TYPE_TURN_RIGHT || + player->getCutType() == daPy_py_c::CUT_TYPE_TURN_LEFT || + player->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT || + player->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT)) + { + var_r3 = true; + } + + return var_r3; } -#pragma pop /* 8085BB80-8085BBB8 0000C0 0038+00 1/1 0/0 0/0 .text d_kytag12_cut_normal_check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void d_kytag12_cut_normal_check() { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/d_kytag12_cut_normal_check__Fv.s" +static BOOL d_kytag12_cut_normal_check() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + BOOL var_r3 = true; + if (player != NULL && + (player->getCutType() == 0x28 || player->getCutType() == daPy_py_c::CUT_TYPE_GUARD_ATTACK)) + { + var_r3 = false; + } + + return var_r3; } -#pragma pop /* 8085BBB8-8085BBC0 0000F8 0008+00 1/0 0/0 0/0 .text daKytag12_Draw__FP13kytag12_class */ -static bool daKytag12_Draw(kytag12_class* param_0) { - return true; +static int daKytag12_Draw(kytag12_class* param_0) { + return 1; } /* ############################################################################################## */ @@ -189,6 +175,35 @@ COMPILER_STRIP_GATE(0x8085EF20, &lit_3844); /* 8085BBC0-8085BCD0 000100 0110+00 3/3 0/0 0/0 .text * daKytag12_light_swprd_proc__FP13kytag12_class */ +// matches with literals +#ifdef NONMATCHING +static void daKytag12_light_swprd_proc(kytag12_class* i_this) { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + + if (dComIfGs_getSelectEquipSword() == LIGHT_SWORD) { + if (player->getCutType() != 0) { + if (i_this->field_0x576 == 0) { + cXyz sp28(player->current.pos); + sp28.y -= 100.0f; + + i_this->field_0x576 = 25; + + if (d_kytag12_cut_turn_check()) { + dKyw_plight_collision_set(&sp28, 0, player->current.angle.y, 500.0f, 2000.0f, + 1.0f, 0.0f, 0.015f); + } else if (d_kytag12_cut_normal_check()) { + dKyw_plight_collision_set(&sp28, 1800, player->current.angle.y, 500.0f, 300.0f, + 1.0f, 150.0f, 0.3f); + } + } else if (i_this->field_0x576 != 0) { + i_this->field_0x576--; + } + } else { + i_this->field_0x576 = 0; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -197,12 +212,14 @@ static asm void daKytag12_light_swprd_proc(kytag12_class* param_0) { #include "asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_light_swprd_proc__FP13kytag12_class.s" } #pragma pop +#endif /* 8085BCD0-8085BD0C 000210 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/__dt__4cXyzFv.s" } @@ -605,6 +622,394 @@ SECTION_DATA static void* lit_4529[9] = { /* 8085BD0C-8085D1DC 00024C 14D0+00 2/1 0/0 0/0 .text * daKytag12_Execute_standard__FP13kytag12_class */ +// minor regalloc +#ifdef NONMATCHING +static int daKytag12_Execute_standard(kytag12_class* i_this) { + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + dKankyo_evil_Packet* temp_r25 = dKy_getEnvlight()->mpEvilPacket; + cXyz spB8; + cXyz spC4; + + f32 var_f30; + f32 var_f25; + f32 var_f29; + f32 var_f28; + + int var_r24 = 0; + int var_r23 = 0; + int var_r22 = 0; + int var_r21 = 0; + int var_r20 = 0; + int var_r19 = 0; + int spEC = 0; + int spE8 = 0; + + if (temp_r25 == NULL) { + return 1; + } + + cXyz spD0; + cXyz spDC; + cXyz spA8; + + for (int i = 0; i < g_env_light.field_0x1054; i++) { + EF_EVIL_EFF* effect_p = &temp_r25->mEffect[i]; + var_f29 = 1.0f; + + switch (effect_p->mStatus) { + case 0: + if (strcmp(dComIfGp_getStartStageName(), "D_MN08") == 0 && a_this->home.roomNo == 1 && + i < 400) + { + effect_p->mBasePos.x = cM_rndFX(30.0f) + -5200.0f; + effect_p->mBasePos.y = cM_rndF(2100.0f) + -700.0f; + effect_p->mBasePos.z = cM_rndFX(200.0f) + 5400.0f; + + effect_p->field_0x24 = 1.0f; + effect_p->field_0x38 = fabsf(var_f30) * 50.0f + 100.0f; + } else if (strcmp(dComIfGp_getStartStageName(), "D_MN08") == 0 && + a_this->home.roomNo == 1 && i >= 400 && i < 800) + { + effect_p->mBasePos.x = cM_rndFX(30.0f) + -2700.0f; + effect_p->mBasePos.y = cM_rndF(2100.0f) + -700.0f; + effect_p->mBasePos.z = cM_rndFX(200.0f) + 5400.0f; + + effect_p->field_0x24 = 1.0f; + effect_p->field_0x38 = fabsf(var_f30) * 50.0f + 100.0f; + } else if (strcmp(dComIfGp_getStartStageName(), "D_MN08") == 0 && + a_this->home.roomNo == 1 && i >= 800 && i < 1200) + { + effect_p->mBasePos.x = cM_rndFX(30.0f) + -2700.0f; + effect_p->mBasePos.y = cM_rndF(2100.0f) + -1100.0f; + effect_p->mBasePos.z = cM_rndFX(200.0f) + 3200.0f; + + effect_p->field_0x24 = 1.0f; + effect_p->field_0x38 = fabsf(var_f30) * 50.0f + 100.0f; + } else if (strcmp(dComIfGp_getStartStageName(), "D_MN08") == 0 && + a_this->home.roomNo == 1 && i >= 1200 && i < 1600) + { + effect_p->mBasePos.x = cM_rndFX(30.0f) + -5200.0f; + effect_p->mBasePos.y = cM_rndF(2100.0f) + -1100.0f; + effect_p->mBasePos.z = cM_rndFX(200.0f) + 3200.0f; + + effect_p->field_0x24 = 1.0f; + effect_p->field_0x38 = fabsf(var_f30) * 50.0f + 100.0f; + } else if (strcmp(dComIfGp_getStartStageName(), "D_MN08") == 0 && + a_this->home.roomNo == 11) + { + effect_p->mBasePos.x = cM_rndFX(1000.0f); + effect_p->mBasePos.y = cM_rndF(6700.0f) + -500.0f; + effect_p->mBasePos.z = cM_rndFX(10.0f) + -2828.0f; + + effect_p->field_0x24 = 1.0f; + effect_p->field_0x38 = fabsf(var_f30) * 50.0f + 100.0f; + } else { + f32 temp_f2; + switch (a_this->home.roomNo) { + case 2: + temp_f2 = -2.3f; + var_f28 = -0.5f; + var_f25 = 90.0f; + break; + case 4: + temp_f2 = -0.7f; + var_f28 = -2.0f; + var_f25 = 90.0f; + break; + case 5: + temp_f2 = -1.0f; + var_f28 = -1.0f; + var_f25 = 90.0f; + break; + case 7: + temp_f2 = -1.1f; + var_f28 = -0.0f; + var_f25 = 90.0f; + break; + case 8: + temp_f2 = 0.0f; + var_f28 = -2.3f; + var_f25 = 90.0f; + break; + default: + temp_f2 = 0.0f; + var_f28 = 0.0f; + var_f25 = 90.0f; + break; + } + + effect_p->mBasePos.x = + a_this->current.pos.x + cM_rndFX((a_this->scale.x + temp_f2) * 100.0f); + effect_p->mBasePos.y = + a_this->current.pos.y + cM_rndF(a_this->scale.y * 100.0f) + var_f25; + effect_p->mBasePos.z = + a_this->current.pos.z + cM_rndFX((a_this->scale.z + var_f28) * 100.0f); + + effect_p->field_0x24 = 1.0f; + a_this->current.pos.abs(effect_p->mBasePos); + effect_p->field_0x38 = fabsf(var_f30) * 50.0f + 100.0f; + } + + effect_p->field_0x2c = 0.0f; + effect_p->field_0x40 = 0; + effect_p->field_0x42 = 0; + effect_p->mStatus++; + /* fallthrough */ + case 1: + var_f30 = cM_ssin(effect_p->field_0x3c); + effect_p->field_0x3c += (((f32)(i & 31) * 6.8f) + 630.0f); + + f32 temp_f7 = cM_ssin(effect_p->field_0x3e); + effect_p->field_0x3e += (((f32)(i & 51) * 4.8) + 562.0); + + effect_p->mPosition.x = temp_f7 * 10.0f; + effect_p->mPosition.y = (var_f30 + 1.0f) * 13.0f; + effect_p->mPosition.z = temp_f7 * 9.0f; + + if (effect_p->field_0x38 < 9000.0f) { + if (g_env_light.field_0x1054 <= 500) { + effect_p->field_0x38 = temp_f7 * 10.0f + 85.0f; + } else if (a_this->home.roomNo == 11) { + effect_p->field_0x38 = (temp_f7 * 10.0f + 85.0f) * 1.5f; + } else { + effect_p->field_0x38 = (temp_f7 * 10.0f + 85.0f) * 0.6f; + } + } + break; + case 2: + spB8 = effect_p->mBasePos + effect_p->mPosition; + var_f29 = 0.0f; + + spC4.x = cM_rndFX(0.5f); + spC4.z = cM_rndFX(0.5f); + spC4.y = 1.0f; + + effect_p->mPosition.x += spC4.x * 25.0f; + effect_p->mPosition.y += spC4.y * 25.0f; + effect_p->mPosition.z += spC4.z * 25.0f; + + if (effect_p->field_0x38 > 4.0f) { + effect_p->field_0x38 -= 4.0f; + } + + if (effect_p->field_0x24 <= 0.0f) { + effect_p->mStatus = 1; + } + break; + } + + if (strcmp(dComIfGp_getStartStageName(), "D_MN08") == 0 && a_this->home.roomNo == 1 && + i < 1600) + { + effect_p->mBasePos.y += -8.0f; + + if (i >= 800) { + if (effect_p->mBasePos.y < -1200.0f) { + effect_p->mBasePos.y = 900.0f; + effect_p->mStatus = 1; + effect_p->field_0x24 = 1.0f; + } + } else if (effect_p->mBasePos.y < -780.0f) { + effect_p->mBasePos.y = 1400.0f; + effect_p->mStatus = 1; + effect_p->field_0x24 = 1.0f; + } + } else if (a_this->home.roomNo == 11) { + effect_p->mBasePos.y += cM_rndF(-5.0f) + -10.0f; + + if (effect_p->mBasePos.y < -500.0f) { + effect_p->mBasePos.y = 6200.0f; + effect_p->mStatus = 1; + effect_p->field_0x24 = 1.0f; + } + } + + for (int j = 0; j < 10; j++) { + if (g_env_light.mDalkmistInf[j] != NULL && + g_env_light.mDalkmistInf[j]->mPos.abs(effect_p->mBasePos) < + g_env_light.mDalkmistInf[j]->field_0xc + 100.0f) + { + if (effect_p->mStatus != 2 && effect_p->field_0x40 == 0 && var_r23 < 1) { + cXyz spF4; + spF4 = effect_p->mBasePos; + + mDoAud_seStart(Z2SE_OBJ_L8_B_FOG_FLY, &spF4, 0, 0); + var_r23++; + } + + effect_p->mStatus = 2; + effect_p->field_0x40 = 180; + break; + } + } + + spB8 = effect_p->mBasePos + effect_p->mPosition; + + if (player->current.pos.y - 100.0f < spB8.y && player->current.pos.y + 250.0f > spB8.y) { + spB8.y = player->current.pos.y; + + if (player->current.pos.abs(spB8) < 190.0f && var_f29 > 0.0f && + effect_p->field_0x40 == 0) + { + var_r22++; + } + } + + if (!daPy_py_c::i_checkNowWolf()) { + if (effect_p->field_0x38 >= 9000.0f) { + var_f29 = 0.0f; + } + + spB8 = effect_p->mBasePos + effect_p->mPosition; + spB8.y -= 100.0f; + + f32 sp34; + dKyw_pntlight_collision_get_info(&spB8, &spDC, &sp34); + + if (sp34 > 0.2f) { + if (effect_p->mStatus != 2 && effect_p->field_0x40 == 0 && var_r23 < 1) { + cXyz sp100; + sp100 = effect_p->mBasePos; + + mDoAud_seStart(Z2SE_OBJ_L8_B_FOG_FLY, &sp100, 0, 0); + var_r23++; + } + + effect_p->mStatus = 2; + effect_p->field_0x40 = 360; + } + + spB8 = effect_p->mBasePos + effect_p->mPosition; + + if (player->current.pos.y < spB8.y + 100.0f && + player->current.pos.y > spB8.y - 200.0f && effect_p->mStatus != 2) + { + spB8.y = player->current.pos.y; + + if (player->current.pos.abs(spB8) < 165.0f && var_f29 > 0.0f && + effect_p->field_0x24 >= 0.95f) + { + var_r24++; + } + } + } + + if (var_f29 <= 0.0f || effect_p->field_0x40 == 0) { + if (var_f29 <= 0.0f) { + cLib_addCalc(&effect_p->field_0x24, var_f29, 0.25f, 0.07f, 0.0001f); + } else if (temp_r25->mEffect[0].field_0x42 != 0) { + cLib_addCalc(&effect_p->field_0x24, 0.04f, 0.5f, 0.5f, 0.1f); + } else { + cLib_addCalc(&effect_p->field_0x24, var_f29, 0.1f, 0.01f, 0.001f); + } + } + + if (!dComIfGp_event_runCheck() && effect_p->field_0x40 != 0) { + effect_p->field_0x40--; + } + + if (effect_p->field_0x24 > 0.95f) { + if (strcmp(dComIfGp_getStartStageName(), "D_MN08") == 0 && a_this->home.roomNo == 1 && + i < 1600) + { + if (i < 400) { + var_r20++; + } else if (i >= 400 && i < 800) { + var_r19++; + } else if (i >= 800 && i < 1200) { + spEC++; + } else if (i >= 1200 && i < 1600) { + spE8++; + } + } else { + var_r21++; + } + } + } + + if (var_r24 != 0 && i_this->field_0x578 == 0) { + if (dComIfGp_roomControl_getStayNo() == 11 || dComIfGp_roomControl_getStayNo() == 1) { + i_this->field_0x578 = 60; + } else { + i_this->field_0x578 = 80; + } + } + + if (i_this->field_0x578 != 0 && i_this->field_0x578 <= 60) { + if (!daPy_py_c::i_checkNowWolf()) { + temp_r25->mEffect[0].field_0x42 = 45; + } + + if (player->checkMetamorphose()) { + i_this->field_0x578 = 0; + } else { + player->onForceWolfChange(); + } + } + + if (i_this->field_0x578 != 0) { + i_this->field_0x578--; + } + + if (temp_r25->mEffect[0].field_0x42 != 0) { + temp_r25->mEffect[0].field_0x42--; + } + + daKytag12_light_swprd_proc(i_this); + + g_env_light.mEvilInitialized &= 0x7F; + + if (daPy_py_c::i_checkNowWolf() && var_r22 > 0) { + g_env_light.mEvilInitialized |= 0x80; + } + + if (strcmp(dComIfGp_getStartStageName(), "D_MN08") == 0 && a_this->home.roomNo == 1) { + f32 temp = (f32)var_r20 / (f32)(g_env_light.field_0x1054 / 5); + i_this->field_0x57c[0].x = -5200.0f; + i_this->field_0x57c[0].y = player->current.pos.y; + i_this->field_0x57c[0].z = 5400.0f; + mDoAud_seStartLevel(Z2SE_OBJ_L8_B_FALL_S, &i_this->field_0x57c[0], temp * 100.0f, 0); + + f32 temp2 = (f32)var_r19 / (f32)(g_env_light.field_0x1054 / 5); + i_this->field_0x57c[1].x = -2700.0f; + i_this->field_0x57c[1].y = player->current.pos.y; + i_this->field_0x57c[1].z = 5400.0f; + mDoAud_seStartLevel(Z2SE_OBJ_L8_B_FALL_S, &i_this->field_0x57c[1], temp2 * 100.0f, 0); + + f32 temp3 = ((f32)spEC / (f32)(g_env_light.field_0x1054 / 5)); + i_this->field_0x57c[2].x = -2700.0f; + i_this->field_0x57c[2].y = player->current.pos.y; + i_this->field_0x57c[2].z = 3200.0f; + mDoAud_seStartLevel(Z2SE_OBJ_L8_B_FALL_S, &i_this->field_0x57c[2], temp3 * 100.0f, 0); + + f32 temp4 = ((f32)spE8 / (f32)(g_env_light.field_0x1054 / 5)); + i_this->field_0x57c[3].x = -5200.0f; + i_this->field_0x57c[3].y = player->current.pos.y; + i_this->field_0x57c[3].z = 3200.0f; + mDoAud_seStartLevel(Z2SE_OBJ_L8_B_FALL_S, &i_this->field_0x57c[3], temp4 * 100.0f, 0); + } + + if (a_this->home.roomNo != 11) { + f32 var_f1_4; + if (a_this->home.roomNo == 1) { + var_f1_4 = ((f32)var_r21 / (f32)(g_env_light.field_0x1054 / 5)); + } else { + var_f1_4 = ((f32)var_r21 / (f32)g_env_light.field_0x1054); + } + + mDoAud_seStartLevel(Z2SE_OBJ_L8_B_FOG_STAY, &a_this->current.pos, var_f1_4 * 100.0f, 0); + } else { + f32 temp = ((f32)var_r21 / (f32)g_env_light.field_0x1054); + i_this->field_0x57c[0].x = 0.0f; + i_this->field_0x57c[0].y = player->current.pos.y; + i_this->field_0x57c[0].z = -2828.0f; + mDoAud_seStartLevel(Z2SE_OBJ_L8_B_FALL_S, &i_this->field_0x57c[0], temp * 100.0f, 0); + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -613,6 +1018,7 @@ static asm void daKytag12_Execute_standard(kytag12_class* param_0) { #include "asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute_standard__FP13kytag12_class.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8085F00C-8085F010 00010C 0004+00 0/2 0/0 0/0 .rodata @4522 */ @@ -760,6 +1166,244 @@ COMPILER_STRIP_GATE(0x8085F064, &lit_4970); /* 8085D1DC-8085DFF0 00171C 0E14+00 1/1 0/0 0/0 .text daKytag12_Execute_arrival__FP13kytag12_class */ +// minor regalloc +#ifdef NONMATCHING +static int daKytag12_Execute_arrival(kytag12_class* i_this) { + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + dKankyo_evil_Packet* temp_r25 = dKy_getEnvlight()->mpEvilPacket; + + f32 var_f27; + f32 var_f22; + f32 var_f21; + + int var_r22 = 0; + int var_r21 = 0; + int var_r20 = 0; + int var_r19 = 0; + + if (temp_r25 == NULL) { + return 1; + } + + cXyz sp80; + cXyz sp8C; + + for (int i = 0; i < g_env_light.field_0x1054; i++) { + EF_EVIL_EFF* effect_p = &temp_r25->mEffect[i]; + var_f27 = 1.0f; + + var_f22 = cM_ssin(effect_p->field_0x3c); + effect_p->field_0x3c += ((f32)(i & 240) * 4.8f); + + var_f21 = cM_ssin(effect_p->field_0x3e); + effect_p->field_0x3e += ((f32)(i & 240) * 3.8); + + if (effect_p->field_0x38 < 9000.0f) { + if (a_this->home.roomNo == 2) { + effect_p->field_0x38 = (var_f21 * 10.0f + 85.0f) * 0.8f; + } else { + effect_p->field_0x38 = (var_f21 * 10.0f + 85.0f) * 0.6f; + } + } + + switch (effect_p->mStatus) { + case 0: + s16 temp_r3 = cM_rndF(0x10000); + + sp80.x = cM_rndFX(cM_ssin(temp_r3) * 1000.0f); + sp80.y = cM_rndF(100.0f); + sp80.z = cM_rndFX(cM_scos(temp_r3) * 1000.0f); + + effect_p->mBasePos.x = a_this->current.pos.x + sp80.x; + effect_p->mBasePos.y = a_this->current.pos.y + sp80.y + 35.0f; + effect_p->mBasePos.z = a_this->current.pos.z + sp80.z; + + effect_p->field_0x24 = 1.0f; + effect_p->field_0x38 = fabsf(var_f22) * 50.0f + 100.0f; + + effect_p->field_0x40 = 0; + effect_p->field_0x42 = 0; + effect_p->field_0x2c = 0.0f; + effect_p->mPosition.x = -sp80.x; + effect_p->mPosition.y = -sp80.y; + effect_p->mPosition.z = -sp80.z; + effect_p->mStatus++; + break; + case 1: + sp80.x = 0.0f; + sp80.y = effect_p->mPosition.y; + sp80.z = 0.0f; + + f32 var_f20 = effect_p->mPosition.abs(sp80); + if (var_f20 >= 20.0f) { + var_f20 -= 20.0f; + } else { + var_f20 = 0.0f; + } + + cLib_addCalc(&effect_p->mPosition.x, var_f21 * 20.0f, 0.1f, 20.0f, 0.01f); + cLib_addCalc(&effect_p->mPosition.y, + (var_f22 + 1.0f) * 20.0f + (var_f20 / 1000.0f) * 1000.0f, 0.5f, 32.0f, + 0.01f); + cLib_addCalc(&effect_p->mPosition.z, var_f21 * 20.0f, 0.1f, 10.0f, 0.01f); + break; + case 2: + effect_p->mPosition.x = var_f21 * 20.0f; + effect_p->mPosition.y = (var_f22 + 1.0f) * 20.0f; + effect_p->mPosition.z = var_f21 * 20.0f; + + if (strcmp(dComIfGp_getStartStageName(), "D_MN08") == 0 && a_this->home.roomNo == 1 && + i < 1600) + { + effect_p->mBasePos.y += cM_rndF(-4.0f) + -4.0f; + + if (i >= 800) { + if (effect_p->mBasePos.y < -1100.0f) { + effect_p->mBasePos.y = 900.0f; + } + } else if (effect_p->mBasePos.y < -680.0f) { + effect_p->mBasePos.y = 1400.0f; + } + } + break; + case 3: + sp80 = effect_p->mBasePos + effect_p->mPosition; + var_f27 = 0.0f; + + sp8C.x = cM_rndFX(0.5f); + sp8C.z = cM_rndFX(0.5f); + sp8C.y = 1.0f; + + effect_p->mPosition.x += sp8C.x * 25.0f; + effect_p->mPosition.y += sp8C.y * 25.0f; + effect_p->mPosition.z += sp8C.z * 25.0f; + + if (effect_p->field_0x38 > 4.0f) { + effect_p->field_0x38 -= 4.0f; + } + + if (effect_p->field_0x24 <= 0.0f) { + effect_p->mStatus = 2; + } + break; + } + + for (int j = 0; j < 10; j++) { + if (g_env_light.mDalkmistInf[j] != NULL && + g_env_light.mDalkmistInf[j]->mPos.abs(effect_p->mBasePos) < + g_env_light.mDalkmistInf[j]->field_0xc + 100.0f) + { + if (effect_p->mStatus != 3 && effect_p->field_0x40 == 0 && var_r21 < 1) { + sp80 = effect_p->mBasePos; + + mDoAud_seStart(Z2SE_OBJ_L8_B_FOG_FLY, &sp80, 0, 0); + var_r21++; + } + + effect_p->mStatus = 3; + effect_p->field_0x40 = 180; + break; + } + } + + sp80 = effect_p->mBasePos + effect_p->mPosition; + + if (player->current.pos.y - 100.0f < sp80.y && player->current.pos.y + 250.0f > sp80.y) { + sp80.y = player->current.pos.y; + + if (player->current.pos.abs(sp80) < 190.0f && var_f27 > 0.0f && + effect_p->field_0x24 >= 0.95f) + { + var_r20++; + } + } + + if (!daPy_py_c::i_checkNowWolf()) { + if (effect_p->field_0x38 >= 9000.0f) { + var_f27 = 0.0f; + } + + sp80 = effect_p->mBasePos + effect_p->mPosition; + cXyz sp98; + sp80.y -= 100.0f; + + f32 sp34; + dKyw_pntlight_collision_get_info(&sp80, &sp98, &sp34); + + if (sp34 > 0.2f) { + if (effect_p->mStatus != 3 && effect_p->field_0x40 == 0 && var_r21 < 1) { + cXyz spA4; + spA4 = effect_p->mBasePos; + + mDoAud_seStart(Z2SE_OBJ_L8_B_FOG_FLY, &spA4, 0, 0); + var_r21++; + } + + effect_p->mStatus = 3; + effect_p->field_0x40 = 360; + } + + sp80 = effect_p->mBasePos + effect_p->mPosition; + + if (player->current.pos.y - 100.0f < sp80.y && player->current.pos.y + 250.0f > sp80.y) + { + sp80.y = player->current.pos.y; + + if (player->current.pos.abs(sp80) < 40.0f && var_f27 > 0.0f && + effect_p->field_0x24 >= 0.95f && effect_p->mStatus != 3) + { + var_r22++; + } + } + } + + if (var_f27 <= 0.0f || effect_p->field_0x40 == 0) { + if (var_f27 <= 0.0f) { + cLib_addCalc(&effect_p->field_0x24, var_f27, 0.25f, 0.07f, 0.0001f); + } else { + cLib_addCalc(&effect_p->field_0x24, var_f27, 0.1f, 0.01f, 0.001f); + } + } + + if (!dComIfGp_event_runCheck() && effect_p->field_0x40 != 0) { + effect_p->field_0x40--; + } + + if (effect_p->field_0x24 > 0.95f) { + var_r19++; + } + } + + if (var_r22 != 0) { + if (dComIfGp_roomControl_getStayNo() == 11) { + i_this->field_0x578 = 60; + } else if (i_this->field_0x578 < 40) { + i_this->field_0x578++; + } + } else { + if (i_this->field_0x578 != 0) { + i_this->field_0x578--; + } + } + + if (i_this->field_0x578 >= 20 && !player->checkMetamorphose()) { + player->onForceWolfChange(); + } + + daKytag12_light_swprd_proc(i_this); + + g_env_light.mEvilInitialized &= 0x7F; + + if (daPy_py_c::i_checkNowWolf() && var_r20 > 0) { + g_env_light.mEvilInitialized |= 0x80; + } + + f32 temp = ((f32)var_r19 / (f32)g_env_light.field_0x1054); + mDoAud_seStartLevel(Z2SE_OBJ_L8_B_FALL_S, &i_this->current.pos, temp * 100.0f, 0); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -768,6 +1412,7 @@ static asm void daKytag12_Execute_arrival(kytag12_class* param_0) { #include "asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute_arrival__FP13kytag12_class.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8085F068-8085F06C 000168 0004+00 0/1 0/0 0/0 .rodata @5266 */ @@ -1002,6 +1647,278 @@ COMPILER_STRIP_GATE(0x8085F0E8, &lit_5298); #pragma pop /* 8085DFF0-8085ED48 002530 0D58+00 1/1 0/0 0/0 .text daKytag12_Execute_R00__FP13kytag12_class */ +// matches with literals +#ifdef NONMATCHING +static int daKytag12_Execute_R00(kytag12_class* i_this) { + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + dKankyo_evil_Packet* temp_r25 = dKy_getEnvlight()->mpEvilPacket; + + f32 var_f26; + f32 var_f25; + + int var_r24 = 0; + + if (temp_r25 == NULL) { + return 1; + } + + cXyz sp80; + cXyz sp8C; + cXyz sp98; + + for (int i = 0; i < g_env_light.field_0x1054; i++) { + EF_EVIL_EFF* effect_p = &temp_r25->mEffect[i]; + var_f25 = 1.0f; + + switch (effect_p->mStatus) { + case 0: + if (i < 500) { + effect_p->mBasePos.x = a_this->current.pos.x + cM_rndFX(550.0f); + effect_p->mBasePos.y = cM_rndF(5900.0f) + -3000.0f; + effect_p->mBasePos.z = a_this->current.pos.z + cM_rndFX(80.0f); + + effect_p->field_0x24 = 1.0f; + effect_p->field_0x38 = fabsf(var_f26) * 50.0f + 100.0f; + } else if (i >= 500 && i < 1000) { + effect_p->mBasePos.x = cM_rndFX(250.0f) + 244.0f; + effect_p->mBasePos.y = cM_rndF(4100.0f) + 2951.0f; + effect_p->mBasePos.z = cM_rndFX(50.0f) + 2206.0f; + + effect_p->field_0x24 = 1.0f; + effect_p->field_0x38 = fabsf(var_f26) * 50.0f + 100.0f; + } else if (i >= 1000 && i < 1500) { + effect_p->mBasePos.y = cM_rndFX(6800.0f) + -3200.0f; + effect_p->mBasePos.z = cM_rndF(480.0f) + 5350.0f; + + f32 temp_f2 = (effect_p->mBasePos.y / 1000.0f); + temp_f2 = temp_f2; // fake match? idk how else to fix instruction order + effect_p->mBasePos.x = temp_f2 * -200.0f + -3000.0f; + + effect_p->field_0x24 = 1.0f; + effect_p->field_0x38 = fabsf(var_f26) * 50.0f + 100.0f; + } else if (i >= 1500 && i < 2000) { + effect_p->mBasePos.y = cM_rndFX(6800.0f) + -3200.0f; + effect_p->mBasePos.z = cM_rndF(510.0f) + 5300.0f; + + f32 temp_f2 = (effect_p->mBasePos.y / 1000.0f); + temp_f2 = temp_f2; // fake match? idk how else to fix instruction order + effect_p->mBasePos.x = temp_f2 * -200.0f + -3400.0f; + + effect_p->field_0x24 = 1.0f; + effect_p->field_0x38 = fabsf(var_f26) * 50.0f + 100.0f; + } else { + effect_p->mBasePos.x = cM_rndFX(650.0f); + effect_p->mBasePos.y = cM_rndF(3000.0f); + effect_p->mBasePos.z = cM_rndFX(100.0f); + + effect_p->field_0x24 = 1.0f; + effect_p->field_0x38 = fabsf(var_f26) * 50.0f + 100.0f; + } + + effect_p->field_0x40 = 0; + effect_p->field_0x2c = 0.0f; + effect_p->mStatus++; + /* fallthrough */ + case 1: + var_f26 = cM_ssin(effect_p->field_0x3c); + effect_p->field_0x3c += ((f32)(i & 240) * 4.8f); + + f32 temp_f7 = cM_ssin(effect_p->field_0x3e); + effect_p->field_0x3e += ((f32)(i & 240) * 3.8); + + effect_p->mPosition.x = temp_f7 * 20.0f; + effect_p->mPosition.y = (var_f26 + 1.0f) * 20.0f; + effect_p->mPosition.z = temp_f7 * 20.0f; + + if (effect_p->field_0x38 < 9000.0f) { + effect_p->field_0x38 = (temp_f7 * 10.0f + 85.0f) * 1.5f; + } + break; + case 2: + sp80 = effect_p->mBasePos + effect_p->mPosition; + var_f25 = 0.0f; + + sp8C.x = cM_rndFX(0.5f); + sp8C.z = cM_rndFX(0.5f); + sp8C.y = 1.0f; + + effect_p->mPosition.x += sp8C.x * 40.0f; + effect_p->mPosition.y += sp8C.y * 40.0f; + effect_p->mPosition.z += sp8C.z * 40.0f; + + if (effect_p->field_0x38 > 4.0f) { + effect_p->field_0x38 -= 4.0f; + } + + if (effect_p->field_0x24 <= 0.0f && effect_p->field_0x40 == 0) { + effect_p->mStatus = 1; + } + break; + } + + effect_p->mBasePos.y -= ((f32)i / (f32)g_env_light.field_0x1054) * 10.0f + 15.0f; + + if (i < 500) { + if (effect_p->mBasePos.y < -3000.0f) { + effect_p->mBasePos.y = 2900.0f; + effect_p->field_0x24 = 0.0f; + effect_p->mStatus = 1; + } + } else if (i >= 500 && i < 1000) { + if (effect_p->mBasePos.y < 2951.0f) { + effect_p->mBasePos.y = 7000.0f; + effect_p->field_0x24 = 0.0f; + effect_p->mStatus = 1; + } + } else if (i >= 1000 && i < 1500) { + if (effect_p->mBasePos.y < -3800.0f) { + effect_p->mBasePos.y = 2800.0f; + effect_p->field_0x24 = 0.0f; + effect_p->mStatus = 1; + } + + f32 temp_f2 = (effect_p->mBasePos.y / 1000.0f); + temp_f2 = temp_f2; // fake match? idk how else to fix instruction order + effect_p->mBasePos.x = temp_f2 * -200.0f + -3000.0f; + + if (effect_p->mBasePos.y < -680.0f) { + f32 temp_f2 = (effect_p->mBasePos.y / 1000.0f); + temp_f2 = temp_f2; // fake match? idk how else to fix instruction order + effect_p->mBasePos.x = temp_f2 * -20.0f + -2250.0f; + } else if (effect_p->mBasePos.y < 0.0f) { + f32 temp_f2 = (effect_p->mBasePos.y / 1000.0f); + temp_f2 = temp_f2; // fake match? idk how else to fix instruction order + effect_p->mBasePos.x = temp_f2 * -1160.0f + -3000.0f; + effect_p->mBasePos.y += 10.0f; + } + } else if (i >= 1500 && i < 2000) { + if (effect_p->mBasePos.y < -3800.0f) { + effect_p->mBasePos.y = 2800.0f; + effect_p->field_0x24 = 0.0f; + effect_p->mStatus = 1; + } + + f32 temp_f2 = (effect_p->mBasePos.y / 1000.0f); + temp_f2 = temp_f2; // fake match? idk how else to fix instruction order + effect_p->mBasePos.x = temp_f2 * 200.0f + 3400.0f; + + if (effect_p->mBasePos.y < -380.0f) { + f32 temp_f2 = (effect_p->mBasePos.y / 1000.0f); + temp_f2 = temp_f2; // fake match? idk how else to fix instruction order + effect_p->mBasePos.x = temp_f2 * -20.0f + 2700.0f; + } else if (effect_p->mBasePos.y < 200.0f) { + f32 temp_f2 = (effect_p->mBasePos.y / -800.0f); + temp_f2 = temp_f2; // fake match? idk how else to fix instruction order + effect_p->mBasePos.x = temp_f2 * -1060.0f + 3200.0f; + effect_p->mBasePos.y += 10.0f; + } + } + + if (i_this->field_0x575 == 0 && player->current.pos.z < 2700.0f && + player->current.pos.z > 2600.0f) + { + player->current.pos.z = 2650.0f; + } + + sp80 = effect_p->mBasePos + effect_p->mPosition; + sp80.y = player->current.pos.y; + + if (player->current.pos.abs(sp80) < 600.0f && + dComIfGs_getSelectEquipSword() == LIGHT_SWORD && player->getCutType() != 0 && + d_kytag12_cut_turn_check()) + { + i_this->field_0x575 = 1; + } + + if (i_this->field_0x575 == 1) { + mDoAud_seStartLevel(Z2SE_OBJ_L8_B_FALL_S, &sp80, 0, 0); + i_this->field_0x575 = 2; + effect_p->mStatus = 2; + effect_p->field_0x40 = 360; + } + + for (int j = 0; j < 10; j++) { + if (g_env_light.mDalkmistInf[j] != NULL && + g_env_light.mDalkmistInf[j]->mPos.abs(effect_p->mBasePos) < + g_env_light.mDalkmistInf[j]->field_0xc + 100.0f) + { + if (effect_p->mStatus != 2 && effect_p->field_0x40 == 0 && var_r24 < 1) { + cXyz spA4; + spA4 = effect_p->mBasePos; + + var_r24++; + } + + effect_p->mStatus = 2; + effect_p->field_0x40 = 180; + break; + } + } + + if (!daPy_py_c::i_checkNowWolf()) { + if (effect_p->field_0x38 >= 9000.0f) { + var_f25 = 0.0f; + } + + sp80 = effect_p->mBasePos + effect_p->mPosition; + cXyz spB0; + sp80.y -= 100.0f; + + f32 sp34; + dKyw_pntlight_collision_get_info(&sp80, &spB0, &sp34); + + if (sp34 > 0.2f) { + if (effect_p->mStatus != 2 && effect_p->field_0x40 == 0 && var_r24 < 1) { + cXyz spBC; + spBC = effect_p->mBasePos; + + mDoAud_seStart(Z2SE_OBJ_L8_B_FOG_FLY, &spBC, 0, 0); + var_r24++; + } + + effect_p->mStatus = 2; + effect_p->field_0x40 = 360; + } + } + + if (var_f25 <= 0.0f) { + cLib_addCalc(&effect_p->field_0x24, var_f25, 0.25f, 0.07f, 0.0001f); + } else { + cLib_addCalc(&effect_p->field_0x24, var_f25, 0.25f, 0.1f, 0.0001f); + } + + if (effect_p->field_0x40 != 0) { + effect_p->field_0x40--; + + if (effect_p->field_0x40 == 0) { + i_this->field_0x575 = 0; + } + } + } + + i_this->field_0x578 = 0; + + daKytag12_light_swprd_proc(i_this); + + i_this->field_0x57c[0].y = player->current.pos.y; + i_this->field_0x57c[1].y = player->current.pos.y; + i_this->field_0x57c[2].y = player->current.pos.y; + i_this->field_0x57c[0].x = a_this->current.pos.x; + i_this->field_0x57c[0].z = a_this->current.pos.z; + + mDoAud_seStartLevel(Z2SE_OBJ_L8_B_FALL_L, &i_this->field_0x57c[0], 100, 0); + + i_this->field_0x57c[1].x = -3000.0f; + i_this->field_0x57c[1].z = 5350.0f; + mDoAud_seStartLevel(Z2SE_OBJ_L8_B_FALL_L, &i_this->field_0x57c[1], 100, 0); + + i_this->field_0x57c[2].x = 3400.0f; + i_this->field_0x57c[2].z = 5300.0f; + mDoAud_seStartLevel(Z2SE_OBJ_L8_B_FALL_L, &i_this->field_0x57c[2], 100, 0); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1010,45 +1927,88 @@ static asm void daKytag12_Execute_R00(kytag12_class* param_0) { #include "asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute_R00__FP13kytag12_class.s" } #pragma pop +#endif /* 8085ED48-8085EE28 003288 00E0+00 1/0 0/0 0/0 .text daKytag12_Execute__FP13kytag12_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag12_Execute(kytag12_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute__FP13kytag12_class.s" +static int daKytag12_Execute(kytag12_class* i_this) { + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + + if (g_env_light.field_0x1051 != a_this->home.roomNo) { + return 0; + } + + switch (a_this->home.roomNo) { + case 0: + case 1: + g_env_light.field_0x1054 = 2000; + break; + case 2: + g_env_light.field_0x1054 = 500; + break; + case 11: + case 0x33: + case 0x34: + g_env_light.field_0x1054 = 1000; + break; + default: + g_env_light.field_0x1054 = 500; + break; + } + + if (i_this->field_0x574 == 1) { + daKytag12_Execute_arrival(i_this); + } else if (i_this->field_0x574 == 2) { + daKytag12_Execute_R00(i_this); + } else { + daKytag12_Execute_standard(i_this); + } + + return 1; } -#pragma pop /* 8085EE28-8085EE30 003368 0008+00 1/0 0/0 0/0 .text daKytag12_IsDelete__FP13kytag12_class */ -static bool daKytag12_IsDelete(kytag12_class* param_0) { - return true; +static int daKytag12_IsDelete(kytag12_class* i_this) { + return 1; } /* 8085EE30-8085EE48 003370 0018+00 1/0 0/0 0/0 .text daKytag12_Delete__FP13kytag12_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag12_Delete(kytag12_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Delete__FP13kytag12_class.s" +static int daKytag12_Delete(kytag12_class* i_this) { + g_env_light.field_0x1054 = 0; + return 1; } -#pragma pop /* 8085EE48-8085EEF4 003388 00AC+00 1/0 0/0 0/0 .text daKytag12_Create__FP10fopAc_ac_c */ +// matches with weak order +#ifdef NONMATCHING +static int daKytag12_Create(fopAc_ac_c* i_this) { + kytag12_class* a_this = (kytag12_class*)i_this; + fopAcM_SetupActor(a_this, kytag12_class); + + a_this->field_0x574 = fopAcM_GetParam(i_this); + a_this->field_0x576 = 0; + a_this->field_0x578 = 0; + a_this->field_0x575 = 0; + + g_env_light.field_0x1054 = 0; + g_env_light.field_0x1051 = i_this->home.roomNo; + dKyr_evil_init(); + return cPhs_COMPLEATE_e; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void daKytag12_Create(fopAc_ac_c* param_0) { +static asm int daKytag12_Create(fopAc_ac_c* param_0) { nofralloc #include "asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Create__FP10fopAc_ac_c.s" } #pragma pop +#endif /* 8085EEF4-8085EEF8 003434 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +extern "C" void __ct__4cXyzFv() { /* empty function */ } @@ -1074,5 +2034,3 @@ SECTION_DATA extern void* g_profile_KYTAG12[12] = { (void*)0x006A0000, (void*)&l_daKytag12_Method, (void*)0x00044000, (void*)NULL, }; - -/* 8085F0EC-8085F0EC 0001EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp b/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp index 5bef1917fc..8070122766 100644 --- a/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp +++ b/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp @@ -1,62 +1,28 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_kytag13 -// +/** + * d_a_kytag13.cpp + * Blowing Snow Tag + */ #include "rel/d/a/kytag/d_a_kytag13/d_a_kytag13.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" +#include "d/kankyo/d_kankyo_rain.h" #include "dol2asm.h" // // Types: // -struct mDoMtx_stack_c { - static u8 now[48]; +class kytag13_class : public fopAc_ac_c { +public: + /* 0x568 */ u8 field_0x568[0x574 - 0x568]; + /* 0x574 */ f32 mSpeed; + /* 0x578 */ u16 mMax; + /* 0x57A */ u8 field_0x57a; + /* 0x57C */ u16 field_0x57c; + /* 0x57E */ u16 field_0x57e; }; -struct kytag13_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk_All { - /* 800778E8 */ ~dBgS_ObjGndChk_All(); -}; - -struct dBgS_ObjGndChk { - /* 80860148 */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct cXyz {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct DOUBLE_POS {}; - // // Forward References: // @@ -98,22 +64,11 @@ extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); extern "C" void cM3d_VectorProduct2d__Fffffff(); extern "C" void cLib_addCalc__FPfffff(); extern "C" void __dl__FPv(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareDistance(); extern "C" void _savegpr_21(); extern "C" void _restgpr_21(); -extern "C" void strcmp(); -extern "C" void sqrt(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: @@ -121,8 +76,8 @@ extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; /* 8085F1F8-8085F200 000078 0008+00 1/0 0/0 0/0 .text daKytag13_Draw__FP13kytag13_class */ -static bool daKytag13_Draw(kytag13_class* param_0) { - return true; +static int daKytag13_Draw(kytag13_class* i_this) { + return 1; } /* ############################################################################################## */ @@ -143,14 +98,30 @@ COMPILER_STRIP_GATE(0x80860478, &lit_3784); /* 8085F200-8085F2B0 000080 00B0+00 1/1 0/0 0/0 .text vectle_calc__FP10DOUBLE_POSP4cXyz */ +// matches with literals +#ifdef NONMATCHING +static void vectle_calc(DOUBLE_POS* pos, cXyz* out) { + f64 len = sqrt(pos->x * pos->x + pos->y * pos->y + pos->z * pos->z); + if (0.0 != len) { + out->x = pos->x / len; + out->y = pos->y / len; + out->z = pos->z / len; + } else { + out->x = 0.0f; + out->y = 0.0f; + out->z = 0.0f; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void vectle_calc(DOUBLE_POS* param_0, cXyz* param_1) { +static asm void vectle_calc(DOUBLE_POS* i_this, cXyz* param_1) { nofralloc #include "asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/vectle_calc__FP10DOUBLE_POSP4cXyz.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8086047C-80860480 00000C 0004+00 0/1 0/0 0/0 .rodata @4177 */ @@ -494,66 +465,422 @@ SECTION_DATA extern void* __vt__14dBgS_ObjGndChk[12] = { /* 8085F2B0-80860148 000130 0E98+00 1/1 0/0 0/0 .text * daKytag13_Execute_standard__FP13kytag13_class */ +// some regalloc +#ifdef NONMATCHING +static int daKytag13_Execute_standard(kytag13_class* i_this) { + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + dKankyo_snow_Packet* snow_packet = g_env_light.mpSnowPacket; + camera_class* camera = dComIfGp_getCamera(0); + fopAc_ac_c* player = dComIfGp_getPlayer(0); + DOUBLE_POS sp88; + cXyz sp7C; + cXyz sp70; + + cXyz sp64 = dKyw_get_wind_vecpow(); + cXyz sp60; + + cXyz sp4C; + cXyz sp40; + + dBgS_ObjGndChk_All spA0; + cXyz sp34; + + if (snow_packet == NULL) { + return 1; + } + + sp34 = player->current.pos; + sp34.y += 100.0f; + spA0.SetPos(&sp34); + + f32 temp_f30 = dComIfG_Bgsp().GroundCross(&spA0); + temp_f30 += 5.0f; + f32 var_f29; + f32 var_f28; + + f32 temp_f27 = a_this->current.pos.y; + + if (i_this->field_0x57a != 0xFF) { + s32 roomNo = dComIfGp_roomControl_getStayNo(); + if (!dComIfGs_isSwitch(i_this->field_0x57a, roomNo)) { + g_env_light.field_0xe90 = 0; + } + } + + snow_packet->field_0x6d74 = camera->mLookat.mEye; + sp7C.z = 0.0f; + sp7C.y = 0.0f; + sp7C.x = 0.0f; + + cXyz* temp_r27 = dKyw_get_wind_vec(); + f32 temp_f31 = dKyw_get_wind_pow(); + + sp4C.x = 0.0f; + sp4C.y = 1000.0f * a_this->scale.y; + sp4C.z = 0.0f; + + mDoMtx_stack_c::transS(a_this->current.pos.x, a_this->current.pos.y, a_this->current.pos.z); + mDoMtx_stack_c::ZrotM(a_this->current.angle.z); + mDoMtx_stack_c::YrotM(a_this->current.angle.y); + mDoMtx_stack_c::XrotM(a_this->current.angle.x); + mDoMtx_stack_c::multVec(&sp4C, &sp40); + + sp70 = *temp_r27; + + dKyr_get_vectle_calc(&sp40, &a_this->current.pos, &sp64); + + sp88.x = camera->mLookat.mCenter.x - camera->mLookat.mEye.x; + sp88.y = 0.0; + sp88.z = camera->mLookat.mCenter.z - camera->mLookat.mEye.z; + + cXyz sp28; + vectle_calc(&sp88, &sp28); + + snow_packet->field_0x6d84 = cM3d_VectorProduct2d(0.0f, 0.0f, -sp70.x, -sp70.z, sp28.x, sp28.z); + + f32 tmp = fabsf((sp70.x * sp28.x) + (sp70.z * sp28.z)); + snow_packet->field_0x6d80 = (1.0f - tmp) * temp_f31 * (1.0f - fabsf(0.3f + sp70.y)); + snow_packet->field_0x6d80 *= fabsf(snow_packet->field_0x6d84); + + for (int i = i_this->field_0x57e - 1; i >= i_this->field_0x57c; i--) { + if (strcmp(dComIfGp_getStartStageName(), "D_MN11") == 0 && + dComIfGp_roomControl_getStayNo() == 0 && i == 100) + { + sp64.x = -0.0f; + sp64.y = -0.3f; + sp64.z = -0.4f; + } + + f32 temp_f28 = -(0.2f + cM_rndF(1.0f)); + + switch (snow_packet->mSnowEff[i].mStatus) { + case 0: + snow_packet->mSnowEff[i].mWindSpeed = (4.0f * i_this->field_0x574) + cM_rndF(6.0f); + snow_packet->mSnowEff[i].mGravity = temp_f28; + snow_packet->mSnowEff[i].mTimer = 0; + snow_packet->mSnowEff[i].mPosition.x = sp40.x + cM_rndFX(500.0f * a_this->scale.x); + snow_packet->mSnowEff[i].mPosition.y = sp40.y - cM_rndF(1000.0f * a_this->scale.y); + snow_packet->mSnowEff[i].mPosition.z = sp40.z + cM_rndFX(500.0f * a_this->scale.z); + snow_packet->mSnowEff[i].mBasePos.x = sp40.x + cM_rndFX(500.0f * a_this->scale.x); + snow_packet->mSnowEff[i].mBasePos.y = sp40.y - cM_rndF(1000.0f * a_this->scale.y); + snow_packet->mSnowEff[i].mBasePos.z = sp40.z + cM_rndFX(500.0f * a_this->scale.z); + snow_packet->mSnowEff[i].mScale = 1.0f; + snow_packet->mSnowEff[i].field_0x30 = 1.0f; + snow_packet->mSnowEff[i].mPosWaveX = cM_rndF(0xFFFF); + snow_packet->mSnowEff[i].mPosWaveZ = cM_rndF(0xFFFF); + snow_packet->mSnowEff[i].mStatus = 1; + + if (strcmp(dComIfGp_getStartStageName(), "D_MN11") == 0 && + dComIfGp_roomControl_getStayNo() == 0) + { + if (i < 25) { + snow_packet->mSnowEff[i].mBasePos.x = + 1680.0f + cM_rndFX(200.0f * a_this->scale.x); + snow_packet->mSnowEff[i].mBasePos.y = + 1630.0f - cM_rndF(1630.0f * a_this->scale.y); + snow_packet->mSnowEff[i].mBasePos.z = + 4280.0f + cM_rndFX(100.0f * a_this->scale.z); + } else if (i < 50) { + snow_packet->mSnowEff[i].mBasePos.x = + -1680.0f + cM_rndFX(200.0f * a_this->scale.x); + snow_packet->mSnowEff[i].mBasePos.y = + 1630.0f - cM_rndF(1630.0f * a_this->scale.y); + snow_packet->mSnowEff[i].mBasePos.z = + 4280.0f + cM_rndFX(100.0f * a_this->scale.z); + } else if (i < 75) { + snow_packet->mSnowEff[i].mBasePos.x = cM_rndFX(500.0f * a_this->scale.x); + snow_packet->mSnowEff[i].mBasePos.y = + 1680.0f - cM_rndF(1680.0f * a_this->scale.y); + snow_packet->mSnowEff[i].mBasePos.z = + 5000.0f + cM_rndFX(100.0f * a_this->scale.z); + } else if (i < 100) { + snow_packet->mSnowEff[i].mBasePos.x = cM_rndFX(500.0f * a_this->scale.x); + snow_packet->mSnowEff[i].mBasePos.y = + 750.0f - cM_rndF(750.0f * a_this->scale.y); + snow_packet->mSnowEff[i].mBasePos.z = + 7110.0f + cM_rndFX(100.0f * a_this->scale.z); + } + } + break; + case 1: + case 2: + var_f28 = temp_f27; + var_f29 = temp_f27; + + if (dComIfGp_roomControl_getStayNo() == 0) { + var_f28 = -22.0f; + var_f29 = -22.0f; + } else if (dComIfGp_roomControl_getStayNo() == 6) { + var_f28 = 950.0f; + var_f29 = 950.0f; + } else if (dComIfGp_roomControl_getStayNo() == 3) { + var_f28 = -22.0f; + var_f29 = -22.0f; + } else if (dComIfGp_roomControl_getStayNo() == 9) { + var_f28 = -50.0f; + var_f29 = -50.0f; + } else if (dComIfGp_roomControl_getStayNo() == 13) { + var_f28 = 0.0f; + var_f29 = 0.0f; + } + + if (camera->mLookat.mEye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f) { + var_f28 = temp_f30; + } + + if (camera->mLookat.mEye.abs(snow_packet->mSnowEff[i].mBasePos) < 500.0f) { + var_f29 = temp_f30; + } + + cLib_addCalc(&snow_packet->mSnowEff[i].mWindSpeed, + snow_packet->mSnowEff[i].mWindSpeed - cM_rndFX(0.08f), 0.5f, 0.1f, 0.01f); + + cXyz sp1C; + if (snow_packet->mSnowEff[i].mPosition.y > var_f28) { + s16 temp_r4_2 = snow_packet->mSnowEff[i].mPosWaveX; + s16 temp_r5_2 = snow_packet->mSnowEff[i].mPosWaveZ; + + sp1C.x = cM_scos(temp_r4_2) * cM_ssin(temp_r5_2); + sp1C.y = cM_ssin(temp_r4_2); + sp1C.z = cM_scos(temp_r4_2) * cM_scos(temp_r5_2); + + snow_packet->mSnowEff[i].mPosition.x += + (sp64.x * snow_packet->mSnowEff[i].mWindSpeed); + snow_packet->mSnowEff[i].mPosition.z += + (sp64.z * snow_packet->mSnowEff[i].mWindSpeed); + snow_packet->mSnowEff[i].mPosition.y += + (snow_packet->mSnowEff[i].mGravity + + (sp64.y * snow_packet->mSnowEff[i].mWindSpeed)); + + snow_packet->mSnowEff[i].mPosition.x += (3.7f * sp1C.x); + snow_packet->mSnowEff[i].mPosition.y += (3.7f * sp1C.y); + snow_packet->mSnowEff[i].mPosition.z += (3.7f * sp1C.z); + } + + if (snow_packet->mSnowEff[i].mBasePos.y > var_f29) { + snow_packet->mSnowEff[i].mBasePos.x += + (sp64.x * snow_packet->mSnowEff[i].mWindSpeed); + snow_packet->mSnowEff[i].mBasePos.z += + (sp64.z * snow_packet->mSnowEff[i].mWindSpeed); + snow_packet->mSnowEff[i].mBasePos.y += + (snow_packet->mSnowEff[i].mGravity + + (sp64.y * snow_packet->mSnowEff[i].mWindSpeed)); + + snow_packet->mSnowEff[i].mBasePos.x += (3.0f * sp1C.x); + snow_packet->mSnowEff[i].mBasePos.y += (3.0f * sp1C.y); + snow_packet->mSnowEff[i].mBasePos.z += (3.0f * sp1C.z); + } + + cLib_addCalc(&snow_packet->mSnowEff[i].mPosWaveX, + snow_packet->mSnowEff[i].mPosWaveX + cM_rndF(3000.0f), 0.25f, 1500.0f, + 0.001f); + cLib_addCalc(&snow_packet->mSnowEff[i].mPosWaveZ, + snow_packet->mSnowEff[i].mPosWaveZ + cM_rndF(3000.0f), 0.25f, 1500.0f, + 0.001f); + + sp60.y = snow_packet->mSnowEff[i].mPosition.y; + if (sp60.y < var_f28) { + snow_packet->mSnowEff[i].mPosition.y = var_f28; + snow_packet->mSnowEff[i].mStatus = 2; + } + + sp60.y = snow_packet->mSnowEff[i].mBasePos.y; + if (sp60.y < var_f29) { + snow_packet->mSnowEff[i].mBasePos.y = var_f29; + snow_packet->mSnowEff[i].mStatus = 2; + } + + if (snow_packet->mSnowEff[i].mPosition.y == var_f28) { + cLib_addCalc(&snow_packet->mSnowEff[i].mScale, 0.0f, 0.25f, 0.05f, 0.0001f); + + if (snow_packet->mSnowEff[i].mScale <= 0.0001f) { + snow_packet->mSnowEff[i].mPosition.x = + sp40.x + cM_rndFX(500.0f * a_this->scale.x); + snow_packet->mSnowEff[i].mPosition.y = + sp40.y - cM_rndF(10.0f * a_this->scale.y); + snow_packet->mSnowEff[i].mPosition.z = + sp40.z + cM_rndFX(500.0f * a_this->scale.z); + snow_packet->mSnowEff[i].mStatus = 1; + } + } else { + snow_packet->mSnowEff[i].mScale = (f32)0.5f; + } + + if (snow_packet->mSnowEff[i].mBasePos.y == var_f29) { + cLib_addCalc(&snow_packet->mSnowEff[i].field_0x30, 0.0f, 0.25f, 0.05f, 0.0001f); + + if (snow_packet->mSnowEff[i].field_0x30 <= 0.0001f) { + snow_packet->mSnowEff[i].mBasePos.x = + sp40.x + cM_rndFX(500.0f * a_this->scale.x); + snow_packet->mSnowEff[i].mBasePos.y = sp40.y - cM_rndF(10.0f * a_this->scale.y); + snow_packet->mSnowEff[i].mBasePos.z = + sp40.z + cM_rndFX(500.0f * a_this->scale.z); + + if (strcmp(dComIfGp_getStartStageName(), "D_MN11") == 0 && + dComIfGp_roomControl_getStayNo() == 0) + { + if (i < 20) { + snow_packet->mSnowEff[i].mBasePos.x = + 1680.0f + cM_rndFX(200.0f * a_this->scale.x); + snow_packet->mSnowEff[i].mBasePos.y = + 1630.0f - cM_rndF(10.0f * a_this->scale.y); + snow_packet->mSnowEff[i].mBasePos.z = + 4280.0f + cM_rndFX(200.0f * a_this->scale.z); + } else if (i < 50) { + snow_packet->mSnowEff[i].mBasePos.x = + -1680.0f + cM_rndFX(200.0f * a_this->scale.x); + snow_packet->mSnowEff[i].mBasePos.y = + 1630.0f - cM_rndF(10.0f * a_this->scale.y); + snow_packet->mSnowEff[i].mBasePos.z = + 4280.0f + cM_rndFX(100.0f * a_this->scale.z); + } else if (i < 75) { + snow_packet->mSnowEff[i].mBasePos.x = + cM_rndFX(500.0f * a_this->scale.x); + snow_packet->mSnowEff[i].mBasePos.y = + 1680.0f - cM_rndF(10.0f * a_this->scale.y); + snow_packet->mSnowEff[i].mBasePos.z = + 5000.0f + cM_rndFX(100.0f * a_this->scale.z); + } else if (i < 100) { + snow_packet->mSnowEff[i].mBasePos.x = + cM_rndFX(500.0f * a_this->scale.x); + snow_packet->mSnowEff[i].mBasePos.y = + 750.0f - cM_rndF(10.0f * a_this->scale.y); + snow_packet->mSnowEff[i].mBasePos.z = + 7110.0f + cM_rndFX(100.0f * a_this->scale.z); + } + } + snow_packet->mSnowEff[i].mStatus = 1; + } + } else { + snow_packet->mSnowEff[i].field_0x30 = 0.5f; + } + break; + } + + if (dComIfGp_roomControl_getStayNo() == 5) { + if (snow_packet->mSnowEff[i].mBasePos.z > -5560.0f && + snow_packet->mSnowEff[i].mBasePos.y < 925.0f) + { + snow_packet->mSnowEff[i].field_0x30 = 0.0f; + } + if (snow_packet->mSnowEff[i].mPosition.z > -5560.0f && + snow_packet->mSnowEff[i].mPosition.y < 925.0f) + { + snow_packet->mSnowEff[i].mScale = 0.0f; + } + } + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void daKytag13_Execute_standard(kytag13_class* param_0) { +static asm void daKytag13_Execute_standard(kytag13_class* i_this) { nofralloc #include "asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute_standard__FP13kytag13_class.s" } #pragma pop +#endif /* 80860148-808601C0 000FC8 0078+00 4/3 0/0 0/0 .text __dt__14dBgS_ObjGndChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/__dt__14dBgS_ObjGndChkFv.s" } #pragma pop /* 808601C0-80860200 001040 0040+00 1/0 0/0 0/0 .text daKytag13_Execute__FP13kytag13_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag13_Execute(kytag13_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute__FP13kytag13_class.s" +static int daKytag13_Execute(kytag13_class* i_this) { + if (i_this->home.roomNo == dComIfGp_roomControl_getStayNo()) { + daKytag13_Execute_standard(i_this); + } + + return 1; } -#pragma pop /* 80860200-80860208 001080 0008+00 1/0 0/0 0/0 .text daKytag13_IsDelete__FP13kytag13_class */ -static bool daKytag13_IsDelete(kytag13_class* param_0) { - return true; +static int daKytag13_IsDelete(kytag13_class* i_this) { + return 1; } /* 80860208-80860210 001088 0008+00 1/0 0/0 0/0 .text daKytag13_Delete__FP13kytag13_class */ -static bool daKytag13_Delete(kytag13_class* param_0) { - return true; +static int daKytag13_Delete(kytag13_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 8086052C-80860530 0000BC 0004+00 1/1 0/0 0/0 .rodata @4335 */ -SECTION_RODATA static f32 const lit_4335 = 255.0f; -COMPILER_STRIP_GATE(0x8086052C, &lit_4335); - -/* 80860530-80860538 0000C0 0008+00 1/1 0/0 0/0 .rodata @4337 */ -SECTION_RODATA static u8 const lit_4337[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80860530, &lit_4337); - /* 80860210-80860450 001090 0240+00 1/0 0/0 0/0 .text daKytag13_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag13_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Create__FP10fopAc_ac_c.s" +static int daKytag13_Create(fopAc_ac_c* i_this) { + kytag13_class* a_this = (kytag13_class*)i_this; + fopAcM_SetupActor(i_this, kytag13_class); + + if (i_this->home.roomNo != dComIfGp_roomControl_getStayNo()) { + return 0; + } + + a_this->mMax = fopAcM_GetParam(i_this) & 0xFF; + if (a_this->mMax > 7) { + a_this->mMax = 7; + } + + a_this->mMax *= 71; + if (a_this->mMax > 500) { + a_this->mMax = 500; + } + + g_env_light.field_0xe90 = a_this->mMax / 10; + + if (g_env_light.mSnowInitialized) { + g_env_light.mSnowCount = 0; + + if (g_env_light.mpSnowPacket != NULL) { + g_env_light.mpSnowPacket->field_0x6d88 = 0; + + for (int i = 0; i < 500; i++) { + g_env_light.mpSnowPacket->mSnowEff[i].mStatus = 0; + } + } + } + + a_this->mSpeed = ((fopAcM_GetParam(i_this) >> 8) & 0xFF) / 255.0f; + a_this->field_0x57a = fopAcM_GetParam(i_this) >> 0x10; + a_this->field_0x57c = 0; + a_this->field_0x57e = g_env_light.field_0xe90 * 10; + + if (i_this->home.roomNo == 9) { + u8 prm = (fopAcM_GetParam(i_this) >> 0x1C); + a_this->field_0x57c = prm * 125; + a_this->field_0x57e = (prm + 1) * 125; + + if (g_env_light.field_0xe90 * 10 < a_this->field_0x57e) { + g_env_light.field_0xe90 = a_this->field_0x57e / 10; + } + } else if (i_this->home.roomNo == 7) { + u8 prm = (fopAcM_GetParam(i_this) >> 0x1C); + a_this->field_0x57c = prm * 250; + a_this->field_0x57e = (prm + 1) * 250; + + if (g_env_light.field_0xe90 * 10 < a_this->field_0x57e) { + g_env_light.field_0xe90 = a_this->field_0x57e / 10; + } + } else if (i_this->home.roomNo == 13) { + u8 prm = (fopAcM_GetParam(i_this) >> 0x1C); + a_this->field_0x57c = prm * 71; + a_this->field_0x57e = (prm + 1) * 71; + + if (g_env_light.field_0xe90 * 10 < a_this->field_0x57e) { + g_env_light.field_0xe90 = a_this->field_0x57e / 10; + } + } + + return cPhs_COMPLEATE_e; } -#pragma pop /* 80860450-80860458 0012D0 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ #pragma push @@ -584,5 +911,3 @@ static asm void func_80860460() { #include "asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/func_80860460.s" } #pragma pop - -/* 80860538-80860538 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp b/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp index 4d1ae65561..b91cef877f 100644 --- a/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp +++ b/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp @@ -98,7 +98,6 @@ static int daKytag14_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -/* ############################################################################################## */ /* 80529BE8-80529C08 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag14_Method */ static actor_method_class l_daKytag14_Method = { (process_method_func)daKytag14_Create, (process_method_func)daKytag14_Delete, diff --git a/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp b/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp index 3c8c356f21..9742fb14ac 100644 --- a/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp +++ b/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp @@ -80,16 +80,16 @@ static int daKytag15_Delete(kytag15_class* i_this) { /* 808608E8-808609B4 000328 00CC+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ static int useHeapInit(fopAc_ac_c* i_this) { - kytag15_class* this_ = (kytag15_class*)i_this; + kytag15_class* a_this = (kytag15_class*)i_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kytag15", 4); - this_->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); - if (this_->mpModel == NULL) { + a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (a_this->mpModel == NULL) { return 0; } J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Kytag15", 7); - if (!this_->mBtk.init(modelData, btk, TRUE, 2, 1.0f, 0, -1)) { + if (!a_this->mBtk.init(modelData, btk, TRUE, 2, 1.0f, 0, -1)) { return 0; } @@ -98,29 +98,29 @@ static int useHeapInit(fopAc_ac_c* i_this) { /* 808609B4-80860AF0 0003F4 013C+00 1/0 0/0 0/0 .text daKytag15_Create__FP10fopAc_ac_c */ static int daKytag15_Create(fopAc_ac_c* i_this) { - kytag15_class* this_ = (kytag15_class*)i_this; + kytag15_class* a_this = (kytag15_class*)i_this; if (strcmp(dComIfGp_getStartStageName(), "F_SP118") == 0) { - this_->field_0x58c = 1; + a_this->field_0x58c = 1; } else { - this_->field_0x58c = 0; + a_this->field_0x58c = 0; } - fopAcM_SetupActor(this_, kytag15_class); + fopAcM_SetupActor(a_this, kytag15_class); - if (this_->field_0x58c == 0) { + if (a_this->field_0x58c == 0) { if (!dKy_daynight_check()) { - this_->field_0x590 = 1.0f; + a_this->field_0x590 = 1.0f; } else { - this_->field_0x590 = 0.0f; + a_this->field_0x590 = 0.0f; } } else { - this_->field_0x590 = 0.0f; + a_this->field_0x590 = 0.0f; } - int phase = dComIfG_resLoad(&this_->mPhase, "Kytag15"); + int phase = dComIfG_resLoad(&a_this->mPhase, "Kytag15"); if (phase == cPhs_COMPLEATE_e) { - if (!fopAcM_entrySolidHeap(this_, useHeapInit, 0)) { + if (!fopAcM_entrySolidHeap(a_this, useHeapInit, 0)) { return cPhs_ERROR_e; } } @@ -128,7 +128,6 @@ static int daKytag15_Create(fopAc_ac_c* i_this) { return phase; } -/* ############################################################################################## */ /* 80860B78-80860B98 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag15_Method */ static actor_method_class l_daKytag15_Method = { (process_method_func)daKytag15_Create, (process_method_func)daKytag15_Delete, diff --git a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp index cd7641bfc4..f5ee21aea3 100644 --- a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp +++ b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp @@ -40,10 +40,10 @@ static int daKytag16_Execute(kytag16_class* i_this) { if (var_r29) { var_r29 = false; - if (i_this->field_0x573 != 0xFF) { + if (i_this->mSwitch != 0xFF) { s32 room_no = dComIfGp_roomControl_getStayNo(); - if (dComIfGs_isSwitch(i_this->field_0x573, room_no)) { + if (dComIfGs_isSwitch(i_this->mSwitch, room_no)) { var_r29 = true; } } else { @@ -72,7 +72,7 @@ static int daKytag16_Execute(kytag16_class* i_this) { if (i_this->field_0x568 > 0.001f) { dKy_BossSpotLight_set(&i_this->current.pos, i_this->field_0x578 + (12.0f * var_f31), i_this->field_0x57c + (50.0f * var_f30), i_this->field_0x580, - &i_this->field_0x56d, i_this->field_0x574 * i_this->field_0x568, + &i_this->mColor, i_this->field_0x574 * i_this->field_0x568, i_this->field_0x58c, i_this->field_0x58d); } @@ -93,80 +93,79 @@ static int daKytag16_Delete(kytag16_class* i_this) { /* 80860EAC-8086112C 0002CC 0280+00 2/0 0/0 0/0 .text daKytag16_Create__FP10fopAc_ac_c */ static int daKytag16_Create(fopAc_ac_c* i_this) { fopAcM_SetupActor(i_this, kytag16_class); - kytag16_class* this_ = (kytag16_class*)i_this; + kytag16_class* a_this = (kytag16_class*)i_this; - this_->field_0x573 = fopAcM_GetParam(this_) & 0xFF; - this_->field_0x56c = (this_->current.angle.z >> 10) & 0x3F; + a_this->mSwitch = fopAcM_GetParam(a_this) & 0xFF; + a_this->field_0x56c = (a_this->current.angle.z >> 10) & 0x3F; - this_->field_0x56d.r = fopAcM_GetParam(this_) >> 0x8; - this_->field_0x56d.g = fopAcM_GetParam(this_) >> 0x10; - this_->field_0x56d.b = fopAcM_GetParam(this_) >> 0x18; + a_this->mColor.r = fopAcM_GetParam(a_this) >> 0x8; + a_this->mColor.g = fopAcM_GetParam(a_this) >> 0x10; + a_this->mColor.b = fopAcM_GetParam(a_this) >> 0x18; - this_->field_0x571 = this_->current.angle.z & 0x1F; - this_->field_0x572 = (this_->current.angle.z >> 5) & 0x1F; - this_->field_0x578 = (this_->shape_angle.x / 32767.0f) * 180.0f; - this_->field_0x57c = (this_->shape_angle.y / 32767.0f) * 180.0f; + a_this->field_0x571 = a_this->current.angle.z & 0x1F; + a_this->field_0x572 = (a_this->current.angle.z >> 5) & 0x1F; + a_this->field_0x578 = (a_this->shape_angle.x / 32767.0f) * 180.0f; + a_this->field_0x57c = (a_this->shape_angle.y / 32767.0f) * 180.0f; - this_->field_0x588 = cM_rndFX(65535.0f); - this_->field_0x58a = cM_rndFX(65535.0f); - this_->field_0x584 = 1.0f; - this_->field_0x568 = 0.0f; + a_this->field_0x588 = cM_rndFX(65535.0f); + a_this->field_0x58a = cM_rndFX(65535.0f); + a_this->field_0x584 = 1.0f; + a_this->field_0x568 = 0.0f; - switch (this_->field_0x56c) { + switch (a_this->field_0x56c) { case 0: - this_->field_0x580 = 45.0f; - this_->field_0x574 = 1.0f; - this_->field_0x58c = 0; - this_->field_0x58d = 3; + a_this->field_0x580 = 45.0f; + a_this->field_0x574 = 1.0f; + a_this->field_0x58c = 0; + a_this->field_0x58d = 3; break; case 1: - this_->field_0x580 = 45.0f; - this_->field_0x574 = 5.0f; - this_->field_0x58c = 0; - this_->field_0x58d = 3; + a_this->field_0x580 = 45.0f; + a_this->field_0x574 = 5.0f; + a_this->field_0x58c = 0; + a_this->field_0x58d = 3; break; case 2: - this_->field_0x580 = 45.0f; - this_->field_0x574 = 10.0f; - this_->field_0x58c = 0; - this_->field_0x58d = 3; + a_this->field_0x580 = 45.0f; + a_this->field_0x574 = 10.0f; + a_this->field_0x58c = 0; + a_this->field_0x58d = 3; break; case 3: - this_->field_0x580 = 25.0f; - this_->field_0x574 = 1.0f; - this_->field_0x58c = 2; - this_->field_0x58d = 3; + a_this->field_0x580 = 25.0f; + a_this->field_0x574 = 1.0f; + a_this->field_0x58c = 2; + a_this->field_0x58d = 3; break; case 4: - this_->field_0x580 = 45.0f; - this_->field_0x574 = 5.0f; - this_->field_0x58c = 2; - this_->field_0x58d = 3; + a_this->field_0x580 = 45.0f; + a_this->field_0x574 = 5.0f; + a_this->field_0x58c = 2; + a_this->field_0x58d = 3; break; case 5: - this_->field_0x580 = 70.0f; - this_->field_0x574 = 10.0f; - this_->field_0x58c = 2; - this_->field_0x58d = 3; + a_this->field_0x580 = 70.0f; + a_this->field_0x574 = 10.0f; + a_this->field_0x58c = 2; + a_this->field_0x58d = 3; break; case 6: - this_->field_0x580 = 60.0f; - this_->field_0x574 = 0.01f; - this_->field_0x58c = 2; - this_->field_0x58d = 1; + a_this->field_0x580 = 60.0f; + a_this->field_0x574 = 0.01f; + a_this->field_0x58c = 2; + a_this->field_0x58d = 1; break; case 7: - this_->field_0x580 = 50.0f; - this_->field_0x574 = 0.01f; - this_->field_0x58c = 2; - this_->field_0x58d = 1; + a_this->field_0x580 = 50.0f; + a_this->field_0x574 = 0.01f; + a_this->field_0x58c = 2; + a_this->field_0x58d = 1; break; } return cPhs_COMPLEATE_e; } -/* ############################################################################################## */ /* 808611BC-808611DC -00001 0020+00 1/0 0/0 0/0 .data l_daKytag16_Method */ static actor_method_class l_daKytag16_Method = { (process_method_func)daKytag16_Create, (process_method_func)daKytag16_Delete, diff --git a/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp b/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp index 6e5835a27b..8ded7c9fb9 100644 --- a/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp +++ b/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp @@ -30,16 +30,15 @@ static int daKytag17_Delete(kytag17_class* i_this) { /* 8046DB78-8046DBE0 000098 0068+00 1/0 0/0 0/0 .text daKytag17_Create__FP10fopAc_ac_c */ static int daKytag17_Create(fopAc_ac_c* i_this) { - kytag17_class* kytag17 = (kytag17_class*)i_this; + kytag17_class* a_this = (kytag17_class*)i_this; - fopAcM_SetupActor(kytag17, kytag17_class); + fopAcM_SetupActor(a_this, kytag17_class); - kytag17->mParameters = fopAcM_GetParam(kytag17); - g_env_light.field_0x1308 = kytag17->mParameters; + a_this->mParameters = fopAcM_GetParam(a_this); + g_env_light.field_0x1308 = a_this->mParameters; return cPhs_COMPLEATE_e; } -/* ############################################################################################## */ /* 8046DBE8-8046DC08 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag17_Method */ static actor_method_class l_daKytag17_Method = { (process_method_func)daKytag17_Create, (process_method_func)daKytag17_Delete, diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index bd3c6a7b25..97e93850b0 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -6723,9 +6723,9 @@ void dKy_bg_MAxx_proc(void* param_0) { mat_p->setTevColor(2, &color); if (env_light->field_0x1060 != NULL) { - sp98 = env_light->field_0x1060->field_0x5b8; - f32 var_f29 = env_light->field_0x1060->field_0x5ac.x * - env_light->field_0x1060->field_0x5d0; + sp98 = env_light->field_0x1060->mAvoidPos; + f32 var_f29 = env_light->field_0x1060->mSize.x * + env_light->field_0x1060->mSizeScale; if (var_f29 < 0.1f) { var_f29 = 0.1f; }