diff options
| author | Pheenoh <pheenoh@gmail.com> | 2021-02-20 10:25:31 -0500 |
|---|---|---|
| committer | Pheenoh <pheenoh@gmail.com> | 2021-02-20 10:25:31 -0500 |
| commit | d102f73e7a1bb18745cdedc034baee3c88aeb065 (patch) | |
| tree | 8ec4492439f311ab670ed99e5cc5d40118522237 /include/JSystem | |
| parent | b0499177ef7e08594fbac1665d1ac6f8dc9d0d47 (diff) | |
| parent | 5c83d2532c610dc9eb5fb4f36c250174c79964e4 (diff) | |
Merge branch 'master' of https://github.com/zeldaret/tp
Diffstat (limited to 'include/JSystem')
5 files changed, 4 insertions, 6 deletions
diff --git a/include/JSystem/JStudio/asm/composite_index__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer.s b/include/JSystem/JStudio/asm/composite_index__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer.s index 50057d0af2..e4e892081b 100644 --- a/include/JSystem/JStudio/asm/composite_index__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer.s +++ b/include/JSystem/JStudio/asm/composite_index__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer.s @@ -28,7 +28,7 @@ lbl_80281F1C: /* 80281F28 0027EE68 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80281F2C 0027EE6C 7D 89 03 A6 */ mtctr r12 /* 80281F30 0027EE70 4E 80 04 21 */ bctrl -/* 80281F34 0027EE74 48 0E A1 C9 */ bl func_8036C0FC +/* 80281F34 0027EE74 48 0E A1 C9 */ bl floor /* 80281F38 0027EE78 FC 00 08 1E */ fctiwz f0, f1 /* 80281F3C 0027EE7C D8 01 00 18 */ stfd f0, 0x18(r1) /* 80281F40 0027EE80 80 61 00 1C */ lwz r3, 0x1c(r1) diff --git a/include/JSystem/JStudio/asm/getValue__Q27JStudio19TFunctionValue_listFd.s b/include/JSystem/JStudio/asm/getValue__Q27JStudio19TFunctionValue_listFd.s index 47b6f7e651..eee0755c09 100644 --- a/include/JSystem/JStudio/asm/getValue__Q27JStudio19TFunctionValue_listFd.s +++ b/include/JSystem/JStudio/asm/getValue__Q27JStudio19TFunctionValue_listFd.s @@ -236,7 +236,7 @@ lbl_80282BA8: /* 80282BBC 0027FAFC 7C 23 04 2E */ lfsx f1, r3, r0 /* 80282BC0 0027FB00 48 00 00 28 */ b lbl_80282BE8 lbl_80282BC4: -/* 80282BC4 0027FB04 48 0E 95 39 */ bl func_8036C0FC +/* 80282BC4 0027FB04 48 0E 95 39 */ bl floor /* 80282BC8 0027FB08 D8 21 00 10 */ stfd f1, 0x10(r1) /* 80282BCC 0027FB0C 48 0D F4 E1 */ bl __cvt_fp2unsigned /* 80282BD0 0027FB10 90 61 00 18 */ stw r3, 0x18(r1) diff --git a/include/JSystem/JStudio/asm/interpolateValue_BSpline_nonuniform__Q27JStudio13functionvalueFdPCdPCd.s b/include/JSystem/JStudio/asm/interpolateValue_BSpline_nonuniform__Q27JStudio13functionvalueFdPCdPCd.s index fccb99289f..84ab937dff 100644 --- a/include/JSystem/JStudio/asm/interpolateValue_BSpline_nonuniform__Q27JStudio13functionvalueFdPCdPCd.s +++ b/include/JSystem/JStudio/asm/interpolateValue_BSpline_nonuniform__Q27JStudio13functionvalueFdPCdPCd.s @@ -63,7 +63,7 @@ /* 802818D0 0027E810 C8 02 BA 38 */ lfd f0, 0x80455438 - 0x80459A00(r2) /*SDA HACK; original: lbl_80455438-_SDA2_BASE_(r2)*/ /* 802818D4 0027E814 FF E0 07 B2 */ fmul f31, f0, f30 /* 802818D8 0027E818 FC 40 F8 90 */ fmr f2, f31 -/* 802818DC 0027E81C 48 0E AE 85 */ bl func_8036C760 +/* 802818DC 0027E81C 48 0E AE 85 */ bl fmod /* 802818E0 0027E820 C8 02 BA 00 */ lfd f0, 0x80455400 - 0x80459A00(r2) /*SDA HACK; original: lbl_80455400-_SDA2_BASE_(r2)*/ /* 802818E4 0027E824 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 802818E8 0027E828 40 80 00 08 */ bge lbl_802818F0 diff --git a/include/JSystem/JStudio/functionvalue.h b/include/JSystem/JStudio/functionvalue.h index 54a8492747..3bc7380de6 100644 --- a/include/JSystem/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/functionvalue.h @@ -12,14 +12,12 @@ extern void toFunction_outside__Q27JStudio14TFunctionValueFi(); extern void JGadget_NS_TVector_pointer_void(); extern void __ct__Q27JStudio14TFunctionValueFv(); extern void func_80365078(); -extern void func_8036C0FC(); extern void interpolateValue_hermite__Q27JStudio13functionvalueFddddddd(); extern void interpolateValue_BSpline_uniform__Q27JStudio13functionvalueFddddd(); extern void JGadget_NS_findUpperBound_binary_current(); extern void range_getParameter__Q27JStudio29TFunctionValueAttribute_rangeCFddd(); extern void interpolateValue_BSpline_nonuniform__Q27JStudio13functionvalueFdPCdPCd(); extern void JGadget_NS_findUpperBound_binary_current_X2_(); -extern f64 func_8036C760(f64 a1, f64 a2); } extern DoubleFunc lbl_8039A9F0[]; diff --git a/include/JSystem/JUtility/JUTGamePad/asm/func_802E1238.s b/include/JSystem/JUtility/JUTGamePad/asm/func_802E1238.s index 40e46c9593..bd2b2f6efe 100644 --- a/include/JSystem/JUtility/JUTGamePad/asm/func_802E1238.s +++ b/include/JSystem/JUtility/JUTGamePad/asm/func_802E1238.s @@ -175,7 +175,7 @@ lbl_802E1498: lbl_802E14A4: /* 802E14A4 002DE3E4 C0 3D 00 00 */ lfs f1, 0(r29) /* 802E14A8 002DE3E8 FC 40 00 50 */ fneg f2, f0 -/* 802E14AC 002DE3EC 48 08 B2 75 */ bl func_8036C720 +/* 802E14AC 002DE3EC 48 08 B2 75 */ bl atan2 /* 802E14B0 002DE3F0 FC 20 08 18 */ frsp f1, f1 /* 802E14B4 002DE3F4 C0 02 C6 4C */ lfs f0, lbl_8045604C-_SDA2_BASE_(r2) /* 802E14B8 002DE3F8 EC 00 00 72 */ fmuls f0, f0, f1 |