diff options
| author | lepelog <lepelog@users.noreply.github.com> | 2021-04-19 18:11:56 +0200 |
|---|---|---|
| committer | lepelog <lepelog@users.noreply.github.com> | 2021-04-19 18:11:56 +0200 |
| commit | a9c78b5b0bc85f45e4ed5a3e9f1ddc12c8c47308 (patch) | |
| tree | f1b088b0b73c4df9e7ef80dc0798f8afd1d4ed6c /libs/SSystem/SComponent/c_lib.cpp | |
| parent | 8cfd681585f83e139bf980917923153664e51093 (diff) | |
| parent | 3e8554bd51f7fd1e8fc2e2dc517295379a780917 (diff) | |
Merge remote-tracking branch 'Julgodis/dol2asm_fullsplitt' into new-disasm-codecopy
Diffstat (limited to 'libs/SSystem/SComponent/c_lib.cpp')
| -rw-r--r-- | libs/SSystem/SComponent/c_lib.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libs/SSystem/SComponent/c_lib.cpp b/libs/SSystem/SComponent/c_lib.cpp index a3aaacdc0e..21aec1cc0f 100644 --- a/libs/SSystem/SComponent/c_lib.cpp +++ b/libs/SSystem/SComponent/c_lib.cpp @@ -4,13 +4,13 @@ // #include "SSystem/SComponent/c_lib.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "JSystem/JMath/JMath.h" -#include "SSystem/SComponent/c_xyz.h" #include "SSystem/SComponent/c_math.h" -#include "msl_c/string.h" +#include "SSystem/SComponent/c_xyz.h" +#include "dol2asm.h" +#include "dolphin/types.h" #include "msl_c/math.h" +#include "msl_c/string.h" // // Forward References: @@ -132,8 +132,7 @@ SECTION_SDATA2 static f32 lit_2382[1 + 1 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm f32 cLib_addCalcPos(cXyz* param_0, cXyz const& param_1, f32 param_2, f32 param_3, - f32 param_4) { +asm f32 cLib_addCalcPos(cXyz* param_0, cXyz const& param_1, f32 param_2, f32 param_3, f32 param_4) { nofralloc #include "asm/SSystem/SComponent/c_lib/cLib_addCalcPos__FP4cXyzRC4cXyzfff.s" } @@ -144,7 +143,7 @@ asm f32 cLib_addCalcPos(cXyz* param_0, cXyz const& param_1, f32 param_2, f32 par #pragma optimization_level 0 #pragma optimizewithasm off asm f32 cLib_addCalcPosXZ(cXyz* param_0, cXyz const& param_1, f32 param_2, f32 param_3, - f32 param_4) { + f32 param_4) { nofralloc #include "asm/SSystem/SComponent/c_lib/cLib_addCalcPosXZ__FP4cXyzRC4cXyzfff.s" } @@ -269,7 +268,6 @@ s16 cLib_targetAngleX(cXyz const* param_0, cXyz const* param_1) { cXyz diff = *param_1 - *param_0; f32 f1 = sqrtf(diff.getMagXZ()); return cM_atan2s(diff.GetY(), f1); - } #else #pragma push @@ -303,7 +301,7 @@ s32 cLib_distanceAngleS(s16 x, s16 y) { static Mtx mtx[10]; /* 80450768-80450770 -00001 0004+04 6/6 2/2 695/695 .sdata calc_mtx */ -Mtx *calc_mtx = mtx; +Mtx* calc_mtx = mtx; /* 80270E4C-80270E5C 26B78C 0010+00 0/0 1/1 0/0 .text MtxInit__Fv */ void MtxInit() { |