diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index 12cf6de5f53..a8b5ad771ae 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -5018,7 +5018,7 @@ lbl_80149FC0: /* 80149FD0 00146F10 38 A1 00 3C */ addi r5, r1, 0x3c /* 80149FD4 00146F14 38 C0 00 00 */ li r6, 0 /* 80149FD8 00146F18 38 E0 00 00 */ li r7, 0 -/* 80149FDC 00146F1C 4B ED 57 DD */ bl fopKyM_create +/* 80149FDC 00146F1C 4B ED 57 DD */ bl fopKyM_create__FsiP4cXyzP4cXyzPFPv_i lbl_80149FE0: /* 80149FE0 00146F20 88 1A 0E 28 */ lbz r0, 0xe28(r26) /* 80149FE4 00146F24 28 00 00 00 */ cmplwi r0, 0 @@ -5039,7 +5039,7 @@ lbl_8014A00C: /* 8014A01C 00146F5C 38 A1 00 30 */ addi r5, r1, 0x30 /* 8014A020 00146F60 38 C0 00 00 */ li r6, 0 /* 8014A024 00146F64 38 E0 00 00 */ li r7, 0 -/* 8014A028 00146F68 4B ED 57 91 */ bl fopKyM_create +/* 8014A028 00146F68 4B ED 57 91 */ bl fopKyM_create__FsiP4cXyzP4cXyzPFPv_i lbl_8014A02C: /* 8014A02C 00146F6C 9B FA 0E 27 */ stb r31, 0xe27(r26) /* 8014A030 00146F70 9B BA 0E 28 */ stb r29, 0xe28(r26) diff --git a/asm/d/k/d_k_wmark.s b/asm/d/k/d_k_wmark.s index 637dc8e8ef5..6702143d40a 100644 --- a/asm/d/k/d_k_wmark.s +++ b/asm/d/k/d_k_wmark.s @@ -419,7 +419,7 @@ lbl_802619C0: /* 802619EC 0025E92C 40 82 00 14 */ bne lbl_80261A00 lbl_802619F0: /* 802619F0 0025E930 7F E3 FB 78 */ mr r3, r31 -/* 802619F4 0025E934 4B DB DD 55 */ bl fopKyM_Delete +/* 802619F4 0025E934 4B DB DD 55 */ bl fopKyM_Delete__FPv /* 802619F8 0025E938 C0 02 B5 C0 */ lfs f0, lbl_80454FC0-_SDA2_BASE_(r2) /* 802619FC 0025E93C D0 1F 04 90 */ stfs f0, 0x490(r31) lbl_80261A00: diff --git a/asm/d/k/d_k_wpillar.s b/asm/d/k/d_k_wpillar.s index 3bec9427c50..bf02e3fa6b9 100644 --- a/asm/d/k/d_k_wpillar.s +++ b/asm/d/k/d_k_wpillar.s @@ -353,7 +353,7 @@ lbl_80262054: /* 80262054 0025EF94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80262058 0025EF98 41 82 00 10 */ beq lbl_80262068 /* 8026205C 0025EF9C 7F E3 FB 78 */ mr r3, r31 -/* 80262060 0025EFA0 4B DB D6 E9 */ bl fopKyM_Delete +/* 80262060 0025EFA0 4B DB D6 E9 */ bl fopKyM_Delete__FPv /* 80262064 0025EFA4 48 00 00 2C */ b lbl_80262090 lbl_80262068: /* 80262068 0025EFA8 38 7F 00 DC */ addi r3, r31, 0xdc diff --git a/asm/d/ky/d_ky_thunder.s b/asm/d/ky/d_ky_thunder.s index 2ec433078b0..f2a79eac930 100644 --- a/asm/d/ky/d_ky_thunder.s +++ b/asm/d/ky/d_ky_thunder.s @@ -188,7 +188,7 @@ lbl_801AE1E0: /* 801AE204 001AB144 38 A0 00 00 */ li r5, 0 /* 801AE208 001AB148 48 11 9C 61 */ bl Z2EnvSeMgr_NS_startFarThunderSe /* 801AE20C 001AB14C 7F E3 FB 78 */ mr r3, r31 -/* 801AE210 001AB150 4B E7 15 39 */ bl fopKyM_Delete +/* 801AE210 001AB150 4B E7 15 39 */ bl fopKyM_Delete__FPv lbl_801AE214: /* 801AE214 001AB154 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801AE218 001AB158 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/asm/d/particle/d_particle_copoly.s b/asm/d/particle/d_particle_copoly.s index f63eafcf1f4..23e110bb7d5 100644 --- a/asm/d/particle/d_particle_copoly.s +++ b/asm/d/particle/d_particle_copoly.s @@ -82,7 +82,7 @@ dPaPo_c_NS_checkWaterIn: /* 80050DB8 0004DCF8 7F 63 DB 78 */ mr r3, r27 /* 80050DBC 0004DCFC FC 20 E8 90 */ fmr f1, f29 /* 80050DC0 0004DD00 38 80 00 00 */ li r4, 0 -/* 80050DC4 0004DD04 4B FC EA B9 */ bl fopKyM_createWpillar +/* 80050DC4 0004DD04 4B FC EA B9 */ bl fopKyM_createWpillar__FPC4cXyzfi lbl_80050DC8: /* 80050DC8 0004DD08 C0 1A 00 30 */ lfs f0, 0x30(r26) /* 80050DCC 0004DD0C FC 1F 00 40 */ fcmpo cr0, f31, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B154C.s b/include/d/d_a/d_a_alink/asm/func_800B154C.s index fbdd90d3423..f2f9eebcfe1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B154C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B154C.s @@ -87,7 +87,7 @@ lbl_800B166C: /* 800B1690 000AE5D0 38 61 00 08 */ addi r3, r1, 8 /* 800B1694 000AE5D4 C0 3F 34 20 */ lfs f1, 0x3420(r31) /* 800B1698 000AE5D8 38 80 00 00 */ li r4, 0 -/* 800B169C 000AE5DC 4B F6 E1 E1 */ bl fopKyM_createWpillar +/* 800B169C 000AE5DC 4B F6 E1 E1 */ bl fopKyM_createWpillar__FPC4cXyzfi lbl_800B16A0: /* 800B16A0 000AE5E0 C0 3F 33 BC */ lfs f1, 0x33bc(r31) /* 800B16A4 000AE5E4 C0 1F 33 B8 */ lfs f0, 0x33b8(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80104AA0.s b/include/d/d_a/d_a_alink/asm/func_80104AA0.s index 6aee80dcfe9..ca75273e355 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104AA0.s +++ b/include/d/d_a/d_a_alink/asm/func_80104AA0.s @@ -64,7 +64,7 @@ lbl_80104B58: /* 80104B90 00101AD0 38 61 00 08 */ addi r3, r1, 8 /* 80104B94 00101AD4 C0 22 93 A8 */ lfs f1, lbl_80452DA8-_SDA2_BASE_(r2) /* 80104B98 00101AD8 38 80 00 00 */ li r4, 0 -/* 80104B9C 00101ADC 4B F1 AC E1 */ bl fopKyM_createWpillar +/* 80104B9C 00101ADC 4B F1 AC E1 */ bl fopKyM_createWpillar__FPC4cXyzfi lbl_80104BA0: /* 80104BA0 00101AE0 C0 7F 1A 08 */ lfs f3, 0x1a08(r31) /* 80104BA4 00101AE4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80109BDC.s b/include/d/d_a/d_a_alink/asm/func_80109BDC.s index 7db8169eb8b..160b8bfe1f7 100644 --- a/include/d/d_a/d_a_alink/asm/func_80109BDC.s +++ b/include/d/d_a/d_a_alink/asm/func_80109BDC.s @@ -1436,7 +1436,7 @@ lbl_8010B014: /* 8010B084 00107FC4 38 63 00 30 */ addi r3, r3, 0x30 /* 8010B088 00107FC8 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) /* 8010B08C 00107FCC 38 80 00 00 */ li r4, 0 -/* 8010B090 00107FD0 4B F1 47 ED */ bl fopKyM_createWpillar +/* 8010B090 00107FD0 4B F1 47 ED */ bl fopKyM_createWpillar__FPC4cXyzfi /* 8010B094 00107FD4 88 FF 2F 9A */ lbz r7, 0x2f9a(r31) /* 8010B098 00107FD8 80 7F 07 7C */ lwz r3, 0x77c(r31) /* 8010B09C 00107FDC 38 A3 00 30 */ addi r5, r3, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_80113D58.s b/include/d/d_a/d_a_alink/asm/func_80113D58.s index 72955ee7587..869d0b07c4a 100644 --- a/include/d/d_a/d_a_alink/asm/func_80113D58.s +++ b/include/d/d_a/d_a_alink/asm/func_80113D58.s @@ -1158,7 +1158,7 @@ lbl_80114DC8: /* 80114E48 00111D88 38 63 00 30 */ addi r3, r3, 0x30 /* 80114E4C 00111D8C C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 80114E50 00111D90 38 80 00 00 */ li r4, 0 -/* 80114E54 00111D94 4B F0 AA 29 */ bl fopKyM_createWpillar +/* 80114E54 00111D94 4B F0 AA 29 */ bl fopKyM_createWpillar__FPC4cXyzfi /* 80114E58 00111D98 88 FF 2F 9A */ lbz r7, 0x2f9a(r31) /* 80114E5C 00111D9C 80 7F 07 7C */ lwz r3, 0x77c(r31) /* 80114E60 00111DA0 38 A3 00 30 */ addi r5, r3, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_80121304.s b/include/d/d_a/d_a_alink/asm/func_80121304.s index 5ee9b3f42dd..db2a864f3e7 100644 --- a/include/d/d_a/d_a_alink/asm/func_80121304.s +++ b/include/d/d_a/d_a_alink/asm/func_80121304.s @@ -24,7 +24,7 @@ /* 80121360 0011E2A0 7F C5 F3 78 */ mr r5, r30 /* 80121364 0011E2A4 38 C0 00 00 */ li r6, 0 /* 80121368 0011E2A8 38 E0 00 00 */ li r7, 0 -/* 8012136C 0011E2AC 4B EF E4 4D */ bl fopKyM_create +/* 8012136C 0011E2AC 4B EF E4 4D */ bl fopKyM_create__FsiP4cXyzP4cXyzPFPv_i /* 80121370 0011E2B0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80121374 0011E2B4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80121378 0011E2B8 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801381F8.s b/include/d/d_a/d_a_alink/asm/func_801381F8.s index 67d5653898e..ec9093eeb1a 100644 --- a/include/d/d_a/d_a_alink/asm/func_801381F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801381F8.s @@ -118,7 +118,7 @@ lbl_80138340: /* 801383B0 001352F0 38 61 00 08 */ addi r3, r1, 8 /* 801383B4 001352F4 C0 22 94 AC */ lfs f1, lbl_80452EAC-_SDA2_BASE_(r2) /* 801383B8 001352F8 38 80 00 00 */ li r4, 0 -/* 801383BC 001352FC 4B EE 74 C1 */ bl fopKyM_createWpillar +/* 801383BC 001352FC 4B EE 74 C1 */ bl fopKyM_createWpillar__FPC4cXyzfi lbl_801383C0: /* 801383C0 00135300 38 60 00 00 */ li r3, 0 lbl_801383C4: diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B1A8.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B1A8.s index 0c6a997fc57..a93230dabed 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B1A8.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B1A8.s @@ -101,7 +101,7 @@ lbl_8006B2C0: /* 8006B328 00068268 38 A0 00 00 */ li r5, 0 /* 8006B32C 0006826C 38 C0 00 00 */ li r6, 0 /* 8006B330 00068270 38 E0 00 00 */ li r7, 0 -/* 8006B334 00068274 4B FB 44 85 */ bl fopKyM_create +/* 8006B334 00068274 4B FB 44 85 */ bl fopKyM_create__FsiP4cXyzP4cXyzPFPv_i /* 8006B338 00068278 88 7F 0E D5 */ lbz r3, 0xed5(r31) /* 8006B33C 0006827C 38 03 00 01 */ addi r0, r3, 1 /* 8006B340 00068280 98 1F 0E D5 */ stb r0, 0xed5(r31) @@ -149,7 +149,7 @@ lbl_8006B348: /* 8006B3E4 00068324 38 A0 00 00 */ li r5, 0 /* 8006B3E8 00068328 38 C0 00 00 */ li r6, 0 /* 8006B3EC 0006832C 38 E0 00 00 */ li r7, 0 -/* 8006B3F0 00068330 4B FB 43 C9 */ bl fopKyM_create +/* 8006B3F0 00068330 4B FB 43 C9 */ bl fopKyM_create__FsiP4cXyzP4cXyzPFPv_i /* 8006B3F4 00068334 88 7F 0E D5 */ lbz r3, 0xed5(r31) /* 8006B3F8 00068338 38 03 00 01 */ addi r0, r3, 1 /* 8006B3FC 0006833C 98 1F 0E D5 */ stb r0, 0xed5(r31) @@ -177,7 +177,7 @@ lbl_8006B404: /* 8006B450 00068390 38 A0 00 00 */ li r5, 0 /* 8006B454 00068394 38 C0 00 00 */ li r6, 0 /* 8006B458 00068398 38 E0 00 00 */ li r7, 0 -/* 8006B45C 0006839C 4B FB 43 5D */ bl fopKyM_create +/* 8006B45C 0006839C 4B FB 43 5D */ bl fopKyM_create__FsiP4cXyzP4cXyzPFPv_i /* 8006B460 000683A0 48 00 01 E8 */ b lbl_8006B648 lbl_8006B464: /* 8006B464 000683A4 C0 22 88 14 */ lfs f1, lbl_80452214-_SDA2_BASE_(r2) @@ -218,7 +218,7 @@ lbl_8006B464: /* 8006B4F0 00068430 38 A0 00 00 */ li r5, 0 /* 8006B4F4 00068434 38 C0 00 00 */ li r6, 0 /* 8006B4F8 00068438 38 E0 00 00 */ li r7, 0 -/* 8006B4FC 0006843C 4B FB 42 BD */ bl fopKyM_create +/* 8006B4FC 0006843C 4B FB 42 BD */ bl fopKyM_create__FsiP4cXyzP4cXyzPFPv_i /* 8006B500 00068440 88 7F 0E D5 */ lbz r3, 0xed5(r31) /* 8006B504 00068444 38 03 00 01 */ addi r0, r3, 1 /* 8006B508 00068448 98 1F 0E D5 */ stb r0, 0xed5(r31) @@ -302,7 +302,7 @@ lbl_8006B5CC: /* 8006B62C 0006856C 38 A0 00 00 */ li r5, 0 /* 8006B630 00068570 38 C0 00 00 */ li r6, 0 /* 8006B634 00068574 38 E0 00 00 */ li r7, 0 -/* 8006B638 00068578 4B FB 41 81 */ bl fopKyM_create +/* 8006B638 00068578 4B FB 41 81 */ bl fopKyM_create__FsiP4cXyzP4cXyzPFPv_i lbl_8006B63C: /* 8006B63C 0006857C 88 7F 0E D5 */ lbz r3, 0xed5(r31) /* 8006B640 00068580 38 03 FF FF */ addi r0, r3, -1 diff --git a/include/d/d_stage/asm/func_80026898.s b/include/d/d_stage/asm/func_80026898.s index 00b0212bc72..24469239461 100644 --- a/include/d/d_stage/asm/func_80026898.s +++ b/include/d/d_stage/asm/func_80026898.s @@ -6,25 +6,25 @@ /* 800268AC 000237EC 38 A0 00 00 */ li r5, 0 /* 800268B0 000237F0 38 C0 00 00 */ li r6, 0 /* 800268B4 000237F4 38 E0 00 00 */ li r7, 0 -/* 800268B8 000237F8 4B FF 8F 61 */ bl fopKyM_fastCreate +/* 800268B8 000237F8 4B FF 8F 61 */ bl fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i /* 800268BC 000237FC 38 60 03 11 */ li r3, 0x311 /* 800268C0 00023800 38 80 00 00 */ li r4, 0 /* 800268C4 00023804 38 A0 00 00 */ li r5, 0 /* 800268C8 00023808 38 C0 00 00 */ li r6, 0 /* 800268CC 0002380C 38 E0 00 00 */ li r7, 0 -/* 800268D0 00023810 4B FF 8F 49 */ bl fopKyM_fastCreate +/* 800268D0 00023810 4B FF 8F 49 */ bl fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i /* 800268D4 00023814 38 60 03 12 */ li r3, 0x312 /* 800268D8 00023818 38 80 00 00 */ li r4, 0 /* 800268DC 0002381C 38 A0 00 00 */ li r5, 0 /* 800268E0 00023820 38 C0 00 00 */ li r6, 0 /* 800268E4 00023824 38 E0 00 00 */ li r7, 0 -/* 800268E8 00023828 4B FF 8F 31 */ bl fopKyM_fastCreate +/* 800268E8 00023828 4B FF 8F 31 */ bl fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i /* 800268EC 0002382C 38 60 00 15 */ li r3, 0x15 /* 800268F0 00023830 38 80 00 00 */ li r4, 0 /* 800268F4 00023834 38 A0 00 00 */ li r5, 0 /* 800268F8 00023838 38 C0 00 00 */ li r6, 0 /* 800268FC 0002383C 38 E0 00 00 */ li r7, 0 -/* 80026900 00023840 4B FF 8F 19 */ bl fopKyM_fastCreate +/* 80026900 00023840 4B FF 8F 19 */ bl fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i /* 80026904 00023844 80 01 00 14 */ lwz r0, 0x14(r1) /* 80026908 00023848 7C 08 03 A6 */ mtlr r0 /* 8002690C 0002384C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_kankyo_mng/asm/func_8001F6B8.s b/include/f/f_op/f_op_kankyo_mng/asm/func_8001F6B8.s index a57ddbe3c5d..bf893a903b6 100644 --- a/include/f/f_op/f_op_kankyo_mng/asm/func_8001F6B8.s +++ b/include/f/f_op/f_op_kankyo_mng/asm/func_8001F6B8.s @@ -6,7 +6,7 @@ /* 8001F6CC 0001C60C 7C 7D 1B 78 */ mr r29, r3 /* 8001F6D0 0001C610 7C 9E 23 78 */ mr r30, r4 /* 8001F6D4 0001C614 7C BF 2B 78 */ mr r31, r5 -/* 8001F6D8 0001C618 4B FF FF 89 */ bl fopKyM_CreateAppend +/* 8001F6D8 0001C618 4B FF FF 89 */ bl fopKyM_CreateAppend__Fv /* 8001F6DC 0001C61C 28 03 00 00 */ cmplwi r3, 0 /* 8001F6E0 0001C620 40 82 00 0C */ bne lbl_8001F6EC /* 8001F6E4 0001C624 38 60 00 00 */ li r3, 0 diff --git a/include/f/f_op/f_op_kankyo_mng/asm/func_8001F7B8.s b/include/f/f_op/f_op_kankyo_mng/asm/func_8001F7B8.s index ccfb6f5b63b..e37bebe4793 100644 --- a/include/f/f_op/f_op_kankyo_mng/asm/func_8001F7B8.s +++ b/include/f/f_op/f_op_kankyo_mng/asm/func_8001F7B8.s @@ -8,7 +8,7 @@ /* 8001F7D4 0001C714 7C 83 23 78 */ mr r3, r4 /* 8001F7D8 0001C718 7C A4 2B 78 */ mr r4, r5 /* 8001F7DC 0001C71C 7C C5 33 78 */ mr r5, r6 -/* 8001F7E0 0001C720 4B FF FE D9 */ bl createAppend_X1_ +/* 8001F7E0 0001C720 4B FF FE D9 */ bl createAppend__FiP4cXyzP4cXyz /* 8001F7E4 0001C724 7C 65 1B 79 */ or. r5, r3, r3 /* 8001F7E8 0001C728 40 82 00 0C */ bne lbl_8001F7F4 /* 8001F7EC 0001C72C 38 60 FF FF */ li r3, -1 @@ -16,7 +16,7 @@ lbl_8001F7F4: /* 8001F7F4 0001C734 7F C3 F3 78 */ mr r3, r30 /* 8001F7F8 0001C738 7F E4 FB 78 */ mr r4, r31 -/* 8001F7FC 0001C73C 4B FF FF 6D */ bl fopKyM_Create +/* 8001F7FC 0001C73C 4B FF FF 6D */ bl fopKyM_Create__FsPFPv_iPv lbl_8001F800: /* 8001F800 0001C740 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8001F804 0001C744 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/f/f_op/f_op_kankyo_mng/asm/func_8001F818.s b/include/f/f_op/f_op_kankyo_mng/asm/func_8001F818.s index 59be373e7d5..7fb16119430 100644 --- a/include/f/f_op/f_op_kankyo_mng/asm/func_8001F818.s +++ b/include/f/f_op/f_op_kankyo_mng/asm/func_8001F818.s @@ -8,7 +8,7 @@ /* 8001F834 0001C774 7C 83 23 78 */ mr r3, r4 /* 8001F838 0001C778 7C A4 2B 78 */ mr r4, r5 /* 8001F83C 0001C77C 7C C5 33 78 */ mr r5, r6 -/* 8001F840 0001C780 4B FF FE 79 */ bl createAppend_X1_ +/* 8001F840 0001C780 4B FF FE 79 */ bl createAppend__FiP4cXyzP4cXyz /* 8001F844 0001C784 7C 66 1B 79 */ or. r6, r3, r3 /* 8001F848 0001C788 40 82 00 0C */ bne lbl_8001F854 /* 8001F84C 0001C78C 38 60 00 00 */ li r3, 0 diff --git a/include/f/f_op/f_op_kankyo_mng/asm/func_8001F87C.s b/include/f/f_op/f_op_kankyo_mng/asm/func_8001F87C.s index edbdfa0fec8..c9f0c27719e 100644 --- a/include/f/f_op/f_op_kankyo_mng/asm/func_8001F87C.s +++ b/include/f/f_op/f_op_kankyo_mng/asm/func_8001F87C.s @@ -8,7 +8,7 @@ /* 8001F898 0001C7D8 7C 7E 1B 78 */ mr r30, r3 /* 8001F89C 0001C7DC FF E0 08 90 */ fmr f31, f1 /* 8001F8A0 0001C7E0 7C 9F 23 78 */ mr r31, r4 -/* 8001F8A4 0001C7E4 4B FF FD BD */ bl fopKyM_CreateAppend +/* 8001F8A4 0001C7E4 4B FF FD BD */ bl fopKyM_CreateAppend__Fv /* 8001F8A8 0001C7E8 7C 65 1B 79 */ or. r5, r3, r3 /* 8001F8AC 0001C7EC 40 82 00 0C */ bne lbl_8001F8B8 /* 8001F8B0 0001C7F0 38 60 FF FF */ li r3, -1 @@ -26,7 +26,7 @@ lbl_8001F8B8: /* 8001F8DC 0001C81C 93 E5 00 18 */ stw r31, 0x18(r5) /* 8001F8E0 0001C820 38 60 03 02 */ li r3, 0x302 /* 8001F8E4 0001C824 38 80 00 00 */ li r4, 0 -/* 8001F8E8 0001C828 4B FF FE 81 */ bl fopKyM_Create +/* 8001F8E8 0001C828 4B FF FE 81 */ bl fopKyM_Create__FsPFPv_iPv lbl_8001F8EC: /* 8001F8EC 0001C82C E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* 8001F8F0 0001C830 CB E1 00 10 */ lfd f31, 0x10(r1) diff --git a/ldscript.lcf b/ldscript.lcf index 42fb9fffed3..91a36a7e173 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -3457,6 +3457,14 @@ fopOvlpReq_Cancel__FP21overlap_request_class fopOvlpReq_Is_PeektimeLimit__FP21overlap_request_class fopOvlpReq_SetPeektime__FP21overlap_request_classUs fopOvlpReq_OverlapClr__FP21overlap_request_class +fopKyM_CreateAppend__Fv +fopKyM_Create__FsPFPv_iPv +createAppend__FiP4cXyzP4cXyz +fopKyM_Delete__FPv +fopKyM_create__FsiP4cXyzP4cXyzPFPv_i +fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i +fopKyM_createWpillar__FPC4cXyzfi +fopKyM_createMpillar__FPC4cXyzf } /* .init 80003100 - 80005600 diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp index 9625ea80a45..89a1e28e112 100644 --- a/src/d/d_a/d_a_alink.cpp +++ b/src/d/d_a/d_a_alink.cpp @@ -1330,6 +1330,8 @@ void Z2Creature_NS_updateAnime(void); void Z2SeqMgr_NS_bgmSetSwordUsing(void); void Z2SeqMgr_NS_taktModeMute(void); void Z2SeqMgr_NS_taktModeMuteOff(void); +void fopKyM_create__FsiP4cXyzP4cXyzPFPv_i(void); +void fopKyM_createWpillar__FPC4cXyzfi(void); } class j3dsys { diff --git a/src/d/d_kankyo/d_kankyo_rain.cpp b/src/d/d_kankyo/d_kankyo_rain.cpp index 81f4a8520da..43bb600282a 100644 --- a/src/d/d_kankyo/d_kankyo_rain.cpp +++ b/src/d/d_kankyo/d_kankyo_rain.cpp @@ -90,6 +90,7 @@ void SNOW_EFF(void); void STAR_EFF_NS_dtor(void); void STAR_EFF(void); void Z2EnvSeMgr_NS_startNearThunderSe(void); +void fopKyM_create__FsiP4cXyzP4cXyzPFPv_i(void); } class j3dsys { diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 79e6f9ba1e4..d57b937cf13 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -75,6 +75,7 @@ void stage_tgsc_data_class_NS_dtor(void); void stage_tgsc_data_class(void); void* memalignB__3cMlFiUl(int pAlign, u32 pSize); void fopScnM_CreateReq__FssUsUl(void); +void fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i(void); } extern char lbl_80378A50[0x3F8]; // d_stage string literals diff --git a/src/f/f_op/f_op_kankyo_mng.cpp b/src/f/f_op/f_op_kankyo_mng.cpp index 7ec436ac1fb..4dd84ae4bd5 100644 --- a/src/f/f_op/f_op_kankyo_mng.cpp +++ b/src/f/f_op/f_op_kankyo_mng.cpp @@ -1,6 +1,8 @@ /* f_op_kankyo_mng.cpp autogenerated by split.py v0.4 at 2021-02-15 20:20:10.089723 */ #include "d/d_com/d_com_inf_game/d_com_inf_game.h" +#include "SComponent/c_malloc.h" +#include "SComponent/c_lib.h" #include "global.h" // additional symbols needed for f_op_kankyo_mng.cpp @@ -14,7 +16,6 @@ void cLib_memSet__FPviUl(void); void createAppend_X1_(void); void dPa_control_c_NS_set(void); void fopKyM_Create(void); -void fopKyM_CreateAppend(void); void fopKyM_Delete(void); void fopKyM_create(void); void fopKyM_createWpillar(void); @@ -25,67 +26,111 @@ void fpcM_FastCreate(void); void fpcSCtRq_Request(void); void func_8001F90C(void); void memalignB__3cMlFiUl(void); +void fopKyM_CreateAppend__Fv(void); +void fopKyM_Create__FsPFPv_iPvAppend__Fv(void); +void fopKyM_Create__FsPFPv_iPv(void); +void createAppend__FiP4cXyzP4cXyz(void); } // additional symbols needed for f_op_kankyo_mng.cpp // autogenerated by split.py v0.4 at 2021-02-15 20:20:10.089760 extern u8 lbl_804505C0; -extern u8 lbl_80451C68; +extern f32 lbl_80451C68; -extern "C" { -// fopKyM_CreateAppend__Fv -// fopKyM_CreateAppend(void) -asm void fopKyM_CreateAppend(void) { - nofralloc -#include "f/f_op/f_op_kankyo_mng/asm/func_8001F660.s" +// matches but can be improved +void* fopKyM_CreateAppend(void) { + struct unk { + u8 field_0x00[0xc]; + f32 field_0x0C; + f32 field_0x10; + f32 field_0x14; + }; + + void* ptr = cMl::memalignB(-4, 0x1C); + + if (ptr) { + cLib_memSet(ptr, 0, 0x1C); + f32 tmp = lbl_80451C68; + ((unk*)ptr)->field_0x0C = lbl_80451C68; + ((unk*)ptr)->field_0x10 = tmp; + ((unk*)ptr)->field_0x14 = tmp; + } + + return ptr; } -// createAppend__FiP4cXyzP4cXyz -// createAppend(int, cXyz*, cXyz*) -asm void createAppend_X1_(void) { - nofralloc -#include "f/f_op/f_op_kankyo_mng/asm/func_8001F6B8.s" +// matches but can be improved +f32* createAppend(int param_1, cXyz* param_2, cXyz* param_3) { + struct unk { + f32 field_0x00; + f32 field_0x04; + f32 field_0x08; + f32 field_0x0C; + f32 field_0x10; + f32 field_0x14; + int field_0x18; + }; + + f32* ptr = (f32*)(fopKyM_CreateAppend()); + + if (!ptr) { + return 0; + } + + if (param_2) { + ((unk*)ptr)->field_0x00 = param_2->x; + ((unk*)ptr)->field_0x04 = param_2->y; + ((unk*)ptr)->field_0x08 = param_2->z; + } + + if (param_3) { + ((unk*)ptr)->field_0x0C = param_3->x; + ((unk*)ptr)->field_0x10 = param_3->y; + ((unk*)ptr)->field_0x14 = param_3->z; + } + + ((unk*)ptr)->field_0x18 = param_1; + return ptr; } // fopKyM_Delete__FPv // fopKyM_Delete(void*) -asm void fopKyM_Delete(void) { +asm void fopKyM_Delete(void*) { nofralloc #include "f/f_op/f_op_kankyo_mng/asm/func_8001F748.s" } // fopKyM_Create__FsPFPv_iPv // fopKyM_Create(s16, int (*)(void*), void*) -asm void fopKyM_Create(void) { +asm void fopKyM_Create(s16, int (*)(void*), void*) { nofralloc #include "f/f_op/f_op_kankyo_mng/asm/func_8001F768.s" } // fopKyM_create__FsiP4cXyzP4cXyzPFPv_i // fopKyM_create(s16, int, cXyz*, cXyz*, int (*)(void*)) -asm void fopKyM_create(void) { +asm void fopKyM_create(s16, int, cXyz*, cXyz*, int (*)(void*)) { nofralloc #include "f/f_op/f_op_kankyo_mng/asm/func_8001F7B8.s" } // fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i // fopKyM_fastCreate(s16, int, cXyz*, cXyz*, int (*)(void*)) -asm void fopKyM_fastCreate(void) { +asm void fopKyM_fastCreate(s16, int, cXyz*, cXyz*, int (*)(void*)) { nofralloc #include "f/f_op/f_op_kankyo_mng/asm/func_8001F818.s" } // fopKyM_createWpillar__FPC4cXyzfi // fopKyM_createWpillar(const cXyz*, f32, int) -asm void fopKyM_createWpillar(void) { +asm void fopKyM_createWpillar(const cXyz*, f32, int) { nofralloc #include "f/f_op/f_op_kankyo_mng/asm/func_8001F87C.s" } // fopKyM_createMpillar__FPC4cXyzf // fopKyM_createMpillar(const cXyz*, f32) -asm void func_8001F90C(void) { +asm void fopKyM_createMpillar(const cXyz*, f32) { nofralloc #include "f/f_op/f_op_kankyo_mng/asm/func_8001F90C.s" -} -}; +} \ No newline at end of file