diff options
| author | lepelog <lepelog@users.noreply.github.com> | 2021-01-07 02:04:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-06 20:04:53 -0500 |
| commit | 0cf65151b3a1a85a5d3ad74a367045e596aee1aa (patch) | |
| tree | 9ac4f66b24945629766d587a9514ad513b11241c /include | |
| parent | 792509e0a15687b76bee216440ccd3d90554f37e (diff) | |
Split SComponent (#45)
* split c_math
* split c_angle
* split c_API_controller_pad
* split c_API_graphic
* split c_bg_s_chk
* c_bg_s_gnd_chk split
* more c_bg split
* split c_cc_d
* delete asm
* split c_cc_s
* split c_lib
* split c_m2d and c_m3d_g_aab
* split c_m3d_g_cir
* split c_m3d_g_cps
* split rest of c_m3d_g
* split c_m3d
* split c_malloc
* split c_request
* split c_sxyz
* split and partly decompile c_xyz
* format
* c_angle.h
* begin c_angle decomp
* c_angle
* progress adding stub classes for SComponent
* more c_m3d
* remove some asm and format
* more m3d headers
* more c_angle decomp
* c_lib headers
* add public to classes
* fix csXyz member names
* c_sxyz partly OK
* move Zero csXyz to c_sxyz header
* c_API_graphic
* delete some unused asm
* move math extern data, decompile some functions
* delete unused asm
* fix duplicated c_angle.h
* fix an inlined function name, add more inlined functions for c_angle.h (currently unused)
* format
Co-authored-by: Pheenoh <pheenoh@gmail.com>
Diffstat (limited to 'include')
795 files changed, 17976 insertions, 2915 deletions
diff --git a/include/SComponent/c_API_graphic.h b/include/SComponent/c_API_graphic.h new file mode 100644 index 0000000000..addd8ce849 --- /dev/null +++ b/include/SComponent/c_API_graphic.h @@ -0,0 +1,10 @@ +#ifndef __C_API_GRAPHIC_H_ +#define __C_API_GRAPHIC_H_ + +#include "global.h" + +void cAPIGph_Painter(void); +void cAPIGph_BeforeOfDraw(void); +void cAPIGph_AfterOfDraw(void); + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_angle.h b/include/SComponent/c_angle.h new file mode 100644 index 0000000000..09a99e0388 --- /dev/null +++ b/include/SComponent/c_angle.h @@ -0,0 +1,104 @@ +#ifndef __C_ANGLE_H_ +#define __C_ANGLE_H_ + +#include "SComponent/c_xyz.h" +#include "global.h" + +class cSAngle { +private: + s16 mAngle; + +public: + cSAngle() {} + cSAngle(const cSAngle&); + cSAngle(s16); + cSAngle(float); + s16 Val() const { return this->mAngle; } + // void Set(s16 angle) { this->mAngle = angle; } + void Val(const cSAngle&); + void Val(s16); + void Val(float); + float Degree(void) const; + float Radian(void) const; + float Norm(void) const; + s16 Abs(void) const; + s16 Inv(void) const; + float Sin(void) const; + float Cos(void) const; + cSAngle operator-(void) const; + cSAngle operator+(const cSAngle&) const; + cSAngle operator-(const cSAngle&) const; + void operator+=(const cSAngle&); + void operator-=(const cSAngle&); + cSAngle operator+(short) const; + cSAngle operator-(short) const; + void operator+=(short); + cSAngle operator*(float) const; + void operator*=(float); + bool operator<(const cSAngle& other) const { return mAngle < other.mAngle; } + bool operator>(const cSAngle& other) const { return mAngle > other.mAngle; } + operator s16(void) const { return mAngle; } + void operator=(const cSAngle& other) { mAngle = other.mAngle; } + static cSAngle getMaxNegative(void) { return cSAngle((s16)-0x8000); } + void mirrorAtMaxNeg(void) { *this = getMaxNegative() - *this; } +}; + +cSAngle operator+(short, const cSAngle&); +cSAngle operator-(short, const cSAngle&); + +class cDegree { +private: + float mDegree; + +public: + cDegree(float); + cDegree& Formal(void); + void Val(float); + float Radian(void) const; + float Sin(void) const; + float Cos(void) const; + float Tan(void) const; +}; + +class cSPolar { +private: + float mRadial; + cSAngle mAngle1; + cSAngle mAngle2; + +public: + cSPolar() {} + cSPolar(const cXyz&); + cSPolar& Formal(void); + void Val(float, short, short); + void Val(const cXyz&); + cXyz Xyz(void) const; + void Globe(class cSGlobe*) const; +}; + +class cSGlobe { +private: + float mRadius; + cSAngle mAzimuth; // original: V + cSAngle mInclination; // original: U + +public: + cSGlobe(const cSGlobe&); + cSGlobe(float, short, short); + cSGlobe(float, const cSAngle&, const cSAngle&); + cSGlobe(const cXyz&); + cSGlobe& Formal(void); + void Val(const cSGlobe&); + void Val(float, short, short); + void Val(float, const cSAngle&, const cSAngle&); + void Val(const cXyz&); + float R(void) const { return mRadius; } + const cSAngle& V(void) const { return mAzimuth; } + const cSAngle& U(void) const { return mInclination; } + cXyz Xyz(void) const; + void Polar(cSPolar*) const; + cXyz Norm(void) const; + cSGlobe& Invert(void); +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_angle/asm/func_80271030.s b/include/SComponent/c_angle/asm/func_80271030.s new file mode 100644 index 0000000000..f58388a4e9 --- /dev/null +++ b/include/SComponent/c_angle/asm/func_80271030.s @@ -0,0 +1,13 @@ +/* 80271030 0026DF70 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80271034 0026DF74 C0 42 B8 0C */ lfs f2, lbl_8045520C-_SDA2_BASE_(r2) +/* 80271038 0026DF78 A8 03 00 00 */ lha r0, 0(r3) +/* 8027103C 0026DF7C C8 22 B8 10 */ lfd f1, lbl_80455210-_SDA2_BASE_(r2) +/* 80271040 0026DF80 6C 00 80 00 */ xoris r0, r0, 0x8000 +/* 80271044 0026DF84 90 01 00 0C */ stw r0, 0xc(r1) +/* 80271048 0026DF88 3C 00 43 30 */ lis r0, 0x4330 +/* 8027104C 0026DF8C 90 01 00 08 */ stw r0, 8(r1) +/* 80271050 0026DF90 C8 01 00 08 */ lfd f0, 8(r1) +/* 80271054 0026DF94 EC 00 08 28 */ fsubs f0, f0, f1 +/* 80271058 0026DF98 EC 22 00 32 */ fmuls f1, f2, f0 +/* 8027105C 0026DF9C 38 21 00 10 */ addi r1, r1, 0x10 +/* 80271060 0026DFA0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_angle/asm/func_80271064.s b/include/SComponent/c_angle/asm/func_80271064.s new file mode 100644 index 0000000000..23d5cd7be1 --- /dev/null +++ b/include/SComponent/c_angle/asm/func_80271064.s @@ -0,0 +1,13 @@ +/* 80271064 0026DFA4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80271068 0026DFA8 C0 42 B8 18 */ lfs f2, lbl_80455218-_SDA2_BASE_(r2) +/* 8027106C 0026DFAC A8 03 00 00 */ lha r0, 0(r3) +/* 80271070 0026DFB0 C8 22 B8 10 */ lfd f1, lbl_80455210-_SDA2_BASE_(r2) +/* 80271074 0026DFB4 6C 00 80 00 */ xoris r0, r0, 0x8000 +/* 80271078 0026DFB8 90 01 00 0C */ stw r0, 0xc(r1) +/* 8027107C 0026DFBC 3C 00 43 30 */ lis r0, 0x4330 +/* 80271080 0026DFC0 90 01 00 08 */ stw r0, 8(r1) +/* 80271084 0026DFC4 C8 01 00 08 */ lfd f0, 8(r1) +/* 80271088 0026DFC8 EC 00 08 28 */ fsubs f0, f0, f1 +/* 8027108C 0026DFCC EC 22 00 32 */ fmuls f1, f2, f0 +/* 80271090 0026DFD0 38 21 00 10 */ addi r1, r1, 0x10 +/* 80271094 0026DFD4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_angle/asm/func_80271098.s b/include/SComponent/c_angle/asm/func_80271098.s new file mode 100644 index 0000000000..53387be03f --- /dev/null +++ b/include/SComponent/c_angle/asm/func_80271098.s @@ -0,0 +1,13 @@ +/* 80271098 0026DFD8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8027109C 0026DFDC C0 42 B8 1C */ lfs f2, lbl_8045521C-_SDA2_BASE_(r2) +/* 802710A0 0026DFE0 A8 03 00 00 */ lha r0, 0(r3) +/* 802710A4 0026DFE4 C8 22 B8 10 */ lfd f1, lbl_80455210-_SDA2_BASE_(r2) +/* 802710A8 0026DFE8 6C 00 80 00 */ xoris r0, r0, 0x8000 +/* 802710AC 0026DFEC 90 01 00 0C */ stw r0, 0xc(r1) +/* 802710B0 0026DFF0 3C 00 43 30 */ lis r0, 0x4330 +/* 802710B4 0026DFF4 90 01 00 08 */ stw r0, 8(r1) +/* 802710B8 0026DFF8 C8 01 00 08 */ lfd f0, 8(r1) +/* 802710BC 0026DFFC EC 00 08 28 */ fsubs f0, f0, f1 +/* 802710C0 0026E000 EC 22 00 32 */ fmuls f1, f2, f0 +/* 802710C4 0026E004 38 21 00 10 */ addi r1, r1, 0x10 +/* 802710C8 0026E008 4E 80 00 20 */ blr diff --git a/include/SComponent/c_angle/asm/func_80271264.s b/include/SComponent/c_angle/asm/func_80271264.s new file mode 100644 index 0000000000..0eb4364e6a --- /dev/null +++ b/include/SComponent/c_angle/asm/func_80271264.s @@ -0,0 +1,20 @@ +/* 80271264 0026E1A4 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80271268 0026E1A8 7C 08 02 A6 */ mflr r0 +/* 8027126C 0026E1AC 90 01 00 24 */ stw r0, 0x24(r1) +/* 80271270 0026E1B0 A8 04 00 00 */ lha r0, 0(r4) +/* 80271274 0026E1B4 C8 42 B8 10 */ lfd f2, lbl_80455210-_SDA2_BASE_(r2) +/* 80271278 0026E1B8 6C 00 80 00 */ xoris r0, r0, 0x8000 +/* 8027127C 0026E1BC 90 01 00 0C */ stw r0, 0xc(r1) +/* 80271280 0026E1C0 3C 00 43 30 */ lis r0, 0x4330 +/* 80271284 0026E1C4 90 01 00 08 */ stw r0, 8(r1) +/* 80271288 0026E1C8 C8 01 00 08 */ lfd f0, 8(r1) +/* 8027128C 0026E1CC EC 00 10 28 */ fsubs f0, f0, f2 +/* 80271290 0026E1D0 EC 00 00 72 */ fmuls f0, f0, f1 +/* 80271294 0026E1D4 FC 00 00 1E */ fctiwz f0, f0 +/* 80271298 0026E1D8 D8 01 00 10 */ stfd f0, 0x10(r1) +/* 8027129C 0026E1DC 80 81 00 14 */ lwz r4, 0x14(r1) +/* 802712A0 0026E1E0 4B FF FC F9 */ bl __ct__7cSAngleFs +/* 802712A4 0026E1E4 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802712A8 0026E1E8 7C 08 03 A6 */ mtlr r0 +/* 802712AC 0026E1EC 38 21 00 20 */ addi r1, r1, 0x20 +/* 802712B0 0026E1F0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_angle/asm/func_802712B4.s b/include/SComponent/c_angle/asm/func_802712B4.s new file mode 100644 index 0000000000..3c8d99d7bd --- /dev/null +++ b/include/SComponent/c_angle/asm/func_802712B4.s @@ -0,0 +1,16 @@ +/* 802712B4 0026E1F4 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802712B8 0026E1F8 A8 03 00 00 */ lha r0, 0(r3) +/* 802712BC 0026E1FC C8 42 B8 10 */ lfd f2, lbl_80455210-_SDA2_BASE_(r2) +/* 802712C0 0026E200 6C 00 80 00 */ xoris r0, r0, 0x8000 +/* 802712C4 0026E204 90 01 00 0C */ stw r0, 0xc(r1) +/* 802712C8 0026E208 3C 00 43 30 */ lis r0, 0x4330 +/* 802712CC 0026E20C 90 01 00 08 */ stw r0, 8(r1) +/* 802712D0 0026E210 C8 01 00 08 */ lfd f0, 8(r1) +/* 802712D4 0026E214 EC 00 10 28 */ fsubs f0, f0, f2 +/* 802712D8 0026E218 EC 00 00 72 */ fmuls f0, f0, f1 +/* 802712DC 0026E21C FC 00 00 1E */ fctiwz f0, f0 +/* 802712E0 0026E220 D8 01 00 10 */ stfd f0, 0x10(r1) +/* 802712E4 0026E224 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802712E8 0026E228 B0 03 00 00 */ sth r0, 0(r3) +/* 802712EC 0026E22C 38 21 00 20 */ addi r1, r1, 0x20 +/* 802712F0 0026E230 4E 80 00 20 */ blr diff --git a/include/SComponent/c_angle/asm/func_80271BD4.s b/include/SComponent/c_angle/asm/func_80271BD4.s new file mode 100644 index 0000000000..e0936cdf5d --- /dev/null +++ b/include/SComponent/c_angle/asm/func_80271BD4.s @@ -0,0 +1,46 @@ +/* 80271BD4 0026EB14 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80271BD8 0026EB18 7C 08 02 A6 */ mflr r0 +/* 80271BDC 0026EB1C 90 01 00 14 */ stw r0, 0x14(r1) +/* 80271BE0 0026EB20 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80271BE4 0026EB24 3C 60 80 43 */ lis r3, lbl_80430F98@ha +/* 80271BE8 0026EB28 3B E3 0F 98 */ addi r31, r3, lbl_80430F98@l +/* 80271BEC 0026EB2C 38 6D 8C 08 */ addi r3, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ +/* 80271BF0 0026EB30 38 80 00 00 */ li r4, 0 +/* 80271BF4 0026EB34 4B FF F3 A5 */ bl __ct__7cSAngleFs +/* 80271BF8 0026EB38 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha +/* 80271BFC 0026EB3C 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 80271C00 0026EB40 38 BF 00 00 */ addi r5, r31, 0 +/* 80271C04 0026EB44 48 0F 00 21 */ bl func_80361C24 +/* 80271C08 0026EB48 38 6D 8C 0C */ addi r3, r13, 0x8045118C - 0x80458580 /*SDA HACK; original: lbl_8045118C-_SDA_BASE_*/ +/* 80271C0C 0026EB4C 38 80 00 B6 */ li r4, 0xb6 +/* 80271C10 0026EB50 4B FF F3 89 */ bl __ct__7cSAngleFs +/* 80271C14 0026EB54 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha +/* 80271C18 0026EB58 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 80271C1C 0026EB5C 38 BF 00 0C */ addi r5, r31, 0xc +/* 80271C20 0026EB60 48 0F 00 05 */ bl func_80361C24 +/* 80271C24 0026EB64 38 6D 8C 10 */ addi r3, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ +/* 80271C28 0026EB68 38 80 40 00 */ li r4, 0x4000 +/* 80271C2C 0026EB6C 4B FF F3 6D */ bl __ct__7cSAngleFs +/* 80271C30 0026EB70 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha +/* 80271C34 0026EB74 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 80271C38 0026EB78 38 BF 00 18 */ addi r5, r31, 0x18 +/* 80271C3C 0026EB7C 48 0E FF E9 */ bl func_80361C24 +/* 80271C40 0026EB80 38 6D 8C 14 */ addi r3, r13, 0x80451194 - 0x80458580 /*SDA HACK; original: lbl_80451194-_SDA_BASE_*/ +/* 80271C44 0026EB84 38 80 80 00 */ li r4, -32768 +/* 80271C48 0026EB88 4B FF F3 51 */ bl __ct__7cSAngleFs +/* 80271C4C 0026EB8C 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha +/* 80271C50 0026EB90 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 80271C54 0026EB94 38 BF 00 24 */ addi r5, r31, 0x24 +/* 80271C58 0026EB98 48 0E FF CD */ bl func_80361C24 +/* 80271C5C 0026EB9C 38 6D 8C 18 */ addi r3, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ +/* 80271C60 0026EBA0 38 80 C0 00 */ li r4, -16384 +/* 80271C64 0026EBA4 4B FF F3 35 */ bl __ct__7cSAngleFs +/* 80271C68 0026EBA8 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha +/* 80271C6C 0026EBAC 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 80271C70 0026EBB0 38 BF 00 30 */ addi r5, r31, 0x30 +/* 80271C74 0026EBB4 48 0E FF B1 */ bl func_80361C24 +/* 80271C78 0026EBB8 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80271C7C 0026EBBC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80271C80 0026EBC0 7C 08 03 A6 */ mtlr r0 +/* 80271C84 0026EBC4 38 21 00 10 */ addi r1, r1, 0x10 +/* 80271C88 0026EBC8 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_angle/c_angle.h b/include/SComponent/c_angle/c_angle.h deleted file mode 100644 index c73747ca47..0000000000 --- a/include/SComponent/c_angle/c_angle.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __C_ANGLE_H_ -#define __C_ANGLE_H_ - -#include "global.h" - -class cSAngle { -public: - cSAngle(); - -private: - s16 value; -}; - -#endif
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_chk.h b/include/SComponent/c_bg_s_chk.h new file mode 100644 index 0000000000..0d6016e4f0 --- /dev/null +++ b/include/SComponent/c_bg_s_chk.h @@ -0,0 +1,14 @@ +#ifndef __C_BG_S_CHK_H_ +#define __C_BG_S_CHK_H_ + +#include "global.h" + +class cBgS_Chk { +public: + cBgS_Chk(void); + ~cBgS_Chk(void); + void SetExtChk(cBgS_Chk&); + bool ChkSameActorPid(unsigned int) const; +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_chk/asm/func_80267B4C.s b/include/SComponent/c_bg_s_chk/asm/func_80267B4C.s new file mode 100644 index 0000000000..f6368d6fdb --- /dev/null +++ b/include/SComponent/c_bg_s_chk/asm/func_80267B4C.s @@ -0,0 +1,9 @@ +/* 80267B4C 00264A8C 3C 80 80 3C */ lis r4, lbl_803C3F80@ha +/* 80267B50 00264A90 38 04 3F 80 */ addi r0, r4, lbl_803C3F80@l +/* 80267B54 00264A94 90 03 00 10 */ stw r0, 0x10(r3) +/* 80267B58 00264A98 38 00 00 00 */ li r0, 0 +/* 80267B5C 00264A9C 90 03 00 00 */ stw r0, 0(r3) +/* 80267B60 00264AA0 90 03 00 04 */ stw r0, 4(r3) +/* 80267B64 00264AA4 38 00 00 01 */ li r0, 1 +/* 80267B68 00264AA8 98 03 00 0C */ stb r0, 0xc(r3) +/* 80267B6C 00264AAC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_chk/asm/func_80267B70.s b/include/SComponent/c_bg_s_chk/asm/func_80267B70.s new file mode 100644 index 0000000000..eb0cabb579 --- /dev/null +++ b/include/SComponent/c_bg_s_chk/asm/func_80267B70.s @@ -0,0 +1,19 @@ +/* 80267B70 00264AB0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80267B74 00264AB4 7C 08 02 A6 */ mflr r0 +/* 80267B78 00264AB8 90 01 00 14 */ stw r0, 0x14(r1) +/* 80267B7C 00264ABC 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80267B80 00264AC0 7C 7F 1B 79 */ or. r31, r3, r3 +/* 80267B84 00264AC4 41 82 00 1C */ beq lbl_80267BA0 +/* 80267B88 00264AC8 3C A0 80 3C */ lis r5, lbl_803C3F80@ha +/* 80267B8C 00264ACC 38 05 3F 80 */ addi r0, r5, lbl_803C3F80@l +/* 80267B90 00264AD0 90 1F 00 10 */ stw r0, 0x10(r31) +/* 80267B94 00264AD4 7C 80 07 35 */ extsh. r0, r4 +/* 80267B98 00264AD8 40 81 00 08 */ ble lbl_80267BA0 +/* 80267B9C 00264ADC 48 06 71 A1 */ bl __dl__FPv +lbl_80267BA0: +/* 80267BA0 00264AE0 7F E3 FB 78 */ mr r3, r31 +/* 80267BA4 00264AE4 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80267BA8 00264AE8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80267BAC 00264AEC 7C 08 03 A6 */ mtlr r0 +/* 80267BB0 00264AF0 38 21 00 10 */ addi r1, r1, 0x10 +/* 80267BB4 00264AF4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_chk/asm/func_80267BB8.s b/include/SComponent/c_bg_s_chk/asm/func_80267BB8.s new file mode 100644 index 0000000000..95613597cd --- /dev/null +++ b/include/SComponent/c_bg_s_chk/asm/func_80267BB8.s @@ -0,0 +1,9 @@ +/* 80267BB8 00264AF8 80 04 00 00 */ lwz r0, 0(r4) +/* 80267BBC 00264AFC 90 03 00 00 */ stw r0, 0(r3) +/* 80267BC0 00264B00 80 04 00 04 */ lwz r0, 4(r4) +/* 80267BC4 00264B04 90 03 00 04 */ stw r0, 4(r3) +/* 80267BC8 00264B08 80 04 00 08 */ lwz r0, 8(r4) +/* 80267BCC 00264B0C 90 03 00 08 */ stw r0, 8(r3) +/* 80267BD0 00264B10 88 04 00 0C */ lbz r0, 0xc(r4) +/* 80267BD4 00264B14 98 03 00 0C */ stb r0, 0xc(r3) +/* 80267BD8 00264B18 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_chk/asm/func_80267BDC.s b/include/SComponent/c_bg_s_chk/asm/func_80267BDC.s new file mode 100644 index 0000000000..46b6af51d2 --- /dev/null +++ b/include/SComponent/c_bg_s_chk/asm/func_80267BDC.s @@ -0,0 +1,18 @@ +/* 80267BDC 00264B1C 80 A3 00 08 */ lwz r5, 8(r3) +/* 80267BE0 00264B20 3C 05 00 01 */ addis r0, r5, 1 +/* 80267BE4 00264B24 28 00 FF FF */ cmplwi r0, 0xffff +/* 80267BE8 00264B28 41 82 00 1C */ beq lbl_80267C04 +/* 80267BEC 00264B2C 3C 04 00 01 */ addis r0, r4, 1 +/* 80267BF0 00264B30 28 00 FF FF */ cmplwi r0, 0xffff +/* 80267BF4 00264B34 41 82 00 10 */ beq lbl_80267C04 +/* 80267BF8 00264B38 88 03 00 0C */ lbz r0, 0xc(r3) +/* 80267BFC 00264B3C 28 00 00 00 */ cmplwi r0, 0 +/* 80267C00 00264B40 40 82 00 0C */ bne lbl_80267C0C +lbl_80267C04: +/* 80267C04 00264B44 38 60 00 00 */ li r3, 0 +/* 80267C08 00264B48 4E 80 00 20 */ blr +lbl_80267C0C: +/* 80267C0C 00264B4C 7C 05 20 50 */ subf r0, r5, r4 +/* 80267C10 00264B50 7C 00 00 34 */ cntlzw r0, r0 +/* 80267C14 00264B54 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f +/* 80267C18 00264B58 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_gnd_chk.h b/include/SComponent/c_bg_s_gnd_chk.h new file mode 100644 index 0000000000..c0f0406852 --- /dev/null +++ b/include/SComponent/c_bg_s_gnd_chk.h @@ -0,0 +1,15 @@ +#ifndef __C_BG_S_GND_CHK_H_ +#define __C_BG_S_GND_CHK_H_ + +#include "SComponent/c_xyz.h" +#include "global.h" + +class cBgS_GndChk { + cBgS_GndChk(void); + ~cBgS_GndChk(void); + void SetPos(const Vec*); + void SetPos(const cXyz*); + void PreCheck(void); +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_gnd_chk/asm/func_80267C1C.s b/include/SComponent/c_bg_s_gnd_chk/asm/func_80267C1C.s new file mode 100644 index 0000000000..1a3ea4f532 --- /dev/null +++ b/include/SComponent/c_bg_s_gnd_chk/asm/func_80267C1C.s @@ -0,0 +1,30 @@ +/* 80267C1C 00264B5C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80267C20 00264B60 7C 08 02 A6 */ mflr r0 +/* 80267C24 00264B64 90 01 00 14 */ stw r0, 0x14(r1) +/* 80267C28 00264B68 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80267C2C 00264B6C 7C 7F 1B 78 */ mr r31, r3 +/* 80267C30 00264B70 4B FF FF 1D */ bl __ct__8cBgS_ChkFv +/* 80267C34 00264B74 38 7F 00 14 */ addi r3, r31, 0x14 +/* 80267C38 00264B78 48 00 04 3D */ bl __ct__13cBgS_PolyInfoFv +/* 80267C3C 00264B7C 3C 60 80 3C */ lis r3, lbl_803C3F90@ha +/* 80267C40 00264B80 38 63 3F 90 */ addi r3, r3, lbl_803C3F90@l +/* 80267C44 00264B84 90 7F 00 10 */ stw r3, 0x10(r31) +/* 80267C48 00264B88 38 03 00 0C */ addi r0, r3, 0xc +/* 80267C4C 00264B8C 90 1F 00 20 */ stw r0, 0x20(r31) +/* 80267C50 00264B90 3C 60 80 43 */ lis r3, lbl_80430CF4@ha +/* 80267C54 00264B94 C4 03 0C F4 */ lfsu f0, lbl_80430CF4@l(r3) +/* 80267C58 00264B98 D0 1F 00 24 */ stfs f0, 0x24(r31) +/* 80267C5C 00264B9C C0 03 00 04 */ lfs f0, 4(r3) +/* 80267C60 00264BA0 D0 1F 00 28 */ stfs f0, 0x28(r31) +/* 80267C64 00264BA4 C0 03 00 08 */ lfs f0, 8(r3) +/* 80267C68 00264BA8 D0 1F 00 2C */ stfs f0, 0x2c(r31) +/* 80267C6C 00264BAC 38 00 FF FF */ li r0, -1 +/* 80267C70 00264BB0 90 1F 00 08 */ stw r0, 8(r31) +/* 80267C74 00264BB4 38 00 00 02 */ li r0, 2 +/* 80267C78 00264BB8 90 1F 00 30 */ stw r0, 0x30(r31) +/* 80267C7C 00264BBC 7F E3 FB 78 */ mr r3, r31 +/* 80267C80 00264BC0 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80267C84 00264BC4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80267C88 00264BC8 7C 08 03 A6 */ mtlr r0 +/* 80267C8C 00264BCC 38 21 00 10 */ addi r1, r1, 0x10 +/* 80267C90 00264BD0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_gnd_chk/asm/func_80267C94.s b/include/SComponent/c_bg_s_gnd_chk/asm/func_80267C94.s new file mode 100644 index 0000000000..e4766d5f42 --- /dev/null +++ b/include/SComponent/c_bg_s_gnd_chk/asm/func_80267C94.s @@ -0,0 +1,31 @@ +/* 80267C94 00264BD4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80267C98 00264BD8 7C 08 02 A6 */ mflr r0 +/* 80267C9C 00264BDC 90 01 00 14 */ stw r0, 0x14(r1) +/* 80267CA0 00264BE0 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80267CA4 00264BE4 93 C1 00 08 */ stw r30, 8(r1) +/* 80267CA8 00264BE8 7C 7E 1B 79 */ or. r30, r3, r3 +/* 80267CAC 00264BEC 7C 9F 23 78 */ mr r31, r4 +/* 80267CB0 00264BF0 41 82 00 40 */ beq lbl_80267CF0 +/* 80267CB4 00264BF4 3C 60 80 3C */ lis r3, lbl_803C3F90@ha +/* 80267CB8 00264BF8 38 63 3F 90 */ addi r3, r3, lbl_803C3F90@l +/* 80267CBC 00264BFC 90 7E 00 10 */ stw r3, 0x10(r30) +/* 80267CC0 00264C00 38 03 00 0C */ addi r0, r3, 0xc +/* 80267CC4 00264C04 90 1E 00 20 */ stw r0, 0x20(r30) +/* 80267CC8 00264C08 38 7E 00 14 */ addi r3, r30, 0x14 +/* 80267CCC 00264C0C 38 80 00 00 */ li r4, 0 +/* 80267CD0 00264C10 48 00 03 E1 */ bl __dt__13cBgS_PolyInfoFv +/* 80267CD4 00264C14 7F C3 F3 78 */ mr r3, r30 +/* 80267CD8 00264C18 38 80 00 00 */ li r4, 0 +/* 80267CDC 00264C1C 4B FF FE 95 */ bl __dt__8cBgS_ChkFv +/* 80267CE0 00264C20 7F E0 07 35 */ extsh. r0, r31 +/* 80267CE4 00264C24 40 81 00 0C */ ble lbl_80267CF0 +/* 80267CE8 00264C28 7F C3 F3 78 */ mr r3, r30 +/* 80267CEC 00264C2C 48 06 70 51 */ bl __dl__FPv +lbl_80267CF0: +/* 80267CF0 00264C30 7F C3 F3 78 */ mr r3, r30 +/* 80267CF4 00264C34 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80267CF8 00264C38 83 C1 00 08 */ lwz r30, 8(r1) +/* 80267CFC 00264C3C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80267D00 00264C40 7C 08 03 A6 */ mtlr r0 +/* 80267D04 00264C44 38 21 00 10 */ addi r1, r1, 0x10 +/* 80267D08 00264C48 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_gnd_chk/asm/func_80267D0C.s b/include/SComponent/c_bg_s_gnd_chk/asm/func_80267D0C.s new file mode 100644 index 0000000000..c7faae8d87 --- /dev/null +++ b/include/SComponent/c_bg_s_gnd_chk/asm/func_80267D0C.s @@ -0,0 +1,7 @@ +/* 80267D0C 00264C4C C0 04 00 00 */ lfs f0, 0(r4) +/* 80267D10 00264C50 D0 03 00 24 */ stfs f0, 0x24(r3) +/* 80267D14 00264C54 C0 04 00 04 */ lfs f0, 4(r4) +/* 80267D18 00264C58 D0 03 00 28 */ stfs f0, 0x28(r3) +/* 80267D1C 00264C5C C0 04 00 08 */ lfs f0, 8(r4) +/* 80267D20 00264C60 D0 03 00 2C */ stfs f0, 0x2c(r3) +/* 80267D24 00264C64 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_gnd_chk/asm/func_80267D28.s b/include/SComponent/c_bg_s_gnd_chk/asm/func_80267D28.s new file mode 100644 index 0000000000..eedbd8c9d8 --- /dev/null +++ b/include/SComponent/c_bg_s_gnd_chk/asm/func_80267D28.s @@ -0,0 +1,7 @@ +/* 80267D28 00264C68 C0 04 00 00 */ lfs f0, 0(r4) +/* 80267D2C 00264C6C D0 03 00 24 */ stfs f0, 0x24(r3) +/* 80267D30 00264C70 C0 04 00 04 */ lfs f0, 4(r4) +/* 80267D34 00264C74 D0 03 00 28 */ stfs f0, 0x28(r3) +/* 80267D38 00264C78 C0 04 00 08 */ lfs f0, 8(r4) +/* 80267D3C 00264C7C D0 03 00 2C */ stfs f0, 0x2c(r3) +/* 80267D40 00264C80 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_gnd_chk/asm/func_80267D44.s b/include/SComponent/c_bg_s_gnd_chk/asm/func_80267D44.s new file mode 100644 index 0000000000..033ca9b06c --- /dev/null +++ b/include/SComponent/c_bg_s_gnd_chk/asm/func_80267D44.s @@ -0,0 +1,4 @@ +/* 80267D44 00264C84 80 03 00 30 */ lwz r0, 0x30(r3) +/* 80267D48 00264C88 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e +/* 80267D4C 00264C8C 90 03 00 38 */ stw r0, 0x38(r3) +/* 80267D50 00264C90 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_gnd_chk/asm/func_80267D54.s b/include/SComponent/c_bg_s_gnd_chk/asm/func_80267D54.s new file mode 100644 index 0000000000..dc99041e64 --- /dev/null +++ b/include/SComponent/c_bg_s_gnd_chk/asm/func_80267D54.s @@ -0,0 +1,2 @@ +/* 80267D54 00264C94 38 63 FF EC */ addi r3, r3, -20 +/* 80267D58 00264C98 4B FF FF 3C */ b __dt__11cBgS_GndChkFv
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_lin_chk.h b/include/SComponent/c_bg_s_lin_chk.h new file mode 100644 index 0000000000..91e28b3a52 --- /dev/null +++ b/include/SComponent/c_bg_s_lin_chk.h @@ -0,0 +1,16 @@ +#ifndef __C_BG_S_LIN_CHK_H_ +#define __C_BG_S_LIN_CHK_H_ + +#include "SComponent/c_xyz.h" +#include "global.h" + +class cBgS_LinChk { +public: + cBgS_LinChk(void); + ~cBgS_LinChk(void); + void ct(void); + void Set2(const cXyz*, const cXyz*, unsigned int); + void PreCalc(void); +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_lin_chk/asm/func_80267D5C.s b/include/SComponent/c_bg_s_lin_chk/asm/func_80267D5C.s new file mode 100644 index 0000000000..b9d619c588 --- /dev/null +++ b/include/SComponent/c_bg_s_lin_chk/asm/func_80267D5C.s @@ -0,0 +1,24 @@ +/* 80267D5C 00264C9C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80267D60 00264CA0 7C 08 02 A6 */ mflr r0 +/* 80267D64 00264CA4 90 01 00 14 */ stw r0, 0x14(r1) +/* 80267D68 00264CA8 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80267D6C 00264CAC 7C 7F 1B 78 */ mr r31, r3 +/* 80267D70 00264CB0 4B FF FD DD */ bl __ct__8cBgS_ChkFv +/* 80267D74 00264CB4 38 7F 00 14 */ addi r3, r31, 0x14 +/* 80267D78 00264CB8 48 00 02 FD */ bl __ct__13cBgS_PolyInfoFv +/* 80267D7C 00264CBC 3C 60 80 3C */ lis r3, lbl_803C3FA8@ha +/* 80267D80 00264CC0 38 63 3F A8 */ addi r3, r3, lbl_803C3FA8@l +/* 80267D84 00264CC4 90 7F 00 10 */ stw r3, 0x10(r31) +/* 80267D88 00264CC8 38 03 00 0C */ addi r0, r3, 0xc +/* 80267D8C 00264CCC 90 1F 00 20 */ stw r0, 0x20(r31) +/* 80267D90 00264CD0 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 80267D94 00264CD4 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 80267D98 00264CD8 90 1F 00 3C */ stw r0, 0x3c(r31) +/* 80267D9C 00264CDC 7F E3 FB 78 */ mr r3, r31 +/* 80267DA0 00264CE0 48 00 00 A9 */ bl ct__11cBgS_LinChkFv +/* 80267DA4 00264CE4 7F E3 FB 78 */ mr r3, r31 +/* 80267DA8 00264CE8 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80267DAC 00264CEC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80267DB0 00264CF0 7C 08 03 A6 */ mtlr r0 +/* 80267DB4 00264CF4 38 21 00 10 */ addi r1, r1, 0x10 +/* 80267DB8 00264CF8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_lin_chk/asm/func_80267DBC.s b/include/SComponent/c_bg_s_lin_chk/asm/func_80267DBC.s new file mode 100644 index 0000000000..1bdfa8a8f7 --- /dev/null +++ b/include/SComponent/c_bg_s_lin_chk/asm/func_80267DBC.s @@ -0,0 +1,37 @@ +/* 80267DBC 00264CFC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80267DC0 00264D00 7C 08 02 A6 */ mflr r0 +/* 80267DC4 00264D04 90 01 00 14 */ stw r0, 0x14(r1) +/* 80267DC8 00264D08 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80267DCC 00264D0C 93 C1 00 08 */ stw r30, 8(r1) +/* 80267DD0 00264D10 7C 7E 1B 79 */ or. r30, r3, r3 +/* 80267DD4 00264D14 7C 9F 23 78 */ mr r31, r4 +/* 80267DD8 00264D18 41 82 00 54 */ beq lbl_80267E2C +/* 80267DDC 00264D1C 3C 60 80 3C */ lis r3, lbl_803C3FA8@ha +/* 80267DE0 00264D20 38 63 3F A8 */ addi r3, r3, lbl_803C3FA8@l +/* 80267DE4 00264D24 90 7E 00 10 */ stw r3, 0x10(r30) +/* 80267DE8 00264D28 38 03 00 0C */ addi r0, r3, 0xc +/* 80267DEC 00264D2C 90 1E 00 20 */ stw r0, 0x20(r30) +/* 80267DF0 00264D30 34 1E 00 24 */ addic. r0, r30, 0x24 +/* 80267DF4 00264D34 41 82 00 10 */ beq lbl_80267E04 +/* 80267DF8 00264D38 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 80267DFC 00264D3C 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 80267E00 00264D40 90 1E 00 3C */ stw r0, 0x3c(r30) +lbl_80267E04: +/* 80267E04 00264D44 38 7E 00 14 */ addi r3, r30, 0x14 +/* 80267E08 00264D48 38 80 00 00 */ li r4, 0 +/* 80267E0C 00264D4C 48 00 02 A5 */ bl __dt__13cBgS_PolyInfoFv +/* 80267E10 00264D50 7F C3 F3 78 */ mr r3, r30 +/* 80267E14 00264D54 38 80 00 00 */ li r4, 0 +/* 80267E18 00264D58 4B FF FD 59 */ bl __dt__8cBgS_ChkFv +/* 80267E1C 00264D5C 7F E0 07 35 */ extsh. r0, r31 +/* 80267E20 00264D60 40 81 00 0C */ ble lbl_80267E2C +/* 80267E24 00264D64 7F C3 F3 78 */ mr r3, r30 +/* 80267E28 00264D68 48 06 6F 15 */ bl __dl__FPv +lbl_80267E2C: +/* 80267E2C 00264D6C 7F C3 F3 78 */ mr r3, r30 +/* 80267E30 00264D70 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80267E34 00264D74 83 C1 00 08 */ lwz r30, 8(r1) +/* 80267E38 00264D78 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80267E3C 00264D7C 7C 08 03 A6 */ mtlr r0 +/* 80267E40 00264D80 38 21 00 10 */ addi r1, r1, 0x10 +/* 80267E44 00264D84 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_lin_chk/asm/func_80267E48.s b/include/SComponent/c_bg_s_lin_chk/asm/func_80267E48.s new file mode 100644 index 0000000000..aada51b750 --- /dev/null +++ b/include/SComponent/c_bg_s_lin_chk/asm/func_80267E48.s @@ -0,0 +1,34 @@ +/* 80267E48 00264D88 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80267E4C 00264D8C 7C 08 02 A6 */ mflr r0 +/* 80267E50 00264D90 90 01 00 24 */ stw r0, 0x24(r1) +/* 80267E54 00264D94 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 80267E58 00264D98 7C 7F 1B 78 */ mr r31, r3 +/* 80267E5C 00264D9C 3C 60 80 43 */ lis r3, lbl_80430CF4@ha +/* 80267E60 00264DA0 C4 03 0C F4 */ lfsu f0, lbl_80430CF4@l(r3) +/* 80267E64 00264DA4 D0 01 00 08 */ stfs f0, 8(r1) +/* 80267E68 00264DA8 C0 03 00 04 */ lfs f0, 4(r3) +/* 80267E6C 00264DAC D0 01 00 0C */ stfs f0, 0xc(r1) +/* 80267E70 00264DB0 C0 03 00 08 */ lfs f0, 8(r3) +/* 80267E74 00264DB4 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 80267E78 00264DB8 38 7F 00 24 */ addi r3, r31, 0x24 +/* 80267E7C 00264DBC 38 81 00 08 */ addi r4, r1, 8 +/* 80267E80 00264DC0 7C 85 23 78 */ mr r5, r4 +/* 80267E84 00264DC4 48 00 74 65 */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz +/* 80267E88 00264DC8 C0 01 00 08 */ lfs f0, 8(r1) +/* 80267E8C 00264DCC D0 1F 00 40 */ stfs f0, 0x40(r31) +/* 80267E90 00264DD0 C0 01 00 0C */ lfs f0, 0xc(r1) +/* 80267E94 00264DD4 D0 1F 00 44 */ stfs f0, 0x44(r31) +/* 80267E98 00264DD8 C0 01 00 10 */ lfs f0, 0x10(r1) +/* 80267E9C 00264DDC D0 1F 00 48 */ stfs f0, 0x48(r31) +/* 80267EA0 00264DE0 38 00 FF FF */ li r0, -1 +/* 80267EA4 00264DE4 90 1F 00 08 */ stw r0, 8(r31) +/* 80267EA8 00264DE8 38 60 00 00 */ li r3, 0 +/* 80267EAC 00264DEC 90 7F 00 4C */ stw r3, 0x4c(r31) +/* 80267EB0 00264DF0 38 00 00 01 */ li r0, 1 +/* 80267EB4 00264DF4 98 1F 00 53 */ stb r0, 0x53(r31) +/* 80267EB8 00264DF8 98 7F 00 54 */ stb r3, 0x54(r31) +/* 80267EBC 00264DFC 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 80267EC0 00264E00 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80267EC4 00264E04 7C 08 03 A6 */ mtlr r0 +/* 80267EC8 00264E08 38 21 00 20 */ addi r1, r1, 0x20 +/* 80267ECC 00264E0C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_lin_chk/asm/func_80267ED0.s b/include/SComponent/c_bg_s_lin_chk/asm/func_80267ED0.s new file mode 100644 index 0000000000..a76584ed9e --- /dev/null +++ b/include/SComponent/c_bg_s_lin_chk/asm/func_80267ED0.s @@ -0,0 +1,28 @@ +/* 80267ED0 00264E10 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80267ED4 00264E14 7C 08 02 A6 */ mflr r0 +/* 80267ED8 00264E18 90 01 00 24 */ stw r0, 0x24(r1) +/* 80267EDC 00264E1C 39 61 00 20 */ addi r11, r1, 0x20 +/* 80267EE0 00264E20 48 0F A2 FD */ bl _savegpr_29 +/* 80267EE4 00264E24 7C 7D 1B 78 */ mr r29, r3 +/* 80267EE8 00264E28 7C BE 2B 78 */ mr r30, r5 +/* 80267EEC 00264E2C 7C DF 33 78 */ mr r31, r6 +/* 80267EF0 00264E30 38 7D 00 24 */ addi r3, r29, 0x24 +/* 80267EF4 00264E34 48 00 73 F5 */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz +/* 80267EF8 00264E38 C0 1E 00 00 */ lfs f0, 0(r30) +/* 80267EFC 00264E3C D0 1D 00 40 */ stfs f0, 0x40(r29) +/* 80267F00 00264E40 C0 1E 00 04 */ lfs f0, 4(r30) +/* 80267F04 00264E44 D0 1D 00 44 */ stfs f0, 0x44(r29) +/* 80267F08 00264E48 C0 1E 00 08 */ lfs f0, 8(r30) +/* 80267F0C 00264E4C D0 1D 00 48 */ stfs f0, 0x48(r29) +/* 80267F10 00264E50 93 FD 00 08 */ stw r31, 8(r29) +/* 80267F14 00264E54 80 1D 00 4C */ lwz r0, 0x4c(r29) +/* 80267F18 00264E58 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a +/* 80267F1C 00264E5C 90 1D 00 4C */ stw r0, 0x4c(r29) +/* 80267F20 00264E60 38 7D 00 14 */ addi r3, r29, 0x14 +/* 80267F24 00264E64 48 00 01 FD */ bl ClearPi__13cBgS_PolyInfoFv +/* 80267F28 00264E68 39 61 00 20 */ addi r11, r1, 0x20 +/* 80267F2C 00264E6C 48 0F A2 FD */ bl _restgpr_29 +/* 80267F30 00264E70 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80267F34 00264E74 7C 08 03 A6 */ mtlr r0 +/* 80267F38 00264E78 38 21 00 20 */ addi r1, r1, 0x20 +/* 80267F3C 00264E7C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_lin_chk/asm/func_80267F40.s b/include/SComponent/c_bg_s_lin_chk/asm/func_80267F40.s new file mode 100644 index 0000000000..e111aa6719 --- /dev/null +++ b/include/SComponent/c_bg_s_lin_chk/asm/func_80267F40.s @@ -0,0 +1,16 @@ +/* 80267F40 00264E80 80 03 00 4C */ lwz r0, 0x4c(r3) +/* 80267F44 00264E84 54 00 00 42 */ rlwinm r0, r0, 0, 1, 1 +/* 80267F48 00264E88 7C 00 00 34 */ cntlzw r0, r0 +/* 80267F4C 00264E8C 54 00 D9 7E */ srwi r0, r0, 5 +/* 80267F50 00264E90 98 03 00 50 */ stb r0, 0x50(r3) +/* 80267F54 00264E94 80 03 00 4C */ lwz r0, 0x4c(r3) +/* 80267F58 00264E98 54 00 00 00 */ rlwinm r0, r0, 0, 0, 0 +/* 80267F5C 00264E9C 7C 00 00 34 */ cntlzw r0, r0 +/* 80267F60 00264EA0 54 00 D9 7E */ srwi r0, r0, 5 +/* 80267F64 00264EA4 98 03 00 51 */ stb r0, 0x51(r3) +/* 80267F68 00264EA8 80 03 00 4C */ lwz r0, 0x4c(r3) +/* 80267F6C 00264EAC 54 00 00 84 */ rlwinm r0, r0, 0, 2, 2 +/* 80267F70 00264EB0 7C 00 00 34 */ cntlzw r0, r0 +/* 80267F74 00264EB4 54 00 D9 7E */ srwi r0, r0, 5 +/* 80267F78 00264EB8 98 03 00 52 */ stb r0, 0x52(r3) +/* 80267F7C 00264EBC 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_lin_chk/asm/func_80267F80.s b/include/SComponent/c_bg_s_lin_chk/asm/func_80267F80.s new file mode 100644 index 0000000000..f971b9fc35 --- /dev/null +++ b/include/SComponent/c_bg_s_lin_chk/asm/func_80267F80.s @@ -0,0 +1,2 @@ +/* 80267F80 00264EC0 38 63 FF EC */ addi r3, r3, -20 +/* 80267F84 00264EC4 4B FF FE 38 */ b __dt__11cBgS_LinChkFv
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_poly_info.h b/include/SComponent/c_bg_s_poly_info.h index e82aaade48..873e5c4743 100644 --- a/include/SComponent/c_bg_s_poly_info.h +++ b/include/SComponent/c_bg_s_poly_info.h @@ -1,6 +1,19 @@ #ifndef C_BG_S_POLY_INFO_H_ #define C_BG_S_POLY_INFO_H_ -struct cBgS_PolyInfo {}; +#include "global.h" + +class cBgS_PolyInfo { +public: + cBgS_PolyInfo(void); + ~cBgS_PolyInfo(void); + bool ChkSetInfo(void) const; + void ClearPi(void); + void SetPolyInfo(const cBgS_PolyInfo&); + void SetActorInfo(int, void*, unsigned int); + bool ChkSafe(const void*, unsigned int) const; + void SetPolyIndex(int); + bool ChkBgIndex(void) const; +}; #endif
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_80268074.s b/include/SComponent/c_bg_s_poly_info/asm/func_80268074.s new file mode 100644 index 0000000000..ae051fa81c --- /dev/null +++ b/include/SComponent/c_bg_s_poly_info/asm/func_80268074.s @@ -0,0 +1,15 @@ +/* 80268074 00264FB4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80268078 00264FB8 7C 08 02 A6 */ mflr r0 +/* 8026807C 00264FBC 90 01 00 14 */ stw r0, 0x14(r1) +/* 80268080 00264FC0 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80268084 00264FC4 7C 7F 1B 78 */ mr r31, r3 +/* 80268088 00264FC8 3C 80 80 3C */ lis r4, lbl_803C3FD0@ha +/* 8026808C 00264FCC 38 04 3F D0 */ addi r0, r4, lbl_803C3FD0@l +/* 80268090 00264FD0 90 03 00 0C */ stw r0, 0xc(r3) +/* 80268094 00264FD4 48 00 00 8D */ bl ClearPi__13cBgS_PolyInfoFv +/* 80268098 00264FD8 7F E3 FB 78 */ mr r3, r31 +/* 8026809C 00264FDC 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802680A0 00264FE0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802680A4 00264FE4 7C 08 03 A6 */ mtlr r0 +/* 802680A8 00264FE8 38 21 00 10 */ addi r1, r1, 0x10 +/* 802680AC 00264FEC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_802680B0.s b/include/SComponent/c_bg_s_poly_info/asm/func_802680B0.s new file mode 100644 index 0000000000..4c369c5ee9 --- /dev/null +++ b/include/SComponent/c_bg_s_poly_info/asm/func_802680B0.s @@ -0,0 +1,19 @@ +/* 802680B0 00264FF0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802680B4 00264FF4 7C 08 02 A6 */ mflr r0 +/* 802680B8 00264FF8 90 01 00 14 */ stw r0, 0x14(r1) +/* 802680BC 00264FFC 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802680C0 00265000 7C 7F 1B 79 */ or. r31, r3, r3 +/* 802680C4 00265004 41 82 00 1C */ beq lbl_802680E0 +/* 802680C8 00265008 3C A0 80 3C */ lis r5, lbl_803C3FD0@ha +/* 802680CC 0026500C 38 05 3F D0 */ addi r0, r5, lbl_803C3FD0@l +/* 802680D0 00265010 90 1F 00 0C */ stw r0, 0xc(r31) +/* 802680D4 00265014 7C 80 07 35 */ extsh. r0, r4 +/* 802680D8 00265018 40 81 00 08 */ ble lbl_802680E0 +/* 802680DC 0026501C 48 06 6C 61 */ bl __dl__FPv +lbl_802680E0: +/* 802680E0 00265020 7F E3 FB 78 */ mr r3, r31 +/* 802680E4 00265024 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802680E8 00265028 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802680EC 0026502C 7C 08 03 A6 */ mtlr r0 +/* 802680F0 00265030 38 21 00 10 */ addi r1, r1, 0x10 +/* 802680F4 00265034 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_802680F8.s b/include/SComponent/c_bg_s_poly_info/asm/func_802680F8.s new file mode 100644 index 0000000000..0a808e711c --- /dev/null +++ b/include/SComponent/c_bg_s_poly_info/asm/func_802680F8.s @@ -0,0 +1,12 @@ +/* 802680F8 00265038 A0 03 00 00 */ lhz r0, 0(r3) +/* 802680FC 0026503C 28 00 FF FF */ cmplwi r0, 0xffff +/* 80268100 00265040 41 82 00 10 */ beq lbl_80268110 +/* 80268104 00265044 A0 03 00 02 */ lhz r0, 2(r3) +/* 80268108 00265048 28 00 01 00 */ cmplwi r0, 0x100 +/* 8026810C 0026504C 40 82 00 0C */ bne lbl_80268118 +lbl_80268110: +/* 80268110 00265050 38 60 00 00 */ li r3, 0 +/* 80268114 00265054 4E 80 00 20 */ blr +lbl_80268118: +/* 80268118 00265058 38 60 00 01 */ li r3, 1 +/* 8026811C 0026505C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_80268120.s b/include/SComponent/c_bg_s_poly_info/asm/func_80268120.s new file mode 100644 index 0000000000..08fa4e3b1d --- /dev/null +++ b/include/SComponent/c_bg_s_poly_info/asm/func_80268120.s @@ -0,0 +1,10 @@ +/* 80268120 00265060 3C 80 00 01 */ lis r4, 0x0000FFFF@ha +/* 80268124 00265064 38 04 FF FF */ addi r0, r4, 0x0000FFFF@l +/* 80268128 00265068 B0 03 00 00 */ sth r0, 0(r3) +/* 8026812C 0026506C 38 00 01 00 */ li r0, 0x100 +/* 80268130 00265070 B0 03 00 02 */ sth r0, 2(r3) +/* 80268134 00265074 38 00 00 00 */ li r0, 0 +/* 80268138 00265078 90 03 00 04 */ stw r0, 4(r3) +/* 8026813C 0026507C 38 00 FF FF */ li r0, -1 +/* 80268140 00265080 90 03 00 08 */ stw r0, 8(r3) +/* 80268144 00265084 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_80268148.s b/include/SComponent/c_bg_s_poly_info/asm/func_80268148.s new file mode 100644 index 0000000000..e151525026 --- /dev/null +++ b/include/SComponent/c_bg_s_poly_info/asm/func_80268148.s @@ -0,0 +1,9 @@ +/* 80268148 00265088 A0 04 00 00 */ lhz r0, 0(r4) +/* 8026814C 0026508C B0 03 00 00 */ sth r0, 0(r3) +/* 80268150 00265090 A0 04 00 02 */ lhz r0, 2(r4) +/* 80268154 00265094 B0 03 00 02 */ sth r0, 2(r3) +/* 80268158 00265098 80 04 00 04 */ lwz r0, 4(r4) +/* 8026815C 0026509C 90 03 00 04 */ stw r0, 4(r3) +/* 80268160 002650A0 80 04 00 08 */ lwz r0, 8(r4) +/* 80268164 002650A4 90 03 00 08 */ stw r0, 8(r3) +/* 80268168 002650A8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_8026816C.s b/include/SComponent/c_bg_s_poly_info/asm/func_8026816C.s new file mode 100644 index 0000000000..3b307a0a64 --- /dev/null +++ b/include/SComponent/c_bg_s_poly_info/asm/func_8026816C.s @@ -0,0 +1,4 @@ +/* 8026816C 002650AC B0 83 00 02 */ sth r4, 2(r3) +/* 80268170 002650B0 90 A3 00 04 */ stw r5, 4(r3) +/* 80268174 002650B4 90 C3 00 08 */ stw r6, 8(r3) +/* 80268178 002650B8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_8026817C.s b/include/SComponent/c_bg_s_poly_info/asm/func_8026817C.s new file mode 100644 index 0000000000..27fda2f852 --- /dev/null +++ b/include/SComponent/c_bg_s_poly_info/asm/func_8026817C.s @@ -0,0 +1,11 @@ +/* 8026817C 002650BC 80 03 00 04 */ lwz r0, 4(r3) +/* 80268180 002650C0 7C 00 20 40 */ cmplw r0, r4 +/* 80268184 002650C4 40 82 00 18 */ bne lbl_8026819C +/* 80268188 002650C8 80 03 00 08 */ lwz r0, 8(r3) +/* 8026818C 002650CC 7C 00 28 40 */ cmplw r0, r5 +/* 80268190 002650D0 40 82 00 0C */ bne lbl_8026819C +/* 80268194 002650D4 38 60 00 01 */ li r3, 1 +/* 80268198 002650D8 4E 80 00 20 */ blr +lbl_8026819C: +/* 8026819C 002650DC 38 60 00 00 */ li r3, 0 +/* 802681A0 002650E0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_802681A4.s b/include/SComponent/c_bg_s_poly_info/asm/func_802681A4.s new file mode 100644 index 0000000000..5b6195e980 --- /dev/null +++ b/include/SComponent/c_bg_s_poly_info/asm/func_802681A4.s @@ -0,0 +1,2 @@ +/* 802681A4 002650E4 B0 83 00 00 */ sth r4, 0(r3) +/* 802681A8 002650E8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_802681AC.s b/include/SComponent/c_bg_s_poly_info/asm/func_802681AC.s new file mode 100644 index 0000000000..7c15041ccb --- /dev/null +++ b/include/SComponent/c_bg_s_poly_info/asm/func_802681AC.s @@ -0,0 +1,5 @@ +/* 802681AC 002650EC A0 03 00 02 */ lhz r0, 2(r3) +/* 802681B0 002650F0 20 60 01 00 */ subfic r3, r0, 0x100 +/* 802681B4 002650F4 30 03 FF FF */ addic r0, r3, -1 +/* 802681B8 002650F8 7C 60 19 10 */ subfe r3, r0, r3 +/* 802681BC 002650FC 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_shdw_draw.h b/include/SComponent/c_bg_s_shdw_draw.h new file mode 100644 index 0000000000..df209720e6 --- /dev/null +++ b/include/SComponent/c_bg_s_shdw_draw.h @@ -0,0 +1,20 @@ +#ifndef __C_BG_S_SHDW_DRAW_H_ +#define __C_BG_S_SHDW_DRAW_H_ + +#include "SComponent/c_m3d_g_pla.h" +#include "SComponent/c_xyz.h" +#include "global.h" + +struct cBgD_Vtx_t; + +typedef int (*cBgS_ShdwDraw_Callback)(class cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int, cM3dGPla*); + +class cBgS_ShdwDraw { +public: + cBgS_ShdwDraw(void); + ~cBgS_ShdwDraw(void); + void Set(cXyz&, cXyz&); + void SetCallback(cBgS_ShdwDraw_Callback); +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_bg_s_shdw_draw/asm/func_80267F88.s b/include/SComponent/c_bg_s_shdw_draw/asm/func_80267F88.s new file mode 100644 index 0000000000..f87827abb8 --- /dev/null +++ b/include/SComponent/c_bg_s_shdw_draw/asm/func_80267F88.s @@ -0,0 +1,18 @@ +/* 80267F88 00264EC8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80267F8C 00264ECC 7C 08 02 A6 */ mflr r0 +/* 80267F90 00264ED0 90 01 00 14 */ stw r0, 0x14(r1) +/* 80267F94 00264ED4 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80267F98 00264ED8 7C 7F 1B 78 */ mr r31, r3 +/* 80267F9C 00264EDC 4B FF FB B1 */ bl __ct__8cBgS_ChkFv +/* 80267FA0 00264EE0 3C 60 80 3C */ lis r3, lbl_803C3FC0@ha +/* 80267FA4 00264EE4 38 03 3F C0 */ addi r0, r3, lbl_803C3FC0@l +/* 80267FA8 00264EE8 90 1F 00 10 */ stw r0, 0x10(r31) +/* 80267FAC 00264EEC 3C 60 80 3A */ lis r3, lbl_803A7218@ha +/* 80267FB0 00264EF0 38 03 72 18 */ addi r0, r3, lbl_803A7218@l +/* 80267FB4 00264EF4 90 1F 00 2C */ stw r0, 0x2c(r31) +/* 80267FB8 00264EF8 7F E3 FB 78 */ mr r3, r31 +/* 80267FBC 00264EFC 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80267FC0 00264F00 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80267FC4 00264F04 7C 08 03 A6 */ mtlr r0 +/* 80267FC8 00264F08 38 21 00 10 */ addi r1, r1, 0x10 +/* 80267FCC 00264F0C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_shdw_draw/asm/func_80267FD0.s b/include/SComponent/c_bg_s_shdw_draw/asm/func_80267FD0.s new file mode 100644 index 0000000000..7e48edcc21 --- /dev/null +++ b/include/SComponent/c_bg_s_shdw_draw/asm/func_80267FD0.s @@ -0,0 +1,32 @@ +/* 80267FD0 00264F10 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80267FD4 00264F14 7C 08 02 A6 */ mflr r0 +/* 80267FD8 00264F18 90 01 00 14 */ stw r0, 0x14(r1) +/* 80267FDC 00264F1C 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80267FE0 00264F20 93 C1 00 08 */ stw r30, 8(r1) +/* 80267FE4 00264F24 7C 7E 1B 79 */ or. r30, r3, r3 +/* 80267FE8 00264F28 7C 9F 23 78 */ mr r31, r4 +/* 80267FEC 00264F2C 41 82 00 40 */ beq lbl_8026802C +/* 80267FF0 00264F30 3C 60 80 3C */ lis r3, lbl_803C3FC0@ha +/* 80267FF4 00264F34 38 03 3F C0 */ addi r0, r3, lbl_803C3FC0@l +/* 80267FF8 00264F38 90 1E 00 10 */ stw r0, 0x10(r30) +/* 80267FFC 00264F3C 34 1E 00 14 */ addic. r0, r30, 0x14 +/* 80268000 00264F40 41 82 00 10 */ beq lbl_80268010 +/* 80268004 00264F44 3C 60 80 3A */ lis r3, lbl_803A7218@ha +/* 80268008 00264F48 38 03 72 18 */ addi r0, r3, lbl_803A7218@l +/* 8026800C 00264F4C 90 1E 00 2C */ stw r0, 0x2c(r30) +lbl_80268010: +/* 80268010 00264F50 7F C3 F3 78 */ mr r3, r30 +/* 80268014 00264F54 38 80 00 00 */ li r4, 0 +/* 80268018 00264F58 4B FF FB 59 */ bl __dt__8cBgS_ChkFv +/* 8026801C 00264F5C 7F E0 07 35 */ extsh. r0, r31 +/* 80268020 00264F60 40 81 00 0C */ ble lbl_8026802C +/* 80268024 00264F64 7F C3 F3 78 */ mr r3, r30 +/* 80268028 00264F68 48 06 6D 15 */ bl __dl__FPv +lbl_8026802C: +/* 8026802C 00264F6C 7F C3 F3 78 */ mr r3, r30 +/* 80268030 00264F70 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80268034 00264F74 83 C1 00 08 */ lwz r30, 8(r1) +/* 80268038 00264F78 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026803C 00264F7C 7C 08 03 A6 */ mtlr r0 +/* 80268040 00264F80 38 21 00 10 */ addi r1, r1, 0x10 +/* 80268044 00264F84 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_shdw_draw/asm/func_80268048.s b/include/SComponent/c_bg_s_shdw_draw/asm/func_80268048.s new file mode 100644 index 0000000000..4356823434 --- /dev/null +++ b/include/SComponent/c_bg_s_shdw_draw/asm/func_80268048.s @@ -0,0 +1,9 @@ +/* 80268048 00264F88 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026804C 00264F8C 7C 08 02 A6 */ mflr r0 +/* 80268050 00264F90 90 01 00 14 */ stw r0, 0x14(r1) +/* 80268054 00264F94 38 63 00 14 */ addi r3, r3, 0x14 +/* 80268058 00264F98 48 00 6B FD */ bl Set__8cM3dGAabFPC4cXyzPC4cXyz +/* 8026805C 00264F9C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80268060 00264FA0 7C 08 03 A6 */ mtlr r0 +/* 80268064 00264FA4 38 21 00 10 */ addi r1, r1, 0x10 +/* 80268068 00264FA8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_shdw_draw/asm/func_8026806C.s b/include/SComponent/c_bg_s_shdw_draw/asm/func_8026806C.s new file mode 100644 index 0000000000..17407969b3 --- /dev/null +++ b/include/SComponent/c_bg_s_shdw_draw/asm/func_8026806C.s @@ -0,0 +1,2 @@ +/* 8026806C 00264FAC 90 83 00 30 */ stw r4, 0x30(r3) +/* 80268070 00264FB0 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263358.s b/include/SComponent/c_cc_d/asm/func_80263358.s new file mode 100644 index 0000000000..12f4cf8174 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263358.s @@ -0,0 +1,4 @@ +/* 80263358 00260298 90 83 00 00 */ stw r4, 0(r3) +/* 8026335C 0026029C 90 A3 00 04 */ stw r5, 4(r3) +/* 80263360 002602A0 90 C3 00 08 */ stw r6, 8(r3) +/* 80263364 002602A4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_80263368.s b/include/SComponent/c_cc_d/asm/func_80263368.s new file mode 100644 index 0000000000..3a62b90cce --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263368.s @@ -0,0 +1,18 @@ +/* 80263368 002602A8 80 A3 00 00 */ lwz r5, 0(r3) +/* 8026336C 002602AC 80 04 00 00 */ lwz r0, 0(r4) +/* 80263370 002602B0 7C A0 00 39 */ and. r0, r5, r0 +/* 80263374 002602B4 41 82 00 24 */ beq lbl_80263398 +/* 80263378 002602B8 80 A3 00 08 */ lwz r5, 8(r3) +/* 8026337C 002602BC 80 04 00 08 */ lwz r0, 8(r4) +/* 80263380 002602C0 7C A0 00 39 */ and. r0, r5, r0 +/* 80263384 002602C4 41 82 00 14 */ beq lbl_80263398 +/* 80263388 002602C8 80 63 00 04 */ lwz r3, 4(r3) +/* 8026338C 002602CC 80 04 00 04 */ lwz r0, 4(r4) +/* 80263390 002602D0 7C 60 00 39 */ and. r0, r3, r0 +/* 80263394 002602D4 40 82 00 0C */ bne lbl_802633A0 +lbl_80263398: +/* 80263398 002602D8 38 60 00 00 */ li r3, 0 +/* 8026339C 002602DC 4E 80 00 20 */ blr +lbl_802633A0: +/* 802633A0 002602E0 38 60 00 01 */ li r3, 1 +/* 802633A4 002602E4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_802633A8.s b/include/SComponent/c_cc_d/asm/func_802633A8.s new file mode 100644 index 0000000000..4175811ff1 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802633A8.s @@ -0,0 +1,78 @@ +/* 802633A8 002602E8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802633AC 002602EC 7C 08 02 A6 */ mflr r0 +/* 802633B0 002602F0 90 01 00 14 */ stw r0, 0x14(r1) +/* 802633B4 002602F4 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802633B8 002602F8 7C 7F 1B 78 */ mr r31, r3 +/* 802633BC 002602FC 38 A4 00 0C */ addi r5, r4, 0xc +/* 802633C0 00260300 48 00 B8 95 */ bl Set__8cM3dGAabFPC4cXyzPC4cXyz +/* 802633C4 00260304 C0 42 B6 18 */ lfs f2, lbl_80455018-_SDA2_BASE_(r2) +/* 802633C8 00260308 C0 3F 00 0C */ lfs f1, 0xc(r31) +/* 802633CC 0026030C C0 1F 00 00 */ lfs f0, 0(r31) +/* 802633D0 00260310 EC 01 00 28 */ fsubs f0, f1, f0 +/* 802633D4 00260314 EC 02 00 32 */ fmuls f0, f2, f0 +/* 802633D8 00260318 D0 1F 00 20 */ stfs f0, 0x20(r31) +/* 802633DC 0026031C C0 1F 00 20 */ lfs f0, 0x20(r31) +/* 802633E0 00260320 FC 00 02 10 */ fabs f0, f0 +/* 802633E4 00260324 FC 20 00 18 */ frsp f1, f0 +/* 802633E8 00260328 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 802633EC 0026032C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802633F0 00260330 7C 00 00 26 */ mfcr r0 +/* 802633F4 00260334 54 00 0F FE */ srwi r0, r0, 0x1f +/* 802633F8 00260338 98 1F 00 1C */ stb r0, 0x1c(r31) +/* 802633FC 0026033C 88 1F 00 1C */ lbz r0, 0x1c(r31) +/* 80263400 00260340 28 00 00 00 */ cmplwi r0, 0 +/* 80263404 00260344 40 82 00 14 */ bne lbl_80263418 +/* 80263408 00260348 C0 22 B6 1C */ lfs f1, lbl_8045501C-_SDA2_BASE_(r2) +/* 8026340C 0026034C C0 1F 00 20 */ lfs f0, 0x20(r31) +/* 80263410 00260350 EC 01 00 24 */ fdivs f0, f1, f0 +/* 80263414 00260354 D0 1F 00 24 */ stfs f0, 0x24(r31) +lbl_80263418: +/* 80263418 00260358 C0 42 B6 18 */ lfs f2, lbl_80455018-_SDA2_BASE_(r2) +/* 8026341C 0026035C C0 3F 00 10 */ lfs f1, 0x10(r31) +/* 80263420 00260360 C0 1F 00 04 */ lfs f0, 4(r31) +/* 80263424 00260364 EC 01 00 28 */ fsubs f0, f1, f0 +/* 80263428 00260368 EC 02 00 32 */ fmuls f0, f2, f0 +/* 8026342C 0026036C D0 1F 00 2C */ stfs f0, 0x2c(r31) +/* 80263430 00260370 C0 1F 00 2C */ lfs f0, 0x2c(r31) +/* 80263434 00260374 FC 00 02 10 */ fabs f0, f0 +/* 80263438 00260378 FC 20 00 18 */ frsp f1, f0 +/* 8026343C 0026037C C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 80263440 00260380 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80263444 00260384 7C 00 00 26 */ mfcr r0 +/* 80263448 00260388 54 00 0F FE */ srwi r0, r0, 0x1f +/* 8026344C 0026038C 98 1F 00 28 */ stb r0, 0x28(r31) +/* 80263450 00260390 88 1F 00 28 */ lbz r0, 0x28(r31) +/* 80263454 00260394 28 00 00 00 */ cmplwi r0, 0 +/* 80263458 00260398 40 82 00 14 */ bne lbl_8026346C +/* 8026345C 0026039C C0 22 B6 1C */ lfs f1, lbl_8045501C-_SDA2_BASE_(r2) +/* 80263460 002603A0 C0 1F 00 2C */ lfs f0, 0x2c(r31) +/* 80263464 002603A4 EC 01 00 24 */ fdivs f0, f1, f0 +/* 80263468 002603A8 D0 1F 00 30 */ stfs f0, 0x30(r31) +lbl_8026346C: +/* 8026346C 002603AC C0 42 B6 18 */ lfs f2, lbl_80455018-_SDA2_BASE_(r2) +/* 80263470 002603B0 C0 3F 00 14 */ lfs f1, 0x14(r31) +/* 80263474 002603B4 C0 1F 00 08 */ lfs f0, 8(r31) +/* 80263478 002603B8 EC 01 00 28 */ fsubs f0, f1, f0 +/* 8026347C 002603BC EC 02 00 32 */ fmuls f0, f2, f0 +/* 80263480 002603C0 D0 1F 00 38 */ stfs f0, 0x38(r31) +/* 80263484 002603C4 C0 1F 00 38 */ lfs f0, 0x38(r31) +/* 80263488 002603C8 FC 00 02 10 */ fabs f0, f0 +/* 8026348C 002603CC FC 20 00 18 */ frsp f1, f0 +/* 80263490 002603D0 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 80263494 002603D4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80263498 002603D8 7C 00 00 26 */ mfcr r0 +/* 8026349C 002603DC 54 00 0F FE */ srwi r0, r0, 0x1f +/* 802634A0 002603E0 98 1F 00 34 */ stb r0, 0x34(r31) +/* 802634A4 002603E4 88 1F 00 34 */ lbz r0, 0x34(r31) +/* 802634A8 002603E8 28 00 00 00 */ cmplwi r0, 0 +/* 802634AC 002603EC 40 82 00 14 */ bne lbl_802634C0 +/* 802634B0 002603F0 C0 22 B6 1C */ lfs f1, lbl_8045501C-_SDA2_BASE_(r2) +/* 802634B4 002603F4 C0 1F 00 38 */ lfs f0, 0x38(r31) +/* 802634B8 002603F8 EC 01 00 24 */ fdivs f0, f1, f0 +/* 802634BC 002603FC D0 1F 00 3C */ stfs f0, 0x3c(r31) +lbl_802634C0: +/* 802634C0 00260400 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802634C4 00260404 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802634C8 00260408 7C 08 03 A6 */ mtlr r0 +/* 802634CC 0026040C 38 21 00 10 */ addi r1, r1, 0x10 +/* 802634D0 00260410 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_802634D4.s b/include/SComponent/c_cc_d/asm/func_802634D4.s new file mode 100644 index 0000000000..62a2cd6675 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802634D4.s @@ -0,0 +1,126 @@ +/* 802634D4 00260414 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802634D8 00260418 7C 08 02 A6 */ mflr r0 +/* 802634DC 0026041C 90 01 00 24 */ stw r0, 0x24(r1) +/* 802634E0 00260420 28 06 00 00 */ cmplwi r6, 0 +/* 802634E4 00260424 41 82 00 1C */ beq lbl_80263500 +/* 802634E8 00260428 7C 83 23 78 */ mr r3, r4 +/* 802634EC 0026042C 38 80 FF FF */ li r4, -1 +/* 802634F0 00260430 38 A0 FF FF */ li r5, -1 +/* 802634F4 00260434 38 C0 FF FF */ li r6, -1 +/* 802634F8 00260438 4B FF FE 61 */ bl Set__15cCcD_DivideInfoFUlUlUl +/* 802634FC 0026043C 48 00 01 94 */ b lbl_80263690 +lbl_80263500: +/* 80263500 00260440 88 03 00 1C */ lbz r0, 0x1c(r3) +/* 80263504 00260444 28 00 00 00 */ cmplwi r0, 0 +/* 80263508 00260448 40 82 00 74 */ bne lbl_8026357C +/* 8026350C 0026044C C0 43 00 24 */ lfs f2, 0x24(r3) +/* 80263510 00260450 C0 05 00 00 */ lfs f0, 0(r5) +/* 80263514 00260454 C0 23 00 00 */ lfs f1, 0(r3) +/* 80263518 00260458 EC 00 08 28 */ fsubs f0, f0, f1 +/* 8026351C 0026045C EC 02 00 32 */ fmuls f0, f2, f0 +/* 80263520 00260460 FC 00 00 1E */ fctiwz f0, f0 +/* 80263524 00260464 D8 01 00 08 */ stfd f0, 8(r1) +/* 80263528 00260468 81 01 00 0C */ lwz r8, 0xc(r1) +/* 8026352C 0026046C C0 05 00 0C */ lfs f0, 0xc(r5) +/* 80263530 00260470 EC 00 08 28 */ fsubs f0, f0, f1 +/* 80263534 00260474 EC 02 00 32 */ fmuls f0, f2, f0 +/* 80263538 00260478 FC 00 00 1E */ fctiwz f0, f0 +/* 8026353C 0026047C D8 01 00 10 */ stfd f0, 0x10(r1) +/* 80263540 00260480 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80263544 00260484 2C 00 00 1F */ cmpwi r0, 0x1f +/* 80263548 00260488 40 81 00 08 */ ble lbl_80263550 +/* 8026354C 0026048C 38 00 00 1F */ li r0, 0x1f +lbl_80263550: +/* 80263550 00260490 54 00 10 3A */ slwi r0, r0, 2 +/* 80263554 00260494 3C C0 80 3A */ lis r6, lbl_8039A7E8@ha +/* 80263558 00260498 38 C6 A7 E8 */ addi r6, r6, lbl_8039A7E8@l +/* 8026355C 0026049C 7C E6 00 2E */ lwzx r7, r6, r0 +/* 80263560 002604A0 2C 08 00 00 */ cmpwi r8, 0 +/* 80263564 002604A4 40 81 00 1C */ ble lbl_80263580 +/* 80263568 002604A8 38 08 FF FF */ addi r0, r8, -1 +/* 8026356C 002604AC 54 00 10 3A */ slwi r0, r0, 2 +/* 80263570 002604B0 7C 06 00 2E */ lwzx r0, r6, r0 +/* 80263574 002604B4 7C E7 00 78 */ andc r7, r7, r0 +/* 80263578 002604B8 48 00 00 08 */ b lbl_80263580 +lbl_8026357C: +/* 8026357C 002604BC 38 E0 FF FF */ li r7, -1 +lbl_80263580: +/* 80263580 002604C0 88 03 00 28 */ lbz r0, 0x28(r3) +/* 80263584 002604C4 28 00 00 00 */ cmplwi r0, 0 +/* 80263588 002604C8 40 82 00 74 */ bne lbl_802635FC +/* 8026358C 002604CC C0 43 00 30 */ lfs f2, 0x30(r3) +/* 80263590 002604D0 C0 05 00 04 */ lfs f0, 4(r5) +/* 80263594 002604D4 C0 23 00 04 */ lfs f1, 4(r3) +/* 80263598 002604D8 EC 00 08 28 */ fsubs f0, f0, f1 +/* 8026359C 002604DC EC 02 00 32 */ fmuls f0, f2, f0 +/* 802635A0 002604E0 FC 00 00 1E */ fctiwz f0, f0 +/* 802635A4 002604E4 D8 01 00 10 */ stfd f0, 0x10(r1) +/* 802635A8 002604E8 81 21 00 14 */ lwz r9, 0x14(r1) +/* 802635AC 002604EC C0 05 00 10 */ lfs f0, 0x10(r5) +/* 802635B0 002604F0 EC 00 08 28 */ fsubs f0, f0, f1 +/* 802635B4 002604F4 EC 02 00 32 */ fmuls f0, f2, f0 +/* 802635B8 002604F8 FC 00 00 1E */ fctiwz f0, f0 +/* 802635BC 002604FC D8 01 00 08 */ stfd f0, 8(r1) +/* 802635C0 00260500 80 01 00 0C */ lwz r0, 0xc(r1) +/* 802635C4 00260504 2C 00 00 1F */ cmpwi r0, 0x1f +/* 802635C8 00260508 40 81 00 08 */ ble lbl_802635D0 +/* 802635CC 0026050C 38 00 00 1F */ li r0, 0x1f +lbl_802635D0: +/* 802635D0 00260510 54 00 10 3A */ slwi r0, r0, 2 +/* 802635D4 00260514 3C C0 80 3A */ lis r6, lbl_8039A7E8@ha +/* 802635D8 00260518 38 C6 A7 E8 */ addi r6, r6, lbl_8039A7E8@l +/* 802635DC 0026051C 7D 06 00 2E */ lwzx r8, r6, r0 +/* 802635E0 00260520 2C 09 00 00 */ cmpwi r9, 0 +/* 802635E4 00260524 40 81 00 1C */ ble lbl_80263600 +/* 802635E8 00260528 38 09 FF FF */ addi r0, r9, -1 +/* 802635EC 0026052C 54 00 10 3A */ slwi r0, r0, 2 +/* 802635F0 00260530 7C 06 00 2E */ lwzx r0, r6, r0 +/* 802635F4 00260534 7D 08 00 78 */ andc r8, r8, r0 +/* 802635F8 00260538 48 00 00 08 */ b lbl_80263600 +lbl_802635FC: +/* 802635FC 0026053C 39 00 FF FF */ li r8, -1 +lbl_80263600: +/* 80263600 00260540 88 03 00 34 */ lbz r0, 0x34(r3) +/* 80263604 00260544 28 00 00 00 */ cmplwi r0, 0 +/* 80263608 00260548 40 82 00 74 */ bne lbl_8026367C +/* 8026360C 0026054C C0 43 00 3C */ lfs f2, 0x3c(r3) +/* 80263610 00260550 C0 05 00 08 */ lfs f0, 8(r5) +/* 80263614 00260554 C0 23 00 08 */ lfs f1, 8(r3) +/* 80263618 00260558 EC 00 08 28 */ fsubs f0, f0, f1 +/* 8026361C 0026055C EC 02 00 32 */ fmuls f0, f2, f0 +/* 80263620 00260560 FC 00 00 1E */ fctiwz f0, f0 +/* 80263624 00260564 D8 01 00 10 */ stfd f0, 0x10(r1) +/* 80263628 00260568 81 21 00 14 */ lwz r9, 0x14(r1) +/* 8026362C 0026056C C0 05 00 14 */ lfs f0, 0x14(r5) +/* 80263630 00260570 EC 00 08 28 */ fsubs f0, f0, f1 +/* 80263634 00260574 EC 02 00 32 */ fmuls f0, f2, f0 +/* 80263638 00260578 FC 00 00 1E */ fctiwz f0, f0 +/* 8026363C 0026057C D8 01 00 08 */ stfd f0, 8(r1) +/* 80263640 00260580 80 01 00 0C */ lwz r0, 0xc(r1) +/* 80263644 00260584 2C 00 00 1F */ cmpwi r0, 0x1f +/* 80263648 00260588 40 81 00 08 */ ble lbl_80263650 +/* 8026364C 0026058C 38 00 00 1F */ li r0, 0x1f +lbl_80263650: +/* 80263650 00260590 54 00 10 3A */ slwi r0, r0, 2 +/* 80263654 00260594 3C 60 80 3A */ lis r3, lbl_8039A7E8@ha +/* 80263658 00260598 38 63 A7 E8 */ addi r3, r3, lbl_8039A7E8@l +/* 8026365C 0026059C 7C C3 00 2E */ lwzx r6, r3, r0 +/* 80263660 002605A0 2C 09 00 00 */ cmpwi r9, 0 +/* 80263664 002605A4 40 81 00 1C */ ble lbl_80263680 +/* 80263668 002605A8 38 09 FF FF */ addi r0, r9, -1 +/* 8026366C 002605AC 54 00 10 3A */ slwi r0, r0, 2 +/* 80263670 002605B0 7C 03 00 2E */ lwzx r0, r3, r0 +/* 80263674 002605B4 7C C6 00 78 */ andc r6, r6, r0 +/* 80263678 002605B8 48 00 00 08 */ b lbl_80263680 +lbl_8026367C: +/* 8026367C 002605BC 38 C0 FF FF */ li r6, -1 +lbl_80263680: +/* 80263680 002605C0 7C 83 23 78 */ mr r3, r4 +/* 80263684 002605C4 7C E4 3B 78 */ mr r4, r7 +/* 80263688 002605C8 7D 05 43 78 */ mr r5, r8 +/* 8026368C 002605CC 4B FF FC CD */ bl Set__15cCcD_DivideInfoFUlUlUl +lbl_80263690: +/* 80263690 002605D0 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80263694 002605D4 7C 08 03 A6 */ mtlr r0 +/* 80263698 002605D8 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026369C 002605DC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_802636A0.s b/include/SComponent/c_cc_d/asm/func_802636A0.s new file mode 100644 index 0000000000..edd447afb8 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802636A0.s @@ -0,0 +1,140 @@ +/* 802636A0 002605E0 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802636A4 002605E4 7C 08 02 A6 */ mflr r0 +/* 802636A8 002605E8 90 01 00 24 */ stw r0, 0x24(r1) +/* 802636AC 002605EC 88 03 00 1C */ lbz r0, 0x1c(r3) +/* 802636B0 002605F0 28 00 00 00 */ cmplwi r0, 0 +/* 802636B4 002605F4 40 82 00 8C */ bne lbl_80263740 +/* 802636B8 002605F8 C0 43 00 24 */ lfs f2, 0x24(r3) +/* 802636BC 002605FC C0 05 00 00 */ lfs f0, 0(r5) +/* 802636C0 00260600 C0 23 00 00 */ lfs f1, 0(r3) +/* 802636C4 00260604 EC 00 08 28 */ fsubs f0, f0, f1 +/* 802636C8 00260608 EC 02 00 32 */ fmuls f0, f2, f0 +/* 802636CC 0026060C FC 00 00 1E */ fctiwz f0, f0 +/* 802636D0 00260610 D8 01 00 08 */ stfd f0, 8(r1) +/* 802636D4 00260614 81 01 00 0C */ lwz r8, 0xc(r1) +/* 802636D8 00260618 C0 05 00 0C */ lfs f0, 0xc(r5) +/* 802636DC 0026061C EC 00 08 28 */ fsubs f0, f0, f1 +/* 802636E0 00260620 EC 02 00 32 */ fmuls f0, f2, f0 +/* 802636E4 00260624 FC 00 00 1E */ fctiwz f0, f0 +/* 802636E8 00260628 D8 01 00 10 */ stfd f0, 0x10(r1) +/* 802636EC 0026062C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802636F0 00260630 2C 00 00 00 */ cmpwi r0, 0 +/* 802636F4 00260634 41 80 00 0C */ blt lbl_80263700 +/* 802636F8 00260638 2C 08 00 1F */ cmpwi r8, 0x1f +/* 802636FC 0026063C 40 81 00 0C */ ble lbl_80263708 +lbl_80263700: +/* 80263700 00260640 38 E0 00 00 */ li r7, 0 +/* 80263704 00260644 48 00 00 40 */ b lbl_80263744 +lbl_80263708: +/* 80263708 00260648 2C 00 00 1F */ cmpwi r0, 0x1f +/* 8026370C 0026064C 40 81 00 08 */ ble lbl_80263714 +/* 80263710 00260650 38 00 00 1F */ li r0, 0x1f +lbl_80263714: +/* 80263714 00260654 54 00 10 3A */ slwi r0, r0, 2 +/* 80263718 00260658 3C C0 80 3A */ lis r6, lbl_8039A7E8@ha +/* 8026371C 0026065C 38 C6 A7 E8 */ addi r6, r6, lbl_8039A7E8@l +/* 80263720 00260660 7C E6 00 2E */ lwzx r7, r6, r0 +/* 80263724 00260664 2C 08 00 00 */ cmpwi r8, 0 +/* 80263728 00260668 40 81 00 1C */ ble lbl_80263744 +/* 8026372C 0026066C 38 08 FF FF */ addi r0, r8, -1 +/* 80263730 00260670 54 00 10 3A */ slwi r0, r0, 2 +/* 80263734 00260674 7C 06 00 2E */ lwzx r0, r6, r0 +/* 80263738 00260678 7C E7 00 78 */ andc r7, r7, r0 +/* 8026373C 0026067C 48 00 00 08 */ b lbl_80263744 +lbl_80263740: +/* 80263740 00260680 38 E0 FF FF */ li r7, -1 +lbl_80263744: +/* 80263744 00260684 88 03 00 28 */ lbz r0, 0x28(r3) +/* 80263748 00260688 28 00 00 00 */ cmplwi r0, 0 +/* 8026374C 0026068C 40 82 00 8C */ bne lbl_802637D8 +/* 80263750 00260690 C0 43 00 30 */ lfs f2, 0x30(r3) +/* 80263754 00260694 C0 05 00 04 */ lfs f0, 4(r5) +/* 80263758 00260698 C0 23 00 04 */ lfs f1, 4(r3) +/* 8026375C 0026069C EC 00 08 28 */ fsubs f0, f0, f1 +/* 80263760 002606A0 EC 02 00 32 */ fmuls f0, f2, f0 +/* 80263764 002606A4 FC 00 00 1E */ fctiwz f0, f0 +/* 80263768 002606A8 D8 01 00 10 */ stfd f0, 0x10(r1) +/* 8026376C 002606AC 81 21 00 14 */ lwz r9, 0x14(r1) +/* 80263770 002606B0 C0 05 00 10 */ lfs f0, 0x10(r5) +/* 80263774 002606B4 EC 00 08 28 */ fsubs f0, f0, f1 +/* 80263778 002606B8 EC 02 00 32 */ fmuls f0, f2, f0 +/* 8026377C 002606BC FC 00 00 1E */ fctiwz f0, f0 +/* 80263780 002606C0 D8 01 00 08 */ stfd f0, 8(r1) +/* 80263784 002606C4 80 01 00 0C */ lwz r0, 0xc(r1) +/* 80263788 002606C8 2C 00 00 00 */ cmpwi r0, 0 +/* 8026378C 002606CC 41 80 00 0C */ blt lbl_80263798 +/* 80263790 002606D0 2C 09 00 1F */ cmpwi r9, 0x1f +/* 80263794 002606D4 40 81 00 0C */ ble lbl_802637A0 +lbl_80263798: +/* 80263798 002606D8 39 00 00 00 */ li r8, 0 +/* 8026379C 002606DC 48 00 00 40 */ b lbl_802637DC +lbl_802637A0: +/* 802637A0 002606E0 2C 00 00 1F */ cmpwi r0, 0x1f +/* 802637A4 002606E4 40 81 00 08 */ ble lbl_802637AC +/* 802637A8 002606E8 38 00 00 1F */ li r0, 0x1f +lbl_802637AC: +/* 802637AC 002606EC 54 00 10 3A */ slwi r0, r0, 2 +/* 802637B0 002606F0 3C C0 80 3A */ lis r6, lbl_8039A7E8@ha +/* 802637B4 002606F4 38 C6 A7 E8 */ addi r6, r6, lbl_8039A7E8@l +/* 802637B8 002606F8 7D 06 00 2E */ lwzx r8, r6, r0 +/* 802637BC 002606FC 2C 09 00 00 */ cmpwi r9, 0 +/* 802637C0 00260700 40 81 00 1C */ ble lbl_802637DC +/* 802637C4 00260704 38 09 FF FF */ addi r0, r9, -1 +/* 802637C8 00260708 54 00 10 3A */ slwi r0, r0, 2 +/* 802637CC 0026070C 7C 06 00 2E */ lwzx r0, r6, r0 +/* 802637D0 00260710 7D 08 00 78 */ andc r8, r8, r0 +/* 802637D4 00260714 48 00 00 08 */ b lbl_802637DC +lbl_802637D8: +/* 802637D8 00260718 39 00 FF FF */ li r8, -1 +lbl_802637DC: +/* 802637DC 0026071C 88 03 00 34 */ lbz r0, 0x34(r3) +/* 802637E0 00260720 28 00 00 00 */ cmplwi r0, 0 +/* 802637E4 00260724 40 82 00 8C */ bne lbl_80263870 +/* 802637E8 00260728 C0 43 00 3C */ lfs f2, 0x3c(r3) +/* 802637EC 0026072C C0 05 00 08 */ lfs f0, 8(r5) +/* 802637F0 00260730 C0 23 00 08 */ lfs f1, 8(r3) +/* 802637F4 00260734 EC 00 08 28 */ fsubs f0, f0, f1 +/* 802637F8 00260738 EC 02 00 32 */ fmuls f0, f2, f0 +/* 802637FC 0026073C FC 00 00 1E */ fctiwz f0, f0 +/* 80263800 00260740 D8 01 00 10 */ stfd f0, 0x10(r1) +/* 80263804 00260744 81 21 00 14 */ lwz r9, 0x14(r1) +/* 80263808 00260748 C0 05 00 14 */ lfs f0, 0x14(r5) +/* 8026380C 0026074C EC 00 08 28 */ fsubs f0, f0, f1 +/* 80263810 00260750 EC 02 00 32 */ fmuls f0, f2, f0 +/* 80263814 00260754 FC 00 00 1E */ fctiwz f0, f0 +/* 80263818 00260758 D8 01 00 08 */ stfd f0, 8(r1) +/* 8026381C 0026075C 80 01 00 0C */ lwz r0, 0xc(r1) +/* 80263820 00260760 2C 00 00 00 */ cmpwi r0, 0 +/* 80263824 00260764 41 80 00 0C */ blt lbl_80263830 +/* 80263828 00260768 2C 09 00 1F */ cmpwi r9, 0x1f +/* 8026382C 0026076C 40 81 00 0C */ ble lbl_80263838 +lbl_80263830: +/* 80263830 00260770 38 C0 00 00 */ li r6, 0 +/* 80263834 00260774 48 00 00 40 */ b lbl_80263874 +lbl_80263838: +/* 80263838 00260778 2C 00 00 1F */ cmpwi r0, 0x1f +/* 8026383C 0026077C 40 81 00 08 */ ble lbl_80263844 +/* 80263840 00260780 38 00 00 1F */ li r0, 0x1f +lbl_80263844: +/* 80263844 00260784 54 00 10 3A */ slwi r0, r0, 2 +/* 80263848 00260788 3C 60 80 3A */ lis r3, lbl_8039A7E8@ha +/* 8026384C 0026078C 38 63 A7 E8 */ addi r3, r3, lbl_8039A7E8@l +/* 80263850 00260790 7C C3 00 2E */ lwzx r6, r3, r0 +/* 80263854 00260794 2C 09 00 00 */ cmpwi r9, 0 +/* 80263858 00260798 40 81 00 1C */ ble lbl_80263874 +/* 8026385C 0026079C 38 09 FF FF */ addi r0, r9, -1 +/* 80263860 002607A0 54 00 10 3A */ slwi r0, r0, 2 +/* 80263864 002607A4 7C 03 00 2E */ lwzx r0, r3, r0 +/* 80263868 002607A8 7C C6 00 78 */ andc r6, r6, r0 +/* 8026386C 002607AC 48 00 00 08 */ b lbl_80263874 +lbl_80263870: +/* 80263870 002607B0 38 C0 FF FF */ li r6, -1 +lbl_80263874: +/* 80263874 002607B4 7C 83 23 78 */ mr r3, r4 +/* 80263878 002607B8 7C E4 3B 78 */ mr r4, r7 +/* 8026387C 002607BC 7D 05 43 78 */ mr r5, r8 +/* 80263880 002607C0 4B FF FA D9 */ bl Set__15cCcD_DivideInfoFUlUlUl +/* 80263884 002607C4 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80263888 002607C8 7C 08 03 A6 */ mtlr r0 +/* 8026388C 002607CC 38 21 00 20 */ addi r1, r1, 0x20 +/* 80263890 002607D0 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263894.s b/include/SComponent/c_cc_d/asm/func_80263894.s new file mode 100644 index 0000000000..10e36b2bf4 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263894.s @@ -0,0 +1,2 @@ +/* 80263894 002607D4 38 60 00 00 */ li r3, 0 +/* 80263898 002607D8 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_8026389C.s b/include/SComponent/c_cc_d/asm/func_8026389C.s new file mode 100644 index 0000000000..8dbb147c92 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_8026389C.s @@ -0,0 +1,2 @@ +/* 8026389C 002607DC 38 60 00 00 */ li r3, 0 +/* 802638A0 002607E0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_802638A4.s b/include/SComponent/c_cc_d/asm/func_802638A4.s new file mode 100644 index 0000000000..32c526f467 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802638A4.s @@ -0,0 +1,24 @@ +/* 802638A4 002607E4 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802638A8 002607E8 7C 08 02 A6 */ mflr r0 +/* 802638AC 002607EC 90 01 00 24 */ stw r0, 0x24(r1) +/* 802638B0 002607F0 39 61 00 20 */ addi r11, r1, 0x20 +/* 802638B4 002607F4 48 0F E9 21 */ bl _savegpr_27 +/* 802638B8 002607F8 7C 7B 1B 78 */ mr r27, r3 +/* 802638BC 002607FC 7C 9C 23 78 */ mr r28, r4 +/* 802638C0 00260800 7C BD 2B 78 */ mr r29, r5 +/* 802638C4 00260804 7C DE 33 78 */ mr r30, r6 +/* 802638C8 00260808 7C FF 3B 78 */ mr r31, r7 +/* 802638CC 0026080C 81 83 00 18 */ lwz r12, 0x18(r3) +/* 802638D0 00260810 81 8C 00 14 */ lwz r12, 0x14(r12) +/* 802638D4 00260814 7D 89 03 A6 */ mtctr r12 +/* 802638D8 00260818 4E 80 04 21 */ bctrl +/* 802638DC 0026081C 9B 9B 00 14 */ stb r28, 0x14(r27) +/* 802638E0 00260820 9B BB 00 15 */ stb r29, 0x15(r27) +/* 802638E4 00260824 93 DB 00 0C */ stw r30, 0xc(r27) +/* 802638E8 00260828 93 FB 00 10 */ stw r31, 0x10(r27) +/* 802638EC 0026082C 39 61 00 20 */ addi r11, r1, 0x20 +/* 802638F0 00260830 48 0F E9 31 */ bl _restgpr_27 +/* 802638F4 00260834 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802638F8 00260838 7C 08 03 A6 */ mtlr r0 +/* 802638FC 0026083C 38 21 00 20 */ addi r1, r1, 0x20 +/* 80263900 00260840 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_80263904.s b/include/SComponent/c_cc_d/asm/func_80263904.s new file mode 100644 index 0000000000..14ebeb4aae --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263904.s @@ -0,0 +1,12 @@ +/* 80263904 00260844 C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 80263908 00260848 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026390C 0026084C D0 03 00 04 */ stfs f0, 4(r3) +/* 80263910 00260850 D0 03 00 08 */ stfs f0, 8(r3) +/* 80263914 00260854 38 80 00 00 */ li r4, 0 +/* 80263918 00260858 90 83 00 0C */ stw r4, 0xc(r3) +/* 8026391C 0026085C 38 00 FF FF */ li r0, -1 +/* 80263920 00260860 90 03 00 10 */ stw r0, 0x10(r3) +/* 80263924 00260864 98 83 00 14 */ stb r4, 0x14(r3) +/* 80263928 00260868 98 83 00 15 */ stb r4, 0x15(r3) +/* 8026392C 0026086C 98 83 00 16 */ stb r4, 0x16(r3) +/* 80263930 00260870 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_80263934.s b/include/SComponent/c_cc_d/asm/func_80263934.s new file mode 100644 index 0000000000..dfd0af0a23 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263934.s @@ -0,0 +1,10 @@ +/* 80263934 00260874 C0 03 00 00 */ lfs f0, 0(r3) +/* 80263938 00260878 EC 00 08 2A */ fadds f0, f0, f1 +/* 8026393C 0026087C D0 03 00 00 */ stfs f0, 0(r3) +/* 80263940 00260880 C0 03 00 04 */ lfs f0, 4(r3) +/* 80263944 00260884 EC 00 10 2A */ fadds f0, f0, f2 +/* 80263948 00260888 D0 03 00 04 */ stfs f0, 4(r3) +/* 8026394C 0026088C C0 03 00 08 */ lfs f0, 8(r3) +/* 80263950 00260890 EC 00 18 2A */ fadds f0, f0, f3 +/* 80263954 00260894 D0 03 00 08 */ stfs f0, 8(r3) +/* 80263958 00260898 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_8026395C.s b/include/SComponent/c_cc_d/asm/func_8026395C.s new file mode 100644 index 0000000000..93a5fed983 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_8026395C.s @@ -0,0 +1,5 @@ +/* 8026395C 0026089C C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 80263960 002608A0 D0 03 00 08 */ stfs f0, 8(r3) +/* 80263964 002608A4 D0 03 00 04 */ stfs f0, 4(r3) +/* 80263968 002608A8 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026396C 002608AC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_80263970.s b/include/SComponent/c_cc_d/asm/func_80263970.s new file mode 100644 index 0000000000..bebe66117c --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263970.s @@ -0,0 +1,5 @@ +/* 80263970 002608B0 88 03 00 16 */ lbz r0, 0x16(r3) +/* 80263974 002608B4 7C 00 20 00 */ cmpw r0, r4 +/* 80263978 002608B8 4C 80 00 20 */ bgelr +/* 8026397C 002608BC 98 83 00 16 */ stb r4, 0x16(r3) +/* 80263980 002608C0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_80263984.s b/include/SComponent/c_cc_d/asm/func_80263984.s new file mode 100644 index 0000000000..1a5bc06d53 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263984.s @@ -0,0 +1,11 @@ +/* 80263984 002608C4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80263988 002608C8 88 03 00 14 */ lbz r0, 0x14(r3) +/* 8026398C 002608CC C8 22 B6 28 */ lfd f1, lbl_80455028-_SDA2_BASE_(r2) +/* 80263990 002608D0 6C 00 80 00 */ xoris r0, r0, 0x8000 +/* 80263994 002608D4 90 01 00 0C */ stw r0, 0xc(r1) +/* 80263998 002608D8 3C 00 43 30 */ lis r0, 0x4330 +/* 8026399C 002608DC 90 01 00 08 */ stw r0, 8(r1) +/* 802639A0 002608E0 C8 01 00 08 */ lfd f0, 8(r1) +/* 802639A4 002608E4 EC 20 08 28 */ fsubs f1, f0, f1 +/* 802639A8 002608E8 38 21 00 10 */ addi r1, r1, 0x10 +/* 802639AC 002608EC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_802639B0.s b/include/SComponent/c_cc_d/asm/func_802639B0.s new file mode 100644 index 0000000000..3501d64268 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802639B0.s @@ -0,0 +1,5 @@ +/* 802639B0 002608F0 38 00 00 00 */ li r0, 0 +/* 802639B4 002608F4 90 03 00 00 */ stw r0, 0(r3) +/* 802639B8 002608F8 90 03 00 04 */ stw r0, 4(r3) +/* 802639BC 002608FC 90 03 00 08 */ stw r0, 8(r3) +/* 802639C0 00260900 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_802639C4.s b/include/SComponent/c_cc_d/asm/func_802639C4.s new file mode 100644 index 0000000000..a8f0461811 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802639C4.s @@ -0,0 +1,19 @@ +/* 802639C4 00260904 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802639C8 00260908 7C 08 02 A6 */ mflr r0 +/* 802639CC 0026090C 90 01 00 14 */ stw r0, 0x14(r1) +/* 802639D0 00260910 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802639D4 00260914 93 C1 00 08 */ stw r30, 8(r1) +/* 802639D8 00260918 7C 7E 1B 78 */ mr r30, r3 +/* 802639DC 0026091C 7C 9F 23 78 */ mr r31, r4 +/* 802639E0 00260920 48 00 0E 6D */ bl Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt +/* 802639E4 00260924 38 7E 00 18 */ addi r3, r30, 0x18 +/* 802639E8 00260928 38 9F 00 0C */ addi r4, r31, 0xc +/* 802639EC 0026092C 48 00 0E 95 */ bl Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg +/* 802639F0 00260930 80 1F 00 14 */ lwz r0, 0x14(r31) +/* 802639F4 00260934 90 1E 00 2C */ stw r0, 0x2c(r30) +/* 802639F8 00260938 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802639FC 0026093C 83 C1 00 08 */ lwz r30, 8(r1) +/* 80263A00 00260940 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80263A04 00260944 7C 08 03 A6 */ mtlr r0 +/* 80263A08 00260948 38 21 00 10 */ addi r1, r1, 0x10 +/* 80263A0C 0026094C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_80263A10.s b/include/SComponent/c_cc_d/asm/func_80263A10.s new file mode 100644 index 0000000000..e87325751f --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263A10.s @@ -0,0 +1,3 @@ +/* 80263A10 00260950 38 00 00 00 */ li r0, 0 +/* 80263A14 00260954 90 03 00 40 */ stw r0, 0x40(r3) +/* 80263A18 00260958 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_80263A1C.s b/include/SComponent/c_cc_d/asm/func_80263A1C.s new file mode 100644 index 0000000000..51a286da35 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263A1C.s @@ -0,0 +1,11 @@ +/* 80263A1C 0026095C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80263A20 00260960 7C 08 02 A6 */ mflr r0 +/* 80263A24 00260964 90 01 00 14 */ stw r0, 0x14(r1) +/* 80263A28 00260968 80 04 00 00 */ lwz r0, 0(r4) +/* 80263A2C 0026096C 90 03 00 40 */ stw r0, 0x40(r3) +/* 80263A30 00260970 38 84 00 04 */ addi r4, r4, 4 +/* 80263A34 00260974 4B FF FF 91 */ bl Set__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf +/* 80263A38 00260978 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80263A3C 0026097C 7C 08 03 A6 */ mtlr r0 +/* 80263A40 00260980 38 21 00 10 */ addi r1, r1, 0x10 +/* 80263A44 00260984 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_80263A48.s b/include/SComponent/c_cc_d/asm/func_80263A48.s new file mode 100644 index 0000000000..37db6b989b --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263A48.s @@ -0,0 +1,8 @@ +/* 80263A48 00260988 80 63 00 44 */ lwz r3, 0x44(r3) +/* 80263A4C 0026098C 28 03 00 00 */ cmplwi r3, 0 +/* 80263A50 00260990 40 82 00 0C */ bne lbl_80263A5C +/* 80263A54 00260994 38 60 00 00 */ li r3, 0 +/* 80263A58 00260998 4E 80 00 20 */ blr +lbl_80263A5C: +/* 80263A5C 0026099C 80 63 00 0C */ lwz r3, 0xc(r3) +/* 80263A60 002609A0 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263A64.s b/include/SComponent/c_cc_d/asm/func_80263A64.s new file mode 100644 index 0000000000..0ef3957033 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263A64.s @@ -0,0 +1,9 @@ +/* 80263A64 002609A4 38 00 00 02 */ li r0, 2 +/* 80263A68 002609A8 90 04 00 00 */ stw r0, 0(r4) +/* 80263A6C 002609AC C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 80263A70 002609B0 D0 04 00 14 */ stfs f0, 0x14(r4) +/* 80263A74 002609B4 D0 04 00 10 */ stfs f0, 0x10(r4) +/* 80263A78 002609B8 D0 04 00 0C */ stfs f0, 0xc(r4) +/* 80263A7C 002609BC D0 04 00 08 */ stfs f0, 8(r4) +/* 80263A80 002609C0 D0 04 00 04 */ stfs f0, 4(r4) +/* 80263A84 002609C4 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263A88.s b/include/SComponent/c_cc_d/asm/func_80263A88.s new file mode 100644 index 0000000000..dde715e254 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263A88.s @@ -0,0 +1,52 @@ +/* 80263A88 002609C8 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 80263A8C 002609CC 7C 08 02 A6 */ mflr r0 +/* 80263A90 002609D0 90 01 00 44 */ stw r0, 0x44(r1) +/* 80263A94 002609D4 3C C0 80 3A */ lis r6, lbl_803A37C0@ha +/* 80263A98 002609D8 38 06 37 C0 */ addi r0, r6, lbl_803A37C0@l +/* 80263A9C 002609DC 90 01 00 18 */ stw r0, 0x18(r1) +/* 80263AA0 002609E0 C0 03 00 20 */ lfs f0, 0x20(r3) +/* 80263AA4 002609E4 D0 01 00 08 */ stfs f0, 8(r1) +/* 80263AA8 002609E8 C0 03 00 24 */ lfs f0, 0x24(r3) +/* 80263AAC 002609EC D0 01 00 0C */ stfs f0, 0xc(r1) +/* 80263AB0 002609F0 C0 03 00 28 */ lfs f0, 0x28(r3) +/* 80263AB4 002609F4 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 80263AB8 002609F8 C0 03 00 2C */ lfs f0, 0x2c(r3) +/* 80263ABC 002609FC D0 01 00 14 */ stfs f0, 0x14(r1) +/* 80263AC0 00260A00 3C C0 80 3B */ lis r6, lbl_803ABB84@ha +/* 80263AC4 00260A04 38 06 BB 84 */ addi r0, r6, lbl_803ABB84@l +/* 80263AC8 00260A08 90 01 00 18 */ stw r0, 0x18(r1) +/* 80263ACC 00260A0C 80 C3 00 34 */ lwz r6, 0x34(r3) +/* 80263AD0 00260A10 80 03 00 38 */ lwz r0, 0x38(r3) +/* 80263AD4 00260A14 90 C1 00 1C */ stw r6, 0x1c(r1) +/* 80263AD8 00260A18 90 01 00 20 */ stw r0, 0x20(r1) +/* 80263ADC 00260A1C 80 03 00 3C */ lwz r0, 0x3c(r3) +/* 80263AE0 00260A20 90 01 00 24 */ stw r0, 0x24(r1) +/* 80263AE4 00260A24 80 C3 00 40 */ lwz r6, 0x40(r3) +/* 80263AE8 00260A28 80 03 00 44 */ lwz r0, 0x44(r3) +/* 80263AEC 00260A2C 90 C1 00 28 */ stw r6, 0x28(r1) +/* 80263AF0 00260A30 90 01 00 2C */ stw r0, 0x2c(r1) +/* 80263AF4 00260A34 80 03 00 48 */ lwz r0, 0x48(r3) +/* 80263AF8 00260A38 90 01 00 30 */ stw r0, 0x30(r1) +/* 80263AFC 00260A3C 80 C3 00 4C */ lwz r6, 0x4c(r3) +/* 80263B00 00260A40 80 03 00 50 */ lwz r0, 0x50(r3) +/* 80263B04 00260A44 90 C1 00 34 */ stw r6, 0x34(r1) +/* 80263B08 00260A48 90 01 00 38 */ stw r0, 0x38(r1) +/* 80263B0C 00260A4C 80 03 00 54 */ lwz r0, 0x54(r3) +/* 80263B10 00260A50 90 01 00 3C */ stw r0, 0x3c(r1) +/* 80263B14 00260A54 38 64 00 20 */ addi r3, r4, 0x20 +/* 80263B18 00260A58 38 81 00 08 */ addi r4, r1, 8 +/* 80263B1C 00260A5C 48 00 A6 11 */ bl cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec +/* 80263B20 00260A60 3C 80 80 3B */ lis r4, lbl_803ABB84@ha +/* 80263B24 00260A64 38 04 BB 84 */ addi r0, r4, lbl_803ABB84@l +/* 80263B28 00260A68 90 01 00 18 */ stw r0, 0x18(r1) +/* 80263B2C 00260A6C 3C 80 80 3A */ lis r4, lbl_803A37C0@ha +/* 80263B30 00260A70 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l +/* 80263B34 00260A74 90 01 00 18 */ stw r0, 0x18(r1) +/* 80263B38 00260A78 54 63 06 3E */ clrlwi r3, r3, 0x18 +/* 80263B3C 00260A7C 30 03 FF FF */ addic r0, r3, -1 +/* 80263B40 00260A80 7C 00 19 10 */ subfe r0, r0, r3 +/* 80263B44 00260A84 54 03 06 3E */ clrlwi r3, r0, 0x18 +/* 80263B48 00260A88 80 01 00 44 */ lwz r0, 0x44(r1) +/* 80263B4C 00260A8C 7C 08 03 A6 */ mtlr r0 +/* 80263B50 00260A90 38 21 00 40 */ addi r1, r1, 0x40 +/* 80263B54 00260A94 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263B58.s b/include/SComponent/c_cc_d/asm/func_80263B58.s new file mode 100644 index 0000000000..f55c416cd3 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263B58.s @@ -0,0 +1,14 @@ +/* 80263B58 00260A98 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80263B5C 00260A9C 7C 08 02 A6 */ mflr r0 +/* 80263B60 00260AA0 90 01 00 14 */ stw r0, 0x14(r1) +/* 80263B64 00260AA4 38 63 00 20 */ addi r3, r3, 0x20 +/* 80263B68 00260AA8 38 84 00 20 */ addi r4, r4, 0x20 +/* 80263B6C 00260AAC 48 00 BC 45 */ bl cross__8cM3dGTriCFPC8cM3dGCylP3Vec +/* 80263B70 00260AB0 54 63 06 3E */ clrlwi r3, r3, 0x18 +/* 80263B74 00260AB4 30 03 FF FF */ addic r0, r3, -1 +/* 80263B78 00260AB8 7C 00 19 10 */ subfe r0, r0, r3 +/* 80263B7C 00260ABC 54 03 06 3E */ clrlwi r3, r0, 0x18 +/* 80263B80 00260AC0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80263B84 00260AC4 7C 08 03 A6 */ mtlr r0 +/* 80263B88 00260AC8 38 21 00 10 */ addi r1, r1, 0x10 +/* 80263B8C 00260ACC 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263B90.s b/include/SComponent/c_cc_d/asm/func_80263B90.s new file mode 100644 index 0000000000..f5085dc0e2 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263B90.s @@ -0,0 +1,15 @@ +/* 80263B90 00260AD0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80263B94 00260AD4 7C 08 02 A6 */ mflr r0 +/* 80263B98 00260AD8 90 01 00 14 */ stw r0, 0x14(r1) +/* 80263B9C 00260ADC 7C 66 1B 78 */ mr r6, r3 +/* 80263BA0 00260AE0 38 64 00 20 */ addi r3, r4, 0x20 +/* 80263BA4 00260AE4 38 86 00 20 */ addi r4, r6, 0x20 +/* 80263BA8 00260AE8 48 00 83 5D */ bl cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec +/* 80263BAC 00260AEC 54 63 06 3E */ clrlwi r3, r3, 0x18 +/* 80263BB0 00260AF0 30 03 FF FF */ addic r0, r3, -1 +/* 80263BB4 00260AF4 7C 00 19 10 */ subfe r0, r0, r3 +/* 80263BB8 00260AF8 54 03 06 3E */ clrlwi r3, r0, 0x18 +/* 80263BBC 00260AFC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80263BC0 00260B00 7C 08 03 A6 */ mtlr r0 +/* 80263BC4 00260B04 38 21 00 10 */ addi r1, r1, 0x10 +/* 80263BC8 00260B08 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263BCC.s b/include/SComponent/c_cc_d/asm/func_80263BCC.s new file mode 100644 index 0000000000..450e8b0abb --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263BCC.s @@ -0,0 +1,14 @@ +/* 80263BCC 00260B0C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80263BD0 00260B10 7C 08 02 A6 */ mflr r0 +/* 80263BD4 00260B14 90 01 00 14 */ stw r0, 0x14(r1) +/* 80263BD8 00260B18 38 63 00 20 */ addi r3, r3, 0x20 +/* 80263BDC 00260B1C 38 84 00 20 */ addi r4, r4, 0x20 +/* 80263BE0 00260B20 48 00 A2 4D */ bl cM3d_Cross_TriTri__FRC8cM3dGTriRC8cM3dGTriP3Vec +/* 80263BE4 00260B24 54 63 06 3E */ clrlwi r3, r3, 0x18 +/* 80263BE8 00260B28 30 03 FF FF */ addic r0, r3, -1 +/* 80263BEC 00260B2C 7C 00 19 10 */ subfe r0, r0, r3 +/* 80263BF0 00260B30 54 03 06 3E */ clrlwi r3, r0, 0x18 +/* 80263BF4 00260B34 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80263BF8 00260B38 7C 08 03 A6 */ mtlr r0 +/* 80263BFC 00260B3C 38 21 00 10 */ addi r1, r1, 0x10 +/* 80263C00 00260B40 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263C04.s b/include/SComponent/c_cc_d/asm/func_80263C04.s new file mode 100644 index 0000000000..c6dfddb8b6 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263C04.s @@ -0,0 +1,38 @@ +/* 80263C04 00260B44 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 80263C08 00260B48 7C 08 02 A6 */ mflr r0 +/* 80263C0C 00260B4C 90 01 00 44 */ stw r0, 0x44(r1) +/* 80263C10 00260B50 93 E1 00 3C */ stw r31, 0x3c(r1) +/* 80263C14 00260B54 7C 7F 1B 78 */ mr r31, r3 +/* 80263C18 00260B58 48 00 B0 E1 */ bl ClearForMinMax__8cM3dGAabFv +/* 80263C1C 00260B5C C0 1F 00 34 */ lfs f0, 0x34(r31) +/* 80263C20 00260B60 D0 01 00 20 */ stfs f0, 0x20(r1) +/* 80263C24 00260B64 C0 1F 00 38 */ lfs f0, 0x38(r31) +/* 80263C28 00260B68 D0 01 00 24 */ stfs f0, 0x24(r1) +/* 80263C2C 00260B6C C0 1F 00 3C */ lfs f0, 0x3c(r31) +/* 80263C30 00260B70 D0 01 00 28 */ stfs f0, 0x28(r1) +/* 80263C34 00260B74 7F E3 FB 78 */ mr r3, r31 +/* 80263C38 00260B78 38 81 00 20 */ addi r4, r1, 0x20 +/* 80263C3C 00260B7C 48 00 B0 E1 */ bl SetMinMax__8cM3dGAabFRC4cXyz +/* 80263C40 00260B80 C0 1F 00 40 */ lfs f0, 0x40(r31) +/* 80263C44 00260B84 D0 01 00 14 */ stfs f0, 0x14(r1) +/* 80263C48 00260B88 C0 1F 00 44 */ lfs f0, 0x44(r31) +/* 80263C4C 00260B8C D0 01 00 18 */ stfs f0, 0x18(r1) +/* 80263C50 00260B90 C0 1F 00 48 */ lfs f0, 0x48(r31) +/* 80263C54 00260B94 D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 80263C58 00260B98 7F E3 FB 78 */ mr r3, r31 +/* 80263C5C 00260B9C 38 81 00 14 */ addi r4, r1, 0x14 +/* 80263C60 00260BA0 48 00 B0 BD */ bl SetMinMax__8cM3dGAabFRC4cXyz +/* 80263C64 00260BA4 C0 1F 00 4C */ lfs f0, 0x4c(r31) +/* 80263C68 00260BA8 D0 01 00 08 */ stfs f0, 8(r1) +/* 80263C6C 00260BAC C0 1F 00 50 */ lfs f0, 0x50(r31) +/* 80263C70 00260BB0 D0 01 00 0C */ stfs f0, 0xc(r1) +/* 80263C74 00260BB4 C0 1F 00 54 */ lfs f0, 0x54(r31) +/* 80263C78 00260BB8 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 80263C7C 00260BBC 7F E3 FB 78 */ mr r3, r31 +/* 80263C80 00260BC0 38 81 00 08 */ addi r4, r1, 8 +/* 80263C84 00260BC4 48 00 B0 99 */ bl SetMinMax__8cM3dGAabFRC4cXyz +/* 80263C88 00260BC8 83 E1 00 3C */ lwz r31, 0x3c(r1) +/* 80263C8C 00260BCC 80 01 00 44 */ lwz r0, 0x44(r1) +/* 80263C90 00260BD0 7C 08 03 A6 */ mtlr r0 +/* 80263C94 00260BD4 38 21 00 40 */ addi r1, r1, 0x40 +/* 80263C98 00260BD8 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263C9C.s b/include/SComponent/c_cc_d/asm/func_80263C9C.s new file mode 100644 index 0000000000..f1c4930f14 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263C9C.s @@ -0,0 +1,41 @@ +/* 80263C9C 00260BDC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80263CA0 00260BE0 7C 08 02 A6 */ mflr r0 +/* 80263CA4 00260BE4 90 01 00 14 */ stw r0, 0x14(r1) +/* 80263CA8 00260BE8 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80263CAC 00260BEC 93 C1 00 08 */ stw r30, 8(r1) +/* 80263CB0 00260BF0 7C 7E 1B 78 */ mr r30, r3 +/* 80263CB4 00260BF4 7C BF 2B 78 */ mr r31, r5 +/* 80263CB8 00260BF8 38 7E 00 20 */ addi r3, r30, 0x20 +/* 80263CBC 00260BFC 48 0E 34 D9 */ bl PSVECDotProduct +/* 80263CC0 00260C00 C0 1E 00 2C */ lfs f0, 0x2c(r30) +/* 80263CC4 00260C04 EC 20 08 2A */ fadds f1, f0, f1 +/* 80263CC8 00260C08 C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 80263CCC 00260C0C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80263CD0 00260C10 4C 41 13 82 */ cror 2, 1, 2 +/* 80263CD4 00260C14 40 82 00 20 */ bne lbl_80263CF4 +/* 80263CD8 00260C18 C0 1E 00 20 */ lfs f0, 0x20(r30) +/* 80263CDC 00260C1C D0 1F 00 00 */ stfs f0, 0(r31) +/* 80263CE0 00260C20 C0 1E 00 24 */ lfs f0, 0x24(r30) +/* 80263CE4 00260C24 D0 1F 00 04 */ stfs f0, 4(r31) +/* 80263CE8 00260C28 C0 1E 00 28 */ lfs f0, 0x28(r30) +/* 80263CEC 00260C2C D0 1F 00 08 */ stfs f0, 8(r31) +/* 80263CF0 00260C30 48 00 00 2C */ b lbl_80263D1C +lbl_80263CF4: +/* 80263CF4 00260C34 C0 1E 00 20 */ lfs f0, 0x20(r30) +/* 80263CF8 00260C38 D0 1F 00 00 */ stfs f0, 0(r31) +/* 80263CFC 00260C3C C0 1E 00 24 */ lfs f0, 0x24(r30) +/* 80263D00 00260C40 D0 1F 00 04 */ stfs f0, 4(r31) +/* 80263D04 00260C44 C0 1E 00 28 */ lfs f0, 0x28(r30) +/* 80263D08 00260C48 D0 1F 00 08 */ stfs f0, 8(r31) +/* 80263D0C 00260C4C 7F E3 FB 78 */ mr r3, r31 +/* 80263D10 00260C50 7F E4 FB 78 */ mr r4, r31 +/* 80263D14 00260C54 C0 22 B6 30 */ lfs f1, lbl_80455030-_SDA2_BASE_(r2) +/* 80263D18 00260C58 48 0E 33 C1 */ bl PSVECScale +lbl_80263D1C: +/* 80263D1C 00260C5C 38 60 00 01 */ li r3, 1 +/* 80263D20 00260C60 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80263D24 00260C64 83 C1 00 08 */ lwz r30, 8(r1) +/* 80263D28 00260C68 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80263D2C 00260C6C 7C 08 03 A6 */ mtlr r0 +/* 80263D30 00260C70 38 21 00 10 */ addi r1, r1, 0x10 +/* 80263D34 00260C74 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263D38.s b/include/SComponent/c_cc_d/asm/func_80263D38.s new file mode 100644 index 0000000000..b4db780606 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263D38.s @@ -0,0 +1,20 @@ +/* 80263D38 00260C78 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80263D3C 00260C7C 7C 08 02 A6 */ mflr r0 +/* 80263D40 00260C80 90 01 00 14 */ stw r0, 0x14(r1) +/* 80263D44 00260C84 28 04 00 00 */ cmplwi r4, 0 +/* 80263D48 00260C88 41 82 00 08 */ beq lbl_80263D50 +/* 80263D4C 00260C8C 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80263D50: +/* 80263D50 00260C90 38 63 00 20 */ addi r3, r3, 0x20 +/* 80263D54 00260C94 48 00 93 C1 */ bl cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec +/* 80263D58 00260C98 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80263D5C 00260C9C 41 82 00 0C */ beq lbl_80263D68 +/* 80263D60 00260CA0 38 60 00 01 */ li r3, 1 +/* 80263D64 00260CA4 48 00 00 08 */ b lbl_80263D6C +lbl_80263D68: +/* 80263D68 00260CA8 38 60 00 00 */ li r3, 0 +lbl_80263D6C: +/* 80263D6C 00260CAC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80263D70 00260CB0 7C 08 03 A6 */ mtlr r0 +/* 80263D74 00260CB4 38 21 00 10 */ addi r1, r1, 0x10 +/* 80263D78 00260CB8 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263D7C.s b/include/SComponent/c_cc_d/asm/func_80263D7C.s new file mode 100644 index 0000000000..cc986237be --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263D7C.s @@ -0,0 +1,20 @@ +/* 80263D7C 00260CBC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80263D80 00260CC0 7C 08 02 A6 */ mflr r0 +/* 80263D84 00260CC4 90 01 00 14 */ stw r0, 0x14(r1) +/* 80263D88 00260CC8 28 04 00 00 */ cmplwi r4, 0 +/* 80263D8C 00260CCC 41 82 00 08 */ beq lbl_80263D94 +/* 80263D90 00260CD0 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80263D94: +/* 80263D94 00260CD4 38 63 00 20 */ addi r3, r3, 0x20 +/* 80263D98 00260CD8 48 00 96 3D */ bl cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec +/* 80263D9C 00260CDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80263DA0 00260CE0 41 82 00 0C */ beq lbl_80263DAC +/* 80263DA4 00260CE4 38 60 00 01 */ li r3, 1 +/* 80263DA8 00260CE8 48 00 00 08 */ b lbl_80263DB0 +lbl_80263DAC: +/* 80263DAC 00260CEC 38 60 00 00 */ li r3, 0 +lbl_80263DB0: +/* 80263DB0 00260CF0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80263DB4 00260CF4 7C 08 03 A6 */ mtlr r0 +/* 80263DB8 00260CF8 38 21 00 10 */ addi r1, r1, 0x10 +/* 80263DBC 00260CFC 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263DC0.s b/include/SComponent/c_cc_d/asm/func_80263DC0.s new file mode 100644 index 0000000000..198f525f61 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263DC0.s @@ -0,0 +1,20 @@ +/* 80263DC0 00260D00 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80263DC4 00260D04 7C 08 02 A6 */ mflr r0 +/* 80263DC8 00260D08 90 01 00 14 */ stw r0, 0x14(r1) +/* 80263DCC 00260D0C 28 04 00 00 */ cmplwi r4, 0 +/* 80263DD0 00260D10 41 82 00 08 */ beq lbl_80263DD8 +/* 80263DD4 00260D14 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80263DD8: +/* 80263DD8 00260D18 38 63 00 20 */ addi r3, r3, 0x20 +/* 80263DDC 00260D1C 48 00 9E 61 */ bl cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec +/* 80263DE0 00260D20 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80263DE4 00260D24 41 82 00 0C */ beq lbl_80263DF0 +/* 80263DE8 00260D28 38 60 00 01 */ li r3, 1 +/* 80263DEC 00260D2C 48 00 00 08 */ b lbl_80263DF4 +lbl_80263DF0: +/* 80263DF0 00260D30 38 60 00 00 */ li r3, 0 +lbl_80263DF4: +/* 80263DF4 00260D34 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80263DF8 00260D38 7C 08 03 A6 */ mtlr r0 +/* 80263DFC 00260D3C 38 21 00 10 */ addi r1, r1, 0x10 +/* 80263E00 00260D40 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263E04.s b/include/SComponent/c_cc_d/asm/func_80263E04.s new file mode 100644 index 0000000000..0e1a207f44 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263E04.s @@ -0,0 +1,52 @@ +/* 80263E04 00260D44 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 80263E08 00260D48 7C 08 02 A6 */ mflr r0 +/* 80263E0C 00260D4C 90 01 00 44 */ stw r0, 0x44(r1) +/* 80263E10 00260D50 3C C0 80 3A */ lis r6, lbl_803A37C0@ha +/* 80263E14 00260D54 38 06 37 C0 */ addi r0, r6, lbl_803A37C0@l +/* 80263E18 00260D58 90 01 00 18 */ stw r0, 0x18(r1) +/* 80263E1C 00260D5C C0 04 00 20 */ lfs f0, 0x20(r4) +/* 80263E20 00260D60 D0 01 00 08 */ stfs f0, 8(r1) +/* 80263E24 00260D64 C0 04 00 24 */ lfs f0, 0x24(r4) +/* 80263E28 00260D68 D0 01 00 0C */ stfs f0, 0xc(r1) +/* 80263E2C 00260D6C C0 04 00 28 */ lfs f0, 0x28(r4) +/* 80263E30 00260D70 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 80263E34 00260D74 C0 04 00 2C */ lfs f0, 0x2c(r4) +/* 80263E38 00260D78 D0 01 00 14 */ stfs f0, 0x14(r1) +/* 80263E3C 00260D7C 3C C0 80 3B */ lis r6, lbl_803ABB84@ha +/* 80263E40 00260D80 38 06 BB 84 */ addi r0, r6, lbl_803ABB84@l +/* 80263E44 00260D84 90 01 00 18 */ stw r0, 0x18(r1) +/* 80263E48 00260D88 80 C4 00 34 */ lwz r6, 0x34(r4) +/* 80263E4C 00260D8C 80 04 00 38 */ lwz r0, 0x38(r4) +/* 80263E50 00260D90 90 C1 00 1C */ stw r6, 0x1c(r1) +/* 80263E54 00260D94 90 01 00 20 */ stw r0, 0x20(r1) +/* 80263E58 00260D98 80 04 00 3C */ lwz r0, 0x3c(r4) +/* 80263E5C 00260D9C 90 01 00 24 */ stw r0, 0x24(r1) +/* 80263E60 00260DA0 80 C4 00 40 */ lwz r6, 0x40(r4) +/* 80263E64 00260DA4 80 04 00 44 */ lwz r0, 0x44(r4) +/* 80263E68 00260DA8 90 C1 00 28 */ stw r6, 0x28(r1) +/* 80263E6C 00260DAC 90 01 00 2C */ stw r0, 0x2c(r1) +/* 80263E70 00260DB0 80 04 00 48 */ lwz r0, 0x48(r4) +/* 80263E74 00260DB4 90 01 00 30 */ stw r0, 0x30(r1) +/* 80263E78 00260DB8 80 C4 00 4C */ lwz r6, 0x4c(r4) +/* 80263E7C 00260DBC 80 04 00 50 */ lwz r0, 0x50(r4) +/* 80263E80 00260DC0 90 C1 00 34 */ stw r6, 0x34(r1) +/* 80263E84 00260DC4 90 01 00 38 */ stw r0, 0x38(r1) +/* 80263E88 00260DC8 80 04 00 54 */ lwz r0, 0x54(r4) +/* 80263E8C 00260DCC 90 01 00 3C */ stw r0, 0x3c(r1) +/* 80263E90 00260DD0 38 63 00 20 */ addi r3, r3, 0x20 +/* 80263E94 00260DD4 38 81 00 08 */ addi r4, r1, 8 +/* 80263E98 00260DD8 48 00 A2 95 */ bl cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec +/* 80263E9C 00260DDC 3C 80 80 3B */ lis r4, lbl_803ABB84@ha +/* 80263EA0 00260DE0 38 04 BB 84 */ addi r0, r4, lbl_803ABB84@l +/* 80263EA4 00260DE4 90 01 00 18 */ stw r0, 0x18(r1) +/* 80263EA8 00260DE8 3C 80 80 3A */ lis r4, lbl_803A37C0@ha +/* 80263EAC 00260DEC 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l +/* 80263EB0 00260DF0 90 01 00 18 */ stw r0, 0x18(r1) +/* 80263EB4 00260DF4 54 63 06 3E */ clrlwi r3, r3, 0x18 +/* 80263EB8 00260DF8 30 03 FF FF */ addic r0, r3, -1 +/* 80263EBC 00260DFC 7C 00 19 10 */ subfe r0, r0, r3 +/* 80263EC0 00260E00 54 03 06 3E */ clrlwi r3, r0, 0x18 +/* 80263EC4 00260E04 80 01 00 44 */ lwz r0, 0x44(r1) +/* 80263EC8 00260E08 7C 08 03 A6 */ mtlr r0 +/* 80263ECC 00260E0C 38 21 00 40 */ addi r1, r1, 0x40 +/* 80263ED0 00260E10 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263ED4.s b/include/SComponent/c_cc_d/asm/func_80263ED4.s new file mode 100644 index 0000000000..6bd1c4df2b --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263ED4.s @@ -0,0 +1,23 @@ +/* 80263ED4 00260E14 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80263ED8 00260E18 7C 08 02 A6 */ mflr r0 +/* 80263EDC 00260E1C 90 01 00 24 */ stw r0, 0x24(r1) +/* 80263EE0 00260E20 C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 80263EE4 00260E24 D0 05 00 00 */ stfs f0, 0(r5) +/* 80263EE8 00260E28 28 04 00 00 */ cmplwi r4, 0 +/* 80263EEC 00260E2C 41 82 00 08 */ beq lbl_80263EF4 +/* 80263EF0 00260E30 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80263EF4: +/* 80263EF4 00260E34 38 63 00 20 */ addi r3, r3, 0x20 +/* 80263EF8 00260E38 38 A1 00 08 */ addi r5, r1, 8 +/* 80263EFC 00260E3C 48 00 92 19 */ bl cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec +/* 80263F00 00260E40 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80263F04 00260E44 41 82 00 0C */ beq lbl_80263F10 +/* 80263F08 00260E48 38 60 00 01 */ li r3, 1 +/* 80263F0C 00260E4C 48 00 00 08 */ b lbl_80263F14 +lbl_80263F10: +/* 80263F10 00260E50 38 60 00 00 */ li r3, 0 +lbl_80263F14: +/* 80263F14 00260E54 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80263F18 00260E58 7C 08 03 A6 */ mtlr r0 +/* 80263F1C 00260E5C 38 21 00 20 */ addi r1, r1, 0x20 +/* 80263F20 00260E60 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263F24.s b/include/SComponent/c_cc_d/asm/func_80263F24.s new file mode 100644 index 0000000000..6f01f252f3 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263F24.s @@ -0,0 +1,23 @@ +/* 80263F24 00260E64 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80263F28 00260E68 7C 08 02 A6 */ mflr r0 +/* 80263F2C 00260E6C 90 01 00 24 */ stw r0, 0x24(r1) +/* 80263F30 00260E70 C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 80263F34 00260E74 D0 05 00 00 */ stfs f0, 0(r5) +/* 80263F38 00260E78 28 04 00 00 */ cmplwi r4, 0 +/* 80263F3C 00260E7C 41 82 00 08 */ beq lbl_80263F44 +/* 80263F40 00260E80 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80263F44: +/* 80263F44 00260E84 38 63 00 20 */ addi r3, r3, 0x20 +/* 80263F48 00260E88 38 A1 00 08 */ addi r5, r1, 8 +/* 80263F4C 00260E8C 48 00 94 89 */ bl cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec +/* 80263F50 00260E90 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80263F54 00260E94 41 82 00 0C */ beq lbl_80263F60 +/* 80263F58 00260E98 38 60 00 01 */ li r3, 1 +/* 80263F5C 00260E9C 48 00 00 08 */ b lbl_80263F64 +lbl_80263F60: +/* 80263F60 00260EA0 38 60 00 00 */ li r3, 0 +lbl_80263F64: +/* 80263F64 00260EA4 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80263F68 00260EA8 7C 08 03 A6 */ mtlr r0 +/* 80263F6C 00260EAC 38 21 00 20 */ addi r1, r1, 0x20 +/* 80263F70 00260EB0 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80263F74.s b/include/SComponent/c_cc_d/asm/func_80263F74.s new file mode 100644 index 0000000000..cca7be6d74 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263F74.s @@ -0,0 +1,23 @@ +/* 80263F74 00260EB4 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80263F78 00260EB8 7C 08 02 A6 */ mflr r0 +/* 80263F7C 00260EBC 90 01 00 24 */ stw r0, 0x24(r1) +/* 80263F80 00260EC0 C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 80263F84 00260EC4 D0 05 00 00 */ stfs f0, 0(r5) +/* 80263F88 00260EC8 28 04 00 00 */ cmplwi r4, 0 +/* 80263F8C 00260ECC 41 82 00 08 */ beq lbl_80263F94 +/* 80263F90 00260ED0 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80263F94: +/* 80263F94 00260ED4 38 63 00 20 */ addi r3, r3, 0x20 +/* 80263F98 00260ED8 38 A1 00 08 */ addi r5, r1, 8 +/* 80263F9C 00260EDC 48 00 9C A1 */ bl cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec +/* 80263FA0 00260EE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80263FA4 00260EE4 41 82 00 0C */ beq lbl_80263FB0 +/* 80263FA8 00260EE8 38 60 00 01 */ li r3, 1 +/* 80263FAC 00260EEC 48 00 00 08 */ b lbl_80263FB4 +lbl_80263FB0: +/* 80263FB0 00260EF0 38 60 00 00 */ li r3, 0 +lbl_80263FB4: +/* 80263FB4 00260EF4 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80263FB8 00260EF8 7C 08 03 A6 */ mtlr r0 +/* 80263FBC 00260EFC 38 21 00 20 */ addi r1, r1, 0x20 +/* 80263FC0 00260F00 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_80263FC4.s b/include/SComponent/c_cc_d/asm/func_80263FC4.s new file mode 100644 index 0000000000..e01945e35d --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80263FC4.s @@ -0,0 +1,20 @@ +/* 80263FC4 00260F04 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80263FC8 00260F08 7C 08 02 A6 */ mflr r0 +/* 80263FCC 00260F0C 90 01 00 14 */ stw r0, 0x14(r1) +/* 80263FD0 00260F10 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80263FD4 00260F14 7C 7F 1B 78 */ mr r31, r3 +/* 80263FD8 00260F18 48 00 AD 21 */ bl ClearForMinMax__8cM3dGAabFv +/* 80263FDC 00260F1C 7F E3 FB 78 */ mr r3, r31 +/* 80263FE0 00260F20 38 9F 00 20 */ addi r4, r31, 0x20 +/* 80263FE4 00260F24 48 00 AD 39 */ bl SetMinMax__8cM3dGAabFRC4cXyz +/* 80263FE8 00260F28 7F E3 FB 78 */ mr r3, r31 +/* 80263FEC 00260F2C 38 9F 00 2C */ addi r4, r31, 0x2c +/* 80263FF0 00260F30 48 00 AD 2D */ bl SetMinMax__8cM3dGAabFRC4cXyz +/* 80263FF4 00260F34 7F E3 FB 78 */ mr r3, r31 +/* 80263FF8 00260F38 C0 3F 00 3C */ lfs f1, 0x3c(r31) +/* 80263FFC 00260F3C 48 00 AE 6D */ bl PlusR__8cM3dGAabFf +/* 80264000 00260F40 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80264004 00260F44 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80264008 00260F48 7C 08 03 A6 */ mtlr r0 +/* 8026400C 00260F4C 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264010 00260F50 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264014.s b/include/SComponent/c_cc_d/asm/func_80264014.s new file mode 100644 index 0000000000..2f0350146f --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264014.s @@ -0,0 +1,96 @@ +/* 80264014 00260F54 94 21 FF B0 */ stwu r1, -0x50(r1) +/* 80264018 00260F58 7C 08 02 A6 */ mflr r0 +/* 8026401C 00260F5C 90 01 00 54 */ stw r0, 0x54(r1) +/* 80264020 00260F60 DB E1 00 40 */ stfd f31, 0x40(r1) +/* 80264024 00260F64 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 +/* 80264028 00260F68 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026402C 00260F6C 48 0F E1 AD */ bl _savegpr_28 +/* 80264030 00260F70 7C 7C 1B 78 */ mr r28, r3 +/* 80264034 00260F74 7C 9D 23 78 */ mr r29, r4 +/* 80264038 00260F78 7C BE 2B 78 */ mr r30, r5 +/* 8026403C 00260F7C 3B FC 00 2C */ addi r31, r28, 0x2c +/* 80264040 00260F80 7F E3 FB 78 */ mr r3, r31 +/* 80264044 00260F84 38 9C 00 20 */ addi r4, r28, 0x20 +/* 80264048 00260F88 38 A1 00 20 */ addi r5, r1, 0x20 +/* 8026404C 00260F8C 48 0E 30 69 */ bl PSVECSubtract +/* 80264050 00260F90 38 61 00 20 */ addi r3, r1, 0x20 +/* 80264054 00260F94 7C 64 1B 78 */ mr r4, r3 +/* 80264058 00260F98 48 0E 31 3D */ bl PSVECDotProduct +/* 8026405C 00260F9C FF E0 08 90 */ fmr f31, f1 +/* 80264060 00260FA0 FC 00 FA 10 */ fabs f0, f31 +/* 80264064 00260FA4 FC 20 00 18 */ frsp f1, f0 +/* 80264068 00260FA8 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026406C 00260FAC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80264070 00260FB0 40 80 00 0C */ bge lbl_8026407C +/* 80264074 00260FB4 38 60 00 00 */ li r3, 0 +/* 80264078 00260FB8 48 00 00 E4 */ b lbl_8026415C +lbl_8026407C: +/* 8026407C 00260FBC 7F A3 EB 78 */ mr r3, r29 +/* 80264080 00260FC0 38 9C 00 20 */ addi r4, r28, 0x20 +/* 80264084 00260FC4 38 A1 00 14 */ addi r5, r1, 0x14 +/* 80264088 00260FC8 48 0E 30 2D */ bl PSVECSubtract +/* 8026408C 00260FCC 38 61 00 14 */ addi r3, r1, 0x14 +/* 80264090 00260FD0 38 81 00 20 */ addi r4, r1, 0x20 +/* 80264094 00260FD4 48 0E 31 01 */ bl PSVECDotProduct +/* 80264098 00260FD8 EC 21 F8 24 */ fdivs f1, f1, f31 +/* 8026409C 00260FDC C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 802640A0 00260FE0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802640A4 00260FE4 40 80 00 20 */ bge lbl_802640C4 +/* 802640A8 00260FE8 C0 1C 00 20 */ lfs f0, 0x20(r28) +/* 802640AC 00260FEC D0 01 00 08 */ stfs f0, 8(r1) +/* 802640B0 00260FF0 C0 1C 00 24 */ lfs f0, 0x24(r28) +/* 802640B4 00260FF4 D0 01 00 0C */ stfs f0, 0xc(r1) +/* 802640B8 00260FF8 C0 1C 00 28 */ lfs f0, 0x28(r28) +/* 802640BC 00260FFC D0 01 00 10 */ stfs f0, 0x10(r1) +/* 802640C0 00261000 48 00 00 48 */ b lbl_80264108 +lbl_802640C4: +/* 802640C4 00261004 C0 02 B6 1C */ lfs f0, lbl_8045501C-_SDA2_BASE_(r2) +/* 802640C8 00261008 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802640CC 0026100C 40 81 00 20 */ ble lbl_802640EC +/* 802640D0 00261010 C0 1F 00 00 */ lfs f0, 0(r31) +/* 802640D4 00261014 D0 01 00 08 */ stfs f0, 8(r1) +/* 802640D8 00261018 C0 1F 00 04 */ lfs f0, 4(r31) +/* 802640DC 0026101C D0 01 00 0C */ stfs f0, 0xc(r1) +/* 802640E0 00261020 C0 1F 00 08 */ lfs f0, 8(r31) +/* 802640E4 00261024 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 802640E8 00261028 48 00 00 20 */ b lbl_80264108 +lbl_802640EC: +/* 802640EC 0026102C 38 61 00 20 */ addi r3, r1, 0x20 +/* 802640F0 00261030 7C 64 1B 78 */ mr r4, r3 +/* 802640F4 00261034 48 0E 2F E5 */ bl PSVECScale +/* 802640F8 00261038 38 61 00 20 */ addi r3, r1, 0x20 +/* 802640FC 0026103C 38 9C 00 20 */ addi r4, r28, 0x20 +/* 80264100 00261040 38 A1 00 08 */ addi r5, r1, 8 +/* 80264104 00261044 48 0E 2F 8D */ bl PSVECAdd +lbl_80264108: +/* 80264108 00261048 7F A3 EB 78 */ mr r3, r29 +/* 8026410C 0026104C 38 81 00 08 */ addi r4, r1, 8 +/* 80264110 00261050 7F C5 F3 78 */ mr r5, r30 +/* 80264114 00261054 48 0E 2F A1 */ bl PSVECSubtract +/* 80264118 00261058 7F C3 F3 78 */ mr r3, r30 +/* 8026411C 0026105C 48 0E 30 35 */ bl PSVECMag +/* 80264120 00261060 FC 00 0A 10 */ fabs f0, f1 +/* 80264124 00261064 FC 20 00 18 */ frsp f1, f0 +/* 80264128 00261068 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026412C 0026106C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80264130 00261070 40 80 00 1C */ bge lbl_8026414C +/* 80264134 00261074 C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 80264138 00261078 D0 1E 00 00 */ stfs f0, 0(r30) +/* 8026413C 0026107C D0 1E 00 04 */ stfs f0, 4(r30) +/* 80264140 00261080 D0 1E 00 08 */ stfs f0, 8(r30) +/* 80264144 00261084 38 60 00 00 */ li r3, 0 +/* 80264148 00261088 48 00 00 14 */ b lbl_8026415C +lbl_8026414C: +/* 8026414C 0026108C 7F C3 F3 78 */ mr r3, r30 +/* 80264150 00261090 7F C4 F3 78 */ mr r4, r30 +/* 80264154 00261094 48 0E 2F A1 */ bl PSVECNormalize +/* 80264158 00261098 38 60 00 01 */ li r3, 1 +lbl_8026415C: +/* 8026415C 0026109C E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 +/* 80264160 002610A0 CB E1 00 40 */ lfd f31, 0x40(r1) +/* 80264164 002610A4 39 61 00 40 */ addi r11, r1, 0x40 +/* 80264168 002610A8 48 0F E0 BD */ bl _restgpr_28 +/* 8026416C 002610AC 80 01 00 54 */ lwz r0, 0x54(r1) +/* 80264170 002610B0 7C 08 03 A6 */ mtlr r0 +/* 80264174 002610B4 38 21 00 50 */ addi r1, r1, 0x50 +/* 80264178 002610B8 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_8026417C.s b/include/SComponent/c_cc_d/asm/func_8026417C.s new file mode 100644 index 0000000000..ad6b75abaf --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_8026417C.s @@ -0,0 +1,22 @@ +/* 8026417C 002610BC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80264180 002610C0 7C 08 02 A6 */ mflr r0 +/* 80264184 002610C4 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264188 002610C8 7C 66 1B 78 */ mr r6, r3 +/* 8026418C 002610CC 28 04 00 00 */ cmplwi r4, 0 +/* 80264190 002610D0 41 82 00 08 */ beq lbl_80264198 +/* 80264194 002610D4 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80264198: +/* 80264198 002610D8 7C 83 23 78 */ mr r3, r4 +/* 8026419C 002610DC 38 86 00 20 */ addi r4, r6, 0x20 +/* 802641A0 002610E0 48 00 92 35 */ bl cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec +/* 802641A4 002610E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802641A8 002610E8 41 82 00 0C */ beq lbl_802641B4 +/* 802641AC 002610EC 38 60 00 01 */ li r3, 1 +/* 802641B0 002610F0 48 00 00 08 */ b lbl_802641B8 +lbl_802641B4: +/* 802641B4 002610F4 38 60 00 00 */ li r3, 0 +lbl_802641B8: +/* 802641B8 002610F8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802641BC 002610FC 7C 08 03 A6 */ mtlr r0 +/* 802641C0 00261100 38 21 00 10 */ addi r1, r1, 0x10 +/* 802641C4 00261104 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_802641C8.s b/include/SComponent/c_cc_d/asm/func_802641C8.s new file mode 100644 index 0000000000..5e7a2d5830 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802641C8.s @@ -0,0 +1,20 @@ +/* 802641C8 00261108 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802641CC 0026110C 7C 08 02 A6 */ mflr r0 +/* 802641D0 00261110 90 01 00 14 */ stw r0, 0x14(r1) +/* 802641D4 00261114 28 04 00 00 */ cmplwi r4, 0 +/* 802641D8 00261118 41 82 00 08 */ beq lbl_802641E0 +/* 802641DC 0026111C 38 84 00 20 */ addi r4, r4, 0x20 +lbl_802641E0: +/* 802641E0 00261120 38 63 00 20 */ addi r3, r3, 0x20 +/* 802641E4 00261124 48 00 B0 49 */ bl cross__8cM3dGCylCFPC8cM3dGCylP4cXyz +/* 802641E8 00261128 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802641EC 0026112C 41 82 00 0C */ beq lbl_802641F8 +/* 802641F0 00261130 38 60 00 01 */ li r3, 1 +/* 802641F4 00261134 48 00 00 08 */ b lbl_802641FC +lbl_802641F8: +/* 802641F8 00261138 38 60 00 00 */ li r3, 0 +lbl_802641FC: +/* 802641FC 0026113C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80264200 00261140 7C 08 03 A6 */ mtlr r0 +/* 80264204 00261144 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264208 00261148 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_8026420C.s b/include/SComponent/c_cc_d/asm/func_8026420C.s new file mode 100644 index 0000000000..730d79bc13 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_8026420C.s @@ -0,0 +1,20 @@ +/* 8026420C 0026114C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80264210 00261150 7C 08 02 A6 */ mflr r0 +/* 80264214 00261154 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264218 00261158 28 04 00 00 */ cmplwi r4, 0 +/* 8026421C 0026115C 41 82 00 08 */ beq lbl_80264224 +/* 80264220 00261160 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80264224: +/* 80264224 00261164 38 63 00 20 */ addi r3, r3, 0x20 +/* 80264228 00261168 48 00 AF E1 */ bl cross__8cM3dGCylCFPC8cM3dGSphP4cXyz +/* 8026422C 0026116C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80264230 00261170 41 82 00 0C */ beq lbl_8026423C +/* 80264234 00261174 38 60 00 01 */ li r3, 1 +/* 80264238 00261178 48 00 00 08 */ b lbl_80264240 +lbl_8026423C: +/* 8026423C 0026117C 38 60 00 00 */ li r3, 0 +lbl_80264240: +/* 80264240 00261180 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80264244 00261184 7C 08 03 A6 */ mtlr r0 +/* 80264248 00261188 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026424C 0026118C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264250.s b/include/SComponent/c_cc_d/asm/func_80264250.s new file mode 100644 index 0000000000..63058cb7ed --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264250.s @@ -0,0 +1,14 @@ +/* 80264250 00261190 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80264254 00261194 7C 08 02 A6 */ mflr r0 +/* 80264258 00261198 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026425C 0026119C 38 63 00 20 */ addi r3, r3, 0x20 +/* 80264260 002611A0 38 84 00 20 */ addi r4, r4, 0x20 +/* 80264264 002611A4 48 00 83 6D */ bl cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec +/* 80264268 002611A8 54 63 06 3E */ clrlwi r3, r3, 0x18 +/* 8026426C 002611AC 30 03 FF FF */ addic r0, r3, -1 +/* 80264270 002611B0 7C 00 19 10 */ subfe r0, r0, r3 +/* 80264274 002611B4 54 03 06 3E */ clrlwi r3, r0, 0x18 +/* 80264278 002611B8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026427C 002611BC 7C 08 03 A6 */ mtlr r0 +/* 80264280 002611C0 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264284 002611C4 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264288.s b/include/SComponent/c_cc_d/asm/func_80264288.s new file mode 100644 index 0000000000..db6dac0e6a --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264288.s @@ -0,0 +1,20 @@ +/* 80264288 002611C8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026428C 002611CC 7C 08 02 A6 */ mflr r0 +/* 80264290 002611D0 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264294 002611D4 28 04 00 00 */ cmplwi r4, 0 +/* 80264298 002611D8 41 82 00 08 */ beq lbl_802642A0 +/* 8026429C 002611DC 38 84 00 20 */ addi r4, r4, 0x20 +lbl_802642A0: +/* 802642A0 002611E0 38 63 00 20 */ addi r3, r3, 0x20 +/* 802642A4 002611E4 48 00 7F 89 */ bl cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylPf +/* 802642A8 002611E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802642AC 002611EC 41 82 00 0C */ beq lbl_802642B8 +/* 802642B0 002611F0 38 60 00 01 */ li r3, 1 +/* 802642B4 002611F4 48 00 00 08 */ b lbl_802642BC +lbl_802642B8: +/* 802642B8 002611F8 38 60 00 00 */ li r3, 0 +lbl_802642BC: +/* 802642BC 002611FC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802642C0 00261200 7C 08 03 A6 */ mtlr r0 +/* 802642C4 00261204 38 21 00 10 */ addi r1, r1, 0x10 +/* 802642C8 00261208 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_802642CC.s b/include/SComponent/c_cc_d/asm/func_802642CC.s new file mode 100644 index 0000000000..21048fc64c --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802642CC.s @@ -0,0 +1,20 @@ +/* 802642CC 0026120C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802642D0 00261210 7C 08 02 A6 */ mflr r0 +/* 802642D4 00261214 90 01 00 14 */ stw r0, 0x14(r1) +/* 802642D8 00261218 28 04 00 00 */ cmplwi r4, 0 +/* 802642DC 0026121C 41 82 00 08 */ beq lbl_802642E4 +/* 802642E0 00261220 38 84 00 20 */ addi r4, r4, 0x20 +lbl_802642E4: +/* 802642E4 00261224 38 63 00 20 */ addi r3, r3, 0x20 +/* 802642E8 00261228 48 00 75 BD */ bl cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf +/* 802642EC 0026122C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802642F0 00261230 41 82 00 0C */ beq lbl_802642FC +/* 802642F4 00261234 38 60 00 01 */ li r3, 1 +/* 802642F8 00261238 48 00 00 08 */ b lbl_80264300 +lbl_802642FC: +/* 802642FC 0026123C 38 60 00 00 */ li r3, 0 +lbl_80264300: +/* 80264300 00261240 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80264304 00261244 7C 08 03 A6 */ mtlr r0 +/* 80264308 00261248 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026430C 0026124C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264310.s b/include/SComponent/c_cc_d/asm/func_80264310.s new file mode 100644 index 0000000000..bdf52c6003 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264310.s @@ -0,0 +1,25 @@ +/* 80264310 00261250 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80264314 00261254 7C 08 02 A6 */ mflr r0 +/* 80264318 00261258 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026431C 0026125C 7C 66 1B 78 */ mr r6, r3 +/* 80264320 00261260 C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 80264324 00261264 D0 05 00 00 */ stfs f0, 0(r5) +/* 80264328 00261268 28 04 00 00 */ cmplwi r4, 0 +/* 8026432C 0026126C 41 82 00 08 */ beq lbl_80264334 +/* 80264330 00261270 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80264334: +/* 80264334 00261274 7C 83 23 78 */ mr r3, r4 +/* 80264338 00261278 38 86 00 20 */ addi r4, r6, 0x20 +/* 8026433C 0026127C 38 A1 00 08 */ addi r5, r1, 8 +/* 80264340 00261280 48 00 90 95 */ bl cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec +/* 80264344 00261284 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80264348 00261288 41 82 00 0C */ beq lbl_80264354 +/* 8026434C 0026128C 38 60 00 01 */ li r3, 1 +/* 80264350 00261290 48 00 00 08 */ b lbl_80264358 +lbl_80264354: +/* 80264354 00261294 38 60 00 00 */ li r3, 0 +lbl_80264358: +/* 80264358 00261298 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026435C 0026129C 7C 08 03 A6 */ mtlr r0 +/* 80264360 002612A0 38 21 00 20 */ addi r1, r1, 0x20 +/* 80264364 002612A4 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264368.s b/include/SComponent/c_cc_d/asm/func_80264368.s new file mode 100644 index 0000000000..c51c4bd3ed --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264368.s @@ -0,0 +1,26 @@ +/* 80264368 002612A8 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026436C 002612AC 7C 08 02 A6 */ mflr r0 +/* 80264370 002612B0 90 01 00 24 */ stw r0, 0x24(r1) +/* 80264374 002612B4 C0 83 00 20 */ lfs f4, 0x20(r3) +/* 80264378 002612B8 C0 63 00 2C */ lfs f3, 0x2c(r3) +/* 8026437C 002612BC EC 04 18 28 */ fsubs f0, f4, f3 +/* 80264380 002612C0 D0 01 00 14 */ stfs f0, 0x14(r1) +/* 80264384 002612C4 C0 43 00 24 */ lfs f2, 0x24(r3) +/* 80264388 002612C8 D0 41 00 18 */ stfs f2, 0x18(r1) +/* 8026438C 002612CC C0 23 00 28 */ lfs f1, 0x28(r3) +/* 80264390 002612D0 EC 01 18 28 */ fsubs f0, f1, f3 +/* 80264394 002612D4 D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 80264398 002612D8 EC 04 18 2A */ fadds f0, f4, f3 +/* 8026439C 002612DC D0 01 00 08 */ stfs f0, 8(r1) +/* 802643A0 002612E0 C0 03 00 30 */ lfs f0, 0x30(r3) +/* 802643A4 002612E4 EC 02 00 2A */ fadds f0, f2, f0 +/* 802643A8 002612E8 D0 01 00 0C */ stfs f0, 0xc(r1) +/* 802643AC 002612EC EC 01 18 2A */ fadds f0, f1, f3 +/* 802643B0 002612F0 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 802643B4 002612F4 38 81 00 14 */ addi r4, r1, 0x14 +/* 802643B8 002612F8 38 A1 00 08 */ addi r5, r1, 8 +/* 802643BC 002612FC 48 00 A8 99 */ bl Set__8cM3dGAabFPC4cXyzPC4cXyz +/* 802643C0 00261300 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802643C4 00261304 7C 08 03 A6 */ mtlr r0 +/* 802643C8 00261308 38 21 00 20 */ addi r1, r1, 0x20 +/* 802643CC 0026130C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_802643D0.s b/include/SComponent/c_cc_d/asm/func_802643D0.s new file mode 100644 index 0000000000..9567451e0c --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802643D0.s @@ -0,0 +1,63 @@ +/* 802643D0 00261310 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802643D4 00261314 7C 08 02 A6 */ mflr r0 +/* 802643D8 00261318 90 01 00 24 */ stw r0, 0x24(r1) +/* 802643DC 0026131C 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 802643E0 00261320 7C BF 2B 78 */ mr r31, r5 +/* 802643E4 00261324 C0 43 00 24 */ lfs f2, 0x24(r3) +/* 802643E8 00261328 C0 64 00 04 */ lfs f3, 4(r4) +/* 802643EC 0026132C FC 02 18 40 */ fcmpo cr0, f2, f3 +/* 802643F0 00261330 40 81 00 1C */ ble lbl_8026440C +/* 802643F4 00261334 C0 03 00 20 */ lfs f0, 0x20(r3) +/* 802643F8 00261338 D0 01 00 08 */ stfs f0, 8(r1) +/* 802643FC 0026133C D0 41 00 0C */ stfs f2, 0xc(r1) +/* 80264400 00261340 C0 03 00 28 */ lfs f0, 0x28(r3) +/* 80264404 00261344 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 80264408 00261348 48 00 00 48 */ b lbl_80264450 +lbl_8026440C: +/* 8026440C 0026134C C0 03 00 30 */ lfs f0, 0x30(r3) +/* 80264410 00261350 EC 22 00 2A */ fadds f1, f2, f0 +/* 80264414 00261354 FC 01 18 40 */ fcmpo cr0, f1, f3 +/* 80264418 00261358 40 80 00 20 */ bge lbl_80264438 +/* 8026441C 0026135C C0 03 00 20 */ lfs f0, 0x20(r3) +/* 80264420 00261360 D0 01 00 08 */ stfs f0, 8(r1) +/* 80264424 00261364 D0 41 00 0C */ stfs f2, 0xc(r1) +/* 80264428 00261368 C0 03 00 28 */ lfs f0, 0x28(r3) +/* 8026442C 0026136C D0 01 00 10 */ stfs f0, 0x10(r1) +/* 80264430 00261370 D0 21 00 0C */ stfs f1, 0xc(r1) +/* 80264434 00261374 48 00 00 1C */ b lbl_80264450 +lbl_80264438: +/* 80264438 00261378 C0 03 00 20 */ lfs f0, 0x20(r3) +/* 8026443C 0026137C D0 01 00 08 */ stfs f0, 8(r1) +/* 80264440 00261380 D0 41 00 0C */ stfs f2, 0xc(r1) +/* 80264444 00261384 C0 03 00 28 */ lfs f0, 0x28(r3) +/* 80264448 00261388 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 8026444C 0026138C D0 61 00 0C */ stfs f3, 0xc(r1) +lbl_80264450: +/* 80264450 00261390 7C 83 23 78 */ mr r3, r4 +/* 80264454 00261394 38 81 00 08 */ addi r4, r1, 8 +/* 80264458 00261398 7F E5 FB 78 */ mr r5, r31 +/* 8026445C 0026139C 48 0E 2C 59 */ bl PSVECSubtract +/* 80264460 002613A0 7F E3 FB 78 */ mr r3, r31 +/* 80264464 002613A4 48 0E 2C ED */ bl PSVECMag +/* 80264468 002613A8 FC 00 0A 10 */ fabs f0, f1 +/* 8026446C 002613AC FC 20 00 18 */ frsp f1, f0 +/* 80264470 002613B0 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 80264474 002613B4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80264478 002613B8 40 80 00 1C */ bge lbl_80264494 +/* 8026447C 002613BC C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 80264480 002613C0 D0 1F 00 00 */ stfs f0, 0(r31) +/* 80264484 002613C4 D0 1F 00 04 */ stfs f0, 4(r31) +/* 80264488 002613C8 D0 1F 00 08 */ stfs f0, 8(r31) +/* 8026448C 002613CC 38 60 00 00 */ li r3, 0 +/* 80264490 002613D0 48 00 00 14 */ b lbl_802644A4 +lbl_80264494: +/* 80264494 002613D4 7F E3 FB 78 */ mr r3, r31 +/* 80264498 002613D8 7F E4 FB 78 */ mr r4, r31 +/* 8026449C 002613DC 48 0E 2C 59 */ bl PSVECNormalize +/* 802644A0 002613E0 38 60 00 01 */ li r3, 1 +lbl_802644A4: +/* 802644A4 002613E4 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 802644A8 002613E8 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802644AC 002613EC 7C 08 03 A6 */ mtlr r0 +/* 802644B0 002613F0 38 21 00 20 */ addi r1, r1, 0x20 +/* 802644B4 002613F4 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_802644B8.s b/include/SComponent/c_cc_d/asm/func_802644B8.s new file mode 100644 index 0000000000..6b64503472 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802644B8.s @@ -0,0 +1,13 @@ +/* 802644B8 002613F8 38 00 00 01 */ li r0, 1 +/* 802644BC 002613FC 90 04 00 00 */ stw r0, 0(r4) +/* 802644C0 00261400 C0 03 00 20 */ lfs f0, 0x20(r3) +/* 802644C4 00261404 D0 04 00 04 */ stfs f0, 4(r4) +/* 802644C8 00261408 C0 03 00 24 */ lfs f0, 0x24(r3) +/* 802644CC 0026140C D0 04 00 08 */ stfs f0, 8(r4) +/* 802644D0 00261410 C0 03 00 28 */ lfs f0, 0x28(r3) +/* 802644D4 00261414 D0 04 00 0C */ stfs f0, 0xc(r4) +/* 802644D8 00261418 C0 03 00 2C */ lfs f0, 0x2c(r3) +/* 802644DC 0026141C D0 04 00 10 */ stfs f0, 0x10(r4) +/* 802644E0 00261420 C0 03 00 30 */ lfs f0, 0x30(r3) +/* 802644E4 00261424 D0 04 00 14 */ stfs f0, 0x14(r4) +/* 802644E8 00261428 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_802644EC.s b/include/SComponent/c_cc_d/asm/func_802644EC.s new file mode 100644 index 0000000000..d892ec1e1a --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802644EC.s @@ -0,0 +1,22 @@ +/* 802644EC 0026142C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802644F0 00261430 7C 08 02 A6 */ mflr r0 +/* 802644F4 00261434 90 01 00 14 */ stw r0, 0x14(r1) +/* 802644F8 00261438 7C 66 1B 78 */ mr r6, r3 +/* 802644FC 0026143C 28 04 00 00 */ cmplwi r4, 0 +/* 80264500 00261440 41 82 00 08 */ beq lbl_80264508 +/* 80264504 00261444 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80264508: +/* 80264508 00261448 7C 83 23 78 */ mr r3, r4 +/* 8026450C 0026144C 38 86 00 20 */ addi r4, r6, 0x20 +/* 80264510 00261450 48 00 97 2D */ bl cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec +/* 80264514 00261454 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80264518 00261458 41 82 00 0C */ beq lbl_80264524 +/* 8026451C 0026145C 38 60 00 01 */ li r3, 1 +/* 80264520 00261460 48 00 00 08 */ b lbl_80264528 +lbl_80264524: +/* 80264524 00261464 38 60 00 00 */ li r3, 0 +lbl_80264528: +/* 80264528 00261468 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026452C 0026146C 7C 08 03 A6 */ mtlr r0 +/* 80264530 00261470 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264534 00261474 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264538.s b/include/SComponent/c_cc_d/asm/func_80264538.s new file mode 100644 index 0000000000..320884f3e9 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264538.s @@ -0,0 +1,20 @@ +/* 80264538 00261478 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026453C 0026147C 7C 08 02 A6 */ mflr r0 +/* 80264540 00261480 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264544 00261484 28 04 00 00 */ cmplwi r4, 0 +/* 80264548 00261488 41 82 00 08 */ beq lbl_80264550 +/* 8026454C 0026148C 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80264550: +/* 80264550 00261490 38 63 00 20 */ addi r3, r3, 0x20 +/* 80264554 00261494 48 00 B1 E9 */ bl cross__8cM3dGSphCFPC8cM3dGCylP4cXyz +/* 80264558 00261498 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026455C 0026149C 41 82 00 0C */ beq lbl_80264568 +/* 80264560 002614A0 38 60 00 01 */ li r3, 1 +/* 80264564 002614A4 48 00 00 08 */ b lbl_8026456C +lbl_80264568: +/* 80264568 002614A8 38 60 00 00 */ li r3, 0 +lbl_8026456C: +/* 8026456C 002614AC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80264570 002614B0 7C 08 03 A6 */ mtlr r0 +/* 80264574 002614B4 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264578 002614B8 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_8026457C.s b/include/SComponent/c_cc_d/asm/func_8026457C.s new file mode 100644 index 0000000000..571b8c16c6 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_8026457C.s @@ -0,0 +1,20 @@ +/* 8026457C 002614BC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80264580 002614C0 7C 08 02 A6 */ mflr r0 +/* 80264584 002614C4 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264588 002614C8 28 04 00 00 */ cmplwi r4, 0 +/* 8026458C 002614CC 41 82 00 08 */ beq lbl_80264594 +/* 80264590 002614D0 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80264594: +/* 80264594 002614D4 38 63 00 20 */ addi r3, r3, 0x20 +/* 80264598 002614D8 48 00 B1 79 */ bl cross__8cM3dGSphCFPC8cM3dGSphP4cXyz +/* 8026459C 002614DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802645A0 002614E0 41 82 00 0C */ beq lbl_802645AC +/* 802645A4 002614E4 38 60 00 01 */ li r3, 1 +/* 802645A8 002614E8 48 00 00 08 */ b lbl_802645B0 +lbl_802645AC: +/* 802645AC 002614EC 38 60 00 00 */ li r3, 0 +lbl_802645B0: +/* 802645B0 002614F0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802645B4 002614F4 7C 08 03 A6 */ mtlr r0 +/* 802645B8 002614F8 38 21 00 10 */ addi r1, r1, 0x10 +/* 802645BC 002614FC 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_802645C0.s b/include/SComponent/c_cc_d/asm/func_802645C0.s new file mode 100644 index 0000000000..a393855363 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802645C0.s @@ -0,0 +1,14 @@ +/* 802645C0 00261500 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802645C4 00261504 7C 08 02 A6 */ mflr r0 +/* 802645C8 00261508 90 01 00 14 */ stw r0, 0x14(r1) +/* 802645CC 0026150C 38 63 00 20 */ addi r3, r3, 0x20 +/* 802645D0 00261510 38 84 00 20 */ addi r4, r4, 0x20 +/* 802645D4 00261514 48 00 79 31 */ bl cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec +/* 802645D8 00261518 54 63 06 3E */ clrlwi r3, r3, 0x18 +/* 802645DC 0026151C 30 03 FF FF */ addic r0, r3, -1 +/* 802645E0 00261520 7C 00 19 10 */ subfe r0, r0, r3 +/* 802645E4 00261524 54 03 06 3E */ clrlwi r3, r0, 0x18 +/* 802645E8 00261528 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802645EC 0026152C 7C 08 03 A6 */ mtlr r0 +/* 802645F0 00261530 38 21 00 10 */ addi r1, r1, 0x10 +/* 802645F4 00261534 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_802645F8.s b/include/SComponent/c_cc_d/asm/func_802645F8.s new file mode 100644 index 0000000000..fb6381001d --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802645F8.s @@ -0,0 +1,22 @@ +/* 802645F8 00261538 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802645FC 0026153C 7C 08 02 A6 */ mflr r0 +/* 80264600 00261540 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264604 00261544 7C 66 1B 78 */ mr r6, r3 +/* 80264608 00261548 28 04 00 00 */ cmplwi r4, 0 +/* 8026460C 0026154C 41 82 00 08 */ beq lbl_80264614 +/* 80264610 00261550 38 84 00 20 */ addi r4, r4, 0x20 +lbl_80264614: +/* 80264614 00261554 7C 83 23 78 */ mr r3, r4 +/* 80264618 00261558 38 86 00 20 */ addi r4, r6, 0x20 +/* 8026461C 0026155C 48 00 72 89 */ bl cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf +/* 80264620 00261560 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80264624 00261564 41 82 00 0C */ beq lbl_80264630 +/* 80264628 00261568 38 60 00 01 */ li r3, 1 +/* 8026462C 0026156C 48 00 00 08 */ b lbl_80264634 +lbl_80264630: +/* 80264630 00261570 38 60 00 00 */ li r3, 0 +lbl_80264634: +/* 80264634 00261574 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80264638 00261578 7C 08 03 A6 */ mtlr r0 +/* 8026463C 0026157C 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264640 00261580 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264644.s b/include/SComponent/c_cc_d/asm/func_80264644.s new file mode 100644 index 0000000000..24849363cb --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264644.s @@ -0,0 +1,20 @@ +/* 80264644 00261584 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80264648 00261588 7C 08 02 A6 */ mflr r0 +/* 8026464C 0026158C 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264650 00261590 28 04 00 00 */ cmplwi r4, 0 +/* 80264654 00261594 41 82 00 08 */ beq lbl_8026465C +/* 80264658 00261598 38 84 00 20 */ addi r4, r4, 0x20 +lbl_8026465C: +/* 8026465C 0026159C 38 63 00 20 */ addi r3, r3, 0x20 +/* 80264660 002615A0 48 00 76 1D */ bl cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPf +/* 80264664 002615A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80264668 002615A8 41 82 00 0C */ beq lbl_80264674 +/* 8026466C 002615AC 38 60 00 01 */ li r3, 1 +/* 80264670 002615B0 48 00 00 08 */ b lbl_80264678 +lbl_80264674: +/* 80264674 002615B4 38 60 00 00 */ li r3, 0 +lbl_80264678: +/* 80264678 002615B8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026467C 002615BC 7C 08 03 A6 */ mtlr r0 +/* 80264680 002615C0 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264684 002615C4 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264688.s b/include/SComponent/c_cc_d/asm/func_80264688.s new file mode 100644 index 0000000000..8abb1731b5 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264688.s @@ -0,0 +1,25 @@ +/* 80264688 002615C8 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026468C 002615CC 7C 08 02 A6 */ mflr r0 +/* 80264690 002615D0 90 01 00 24 */ stw r0, 0x24(r1) +/* 80264694 002615D4 7C 66 1B 78 */ mr r6, r3 +/* 80264698 002615D8 C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 8026469C 002615DC D0 05 00 00 */ stfs f0, 0(r5) +/* 802646A0 002615E0 28 04 00 00 */ cmplwi r4, 0 +/* 802646A4 002615E4 41 82 00 08 */ beq lbl_802646AC +/* 802646A8 002615E8 38 84 00 20 */ addi r4, r4, 0x20 +lbl_802646AC: +/* 802646AC 002615EC 7C 83 23 78 */ mr r3, r4 +/* 802646B0 002615F0 38 86 00 20 */ addi r4, r6, 0x20 +/* 802646B4 002615F4 38 A1 00 08 */ addi r5, r1, 8 +/* 802646B8 002615F8 48 00 95 85 */ bl cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec +/* 802646BC 002615FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802646C0 00261600 41 82 00 0C */ beq lbl_802646CC +/* 802646C4 00261604 38 60 00 01 */ li r3, 1 +/* 802646C8 00261608 48 00 00 08 */ b lbl_802646D0 +lbl_802646CC: +/* 802646CC 0026160C 38 60 00 00 */ li r3, 0 +lbl_802646D0: +/* 802646D0 00261610 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802646D4 00261614 7C 08 03 A6 */ mtlr r0 +/* 802646D8 00261618 38 21 00 20 */ addi r1, r1, 0x20 +/* 802646DC 0026161C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_802646E0.s b/include/SComponent/c_cc_d/asm/func_802646E0.s new file mode 100644 index 0000000000..99e7dbf374 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802646E0.s @@ -0,0 +1,35 @@ +/* 802646E0 00261620 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802646E4 00261624 7C 08 02 A6 */ mflr r0 +/* 802646E8 00261628 90 01 00 24 */ stw r0, 0x24(r1) +/* 802646EC 0026162C C0 83 00 20 */ lfs f4, 0x20(r3) +/* 802646F0 00261630 D0 81 00 08 */ stfs f4, 8(r1) +/* 802646F4 00261634 C0 63 00 24 */ lfs f3, 0x24(r3) +/* 802646F8 00261638 D0 61 00 0C */ stfs f3, 0xc(r1) +/* 802646FC 0026163C C0 43 00 28 */ lfs f2, 0x28(r3) +/* 80264700 00261640 D0 41 00 10 */ stfs f2, 0x10(r1) +/* 80264704 00261644 D0 81 00 14 */ stfs f4, 0x14(r1) +/* 80264708 00261648 D0 61 00 18 */ stfs f3, 0x18(r1) +/* 8026470C 0026164C D0 41 00 1C */ stfs f2, 0x1c(r1) +/* 80264710 00261650 FC 00 20 18 */ frsp f0, f4 +/* 80264714 00261654 C0 23 00 2C */ lfs f1, 0x2c(r3) +/* 80264718 00261658 EC 00 08 28 */ fsubs f0, f0, f1 +/* 8026471C 0026165C D0 01 00 14 */ stfs f0, 0x14(r1) +/* 80264720 00261660 FC 00 18 18 */ frsp f0, f3 +/* 80264724 00261664 EC 00 08 28 */ fsubs f0, f0, f1 +/* 80264728 00261668 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026472C 0026166C FC 00 10 18 */ frsp f0, f2 +/* 80264730 00261670 EC 00 08 28 */ fsubs f0, f0, f1 +/* 80264734 00261674 D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 80264738 00261678 EC 04 08 2A */ fadds f0, f4, f1 +/* 8026473C 0026167C D0 01 00 08 */ stfs f0, 8(r1) +/* 80264740 00261680 EC 03 08 2A */ fadds f0, f3, f1 +/* 80264744 00261684 D0 01 00 0C */ stfs f0, 0xc(r1) +/* 80264748 00261688 EC 02 08 2A */ fadds f0, f2, f1 +/* 8026474C 0026168C D0 01 00 10 */ stfs f0, 0x10(r1) +/* 80264750 00261690 38 81 00 14 */ addi r4, r1, 0x14 +/* 80264754 00261694 38 A1 00 08 */ addi r5, r1, 8 +/* 80264758 00261698 48 00 A4 FD */ bl Set__8cM3dGAabFPC4cXyzPC4cXyz +/* 8026475C 0026169C 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80264760 002616A0 7C 08 03 A6 */ mtlr r0 +/* 80264764 002616A4 38 21 00 20 */ addi r1, r1, 0x20 +/* 80264768 002616A8 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_8026476C.s b/include/SComponent/c_cc_d/asm/func_8026476C.s new file mode 100644 index 0000000000..db13ce7ceb --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_8026476C.s @@ -0,0 +1,41 @@ +/* 8026476C 002616AC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80264770 002616B0 7C 08 02 A6 */ mflr r0 +/* 80264774 002616B4 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264778 002616B8 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026477C 002616BC 7C BF 2B 78 */ mr r31, r5 +/* 80264780 002616C0 C0 24 00 00 */ lfs f1, 0(r4) +/* 80264784 002616C4 C0 03 00 20 */ lfs f0, 0x20(r3) +/* 80264788 002616C8 EC 01 00 28 */ fsubs f0, f1, f0 +/* 8026478C 002616CC D0 05 00 00 */ stfs f0, 0(r5) +/* 80264790 002616D0 C0 24 00 04 */ lfs f1, 4(r4) +/* 80264794 002616D4 C0 03 00 24 */ lfs f0, 0x24(r3) +/* 80264798 002616D8 EC 01 00 28 */ fsubs f0, f1, f0 +/* 8026479C 002616DC D0 05 00 04 */ stfs f0, 4(r5) +/* 802647A0 002616E0 C0 24 00 08 */ lfs f1, 8(r4) +/* 802647A4 002616E4 C0 03 00 28 */ lfs f0, 0x28(r3) +/* 802647A8 002616E8 EC 01 00 28 */ fsubs f0, f1, f0 +/* 802647AC 002616EC D0 05 00 08 */ stfs f0, 8(r5) +/* 802647B0 002616F0 7F E3 FB 78 */ mr r3, r31 +/* 802647B4 002616F4 48 0E 29 9D */ bl PSVECMag +/* 802647B8 002616F8 FC 00 0A 10 */ fabs f0, f1 +/* 802647BC 002616FC FC 20 00 18 */ frsp f1, f0 +/* 802647C0 00261700 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 802647C4 00261704 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802647C8 00261708 40 80 00 1C */ bge lbl_802647E4 +/* 802647CC 0026170C C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 802647D0 00261710 D0 1F 00 00 */ stfs f0, 0(r31) +/* 802647D4 00261714 D0 1F 00 04 */ stfs f0, 4(r31) +/* 802647D8 00261718 D0 1F 00 08 */ stfs f0, 8(r31) +/* 802647DC 0026171C 38 60 00 00 */ li r3, 0 +/* 802647E0 00261720 48 00 00 14 */ b lbl_802647F4 +lbl_802647E4: +/* 802647E4 00261724 7F E3 FB 78 */ mr r3, r31 +/* 802647E8 00261728 7F E4 FB 78 */ mr r4, r31 +/* 802647EC 0026172C 48 0E 29 09 */ bl PSVECNormalize +/* 802647F0 00261730 38 60 00 01 */ li r3, 1 +lbl_802647F4: +/* 802647F4 00261734 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802647F8 00261738 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802647FC 0026173C 7C 08 03 A6 */ mtlr r0 +/* 80264800 00261740 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264804 00261744 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264808.s b/include/SComponent/c_cc_d/asm/func_80264808.s new file mode 100644 index 0000000000..b14286b808 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264808.s @@ -0,0 +1,13 @@ +/* 80264808 00261748 38 00 00 00 */ li r0, 0 +/* 8026480C 0026174C 90 04 00 00 */ stw r0, 0(r4) +/* 80264810 00261750 C0 03 00 20 */ lfs f0, 0x20(r3) +/* 80264814 00261754 D0 04 00 04 */ stfs f0, 4(r4) +/* 80264818 00261758 C0 03 00 24 */ lfs f0, 0x24(r3) +/* 8026481C 0026175C D0 04 00 08 */ stfs f0, 8(r4) +/* 80264820 00261760 C0 03 00 28 */ lfs f0, 0x28(r3) +/* 80264824 00261764 D0 04 00 0C */ stfs f0, 0xc(r4) +/* 80264828 00261768 C0 03 00 2C */ lfs f0, 0x2c(r3) +/* 8026482C 0026176C D0 04 00 10 */ stfs f0, 0x10(r4) +/* 80264830 00261770 C0 02 B6 20 */ lfs f0, lbl_80455020-_SDA2_BASE_(r2) +/* 80264834 00261774 D0 04 00 14 */ stfs f0, 0x14(r4) +/* 80264838 00261778 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_8026483C.s b/include/SComponent/c_cc_d/asm/func_8026483C.s new file mode 100644 index 0000000000..d93dddc9e5 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_8026483C.s @@ -0,0 +1,4 @@ +/* 8026483C 0026177C 38 00 00 01 */ li r0, 1 +/* 80264840 00261780 90 03 00 04 */ stw r0, 4(r3) +/* 80264844 00261784 90 83 00 08 */ stw r4, 8(r3) +/* 80264848 00261788 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_8026484C.s b/include/SComponent/c_cc_d/asm/func_8026484C.s new file mode 100644 index 0000000000..a7216c18e6 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_8026484C.s @@ -0,0 +1,7 @@ +/* 8026484C 0026178C 80 04 00 08 */ lwz r0, 8(r4) +/* 80264850 00261790 90 03 00 00 */ stw r0, 0(r3) +/* 80264854 00261794 80 04 00 00 */ lwz r0, 0(r4) +/* 80264858 00261798 90 03 00 10 */ stw r0, 0x10(r3) +/* 8026485C 0026179C 88 04 00 04 */ lbz r0, 4(r4) +/* 80264860 002617A0 98 03 00 14 */ stb r0, 0x14(r3) +/* 80264864 002617A4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_80264868.s b/include/SComponent/c_cc_d/asm/func_80264868.s new file mode 100644 index 0000000000..9551800d17 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264868.s @@ -0,0 +1,6 @@ +/* 80264868 002617A8 80 03 00 04 */ lwz r0, 4(r3) +/* 8026486C 002617AC 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e +/* 80264870 002617B0 90 03 00 04 */ stw r0, 4(r3) +/* 80264874 002617B4 38 00 00 00 */ li r0, 0 +/* 80264878 002617B8 90 03 00 08 */ stw r0, 8(r3) +/* 8026487C 002617BC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_80264880.s b/include/SComponent/c_cc_d/asm/func_80264880.s new file mode 100644 index 0000000000..3c480f93c7 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264880.s @@ -0,0 +1,5 @@ +/* 80264880 002617C0 80 04 00 04 */ lwz r0, 4(r4) +/* 80264884 002617C4 90 03 00 00 */ stw r0, 0(r3) +/* 80264888 002617C8 80 04 00 00 */ lwz r0, 0(r4) +/* 8026488C 002617CC 90 03 00 10 */ stw r0, 0x10(r3) +/* 80264890 002617D0 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264894.s b/include/SComponent/c_cc_d/asm/func_80264894.s new file mode 100644 index 0000000000..14b09e72f5 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264894.s @@ -0,0 +1,7 @@ +/* 80264894 002617D4 80 03 00 00 */ lwz r0, 0(r3) +/* 80264898 002617D8 54 00 07 F4 */ rlwinm r0, r0, 0, 0x1f, 0x1a +/* 8026489C 002617DC 90 03 00 00 */ stw r0, 0(r3) +/* 802648A0 002617E0 80 03 00 00 */ lwz r0, 0(r3) +/* 802648A4 002617E4 7C 00 23 78 */ or r0, r0, r4 +/* 802648A8 002617E8 90 03 00 00 */ stw r0, 0(r3) +/* 802648AC 002617EC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_802648B0.s b/include/SComponent/c_cc_d/asm/func_802648B0.s new file mode 100644 index 0000000000..44dba4e580 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802648B0.s @@ -0,0 +1,6 @@ +/* 802648B0 002617F0 80 03 00 04 */ lwz r0, 4(r3) +/* 802648B4 002617F4 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e +/* 802648B8 002617F8 90 03 00 04 */ stw r0, 4(r3) +/* 802648BC 002617FC 38 00 00 00 */ li r0, 0 +/* 802648C0 00261800 90 03 00 08 */ stw r0, 8(r3) +/* 802648C4 00261804 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_802648C8.s b/include/SComponent/c_cc_d/asm/func_802648C8.s new file mode 100644 index 0000000000..6080793036 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802648C8.s @@ -0,0 +1,4 @@ +/* 802648C8 00261808 38 00 00 01 */ li r0, 1 +/* 802648CC 0026180C 90 03 00 04 */ stw r0, 4(r3) +/* 802648D0 00261810 90 83 00 08 */ stw r4, 8(r3) +/* 802648D4 00261814 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_802648D8.s b/include/SComponent/c_cc_d/asm/func_802648D8.s new file mode 100644 index 0000000000..fe22b19569 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802648D8.s @@ -0,0 +1,4 @@ +/* 802648D8 00261818 38 00 00 01 */ li r0, 1 +/* 802648DC 0026181C 90 03 00 04 */ stw r0, 4(r3) +/* 802648E0 00261820 90 83 00 08 */ stw r4, 8(r3) +/* 802648E4 00261824 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_802648E8.s b/include/SComponent/c_cc_d/asm/func_802648E8.s new file mode 100644 index 0000000000..7fd11d8f5c --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802648E8.s @@ -0,0 +1,6 @@ +/* 802648E8 00261828 80 03 00 04 */ lwz r0, 4(r3) +/* 802648EC 0026182C 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e +/* 802648F0 00261830 90 03 00 04 */ stw r0, 4(r3) +/* 802648F4 00261834 38 00 00 00 */ li r0, 0 +/* 802648F8 00261838 90 03 00 08 */ stw r0, 8(r3) +/* 802648FC 0026183C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_80264900.s b/include/SComponent/c_cc_d/asm/func_80264900.s new file mode 100644 index 0000000000..27178983f5 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264900.s @@ -0,0 +1,7 @@ +/* 80264900 00261840 80 03 00 00 */ lwz r0, 0(r3) +/* 80264904 00261844 54 00 07 F6 */ rlwinm r0, r0, 0, 0x1f, 0x1b +/* 80264908 00261848 90 03 00 00 */ stw r0, 0(r3) +/* 8026490C 0026184C 80 03 00 00 */ lwz r0, 0(r3) +/* 80264910 00261850 7C 00 23 78 */ or r0, r0, r4 +/* 80264914 00261854 90 03 00 00 */ stw r0, 0(r3) +/* 80264918 00261858 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_d/asm/func_8026491C.s b/include/SComponent/c_cc_d/asm/func_8026491C.s new file mode 100644 index 0000000000..4aae0c9c67 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_8026491C.s @@ -0,0 +1,7 @@ +/* 8026491C 0026185C 80 03 00 00 */ lwz r0, 0(r3) +/* 80264920 00261860 54 00 07 30 */ rlwinm r0, r0, 0, 0x1c, 0x18 +/* 80264924 00261864 90 03 00 00 */ stw r0, 0(r3) +/* 80264928 00261868 80 03 00 00 */ lwz r0, 0(r3) +/* 8026492C 0026186C 7C 00 23 78 */ or r0, r0, r4 +/* 80264930 00261870 90 03 00 00 */ stw r0, 0(r3) +/* 80264934 00261874 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264938.s b/include/SComponent/c_cc_d/asm/func_80264938.s new file mode 100644 index 0000000000..f8eb986317 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264938.s @@ -0,0 +1,43 @@ +/* 80264938 00261878 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026493C 0026187C 7C 08 02 A6 */ mflr r0 +/* 80264940 00261880 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264944 00261884 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80264948 00261888 7C 7F 1B 79 */ or. r31, r3, r3 +/* 8026494C 0026188C 41 82 00 74 */ beq lbl_802649C0 +/* 80264950 00261890 3C 60 80 3C */ lis r3, lbl_803C366C@ha +/* 80264954 00261894 38 63 36 6C */ addi r3, r3, lbl_803C366C@l +/* 80264958 00261898 90 7F 00 1C */ stw r3, 0x1c(r31) +/* 8026495C 0026189C 38 03 00 58 */ addi r0, r3, 0x58 +/* 80264960 002618A0 90 1F 00 30 */ stw r0, 0x30(r31) +/* 80264964 002618A4 34 1F 00 20 */ addic. r0, r31, 0x20 +/* 80264968 002618A8 41 82 00 24 */ beq lbl_8026498C +/* 8026496C 002618AC 3C 60 80 3B */ lis r3, lbl_803ABB84@ha +/* 80264970 002618B0 38 03 BB 84 */ addi r0, r3, lbl_803ABB84@l +/* 80264974 002618B4 90 1F 00 30 */ stw r0, 0x30(r31) +/* 80264978 002618B8 34 1F 00 20 */ addic. r0, r31, 0x20 +/* 8026497C 002618BC 41 82 00 10 */ beq lbl_8026498C +/* 80264980 002618C0 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 80264984 002618C4 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 80264988 002618C8 90 1F 00 30 */ stw r0, 0x30(r31) +lbl_8026498C: +/* 8026498C 002618CC 28 1F 00 00 */ cmplwi r31, 0 +/* 80264990 002618D0 41 82 00 20 */ beq lbl_802649B0 +/* 80264994 002618D4 3C 60 80 3C */ lis r3, lbl_803C36D0@ha +/* 80264998 002618D8 38 03 36 D0 */ addi r0, r3, lbl_803C36D0@l +/* 8026499C 002618DC 90 1F 00 1C */ stw r0, 0x1c(r31) +/* 802649A0 002618E0 41 82 00 10 */ beq lbl_802649B0 +/* 802649A4 002618E4 3C 60 80 3A */ lis r3, lbl_803A7218@ha +/* 802649A8 002618E8 38 03 72 18 */ addi r0, r3, lbl_803A7218@l +/* 802649AC 002618EC 90 1F 00 18 */ stw r0, 0x18(r31) +lbl_802649B0: +/* 802649B0 002618F0 7C 80 07 35 */ extsh. r0, r4 +/* 802649B4 002618F4 40 81 00 0C */ ble lbl_802649C0 +/* 802649B8 002618F8 7F E3 FB 78 */ mr r3, r31 +/* 802649BC 002618FC 48 06 A3 81 */ bl __dl__FPv +lbl_802649C0: +/* 802649C0 00261900 7F E3 FB 78 */ mr r3, r31 +/* 802649C4 00261904 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802649C8 00261908 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802649CC 0026190C 7C 08 03 A6 */ mtlr r0 +/* 802649D0 00261910 38 21 00 10 */ addi r1, r1, 0x10 +/* 802649D4 00261914 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_802649D8.s b/include/SComponent/c_cc_d/asm/func_802649D8.s new file mode 100644 index 0000000000..dc7a489445 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802649D8.s @@ -0,0 +1,2 @@ +/* 802649D8 00261918 38 60 00 00 */ li r3, 0 +/* 802649DC 0026191C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_802649E0.s b/include/SComponent/c_cc_d/asm/func_802649E0.s new file mode 100644 index 0000000000..bde74e56b5 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802649E0.s @@ -0,0 +1,2 @@ +/* 802649E0 00261920 38 60 00 00 */ li r3, 0 +/* 802649E4 00261924 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_802649E8.s b/include/SComponent/c_cc_d/asm/func_802649E8.s new file mode 100644 index 0000000000..83c7b2b059 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802649E8.s @@ -0,0 +1 @@ +/* 802649E8 00261928 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_802649EC.s b/include/SComponent/c_cc_d/asm/func_802649EC.s new file mode 100644 index 0000000000..80b8a90213 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802649EC.s @@ -0,0 +1,3 @@ +/* 802649EC 0026192C 38 00 00 00 */ li r0, 0 +/* 802649F0 00261930 98 03 00 16 */ stb r0, 0x16(r3) +/* 802649F4 00261934 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_802649F8.s b/include/SComponent/c_cc_d/asm/func_802649F8.s new file mode 100644 index 0000000000..e2415f65d1 --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_802649F8.s @@ -0,0 +1,21 @@ +/* 802649F8 00261938 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802649FC 0026193C 7C 08 02 A6 */ mflr r0 +/* 80264A00 00261940 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264A04 00261944 3C 60 80 43 */ lis r3, lbl_80430CF4@ha +/* 80264A08 00261948 38 83 0C F4 */ addi r4, r3, lbl_80430CF4@l +/* 80264A0C 0026194C C0 04 00 00 */ lfs f0, 0(r4) +/* 80264A10 00261950 3C 60 80 43 */ lis r3, lbl_80430CB4@ha +/* 80264A14 00261954 D4 03 0C B4 */ stfsu f0, lbl_80430CB4@l(r3) +/* 80264A18 00261958 C0 04 00 04 */ lfs f0, 4(r4) +/* 80264A1C 0026195C D0 03 00 04 */ stfs f0, 4(r3) +/* 80264A20 00261960 C0 04 00 08 */ lfs f0, 8(r4) +/* 80264A24 00261964 D0 03 00 08 */ stfs f0, 8(r3) +/* 80264A28 00261968 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha +/* 80264A2C 0026196C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80264A30 00261970 3C A0 80 43 */ lis r5, lbl_80430CA8@ha +/* 80264A34 00261974 38 A5 0C A8 */ addi r5, r5, lbl_80430CA8@l +/* 80264A38 00261978 48 0F D1 ED */ bl func_80361C24 +/* 80264A3C 0026197C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80264A40 00261980 7C 08 03 A6 */ mtlr r0 +/* 80264A44 00261984 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264A48 00261988 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264A4C.s b/include/SComponent/c_cc_d/asm/func_80264A4C.s new file mode 100644 index 0000000000..cb69e44d6f --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264A4C.s @@ -0,0 +1,3 @@ +/* 80264A4C 0026198C 38 63 FF E0 */ addi r3, r3, -32 +/*.global __dt__12cCcD_TriAttrFv*/ +/* 80264A50 00261990 4B FF FE E8 */ b __dt__12cCcD_TriAttrFv
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264A54.s b/include/SComponent/c_cc_d/asm/func_80264A54.s new file mode 100644 index 0000000000..3d1ef23b9b --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264A54.s @@ -0,0 +1,3 @@ +/* 80264A54 00261994 38 63 FF E0 */ addi r3, r3, -32 +/*.global cCcD_CpsAttr_NS_dtor*/ +/* 80264A58 00261998 4B E2 09 F8 */ b cCcD_CpsAttr_NS_dtor
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264A5C.s b/include/SComponent/c_cc_d/asm/func_80264A5C.s new file mode 100644 index 0000000000..1f91ae7eed --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264A5C.s @@ -0,0 +1,3 @@ +/* 80264A5C 0026199C 38 63 FF E0 */ addi r3, r3, -32 +/*.global cCcD_CylAttr_NS_dtor*/ +/* 80264A60 002619A0 4B E2 0A 80 */ b cCcD_CylAttr_NS_dtor
\ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264A64.s b/include/SComponent/c_cc_d/asm/func_80264A64.s new file mode 100644 index 0000000000..42db5475cf --- /dev/null +++ b/include/SComponent/c_cc_d/asm/func_80264A64.s @@ -0,0 +1,3 @@ +/* 80264A64 002619A4 38 63 FF E0 */ addi r3, r3, -32 +/*.global cCcD_SphAttr_NS_dtor*/ +/* 80264A68 002619A8 4B E2 27 B4 */ b cCcD_SphAttr_NS_dtor
\ No newline at end of file diff --git a/include/SComponent/c_cc_s/asm/func_80264A6C.s b/include/SComponent/c_cc_s/asm/func_80264A6C.s new file mode 100644 index 0000000000..1f08bca1fa --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80264A6C.s @@ -0,0 +1,10 @@ +/* 80264A6C 002619AC 3C 80 80 3C */ lis r4, lbl_803C3748@ha +/* 80264A70 002619B0 38 04 37 48 */ addi r0, r4, lbl_803C3748@l +/* 80264A74 002619B4 90 03 28 48 */ stw r0, 0x2848(r3) +/* 80264A78 002619B8 3C 80 80 3A */ lis r4, lbl_803A7218@ha +/* 80264A7C 002619BC 38 04 72 18 */ addi r0, r4, lbl_803A7218@l +/* 80264A80 002619C0 90 03 28 20 */ stw r0, 0x2820(r3) +/* 80264A84 002619C4 3C 80 80 3A */ lis r4, lbl_803A7200@ha +/* 80264A88 002619C8 38 04 72 00 */ addi r0, r4, lbl_803A7200@l +/* 80264A8C 002619CC 90 03 28 20 */ stw r0, 0x2820(r3) +/* 80264A90 002619D0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80264A94.s b/include/SComponent/c_cc_s/asm/func_80264A94.s new file mode 100644 index 0000000000..3e2604e5a5 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80264A94.s @@ -0,0 +1,59 @@ +/* 80264A94 002619D4 7C 65 1B 78 */ mr r5, r3 +/* 80264A98 002619D8 38 80 00 00 */ li r4, 0 +/* 80264A9C 002619DC 38 C3 04 00 */ addi r6, r3, 0x400 +/* 80264AA0 002619E0 38 06 00 03 */ addi r0, r6, 3 +/* 80264AA4 002619E4 7C 05 00 50 */ subf r0, r5, r0 +/* 80264AA8 002619E8 54 00 F0 BE */ srwi r0, r0, 2 +/* 80264AAC 002619EC 7C 09 03 A6 */ mtctr r0 +/* 80264AB0 002619F0 7C 05 30 40 */ cmplw r5, r6 +/* 80264AB4 002619F4 40 80 00 10 */ bge lbl_80264AC4 +lbl_80264AB8: +/* 80264AB8 002619F8 90 85 00 00 */ stw r4, 0(r5) +/* 80264ABC 002619FC 38 A5 00 04 */ addi r5, r5, 4 +/* 80264AC0 00261A00 42 00 FF F8 */ bdnz lbl_80264AB8 +lbl_80264AC4: +/* 80264AC4 00261A04 38 80 00 00 */ li r4, 0 +/* 80264AC8 00261A08 B0 83 28 00 */ sth r4, 0x2800(r3) +/* 80264ACC 00261A0C 38 A3 10 00 */ addi r5, r3, 0x1000 +/* 80264AD0 00261A10 38 05 00 03 */ addi r0, r5, 3 +/* 80264AD4 00261A14 7C 06 00 50 */ subf r0, r6, r0 +/* 80264AD8 00261A18 54 00 F0 BE */ srwi r0, r0, 2 +/* 80264ADC 00261A1C 7C 09 03 A6 */ mtctr r0 +/* 80264AE0 00261A20 7C 06 28 40 */ cmplw r6, r5 +/* 80264AE4 00261A24 40 80 00 10 */ bge lbl_80264AF4 +lbl_80264AE8: +/* 80264AE8 00261A28 90 86 00 00 */ stw r4, 0(r6) +/* 80264AEC 00261A2C 38 C6 00 04 */ addi r6, r6, 4 +/* 80264AF0 00261A30 42 00 FF F8 */ bdnz lbl_80264AE8 +lbl_80264AF4: +/* 80264AF4 00261A34 38 80 00 00 */ li r4, 0 +/* 80264AF8 00261A38 B0 83 28 02 */ sth r4, 0x2802(r3) +/* 80264AFC 00261A3C 38 C3 14 00 */ addi r6, r3, 0x1400 +/* 80264B00 00261A40 38 06 00 03 */ addi r0, r6, 3 +/* 80264B04 00261A44 7C 05 00 50 */ subf r0, r5, r0 +/* 80264B08 00261A48 54 00 F0 BE */ srwi r0, r0, 2 +/* 80264B0C 00261A4C 7C 09 03 A6 */ mtctr r0 +/* 80264B10 00261A50 7C 05 30 40 */ cmplw r5, r6 +/* 80264B14 00261A54 40 80 00 10 */ bge lbl_80264B24 +lbl_80264B18: +/* 80264B18 00261A58 90 85 00 00 */ stw r4, 0(r5) +/* 80264B1C 00261A5C 38 A5 00 04 */ addi r5, r5, 4 +/* 80264B20 00261A60 42 00 FF F8 */ bdnz lbl_80264B18 +lbl_80264B24: +/* 80264B24 00261A64 38 A0 00 00 */ li r5, 0 +/* 80264B28 00261A68 B0 A3 28 04 */ sth r5, 0x2804(r3) +/* 80264B2C 00261A6C 38 83 28 00 */ addi r4, r3, 0x2800 +/* 80264B30 00261A70 38 04 00 03 */ addi r0, r4, 3 +/* 80264B34 00261A74 7C 06 00 50 */ subf r0, r6, r0 +/* 80264B38 00261A78 54 00 F0 BE */ srwi r0, r0, 2 +/* 80264B3C 00261A7C 7C 09 03 A6 */ mtctr r0 +/* 80264B40 00261A80 7C 06 20 40 */ cmplw r6, r4 +/* 80264B44 00261A84 40 80 00 10 */ bge lbl_80264B54 +lbl_80264B48: +/* 80264B48 00261A88 90 A6 00 00 */ stw r5, 0(r6) +/* 80264B4C 00261A8C 38 C6 00 04 */ addi r6, r6, 4 +/* 80264B50 00261A90 42 00 FF F8 */ bdnz lbl_80264B48 +lbl_80264B54: +/* 80264B54 00261A94 38 00 00 00 */ li r0, 0 +/* 80264B58 00261A98 B0 03 28 06 */ sth r0, 0x2806(r3) +/* 80264B5C 00261A9C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80264B60.s b/include/SComponent/c_cc_s/asm/func_80264B60.s new file mode 100644 index 0000000000..a86f9dccd7 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80264B60.s @@ -0,0 +1,8 @@ +/* 80264B60 00261AA0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80264B64 00261AA4 7C 08 02 A6 */ mflr r0 +/* 80264B68 00261AA8 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264B6C 00261AAC 4B FF FF 29 */ bl Ct__4cCcSFv +/* 80264B70 00261AB0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80264B74 00261AB4 7C 08 03 A6 */ mtlr r0 +/* 80264B78 00261AB8 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264B7C 00261ABC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80264B80.s b/include/SComponent/c_cc_s/asm/func_80264B80.s new file mode 100644 index 0000000000..3b7026e5c1 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80264B80.s @@ -0,0 +1,11 @@ +/* 80264B80 00261AC0 54 80 06 3E */ clrlwi r0, r4, 0x18 +/* 80264B84 00261AC4 28 00 00 FF */ cmplwi r0, 0xff +/* 80264B88 00261AC8 40 82 00 0C */ bne lbl_80264B94 +/* 80264B8C 00261ACC 38 60 00 00 */ li r3, 0 +/* 80264B90 00261AD0 4E 80 00 20 */ blr +lbl_80264B94: +/* 80264B94 00261AD4 28 00 00 FE */ cmplwi r0, 0xfe +/* 80264B98 00261AD8 38 60 00 02 */ li r3, 2 +/* 80264B9C 00261ADC 4C 82 00 20 */ bnelr +/* 80264BA0 00261AE0 38 60 00 01 */ li r3, 1 +/* 80264BA4 00261AE4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80264BA8.s b/include/SComponent/c_cc_s/asm/func_80264BA8.s new file mode 100644 index 0000000000..316879dd2b --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80264BA8.s @@ -0,0 +1,48 @@ +/* 80264BA8 00261AE8 80 04 00 00 */ lwz r0, 0(r4) +/* 80264BAC 00261AEC 54 00 07 FF */ clrlwi. r0, r0, 0x1f +/* 80264BB0 00261AF0 41 82 00 24 */ beq lbl_80264BD4 +/* 80264BB4 00261AF4 A0 03 28 00 */ lhz r0, 0x2800(r3) +/* 80264BB8 00261AF8 28 00 01 00 */ cmplwi r0, 0x100 +/* 80264BBC 00261AFC 40 80 00 18 */ bge lbl_80264BD4 +/* 80264BC0 00261B00 54 00 13 BA */ rlwinm r0, r0, 2, 0xe, 0x1d +/* 80264BC4 00261B04 7C 83 01 2E */ stwx r4, r3, r0 +/* 80264BC8 00261B08 A0 A3 28 00 */ lhz r5, 0x2800(r3) +/* 80264BCC 00261B0C 38 05 00 01 */ addi r0, r5, 1 +/* 80264BD0 00261B10 B0 03 28 00 */ sth r0, 0x2800(r3) +lbl_80264BD4: +/* 80264BD4 00261B14 80 04 00 18 */ lwz r0, 0x18(r4) +/* 80264BD8 00261B18 54 00 07 FF */ clrlwi. r0, r0, 0x1f +/* 80264BDC 00261B1C 41 82 00 28 */ beq lbl_80264C04 +/* 80264BE0 00261B20 A0 03 28 02 */ lhz r0, 0x2802(r3) +/* 80264BE4 00261B24 28 00 03 00 */ cmplwi r0, 0x300 +/* 80264BE8 00261B28 40 80 00 1C */ bge lbl_80264C04 +/* 80264BEC 00261B2C 54 00 13 BA */ rlwinm r0, r0, 2, 0xe, 0x1d +/* 80264BF0 00261B30 7C A3 02 14 */ add r5, r3, r0 +/* 80264BF4 00261B34 90 85 04 00 */ stw r4, 0x400(r5) +/* 80264BF8 00261B38 A0 A3 28 02 */ lhz r5, 0x2802(r3) +/* 80264BFC 00261B3C 38 05 00 01 */ addi r0, r5, 1 +/* 80264C00 00261B40 B0 03 28 02 */ sth r0, 0x2802(r3) +lbl_80264C04: +/* 80264C04 00261B44 80 04 00 2C */ lwz r0, 0x2c(r4) +/* 80264C08 00261B48 54 00 07 FF */ clrlwi. r0, r0, 0x1f +/* 80264C0C 00261B4C 41 82 00 28 */ beq lbl_80264C34 +/* 80264C10 00261B50 A0 03 28 04 */ lhz r0, 0x2804(r3) +/* 80264C14 00261B54 28 00 01 00 */ cmplwi r0, 0x100 +/* 80264C18 00261B58 40 80 00 1C */ bge lbl_80264C34 +/* 80264C1C 00261B5C 54 00 13 BA */ rlwinm r0, r0, 2, 0xe, 0x1d +/* 80264C20 00261B60 7C A3 02 14 */ add r5, r3, r0 +/* 80264C24 00261B64 90 85 10 00 */ stw r4, 0x1000(r5) +/* 80264C28 00261B68 A0 A3 28 04 */ lhz r5, 0x2804(r3) +/* 80264C2C 00261B6C 38 05 00 01 */ addi r0, r5, 1 +/* 80264C30 00261B70 B0 03 28 04 */ sth r0, 0x2804(r3) +lbl_80264C34: +/* 80264C34 00261B74 A0 03 28 06 */ lhz r0, 0x2806(r3) +/* 80264C38 00261B78 28 00 05 00 */ cmplwi r0, 0x500 +/* 80264C3C 00261B7C 4C 80 00 20 */ bgelr +/* 80264C40 00261B80 54 00 13 BA */ rlwinm r0, r0, 2, 0xe, 0x1d +/* 80264C44 00261B84 7C A3 02 14 */ add r5, r3, r0 +/* 80264C48 00261B88 90 85 14 00 */ stw r4, 0x1400(r5) +/* 80264C4C 00261B8C A0 83 28 06 */ lhz r4, 0x2806(r3) +/* 80264C50 00261B90 38 04 00 01 */ addi r0, r4, 1 +/* 80264C54 00261B94 B0 03 28 06 */ sth r0, 0x2806(r3) +/* 80264C58 00261B98 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80264C5C.s b/include/SComponent/c_cc_s/asm/func_80264C5C.s new file mode 100644 index 0000000000..b15f7f7cad --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80264C5C.s @@ -0,0 +1,40 @@ +/* 80264C5C 00261B9C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80264C60 00261BA0 7C 08 02 A6 */ mflr r0 +/* 80264C64 00261BA4 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264C68 00261BA8 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80264C6C 00261BAC 93 C1 00 08 */ stw r30, 8(r1) +/* 80264C70 00261BB0 7C 7E 1B 78 */ mr r30, r3 +/* 80264C74 00261BB4 3B FE 10 00 */ addi r31, r30, 0x1000 +/* 80264C78 00261BB8 48 00 00 48 */ b lbl_80264CC0 +lbl_80264C7C: +/* 80264C7C 00261BBC 80 7F 00 00 */ lwz r3, 0(r31) +/* 80264C80 00261BC0 28 03 00 00 */ cmplwi r3, 0 +/* 80264C84 00261BC4 41 82 00 38 */ beq lbl_80264CBC +/* 80264C88 00261BC8 81 83 00 3C */ lwz r12, 0x3c(r3) +/* 80264C8C 00261BCC 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80264C90 00261BD0 7D 89 03 A6 */ mtctr r12 +/* 80264C94 00261BD4 4E 80 04 21 */ bctrl +/* 80264C98 00261BD8 81 83 00 3C */ lwz r12, 0x3c(r3) +/* 80264C9C 00261BDC 81 8C 00 28 */ lwz r12, 0x28(r12) +/* 80264CA0 00261BE0 7D 89 03 A6 */ mtctr r12 +/* 80264CA4 00261BE4 4E 80 04 21 */ bctrl +/* 80264CA8 00261BE8 80 7F 00 00 */ lwz r3, 0(r31) +/* 80264CAC 00261BEC 80 63 00 44 */ lwz r3, 0x44(r3) +/* 80264CB0 00261BF0 28 03 00 00 */ cmplwi r3, 0 +/* 80264CB4 00261BF4 41 82 00 08 */ beq lbl_80264CBC +/* 80264CB8 00261BF8 4B FF EC A5 */ bl ClrCcMove__9cCcD_SttsFv +lbl_80264CBC: +/* 80264CBC 00261BFC 3B FF 00 04 */ addi r31, r31, 4 +lbl_80264CC0: +/* 80264CC0 00261C00 A0 1E 28 04 */ lhz r0, 0x2804(r30) +/* 80264CC4 00261C04 54 03 10 3A */ slwi r3, r0, 2 +/* 80264CC8 00261C08 38 03 10 00 */ addi r0, r3, 0x1000 +/* 80264CCC 00261C0C 7C 1E 02 14 */ add r0, r30, r0 +/* 80264CD0 00261C10 7C 1F 00 40 */ cmplw r31, r0 +/* 80264CD4 00261C14 41 80 FF A8 */ blt lbl_80264C7C +/* 80264CD8 00261C18 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80264CDC 00261C1C 83 C1 00 08 */ lwz r30, 8(r1) +/* 80264CE0 00261C20 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80264CE4 00261C24 7C 08 03 A6 */ mtlr r0 +/* 80264CE8 00261C28 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264CEC 00261C2C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80264CF0.s b/include/SComponent/c_cc_s/asm/func_80264CF0.s new file mode 100644 index 0000000000..48fc9d9f22 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80264CF0.s @@ -0,0 +1,43 @@ +/* 80264CF0 00261C30 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80264CF4 00261C34 7C 08 02 A6 */ mflr r0 +/* 80264CF8 00261C38 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264CFC 00261C3C 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80264D00 00261C40 93 C1 00 08 */ stw r30, 8(r1) +/* 80264D04 00261C44 7C 7E 1B 78 */ mr r30, r3 +/* 80264D08 00261C48 3B FE 04 00 */ addi r31, r30, 0x400 +/* 80264D0C 00261C4C 48 00 00 54 */ b lbl_80264D60 +lbl_80264D10: +/* 80264D10 00261C50 80 7F 00 00 */ lwz r3, 0(r31) +/* 80264D14 00261C54 28 03 00 00 */ cmplwi r3, 0 +/* 80264D18 00261C58 41 82 00 44 */ beq lbl_80264D5C +/* 80264D1C 00261C5C 81 83 00 3C */ lwz r12, 0x3c(r3) +/* 80264D20 00261C60 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80264D24 00261C64 7D 89 03 A6 */ mtctr r12 +/* 80264D28 00261C68 4E 80 04 21 */ bctrl +/* 80264D2C 00261C6C 81 83 00 3C */ lwz r12, 0x3c(r3) +/* 80264D30 00261C70 81 8C 00 24 */ lwz r12, 0x24(r12) +/* 80264D34 00261C74 7D 89 03 A6 */ mtctr r12 +/* 80264D38 00261C78 4E 80 04 21 */ bctrl +/* 80264D3C 00261C7C 80 7F 00 00 */ lwz r3, 0(r31) +/* 80264D40 00261C80 80 63 00 44 */ lwz r3, 0x44(r3) +/* 80264D44 00261C84 28 03 00 00 */ cmplwi r3, 0 +/* 80264D48 00261C88 41 82 00 14 */ beq lbl_80264D5C +/* 80264D4C 00261C8C 81 83 00 18 */ lwz r12, 0x18(r3) +/* 80264D50 00261C90 81 8C 00 1C */ lwz r12, 0x1c(r12) +/* 80264D54 00261C94 7D 89 03 A6 */ mtctr r12 +/* 80264D58 00261C98 4E 80 04 21 */ bctrl +lbl_80264D5C: +/* 80264D5C 00261C9C 3B FF 00 04 */ addi r31, r31, 4 +lbl_80264D60: +/* 80264D60 00261CA0 A0 1E 28 02 */ lhz r0, 0x2802(r30) +/* 80264D64 00261CA4 54 03 10 3A */ slwi r3, r0, 2 +/* 80264D68 00261CA8 38 03 04 00 */ addi r0, r3, 0x400 +/* 80264D6C 00261CAC 7C 1E 02 14 */ add r0, r30, r0 +/* 80264D70 00261CB0 7C 1F 00 40 */ cmplw r31, r0 +/* 80264D74 00261CB4 41 80 FF 9C */ blt lbl_80264D10 +/* 80264D78 00261CB8 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80264D7C 00261CBC 83 C1 00 08 */ lwz r30, 8(r1) +/* 80264D80 00261CC0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80264D84 00261CC4 7C 08 03 A6 */ mtlr r0 +/* 80264D88 00261CC8 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264D8C 00261CCC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80264D90.s b/include/SComponent/c_cc_s/asm/func_80264D90.s new file mode 100644 index 0000000000..5cd58a1630 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80264D90.s @@ -0,0 +1,42 @@ +/* 80264D90 00261CD0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80264D94 00261CD4 7C 08 02 A6 */ mflr r0 +/* 80264D98 00261CD8 90 01 00 14 */ stw r0, 0x14(r1) +/* 80264D9C 00261CDC 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80264DA0 00261CE0 93 C1 00 08 */ stw r30, 8(r1) +/* 80264DA4 00261CE4 7C 7E 1B 78 */ mr r30, r3 +/* 80264DA8 00261CE8 7F DF F3 78 */ mr r31, r30 +/* 80264DAC 00261CEC 48 00 00 54 */ b lbl_80264E00 +lbl_80264DB0: +/* 80264DB0 00261CF0 80 7F 00 00 */ lwz r3, 0(r31) +/* 80264DB4 00261CF4 28 03 00 00 */ cmplwi r3, 0 +/* 80264DB8 00261CF8 41 82 00 44 */ beq lbl_80264DFC +/* 80264DBC 00261CFC 81 83 00 3C */ lwz r12, 0x3c(r3) +/* 80264DC0 00261D00 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80264DC4 00261D04 7D 89 03 A6 */ mtctr r12 +/* 80264DC8 00261D08 4E 80 04 21 */ bctrl +/* 80264DCC 00261D0C 81 83 00 3C */ lwz r12, 0x3c(r3) +/* 80264DD0 00261D10 81 8C 00 20 */ lwz r12, 0x20(r12) +/* 80264DD4 00261D14 7D 89 03 A6 */ mtctr r12 +/* 80264DD8 00261D18 4E 80 04 21 */ bctrl +/* 80264DDC 00261D1C 80 7F 00 00 */ lwz r3, 0(r31) +/* 80264DE0 00261D20 80 63 00 44 */ lwz r3, 0x44(r3) +/* 80264DE4 00261D24 28 03 00 00 */ cmplwi r3, 0 +/* 80264DE8 00261D28 41 82 00 14 */ beq lbl_80264DFC +/* 80264DEC 00261D2C 81 83 00 18 */ lwz r12, 0x18(r3) +/* 80264DF0 00261D30 81 8C 00 18 */ lwz r12, 0x18(r12) +/* 80264DF4 00261D34 7D 89 03 A6 */ mtctr r12 +/* 80264DF8 00261D38 4E 80 04 21 */ bctrl +lbl_80264DFC: +/* 80264DFC 00261D3C 3B FF 00 04 */ addi r31, r31, 4 +lbl_80264E00: +/* 80264E00 00261D40 A0 1E 28 00 */ lhz r0, 0x2800(r30) +/* 80264E04 00261D44 54 00 10 3A */ slwi r0, r0, 2 +/* 80264E08 00261D48 7C 1E 02 14 */ add r0, r30, r0 +/* 80264E0C 00261D4C 7C 1F 00 40 */ cmplw r31, r0 +/* 80264E10 00261D50 41 80 FF A0 */ blt lbl_80264DB0 +/* 80264E14 00261D54 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80264E18 00261D58 83 C1 00 08 */ lwz r30, 8(r1) +/* 80264E1C 00261D5C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80264E20 00261D60 7C 08 03 A6 */ mtlr r0 +/* 80264E24 00261D64 38 21 00 10 */ addi r1, r1, 0x10 +/* 80264E28 00261D68 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80264E2C.s b/include/SComponent/c_cc_s/asm/func_80264E2C.s new file mode 100644 index 0000000000..bdd46d1010 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80264E2C.s @@ -0,0 +1,73 @@ +/* 80264E2C 00261D6C 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80264E30 00261D70 7C 08 02 A6 */ mflr r0 +/* 80264E34 00261D74 90 01 00 24 */ stw r0, 0x24(r1) +/* 80264E38 00261D78 39 61 00 20 */ addi r11, r1, 0x20 +/* 80264E3C 00261D7C 48 0F D3 99 */ bl _savegpr_27 +/* 80264E40 00261D80 7C 7B 1B 78 */ mr r27, r3 +/* 80264E44 00261D84 7C 9C 23 78 */ mr r28, r4 +/* 80264E48 00261D88 7C BF 2B 78 */ mr r31, r5 +/* 80264E4C 00261D8C 7F 83 E3 78 */ mr r3, r28 +/* 80264E50 00261D90 4B FF EB F9 */ bl GetAc__8cCcD_ObjFv +/* 80264E54 00261D94 7C 7D 1B 78 */ mr r29, r3 +/* 80264E58 00261D98 7F E3 FB 78 */ mr r3, r31 +/* 80264E5C 00261D9C 4B FF EB ED */ bl GetAc__8cCcD_ObjFv +/* 80264E60 00261DA0 28 1D 00 00 */ cmplwi r29, 0 +/* 80264E64 00261DA4 41 82 00 14 */ beq lbl_80264E78 +/* 80264E68 00261DA8 28 03 00 00 */ cmplwi r3, 0 +/* 80264E6C 00261DAC 41 82 00 0C */ beq lbl_80264E78 +/* 80264E70 00261DB0 7C 1D 18 40 */ cmplw r29, r3 +/* 80264E74 00261DB4 41 82 00 28 */ beq lbl_80264E9C +lbl_80264E78: +/* 80264E78 00261DB8 80 1C 00 00 */ lwz r0, 0(r28) +/* 80264E7C 00261DBC 54 03 06 FC */ rlwinm r3, r0, 0, 0x1b, 0x1e +/* 80264E80 00261DC0 80 1F 00 18 */ lwz r0, 0x18(r31) +/* 80264E84 00261DC4 7C 60 00 39 */ and. r0, r3, r0 +/* 80264E88 00261DC8 41 82 00 14 */ beq lbl_80264E9C +/* 80264E8C 00261DCC 80 7C 00 10 */ lwz r3, 0x10(r28) +/* 80264E90 00261DD0 80 1F 00 28 */ lwz r0, 0x28(r31) +/* 80264E94 00261DD4 7C 60 00 39 */ and. r0, r3, r0 +/* 80264E98 00261DD8 40 82 00 0C */ bne lbl_80264EA4 +lbl_80264E9C: +/* 80264E9C 00261DDC 38 60 00 01 */ li r3, 1 +/* 80264EA0 00261DE0 48 00 00 88 */ b lbl_80264F28 +lbl_80264EA4: +/* 80264EA4 00261DE4 83 DC 00 44 */ lwz r30, 0x44(r28) +/* 80264EA8 00261DE8 80 7F 00 44 */ lwz r3, 0x44(r31) +/* 80264EAC 00261DEC 81 83 00 18 */ lwz r12, 0x18(r3) +/* 80264EB0 00261DF0 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80264EB4 00261DF4 7D 89 03 A6 */ mtctr r12 +/* 80264EB8 00261DF8 4E 80 04 21 */ bctrl +/* 80264EBC 00261DFC 7C 7D 1B 78 */ mr r29, r3 +/* 80264EC0 00261E00 7F C3 F3 78 */ mr r3, r30 +/* 80264EC4 00261E04 81 9E 00 18 */ lwz r12, 0x18(r30) +/* 80264EC8 00261E08 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80264ECC 00261E0C 7D 89 03 A6 */ mtctr r12 +/* 80264ED0 00261E10 4E 80 04 21 */ bctrl +/* 80264ED4 00261E14 7C 7E 1B 78 */ mr r30, r3 +/* 80264ED8 00261E18 7F E3 FB 78 */ mr r3, r31 +/* 80264EDC 00261E1C 81 9F 00 3C */ lwz r12, 0x3c(r31) +/* 80264EE0 00261E20 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80264EE4 00261E24 7D 89 03 A6 */ mtctr r12 +/* 80264EE8 00261E28 4E 80 04 21 */ bctrl +/* 80264EEC 00261E2C 7C 7F 1B 78 */ mr r31, r3 +/* 80264EF0 00261E30 7F 83 E3 78 */ mr r3, r28 +/* 80264EF4 00261E34 81 9C 00 3C */ lwz r12, 0x3c(r28) +/* 80264EF8 00261E38 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80264EFC 00261E3C 7D 89 03 A6 */ mtctr r12 +/* 80264F00 00261E40 4E 80 04 21 */ bctrl +/* 80264F04 00261E44 7C 64 1B 78 */ mr r4, r3 +/* 80264F08 00261E48 7F 63 DB 78 */ mr r3, r27 +/* 80264F0C 00261E4C 7F E5 FB 78 */ mr r5, r31 +/* 80264F10 00261E50 7F C6 F3 78 */ mr r6, r30 +/* 80264F14 00261E54 7F A7 EB 78 */ mr r7, r29 +/* 80264F18 00261E58 81 9B 28 48 */ lwz r12, 0x2848(r27) +/* 80264F1C 00261E5C 81 8C 00 18 */ lwz r12, 0x18(r12) +/* 80264F20 00261E60 7D 89 03 A6 */ mtctr r12 +/* 80264F24 00261E64 4E 80 04 21 */ bctrl +lbl_80264F28: +/* 80264F28 00261E68 39 61 00 20 */ addi r11, r1, 0x20 +/* 80264F2C 00261E6C 48 0F D2 F5 */ bl _restgpr_27 +/* 80264F30 00261E70 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80264F34 00261E74 7C 08 03 A6 */ mtlr r0 +/* 80264F38 00261E78 38 21 00 20 */ addi r1, r1, 0x20 +/* 80264F3C 00261E7C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80264F40.s b/include/SComponent/c_cc_s/asm/func_80264F40.s new file mode 100644 index 0000000000..500d911635 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80264F40.s @@ -0,0 +1,146 @@ +/* 80264F40 00261E80 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 80264F44 00261E84 7C 08 02 A6 */ mflr r0 +/* 80264F48 00261E88 90 01 00 34 */ stw r0, 0x34(r1) +/* 80264F4C 00261E8C 39 61 00 30 */ addi r11, r1, 0x30 +/* 80264F50 00261E90 48 0F D2 7D */ bl _savegpr_25 +/* 80264F54 00261E94 7C 7F 1B 78 */ mr r31, r3 +/* 80264F58 00261E98 A0 03 28 02 */ lhz r0, 0x2802(r3) +/* 80264F5C 00261E9C 54 04 10 3A */ slwi r4, r0, 2 +/* 80264F60 00261EA0 3B A4 04 00 */ addi r29, r4, 0x400 +/* 80264F64 00261EA4 7F BF EA 14 */ add r29, r31, r29 +/* 80264F68 00261EA8 4B FF FE 29 */ bl ClrAtHitInf__4cCcSFv +/* 80264F6C 00261EAC 7F E3 FB 78 */ mr r3, r31 +/* 80264F70 00261EB0 4B FF FD 81 */ bl ClrTgHitInf__4cCcSFv +/* 80264F74 00261EB4 7F FC FB 78 */ mr r28, r31 +/* 80264F78 00261EB8 3C 60 80 43 */ lis r3, lbl_80430CCC@ha +/* 80264F7C 00261EBC 3B C3 0C CC */ addi r30, r3, lbl_80430CCC@l +/* 80264F80 00261EC0 48 00 01 B0 */ b lbl_80265130 +lbl_80264F84: +/* 80264F84 00261EC4 80 7C 00 00 */ lwz r3, 0(r28) +/* 80264F88 00261EC8 28 03 00 00 */ cmplwi r3, 0 +/* 80264F8C 00261ECC 41 82 01 A0 */ beq lbl_8026512C +/* 80264F90 00261ED0 80 03 00 00 */ lwz r0, 0(r3) +/* 80264F94 00261ED4 54 00 07 FF */ clrlwi. r0, r0, 0x1f +/* 80264F98 00261ED8 41 82 01 94 */ beq lbl_8026512C +/* 80264F9C 00261EDC 81 83 00 3C */ lwz r12, 0x3c(r3) +/* 80264FA0 00261EE0 81 8C 00 18 */ lwz r12, 0x18(r12) +/* 80264FA4 00261EE4 7D 89 03 A6 */ mtctr r12 +/* 80264FA8 00261EE8 4E 80 04 21 */ bctrl +/* 80264FAC 00261EEC 7C 7B 1B 78 */ mr r27, r3 +/* 80264FB0 00261EF0 3B 5F 04 00 */ addi r26, r31, 0x400 +/* 80264FB4 00261EF4 48 00 01 70 */ b lbl_80265124 +lbl_80264FB8: +/* 80264FB8 00261EF8 80 7A 00 00 */ lwz r3, 0(r26) +/* 80264FBC 00261EFC 28 03 00 00 */ cmplwi r3, 0 +/* 80264FC0 00261F00 41 82 01 60 */ beq lbl_80265120 +/* 80264FC4 00261F04 80 03 00 18 */ lwz r0, 0x18(r3) +/* 80264FC8 00261F08 54 00 07 FF */ clrlwi. r0, r0, 0x1f +/* 80264FCC 00261F0C 41 82 01 54 */ beq lbl_80265120 +/* 80264FD0 00261F10 38 83 00 48 */ addi r4, r3, 0x48 +/* 80264FD4 00261F14 80 7C 00 00 */ lwz r3, 0(r28) +/* 80264FD8 00261F18 38 63 00 48 */ addi r3, r3, 0x48 +/* 80264FDC 00261F1C 4B FF E3 8D */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo +/* 80264FE0 00261F20 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80264FE4 00261F24 41 82 01 3C */ beq lbl_80265120 +/* 80264FE8 00261F28 7F E3 FB 78 */ mr r3, r31 +/* 80264FEC 00261F2C 80 9C 00 00 */ lwz r4, 0(r28) +/* 80264FF0 00261F30 80 BA 00 00 */ lwz r5, 0(r26) +/* 80264FF4 00261F34 4B FF FE 39 */ bl ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj +/* 80264FF8 00261F38 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80264FFC 00261F3C 40 82 01 24 */ bne lbl_80265120 +/* 80265000 00261F40 80 7A 00 00 */ lwz r3, 0(r26) +/* 80265004 00261F44 81 83 00 3C */ lwz r12, 0x3c(r3) +/* 80265008 00261F48 81 8C 00 18 */ lwz r12, 0x18(r12) +/* 8026500C 00261F4C 7D 89 03 A6 */ mtctr r12 +/* 80265010 00261F50 4E 80 04 21 */ bctrl +/* 80265014 00261F54 7C 79 1B 78 */ mr r25, r3 +/* 80265018 00261F58 88 0D 8B D8 */ lbz r0, lbl_80451158-_SDA_BASE_(r13) +/* 8026501C 00261F5C 7C 00 07 75 */ extsb. r0, r0 +/* 80265020 00261F60 40 82 00 28 */ bne lbl_80265048 +/* 80265024 00261F64 3C 60 80 43 */ lis r3, lbl_80430CCC@ha +/* 80265028 00261F68 38 63 0C CC */ addi r3, r3, lbl_80430CCC@l +/* 8026502C 00261F6C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha +/* 80265030 00261F70 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80265034 00261F74 3C A0 80 43 */ lis r5, lbl_80430CC0@ha +/* 80265038 00261F78 38 A5 0C C0 */ addi r5, r5, lbl_80430CC0@l +/* 8026503C 00261F7C 48 0F CB E9 */ bl func_80361C24 +/* 80265040 00261F80 38 00 00 01 */ li r0, 1 +/* 80265044 00261F84 98 0D 8B D8 */ stb r0, lbl_80451158-_SDA_BASE_(r13) +lbl_80265048: +/* 80265048 00261F88 7F 63 DB 78 */ mr r3, r27 +/* 8026504C 00261F8C 7F 24 CB 78 */ mr r4, r25 +/* 80265050 00261F90 3C A0 80 43 */ lis r5, lbl_80430CCC@ha +/* 80265054 00261F94 38 A5 0C CC */ addi r5, r5, lbl_80430CCC@l +/* 80265058 00261F98 81 9B 00 1C */ lwz r12, 0x1c(r27) +/* 8026505C 00261F9C 81 8C 00 0C */ lwz r12, 0xc(r12) +/* 80265060 00261FA0 7D 89 03 A6 */ mtctr r12 +/* 80265064 00261FA4 4E 80 04 21 */ bctrl +/* 80265068 00261FA8 38 C0 00 01 */ li r6, 1 +/* 8026506C 00261FAC 80 9C 00 00 */ lwz r4, 0(r28) +/* 80265070 00261FB0 80 04 00 40 */ lwz r0, 0x40(r4) +/* 80265074 00261FB4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e +/* 80265078 00261FB8 40 82 00 18 */ bne lbl_80265090 +/* 8026507C 00261FBC 80 BA 00 00 */ lwz r5, 0(r26) +/* 80265080 00261FC0 80 05 00 40 */ lwz r0, 0x40(r5) +/* 80265084 00261FC4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e +/* 80265088 00261FC8 40 82 00 08 */ bne lbl_80265090 +/* 8026508C 00261FCC 38 C0 00 00 */ li r6, 0 +lbl_80265090: +/* 80265090 00261FD0 54 C0 06 3F */ clrlwi. r0, r6, 0x18 +/* 80265094 00261FD4 40 82 00 24 */ bne lbl_802650B8 +/* 80265098 00261FD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026509C 00261FDC 41 82 00 1C */ beq lbl_802650B8 +/* 802650A0 00261FE0 7F E3 FB 78 */ mr r3, r31 +/* 802650A4 00261FE4 80 BA 00 00 */ lwz r5, 0(r26) +/* 802650A8 00261FE8 3C C0 80 43 */ lis r6, lbl_80430CCC@ha +/* 802650AC 00261FEC 38 C6 0C CC */ addi r6, r6, lbl_80430CCC@l +/* 802650B0 00261FF0 48 00 03 19 */ bl SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz +/* 802650B4 00261FF4 48 00 00 6C */ b lbl_80265120 +lbl_802650B8: +/* 802650B8 00261FF8 54 C0 06 3F */ clrlwi. r0, r6, 0x18 +/* 802650BC 00261FFC 41 82 00 64 */ beq lbl_80265120 +/* 802650C0 00262000 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802650C4 00262004 40 82 00 5C */ bne lbl_80265120 +/* 802650C8 00262008 7C 83 23 78 */ mr r3, r4 +/* 802650CC 0026200C 81 84 00 3C */ lwz r12, 0x3c(r4) +/* 802650D0 00262010 81 8C 00 18 */ lwz r12, 0x18(r12) +/* 802650D4 00262014 7D 89 03 A6 */ mtctr r12 +/* 802650D8 00262018 4E 80 04 21 */ bctrl +/* 802650DC 0026201C 28 03 00 00 */ cmplwi r3, 0 +/* 802650E0 00262020 40 82 00 1C */ bne lbl_802650FC +/* 802650E4 00262024 C0 02 B6 38 */ lfs f0, lbl_80455038-_SDA2_BASE_(r2) +/* 802650E8 00262028 3C 60 80 43 */ lis r3, lbl_80430CCC@ha +/* 802650EC 0026202C D0 03 0C CC */ stfs f0, lbl_80430CCC@l(r3) +/* 802650F0 00262030 D0 1E 00 04 */ stfs f0, 4(r30) +/* 802650F4 00262034 D0 1E 00 08 */ stfs f0, 8(r30) +/* 802650F8 00262038 48 00 00 10 */ b lbl_80265108 +lbl_802650FC: +/* 802650FC 0026203C 3C 80 80 43 */ lis r4, lbl_80430CCC@ha +/* 80265100 00262040 38 84 0C CC */ addi r4, r4, lbl_80430CCC@l +/* 80265104 00262044 48 00 9D 21 */ bl CalcCenter__8cM3dGAabCFP4cXyz +lbl_80265108: +/* 80265108 00262048 7F E3 FB 78 */ mr r3, r31 +/* 8026510C 0026204C 80 9C 00 00 */ lwz r4, 0(r28) +/* 80265110 00262050 80 BA 00 00 */ lwz r5, 0(r26) +/* 80265114 00262054 3C C0 80 43 */ lis r6, lbl_80430CCC@ha +/* 80265118 00262058 38 C6 0C CC */ addi r6, r6, lbl_80430CCC@l +/* 8026511C 0026205C 48 00 02 AD */ bl SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz +lbl_80265120: +/* 80265120 00262060 3B 5A 00 04 */ addi r26, r26, 4 +lbl_80265124: +/* 80265124 00262064 7C 1A E8 40 */ cmplw r26, r29 +/* 80265128 00262068 41 80 FE 90 */ blt lbl_80264FB8 +lbl_8026512C: +/* 8026512C 0026206C 3B 9C 00 04 */ addi r28, r28, 4 +lbl_80265130: +/* 80265130 00262070 A0 1F 28 00 */ lhz r0, 0x2800(r31) +/* 80265134 00262074 54 00 10 3A */ slwi r0, r0, 2 +/* 80265138 00262078 7C 1F 02 14 */ add r0, r31, r0 +/* 8026513C 0026207C 7C 1C 00 40 */ cmplw r28, r0 +/* 80265140 00262080 41 80 FE 44 */ blt lbl_80264F84 +/* 80265144 00262084 39 61 00 30 */ addi r11, r1, 0x30 +/* 80265148 00262088 48 0F D0 D1 */ bl _restgpr_25 +/* 8026514C 0026208C 80 01 00 34 */ lwz r0, 0x34(r1) +/* 80265150 00262090 7C 08 03 A6 */ mtlr r0 +/* 80265154 00262094 38 21 00 30 */ addi r1, r1, 0x30 +/* 80265158 00262098 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_8026515C.s b/include/SComponent/c_cc_s/asm/func_8026515C.s new file mode 100644 index 0000000000..696e025472 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_8026515C.s @@ -0,0 +1,57 @@ +/* 8026515C 0026209C 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80265160 002620A0 7C 08 02 A6 */ mflr r0 +/* 80265164 002620A4 90 01 00 24 */ stw r0, 0x24(r1) +/* 80265168 002620A8 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026516C 002620AC 48 0F D0 6D */ bl _savegpr_28 +/* 80265170 002620B0 7C 7C 1B 78 */ mr r28, r3 +/* 80265174 002620B4 7C 9D 23 78 */ mr r29, r4 +/* 80265178 002620B8 7C BE 2B 78 */ mr r30, r5 +/* 8026517C 002620BC 7F A3 EB 78 */ mr r3, r29 +/* 80265180 002620C0 4B FF E8 C9 */ bl GetAc__8cCcD_ObjFv +/* 80265184 002620C4 7C 7F 1B 78 */ mr r31, r3 +/* 80265188 002620C8 7F C3 F3 78 */ mr r3, r30 +/* 8026518C 002620CC 4B FF E8 BD */ bl GetAc__8cCcD_ObjFv +/* 80265190 002620D0 28 1F 00 00 */ cmplwi r31, 0 +/* 80265194 002620D4 41 82 00 2C */ beq lbl_802651C0 +/* 80265198 002620D8 28 03 00 00 */ cmplwi r3, 0 +/* 8026519C 002620DC 41 82 00 24 */ beq lbl_802651C0 +/* 802651A0 002620E0 7C 1F 18 40 */ cmplw r31, r3 +/* 802651A4 002620E4 40 82 00 1C */ bne lbl_802651C0 +/* 802651A8 002620E8 80 1D 00 2C */ lwz r0, 0x2c(r29) +/* 802651AC 002620EC 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 +/* 802651B0 002620F0 40 82 00 10 */ bne lbl_802651C0 +/* 802651B4 002620F4 80 1E 00 2C */ lwz r0, 0x2c(r30) +/* 802651B8 002620F8 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 +/* 802651BC 002620FC 41 82 00 50 */ beq lbl_8026520C +lbl_802651C0: +/* 802651C0 00262100 80 BD 00 2C */ lwz r5, 0x2c(r29) +/* 802651C4 00262104 54 A3 07 3C */ rlwinm r3, r5, 0, 0x1c, 0x1e +/* 802651C8 00262108 80 9E 00 2C */ lwz r4, 0x2c(r30) +/* 802651CC 0026210C 54 80 EF 3C */ rlwinm r0, r4, 0x1d, 0x1c, 0x1e +/* 802651D0 00262110 7C 60 00 39 */ and. r0, r3, r0 +/* 802651D4 00262114 41 82 00 38 */ beq lbl_8026520C +/* 802651D8 00262118 54 A3 EF 3C */ rlwinm r3, r5, 0x1d, 0x1c, 0x1e +/* 802651DC 0026211C 54 80 07 3C */ rlwinm r0, r4, 0, 0x1c, 0x1e +/* 802651E0 00262120 7C 60 00 39 */ and. r0, r3, r0 +/* 802651E4 00262124 41 82 00 28 */ beq lbl_8026520C +/* 802651E8 00262128 7F 83 E3 78 */ mr r3, r28 +/* 802651EC 0026212C 7F A4 EB 78 */ mr r4, r29 +/* 802651F0 00262130 7F C5 F3 78 */ mr r5, r30 +/* 802651F4 00262134 81 9C 28 48 */ lwz r12, 0x2848(r28) +/* 802651F8 00262138 81 8C 00 20 */ lwz r12, 0x20(r12) +/* 802651FC 0026213C 7D 89 03 A6 */ mtctr r12 +/* 80265200 00262140 4E 80 04 21 */ bctrl +/* 80265204 00262144 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80265208 00262148 41 82 00 0C */ beq lbl_80265214 +lbl_8026520C: +/* 8026520C 0026214C 38 60 00 01 */ li r3, 1 +/* 80265210 00262150 48 00 00 08 */ b lbl_80265218 +lbl_80265214: +/* 80265214 00262154 38 60 00 00 */ li r3, 0 +lbl_80265218: +/* 80265218 00262158 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026521C 0026215C 48 0F D0 09 */ bl _restgpr_28 +/* 80265220 00262160 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80265224 00262164 7C 08 03 A6 */ mtlr r0 +/* 80265228 00262168 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026522C 0026216C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80265230.s b/include/SComponent/c_cc_s/asm/func_80265230.s new file mode 100644 index 0000000000..4d6c323d32 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80265230.s @@ -0,0 +1,99 @@ +/* 80265230 00262170 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 80265234 00262174 7C 08 02 A6 */ mflr r0 +/* 80265238 00262178 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026523C 0026217C 39 61 00 30 */ addi r11, r1, 0x30 +/* 80265240 00262180 48 0F CF 8D */ bl _savegpr_25 +/* 80265244 00262184 7C 7B 1B 78 */ mr r27, r3 +/* 80265248 00262188 4B FF FA 15 */ bl ClrCoHitInf__4cCcSFv +/* 8026524C 0026218C A0 1B 28 04 */ lhz r0, 0x2804(r27) +/* 80265250 00262190 28 00 00 01 */ cmplwi r0, 1 +/* 80265254 00262194 40 81 01 34 */ ble lbl_80265388 +/* 80265258 00262198 54 03 13 BA */ rlwinm r3, r0, 2, 0xe, 0x1d +/* 8026525C 0026219C 3B E3 10 00 */ addi r31, r3, 0x1000 +/* 80265260 002621A0 7F FB FA 14 */ add r31, r27, r31 +/* 80265264 002621A4 3B DB 10 00 */ addi r30, r27, 0x1000 +/* 80265268 002621A8 3B 5F FF FC */ addi r26, r31, -4 +/* 8026526C 002621AC 48 00 01 14 */ b lbl_80265380 +lbl_80265270: +/* 80265270 002621B0 80 7E 00 00 */ lwz r3, 0(r30) +/* 80265274 002621B4 28 03 00 00 */ cmplwi r3, 0 +/* 80265278 002621B8 41 82 01 04 */ beq lbl_8026537C +/* 8026527C 002621BC 80 03 00 2C */ lwz r0, 0x2c(r3) +/* 80265280 002621C0 54 00 07 FF */ clrlwi. r0, r0, 0x1f +/* 80265284 002621C4 41 82 00 F8 */ beq lbl_8026537C +/* 80265288 002621C8 81 83 00 3C */ lwz r12, 0x3c(r3) +/* 8026528C 002621CC 81 8C 00 18 */ lwz r12, 0x18(r12) +/* 80265290 002621D0 7D 89 03 A6 */ mtctr r12 +/* 80265294 002621D4 4E 80 04 21 */ bctrl +/* 80265298 002621D8 7C 7D 1B 78 */ mr r29, r3 +/* 8026529C 002621DC 3B 9E 00 04 */ addi r28, r30, 4 +/* 802652A0 002621E0 48 00 00 D4 */ b lbl_80265374 +lbl_802652A4: +/* 802652A4 002621E4 80 7C 00 00 */ lwz r3, 0(r28) +/* 802652A8 002621E8 28 03 00 00 */ cmplwi r3, 0 +/* 802652AC 002621EC 41 82 00 C4 */ beq lbl_80265370 +/* 802652B0 002621F0 80 03 00 2C */ lwz r0, 0x2c(r3) +/* 802652B4 002621F4 54 00 07 FF */ clrlwi. r0, r0, 0x1f +/* 802652B8 002621F8 41 82 00 B8 */ beq lbl_80265370 +/* 802652BC 002621FC 38 83 00 48 */ addi r4, r3, 0x48 +/* 802652C0 00262200 80 7E 00 00 */ lwz r3, 0(r30) +/* 802652C4 00262204 38 63 00 48 */ addi r3, r3, 0x48 +/* 802652C8 00262208 4B FF E0 A1 */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo +/* 802652CC 0026220C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802652D0 00262210 41 82 00 A0 */ beq lbl_80265370 +/* 802652D4 00262214 7F 63 DB 78 */ mr r3, r27 +/* 802652D8 00262218 80 9E 00 00 */ lwz r4, 0(r30) +/* 802652DC 0026221C 80 BC 00 00 */ lwz r5, 0(r28) +/* 802652E0 00262220 4B FF FE 7D */ bl ChkNoHitCo__4cCcSFP8cCcD_ObjP8cCcD_Obj +/* 802652E4 00262224 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802652E8 00262228 40 82 00 88 */ bne lbl_80265370 +/* 802652EC 0026222C 80 7C 00 00 */ lwz r3, 0(r28) +/* 802652F0 00262230 81 83 00 3C */ lwz r12, 0x3c(r3) +/* 802652F4 00262234 81 8C 00 18 */ lwz r12, 0x18(r12) +/* 802652F8 00262238 7D 89 03 A6 */ mtctr r12 +/* 802652FC 0026223C 4E 80 04 21 */ bctrl +/* 80265300 00262240 7C 79 1B 78 */ mr r25, r3 +/* 80265304 00262244 7F A3 EB 78 */ mr r3, r29 +/* 80265308 00262248 7F 24 CB 78 */ mr r4, r25 +/* 8026530C 0026224C 38 A1 00 08 */ addi r5, r1, 8 +/* 80265310 00262250 81 9D 00 1C */ lwz r12, 0x1c(r29) +/* 80265314 00262254 81 8C 00 28 */ lwz r12, 0x28(r12) +/* 80265318 00262258 7D 89 03 A6 */ mtctr r12 +/* 8026531C 0026225C 4E 80 04 21 */ bctrl +/* 80265320 00262260 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80265324 00262264 41 82 00 4C */ beq lbl_80265370 +/* 80265328 00262268 7F 23 CB 78 */ mr r3, r25 +/* 8026532C 0026226C 81 99 00 1C */ lwz r12, 0x1c(r25) +/* 80265330 00262270 81 8C 00 48 */ lwz r12, 0x48(r12) +/* 80265334 00262274 7D 89 03 A6 */ mtctr r12 +/* 80265338 00262278 4E 80 04 21 */ bctrl +/* 8026533C 0026227C 7C 79 1B 78 */ mr r25, r3 +/* 80265340 00262280 7F A3 EB 78 */ mr r3, r29 +/* 80265344 00262284 81 9D 00 1C */ lwz r12, 0x1c(r29) +/* 80265348 00262288 81 8C 00 48 */ lwz r12, 0x48(r12) +/* 8026534C 0026228C 7D 89 03 A6 */ mtctr r12 +/* 80265350 00262290 4E 80 04 21 */ bctrl +/* 80265354 00262294 7C 65 1B 78 */ mr r5, r3 +/* 80265358 00262298 7F 63 DB 78 */ mr r3, r27 +/* 8026535C 0026229C 80 9E 00 00 */ lwz r4, 0(r30) +/* 80265360 002622A0 80 DC 00 00 */ lwz r6, 0(r28) +/* 80265364 002622A4 7F 27 CB 78 */ mr r7, r25 +/* 80265368 002622A8 C0 21 00 08 */ lfs f1, 8(r1) +/* 8026536C 002622AC 48 00 02 79 */ bl SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf +lbl_80265370: +/* 80265370 002622B0 3B 9C 00 04 */ addi r28, r28, 4 +lbl_80265374: +/* 80265374 002622B4 7C 1C F8 40 */ cmplw r28, r31 +/* 80265378 002622B8 41 80 FF 2C */ blt lbl_802652A4 +lbl_8026537C: +/* 8026537C 002622BC 3B DE 00 04 */ addi r30, r30, 4 +lbl_80265380: +/* 80265380 002622C0 7C 1E D0 40 */ cmplw r30, r26 +/* 80265384 002622C4 41 80 FE EC */ blt lbl_80265270 +lbl_80265388: +/* 80265388 002622C8 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026538C 002622CC 48 0F CE 8D */ bl _restgpr_25 +/* 80265390 002622D0 80 01 00 34 */ lwz r0, 0x34(r1) +/* 80265394 002622D4 7C 08 03 A6 */ mtlr r0 +/* 80265398 002622D8 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026539C 002622DC 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_s/asm/func_802653A0.s b/include/SComponent/c_cc_s/asm/func_802653A0.s new file mode 100644 index 0000000000..844f85d8aa --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_802653A0.s @@ -0,0 +1,10 @@ +/* 802653A0 002622E0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802653A4 002622E4 7C 08 02 A6 */ mflr r0 +/* 802653A8 002622E8 90 01 00 14 */ stw r0, 0x14(r1) +/* 802653AC 002622EC 7C E3 3B 78 */ mr r3, r7 +/* 802653B0 002622F0 88 84 00 14 */ lbz r4, 0x14(r4) +/* 802653B4 002622F4 4B FF E5 BD */ bl cCcD_Stts_NS_PlusDmg +/* 802653B8 002622F8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802653BC 002622FC 7C 08 03 A6 */ mtlr r0 +/* 802653C0 00262300 38 21 00 10 */ addi r1, r1, 0x10 +/* 802653C4 00262304 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_802653C8.s b/include/SComponent/c_cc_s/asm/func_802653C8.s new file mode 100644 index 0000000000..f63ebd519b --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_802653C8.s @@ -0,0 +1,140 @@ +/* 802653C8 00262308 94 21 FF B0 */ stwu r1, -0x50(r1) +/* 802653CC 0026230C 7C 08 02 A6 */ mflr r0 +/* 802653D0 00262310 90 01 00 54 */ stw r0, 0x54(r1) +/* 802653D4 00262314 39 61 00 50 */ addi r11, r1, 0x50 +/* 802653D8 00262318 48 0F CD E5 */ bl _savegpr_21 +/* 802653DC 0026231C 7C 7A 1B 78 */ mr r26, r3 +/* 802653E0 00262320 7C 9B 23 78 */ mr r27, r4 +/* 802653E4 00262324 7C BC 2B 78 */ mr r28, r5 +/* 802653E8 00262328 7C DD 33 78 */ mr r29, r6 +/* 802653EC 0026232C 83 E4 00 44 */ lwz r31, 0x44(r4) +/* 802653F0 00262330 83 C5 00 44 */ lwz r30, 0x44(r5) +/* 802653F4 00262334 80 04 00 00 */ lwz r0, 0(r4) +/* 802653F8 00262338 54 16 06 B4 */ rlwinm r22, r0, 0, 0x1a, 0x1a +/* 802653FC 0026233C 80 05 00 18 */ lwz r0, 0x18(r5) +/* 80265400 00262340 54 15 06 B4 */ rlwinm r21, r0, 0, 0x1a, 0x1a +/* 80265404 00262344 7F C3 F3 78 */ mr r3, r30 +/* 80265408 00262348 81 9E 00 18 */ lwz r12, 0x18(r30) +/* 8026540C 0026234C 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80265410 00262350 7D 89 03 A6 */ mtctr r12 +/* 80265414 00262354 4E 80 04 21 */ bctrl +/* 80265418 00262358 7C 79 1B 78 */ mr r25, r3 +/* 8026541C 0026235C 7F E3 FB 78 */ mr r3, r31 +/* 80265420 00262360 81 9F 00 18 */ lwz r12, 0x18(r31) +/* 80265424 00262364 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80265428 00262368 7D 89 03 A6 */ mtctr r12 +/* 8026542C 0026236C 4E 80 04 21 */ bctrl +/* 80265430 00262370 7C 78 1B 78 */ mr r24, r3 +/* 80265434 00262374 7F 83 E3 78 */ mr r3, r28 +/* 80265438 00262378 81 9C 00 3C */ lwz r12, 0x3c(r28) +/* 8026543C 0026237C 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80265440 00262380 7D 89 03 A6 */ mtctr r12 +/* 80265444 00262384 4E 80 04 21 */ bctrl +/* 80265448 00262388 7C 77 1B 78 */ mr r23, r3 +/* 8026544C 0026238C 7F 63 DB 78 */ mr r3, r27 +/* 80265450 00262390 81 9B 00 3C */ lwz r12, 0x3c(r27) +/* 80265454 00262394 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80265458 00262398 7D 89 03 A6 */ mtctr r12 +/* 8026545C 0026239C 4E 80 04 21 */ bctrl +/* 80265460 002623A0 7C 66 1B 78 */ mr r6, r3 +/* 80265464 002623A4 93 21 00 08 */ stw r25, 8(r1) +/* 80265468 002623A8 7F 43 D3 78 */ mr r3, r26 +/* 8026546C 002623AC 7E A0 00 34 */ cntlzw r0, r21 +/* 80265470 002623B0 54 04 D9 7E */ srwi r4, r0, 5 +/* 80265474 002623B4 7E C0 00 34 */ cntlzw r0, r22 +/* 80265478 002623B8 54 05 D9 7E */ srwi r5, r0, 5 +/* 8026547C 002623BC 7E E7 BB 78 */ mr r7, r23 +/* 80265480 002623C0 7F E8 FB 78 */ mr r8, r31 +/* 80265484 002623C4 7F C9 F3 78 */ mr r9, r30 +/* 80265488 002623C8 7F 0A C3 78 */ mr r10, r24 +/* 8026548C 002623CC 81 9A 28 48 */ lwz r12, 0x2848(r26) +/* 80265490 002623D0 81 8C 00 1C */ lwz r12, 0x1c(r12) +/* 80265494 002623D4 7D 89 03 A6 */ mtctr r12 +/* 80265498 002623D8 4E 80 04 21 */ bctrl +/* 8026549C 002623DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802654A0 002623E0 40 82 01 2C */ bne lbl_802655CC +/* 802654A4 002623E4 80 1C 00 18 */ lwz r0, 0x18(r28) +/* 802654A8 002623E8 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a +/* 802654AC 002623EC 40 82 00 10 */ bne lbl_802654BC +/* 802654B0 002623F0 7F 63 DB 78 */ mr r3, r27 +/* 802654B4 002623F4 7F 84 E3 78 */ mr r4, r28 +/* 802654B8 002623F8 4B FF F3 85 */ bl SetHit__10cCcD_ObjAtFP8cCcD_Obj +lbl_802654BC: +/* 802654BC 002623FC 38 60 00 00 */ li r3, 0 +/* 802654C0 00262400 80 1B 00 00 */ lwz r0, 0(r27) +/* 802654C4 00262404 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a +/* 802654C8 00262408 40 82 00 20 */ bne lbl_802654E8 +/* 802654CC 0026240C 80 1B 00 10 */ lwz r0, 0x10(r27) +/* 802654D0 00262410 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 +/* 802654D4 00262414 41 82 00 10 */ beq lbl_802654E4 +/* 802654D8 00262418 80 1C 00 18 */ lwz r0, 0x18(r28) +/* 802654DC 0026241C 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 +/* 802654E0 00262420 40 82 00 08 */ bne lbl_802654E8 +lbl_802654E4: +/* 802654E4 00262424 38 60 00 01 */ li r3, 1 +lbl_802654E8: +/* 802654E8 00262428 7C 76 1B 78 */ mr r22, r3 +/* 802654EC 0026242C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802654F0 00262430 41 82 00 34 */ beq lbl_80265524 +/* 802654F4 00262434 38 7C 00 18 */ addi r3, r28, 0x18 +/* 802654F8 00262438 7F 64 DB 78 */ mr r4, r27 +/* 802654FC 0026243C 4B FF F3 CD */ bl SetHit__10cCcD_ObjTgFP8cCcD_Obj +/* 80265500 00262440 7F 43 D3 78 */ mr r3, r26 +/* 80265504 00262444 7F 64 DB 78 */ mr r4, r27 +/* 80265508 00262448 7F 85 E3 78 */ mr r5, r28 +/* 8026550C 0026244C 7F E6 FB 78 */ mr r6, r31 +/* 80265510 00262450 7F C7 F3 78 */ mr r7, r30 +/* 80265514 00262454 81 9A 28 48 */ lwz r12, 0x2848(r26) +/* 80265518 00262458 81 8C 00 08 */ lwz r12, 8(r12) +/* 8026551C 0026245C 7D 89 03 A6 */ mtctr r12 +/* 80265520 00262460 4E 80 04 21 */ bctrl +lbl_80265524: +/* 80265524 00262464 80 1C 00 18 */ lwz r0, 0x18(r28) +/* 80265528 00262468 54 15 06 B4 */ rlwinm r21, r0, 0, 0x1a, 0x1a +/* 8026552C 0026246C 7F C3 F3 78 */ mr r3, r30 +/* 80265530 00262470 81 9E 00 18 */ lwz r12, 0x18(r30) +/* 80265534 00262474 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80265538 00262478 7D 89 03 A6 */ mtctr r12 +/* 8026553C 0026247C 4E 80 04 21 */ bctrl +/* 80265540 00262480 7C 77 1B 78 */ mr r23, r3 +/* 80265544 00262484 7F E3 FB 78 */ mr r3, r31 +/* 80265548 00262488 81 9F 00 18 */ lwz r12, 0x18(r31) +/* 8026554C 0026248C 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80265550 00262490 7D 89 03 A6 */ mtctr r12 +/* 80265554 00262494 4E 80 04 21 */ bctrl +/* 80265558 00262498 7C 78 1B 78 */ mr r24, r3 +/* 8026555C 0026249C 7F 83 E3 78 */ mr r3, r28 +/* 80265560 002624A0 81 9C 00 3C */ lwz r12, 0x3c(r28) +/* 80265564 002624A4 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80265568 002624A8 7D 89 03 A6 */ mtctr r12 +/* 8026556C 002624AC 4E 80 04 21 */ bctrl +/* 80265570 002624B0 7C 79 1B 78 */ mr r25, r3 +/* 80265574 002624B4 7F 63 DB 78 */ mr r3, r27 +/* 80265578 002624B8 81 9B 00 3C */ lwz r12, 0x3c(r27) +/* 8026557C 002624BC 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 80265580 002624C0 7D 89 03 A6 */ mtctr r12 +/* 80265584 002624C4 4E 80 04 21 */ bctrl +/* 80265588 002624C8 7C 68 1B 78 */ mr r8, r3 +/* 8026558C 002624CC 93 C1 00 08 */ stw r30, 8(r1) +/* 80265590 002624D0 93 01 00 0C */ stw r24, 0xc(r1) +/* 80265594 002624D4 92 E1 00 10 */ stw r23, 0x10(r1) +/* 80265598 002624D8 93 A1 00 14 */ stw r29, 0x14(r1) +/* 8026559C 002624DC 7F 43 D3 78 */ mr r3, r26 +/* 802655A0 002624E0 7E A0 00 34 */ cntlzw r0, r21 +/* 802655A4 002624E4 54 04 D9 7E */ srwi r4, r0, 5 +/* 802655A8 002624E8 7E C5 B3 78 */ mr r5, r22 +/* 802655AC 002624EC 7F 66 DB 78 */ mr r6, r27 +/* 802655B0 002624F0 7F 87 E3 78 */ mr r7, r28 +/* 802655B4 002624F4 7F 29 CB 78 */ mr r9, r25 +/* 802655B8 002624F8 7F EA FB 78 */ mr r10, r31 +/* 802655BC 002624FC 81 9A 28 48 */ lwz r12, 0x2848(r26) +/* 802655C0 00262500 81 8C 00 14 */ lwz r12, 0x14(r12) +/* 802655C4 00262504 7D 89 03 A6 */ mtctr r12 +/* 802655C8 00262508 4E 80 04 21 */ bctrl +lbl_802655CC: +/* 802655CC 0026250C 39 61 00 50 */ addi r11, r1, 0x50 +/* 802655D0 00262510 48 0F CC 39 */ bl _restgpr_21 +/* 802655D4 00262514 80 01 00 54 */ lwz r0, 0x54(r1) +/* 802655D8 00262518 7C 08 03 A6 */ mtlr r0 +/* 802655DC 0026251C 38 21 00 50 */ addi r1, r1, 0x50 +/* 802655E0 00262520 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_802655E4.s b/include/SComponent/c_cc_s/asm/func_802655E4.s new file mode 100644 index 0000000000..6054569ca6 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_802655E4.s @@ -0,0 +1,94 @@ +/* 802655E4 00262524 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 802655E8 00262528 7C 08 02 A6 */ mflr r0 +/* 802655EC 0026252C 90 01 00 44 */ stw r0, 0x44(r1) +/* 802655F0 00262530 DB E1 00 38 */ stfd f31, 0x38(r1) +/* 802655F4 00262534 39 61 00 38 */ addi r11, r1, 0x38 +/* 802655F8 00262538 48 0F CB C9 */ bl _savegpr_22 +/* 802655FC 0026253C 7C 79 1B 78 */ mr r25, r3 +/* 80265600 00262540 7C 9A 23 78 */ mr r26, r4 +/* 80265604 00262544 7C BB 2B 78 */ mr r27, r5 +/* 80265608 00262548 7C DC 33 78 */ mr r28, r6 +/* 8026560C 0026254C 7C FD 3B 78 */ mr r29, r7 +/* 80265610 00262550 FF E0 08 90 */ fmr f31, f1 +/* 80265614 00262554 80 06 00 2C */ lwz r0, 0x2c(r6) +/* 80265618 00262558 54 00 05 AC */ rlwinm r0, r0, 0, 0x16, 0x16 +/* 8026561C 0026255C 7C 03 00 34 */ cntlzw r3, r0 +/* 80265620 00262560 54 60 D9 7E */ srwi r0, r3, 5 +/* 80265624 00262564 7C 1F 03 78 */ mr r31, r0 +/* 80265628 00262568 80 04 00 2C */ lwz r0, 0x2c(r4) +/* 8026562C 0026256C 54 00 05 AC */ rlwinm r0, r0, 0, 0x16, 0x16 +/* 80265630 00262570 7C 00 00 34 */ cntlzw r0, r0 +/* 80265634 00262574 54 00 D9 7E */ srwi r0, r0, 5 +/* 80265638 00262578 7C 1E 03 78 */ mr r30, r0 +/* 8026563C 0026257C 54 60 DE 3F */ rlwinm. r0, r3, 0x1b, 0x18, 0x1f +/* 80265640 00262580 41 82 00 10 */ beq lbl_80265650 +/* 80265644 00262584 38 7A 00 2C */ addi r3, r26, 0x2c +/* 80265648 00262588 7F 84 E3 78 */ mr r4, r28 +/* 8026564C 0026258C 4B FF F2 8D */ bl SetHit__10cCcD_ObjCoFP8cCcD_Obj +lbl_80265650: +/* 80265650 00262590 57 C0 06 3F */ clrlwi. r0, r30, 0x18 +/* 80265654 00262594 41 82 00 10 */ beq lbl_80265664 +/* 80265658 00262598 38 7C 00 2C */ addi r3, r28, 0x2c +/* 8026565C 0026259C 7F 44 D3 78 */ mr r4, r26 +/* 80265660 002625A0 4B FF F2 79 */ bl SetHit__10cCcD_ObjCoFP8cCcD_Obj +lbl_80265664: +/* 80265664 002625A4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 +/* 80265668 002625A8 41 82 00 34 */ beq lbl_8026569C +/* 8026566C 002625AC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 +/* 80265670 002625B0 41 82 00 2C */ beq lbl_8026569C +/* 80265674 002625B4 7F 23 CB 78 */ mr r3, r25 +/* 80265678 002625B8 7F 44 D3 78 */ mr r4, r26 +/* 8026567C 002625BC 7F 65 DB 78 */ mr r5, r27 +/* 80265680 002625C0 7F 86 E3 78 */ mr r6, r28 +/* 80265684 002625C4 7F A7 EB 78 */ mr r7, r29 +/* 80265688 002625C8 FC 20 F8 90 */ fmr f1, f31 +/* 8026568C 002625CC 81 99 28 48 */ lwz r12, 0x2848(r25) +/* 80265690 002625D0 81 8C 00 0C */ lwz r12, 0xc(r12) +/* 80265694 002625D4 7D 89 03 A6 */ mtctr r12 +/* 80265698 002625D8 4E 80 04 21 */ bctrl +lbl_8026569C: +/* 8026569C 002625DC 82 FA 00 44 */ lwz r23, 0x44(r26) +/* 802656A0 002625E0 82 DC 00 44 */ lwz r22, 0x44(r28) +/* 802656A4 002625E4 7E C3 B3 78 */ mr r3, r22 +/* 802656A8 002625E8 81 96 00 18 */ lwz r12, 0x18(r22) +/* 802656AC 002625EC 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 802656B0 002625F0 7D 89 03 A6 */ mtctr r12 +/* 802656B4 002625F4 4E 80 04 21 */ bctrl +/* 802656B8 002625F8 7C 78 1B 78 */ mr r24, r3 +/* 802656BC 002625FC 7E E3 BB 78 */ mr r3, r23 +/* 802656C0 00262600 81 97 00 18 */ lwz r12, 0x18(r23) +/* 802656C4 00262604 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 802656C8 00262608 7D 89 03 A6 */ mtctr r12 +/* 802656CC 0026260C 4E 80 04 21 */ bctrl +/* 802656D0 00262610 7C 7D 1B 78 */ mr r29, r3 +/* 802656D4 00262614 7F 83 E3 78 */ mr r3, r28 +/* 802656D8 00262618 81 9C 00 3C */ lwz r12, 0x3c(r28) +/* 802656DC 0026261C 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 802656E0 00262620 7D 89 03 A6 */ mtctr r12 +/* 802656E4 00262624 4E 80 04 21 */ bctrl +/* 802656E8 00262628 7C 7B 1B 78 */ mr r27, r3 +/* 802656EC 0026262C 7F 43 D3 78 */ mr r3, r26 +/* 802656F0 00262630 81 9A 00 3C */ lwz r12, 0x3c(r26) +/* 802656F4 00262634 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 802656F8 00262638 7D 89 03 A6 */ mtctr r12 +/* 802656FC 0026263C 4E 80 04 21 */ bctrl +/* 80265700 00262640 7C 66 1B 78 */ mr r6, r3 +/* 80265704 00262644 93 01 00 08 */ stw r24, 8(r1) +/* 80265708 00262648 7F 23 CB 78 */ mr r3, r25 +/* 8026570C 0026264C 7F E4 FB 78 */ mr r4, r31 +/* 80265710 00262650 7F C5 F3 78 */ mr r5, r30 +/* 80265714 00262654 7F 67 DB 78 */ mr r7, r27 +/* 80265718 00262658 7E E8 BB 78 */ mr r8, r23 +/* 8026571C 0026265C 7E C9 B3 78 */ mr r9, r22 +/* 80265720 00262660 7F AA EB 78 */ mr r10, r29 +/* 80265724 00262664 81 99 28 48 */ lwz r12, 0x2848(r25) +/* 80265728 00262668 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 8026572C 0026266C 7D 89 03 A6 */ mtctr r12 +/* 80265730 00262670 4E 80 04 21 */ bctrl +/* 80265734 00262674 CB E1 00 38 */ lfd f31, 0x38(r1) +/* 80265738 00262678 39 61 00 38 */ addi r11, r1, 0x38 +/* 8026573C 0026267C 48 0F CA D1 */ bl _restgpr_22 +/* 80265740 00262680 80 01 00 44 */ lwz r0, 0x44(r1) +/* 80265744 00262684 7C 08 03 A6 */ mtlr r0 +/* 80265748 00262688 38 21 00 40 */ addi r1, r1, 0x40 +/* 8026574C 0026268C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_s/asm/func_80265750.s b/include/SComponent/c_cc_s/asm/func_80265750.s new file mode 100644 index 0000000000..ea7f0d40e4 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80265750.s @@ -0,0 +1,307 @@ +/* 80265750 00262690 94 21 FF 80 */ stwu r1, -0x80(r1) +/* 80265754 00262694 7C 08 02 A6 */ mflr r0 +/* 80265758 00262698 90 01 00 84 */ stw r0, 0x84(r1) +/* 8026575C 0026269C DB E1 00 70 */ stfd f31, 0x70(r1) +/* 80265760 002626A0 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 +/* 80265764 002626A4 DB C1 00 60 */ stfd f30, 0x60(r1) +/* 80265768 002626A8 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 +/* 8026576C 002626AC DB A1 00 50 */ stfd f29, 0x50(r1) +/* 80265770 002626B0 F3 A1 00 58 */ psq_st f29, 88(r1), 0, 0 +/* 80265774 002626B4 39 61 00 50 */ addi r11, r1, 0x50 +/* 80265778 002626B8 48 0F CA 55 */ bl _savegpr_25 +/* 8026577C 002626BC 7C 7A 1B 78 */ mr r26, r3 +/* 80265780 002626C0 7C 9B 23 78 */ mr r27, r4 +/* 80265784 002626C4 7C BC 2B 78 */ mr r28, r5 +/* 80265788 002626C8 7C DD 33 78 */ mr r29, r6 +/* 8026578C 002626CC 7C FE 3B 78 */ mr r30, r7 +/* 80265790 002626D0 FF A0 08 90 */ fmr f29, f1 +/* 80265794 002626D4 80 04 00 2C */ lwz r0, 0x2c(r4) +/* 80265798 002626D8 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 +/* 8026579C 002626DC 40 82 03 E8 */ bne lbl_80265B84 +/* 802657A0 002626E0 80 1D 00 2C */ lwz r0, 0x2c(r29) +/* 802657A4 002626E4 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 +/* 802657A8 002626E8 41 82 00 08 */ beq lbl_802657B0 +/* 802657AC 002626EC 48 00 03 D8 */ b lbl_80265B84 +lbl_802657B0: +/* 802657B0 002626F0 80 7B 00 44 */ lwz r3, 0x44(r27) +/* 802657B4 002626F4 28 03 00 00 */ cmplwi r3, 0 +/* 802657B8 002626F8 41 82 03 CC */ beq lbl_80265B84 +/* 802657BC 002626FC 80 9D 00 44 */ lwz r4, 0x44(r29) +/* 802657C0 00262700 28 04 00 00 */ cmplwi r4, 0 +/* 802657C4 00262704 40 82 00 08 */ bne lbl_802657CC +/* 802657C8 00262708 48 00 03 BC */ b lbl_80265B84 +lbl_802657CC: +/* 802657CC 0026270C 80 03 00 0C */ lwz r0, 0xc(r3) +/* 802657D0 00262710 28 00 00 00 */ cmplwi r0, 0 +/* 802657D4 00262714 41 82 00 10 */ beq lbl_802657E4 +/* 802657D8 00262718 80 64 00 0C */ lwz r3, 0xc(r4) +/* 802657DC 0026271C 7C 00 18 40 */ cmplw r0, r3 +/* 802657E0 00262720 41 82 03 A4 */ beq lbl_80265B84 +lbl_802657E4: +/* 802657E4 00262724 FC 00 EA 10 */ fabs f0, f29 +/* 802657E8 00262728 FC 20 00 18 */ frsp f1, f0 +/* 802657EC 0026272C C0 02 B6 3C */ lfs f0, lbl_8045503C-_SDA2_BASE_(r2) +/* 802657F0 00262730 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802657F4 00262734 41 80 03 90 */ blt lbl_80265B84 +/* 802657F8 00262738 7F 43 D3 78 */ mr r3, r26 +/* 802657FC 0026273C 7F 64 DB 78 */ mr r4, r27 +/* 80265800 00262740 7F A5 EB 78 */ mr r5, r29 +/* 80265804 00262744 81 9A 28 48 */ lwz r12, 0x2848(r26) +/* 80265808 00262748 81 8C 00 2C */ lwz r12, 0x2c(r12) +/* 8026580C 0026274C 7D 89 03 A6 */ mtctr r12 +/* 80265810 00262750 4E 80 04 21 */ bctrl +/* 80265814 00262754 3B E0 00 00 */ li r31, 0 +/* 80265818 00262758 80 1B 00 2C */ lwz r0, 0x2c(r27) +/* 8026581C 0026275C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 +/* 80265820 00262760 41 82 00 14 */ beq lbl_80265834 +/* 80265824 00262764 80 1D 00 2C */ lwz r0, 0x2c(r29) +/* 80265828 00262768 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 +/* 8026582C 0026276C 41 82 00 08 */ beq lbl_80265834 +/* 80265830 00262770 3B E0 00 01 */ li r31, 1 +lbl_80265834: +/* 80265834 00262774 80 7B 00 44 */ lwz r3, 0x44(r27) +/* 80265838 00262778 88 83 00 14 */ lbz r4, 0x14(r3) +/* 8026583C 0026277C 7F 43 D3 78 */ mr r3, r26 +/* 80265840 00262780 4B FF F3 41 */ bl GetWt__4cCcSCFUc +/* 80265844 00262784 7C 79 1B 78 */ mr r25, r3 +/* 80265848 00262788 80 7D 00 44 */ lwz r3, 0x44(r29) +/* 8026584C 0026278C 88 83 00 14 */ lbz r4, 0x14(r3) +/* 80265850 00262790 7F 43 D3 78 */ mr r3, r26 +/* 80265854 00262794 4B FF F3 2D */ bl GetWt__4cCcSCFUc +/* 80265858 00262798 7C 7A 1B 78 */ mr r26, r3 +/* 8026585C 0026279C 80 7B 00 44 */ lwz r3, 0x44(r27) +/* 80265860 002627A0 4B FF E1 25 */ bl GetWeightF__9cCcD_SttsCFv +/* 80265864 002627A4 FF C0 08 90 */ fmr f30, f1 +/* 80265868 002627A8 80 7D 00 44 */ lwz r3, 0x44(r29) +/* 8026586C 002627AC 4B FF E1 19 */ bl GetWeightF__9cCcD_SttsCFv +/* 80265870 002627B0 EC 7E 08 2A */ fadds f3, f30, f1 +/* 80265874 002627B4 FC 00 1A 10 */ fabs f0, f3 +/* 80265878 002627B8 FC 40 00 18 */ frsp f2, f0 +/* 8026587C 002627BC C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 80265880 002627C0 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 80265884 002627C4 40 80 00 10 */ bge lbl_80265894 +/* 80265888 002627C8 C3 C2 B6 40 */ lfs f30, lbl_80455040-_SDA2_BASE_(r2) +/* 8026588C 002627CC FC 20 F0 90 */ fmr f1, f30 +/* 80265890 002627D0 C0 62 B6 44 */ lfs f3, lbl_80455044-_SDA2_BASE_(r2) +lbl_80265894: +/* 80265894 002627D4 C0 02 B6 40 */ lfs f0, lbl_80455040-_SDA2_BASE_(r2) +/* 80265898 002627D8 EC 40 18 24 */ fdivs f2, f0, f3 +/* 8026589C 002627DC 2C 19 00 00 */ cmpwi r25, 0 +/* 802658A0 002627E0 40 82 00 18 */ bne lbl_802658B8 +/* 802658A4 002627E4 2C 1A 00 00 */ cmpwi r26, 0 +/* 802658A8 002627E8 41 82 02 DC */ beq lbl_80265B84 +/* 802658AC 002627EC C3 E2 B6 38 */ lfs f31, lbl_80455038-_SDA2_BASE_(r2) +/* 802658B0 002627F0 FF C0 00 90 */ fmr f30, f0 +/* 802658B4 002627F4 48 00 00 5C */ b lbl_80265910 +lbl_802658B8: +/* 802658B8 002627F8 2C 19 00 01 */ cmpwi r25, 1 +/* 802658BC 002627FC 40 82 00 38 */ bne lbl_802658F4 +/* 802658C0 00262800 2C 1A 00 00 */ cmpwi r26, 0 +/* 802658C4 00262804 40 82 00 10 */ bne lbl_802658D4 +/* 802658C8 00262808 FF E0 00 90 */ fmr f31, f0 +/* 802658CC 0026280C C3 C2 B6 38 */ lfs f30, lbl_80455038-_SDA2_BASE_(r2) +/* 802658D0 00262810 48 00 00 40 */ b lbl_80265910 +lbl_802658D4: +/* 802658D4 00262814 2C 1A 00 01 */ cmpwi r26, 1 +/* 802658D8 00262818 40 82 00 10 */ bne lbl_802658E8 +/* 802658DC 0026281C C3 E2 B6 48 */ lfs f31, lbl_80455048-_SDA2_BASE_(r2) +/* 802658E0 00262820 FF C0 F8 90 */ fmr f30, f31 +/* 802658E4 00262824 48 00 00 2C */ b lbl_80265910 +lbl_802658E8: +/* 802658E8 00262828 C3 E2 B6 38 */ lfs f31, lbl_80455038-_SDA2_BASE_(r2) +/* 802658EC 0026282C FF C0 00 90 */ fmr f30, f0 +/* 802658F0 00262830 48 00 00 20 */ b lbl_80265910 +lbl_802658F4: +/* 802658F4 00262834 2C 1A 00 02 */ cmpwi r26, 2 +/* 802658F8 00262838 40 82 00 10 */ bne lbl_80265908 +/* 802658FC 0026283C EF E1 00 B2 */ fmuls f31, f1, f2 +/* 80265900 00262840 EF DE 00 B2 */ fmuls f30, f30, f2 +/* 80265904 00262844 48 00 00 0C */ b lbl_80265910 +lbl_80265908: +/* 80265908 00262848 FF E0 00 90 */ fmr f31, f0 +/* 8026590C 0026284C C3 C2 B6 38 */ lfs f30, lbl_80455038-_SDA2_BASE_(r2) +lbl_80265910: +/* 80265910 00262850 57 E0 06 3F */ clrlwi. r0, r31, 0x18 +/* 80265914 00262854 41 82 00 20 */ beq lbl_80265934 +/* 80265918 00262858 7F C3 F3 78 */ mr r3, r30 +/* 8026591C 0026285C 7F 84 E3 78 */ mr r4, r28 +/* 80265920 00262860 38 A1 00 0C */ addi r5, r1, 0xc +/* 80265924 00262864 48 0E 17 91 */ bl PSVECSubtract +/* 80265928 00262868 38 61 00 0C */ addi r3, r1, 0xc +/* 8026592C 0026286C 48 0E 18 25 */ bl PSVECMag +/* 80265930 00262870 48 00 01 18 */ b lbl_80265A48 +lbl_80265934: +/* 80265934 00262874 C0 3E 00 00 */ lfs f1, 0(r30) +/* 80265938 00262878 C0 1C 00 00 */ lfs f0, 0(r28) +/* 8026593C 0026287C EC 61 00 28 */ fsubs f3, f1, f0 +/* 80265940 00262880 D0 61 00 0C */ stfs f3, 0xc(r1) +/* 80265944 00262884 C0 42 B6 38 */ lfs f2, lbl_80455038-_SDA2_BASE_(r2) +/* 80265948 00262888 D0 41 00 10 */ stfs f2, 0x10(r1) +/* 8026594C 0026288C C0 3E 00 08 */ lfs f1, 8(r30) +/* 80265950 00262890 C0 1C 00 08 */ lfs f0, 8(r28) +/* 80265954 00262894 EC 01 00 28 */ fsubs f0, f1, f0 +/* 80265958 00262898 D0 01 00 14 */ stfs f0, 0x14(r1) +/* 8026595C 0026289C EC 23 00 F2 */ fmuls f1, f3, f3 +/* 80265960 002628A0 EC 00 00 32 */ fmuls f0, f0, f0 +/* 80265964 002628A4 EC 21 00 2A */ fadds f1, f1, f0 +/* 80265968 002628A8 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026596C 002628AC 40 81 00 58 */ ble lbl_802659C4 +/* 80265970 002628B0 FC 00 08 34 */ frsqrte f0, f1 +/* 80265974 002628B4 C8 82 B6 50 */ lfd f4, lbl_80455050-_SDA2_BASE_(r2) +/* 80265978 002628B8 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026597C 002628BC C8 62 B6 58 */ lfd f3, lbl_80455058-_SDA2_BASE_(r2) +/* 80265980 002628C0 FC 00 00 32 */ fmul f0, f0, f0 +/* 80265984 002628C4 FC 01 00 32 */ fmul f0, f1, f0 +/* 80265988 002628C8 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026598C 002628CC FC 02 00 32 */ fmul f0, f2, f0 +/* 80265990 002628D0 FC 44 00 32 */ fmul f2, f4, f0 +/* 80265994 002628D4 FC 00 00 32 */ fmul f0, f0, f0 +/* 80265998 002628D8 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026599C 002628DC FC 03 00 28 */ fsub f0, f3, f0 +/* 802659A0 002628E0 FC 02 00 32 */ fmul f0, f2, f0 +/* 802659A4 002628E4 FC 44 00 32 */ fmul f2, f4, f0 +/* 802659A8 002628E8 FC 00 00 32 */ fmul f0, f0, f0 +/* 802659AC 002628EC FC 01 00 32 */ fmul f0, f1, f0 +/* 802659B0 002628F0 FC 03 00 28 */ fsub f0, f3, f0 +/* 802659B4 002628F4 FC 02 00 32 */ fmul f0, f2, f0 +/* 802659B8 002628F8 FC 21 00 32 */ fmul f1, f1, f0 +/* 802659BC 002628FC FC 20 08 18 */ frsp f1, f1 +/* 802659C0 00262900 48 00 00 88 */ b lbl_80265A48 +lbl_802659C4: +/* 802659C4 00262904 C8 02 B6 60 */ lfd f0, lbl_80455060-_SDA2_BASE_(r2) +/* 802659C8 00262908 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802659CC 0026290C 40 80 00 10 */ bge lbl_802659DC +/* 802659D0 00262910 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 802659D4 00262914 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 802659D8 00262918 48 00 00 70 */ b lbl_80265A48 +lbl_802659DC: +/* 802659DC 0026291C D0 21 00 08 */ stfs f1, 8(r1) +/* 802659E0 00262920 80 81 00 08 */ lwz r4, 8(r1) +/* 802659E4 00262924 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 802659E8 00262928 3C 00 7F 80 */ lis r0, 0x7f80 +/* 802659EC 0026292C 7C 03 00 00 */ cmpw r3, r0 +/* 802659F0 00262930 41 82 00 14 */ beq lbl_80265A04 +/* 802659F4 00262934 40 80 00 40 */ bge lbl_80265A34 +/* 802659F8 00262938 2C 03 00 00 */ cmpwi r3, 0 +/* 802659FC 0026293C 41 82 00 20 */ beq lbl_80265A1C +/* 80265A00 00262940 48 00 00 34 */ b lbl_80265A34 +lbl_80265A04: +/* 80265A04 00262944 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 80265A08 00262948 41 82 00 0C */ beq lbl_80265A14 +/* 80265A0C 0026294C 38 00 00 01 */ li r0, 1 +/* 80265A10 00262950 48 00 00 28 */ b lbl_80265A38 +lbl_80265A14: +/* 80265A14 00262954 38 00 00 02 */ li r0, 2 +/* 80265A18 00262958 48 00 00 20 */ b lbl_80265A38 +lbl_80265A1C: +/* 80265A1C 0026295C 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 80265A20 00262960 41 82 00 0C */ beq lbl_80265A2C +/* 80265A24 00262964 38 00 00 05 */ li r0, 5 +/* 80265A28 00262968 48 00 00 10 */ b lbl_80265A38 +lbl_80265A2C: +/* 80265A2C 0026296C 38 00 00 03 */ li r0, 3 +/* 80265A30 00262970 48 00 00 08 */ b lbl_80265A38 +lbl_80265A34: +/* 80265A34 00262974 38 00 00 04 */ li r0, 4 +lbl_80265A38: +/* 80265A38 00262978 2C 00 00 01 */ cmpwi r0, 1 +/* 80265A3C 0026297C 40 82 00 0C */ bne lbl_80265A48 +/* 80265A40 00262980 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 80265A44 00262984 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +lbl_80265A48: +/* 80265A48 00262988 FC 00 0A 10 */ fabs f0, f1 +/* 80265A4C 0026298C FC 00 00 18 */ frsp f0, f0 +/* 80265A50 00262990 C0 4D 8C 00 */ lfs f2, lbl_80451180-_SDA_BASE_(r13) +/* 80265A54 00262994 FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 80265A58 00262998 41 80 00 9C */ blt lbl_80265AF4 +/* 80265A5C 0026299C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 +/* 80265A60 002629A0 41 82 00 40 */ beq lbl_80265AA0 +/* 80265A64 002629A4 38 61 00 0C */ addi r3, r1, 0xc +/* 80265A68 002629A8 7C 64 1B 78 */ mr r4, r3 +/* 80265A6C 002629AC EC 3D 08 24 */ fdivs f1, f29, f1 +/* 80265A70 002629B0 48 0E 16 69 */ bl PSVECScale +/* 80265A74 002629B4 C0 02 B6 68 */ lfs f0, lbl_80455068-_SDA2_BASE_(r2) +/* 80265A78 002629B8 EF FF 00 32 */ fmuls f31, f31, f0 +/* 80265A7C 002629BC 38 61 00 0C */ addi r3, r1, 0xc +/* 80265A80 002629C0 38 81 00 24 */ addi r4, r1, 0x24 +/* 80265A84 002629C4 FC 20 F8 90 */ fmr f1, f31 +/* 80265A88 002629C8 48 0E 16 51 */ bl PSVECScale +/* 80265A8C 002629CC 38 61 00 0C */ addi r3, r1, 0xc +/* 80265A90 002629D0 38 81 00 18 */ addi r4, r1, 0x18 +/* 80265A94 002629D4 FC 20 F0 90 */ fmr f1, f30 +/* 80265A98 002629D8 48 0E 16 41 */ bl PSVECScale +/* 80265A9C 002629DC 48 00 00 A0 */ b lbl_80265B3C +lbl_80265AA0: +/* 80265AA0 002629E0 EC 3D 08 24 */ fdivs f1, f29, f1 +/* 80265AA4 002629E4 C0 01 00 0C */ lfs f0, 0xc(r1) +/* 80265AA8 002629E8 EC 60 00 72 */ fmuls f3, f0, f1 +/* 80265AAC 002629EC D0 61 00 0C */ stfs f3, 0xc(r1) +/* 80265AB0 002629F0 C0 01 00 14 */ lfs f0, 0x14(r1) +/* 80265AB4 002629F4 EC 40 00 72 */ fmuls f2, f0, f1 +/* 80265AB8 002629F8 D0 41 00 14 */ stfs f2, 0x14(r1) +/* 80265ABC 002629FC FC 00 18 50 */ fneg f0, f3 +/* 80265AC0 00262A00 EC 00 07 F2 */ fmuls f0, f0, f31 +/* 80265AC4 00262A04 D0 01 00 24 */ stfs f0, 0x24(r1) +/* 80265AC8 00262A08 C0 22 B6 38 */ lfs f1, lbl_80455038-_SDA2_BASE_(r2) +/* 80265ACC 00262A0C D0 21 00 28 */ stfs f1, 0x28(r1) +/* 80265AD0 00262A10 FC 00 10 50 */ fneg f0, f2 +/* 80265AD4 00262A14 EC 00 07 F2 */ fmuls f0, f0, f31 +/* 80265AD8 00262A18 D0 01 00 2C */ stfs f0, 0x2c(r1) +/* 80265ADC 00262A1C EC 03 07 B2 */ fmuls f0, f3, f30 +/* 80265AE0 00262A20 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 80265AE4 00262A24 D0 21 00 1C */ stfs f1, 0x1c(r1) +/* 80265AE8 00262A28 EC 02 07 B2 */ fmuls f0, f2, f30 +/* 80265AEC 00262A2C D0 01 00 20 */ stfs f0, 0x20(r1) +/* 80265AF0 00262A30 48 00 00 4C */ b lbl_80265B3C +lbl_80265AF4: +/* 80265AF4 00262A34 C0 02 B6 38 */ lfs f0, lbl_80455038-_SDA2_BASE_(r2) +/* 80265AF8 00262A38 D0 01 00 28 */ stfs f0, 0x28(r1) +/* 80265AFC 00262A3C D0 01 00 2C */ stfs f0, 0x2c(r1) +/* 80265B00 00262A40 D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 80265B04 00262A44 D0 01 00 20 */ stfs f0, 0x20(r1) +/* 80265B08 00262A48 FC 00 EA 10 */ fabs f0, f29 +/* 80265B0C 00262A4C FC 00 00 18 */ frsp f0, f0 +/* 80265B10 00262A50 FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 80265B14 00262A54 41 80 00 1C */ blt lbl_80265B30 +/* 80265B18 00262A58 FC 00 E8 50 */ fneg f0, f29 +/* 80265B1C 00262A5C EC 00 07 F2 */ fmuls f0, f0, f31 +/* 80265B20 00262A60 D0 01 00 24 */ stfs f0, 0x24(r1) +/* 80265B24 00262A64 EC 1D 07 B2 */ fmuls f0, f29, f30 +/* 80265B28 00262A68 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 80265B2C 00262A6C 48 00 00 10 */ b lbl_80265B3C +lbl_80265B30: +/* 80265B30 00262A70 FC 00 F8 50 */ fneg f0, f31 +/* 80265B34 00262A74 D0 01 00 24 */ stfs f0, 0x24(r1) +/* 80265B38 00262A78 D3 C1 00 18 */ stfs f30, 0x18(r1) +lbl_80265B3C: +/* 80265B3C 00262A7C 80 7B 00 44 */ lwz r3, 0x44(r27) +/* 80265B40 00262A80 C0 21 00 24 */ lfs f1, 0x24(r1) +/* 80265B44 00262A84 C0 41 00 28 */ lfs f2, 0x28(r1) +/* 80265B48 00262A88 C0 61 00 2C */ lfs f3, 0x2c(r1) +/* 80265B4C 00262A8C 4B FF DD E9 */ bl PlusCcMove__9cCcD_SttsFfff +/* 80265B50 00262A90 80 7D 00 44 */ lwz r3, 0x44(r29) +/* 80265B54 00262A94 C0 21 00 18 */ lfs f1, 0x18(r1) +/* 80265B58 00262A98 C0 41 00 1C */ lfs f2, 0x1c(r1) +/* 80265B5C 00262A9C C0 61 00 20 */ lfs f3, 0x20(r1) +/* 80265B60 00262AA0 4B FF DD D5 */ bl PlusCcMove__9cCcD_SttsFfff +/* 80265B64 00262AA4 7F 83 E3 78 */ mr r3, r28 +/* 80265B68 00262AA8 38 81 00 24 */ addi r4, r1, 0x24 +/* 80265B6C 00262AAC 7F 85 E3 78 */ mr r5, r28 +/* 80265B70 00262AB0 48 0E 15 21 */ bl PSVECAdd +/* 80265B74 00262AB4 7F C3 F3 78 */ mr r3, r30 +/* 80265B78 00262AB8 38 81 00 18 */ addi r4, r1, 0x18 +/* 80265B7C 00262ABC 7F C5 F3 78 */ mr r5, r30 +/* 80265B80 00262AC0 48 0E 15 11 */ bl PSVECAdd +lbl_80265B84: +/* 80265B84 00262AC4 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 +/* 80265B88 00262AC8 CB E1 00 70 */ lfd f31, 0x70(r1) +/* 80265B8C 00262ACC E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 +/* 80265B90 00262AD0 CB C1 00 60 */ lfd f30, 0x60(r1) +/* 80265B94 00262AD4 E3 A1 00 58 */ psq_l f29, 88(r1), 0, 0 +/* 80265B98 00262AD8 CB A1 00 50 */ lfd f29, 0x50(r1) +/* 80265B9C 00262ADC 39 61 00 50 */ addi r11, r1, 0x50 +/* 80265BA0 00262AE0 48 0F C6 79 */ bl _restgpr_25 +/* 80265BA4 00262AE4 80 01 00 84 */ lwz r0, 0x84(r1) +/* 80265BA8 00262AE8 7C 08 03 A6 */ mtlr r0 +/* 80265BAC 00262AEC 38 21 00 80 */ addi r1, r1, 0x80 +/* 80265BB0 00262AF0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80265BB4.s b/include/SComponent/c_cc_s/asm/func_80265BB4.s new file mode 100644 index 0000000000..7c81e22e21 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80265BB4.s @@ -0,0 +1,76 @@ +/* 80265BB4 00262AF4 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 80265BB8 00262AF8 7C 08 02 A6 */ mflr r0 +/* 80265BBC 00262AFC 90 01 00 44 */ stw r0, 0x44(r1) +/* 80265BC0 00262B00 39 61 00 40 */ addi r11, r1, 0x40 +/* 80265BC4 00262B04 48 0F C6 19 */ bl _savegpr_29 +/* 80265BC8 00262B08 7C 7F 1B 78 */ mr r31, r3 +/* 80265BCC 00262B0C 3C 60 80 3A */ lis r3, lbl_803A7218@ha +/* 80265BD0 00262B10 38 03 72 18 */ addi r0, r3, lbl_803A7218@l +/* 80265BD4 00262B14 90 01 00 20 */ stw r0, 0x20(r1) +/* 80265BD8 00262B18 38 61 00 08 */ addi r3, r1, 8 +/* 80265BDC 00262B1C 48 00 91 1D */ bl ClearForMinMax__8cM3dGAabFv +/* 80265BE0 00262B20 3B DF 14 00 */ addi r30, r31, 0x1400 +/* 80265BE4 00262B24 48 00 00 44 */ b lbl_80265C28 +lbl_80265BE8: +/* 80265BE8 00262B28 80 7E 00 00 */ lwz r3, 0(r30) +/* 80265BEC 00262B2C 28 03 00 00 */ cmplwi r3, 0 +/* 80265BF0 00262B30 41 82 00 34 */ beq lbl_80265C24 +/* 80265BF4 00262B34 81 83 00 3C */ lwz r12, 0x3c(r3) +/* 80265BF8 00262B38 81 8C 00 18 */ lwz r12, 0x18(r12) +/* 80265BFC 00262B3C 7D 89 03 A6 */ mtctr r12 +/* 80265C00 00262B40 4E 80 04 21 */ bctrl +/* 80265C04 00262B44 7C 7D 1B 78 */ mr r29, r3 +/* 80265C08 00262B48 81 83 00 1C */ lwz r12, 0x1c(r3) +/* 80265C0C 00262B4C 81 8C 00 4C */ lwz r12, 0x4c(r12) +/* 80265C10 00262B50 7D 89 03 A6 */ mtctr r12 +/* 80265C14 00262B54 4E 80 04 21 */ bctrl +/* 80265C18 00262B58 38 61 00 08 */ addi r3, r1, 8 +/* 80265C1C 00262B5C 7F A4 EB 78 */ mr r4, r29 +/* 80265C20 00262B60 48 00 91 41 */ bl SetMinMax__8cM3dGAabFRC8cM3dGAab +lbl_80265C24: +/* 80265C24 00262B64 3B DE 00 04 */ addi r30, r30, 4 +lbl_80265C28: +/* 80265C28 00262B68 A0 1F 28 06 */ lhz r0, 0x2806(r31) +/* 80265C2C 00262B6C 54 03 10 3A */ slwi r3, r0, 2 +/* 80265C30 00262B70 38 03 14 00 */ addi r0, r3, 0x1400 +/* 80265C34 00262B74 7C 1F 02 14 */ add r0, r31, r0 +/* 80265C38 00262B78 7C 1E 00 40 */ cmplw r30, r0 +/* 80265C3C 00262B7C 41 80 FF AC */ blt lbl_80265BE8 +/* 80265C40 00262B80 38 7F 28 08 */ addi r3, r31, 0x2808 +/* 80265C44 00262B84 38 81 00 08 */ addi r4, r1, 8 +/* 80265C48 00262B88 4B FF D7 61 */ bl SetArea__15cCcD_DivideAreaFRC8cM3dGAab +/* 80265C4C 00262B8C 3B BF 14 00 */ addi r29, r31, 0x1400 +/* 80265C50 00262B90 48 00 00 40 */ b lbl_80265C90 +lbl_80265C54: +/* 80265C54 00262B94 80 7D 00 00 */ lwz r3, 0(r29) +/* 80265C58 00262B98 28 03 00 00 */ cmplwi r3, 0 +/* 80265C5C 00262B9C 41 82 00 30 */ beq lbl_80265C8C +/* 80265C60 00262BA0 81 83 00 3C */ lwz r12, 0x3c(r3) +/* 80265C64 00262BA4 81 8C 00 18 */ lwz r12, 0x18(r12) +/* 80265C68 00262BA8 7D 89 03 A6 */ mtctr r12 +/* 80265C6C 00262BAC 4E 80 04 21 */ bctrl +/* 80265C70 00262BB0 7C 65 1B 78 */ mr r5, r3 +/* 80265C74 00262BB4 80 7D 00 00 */ lwz r3, 0(r29) +/* 80265C78 00262BB8 38 83 00 48 */ addi r4, r3, 0x48 +/* 80265C7C 00262BBC 80 03 00 40 */ lwz r0, 0x40(r3) +/* 80265C80 00262BC0 54 06 07 BC */ rlwinm r6, r0, 0, 0x1e, 0x1e +/* 80265C84 00262BC4 38 7F 28 08 */ addi r3, r31, 0x2808 +/* 80265C88 00262BC8 4B FF D8 4D */ bl CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl +lbl_80265C8C: +/* 80265C8C 00262BCC 3B BD 00 04 */ addi r29, r29, 4 +lbl_80265C90: +/* 80265C90 00262BD0 A0 1F 28 06 */ lhz r0, 0x2806(r31) +/* 80265C94 00262BD4 54 03 10 3A */ slwi r3, r0, 2 +/* 80265C98 00262BD8 38 03 14 00 */ addi r0, r3, 0x1400 +/* 80265C9C 00262BDC 7C 1F 02 14 */ add r0, r31, r0 +/* 80265CA0 00262BE0 7C 1D 00 40 */ cmplw r29, r0 +/* 80265CA4 00262BE4 41 80 FF B0 */ blt lbl_80265C54 +/* 80265CA8 00262BE8 3C 60 80 3A */ lis r3, lbl_803A7218@ha +/* 80265CAC 00262BEC 38 03 72 18 */ addi r0, r3, lbl_803A7218@l +/* 80265CB0 00262BF0 90 01 00 20 */ stw r0, 0x20(r1) +/* 80265CB4 00262BF4 39 61 00 40 */ addi r11, r1, 0x40 +/* 80265CB8 00262BF8 48 0F C5 71 */ bl _restgpr_29 +/* 80265CBC 00262BFC 80 01 00 44 */ lwz r0, 0x44(r1) +/* 80265CC0 00262C00 7C 08 03 A6 */ mtlr r0 +/* 80265CC4 00262C04 38 21 00 40 */ addi r1, r1, 0x40 +/* 80265CC8 00262C08 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80265CCC.s b/include/SComponent/c_cc_s/asm/func_80265CCC.s new file mode 100644 index 0000000000..c1fca8f407 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80265CCC.s @@ -0,0 +1,25 @@ +/* 80265CCC 00262C0C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80265CD0 00262C10 7C 08 02 A6 */ mflr r0 +/* 80265CD4 00262C14 90 01 00 14 */ stw r0, 0x14(r1) +/* 80265CD8 00262C18 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80265CDC 00262C1C 7C 7F 1B 78 */ mr r31, r3 +/* 80265CE0 00262C20 4B FF FE D5 */ bl CalcArea__4cCcSFv +/* 80265CE4 00262C24 7F E3 FB 78 */ mr r3, r31 +/* 80265CE8 00262C28 4B FF F2 59 */ bl ChkAtTg__4cCcSFv +/* 80265CEC 00262C2C 7F E3 FB 78 */ mr r3, r31 +/* 80265CF0 00262C30 4B FF F5 41 */ bl ChkCo__4cCcSFv +/* 80265CF4 00262C34 7F E3 FB 78 */ mr r3, r31 +/* 80265CF8 00262C38 81 9F 28 48 */ lwz r12, 0x2848(r31) +/* 80265CFC 00262C3C 81 8C 00 28 */ lwz r12, 0x28(r12) +/* 80265D00 00262C40 7D 89 03 A6 */ mtctr r12 +/* 80265D04 00262C44 4E 80 04 21 */ bctrl +/* 80265D08 00262C48 38 00 00 00 */ li r0, 0 +/* 80265D0C 00262C4C B0 1F 28 00 */ sth r0, 0x2800(r31) +/* 80265D10 00262C50 B0 1F 28 02 */ sth r0, 0x2802(r31) +/* 80265D14 00262C54 B0 1F 28 04 */ sth r0, 0x2804(r31) +/* 80265D18 00262C58 B0 1F 28 06 */ sth r0, 0x2806(r31) +/* 80265D1C 00262C5C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80265D20 00262C60 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80265D24 00262C64 7C 08 03 A6 */ mtlr r0 +/* 80265D28 00262C68 38 21 00 10 */ addi r1, r1, 0x10 +/* 80265D2C 00262C6C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_cc_s/asm/func_80265D30.s b/include/SComponent/c_cc_s/asm/func_80265D30.s new file mode 100644 index 0000000000..fbbd623f0e --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80265D30.s @@ -0,0 +1,57 @@ +/* 80265D30 00262C70 7C 65 1B 78 */ mr r5, r3 +/* 80265D34 00262C74 38 80 00 00 */ li r4, 0 +/* 80265D38 00262C78 48 00 00 0C */ b lbl_80265D44 +lbl_80265D3C: +/* 80265D3C 00262C7C 90 85 00 00 */ stw r4, 0(r5) +/* 80265D40 00262C80 38 A5 00 04 */ addi r5, r5, 4 +lbl_80265D44: +/* 80265D44 00262C84 A0 03 28 00 */ lhz r0, 0x2800(r3) +/* 80265D48 00262C88 54 00 10 3A */ slwi r0, r0, 2 +/* 80265D4C 00262C8C 7C 03 02 14 */ add r0, r3, r0 +/* 80265D50 00262C90 7C 05 00 40 */ cmplw r5, r0 +/* 80265D54 00262C94 41 80 FF E8 */ blt lbl_80265D3C +/* 80265D58 00262C98 38 A0 00 00 */ li r5, 0 +/* 80265D5C 00262C9C B0 A3 28 00 */ sth r5, 0x2800(r3) +/* 80265D60 00262CA0 38 C3 04 00 */ addi r6, r3, 0x400 +/* 80265D64 00262CA4 48 00 00 0C */ b lbl_80265D70 +lbl_80265D68: +/* 80265D68 00262CA8 90 A6 00 00 */ stw r5, 0(r6) +/* 80265D6C 00262CAC 38 C6 00 04 */ addi r6, r6, 4 +lbl_80265D70: +/* 80265D70 00262CB0 A0 03 28 02 */ lhz r0, 0x2802(r3) +/* 80265D74 00262CB4 54 04 10 3A */ slwi r4, r0, 2 +/* 80265D78 00262CB8 38 04 04 00 */ addi r0, r4, 0x400 +/* 80265D7C 00262CBC 7C 03 02 14 */ add r0, r3, r0 +/* 80265D80 00262CC0 7C 06 00 40 */ cmplw r6, r0 +/* 80265D84 00262CC4 41 80 FF E4 */ blt lbl_80265D68 +/* 80265D88 00262CC8 38 A0 00 00 */ li r5, 0 +/* 80265D8C 00262CCC B0 A3 28 02 */ sth r5, 0x2802(r3) +/* 80265D90 00262CD0 38 C3 10 00 */ addi r6, r3, 0x1000 +/* 80265D94 00262CD4 48 00 00 0C */ b lbl_80265DA0 +lbl_80265D98: +/* 80265D98 00262CD8 90 A6 00 00 */ stw r5, 0(r6) +/* 80265D9C 00262CDC 38 C6 00 04 */ addi r6, r6, 4 +lbl_80265DA0: +/* 80265DA0 00262CE0 A0 03 28 04 */ lhz r0, 0x2804(r3) +/* 80265DA4 00262CE4 54 04 10 3A */ slwi r4, r0, 2 +/* 80265DA8 00262CE8 38 04 10 00 */ addi r0, r4, 0x1000 +/* 80265DAC 00262CEC 7C 03 02 14 */ add r0, r3, r0 +/* 80265DB0 00262CF0 7C 06 00 40 */ cmplw r6, r0 +/* 80265DB4 00262CF4 41 80 FF E4 */ blt lbl_80265D98 +/* 80265DB8 00262CF8 38 A0 00 00 */ li r5, 0 +/* 80265DBC 00262CFC B0 A3 28 04 */ sth r5, 0x2804(r3) +/* 80265DC0 00262D00 38 C3 14 00 */ addi r6, r3, 0x1400 +/* 80265DC4 00262D04 48 00 00 0C */ b lbl_80265DD0 +lbl_80265DC8: +/* 80265DC8 00262D08 90 A6 00 00 */ stw r5, 0(r6) +/* 80265DCC 00262D0C 38 C6 00 04 */ addi r6, r6, 4 +lbl_80265DD0: +/* 80265DD0 00262D10 A0 03 28 06 */ lhz r0, 0x2806(r3) +/* 80265DD4 00262D14 54 04 10 3A */ slwi r4, r0, 2 +/* 80265DD8 00262D18 38 04 14 00 */ addi r0, r4, 0x1400 +/* 80265DDC 00262D1C 7C 03 02 14 */ add r0, r3, r0 +/* 80265DE0 00262D20 7C 06 00 40 */ cmplw r6, r0 +/* 80265DE4 00262D24 41 80 FF E4 */ blt lbl_80265DC8 +/* 80265DE8 00262D28 38 00 00 00 */ li r0, 0 +/* 80265DEC 00262D2C B0 03 28 06 */ sth r0, 0x2806(r3) +/* 80265DF0 00262D30 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_s/asm/func_80265DF4.s b/include/SComponent/c_cc_s/asm/func_80265DF4.s new file mode 100644 index 0000000000..7f65898e0f --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80265DF4.s @@ -0,0 +1 @@ +/* 80265DF4 00262D34 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_s/asm/func_80265DF8.s b/include/SComponent/c_cc_s/asm/func_80265DF8.s new file mode 100644 index 0000000000..2cc483ce19 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80265DF8.s @@ -0,0 +1 @@ +/* 80265DF8 00262D38 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_s/asm/func_80265DFC.s b/include/SComponent/c_cc_s/asm/func_80265DFC.s new file mode 100644 index 0000000000..3706353da9 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80265DFC.s @@ -0,0 +1 @@ +/* 80265DFC 00262D3C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_s/asm/func_80265E00.s b/include/SComponent/c_cc_s/asm/func_80265E00.s new file mode 100644 index 0000000000..18b2d32cb2 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80265E00.s @@ -0,0 +1,2 @@ +/* 80265E00 00262D40 38 60 00 00 */ li r3, 0 +/* 80265E04 00262D44 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_s/asm/func_80265E08.s b/include/SComponent/c_cc_s/asm/func_80265E08.s new file mode 100644 index 0000000000..805fda3616 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80265E08.s @@ -0,0 +1,2 @@ +/* 80265E08 00262D48 38 60 00 00 */ li r3, 0 +/* 80265E0C 00262D4C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_s/asm/func_80265E10.s b/include/SComponent/c_cc_s/asm/func_80265E10.s new file mode 100644 index 0000000000..9474f76e60 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80265E10.s @@ -0,0 +1,2 @@ +/* 80265E10 00262D50 38 60 00 00 */ li r3, 0 +/* 80265E14 00262D54 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_cc_s/asm/func_80265E18.s b/include/SComponent/c_cc_s/asm/func_80265E18.s new file mode 100644 index 0000000000..6517b94489 --- /dev/null +++ b/include/SComponent/c_cc_s/asm/func_80265E18.s @@ -0,0 +1 @@ +/* 80265E18 00262D58 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_lib.h b/include/SComponent/c_lib.h new file mode 100644 index 0000000000..8483ed4248 --- /dev/null +++ b/include/SComponent/c_lib.h @@ -0,0 +1,36 @@ +#ifndef __C_LIB_H_ +#define __C_LIB_H_ + +#include "SComponent/c_xyz.h" +#include "global.h" + +void cLib_memCpy(void*, const void*, unsigned long); +void cLib_memSet(void*, int, unsigned long); +float cLib_addCalc(float*, float, float, float, float); +void cLib_addCalc2(float*, float, float, float); +void cLib_addCalc0(float*, float, float); +float cLib_addCalcPos(cXyz*, const cXyz&, float, float, float); +float cLib_addCalcPosXZ(cXyz*, const cXyz&, float, float, float); +void cLib_addCalcPos2(cXyz*, const cXyz&, float, float); +void cLib_addCalcPosXZ2(cXyz*, const cXyz&, float, float); +short cLib_addCalcAngleS(short*, short, short, short, short); +void cLib_addCalcAngleS2(short*, short, short, short); +int cLib_chaseUC(unsigned char*, unsigned char, unsigned char); +int cLib_chaseS(short*, short, short); +int cLib_chaseF(float*, float, float); +int cLib_chasePos(cXyz*, const cXyz&, float); +int cLib_chasePosXZ(cXyz*, const cXyz&, float); +int cLib_chaseAngleS(short*, short, short); +short cLib_targetAngleY(const Vec*, const Vec*); +short cLib_targetAngleY(const Vec&, const Vec&); +short cLib_targetAngleX(const cXyz*, const cXyz*); +void cLib_offsetPos(cXyz*, const cXyz*, short, const cXyz*); +short cLib_distanceAngleS(short, short); +void MtxInit(void); +void MtxTrans(float, float, float, unsigned char); +void MtxScale(float, float, float, unsigned char); +void MtxPosition(cXyz*, cXyz*); +void MtxPush(void); +Mtx* MtxPull(void); + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_lib/asm/func_8026F93C.s b/include/SComponent/c_lib/asm/func_8026F93C.s new file mode 100644 index 0000000000..639baee8c6 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_8026F93C.s @@ -0,0 +1,8 @@ +/* 8026F93C 0026C87C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F940 0026C880 7C 08 02 A6 */ mflr r0 +/* 8026F944 0026C884 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F948 0026C888 4B D9 3B F9 */ bl memcpy +/* 8026F94C 0026C88C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F950 0026C890 7C 08 03 A6 */ mtlr r0 +/* 8026F954 0026C894 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F958 0026C898 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_8026F95C.s b/include/SComponent/c_lib/asm/func_8026F95C.s new file mode 100644 index 0000000000..09217b621f --- /dev/null +++ b/include/SComponent/c_lib/asm/func_8026F95C.s @@ -0,0 +1,8 @@ +/* 8026F95C 0026C89C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F960 0026C8A0 7C 08 02 A6 */ mflr r0 +/* 8026F964 0026C8A4 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F968 0026C8A8 4B D9 3A F1 */ bl func_80003458 +/* 8026F96C 0026C8AC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F970 0026C8B0 7C 08 03 A6 */ mtlr r0 +/* 8026F974 0026C8B4 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F978 0026C8B8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_8026F97C.s b/include/SComponent/c_lib/asm/func_8026F97C.s new file mode 100644 index 0000000000..4fefc91a43 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_8026F97C.s @@ -0,0 +1,54 @@ +/* 8026F97C 0026C8BC C0 A3 00 00 */ lfs f5, 0(r3) +/* 8026F980 0026C8C0 FC 05 08 00 */ fcmpu cr0, f5, f1 +/* 8026F984 0026C8C4 41 82 00 A4 */ beq lbl_8026FA28 +/* 8026F988 0026C8C8 EC 01 28 28 */ fsubs f0, f1, f5 +/* 8026F98C 0026C8CC EC C2 00 32 */ fmuls f6, f2, f0 +/* 8026F990 0026C8D0 FC 06 20 40 */ fcmpo cr0, f6, f4 +/* 8026F994 0026C8D4 4C 41 13 82 */ cror 2, 1, 2 +/* 8026F998 0026C8D8 41 82 00 14 */ beq lbl_8026F9AC +/* 8026F99C 0026C8DC FC 40 20 50 */ fneg f2, f4 +/* 8026F9A0 0026C8E0 FC 06 10 40 */ fcmpo cr0, f6, f2 +/* 8026F9A4 0026C8E4 4C 40 13 82 */ cror 2, 0, 2 +/* 8026F9A8 0026C8E8 40 82 00 30 */ bne lbl_8026F9D8 +lbl_8026F9AC: +/* 8026F9AC 0026C8EC FC 06 18 40 */ fcmpo cr0, f6, f3 +/* 8026F9B0 0026C8F0 40 81 00 08 */ ble lbl_8026F9B8 +/* 8026F9B4 0026C8F4 FC C0 18 90 */ fmr f6, f3 +lbl_8026F9B8: +/* 8026F9B8 0026C8F8 FC 00 18 50 */ fneg f0, f3 +/* 8026F9BC 0026C8FC FC 06 00 40 */ fcmpo cr0, f6, f0 +/* 8026F9C0 0026C900 40 80 00 08 */ bge lbl_8026F9C8 +/* 8026F9C4 0026C904 FC C0 00 90 */ fmr f6, f0 +lbl_8026F9C8: +/* 8026F9C8 0026C908 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026F9CC 0026C90C EC 00 30 2A */ fadds f0, f0, f6 +/* 8026F9D0 0026C910 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026F9D4 0026C914 48 00 00 54 */ b lbl_8026FA28 +lbl_8026F9D8: +/* 8026F9D8 0026C918 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 8026F9DC 0026C91C FC 06 00 40 */ fcmpo cr0, f6, f0 +/* 8026F9E0 0026C920 40 81 00 28 */ ble lbl_8026FA08 +/* 8026F9E4 0026C924 FC 06 20 40 */ fcmpo cr0, f6, f4 +/* 8026F9E8 0026C928 40 80 00 40 */ bge lbl_8026FA28 +/* 8026F9EC 0026C92C EC 05 20 2A */ fadds f0, f5, f4 +/* 8026F9F0 0026C930 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026F9F4 0026C934 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026F9F8 0026C938 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026F9FC 0026C93C 40 81 00 2C */ ble lbl_8026FA28 +/* 8026FA00 0026C940 D0 23 00 00 */ stfs f1, 0(r3) +/* 8026FA04 0026C944 48 00 00 24 */ b lbl_8026FA28 +lbl_8026FA08: +/* 8026FA08 0026C948 FC 06 10 40 */ fcmpo cr0, f6, f2 +/* 8026FA0C 0026C94C 40 81 00 1C */ ble lbl_8026FA28 +/* 8026FA10 0026C950 EC 05 10 2A */ fadds f0, f5, f2 +/* 8026FA14 0026C954 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026FA18 0026C958 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026FA1C 0026C95C FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026FA20 0026C960 40 80 00 08 */ bge lbl_8026FA28 +/* 8026FA24 0026C964 D0 23 00 00 */ stfs f1, 0(r3) +lbl_8026FA28: +/* 8026FA28 0026C968 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026FA2C 0026C96C EC 01 00 28 */ fsubs f0, f1, f0 +/* 8026FA30 0026C970 FC 00 02 10 */ fabs f0, f0 +/* 8026FA34 0026C974 FC 20 00 18 */ frsp f1, f0 +/* 8026FA38 0026C978 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_8026FA3C.s b/include/SComponent/c_lib/asm/func_8026FA3C.s new file mode 100644 index 0000000000..9c0c1bf70b --- /dev/null +++ b/include/SComponent/c_lib/asm/func_8026FA3C.s @@ -0,0 +1,19 @@ +/* 8026FA3C 0026C97C C0 03 00 00 */ lfs f0, 0(r3) +/* 8026FA40 0026C980 FC 00 08 00 */ fcmpu cr0, f0, f1 +/* 8026FA44 0026C984 4D 82 00 20 */ beqlr +/* 8026FA48 0026C988 EC 01 00 28 */ fsubs f0, f1, f0 +/* 8026FA4C 0026C98C EC 22 00 32 */ fmuls f1, f2, f0 +/* 8026FA50 0026C990 FC 01 18 40 */ fcmpo cr0, f1, f3 +/* 8026FA54 0026C994 40 81 00 0C */ ble lbl_8026FA60 +/* 8026FA58 0026C998 FC 20 18 90 */ fmr f1, f3 +/* 8026FA5C 0026C99C 48 00 00 14 */ b lbl_8026FA70 +lbl_8026FA60: +/* 8026FA60 0026C9A0 FC 00 18 50 */ fneg f0, f3 +/* 8026FA64 0026C9A4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026FA68 0026C9A8 40 80 00 08 */ bge lbl_8026FA70 +/* 8026FA6C 0026C9AC FC 20 00 90 */ fmr f1, f0 +lbl_8026FA70: +/* 8026FA70 0026C9B0 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026FA74 0026C9B4 EC 00 08 2A */ fadds f0, f0, f1 +/* 8026FA78 0026C9B8 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026FA7C 0026C9BC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_8026FA80.s b/include/SComponent/c_lib/asm/func_8026FA80.s new file mode 100644 index 0000000000..dfc26d3ee1 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_8026FA80.s @@ -0,0 +1,16 @@ +/* 8026FA80 0026C9C0 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026FA84 0026C9C4 EC 20 00 72 */ fmuls f1, f0, f1 +/* 8026FA88 0026C9C8 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026FA8C 0026C9CC 40 81 00 0C */ ble lbl_8026FA98 +/* 8026FA90 0026C9D0 FC 20 10 90 */ fmr f1, f2 +/* 8026FA94 0026C9D4 48 00 00 14 */ b lbl_8026FAA8 +lbl_8026FA98: +/* 8026FA98 0026C9D8 FC 00 10 50 */ fneg f0, f2 +/* 8026FA9C 0026C9DC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026FAA0 0026C9E0 40 80 00 08 */ bge lbl_8026FAA8 +/* 8026FAA4 0026C9E4 FC 20 00 90 */ fmr f1, f0 +lbl_8026FAA8: +/* 8026FAA8 0026C9E8 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026FAAC 0026C9EC EC 00 08 28 */ fsubs f0, f0, f1 +/* 8026FAB0 0026C9F0 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026FAB4 0026C9F4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_8026FAB8.s b/include/SComponent/c_lib/asm/func_8026FAB8.s new file mode 100644 index 0000000000..d7c4abf6cc --- /dev/null +++ b/include/SComponent/c_lib/asm/func_8026FAB8.s @@ -0,0 +1,230 @@ +/* 8026FAB8 0026C9F8 94 21 FF 90 */ stwu r1, -0x70(r1) +/* 8026FABC 0026C9FC 7C 08 02 A6 */ mflr r0 +/* 8026FAC0 0026CA00 90 01 00 74 */ stw r0, 0x74(r1) +/* 8026FAC4 0026CA04 DB E1 00 60 */ stfd f31, 0x60(r1) +/* 8026FAC8 0026CA08 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 +/* 8026FACC 0026CA0C DB C1 00 50 */ stfd f30, 0x50(r1) +/* 8026FAD0 0026CA10 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 +/* 8026FAD4 0026CA14 DB A1 00 40 */ stfd f29, 0x40(r1) +/* 8026FAD8 0026CA18 F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0 +/* 8026FADC 0026CA1C DB 81 00 30 */ stfd f28, 0x30(r1) +/* 8026FAE0 0026CA20 F3 81 00 38 */ psq_st f28, 56(r1), 0, 0 +/* 8026FAE4 0026CA24 93 E1 00 2C */ stw r31, 0x2c(r1) +/* 8026FAE8 0026CA28 93 C1 00 28 */ stw r30, 0x28(r1) +/* 8026FAEC 0026CA2C 7C 7E 1B 78 */ mr r30, r3 +/* 8026FAF0 0026CA30 7C 9F 23 78 */ mr r31, r4 +/* 8026FAF4 0026CA34 FF A0 08 90 */ fmr f29, f1 +/* 8026FAF8 0026CA38 FF C0 10 90 */ fmr f30, f2 +/* 8026FAFC 0026CA3C FF E0 18 90 */ fmr f31, f3 +/* 8026FB00 0026CA40 4B FF 75 6D */ bl __ne__4cXyzCFRC3Vec +/* 8026FB04 0026CA44 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026FB08 0026CA48 41 82 01 C4 */ beq lbl_8026FCCC +/* 8026FB0C 0026CA4C 38 61 00 10 */ addi r3, r1, 0x10 +/* 8026FB10 0026CA50 7F C4 F3 78 */ mr r4, r30 +/* 8026FB14 0026CA54 7F E5 FB 78 */ mr r5, r31 +/* 8026FB18 0026CA58 4B FF 70 1D */ bl __mi__4cXyzCFRC3Vec +/* 8026FB1C 0026CA5C C0 01 00 10 */ lfs f0, 0x10(r1) +/* 8026FB20 0026CA60 D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 8026FB24 0026CA64 C0 01 00 14 */ lfs f0, 0x14(r1) +/* 8026FB28 0026CA68 D0 01 00 20 */ stfs f0, 0x20(r1) +/* 8026FB2C 0026CA6C C0 01 00 18 */ lfs f0, 0x18(r1) +/* 8026FB30 0026CA70 D0 01 00 24 */ stfs f0, 0x24(r1) +/* 8026FB34 0026CA74 38 61 00 1C */ addi r3, r1, 0x1c +/* 8026FB38 0026CA78 48 0D 76 01 */ bl PSVECSquareMag +/* 8026FB3C 0026CA7C C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 8026FB40 0026CA80 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026FB44 0026CA84 40 81 00 58 */ ble lbl_8026FB9C +/* 8026FB48 0026CA88 FC 00 08 34 */ frsqrte f0, f1 +/* 8026FB4C 0026CA8C C8 82 B7 E8 */ lfd f4, lbl_804551E8-_SDA2_BASE_(r2) +/* 8026FB50 0026CA90 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026FB54 0026CA94 C8 62 B7 F0 */ lfd f3, lbl_804551F0-_SDA2_BASE_(r2) +/* 8026FB58 0026CA98 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026FB5C 0026CA9C FC 01 00 32 */ fmul f0, f1, f0 +/* 8026FB60 0026CAA0 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026FB64 0026CAA4 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026FB68 0026CAA8 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026FB6C 0026CAAC FC 00 00 32 */ fmul f0, f0, f0 +/* 8026FB70 0026CAB0 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026FB74 0026CAB4 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026FB78 0026CAB8 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026FB7C 0026CABC FC 44 00 32 */ fmul f2, f4, f0 +/* 8026FB80 0026CAC0 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026FB84 0026CAC4 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026FB88 0026CAC8 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026FB8C 0026CACC FC 02 00 32 */ fmul f0, f2, f0 +/* 8026FB90 0026CAD0 FC 21 00 32 */ fmul f1, f1, f0 +/* 8026FB94 0026CAD4 FC 20 08 18 */ frsp f1, f1 +/* 8026FB98 0026CAD8 48 00 00 88 */ b lbl_8026FC20 +lbl_8026FB9C: +/* 8026FB9C 0026CADC C8 02 B7 F8 */ lfd f0, lbl_804551F8-_SDA2_BASE_(r2) +/* 8026FBA0 0026CAE0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026FBA4 0026CAE4 40 80 00 10 */ bge lbl_8026FBB4 +/* 8026FBA8 0026CAE8 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026FBAC 0026CAEC C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 8026FBB0 0026CAF0 48 00 00 70 */ b lbl_8026FC20 +lbl_8026FBB4: +/* 8026FBB4 0026CAF4 D0 21 00 0C */ stfs f1, 0xc(r1) +/* 8026FBB8 0026CAF8 80 81 00 0C */ lwz r4, 0xc(r1) +/* 8026FBBC 0026CAFC 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8026FBC0 0026CB00 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026FBC4 0026CB04 7C 03 00 00 */ cmpw r3, r0 +/* 8026FBC8 0026CB08 41 82 00 14 */ beq lbl_8026FBDC +/* 8026FBCC 0026CB0C 40 80 00 40 */ bge lbl_8026FC0C +/* 8026FBD0 0026CB10 2C 03 00 00 */ cmpwi r3, 0 +/* 8026FBD4 0026CB14 41 82 00 20 */ beq lbl_8026FBF4 +/* 8026FBD8 0026CB18 48 00 00 34 */ b lbl_8026FC0C +lbl_8026FBDC: +/* 8026FBDC 0026CB1C 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026FBE0 0026CB20 41 82 00 0C */ beq lbl_8026FBEC +/* 8026FBE4 0026CB24 38 00 00 01 */ li r0, 1 +/* 8026FBE8 0026CB28 48 00 00 28 */ b lbl_8026FC10 +lbl_8026FBEC: +/* 8026FBEC 0026CB2C 38 00 00 02 */ li r0, 2 +/* 8026FBF0 0026CB30 48 00 00 20 */ b lbl_8026FC10 +lbl_8026FBF4: +/* 8026FBF4 0026CB34 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026FBF8 0026CB38 41 82 00 0C */ beq lbl_8026FC04 +/* 8026FBFC 0026CB3C 38 00 00 05 */ li r0, 5 +/* 8026FC00 0026CB40 48 00 00 10 */ b lbl_8026FC10 +lbl_8026FC04: +/* 8026FC04 0026CB44 38 00 00 03 */ li r0, 3 +/* 8026FC08 0026CB48 48 00 00 08 */ b lbl_8026FC10 +lbl_8026FC0C: +/* 8026FC0C 0026CB4C 38 00 00 04 */ li r0, 4 +lbl_8026FC10: +/* 8026FC10 0026CB50 2C 00 00 01 */ cmpwi r0, 1 +/* 8026FC14 0026CB54 40 82 00 0C */ bne lbl_8026FC20 +/* 8026FC18 0026CB58 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026FC1C 0026CB5C C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +lbl_8026FC20: +/* 8026FC20 0026CB60 FC 01 F8 40 */ fcmpo cr0, f1, f31 +/* 8026FC24 0026CB64 40 80 00 20 */ bge lbl_8026FC44 +/* 8026FC28 0026CB68 C0 1F 00 00 */ lfs f0, 0(r31) +/* 8026FC2C 0026CB6C D0 1E 00 00 */ stfs f0, 0(r30) +/* 8026FC30 0026CB70 C0 1F 00 04 */ lfs f0, 4(r31) +/* 8026FC34 0026CB74 D0 1E 00 04 */ stfs f0, 4(r30) +/* 8026FC38 0026CB78 C0 1F 00 08 */ lfs f0, 8(r31) +/* 8026FC3C 0026CB7C D0 1E 00 08 */ stfs f0, 8(r30) +/* 8026FC40 0026CB80 48 00 00 8C */ b lbl_8026FCCC +lbl_8026FC44: +/* 8026FC44 0026CB84 EF 81 07 72 */ fmuls f28, f1, f29 +/* 8026FC48 0026CB88 38 61 00 1C */ addi r3, r1, 0x1c +/* 8026FC4C 0026CB8C 7C 64 1B 78 */ mr r4, r3 +/* 8026FC50 0026CB90 FC 20 E8 90 */ fmr f1, f29 +/* 8026FC54 0026CB94 48 0D 74 85 */ bl PSVECScale +/* 8026FC58 0026CB98 FC 00 E2 10 */ fabs f0, f28 +/* 8026FC5C 0026CB9C FC 20 00 18 */ frsp f1, f0 +/* 8026FC60 0026CBA0 C0 02 B8 00 */ lfs f0, lbl_80455200-_SDA2_BASE_(r2) +/* 8026FC64 0026CBA4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026FC68 0026CBA8 41 80 00 4C */ blt lbl_8026FCB4 +/* 8026FC6C 0026CBAC FC 1C F0 40 */ fcmpo cr0, f28, f30 +/* 8026FC70 0026CBB0 40 81 00 18 */ ble lbl_8026FC88 +/* 8026FC74 0026CBB4 38 61 00 1C */ addi r3, r1, 0x1c +/* 8026FC78 0026CBB8 7C 64 1B 78 */ mr r4, r3 +/* 8026FC7C 0026CBBC EC 3E E0 24 */ fdivs f1, f30, f28 +/* 8026FC80 0026CBC0 48 0D 74 59 */ bl PSVECScale +/* 8026FC84 0026CBC4 48 00 00 1C */ b lbl_8026FCA0 +lbl_8026FC88: +/* 8026FC88 0026CBC8 FC 1C F8 40 */ fcmpo cr0, f28, f31 +/* 8026FC8C 0026CBCC 40 80 00 14 */ bge lbl_8026FCA0 +/* 8026FC90 0026CBD0 38 61 00 1C */ addi r3, r1, 0x1c +/* 8026FC94 0026CBD4 7C 64 1B 78 */ mr r4, r3 +/* 8026FC98 0026CBD8 EC 3F E0 24 */ fdivs f1, f31, f28 +/* 8026FC9C 0026CBDC 48 0D 74 3D */ bl PSVECScale +lbl_8026FCA0: +/* 8026FCA0 0026CBE0 7F C3 F3 78 */ mr r3, r30 +/* 8026FCA4 0026CBE4 38 81 00 1C */ addi r4, r1, 0x1c +/* 8026FCA8 0026CBE8 7F C5 F3 78 */ mr r5, r30 +/* 8026FCAC 0026CBEC 48 0D 74 09 */ bl PSVECSubtract +/* 8026FCB0 0026CBF0 48 00 00 1C */ b lbl_8026FCCC +lbl_8026FCB4: +/* 8026FCB4 0026CBF4 C0 1F 00 00 */ lfs f0, 0(r31) +/* 8026FCB8 0026CBF8 D0 1E 00 00 */ stfs f0, 0(r30) +/* 8026FCBC 0026CBFC C0 1F 00 04 */ lfs f0, 4(r31) +/* 8026FCC0 0026CC00 D0 1E 00 04 */ stfs f0, 4(r30) +/* 8026FCC4 0026CC04 C0 1F 00 08 */ lfs f0, 8(r31) +/* 8026FCC8 0026CC08 D0 1E 00 08 */ stfs f0, 8(r30) +lbl_8026FCCC: +/* 8026FCCC 0026CC0C 7F C3 F3 78 */ mr r3, r30 +/* 8026FCD0 0026CC10 7F E4 FB 78 */ mr r4, r31 +/* 8026FCD4 0026CC14 48 0D 76 C9 */ bl PSVECSquareDistance +/* 8026FCD8 0026CC18 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 8026FCDC 0026CC1C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026FCE0 0026CC20 40 81 00 58 */ ble lbl_8026FD38 +/* 8026FCE4 0026CC24 FC 00 08 34 */ frsqrte f0, f1 +/* 8026FCE8 0026CC28 C8 82 B7 E8 */ lfd f4, lbl_804551E8-_SDA2_BASE_(r2) +/* 8026FCEC 0026CC2C FC 44 00 32 */ fmul f2, f4, f0 +/* 8026FCF0 0026CC30 C8 62 B7 F0 */ lfd f3, lbl_804551F0-_SDA2_BASE_(r2) +/* 8026FCF4 0026CC34 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026FCF8 0026CC38 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026FCFC 0026CC3C FC 03 00 28 */ fsub f0, f3, f0 +/* 8026FD00 0026CC40 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026FD04 0026CC44 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026FD08 0026CC48 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026FD0C 0026CC4C FC 01 00 32 */ fmul f0, f1, f0 +/* 8026FD10 0026CC50 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026FD14 0026CC54 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026FD18 0026CC58 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026FD1C 0026CC5C FC 00 00 32 */ fmul f0, f0, f0 +/* 8026FD20 0026CC60 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026FD24 0026CC64 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026FD28 0026CC68 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026FD2C 0026CC6C FC 21 00 32 */ fmul f1, f1, f0 +/* 8026FD30 0026CC70 FC 20 08 18 */ frsp f1, f1 +/* 8026FD34 0026CC74 48 00 00 88 */ b lbl_8026FDBC +lbl_8026FD38: +/* 8026FD38 0026CC78 C8 02 B7 F8 */ lfd f0, lbl_804551F8-_SDA2_BASE_(r2) +/* 8026FD3C 0026CC7C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026FD40 0026CC80 40 80 00 10 */ bge lbl_8026FD50 +/* 8026FD44 0026CC84 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026FD48 0026CC88 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 8026FD4C 0026CC8C 48 00 00 70 */ b lbl_8026FDBC +lbl_8026FD50: +/* 8026FD50 0026CC90 D0 21 00 08 */ stfs f1, 8(r1) +/* 8026FD54 0026CC94 80 81 00 08 */ lwz r4, 8(r1) +/* 8026FD58 0026CC98 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8026FD5C 0026CC9C 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026FD60 0026CCA0 7C 03 00 00 */ cmpw r3, r0 +/* 8026FD64 0026CCA4 41 82 00 14 */ beq lbl_8026FD78 +/* 8026FD68 0026CCA8 40 80 00 40 */ bge lbl_8026FDA8 +/* 8026FD6C 0026CCAC 2C 03 00 00 */ cmpwi r3, 0 +/* 8026FD70 0026CCB0 41 82 00 20 */ beq lbl_8026FD90 +/* 8026FD74 0026CCB4 48 00 00 34 */ b lbl_8026FDA8 +lbl_8026FD78: +/* 8026FD78 0026CCB8 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026FD7C 0026CCBC 41 82 00 0C */ beq lbl_8026FD88 +/* 8026FD80 0026CCC0 38 00 00 01 */ li r0, 1 +/* 8026FD84 0026CCC4 48 00 00 28 */ b lbl_8026FDAC +lbl_8026FD88: +/* 8026FD88 0026CCC8 38 00 00 02 */ li r0, 2 +/* 8026FD8C 0026CCCC 48 00 00 20 */ b lbl_8026FDAC +lbl_8026FD90: +/* 8026FD90 0026CCD0 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026FD94 0026CCD4 41 82 00 0C */ beq lbl_8026FDA0 +/* 8026FD98 0026CCD8 38 00 00 05 */ li r0, 5 +/* 8026FD9C 0026CCDC 48 00 00 10 */ b lbl_8026FDAC +lbl_8026FDA0: +/* 8026FDA0 0026CCE0 38 00 00 03 */ li r0, 3 +/* 8026FDA4 0026CCE4 48 00 00 08 */ b lbl_8026FDAC +lbl_8026FDA8: +/* 8026FDA8 0026CCE8 38 00 00 04 */ li r0, 4 +lbl_8026FDAC: +/* 8026FDAC 0026CCEC 2C 00 00 01 */ cmpwi r0, 1 +/* 8026FDB0 0026CCF0 40 82 00 0C */ bne lbl_8026FDBC +/* 8026FDB4 0026CCF4 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026FDB8 0026CCF8 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +lbl_8026FDBC: +/* 8026FDBC 0026CCFC E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 +/* 8026FDC0 0026CD00 CB E1 00 60 */ lfd f31, 0x60(r1) +/* 8026FDC4 0026CD04 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 +/* 8026FDC8 0026CD08 CB C1 00 50 */ lfd f30, 0x50(r1) +/* 8026FDCC 0026CD0C E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0 +/* 8026FDD0 0026CD10 CB A1 00 40 */ lfd f29, 0x40(r1) +/* 8026FDD4 0026CD14 E3 81 00 38 */ psq_l f28, 56(r1), 0, 0 +/* 8026FDD8 0026CD18 CB 81 00 30 */ lfd f28, 0x30(r1) +/* 8026FDDC 0026CD1C 83 E1 00 2C */ lwz r31, 0x2c(r1) +/* 8026FDE0 0026CD20 83 C1 00 28 */ lwz r30, 0x28(r1) +/* 8026FDE4 0026CD24 80 01 00 74 */ lwz r0, 0x74(r1) +/* 8026FDE8 0026CD28 7C 08 03 A6 */ mtlr r0 +/* 8026FDEC 0026CD2C 38 21 00 70 */ addi r1, r1, 0x70 +/* 8026FDF0 0026CD30 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_8026FDF4.s b/include/SComponent/c_lib/asm/func_8026FDF4.s new file mode 100644 index 0000000000..903b538061 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_8026FDF4.s @@ -0,0 +1,249 @@ +/* 8026FDF4 0026CD34 94 21 FF 60 */ stwu r1, -0xa0(r1) +/* 8026FDF8 0026CD38 7C 08 02 A6 */ mflr r0 +/* 8026FDFC 0026CD3C 90 01 00 A4 */ stw r0, 0xa4(r1) +/* 8026FE00 0026CD40 DB E1 00 90 */ stfd f31, 0x90(r1) +/* 8026FE04 0026CD44 F3 E1 00 98 */ psq_st f31, 152(r1), 0, 0 +/* 8026FE08 0026CD48 DB C1 00 80 */ stfd f30, 0x80(r1) +/* 8026FE0C 0026CD4C F3 C1 00 88 */ psq_st f30, 136(r1), 0, 0 +/* 8026FE10 0026CD50 DB A1 00 70 */ stfd f29, 0x70(r1) +/* 8026FE14 0026CD54 F3 A1 00 78 */ psq_st f29, 120(r1), 0, 0 +/* 8026FE18 0026CD58 DB 81 00 60 */ stfd f28, 0x60(r1) +/* 8026FE1C 0026CD5C F3 81 00 68 */ psq_st f28, 104(r1), 0, 0 +/* 8026FE20 0026CD60 93 E1 00 5C */ stw r31, 0x5c(r1) +/* 8026FE24 0026CD64 93 C1 00 58 */ stw r30, 0x58(r1) +/* 8026FE28 0026CD68 7C 7E 1B 78 */ mr r30, r3 +/* 8026FE2C 0026CD6C 7C 9F 23 78 */ mr r31, r4 +/* 8026FE30 0026CD70 FF A0 08 90 */ fmr f29, f1 +/* 8026FE34 0026CD74 FF C0 10 90 */ fmr f30, f2 +/* 8026FE38 0026CD78 FF E0 18 90 */ fmr f31, f3 +/* 8026FE3C 0026CD7C C0 23 00 00 */ lfs f1, 0(r3) +/* 8026FE40 0026CD80 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026FE44 0026CD84 FC 01 00 00 */ fcmpu cr0, f1, f0 +/* 8026FE48 0026CD88 40 82 00 14 */ bne lbl_8026FE5C +/* 8026FE4C 0026CD8C C0 3E 00 08 */ lfs f1, 8(r30) +/* 8026FE50 0026CD90 C0 1F 00 08 */ lfs f0, 8(r31) +/* 8026FE54 0026CD94 FC 01 00 00 */ fcmpu cr0, f1, f0 +/* 8026FE58 0026CD98 41 82 01 D4 */ beq lbl_8027002C +lbl_8026FE5C: +/* 8026FE5C 0026CD9C 38 61 00 34 */ addi r3, r1, 0x34 +/* 8026FE60 0026CDA0 7F C4 F3 78 */ mr r4, r30 +/* 8026FE64 0026CDA4 7F E5 FB 78 */ mr r5, r31 +/* 8026FE68 0026CDA8 4B FF 6C CD */ bl __mi__4cXyzCFRC3Vec +/* 8026FE6C 0026CDAC C0 41 00 34 */ lfs f2, 0x34(r1) +/* 8026FE70 0026CDB0 D0 41 00 40 */ stfs f2, 0x40(r1) +/* 8026FE74 0026CDB4 C0 01 00 38 */ lfs f0, 0x38(r1) +/* 8026FE78 0026CDB8 D0 01 00 44 */ stfs f0, 0x44(r1) +/* 8026FE7C 0026CDBC C0 21 00 3C */ lfs f1, 0x3c(r1) +/* 8026FE80 0026CDC0 D0 21 00 48 */ stfs f1, 0x48(r1) +/* 8026FE84 0026CDC4 D0 41 00 1C */ stfs f2, 0x1c(r1) +/* 8026FE88 0026CDC8 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 8026FE8C 0026CDCC D0 01 00 20 */ stfs f0, 0x20(r1) +/* 8026FE90 0026CDD0 D0 21 00 24 */ stfs f1, 0x24(r1) +/* 8026FE94 0026CDD4 38 61 00 1C */ addi r3, r1, 0x1c +/* 8026FE98 0026CDD8 48 0D 72 A1 */ bl PSVECSquareMag +/* 8026FE9C 0026CDDC C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 8026FEA0 0026CDE0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026FEA4 0026CDE4 40 81 00 58 */ ble lbl_8026FEFC +/* 8026FEA8 0026CDE8 FC 00 08 34 */ frsqrte f0, f1 +/* 8026FEAC 0026CDEC C8 82 B7 E8 */ lfd f4, lbl_804551E8-_SDA2_BASE_(r2) +/* 8026FEB0 0026CDF0 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026FEB4 0026CDF4 C8 62 B7 F0 */ lfd f3, lbl_804551F0-_SDA2_BASE_(r2) +/* 8026FEB8 0026CDF8 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026FEBC 0026CDFC FC 01 00 32 */ fmul f0, f1, f0 +/* 8026FEC0 0026CE00 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026FEC4 0026CE04 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026FEC8 0026CE08 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026FECC 0026CE0C FC 00 00 32 */ fmul f0, f0, f0 +/* 8026FED0 0026CE10 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026FED4 0026CE14 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026FED8 0026CE18 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026FEDC 0026CE1C FC 44 00 32 */ fmul f2, f4, f0 +/* 8026FEE0 0026CE20 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026FEE4 0026CE24 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026FEE8 0026CE28 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026FEEC 0026CE2C FC 02 00 32 */ fmul f0, f2, f0 +/* 8026FEF0 0026CE30 FC 21 00 32 */ fmul f1, f1, f0 +/* 8026FEF4 0026CE34 FC 20 08 18 */ frsp f1, f1 +/* 8026FEF8 0026CE38 48 00 00 88 */ b lbl_8026FF80 +lbl_8026FEFC: +/* 8026FEFC 0026CE3C C8 02 B7 F8 */ lfd f0, lbl_804551F8-_SDA2_BASE_(r2) +/* 8026FF00 0026CE40 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026FF04 0026CE44 40 80 00 10 */ bge lbl_8026FF14 +/* 8026FF08 0026CE48 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026FF0C 0026CE4C C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 8026FF10 0026CE50 48 00 00 70 */ b lbl_8026FF80 +lbl_8026FF14: +/* 8026FF14 0026CE54 D0 21 00 0C */ stfs f1, 0xc(r1) +/* 8026FF18 0026CE58 80 81 00 0C */ lwz r4, 0xc(r1) +/* 8026FF1C 0026CE5C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8026FF20 0026CE60 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026FF24 0026CE64 7C 03 00 00 */ cmpw r3, r0 +/* 8026FF28 0026CE68 41 82 00 14 */ beq lbl_8026FF3C +/* 8026FF2C 0026CE6C 40 80 00 40 */ bge lbl_8026FF6C +/* 8026FF30 0026CE70 2C 03 00 00 */ cmpwi r3, 0 +/* 8026FF34 0026CE74 41 82 00 20 */ beq lbl_8026FF54 +/* 8026FF38 0026CE78 48 00 00 34 */ b lbl_8026FF6C +lbl_8026FF3C: +/* 8026FF3C 0026CE7C 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026FF40 0026CE80 41 82 00 0C */ beq lbl_8026FF4C +/* 8026FF44 0026CE84 38 00 00 01 */ li r0, 1 +/* 8026FF48 0026CE88 48 00 00 28 */ b lbl_8026FF70 +lbl_8026FF4C: +/* 8026FF4C 0026CE8C 38 00 00 02 */ li r0, 2 +/* 8026FF50 0026CE90 48 00 00 20 */ b lbl_8026FF70 +lbl_8026FF54: +/* 8026FF54 0026CE94 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026FF58 0026CE98 41 82 00 0C */ beq lbl_8026FF64 +/* 8026FF5C 0026CE9C 38 00 00 05 */ li r0, 5 +/* 8026FF60 0026CEA0 48 00 00 10 */ b lbl_8026FF70 +lbl_8026FF64: +/* 8026FF64 0026CEA4 38 00 00 03 */ li r0, 3 +/* 8026FF68 0026CEA8 48 00 00 08 */ b lbl_8026FF70 +lbl_8026FF6C: +/* 8026FF6C 0026CEAC 38 00 00 04 */ li r0, 4 +lbl_8026FF70: +/* 8026FF70 0026CEB0 2C 00 00 01 */ cmpwi r0, 1 +/* 8026FF74 0026CEB4 40 82 00 0C */ bne lbl_8026FF80 +/* 8026FF78 0026CEB8 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026FF7C 0026CEBC C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +lbl_8026FF80: +/* 8026FF80 0026CEC0 FC 01 F8 40 */ fcmpo cr0, f1, f31 +/* 8026FF84 0026CEC4 40 80 00 18 */ bge lbl_8026FF9C +/* 8026FF88 0026CEC8 C0 1F 00 00 */ lfs f0, 0(r31) +/* 8026FF8C 0026CECC D0 1E 00 00 */ stfs f0, 0(r30) +/* 8026FF90 0026CED0 C0 1F 00 08 */ lfs f0, 8(r31) +/* 8026FF94 0026CED4 D0 1E 00 08 */ stfs f0, 8(r30) +/* 8026FF98 0026CED8 48 00 00 94 */ b lbl_8027002C +lbl_8026FF9C: +/* 8026FF9C 0026CEDC EF 81 07 72 */ fmuls f28, f1, f29 +/* 8026FFA0 0026CEE0 38 61 00 40 */ addi r3, r1, 0x40 +/* 8026FFA4 0026CEE4 7C 64 1B 78 */ mr r4, r3 +/* 8026FFA8 0026CEE8 FC 20 E8 90 */ fmr f1, f29 +/* 8026FFAC 0026CEEC 48 0D 71 2D */ bl PSVECScale +/* 8026FFB0 0026CEF0 FC 00 E2 10 */ fabs f0, f28 +/* 8026FFB4 0026CEF4 FC 20 00 18 */ frsp f1, f0 +/* 8026FFB8 0026CEF8 C0 02 B8 00 */ lfs f0, lbl_80455200-_SDA2_BASE_(r2) +/* 8026FFBC 0026CEFC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026FFC0 0026CF00 41 80 00 5C */ blt lbl_8027001C +/* 8026FFC4 0026CF04 FC 1C F0 40 */ fcmpo cr0, f28, f30 +/* 8026FFC8 0026CF08 40 81 00 18 */ ble lbl_8026FFE0 +/* 8026FFCC 0026CF0C 38 61 00 40 */ addi r3, r1, 0x40 +/* 8026FFD0 0026CF10 7C 64 1B 78 */ mr r4, r3 +/* 8026FFD4 0026CF14 EC 3E E0 24 */ fdivs f1, f30, f28 +/* 8026FFD8 0026CF18 48 0D 71 01 */ bl PSVECScale +/* 8026FFDC 0026CF1C 48 00 00 1C */ b lbl_8026FFF8 +lbl_8026FFE0: +/* 8026FFE0 0026CF20 FC 1C F8 40 */ fcmpo cr0, f28, f31 +/* 8026FFE4 0026CF24 40 80 00 14 */ bge lbl_8026FFF8 +/* 8026FFE8 0026CF28 38 61 00 40 */ addi r3, r1, 0x40 +/* 8026FFEC 0026CF2C 7C 64 1B 78 */ mr r4, r3 +/* 8026FFF0 0026CF30 EC 3F E0 24 */ fdivs f1, f31, f28 +/* 8026FFF4 0026CF34 48 0D 70 E5 */ bl PSVECScale +lbl_8026FFF8: +/* 8026FFF8 0026CF38 C0 3E 00 00 */ lfs f1, 0(r30) +/* 8026FFFC 0026CF3C C0 01 00 40 */ lfs f0, 0x40(r1) +/* 80270000 0026CF40 EC 01 00 28 */ fsubs f0, f1, f0 +/* 80270004 0026CF44 D0 1E 00 00 */ stfs f0, 0(r30) +/* 80270008 0026CF48 C0 3E 00 08 */ lfs f1, 8(r30) +/* 8027000C 0026CF4C C0 01 00 48 */ lfs f0, 0x48(r1) +/* 80270010 0026CF50 EC 01 00 28 */ fsubs f0, f1, f0 +/* 80270014 0026CF54 D0 1E 00 08 */ stfs f0, 8(r30) +/* 80270018 0026CF58 48 00 00 14 */ b lbl_8027002C +lbl_8027001C: +/* 8027001C 0026CF5C C0 1F 00 00 */ lfs f0, 0(r31) +/* 80270020 0026CF60 D0 1E 00 00 */ stfs f0, 0(r30) +/* 80270024 0026CF64 C0 1F 00 08 */ lfs f0, 8(r31) +/* 80270028 0026CF68 D0 1E 00 08 */ stfs f0, 8(r30) +lbl_8027002C: +/* 8027002C 0026CF6C 38 61 00 28 */ addi r3, r1, 0x28 +/* 80270030 0026CF70 7F C4 F3 78 */ mr r4, r30 +/* 80270034 0026CF74 7F E5 FB 78 */ mr r5, r31 +/* 80270038 0026CF78 4B FF 6A FD */ bl __mi__4cXyzCFRC3Vec +/* 8027003C 0026CF7C C0 01 00 28 */ lfs f0, 0x28(r1) +/* 80270040 0026CF80 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 80270044 0026CF84 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 80270048 0026CF88 D0 01 00 14 */ stfs f0, 0x14(r1) +/* 8027004C 0026CF8C C0 01 00 30 */ lfs f0, 0x30(r1) +/* 80270050 0026CF90 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 80270054 0026CF94 38 61 00 10 */ addi r3, r1, 0x10 +/* 80270058 0026CF98 48 0D 70 E1 */ bl PSVECSquareMag +/* 8027005C 0026CF9C C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 80270060 0026CFA0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80270064 0026CFA4 40 81 00 58 */ ble lbl_802700BC +/* 80270068 0026CFA8 FC 00 08 34 */ frsqrte f0, f1 +/* 8027006C 0026CFAC C8 82 B7 E8 */ lfd f4, lbl_804551E8-_SDA2_BASE_(r2) +/* 80270070 0026CFB0 FC 44 00 32 */ fmul f2, f4, f0 +/* 80270074 0026CFB4 C8 62 B7 F0 */ lfd f3, lbl_804551F0-_SDA2_BASE_(r2) +/* 80270078 0026CFB8 FC 00 00 32 */ fmul f0, f0, f0 +/* 8027007C 0026CFBC FC 01 00 32 */ fmul f0, f1, f0 +/* 80270080 0026CFC0 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270084 0026CFC4 FC 02 00 32 */ fmul f0, f2, f0 +/* 80270088 0026CFC8 FC 44 00 32 */ fmul f2, f4, f0 +/* 8027008C 0026CFCC FC 00 00 32 */ fmul f0, f0, f0 +/* 80270090 0026CFD0 FC 01 00 32 */ fmul f0, f1, f0 +/* 80270094 0026CFD4 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270098 0026CFD8 FC 02 00 32 */ fmul f0, f2, f0 +/* 8027009C 0026CFDC FC 44 00 32 */ fmul f2, f4, f0 +/* 802700A0 0026CFE0 FC 00 00 32 */ fmul f0, f0, f0 +/* 802700A4 0026CFE4 FC 01 00 32 */ fmul f0, f1, f0 +/* 802700A8 0026CFE8 FC 03 00 28 */ fsub f0, f3, f0 +/* 802700AC 0026CFEC FC 02 00 32 */ fmul f0, f2, f0 +/* 802700B0 0026CFF0 FC 21 00 32 */ fmul f1, f1, f0 +/* 802700B4 0026CFF4 FC 20 08 18 */ frsp f1, f1 +/* 802700B8 0026CFF8 48 00 00 88 */ b lbl_80270140 +lbl_802700BC: +/* 802700BC 0026CFFC C8 02 B7 F8 */ lfd f0, lbl_804551F8-_SDA2_BASE_(r2) +/* 802700C0 0026D000 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802700C4 0026D004 40 80 00 10 */ bge lbl_802700D4 +/* 802700C8 0026D008 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 802700CC 0026D00C C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 802700D0 0026D010 48 00 00 70 */ b lbl_80270140 +lbl_802700D4: +/* 802700D4 0026D014 D0 21 00 08 */ stfs f1, 8(r1) +/* 802700D8 0026D018 80 81 00 08 */ lwz r4, 8(r1) +/* 802700DC 0026D01C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 802700E0 0026D020 3C 00 7F 80 */ lis r0, 0x7f80 +/* 802700E4 0026D024 7C 03 00 00 */ cmpw r3, r0 +/* 802700E8 0026D028 41 82 00 14 */ beq lbl_802700FC +/* 802700EC 0026D02C 40 80 00 40 */ bge lbl_8027012C +/* 802700F0 0026D030 2C 03 00 00 */ cmpwi r3, 0 +/* 802700F4 0026D034 41 82 00 20 */ beq lbl_80270114 +/* 802700F8 0026D038 48 00 00 34 */ b lbl_8027012C +lbl_802700FC: +/* 802700FC 0026D03C 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 80270100 0026D040 41 82 00 0C */ beq lbl_8027010C +/* 80270104 0026D044 38 00 00 01 */ li r0, 1 +/* 80270108 0026D048 48 00 00 28 */ b lbl_80270130 +lbl_8027010C: +/* 8027010C 0026D04C 38 00 00 02 */ li r0, 2 +/* 80270110 0026D050 48 00 00 20 */ b lbl_80270130 +lbl_80270114: +/* 80270114 0026D054 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 80270118 0026D058 41 82 00 0C */ beq lbl_80270124 +/* 8027011C 0026D05C 38 00 00 05 */ li r0, 5 +/* 80270120 0026D060 48 00 00 10 */ b lbl_80270130 +lbl_80270124: +/* 80270124 0026D064 38 00 00 03 */ li r0, 3 +/* 80270128 0026D068 48 00 00 08 */ b lbl_80270130 +lbl_8027012C: +/* 8027012C 0026D06C 38 00 00 04 */ li r0, 4 +lbl_80270130: +/* 80270130 0026D070 2C 00 00 01 */ cmpwi r0, 1 +/* 80270134 0026D074 40 82 00 0C */ bne lbl_80270140 +/* 80270138 0026D078 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8027013C 0026D07C C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +lbl_80270140: +/* 80270140 0026D080 E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 +/* 80270144 0026D084 CB E1 00 90 */ lfd f31, 0x90(r1) +/* 80270148 0026D088 E3 C1 00 88 */ psq_l f30, 136(r1), 0, 0 +/* 8027014C 0026D08C CB C1 00 80 */ lfd f30, 0x80(r1) +/* 80270150 0026D090 E3 A1 00 78 */ psq_l f29, 120(r1), 0, 0 +/* 80270154 0026D094 CB A1 00 70 */ lfd f29, 0x70(r1) +/* 80270158 0026D098 E3 81 00 68 */ psq_l f28, 104(r1), 0, 0 +/* 8027015C 0026D09C CB 81 00 60 */ lfd f28, 0x60(r1) +/* 80270160 0026D0A0 83 E1 00 5C */ lwz r31, 0x5c(r1) +/* 80270164 0026D0A4 83 C1 00 58 */ lwz r30, 0x58(r1) +/* 80270168 0026D0A8 80 01 00 A4 */ lwz r0, 0xa4(r1) +/* 8027016C 0026D0AC 7C 08 03 A6 */ mtlr r0 +/* 80270170 0026D0B0 38 21 00 A0 */ addi r1, r1, 0xa0 +/* 80270174 0026D0B4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_80270178.s b/include/SComponent/c_lib/asm/func_80270178.s new file mode 100644 index 0000000000..9320d4ba85 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270178.s @@ -0,0 +1,129 @@ +/* 80270178 0026D0B8 94 21 FF 90 */ stwu r1, -0x70(r1) +/* 8027017C 0026D0BC 7C 08 02 A6 */ mflr r0 +/* 80270180 0026D0C0 90 01 00 74 */ stw r0, 0x74(r1) +/* 80270184 0026D0C4 DB E1 00 60 */ stfd f31, 0x60(r1) +/* 80270188 0026D0C8 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 +/* 8027018C 0026D0CC DB C1 00 50 */ stfd f30, 0x50(r1) +/* 80270190 0026D0D0 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 +/* 80270194 0026D0D4 93 E1 00 4C */ stw r31, 0x4c(r1) +/* 80270198 0026D0D8 93 C1 00 48 */ stw r30, 0x48(r1) +/* 8027019C 0026D0DC 7C 7E 1B 78 */ mr r30, r3 +/* 802701A0 0026D0E0 7C 9F 23 78 */ mr r31, r4 +/* 802701A4 0026D0E4 FF C0 08 90 */ fmr f30, f1 +/* 802701A8 0026D0E8 FF E0 10 90 */ fmr f31, f2 +/* 802701AC 0026D0EC 4B FF 6E C1 */ bl __ne__4cXyzCFRC3Vec +/* 802701B0 0026D0F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802701B4 0026D0F4 41 82 01 74 */ beq lbl_80270328 +/* 802701B8 0026D0F8 38 61 00 24 */ addi r3, r1, 0x24 +/* 802701BC 0026D0FC 7F C4 F3 78 */ mr r4, r30 +/* 802701C0 0026D100 7F E5 FB 78 */ mr r5, r31 +/* 802701C4 0026D104 4B FF 69 71 */ bl __mi__4cXyzCFRC3Vec +/* 802701C8 0026D108 38 61 00 18 */ addi r3, r1, 0x18 +/* 802701CC 0026D10C 38 81 00 24 */ addi r4, r1, 0x24 +/* 802701D0 0026D110 FC 20 F0 90 */ fmr f1, f30 +/* 802701D4 0026D114 4B FF 69 B1 */ bl __ml__4cXyzCFf +/* 802701D8 0026D118 C0 01 00 18 */ lfs f0, 0x18(r1) +/* 802701DC 0026D11C D0 01 00 30 */ stfs f0, 0x30(r1) +/* 802701E0 0026D120 C0 01 00 1C */ lfs f0, 0x1c(r1) +/* 802701E4 0026D124 D0 01 00 34 */ stfs f0, 0x34(r1) +/* 802701E8 0026D128 C0 01 00 20 */ lfs f0, 0x20(r1) +/* 802701EC 0026D12C D0 01 00 38 */ stfs f0, 0x38(r1) +/* 802701F0 0026D130 38 61 00 30 */ addi r3, r1, 0x30 +/* 802701F4 0026D134 48 0D 6F 45 */ bl PSVECSquareMag +/* 802701F8 0026D138 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 802701FC 0026D13C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80270200 0026D140 40 81 00 58 */ ble lbl_80270258 +/* 80270204 0026D144 FC 00 08 34 */ frsqrte f0, f1 +/* 80270208 0026D148 C8 82 B7 E8 */ lfd f4, lbl_804551E8-_SDA2_BASE_(r2) +/* 8027020C 0026D14C FC 44 00 32 */ fmul f2, f4, f0 +/* 80270210 0026D150 C8 62 B7 F0 */ lfd f3, lbl_804551F0-_SDA2_BASE_(r2) +/* 80270214 0026D154 FC 00 00 32 */ fmul f0, f0, f0 +/* 80270218 0026D158 FC 01 00 32 */ fmul f0, f1, f0 +/* 8027021C 0026D15C FC 03 00 28 */ fsub f0, f3, f0 +/* 80270220 0026D160 FC 02 00 32 */ fmul f0, f2, f0 +/* 80270224 0026D164 FC 44 00 32 */ fmul f2, f4, f0 +/* 80270228 0026D168 FC 00 00 32 */ fmul f0, f0, f0 +/* 8027022C 0026D16C FC 01 00 32 */ fmul f0, f1, f0 +/* 80270230 0026D170 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270234 0026D174 FC 02 00 32 */ fmul f0, f2, f0 +/* 80270238 0026D178 FC 44 00 32 */ fmul f2, f4, f0 +/* 8027023C 0026D17C FC 00 00 32 */ fmul f0, f0, f0 +/* 80270240 0026D180 FC 01 00 32 */ fmul f0, f1, f0 +/* 80270244 0026D184 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270248 0026D188 FC 02 00 32 */ fmul f0, f2, f0 +/* 8027024C 0026D18C FC 21 00 32 */ fmul f1, f1, f0 +/* 80270250 0026D190 FC 20 08 18 */ frsp f1, f1 +/* 80270254 0026D194 48 00 00 88 */ b lbl_802702DC +lbl_80270258: +/* 80270258 0026D198 C8 02 B7 F8 */ lfd f0, lbl_804551F8-_SDA2_BASE_(r2) +/* 8027025C 0026D19C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80270260 0026D1A0 40 80 00 10 */ bge lbl_80270270 +/* 80270264 0026D1A4 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 80270268 0026D1A8 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 8027026C 0026D1AC 48 00 00 70 */ b lbl_802702DC +lbl_80270270: +/* 80270270 0026D1B0 D0 21 00 08 */ stfs f1, 8(r1) +/* 80270274 0026D1B4 80 81 00 08 */ lwz r4, 8(r1) +/* 80270278 0026D1B8 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8027027C 0026D1BC 3C 00 7F 80 */ lis r0, 0x7f80 +/* 80270280 0026D1C0 7C 03 00 00 */ cmpw r3, r0 +/* 80270284 0026D1C4 41 82 00 14 */ beq lbl_80270298 +/* 80270288 0026D1C8 40 80 00 40 */ bge lbl_802702C8 +/* 8027028C 0026D1CC 2C 03 00 00 */ cmpwi r3, 0 +/* 80270290 0026D1D0 41 82 00 20 */ beq lbl_802702B0 +/* 80270294 0026D1D4 48 00 00 34 */ b lbl_802702C8 +lbl_80270298: +/* 80270298 0026D1D8 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8027029C 0026D1DC 41 82 00 0C */ beq lbl_802702A8 +/* 802702A0 0026D1E0 38 00 00 01 */ li r0, 1 +/* 802702A4 0026D1E4 48 00 00 28 */ b lbl_802702CC +lbl_802702A8: +/* 802702A8 0026D1E8 38 00 00 02 */ li r0, 2 +/* 802702AC 0026D1EC 48 00 00 20 */ b lbl_802702CC +lbl_802702B0: +/* 802702B0 0026D1F0 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 802702B4 0026D1F4 41 82 00 0C */ beq lbl_802702C0 +/* 802702B8 0026D1F8 38 00 00 05 */ li r0, 5 +/* 802702BC 0026D1FC 48 00 00 10 */ b lbl_802702CC +lbl_802702C0: +/* 802702C0 0026D200 38 00 00 03 */ li r0, 3 +/* 802702C4 0026D204 48 00 00 08 */ b lbl_802702CC +lbl_802702C8: +/* 802702C8 0026D208 38 00 00 04 */ li r0, 4 +lbl_802702CC: +/* 802702CC 0026D20C 2C 00 00 01 */ cmpwi r0, 1 +/* 802702D0 0026D210 40 82 00 0C */ bne lbl_802702DC +/* 802702D4 0026D214 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 802702D8 0026D218 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +lbl_802702DC: +/* 802702DC 0026D21C FC 01 F8 40 */ fcmpo cr0, f1, f31 +/* 802702E0 0026D220 40 81 00 38 */ ble lbl_80270318 +/* 802702E4 0026D224 38 61 00 0C */ addi r3, r1, 0xc +/* 802702E8 0026D228 38 81 00 30 */ addi r4, r1, 0x30 +/* 802702EC 0026D22C 4B FF 6A 45 */ bl normZP__4cXyzCFv +/* 802702F0 0026D230 C0 01 00 0C */ lfs f0, 0xc(r1) +/* 802702F4 0026D234 D0 01 00 30 */ stfs f0, 0x30(r1) +/* 802702F8 0026D238 C0 01 00 10 */ lfs f0, 0x10(r1) +/* 802702FC 0026D23C D0 01 00 34 */ stfs f0, 0x34(r1) +/* 80270300 0026D240 C0 01 00 14 */ lfs f0, 0x14(r1) +/* 80270304 0026D244 D0 01 00 38 */ stfs f0, 0x38(r1) +/* 80270308 0026D248 38 61 00 30 */ addi r3, r1, 0x30 +/* 8027030C 0026D24C 7C 64 1B 78 */ mr r4, r3 +/* 80270310 0026D250 FC 20 F8 90 */ fmr f1, f31 +/* 80270314 0026D254 48 0D 6D C5 */ bl PSVECScale +lbl_80270318: +/* 80270318 0026D258 7F C3 F3 78 */ mr r3, r30 +/* 8027031C 0026D25C 38 81 00 30 */ addi r4, r1, 0x30 +/* 80270320 0026D260 7F C5 F3 78 */ mr r5, r30 +/* 80270324 0026D264 48 0D 6D 91 */ bl PSVECSubtract +lbl_80270328: +/* 80270328 0026D268 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 +/* 8027032C 0026D26C CB E1 00 60 */ lfd f31, 0x60(r1) +/* 80270330 0026D270 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 +/* 80270334 0026D274 CB C1 00 50 */ lfd f30, 0x50(r1) +/* 80270338 0026D278 83 E1 00 4C */ lwz r31, 0x4c(r1) +/* 8027033C 0026D27C 83 C1 00 48 */ lwz r30, 0x48(r1) +/* 80270340 0026D280 80 01 00 74 */ lwz r0, 0x74(r1) +/* 80270344 0026D284 7C 08 03 A6 */ mtlr r0 +/* 80270348 0026D288 38 21 00 70 */ addi r1, r1, 0x70 +/* 8027034C 0026D28C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_lib/asm/func_80270350.s b/include/SComponent/c_lib/asm/func_80270350.s new file mode 100644 index 0000000000..074a0360de --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270350.s @@ -0,0 +1,136 @@ +/* 80270350 0026D290 94 21 FF 90 */ stwu r1, -0x70(r1) +/* 80270354 0026D294 7C 08 02 A6 */ mflr r0 +/* 80270358 0026D298 90 01 00 74 */ stw r0, 0x74(r1) +/* 8027035C 0026D29C DB E1 00 60 */ stfd f31, 0x60(r1) +/* 80270360 0026D2A0 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 +/* 80270364 0026D2A4 DB C1 00 50 */ stfd f30, 0x50(r1) +/* 80270368 0026D2A8 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 +/* 8027036C 0026D2AC 93 E1 00 4C */ stw r31, 0x4c(r1) +/* 80270370 0026D2B0 7C 7F 1B 78 */ mr r31, r3 +/* 80270374 0026D2B4 7C 85 23 78 */ mr r5, r4 +/* 80270378 0026D2B8 FF C0 08 90 */ fmr f30, f1 +/* 8027037C 0026D2BC FF E0 10 90 */ fmr f31, f2 +/* 80270380 0026D2C0 C0 23 00 00 */ lfs f1, 0(r3) +/* 80270384 0026D2C4 C0 04 00 00 */ lfs f0, 0(r4) +/* 80270388 0026D2C8 FC 01 00 00 */ fcmpu cr0, f1, f0 +/* 8027038C 0026D2CC 40 82 00 14 */ bne lbl_802703A0 +/* 80270390 0026D2D0 C0 3F 00 08 */ lfs f1, 8(r31) +/* 80270394 0026D2D4 C0 05 00 08 */ lfs f0, 8(r5) +/* 80270398 0026D2D8 FC 01 00 00 */ fcmpu cr0, f1, f0 +/* 8027039C 0026D2DC 41 82 01 80 */ beq lbl_8027051C +lbl_802703A0: +/* 802703A0 0026D2E0 38 61 00 24 */ addi r3, r1, 0x24 +/* 802703A4 0026D2E4 7F E4 FB 78 */ mr r4, r31 +/* 802703A8 0026D2E8 4B FF 67 8D */ bl __mi__4cXyzCFRC3Vec +/* 802703AC 0026D2EC 38 61 00 18 */ addi r3, r1, 0x18 +/* 802703B0 0026D2F0 38 81 00 24 */ addi r4, r1, 0x24 +/* 802703B4 0026D2F4 FC 20 F0 90 */ fmr f1, f30 +/* 802703B8 0026D2F8 4B FF 67 CD */ bl __ml__4cXyzCFf +/* 802703BC 0026D2FC C0 41 00 18 */ lfs f2, 0x18(r1) +/* 802703C0 0026D300 D0 41 00 30 */ stfs f2, 0x30(r1) +/* 802703C4 0026D304 C0 01 00 1C */ lfs f0, 0x1c(r1) +/* 802703C8 0026D308 D0 01 00 34 */ stfs f0, 0x34(r1) +/* 802703CC 0026D30C C0 21 00 20 */ lfs f1, 0x20(r1) +/* 802703D0 0026D310 D0 21 00 38 */ stfs f1, 0x38(r1) +/* 802703D4 0026D314 D0 41 00 0C */ stfs f2, 0xc(r1) +/* 802703D8 0026D318 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 802703DC 0026D31C D0 01 00 10 */ stfs f0, 0x10(r1) +/* 802703E0 0026D320 D0 21 00 14 */ stfs f1, 0x14(r1) +/* 802703E4 0026D324 38 61 00 0C */ addi r3, r1, 0xc +/* 802703E8 0026D328 48 0D 6D 51 */ bl PSVECSquareMag +/* 802703EC 0026D32C C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 802703F0 0026D330 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802703F4 0026D334 40 81 00 58 */ ble lbl_8027044C +/* 802703F8 0026D338 FC 00 08 34 */ frsqrte f0, f1 +/* 802703FC 0026D33C C8 82 B7 E8 */ lfd f4, lbl_804551E8-_SDA2_BASE_(r2) +/* 80270400 0026D340 FC 44 00 32 */ fmul f2, f4, f0 +/* 80270404 0026D344 C8 62 B7 F0 */ lfd f3, lbl_804551F0-_SDA2_BASE_(r2) +/* 80270408 0026D348 FC 00 00 32 */ fmul f0, f0, f0 +/* 8027040C 0026D34C FC 01 00 32 */ fmul f0, f1, f0 +/* 80270410 0026D350 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270414 0026D354 FC 02 00 32 */ fmul f0, f2, f0 +/* 80270418 0026D358 FC 44 00 32 */ fmul f2, f4, f0 +/* 8027041C 0026D35C FC 00 00 32 */ fmul f0, f0, f0 +/* 80270420 0026D360 FC 01 00 32 */ fmul f0, f1, f0 +/* 80270424 0026D364 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270428 0026D368 FC 02 00 32 */ fmul f0, f2, f0 +/* 8027042C 0026D36C FC 44 00 32 */ fmul f2, f4, f0 +/* 80270430 0026D370 FC 00 00 32 */ fmul f0, f0, f0 +/* 80270434 0026D374 FC 01 00 32 */ fmul f0, f1, f0 +/* 80270438 0026D378 FC 03 00 28 */ fsub f0, f3, f0 +/* 8027043C 0026D37C FC 02 00 32 */ fmul f0, f2, f0 +/* 80270440 0026D380 FC 21 00 32 */ fmul f1, f1, f0 +/* 80270444 0026D384 FC 20 08 18 */ frsp f1, f1 +/* 80270448 0026D388 48 00 00 88 */ b lbl_802704D0 +lbl_8027044C: +/* 8027044C 0026D38C C8 02 B7 F8 */ lfd f0, lbl_804551F8-_SDA2_BASE_(r2) +/* 80270450 0026D390 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80270454 0026D394 40 80 00 10 */ bge lbl_80270464 +/* 80270458 0026D398 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8027045C 0026D39C C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 80270460 0026D3A0 48 00 00 70 */ b lbl_802704D0 +lbl_80270464: +/* 80270464 0026D3A4 D0 21 00 08 */ stfs f1, 8(r1) +/* 80270468 0026D3A8 80 81 00 08 */ lwz r4, 8(r1) +/* 8027046C 0026D3AC 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 80270470 0026D3B0 3C 00 7F 80 */ lis r0, 0x7f80 +/* 80270474 0026D3B4 7C 03 00 00 */ cmpw r3, r0 +/* 80270478 0026D3B8 41 82 00 14 */ beq lbl_8027048C +/* 8027047C 0026D3BC 40 80 00 40 */ bge lbl_802704BC +/* 80270480 0026D3C0 2C 03 00 00 */ cmpwi r3, 0 +/* 80270484 0026D3C4 41 82 00 20 */ beq lbl_802704A4 +/* 80270488 0026D3C8 48 00 00 34 */ b lbl_802704BC +lbl_8027048C: +/* 8027048C 0026D3CC 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 80270490 0026D3D0 41 82 00 0C */ beq lbl_8027049C +/* 80270494 0026D3D4 38 00 00 01 */ li r0, 1 +/* 80270498 0026D3D8 48 00 00 28 */ b lbl_802704C0 +lbl_8027049C: +/* 8027049C 0026D3DC 38 00 00 02 */ li r0, 2 +/* 802704A0 0026D3E0 48 00 00 20 */ b lbl_802704C0 +lbl_802704A4: +/* 802704A4 0026D3E4 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 802704A8 0026D3E8 41 82 00 0C */ beq lbl_802704B4 +/* 802704AC 0026D3EC 38 00 00 05 */ li r0, 5 +/* 802704B0 0026D3F0 48 00 00 10 */ b lbl_802704C0 +lbl_802704B4: +/* 802704B4 0026D3F4 38 00 00 03 */ li r0, 3 +/* 802704B8 0026D3F8 48 00 00 08 */ b lbl_802704C0 +lbl_802704BC: +/* 802704BC 0026D3FC 38 00 00 04 */ li r0, 4 +lbl_802704C0: +/* 802704C0 0026D400 2C 00 00 01 */ cmpwi r0, 1 +/* 802704C4 0026D404 40 82 00 0C */ bne lbl_802704D0 +/* 802704C8 0026D408 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 802704CC 0026D40C C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +lbl_802704D0: +/* 802704D0 0026D410 FC 00 0A 10 */ fabs f0, f1 +/* 802704D4 0026D414 FC 40 00 18 */ frsp f2, f0 +/* 802704D8 0026D418 C0 02 B8 00 */ lfs f0, lbl_80455200-_SDA2_BASE_(r2) +/* 802704DC 0026D41C FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 802704E0 0026D420 41 80 00 3C */ blt lbl_8027051C +/* 802704E4 0026D424 FC 01 F8 40 */ fcmpo cr0, f1, f31 +/* 802704E8 0026D428 40 81 00 14 */ ble lbl_802704FC +/* 802704EC 0026D42C 38 61 00 30 */ addi r3, r1, 0x30 +/* 802704F0 0026D430 7C 64 1B 78 */ mr r4, r3 +/* 802704F4 0026D434 EC 3F 08 24 */ fdivs f1, f31, f1 +/* 802704F8 0026D438 48 0D 6B E1 */ bl PSVECScale +lbl_802704FC: +/* 802704FC 0026D43C C0 3F 00 00 */ lfs f1, 0(r31) +/* 80270500 0026D440 C0 01 00 30 */ lfs f0, 0x30(r1) +/* 80270504 0026D444 EC 01 00 28 */ fsubs f0, f1, f0 +/* 80270508 0026D448 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8027050C 0026D44C C0 3F 00 08 */ lfs f1, 8(r31) +/* 80270510 0026D450 C0 01 00 38 */ lfs f0, 0x38(r1) +/* 80270514 0026D454 EC 01 00 28 */ fsubs f0, f1, f0 +/* 80270518 0026D458 D0 1F 00 08 */ stfs f0, 8(r31) +lbl_8027051C: +/* 8027051C 0026D45C E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 +/* 80270520 0026D460 CB E1 00 60 */ lfd f31, 0x60(r1) +/* 80270524 0026D464 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 +/* 80270528 0026D468 CB C1 00 50 */ lfd f30, 0x50(r1) +/* 8027052C 0026D46C 83 E1 00 4C */ lwz r31, 0x4c(r1) +/* 80270530 0026D470 80 01 00 74 */ lwz r0, 0x74(r1) +/* 80270534 0026D474 7C 08 03 A6 */ mtlr r0 +/* 80270538 0026D478 38 21 00 70 */ addi r1, r1, 0x70 +/* 8027053C 0026D47C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_80270540.s b/include/SComponent/c_lib/asm/func_80270540.s new file mode 100644 index 0000000000..cf5fa2a173 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270540.s @@ -0,0 +1,56 @@ +/* 80270540 0026D480 A9 03 00 00 */ lha r8, 0(r3) +/* 80270544 0026D484 7C 89 07 34 */ extsh r9, r4 +/* 80270548 0026D488 7C 08 48 50 */ subf r0, r8, r9 +/* 8027054C 0026D48C 7C 0A 07 34 */ extsh r10, r0 +/* 80270550 0026D490 7C 08 48 00 */ cmpw r8, r9 +/* 80270554 0026D494 41 82 00 A4 */ beq lbl_802705F8 +/* 80270558 0026D498 7C A0 07 34 */ extsh r0, r5 +/* 8027055C 0026D49C 7C 0A 03 D6 */ divw r0, r10, r0 +/* 80270560 0026D4A0 7C 05 07 34 */ extsh r5, r0 +/* 80270564 0026D4A4 7C E0 07 34 */ extsh r0, r7 +/* 80270568 0026D4A8 7C 05 00 00 */ cmpw r5, r0 +/* 8027056C 0026D4AC 41 81 00 10 */ bgt lbl_8027057C +/* 80270570 0026D4B0 7C 00 00 D0 */ neg r0, r0 +/* 80270574 0026D4B4 7C 05 00 00 */ cmpw r5, r0 +/* 80270578 0026D4B8 40 80 00 3C */ bge lbl_802705B4 +lbl_8027057C: +/* 8027057C 0026D4BC 7C C0 07 34 */ extsh r0, r6 +/* 80270580 0026D4C0 7C 05 00 00 */ cmpw r5, r0 +/* 80270584 0026D4C4 40 81 00 08 */ ble lbl_8027058C +/* 80270588 0026D4C8 7C C5 33 78 */ mr r5, r6 +lbl_8027058C: +/* 8027058C 0026D4CC 7C A4 07 34 */ extsh r4, r5 +/* 80270590 0026D4D0 7C C0 07 34 */ extsh r0, r6 +/* 80270594 0026D4D4 7C 00 00 D0 */ neg r0, r0 +/* 80270598 0026D4D8 7C 04 00 00 */ cmpw r4, r0 +/* 8027059C 0026D4DC 40 80 00 08 */ bge lbl_802705A4 +/* 802705A0 0026D4E0 7C 05 07 34 */ extsh r5, r0 +lbl_802705A4: +/* 802705A4 0026D4E4 A8 03 00 00 */ lha r0, 0(r3) +/* 802705A8 0026D4E8 7C 00 2A 14 */ add r0, r0, r5 +/* 802705AC 0026D4EC B0 03 00 00 */ sth r0, 0(r3) +/* 802705B0 0026D4F0 48 00 00 48 */ b lbl_802705F8 +lbl_802705B4: +/* 802705B4 0026D4F4 7D 40 07 35 */ extsh. r0, r10 +/* 802705B8 0026D4F8 41 80 00 24 */ blt lbl_802705DC +/* 802705BC 0026D4FC 7C 08 3A 14 */ add r0, r8, r7 +/* 802705C0 0026D500 B0 03 00 00 */ sth r0, 0(r3) +/* 802705C4 0026D504 A8 03 00 00 */ lha r0, 0(r3) +/* 802705C8 0026D508 7C 00 48 50 */ subf r0, r0, r9 +/* 802705CC 0026D50C 7C 00 07 35 */ extsh. r0, r0 +/* 802705D0 0026D510 41 81 00 28 */ bgt lbl_802705F8 +/* 802705D4 0026D514 B0 83 00 00 */ sth r4, 0(r3) +/* 802705D8 0026D518 48 00 00 20 */ b lbl_802705F8 +lbl_802705DC: +/* 802705DC 0026D51C 7C 07 40 50 */ subf r0, r7, r8 +/* 802705E0 0026D520 B0 03 00 00 */ sth r0, 0(r3) +/* 802705E4 0026D524 A8 03 00 00 */ lha r0, 0(r3) +/* 802705E8 0026D528 7C 00 48 50 */ subf r0, r0, r9 +/* 802705EC 0026D52C 7C 00 07 35 */ extsh. r0, r0 +/* 802705F0 0026D530 41 80 00 08 */ blt lbl_802705F8 +/* 802705F4 0026D534 B0 83 00 00 */ sth r4, 0(r3) +lbl_802705F8: +/* 802705F8 0026D538 A8 03 00 00 */ lha r0, 0(r3) +/* 802705FC 0026D53C 7C 00 48 50 */ subf r0, r0, r9 +/* 80270600 0026D540 7C 03 07 34 */ extsh r3, r0 +/* 80270604 0026D544 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_80270608.s b/include/SComponent/c_lib/asm/func_80270608.s new file mode 100644 index 0000000000..17a9c5ef5d --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270608.s @@ -0,0 +1,23 @@ +/* 80270608 0026D548 A8 E3 00 00 */ lha r7, 0(r3) +/* 8027060C 0026D54C 7C 07 20 50 */ subf r0, r7, r4 +/* 80270610 0026D550 7C 04 07 34 */ extsh r4, r0 +/* 80270614 0026D554 7C A0 07 34 */ extsh r0, r5 +/* 80270618 0026D558 7C 04 03 D6 */ divw r0, r4, r0 +/* 8027061C 0026D55C 7C 04 07 34 */ extsh r4, r0 +/* 80270620 0026D560 7C C0 07 34 */ extsh r0, r6 +/* 80270624 0026D564 7C 04 00 00 */ cmpw r4, r0 +/* 80270628 0026D568 40 81 00 10 */ ble lbl_80270638 +/* 8027062C 0026D56C 7C 07 32 14 */ add r0, r7, r6 +/* 80270630 0026D570 B0 03 00 00 */ sth r0, 0(r3) +/* 80270634 0026D574 4E 80 00 20 */ blr +lbl_80270638: +/* 80270638 0026D578 7C 00 00 D0 */ neg r0, r0 +/* 8027063C 0026D57C 7C 04 00 00 */ cmpw r4, r0 +/* 80270640 0026D580 40 80 00 10 */ bge lbl_80270650 +/* 80270644 0026D584 7C 06 38 50 */ subf r0, r6, r7 +/* 80270648 0026D588 B0 03 00 00 */ sth r0, 0(r3) +/* 8027064C 0026D58C 4E 80 00 20 */ blr +lbl_80270650: +/* 80270650 0026D590 7C 07 22 14 */ add r0, r7, r4 +/* 80270654 0026D594 B0 03 00 00 */ sth r0, 0(r3) +/* 80270658 0026D598 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_8027065C.s b/include/SComponent/c_lib/asm/func_8027065C.s new file mode 100644 index 0000000000..a2c1ac1cc3 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_8027065C.s @@ -0,0 +1,33 @@ +/* 8027065C 0026D59C 54 A5 06 3F */ clrlwi. r5, r5, 0x18 +/* 80270660 0026D5A0 41 82 00 50 */ beq lbl_802706B0 +/* 80270664 0026D5A4 88 E3 00 00 */ lbz r7, 0(r3) +/* 80270668 0026D5A8 54 88 06 3E */ clrlwi r8, r4, 0x18 +/* 8027066C 0026D5AC 7C E0 07 34 */ extsh r0, r7 +/* 80270670 0026D5B0 7C 00 40 00 */ cmpw r0, r8 +/* 80270674 0026D5B4 40 81 00 0C */ ble lbl_80270680 +/* 80270678 0026D5B8 7C 05 00 D0 */ neg r0, r5 +/* 8027067C 0026D5BC 7C 05 07 34 */ extsh r5, r0 +lbl_80270680: +/* 80270680 0026D5C0 7C E7 2A 14 */ add r7, r7, r5 +/* 80270684 0026D5C4 7C A6 07 34 */ extsh r6, r5 +/* 80270688 0026D5C8 7D 05 07 34 */ extsh r5, r8 +/* 8027068C 0026D5CC 7C E0 07 34 */ extsh r0, r7 +/* 80270690 0026D5D0 7C 05 00 50 */ subf r0, r5, r0 +/* 80270694 0026D5D4 7C 06 01 D7 */ mullw. r0, r6, r0 +/* 80270698 0026D5D8 41 80 00 10 */ blt lbl_802706A8 +/* 8027069C 0026D5DC 98 83 00 00 */ stb r4, 0(r3) +/* 802706A0 0026D5E0 38 60 00 01 */ li r3, 1 +/* 802706A4 0026D5E4 4E 80 00 20 */ blr +lbl_802706A8: +/* 802706A8 0026D5E8 98 E3 00 00 */ stb r7, 0(r3) +/* 802706AC 0026D5EC 48 00 00 1C */ b lbl_802706C8 +lbl_802706B0: +/* 802706B0 0026D5F0 88 63 00 00 */ lbz r3, 0(r3) +/* 802706B4 0026D5F4 54 80 06 3E */ clrlwi r0, r4, 0x18 +/* 802706B8 0026D5F8 7C 03 00 40 */ cmplw r3, r0 +/* 802706BC 0026D5FC 40 82 00 0C */ bne lbl_802706C8 +/* 802706C0 0026D600 38 60 00 01 */ li r3, 1 +/* 802706C4 0026D604 4E 80 00 20 */ blr +lbl_802706C8: +/* 802706C8 0026D608 38 60 00 00 */ li r3, 0 +/* 802706CC 0026D60C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_802706D0.s b/include/SComponent/c_lib/asm/func_802706D0.s new file mode 100644 index 0000000000..e2e7d7c5ce --- /dev/null +++ b/include/SComponent/c_lib/asm/func_802706D0.s @@ -0,0 +1,31 @@ +/* 802706D0 0026D610 7C A0 07 35 */ extsh. r0, r5 +/* 802706D4 0026D614 41 82 00 4C */ beq lbl_80270720 +/* 802706D8 0026D618 A8 C3 00 00 */ lha r6, 0(r3) +/* 802706DC 0026D61C 7C 80 07 34 */ extsh r0, r4 +/* 802706E0 0026D620 7C 06 00 00 */ cmpw r6, r0 +/* 802706E4 0026D624 40 81 00 0C */ ble lbl_802706F0 +/* 802706E8 0026D628 7C 05 00 D0 */ neg r0, r5 +/* 802706EC 0026D62C 7C 05 07 34 */ extsh r5, r0 +lbl_802706F0: +/* 802706F0 0026D630 A8 03 00 00 */ lha r0, 0(r3) +/* 802706F4 0026D634 7C 00 2A 14 */ add r0, r0, r5 +/* 802706F8 0026D638 B0 03 00 00 */ sth r0, 0(r3) +/* 802706FC 0026D63C 7C A6 07 34 */ extsh r6, r5 +/* 80270700 0026D640 7C 85 07 34 */ extsh r5, r4 +/* 80270704 0026D644 A8 03 00 00 */ lha r0, 0(r3) +/* 80270708 0026D648 7C 05 00 50 */ subf r0, r5, r0 +/* 8027070C 0026D64C 7C 06 01 D7 */ mullw. r0, r6, r0 +/* 80270710 0026D650 41 80 00 28 */ blt lbl_80270738 +/* 80270714 0026D654 B0 83 00 00 */ sth r4, 0(r3) +/* 80270718 0026D658 38 60 00 01 */ li r3, 1 +/* 8027071C 0026D65C 4E 80 00 20 */ blr +lbl_80270720: +/* 80270720 0026D660 A8 63 00 00 */ lha r3, 0(r3) +/* 80270724 0026D664 7C 80 07 34 */ extsh r0, r4 +/* 80270728 0026D668 7C 03 00 00 */ cmpw r3, r0 +/* 8027072C 0026D66C 40 82 00 0C */ bne lbl_80270738 +/* 80270730 0026D670 38 60 00 01 */ li r3, 1 +/* 80270734 0026D674 4E 80 00 20 */ blr +lbl_80270738: +/* 80270738 0026D678 38 60 00 00 */ li r3, 0 +/* 8027073C 0026D67C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_80270740.s b/include/SComponent/c_lib/asm/func_80270740.s new file mode 100644 index 0000000000..ac58b2f505 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270740.s @@ -0,0 +1,30 @@ +/* 80270740 0026D680 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 80270744 0026D684 FC 02 00 00 */ fcmpu cr0, f2, f0 +/* 80270748 0026D688 41 82 00 48 */ beq lbl_80270790 +/* 8027074C 0026D68C C0 03 00 00 */ lfs f0, 0(r3) +/* 80270750 0026D690 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 80270754 0026D694 40 81 00 08 */ ble lbl_8027075C +/* 80270758 0026D698 FC 40 10 50 */ fneg f2, f2 +lbl_8027075C: +/* 8027075C 0026D69C C0 03 00 00 */ lfs f0, 0(r3) +/* 80270760 0026D6A0 EC 00 10 2A */ fadds f0, f0, f2 +/* 80270764 0026D6A4 D0 03 00 00 */ stfs f0, 0(r3) +/* 80270768 0026D6A8 C0 03 00 00 */ lfs f0, 0(r3) +/* 8027076C 0026D6AC EC 00 08 28 */ fsubs f0, f0, f1 +/* 80270770 0026D6B0 EC 42 00 32 */ fmuls f2, f2, f0 +/* 80270774 0026D6B4 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 80270778 0026D6B8 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8027077C 0026D6BC 4C 41 13 82 */ cror 2, 1, 2 +/* 80270780 0026D6C0 40 82 00 24 */ bne lbl_802707A4 +/* 80270784 0026D6C4 D0 23 00 00 */ stfs f1, 0(r3) +/* 80270788 0026D6C8 38 60 00 01 */ li r3, 1 +/* 8027078C 0026D6CC 4E 80 00 20 */ blr +lbl_80270790: +/* 80270790 0026D6D0 C0 03 00 00 */ lfs f0, 0(r3) +/* 80270794 0026D6D4 FC 00 08 00 */ fcmpu cr0, f0, f1 +/* 80270798 0026D6D8 40 82 00 0C */ bne lbl_802707A4 +/* 8027079C 0026D6DC 38 60 00 01 */ li r3, 1 +/* 802707A0 0026D6E0 4E 80 00 20 */ blr +lbl_802707A4: +/* 802707A4 0026D6E4 38 60 00 00 */ li r3, 0 +/* 802707A8 0026D6E8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_802707AC.s b/include/SComponent/c_lib/asm/func_802707AC.s new file mode 100644 index 0000000000..91087a0131 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_802707AC.s @@ -0,0 +1,135 @@ +/* 802707AC 0026D6EC 94 21 FF B0 */ stwu r1, -0x50(r1) +/* 802707B0 0026D6F0 7C 08 02 A6 */ mflr r0 +/* 802707B4 0026D6F4 90 01 00 54 */ stw r0, 0x54(r1) +/* 802707B8 0026D6F8 DB E1 00 40 */ stfd f31, 0x40(r1) +/* 802707BC 0026D6FC F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 +/* 802707C0 0026D700 93 E1 00 3C */ stw r31, 0x3c(r1) +/* 802707C4 0026D704 93 C1 00 38 */ stw r30, 0x38(r1) +/* 802707C8 0026D708 7C 7E 1B 78 */ mr r30, r3 +/* 802707CC 0026D70C 7C 9F 23 78 */ mr r31, r4 +/* 802707D0 0026D710 FF E0 08 90 */ fmr f31, f1 +/* 802707D4 0026D714 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 802707D8 0026D718 FC 1F 00 00 */ fcmpu cr0, f31, f0 +/* 802707DC 0026D71C 41 82 01 7C */ beq lbl_80270958 +/* 802707E0 0026D720 38 61 00 18 */ addi r3, r1, 0x18 +/* 802707E4 0026D724 7F C4 F3 78 */ mr r4, r30 +/* 802707E8 0026D728 7F E5 FB 78 */ mr r5, r31 +/* 802707EC 0026D72C 4B FF 63 49 */ bl __mi__4cXyzCFRC3Vec +/* 802707F0 0026D730 C0 01 00 18 */ lfs f0, 0x18(r1) +/* 802707F4 0026D734 D0 01 00 24 */ stfs f0, 0x24(r1) +/* 802707F8 0026D738 C0 01 00 1C */ lfs f0, 0x1c(r1) +/* 802707FC 0026D73C D0 01 00 28 */ stfs f0, 0x28(r1) +/* 80270800 0026D740 C0 01 00 20 */ lfs f0, 0x20(r1) +/* 80270804 0026D744 D0 01 00 2C */ stfs f0, 0x2c(r1) +/* 80270808 0026D748 38 61 00 24 */ addi r3, r1, 0x24 +/* 8027080C 0026D74C 48 0D 69 2D */ bl PSVECSquareMag +/* 80270810 0026D750 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 80270814 0026D754 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80270818 0026D758 40 81 00 58 */ ble lbl_80270870 +/* 8027081C 0026D75C FC 00 08 34 */ frsqrte f0, f1 +/* 80270820 0026D760 C8 82 B7 E8 */ lfd f4, lbl_804551E8-_SDA2_BASE_(r2) +/* 80270824 0026D764 FC 44 00 32 */ fmul f2, f4, f0 +/* 80270828 0026D768 C8 62 B7 F0 */ lfd f3, lbl_804551F0-_SDA2_BASE_(r2) +/* 8027082C 0026D76C FC 00 00 32 */ fmul f0, f0, f0 +/* 80270830 0026D770 FC 01 00 32 */ fmul f0, f1, f0 +/* 80270834 0026D774 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270838 0026D778 FC 02 00 32 */ fmul f0, f2, f0 +/* 8027083C 0026D77C FC 44 00 32 */ fmul f2, f4, f0 +/* 80270840 0026D780 FC 00 00 32 */ fmul f0, f0, f0 +/* 80270844 0026D784 FC 01 00 32 */ fmul f0, f1, f0 +/* 80270848 0026D788 FC 03 00 28 */ fsub f0, f3, f0 +/* 8027084C 0026D78C FC 02 00 32 */ fmul f0, f2, f0 +/* 80270850 0026D790 FC 44 00 32 */ fmul f2, f4, f0 +/* 80270854 0026D794 FC 00 00 32 */ fmul f0, f0, f0 +/* 80270858 0026D798 FC 01 00 32 */ fmul f0, f1, f0 +/* 8027085C 0026D79C FC 03 00 28 */ fsub f0, f3, f0 +/* 80270860 0026D7A0 FC 02 00 32 */ fmul f0, f2, f0 +/* 80270864 0026D7A4 FC 21 00 32 */ fmul f1, f1, f0 +/* 80270868 0026D7A8 FC 20 08 18 */ frsp f1, f1 +/* 8027086C 0026D7AC 48 00 00 88 */ b lbl_802708F4 +lbl_80270870: +/* 80270870 0026D7B0 C8 02 B7 F8 */ lfd f0, lbl_804551F8-_SDA2_BASE_(r2) +/* 80270874 0026D7B4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80270878 0026D7B8 40 80 00 10 */ bge lbl_80270888 +/* 8027087C 0026D7BC 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 80270880 0026D7C0 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 80270884 0026D7C4 48 00 00 70 */ b lbl_802708F4 +lbl_80270888: +/* 80270888 0026D7C8 D0 21 00 08 */ stfs f1, 8(r1) +/* 8027088C 0026D7CC 80 81 00 08 */ lwz r4, 8(r1) +/* 80270890 0026D7D0 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 80270894 0026D7D4 3C 00 7F 80 */ lis r0, 0x7f80 +/* 80270898 0026D7D8 7C 03 00 00 */ cmpw r3, r0 +/* 8027089C 0026D7DC 41 82 00 14 */ beq lbl_802708B0 +/* 802708A0 0026D7E0 40 80 00 40 */ bge lbl_802708E0 +/* 802708A4 0026D7E4 2C 03 00 00 */ cmpwi r3, 0 +/* 802708A8 0026D7E8 41 82 00 20 */ beq lbl_802708C8 +/* 802708AC 0026D7EC 48 00 00 34 */ b lbl_802708E0 +lbl_802708B0: +/* 802708B0 0026D7F0 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 802708B4 0026D7F4 41 82 00 0C */ beq lbl_802708C0 +/* 802708B8 0026D7F8 38 00 00 01 */ li r0, 1 +/* 802708BC 0026D7FC 48 00 00 28 */ b lbl_802708E4 +lbl_802708C0: +/* 802708C0 0026D800 38 00 00 02 */ li r0, 2 +/* 802708C4 0026D804 48 00 00 20 */ b lbl_802708E4 +lbl_802708C8: +/* 802708C8 0026D808 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 802708CC 0026D80C 41 82 00 0C */ beq lbl_802708D8 +/* 802708D0 0026D810 38 00 00 05 */ li r0, 5 +/* 802708D4 0026D814 48 00 00 10 */ b lbl_802708E4 +lbl_802708D8: +/* 802708D8 0026D818 38 00 00 03 */ li r0, 3 +/* 802708DC 0026D81C 48 00 00 08 */ b lbl_802708E4 +lbl_802708E0: +/* 802708E0 0026D820 38 00 00 04 */ li r0, 4 +lbl_802708E4: +/* 802708E4 0026D824 2C 00 00 01 */ cmpwi r0, 1 +/* 802708E8 0026D828 40 82 00 0C */ bne lbl_802708F4 +/* 802708EC 0026D82C 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 802708F0 0026D830 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +lbl_802708F4: +/* 802708F4 0026D834 FC 00 0A 10 */ fabs f0, f1 +/* 802708F8 0026D838 FC 40 00 18 */ frsp f2, f0 +/* 802708FC 0026D83C C0 02 B8 00 */ lfs f0, lbl_80455200-_SDA2_BASE_(r2) +/* 80270900 0026D840 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 80270904 0026D844 41 80 00 10 */ blt lbl_80270914 +/* 80270908 0026D848 FC 01 F8 40 */ fcmpo cr0, f1, f31 +/* 8027090C 0026D84C 4C 40 13 82 */ cror 2, 0, 2 +/* 80270910 0026D850 40 82 00 24 */ bne lbl_80270934 +lbl_80270914: +/* 80270914 0026D854 C0 1F 00 00 */ lfs f0, 0(r31) +/* 80270918 0026D858 D0 1E 00 00 */ stfs f0, 0(r30) +/* 8027091C 0026D85C C0 1F 00 04 */ lfs f0, 4(r31) +/* 80270920 0026D860 D0 1E 00 04 */ stfs f0, 4(r30) +/* 80270924 0026D864 C0 1F 00 08 */ lfs f0, 8(r31) +/* 80270928 0026D868 D0 1E 00 08 */ stfs f0, 8(r30) +/* 8027092C 0026D86C 38 60 00 01 */ li r3, 1 +/* 80270930 0026D870 48 00 00 40 */ b lbl_80270970 +lbl_80270934: +/* 80270934 0026D874 38 61 00 0C */ addi r3, r1, 0xc +/* 80270938 0026D878 38 81 00 24 */ addi r4, r1, 0x24 +/* 8027093C 0026D87C EC 3F 08 24 */ fdivs f1, f31, f1 +/* 80270940 0026D880 4B FF 62 45 */ bl __ml__4cXyzCFf +/* 80270944 0026D884 7F C3 F3 78 */ mr r3, r30 +/* 80270948 0026D888 38 81 00 0C */ addi r4, r1, 0xc +/* 8027094C 0026D88C 7F C5 F3 78 */ mr r5, r30 +/* 80270950 0026D890 48 0D 67 65 */ bl PSVECSubtract +/* 80270954 0026D894 48 00 00 18 */ b lbl_8027096C +lbl_80270958: +/* 80270958 0026D898 4B FF 66 D5 */ bl __eq__4cXyzCFRC3Vec +/* 8027095C 0026D89C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80270960 0026D8A0 41 82 00 0C */ beq lbl_8027096C +/* 80270964 0026D8A4 38 60 00 01 */ li r3, 1 +/* 80270968 0026D8A8 48 00 00 08 */ b lbl_80270970 +lbl_8027096C: +/* 8027096C 0026D8AC 38 60 00 00 */ li r3, 0 +lbl_80270970: +/* 80270970 0026D8B0 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 +/* 80270974 0026D8B4 CB E1 00 40 */ lfd f31, 0x40(r1) +/* 80270978 0026D8B8 83 E1 00 3C */ lwz r31, 0x3c(r1) +/* 8027097C 0026D8BC 83 C1 00 38 */ lwz r30, 0x38(r1) +/* 80270980 0026D8C0 80 01 00 54 */ lwz r0, 0x54(r1) +/* 80270984 0026D8C4 7C 08 03 A6 */ mtlr r0 +/* 80270988 0026D8C8 38 21 00 50 */ addi r1, r1, 0x50 +/* 8027098C 0026D8CC 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_lib/asm/func_80270990.s b/include/SComponent/c_lib/asm/func_80270990.s new file mode 100644 index 0000000000..6a5f311889 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270990.s @@ -0,0 +1,142 @@ +/* 80270990 0026D8D0 94 21 FF A0 */ stwu r1, -0x60(r1) +/* 80270994 0026D8D4 7C 08 02 A6 */ mflr r0 +/* 80270998 0026D8D8 90 01 00 64 */ stw r0, 0x64(r1) +/* 8027099C 0026D8DC DB E1 00 50 */ stfd f31, 0x50(r1) +/* 802709A0 0026D8E0 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 +/* 802709A4 0026D8E4 93 E1 00 4C */ stw r31, 0x4c(r1) +/* 802709A8 0026D8E8 93 C1 00 48 */ stw r30, 0x48(r1) +/* 802709AC 0026D8EC 7C 7E 1B 78 */ mr r30, r3 +/* 802709B0 0026D8F0 7C 9F 23 78 */ mr r31, r4 +/* 802709B4 0026D8F4 FF E0 08 90 */ fmr f31, f1 +/* 802709B8 0026D8F8 38 61 00 24 */ addi r3, r1, 0x24 +/* 802709BC 0026D8FC 7F C4 F3 78 */ mr r4, r30 +/* 802709C0 0026D900 7F E5 FB 78 */ mr r5, r31 +/* 802709C4 0026D904 4B FF 61 71 */ bl __mi__4cXyzCFRC3Vec +/* 802709C8 0026D908 C0 41 00 24 */ lfs f2, 0x24(r1) +/* 802709CC 0026D90C D0 41 00 30 */ stfs f2, 0x30(r1) +/* 802709D0 0026D910 C0 01 00 28 */ lfs f0, 0x28(r1) +/* 802709D4 0026D914 D0 01 00 34 */ stfs f0, 0x34(r1) +/* 802709D8 0026D918 C0 21 00 2C */ lfs f1, 0x2c(r1) +/* 802709DC 0026D91C D0 21 00 38 */ stfs f1, 0x38(r1) +/* 802709E0 0026D920 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 802709E4 0026D924 D0 01 00 34 */ stfs f0, 0x34(r1) +/* 802709E8 0026D928 D0 41 00 0C */ stfs f2, 0xc(r1) +/* 802709EC 0026D92C D0 01 00 10 */ stfs f0, 0x10(r1) +/* 802709F0 0026D930 D0 21 00 14 */ stfs f1, 0x14(r1) +/* 802709F4 0026D934 38 61 00 0C */ addi r3, r1, 0xc +/* 802709F8 0026D938 48 0D 67 41 */ bl PSVECSquareMag +/* 802709FC 0026D93C C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 80270A00 0026D940 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80270A04 0026D944 40 81 00 58 */ ble lbl_80270A5C +/* 80270A08 0026D948 FC 00 08 34 */ frsqrte f0, f1 +/* 80270A0C 0026D94C C8 82 B7 E8 */ lfd f4, lbl_804551E8-_SDA2_BASE_(r2) +/* 80270A10 0026D950 FC 44 00 32 */ fmul f2, f4, f0 +/* 80270A14 0026D954 C8 62 B7 F0 */ lfd f3, lbl_804551F0-_SDA2_BASE_(r2) +/* 80270A18 0026D958 FC 00 00 32 */ fmul f0, f0, f0 +/* 80270A1C 0026D95C FC 01 00 32 */ fmul f0, f1, f0 +/* 80270A20 0026D960 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270A24 0026D964 FC 02 00 32 */ fmul f0, f2, f0 +/* 80270A28 0026D968 FC 44 00 32 */ fmul f2, f4, f0 +/* 80270A2C 0026D96C FC 00 00 32 */ fmul f0, f0, f0 +/* 80270A30 0026D970 FC 01 00 32 */ fmul f0, f1, f0 +/* 80270A34 0026D974 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270A38 0026D978 FC 02 00 32 */ fmul f0, f2, f0 +/* 80270A3C 0026D97C FC 44 00 32 */ fmul f2, f4, f0 +/* 80270A40 0026D980 FC 00 00 32 */ fmul f0, f0, f0 +/* 80270A44 0026D984 FC 01 00 32 */ fmul f0, f1, f0 +/* 80270A48 0026D988 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270A4C 0026D98C FC 02 00 32 */ fmul f0, f2, f0 +/* 80270A50 0026D990 FC 21 00 32 */ fmul f1, f1, f0 +/* 80270A54 0026D994 FC 20 08 18 */ frsp f1, f1 +/* 80270A58 0026D998 48 00 00 88 */ b lbl_80270AE0 +lbl_80270A5C: +/* 80270A5C 0026D99C C8 02 B7 F8 */ lfd f0, lbl_804551F8-_SDA2_BASE_(r2) +/* 80270A60 0026D9A0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80270A64 0026D9A4 40 80 00 10 */ bge lbl_80270A74 +/* 80270A68 0026D9A8 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 80270A6C 0026D9AC C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 80270A70 0026D9B0 48 00 00 70 */ b lbl_80270AE0 +lbl_80270A74: +/* 80270A74 0026D9B4 D0 21 00 08 */ stfs f1, 8(r1) +/* 80270A78 0026D9B8 80 81 00 08 */ lwz r4, 8(r1) +/* 80270A7C 0026D9BC 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 80270A80 0026D9C0 3C 00 7F 80 */ lis r0, 0x7f80 +/* 80270A84 0026D9C4 7C 03 00 00 */ cmpw r3, r0 +/* 80270A88 0026D9C8 41 82 00 14 */ beq lbl_80270A9C +/* 80270A8C 0026D9CC 40 80 00 40 */ bge lbl_80270ACC +/* 80270A90 0026D9D0 2C 03 00 00 */ cmpwi r3, 0 +/* 80270A94 0026D9D4 41 82 00 20 */ beq lbl_80270AB4 +/* 80270A98 0026D9D8 48 00 00 34 */ b lbl_80270ACC +lbl_80270A9C: +/* 80270A9C 0026D9DC 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 80270AA0 0026D9E0 41 82 00 0C */ beq lbl_80270AAC +/* 80270AA4 0026D9E4 38 00 00 01 */ li r0, 1 +/* 80270AA8 0026D9E8 48 00 00 28 */ b lbl_80270AD0 +lbl_80270AAC: +/* 80270AAC 0026D9EC 38 00 00 02 */ li r0, 2 +/* 80270AB0 0026D9F0 48 00 00 20 */ b lbl_80270AD0 +lbl_80270AB4: +/* 80270AB4 0026D9F4 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 80270AB8 0026D9F8 41 82 00 0C */ beq lbl_80270AC4 +/* 80270ABC 0026D9FC 38 00 00 05 */ li r0, 5 +/* 80270AC0 0026DA00 48 00 00 10 */ b lbl_80270AD0 +lbl_80270AC4: +/* 80270AC4 0026DA04 38 00 00 03 */ li r0, 3 +/* 80270AC8 0026DA08 48 00 00 08 */ b lbl_80270AD0 +lbl_80270ACC: +/* 80270ACC 0026DA0C 38 00 00 04 */ li r0, 4 +lbl_80270AD0: +/* 80270AD0 0026DA10 2C 00 00 01 */ cmpwi r0, 1 +/* 80270AD4 0026DA14 40 82 00 0C */ bne lbl_80270AE0 +/* 80270AD8 0026DA18 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 80270ADC 0026DA1C C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +lbl_80270AE0: +/* 80270AE0 0026DA20 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 80270AE4 0026DA24 FC 1F 00 00 */ fcmpu cr0, f31, f0 +/* 80270AE8 0026DA28 41 82 00 68 */ beq lbl_80270B50 +/* 80270AEC 0026DA2C FC 00 0A 10 */ fabs f0, f1 +/* 80270AF0 0026DA30 FC 40 00 18 */ frsp f2, f0 +/* 80270AF4 0026DA34 C0 02 B8 00 */ lfs f0, lbl_80455200-_SDA2_BASE_(r2) +/* 80270AF8 0026DA38 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 80270AFC 0026DA3C 41 80 00 10 */ blt lbl_80270B0C +/* 80270B00 0026DA40 FC 01 F8 40 */ fcmpo cr0, f1, f31 +/* 80270B04 0026DA44 4C 40 13 82 */ cror 2, 0, 2 +/* 80270B08 0026DA48 40 82 00 24 */ bne lbl_80270B2C +lbl_80270B0C: +/* 80270B0C 0026DA4C C0 1F 00 00 */ lfs f0, 0(r31) +/* 80270B10 0026DA50 D0 1E 00 00 */ stfs f0, 0(r30) +/* 80270B14 0026DA54 C0 1F 00 04 */ lfs f0, 4(r31) +/* 80270B18 0026DA58 D0 1E 00 04 */ stfs f0, 4(r30) +/* 80270B1C 0026DA5C C0 1F 00 08 */ lfs f0, 8(r31) +/* 80270B20 0026DA60 D0 1E 00 08 */ stfs f0, 8(r30) +/* 80270B24 0026DA64 38 60 00 01 */ li r3, 1 +/* 80270B28 0026DA68 48 00 00 48 */ b lbl_80270B70 +lbl_80270B2C: +/* 80270B2C 0026DA6C 38 61 00 18 */ addi r3, r1, 0x18 +/* 80270B30 0026DA70 38 81 00 30 */ addi r4, r1, 0x30 +/* 80270B34 0026DA74 EC 3F 08 24 */ fdivs f1, f31, f1 +/* 80270B38 0026DA78 4B FF 60 4D */ bl __ml__4cXyzCFf +/* 80270B3C 0026DA7C 7F C3 F3 78 */ mr r3, r30 +/* 80270B40 0026DA80 38 81 00 18 */ addi r4, r1, 0x18 +/* 80270B44 0026DA84 7F C5 F3 78 */ mr r5, r30 +/* 80270B48 0026DA88 48 0D 65 6D */ bl PSVECSubtract +/* 80270B4C 0026DA8C 48 00 00 20 */ b lbl_80270B6C +lbl_80270B50: +/* 80270B50 0026DA90 FC 00 0A 10 */ fabs f0, f1 +/* 80270B54 0026DA94 FC 20 00 18 */ frsp f1, f0 +/* 80270B58 0026DA98 C0 02 B8 00 */ lfs f0, lbl_80455200-_SDA2_BASE_(r2) +/* 80270B5C 0026DA9C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80270B60 0026DAA0 40 80 00 0C */ bge lbl_80270B6C +/* 80270B64 0026DAA4 38 60 00 01 */ li r3, 1 +/* 80270B68 0026DAA8 48 00 00 08 */ b lbl_80270B70 +lbl_80270B6C: +/* 80270B6C 0026DAAC 38 60 00 00 */ li r3, 0 +lbl_80270B70: +/* 80270B70 0026DAB0 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 +/* 80270B74 0026DAB4 CB E1 00 50 */ lfd f31, 0x50(r1) +/* 80270B78 0026DAB8 83 E1 00 4C */ lwz r31, 0x4c(r1) +/* 80270B7C 0026DABC 83 C1 00 48 */ lwz r30, 0x48(r1) +/* 80270B80 0026DAC0 80 01 00 64 */ lwz r0, 0x64(r1) +/* 80270B84 0026DAC4 7C 08 03 A6 */ mtlr r0 +/* 80270B88 0026DAC8 38 21 00 60 */ addi r1, r1, 0x60 +/* 80270B8C 0026DACC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_80270B90.s b/include/SComponent/c_lib/asm/func_80270B90.s new file mode 100644 index 0000000000..98bca2b370 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270B90.s @@ -0,0 +1,32 @@ +/* 80270B90 0026DAD0 7C A0 07 35 */ extsh. r0, r5 +/* 80270B94 0026DAD4 41 82 00 50 */ beq lbl_80270BE4 +/* 80270B98 0026DAD8 7C 86 07 34 */ extsh r6, r4 +/* 80270B9C 0026DADC A8 03 00 00 */ lha r0, 0(r3) +/* 80270BA0 0026DAE0 7C 06 00 50 */ subf r0, r6, r0 +/* 80270BA4 0026DAE4 7C 00 07 35 */ extsh. r0, r0 +/* 80270BA8 0026DAE8 40 81 00 0C */ ble lbl_80270BB4 +/* 80270BAC 0026DAEC 7C 05 00 D0 */ neg r0, r5 +/* 80270BB0 0026DAF0 7C 05 07 34 */ extsh r5, r0 +lbl_80270BB4: +/* 80270BB4 0026DAF4 A8 03 00 00 */ lha r0, 0(r3) +/* 80270BB8 0026DAF8 7C 00 2A 14 */ add r0, r0, r5 +/* 80270BBC 0026DAFC B0 03 00 00 */ sth r0, 0(r3) +/* 80270BC0 0026DB00 7C A5 07 34 */ extsh r5, r5 +/* 80270BC4 0026DB04 A8 03 00 00 */ lha r0, 0(r3) +/* 80270BC8 0026DB08 7C 06 00 50 */ subf r0, r6, r0 +/* 80270BCC 0026DB0C 7C 00 07 34 */ extsh r0, r0 +/* 80270BD0 0026DB10 7C 05 01 D7 */ mullw. r0, r5, r0 +/* 80270BD4 0026DB14 41 80 00 28 */ blt lbl_80270BFC +/* 80270BD8 0026DB18 B0 83 00 00 */ sth r4, 0(r3) +/* 80270BDC 0026DB1C 38 60 00 01 */ li r3, 1 +/* 80270BE0 0026DB20 4E 80 00 20 */ blr +lbl_80270BE4: +/* 80270BE4 0026DB24 A8 63 00 00 */ lha r3, 0(r3) +/* 80270BE8 0026DB28 7C 80 07 34 */ extsh r0, r4 +/* 80270BEC 0026DB2C 7C 03 00 00 */ cmpw r3, r0 +/* 80270BF0 0026DB30 40 82 00 0C */ bne lbl_80270BFC +/* 80270BF4 0026DB34 38 60 00 01 */ li r3, 1 +/* 80270BF8 0026DB38 4E 80 00 20 */ blr +lbl_80270BFC: +/* 80270BFC 0026DB3C 38 60 00 00 */ li r3, 0 +/* 80270C00 0026DB40 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_80270C04.s b/include/SComponent/c_lib/asm/func_80270C04.s new file mode 100644 index 0000000000..9c457bf697 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270C04.s @@ -0,0 +1,14 @@ +/* 80270C04 0026DB44 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80270C08 0026DB48 7C 08 02 A6 */ mflr r0 +/* 80270C0C 0026DB4C 90 01 00 14 */ stw r0, 0x14(r1) +/* 80270C10 0026DB50 C0 24 00 00 */ lfs f1, 0(r4) +/* 80270C14 0026DB54 C0 03 00 00 */ lfs f0, 0(r3) +/* 80270C18 0026DB58 EC 21 00 28 */ fsubs f1, f1, f0 +/* 80270C1C 0026DB5C C0 44 00 08 */ lfs f2, 8(r4) +/* 80270C20 0026DB60 C0 03 00 08 */ lfs f0, 8(r3) +/* 80270C24 0026DB64 EC 42 00 28 */ fsubs f2, f2, f0 +/* 80270C28 0026DB68 4B FF 6A 4D */ bl cM_atan2s__Fff +/* 80270C2C 0026DB6C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80270C30 0026DB70 7C 08 03 A6 */ mtlr r0 +/* 80270C34 0026DB74 38 21 00 10 */ addi r1, r1, 0x10 +/* 80270C38 0026DB78 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_lib/asm/func_80270C3C.s b/include/SComponent/c_lib/asm/func_80270C3C.s new file mode 100644 index 0000000000..63be618be3 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270C3C.s @@ -0,0 +1,14 @@ +/* 80270C3C 0026DB7C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80270C40 0026DB80 7C 08 02 A6 */ mflr r0 +/* 80270C44 0026DB84 90 01 00 14 */ stw r0, 0x14(r1) +/* 80270C48 0026DB88 C0 24 00 00 */ lfs f1, 0(r4) +/* 80270C4C 0026DB8C C0 03 00 00 */ lfs f0, 0(r3) +/* 80270C50 0026DB90 EC 21 00 28 */ fsubs f1, f1, f0 +/* 80270C54 0026DB94 C0 44 00 08 */ lfs f2, 8(r4) +/* 80270C58 0026DB98 C0 03 00 08 */ lfs f0, 8(r3) +/* 80270C5C 0026DB9C EC 42 00 28 */ fsubs f2, f2, f0 +/* 80270C60 0026DBA0 4B FF 6A 15 */ bl cM_atan2s__Fff +/* 80270C64 0026DBA4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80270C68 0026DBA8 7C 08 03 A6 */ mtlr r0 +/* 80270C6C 0026DBAC 38 21 00 10 */ addi r1, r1, 0x10 +/* 80270C70 0026DBB0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_80270C74.s b/include/SComponent/c_lib/asm/func_80270C74.s new file mode 100644 index 0000000000..22534f042b --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270C74.s @@ -0,0 +1,93 @@ +/* 80270C74 0026DBB4 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 80270C78 0026DBB8 7C 08 02 A6 */ mflr r0 +/* 80270C7C 0026DBBC 90 01 00 34 */ stw r0, 0x34(r1) +/* 80270C80 0026DBC0 7C 65 1B 78 */ mr r5, r3 +/* 80270C84 0026DBC4 38 61 00 18 */ addi r3, r1, 0x18 +/* 80270C88 0026DBC8 4B FF 5E AD */ bl __mi__4cXyzCFRC3Vec +/* 80270C8C 0026DBCC C0 41 00 18 */ lfs f2, 0x18(r1) +/* 80270C90 0026DBD0 D0 41 00 24 */ stfs f2, 0x24(r1) +/* 80270C94 0026DBD4 C0 01 00 1C */ lfs f0, 0x1c(r1) +/* 80270C98 0026DBD8 D0 01 00 28 */ stfs f0, 0x28(r1) +/* 80270C9C 0026DBDC C0 21 00 20 */ lfs f1, 0x20(r1) +/* 80270CA0 0026DBE0 D0 21 00 2C */ stfs f1, 0x2c(r1) +/* 80270CA4 0026DBE4 D0 41 00 0C */ stfs f2, 0xc(r1) +/* 80270CA8 0026DBE8 C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 80270CAC 0026DBEC D0 01 00 10 */ stfs f0, 0x10(r1) +/* 80270CB0 0026DBF0 D0 21 00 14 */ stfs f1, 0x14(r1) +/* 80270CB4 0026DBF4 38 61 00 0C */ addi r3, r1, 0xc +/* 80270CB8 0026DBF8 48 0D 64 81 */ bl PSVECSquareMag +/* 80270CBC 0026DBFC C0 02 B7 E0 */ lfs f0, lbl_804551E0-_SDA2_BASE_(r2) +/* 80270CC0 0026DC00 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80270CC4 0026DC04 40 81 00 58 */ ble lbl_80270D1C +/* 80270CC8 0026DC08 FC 00 08 34 */ frsqrte f0, f1 +/* 80270CCC 0026DC0C C8 82 B7 E8 */ lfd f4, lbl_804551E8-_SDA2_BASE_(r2) +/* 80270CD0 0026DC10 FC 44 00 32 */ fmul f2, f4, f0 +/* 80270CD4 0026DC14 C8 62 B7 F0 */ lfd f3, lbl_804551F0-_SDA2_BASE_(r2) +/* 80270CD8 0026DC18 FC 00 00 32 */ fmul f0, f0, f0 +/* 80270CDC 0026DC1C FC 01 00 32 */ fmul f0, f1, f0 +/* 80270CE0 0026DC20 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270CE4 0026DC24 FC 02 00 32 */ fmul f0, f2, f0 +/* 80270CE8 0026DC28 FC 44 00 32 */ fmul f2, f4, f0 +/* 80270CEC 0026DC2C FC 00 00 32 */ fmul f0, f0, f0 +/* 80270CF0 0026DC30 FC 01 00 32 */ fmul f0, f1, f0 +/* 80270CF4 0026DC34 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270CF8 0026DC38 FC 02 00 32 */ fmul f0, f2, f0 +/* 80270CFC 0026DC3C FC 44 00 32 */ fmul f2, f4, f0 +/* 80270D00 0026DC40 FC 00 00 32 */ fmul f0, f0, f0 +/* 80270D04 0026DC44 FC 01 00 32 */ fmul f0, f1, f0 +/* 80270D08 0026DC48 FC 03 00 28 */ fsub f0, f3, f0 +/* 80270D0C 0026DC4C FC 02 00 32 */ fmul f0, f2, f0 +/* 80270D10 0026DC50 FC 41 00 32 */ fmul f2, f1, f0 +/* 80270D14 0026DC54 FC 40 10 18 */ frsp f2, f2 +/* 80270D18 0026DC58 48 00 00 90 */ b lbl_80270DA8 +lbl_80270D1C: +/* 80270D1C 0026DC5C C8 02 B7 F8 */ lfd f0, lbl_804551F8-_SDA2_BASE_(r2) +/* 80270D20 0026DC60 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80270D24 0026DC64 40 80 00 10 */ bge lbl_80270D34 +/* 80270D28 0026DC68 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 80270D2C 0026DC6C C0 43 0A E0 */ lfs f2, lbl_80450AE0@l(r3) +/* 80270D30 0026DC70 48 00 00 78 */ b lbl_80270DA8 +lbl_80270D34: +/* 80270D34 0026DC74 D0 21 00 08 */ stfs f1, 8(r1) +/* 80270D38 0026DC78 80 81 00 08 */ lwz r4, 8(r1) +/* 80270D3C 0026DC7C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 80270D40 0026DC80 3C 00 7F 80 */ lis r0, 0x7f80 +/* 80270D44 0026DC84 7C 03 00 00 */ cmpw r3, r0 +/* 80270D48 0026DC88 41 82 00 14 */ beq lbl_80270D5C +/* 80270D4C 0026DC8C 40 80 00 40 */ bge lbl_80270D8C +/* 80270D50 0026DC90 2C 03 00 00 */ cmpwi r3, 0 +/* 80270D54 0026DC94 41 82 00 20 */ beq lbl_80270D74 +/* 80270D58 0026DC98 48 00 00 34 */ b lbl_80270D8C +lbl_80270D5C: +/* 80270D5C 0026DC9C 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 80270D60 0026DCA0 41 82 00 0C */ beq lbl_80270D6C +/* 80270D64 0026DCA4 38 00 00 01 */ li r0, 1 +/* 80270D68 0026DCA8 48 00 00 28 */ b lbl_80270D90 +lbl_80270D6C: +/* 80270D6C 0026DCAC 38 00 00 02 */ li r0, 2 +/* 80270D70 0026DCB0 48 00 00 20 */ b lbl_80270D90 +lbl_80270D74: +/* 80270D74 0026DCB4 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 80270D78 0026DCB8 41 82 00 0C */ beq lbl_80270D84 +/* 80270D7C 0026DCBC 38 00 00 05 */ li r0, 5 +/* 80270D80 0026DCC0 48 00 00 10 */ b lbl_80270D90 +lbl_80270D84: +/* 80270D84 0026DCC4 38 00 00 03 */ li r0, 3 +/* 80270D88 0026DCC8 48 00 00 08 */ b lbl_80270D90 +lbl_80270D8C: +/* 80270D8C 0026DCCC 38 00 00 04 */ li r0, 4 +lbl_80270D90: +/* 80270D90 0026DCD0 2C 00 00 01 */ cmpwi r0, 1 +/* 80270D94 0026DCD4 40 82 00 10 */ bne lbl_80270DA4 +/* 80270D98 0026DCD8 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 80270D9C 0026DCDC C0 43 0A E0 */ lfs f2, lbl_80450AE0@l(r3) +/* 80270DA0 0026DCE0 48 00 00 08 */ b lbl_80270DA8 +lbl_80270DA4: +/* 80270DA4 0026DCE4 FC 40 08 90 */ fmr f2, f1 +lbl_80270DA8: +/* 80270DA8 0026DCE8 C0 21 00 28 */ lfs f1, 0x28(r1) +/* 80270DAC 0026DCEC 4B FF 68 C9 */ bl cM_atan2s__Fff +/* 80270DB0 0026DCF0 80 01 00 34 */ lwz r0, 0x34(r1) +/* 80270DB4 0026DCF4 7C 08 03 A6 */ mtlr r0 +/* 80270DB8 0026DCF8 38 21 00 30 */ addi r1, r1, 0x30 +/* 80270DBC 0026DCFC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_80270DC0.s b/include/SComponent/c_lib/asm/func_80270DC0.s new file mode 100644 index 0000000000..bf0dbc5e23 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270DC0.s @@ -0,0 +1,25 @@ +/* 80270DC0 0026DD00 3C E0 80 44 */ lis r7, lbl_80439A20@ha +/* 80270DC4 0026DD04 38 E7 9A 20 */ addi r7, r7, lbl_80439A20@l +/* 80270DC8 0026DD08 54 A0 04 38 */ rlwinm r0, r5, 0, 0x10, 0x1c +/* 80270DCC 0026DD0C 7C A7 02 14 */ add r5, r7, r0 +/* 80270DD0 0026DD10 C0 A5 00 04 */ lfs f5, 4(r5) +/* 80270DD4 0026DD14 7C C7 04 2E */ lfsx f6, r7, r0 +/* 80270DD8 0026DD18 C0 44 00 00 */ lfs f2, 0(r4) +/* 80270DDC 0026DD1C C0 86 00 00 */ lfs f4, 0(r6) +/* 80270DE0 0026DD20 EC 24 01 72 */ fmuls f1, f4, f5 +/* 80270DE4 0026DD24 C0 66 00 08 */ lfs f3, 8(r6) +/* 80270DE8 0026DD28 EC 03 01 B2 */ fmuls f0, f3, f6 +/* 80270DEC 0026DD2C EC 01 00 2A */ fadds f0, f1, f0 +/* 80270DF0 0026DD30 EC 02 00 2A */ fadds f0, f2, f0 +/* 80270DF4 0026DD34 D0 03 00 00 */ stfs f0, 0(r3) +/* 80270DF8 0026DD38 C0 24 00 04 */ lfs f1, 4(r4) +/* 80270DFC 0026DD3C C0 06 00 04 */ lfs f0, 4(r6) +/* 80270E00 0026DD40 EC 01 00 2A */ fadds f0, f1, f0 +/* 80270E04 0026DD44 D0 03 00 04 */ stfs f0, 4(r3) +/* 80270E08 0026DD48 C0 44 00 08 */ lfs f2, 8(r4) +/* 80270E0C 0026DD4C EC 23 01 72 */ fmuls f1, f3, f5 +/* 80270E10 0026DD50 EC 04 01 B2 */ fmuls f0, f4, f6 +/* 80270E14 0026DD54 EC 01 00 28 */ fsubs f0, f1, f0 +/* 80270E18 0026DD58 EC 02 00 2A */ fadds f0, f2, f0 +/* 80270E1C 0026DD5C D0 03 00 08 */ stfs f0, 8(r3) +/* 80270E20 0026DD60 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_80270E24.s b/include/SComponent/c_lib/asm/func_80270E24.s new file mode 100644 index 0000000000..9937d1fe9f --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270E24.s @@ -0,0 +1,10 @@ +/* 80270E24 0026DD64 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80270E28 0026DD68 7C 08 02 A6 */ mflr r0 +/* 80270E2C 0026DD6C 90 01 00 14 */ stw r0, 0x14(r1) +/* 80270E30 0026DD70 7C 04 18 50 */ subf r0, r4, r3 +/* 80270E34 0026DD74 7C 03 07 34 */ extsh r3, r0 +/* 80270E38 0026DD78 48 0F 42 99 */ bl func_803650D0 +/* 80270E3C 0026DD7C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80270E40 0026DD80 7C 08 03 A6 */ mtlr r0 +/* 80270E44 0026DD84 38 21 00 10 */ addi r1, r1, 0x10 +/* 80270E48 0026DD88 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_80270E4C.s b/include/SComponent/c_lib/asm/func_80270E4C.s new file mode 100644 index 0000000000..52f4ce3876 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270E4C.s @@ -0,0 +1,4 @@ +/* 80270E4C 0026DD8C 3C 60 80 43 */ lis r3, lbl_80430DB8@ha +/* 80270E50 0026DD90 38 03 0D B8 */ addi r0, r3, lbl_80430DB8@l +/* 80270E54 0026DD94 90 0D 81 E8 */ stw r0, lbl_80450768-_SDA_BASE_(r13) +/* 80270E58 0026DD98 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_lib/asm/func_80270E5C.s b/include/SComponent/c_lib/asm/func_80270E5C.s new file mode 100644 index 0000000000..f2c58faff2 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270E5C.s @@ -0,0 +1,20 @@ +/* 80270E5C 0026DD9C 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 80270E60 0026DDA0 7C 08 02 A6 */ mflr r0 +/* 80270E64 0026DDA4 90 01 00 44 */ stw r0, 0x44(r1) +/* 80270E68 0026DDA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80270E6C 0026DDAC 40 82 00 10 */ bne lbl_80270E7C +/* 80270E70 0026DDB0 80 6D 81 E8 */ lwz r3, lbl_80450768-_SDA_BASE_(r13) +/* 80270E74 0026DDB4 48 0D 5A 75 */ bl PSMTXTrans +/* 80270E78 0026DDB8 48 00 00 1C */ b lbl_80270E94 +lbl_80270E7C: +/* 80270E7C 0026DDBC 38 61 00 08 */ addi r3, r1, 8 +/* 80270E80 0026DDC0 48 0D 5A 69 */ bl PSMTXTrans +/* 80270E84 0026DDC4 80 6D 81 E8 */ lwz r3, lbl_80450768-_SDA_BASE_(r13) +/* 80270E88 0026DDC8 38 81 00 08 */ addi r4, r1, 8 +/* 80270E8C 0026DDCC 7C 65 1B 78 */ mr r5, r3 +/* 80270E90 0026DDD0 48 0D 56 55 */ bl PSMTXConcat +lbl_80270E94: +/* 80270E94 0026DDD4 80 01 00 44 */ lwz r0, 0x44(r1) +/* 80270E98 0026DDD8 7C 08 03 A6 */ mtlr r0 +/* 80270E9C 0026DDDC 38 21 00 40 */ addi r1, r1, 0x40 +/* 80270EA0 0026DDE0 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_lib/asm/func_80270EA4.s b/include/SComponent/c_lib/asm/func_80270EA4.s new file mode 100644 index 0000000000..d749213bef --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270EA4.s @@ -0,0 +1,20 @@ +/* 80270EA4 0026DDE4 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 80270EA8 0026DDE8 7C 08 02 A6 */ mflr r0 +/* 80270EAC 0026DDEC 90 01 00 44 */ stw r0, 0x44(r1) +/* 80270EB0 0026DDF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80270EB4 0026DDF4 40 82 00 10 */ bne lbl_80270EC4 +/* 80270EB8 0026DDF8 80 6D 81 E8 */ lwz r3, lbl_80450768-_SDA_BASE_(r13) +/* 80270EBC 0026DDFC 48 0D 5A AD */ bl PSMTXScale +/* 80270EC0 0026DE00 48 00 00 1C */ b lbl_80270EDC +lbl_80270EC4: +/* 80270EC4 0026DE04 38 61 00 08 */ addi r3, r1, 8 +/* 80270EC8 0026DE08 48 0D 5A A1 */ bl PSMTXScale +/* 80270ECC 0026DE0C 80 6D 81 E8 */ lwz r3, lbl_80450768-_SDA_BASE_(r13) +/* 80270ED0 0026DE10 38 81 00 08 */ addi r4, r1, 8 +/* 80270ED4 0026DE14 7C 65 1B 78 */ mr r5, r3 +/* 80270ED8 0026DE18 48 0D 56 0D */ bl PSMTXConcat +lbl_80270EDC: +/* 80270EDC 0026DE1C 80 01 00 44 */ lwz r0, 0x44(r1) +/* 80270EE0 0026DE20 7C 08 03 A6 */ mtlr r0 +/* 80270EE4 0026DE24 38 21 00 40 */ addi r1, r1, 0x40 +/* 80270EE8 0026DE28 4E 80 00 20 */ blr diff --git a/include/SComponent/c_lib/asm/func_80270EEC.s b/include/SComponent/c_lib/asm/func_80270EEC.s new file mode 100644 index 0000000000..03dcd859d2 --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270EEC.s @@ -0,0 +1,12 @@ +/* 80270EEC 0026DE2C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80270EF0 0026DE30 7C 08 02 A6 */ mflr r0 +/* 80270EF4 0026DE34 90 01 00 14 */ stw r0, 0x14(r1) +/* 80270EF8 0026DE38 7C 60 1B 78 */ mr r0, r3 +/* 80270EFC 0026DE3C 7C 85 23 78 */ mr r5, r4 +/* 80270F00 0026DE40 80 6D 81 E8 */ lwz r3, lbl_80450768-_SDA_BASE_(r13) +/* 80270F04 0026DE44 7C 04 03 78 */ mr r4, r0 +/* 80270F08 0026DE48 48 0D 5E 65 */ bl PSMTXMultVec +/* 80270F0C 0026DE4C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80270F10 0026DE50 7C 08 03 A6 */ mtlr r0 +/* 80270F14 0026DE54 38 21 00 10 */ addi r1, r1, 0x10 +/* 80270F18 0026DE58 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_lib/asm/func_80270F1C.s b/include/SComponent/c_lib/asm/func_80270F1C.s new file mode 100644 index 0000000000..0af320cb5e --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270F1C.s @@ -0,0 +1,15 @@ +/* 80270F1C 0026DE5C 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 80270F20 0026DE60 7C 08 02 A6 */ mflr r0 +/* 80270F24 0026DE64 90 01 00 44 */ stw r0, 0x44(r1) +/* 80270F28 0026DE68 80 6D 81 E8 */ lwz r3, lbl_80450768-_SDA_BASE_(r13) +/* 80270F2C 0026DE6C 38 81 00 08 */ addi r4, r1, 8 +/* 80270F30 0026DE70 48 0D 55 81 */ bl PSMTXCopy +/* 80270F34 0026DE74 80 6D 81 E8 */ lwz r3, lbl_80450768-_SDA_BASE_(r13) +/* 80270F38 0026DE78 38 83 00 30 */ addi r4, r3, 0x30 +/* 80270F3C 0026DE7C 90 8D 81 E8 */ stw r4, lbl_80450768-_SDA_BASE_(r13) +/* 80270F40 0026DE80 38 61 00 08 */ addi r3, r1, 8 +/* 80270F44 0026DE84 48 0D 55 6D */ bl PSMTXCopy +/* 80270F48 0026DE88 80 01 00 44 */ lwz r0, 0x44(r1) +/* 80270F4C 0026DE8C 7C 08 03 A6 */ mtlr r0 +/* 80270F50 0026DE90 38 21 00 40 */ addi r1, r1, 0x40 +/* 80270F54 0026DE94 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_lib/asm/func_80270F58.s b/include/SComponent/c_lib/asm/func_80270F58.s new file mode 100644 index 0000000000..13edeae85d --- /dev/null +++ b/include/SComponent/c_lib/asm/func_80270F58.s @@ -0,0 +1,4 @@ +/* 80270F58 0026DE98 80 6D 81 E8 */ lwz r3, lbl_80450768-_SDA_BASE_(r13) +/* 80270F5C 0026DE9C 38 03 FF D0 */ addi r0, r3, -48 +/* 80270F60 0026DEA0 90 0D 81 E8 */ stw r0, lbl_80450768-_SDA_BASE_(r13) +/* 80270F64 0026DEA4 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m2d.h b/include/SComponent/c_m2d.h new file mode 100644 index 0000000000..5023a29d7b --- /dev/null +++ b/include/SComponent/c_m2d.h @@ -0,0 +1,10 @@ +#ifndef __C_M2D_H_ +#define __C_M2D_H_ + +#include "global.h" + +struct cM2dGCir; + +void cM2d_CrossCirLin(cM2dGCir&, float, float, float, float, float*, float*); + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_m2d/asm/func_80268260.s b/include/SComponent/c_m2d/asm/func_80268260.s new file mode 100644 index 0000000000..e13d0daa89 --- /dev/null +++ b/include/SComponent/c_m2d/asm/func_80268260.s @@ -0,0 +1,218 @@ +/* 80268260 002651A0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80268264 002651A4 C0 03 00 00 */ lfs f0, 0(r3) +/* 80268268 002651A8 EC E1 00 28 */ fsubs f7, f1, f0 +/* 8026826C 002651AC C0 03 00 04 */ lfs f0, 4(r3) +/* 80268270 002651B0 ED 02 00 28 */ fsubs f8, f2, f0 +/* 80268274 002651B4 EC C3 00 F2 */ fmuls f6, f3, f3 +/* 80268278 002651B8 EC 04 01 32 */ fmuls f0, f4, f4 +/* 8026827C 002651BC ED 46 00 2A */ fadds f10, f6, f0 +/* 80268280 002651C0 C1 22 B6 F0 */ lfs f9, lbl_804550F0-_SDA2_BASE_(r2) +/* 80268284 002651C4 EC C3 01 F2 */ fmuls f6, f3, f7 +/* 80268288 002651C8 EC 04 02 32 */ fmuls f0, f4, f8 +/* 8026828C 002651CC EC 06 00 2A */ fadds f0, f6, f0 +/* 80268290 002651D0 EC 09 00 32 */ fmuls f0, f9, f0 +/* 80268294 002651D4 EC E7 01 F2 */ fmuls f7, f7, f7 +/* 80268298 002651D8 EC C8 02 32 */ fmuls f6, f8, f8 +/* 8026829C 002651DC EC E7 30 2A */ fadds f7, f7, f6 +/* 802682A0 002651E0 C0 C3 00 08 */ lfs f6, 8(r3) +/* 802682A4 002651E4 EC C6 01 B2 */ fmuls f6, f6, f6 +/* 802682A8 002651E8 ED 67 30 28 */ fsubs f11, f7, f6 +/* 802682AC 002651EC FC C0 52 10 */ fabs f6, f10 +/* 802682B0 002651F0 FC C0 30 18 */ frsp f6, f6 +/* 802682B4 002651F4 C1 0D 8C 00 */ lfs f8, lbl_80451180-_SDA_BASE_(r13) +/* 802682B8 002651F8 FC 06 40 40 */ fcmpo cr0, f6, f8 +/* 802682BC 002651FC 40 80 00 20 */ bge lbl_802682DC +/* 802682C0 00265200 FC C0 02 10 */ fabs f6, f0 +/* 802682C4 00265204 FC C0 30 18 */ frsp f6, f6 +/* 802682C8 00265208 FC 06 40 40 */ fcmpo cr0, f6, f8 +/* 802682CC 0026520C 41 80 02 54 */ blt lbl_80268520 +/* 802682D0 00265210 FC A0 58 50 */ fneg f5, f11 +/* 802682D4 00265214 EC A5 00 24 */ fdivs f5, f5, f0 +/* 802682D8 00265218 48 00 02 48 */ b lbl_80268520 +lbl_802682DC: +/* 802682DC 0026521C EC E0 00 32 */ fmuls f7, f0, f0 +/* 802682E0 00265220 C0 C2 B6 F4 */ lfs f6, lbl_804550F4-_SDA2_BASE_(r2) +/* 802682E4 00265224 EC C6 02 B2 */ fmuls f6, f6, f10 +/* 802682E8 00265228 EC C6 02 F2 */ fmuls f6, f6, f11 +/* 802682EC 0026522C EC C7 30 28 */ fsubs f6, f7, f6 +/* 802682F0 00265230 FC E0 32 10 */ fabs f7, f6 +/* 802682F4 00265234 FC E0 38 18 */ frsp f7, f7 +/* 802682F8 00265238 FC 07 40 40 */ fcmpo cr0, f7, f8 +/* 802682FC 0026523C 40 80 00 14 */ bge lbl_80268310 +/* 80268300 00265240 FC A0 00 50 */ fneg f5, f0 +/* 80268304 00265244 EC 09 02 B2 */ fmuls f0, f9, f10 +/* 80268308 00265248 EC A5 00 24 */ fdivs f5, f5, f0 +/* 8026830C 0026524C 48 00 02 14 */ b lbl_80268520 +lbl_80268310: +/* 80268310 00265250 C0 E2 B6 F8 */ lfs f7, lbl_804550F8-_SDA2_BASE_(r2) +/* 80268314 00265254 FC 06 38 40 */ fcmpo cr0, f6, f7 +/* 80268318 00265258 41 80 02 08 */ blt lbl_80268520 +/* 8026831C 0026525C C0 E2 B6 FC */ lfs f7, lbl_804550FC-_SDA2_BASE_(r2) +/* 80268320 00265260 EC A9 02 B2 */ fmuls f5, f9, f10 +/* 80268324 00265264 EC A7 28 24 */ fdivs f5, f7, f5 +/* 80268328 00265268 40 81 00 58 */ ble lbl_80268380 +/* 8026832C 0026526C FC E0 30 34 */ frsqrte f7, f6 +/* 80268330 00265270 C9 42 B7 00 */ lfd f10, lbl_80455100-_SDA2_BASE_(r2) +/* 80268334 00265274 FD 0A 01 F2 */ fmul f8, f10, f7 +/* 80268338 00265278 C9 22 B7 08 */ lfd f9, lbl_80455108-_SDA2_BASE_(r2) +/* 8026833C 0026527C FC E7 01 F2 */ fmul f7, f7, f7 +/* 80268340 00265280 FC E6 01 F2 */ fmul f7, f6, f7 +/* 80268344 00265284 FC E9 38 28 */ fsub f7, f9, f7 +/* 80268348 00265288 FC E8 01 F2 */ fmul f7, f8, f7 +/* 8026834C 0026528C FD 0A 01 F2 */ fmul f8, f10, f7 +/* 80268350 00265290 FC E7 01 F2 */ fmul f7, f7, f7 +/* 80268354 00265294 FC E6 01 F2 */ fmul f7, f6, f7 +/* 80268358 00265298 FC E9 38 28 */ fsub f7, f9, f7 +/* 8026835C 0026529C FC E8 01 F2 */ fmul f7, f8, f7 +/* 80268360 002652A0 FD 0A 01 F2 */ fmul f8, f10, f7 +/* 80268364 002652A4 FC E7 01 F2 */ fmul f7, f7, f7 +/* 80268368 002652A8 FC E6 01 F2 */ fmul f7, f6, f7 +/* 8026836C 002652AC FC E9 38 28 */ fsub f7, f9, f7 +/* 80268370 002652B0 FC E8 01 F2 */ fmul f7, f8, f7 +/* 80268374 002652B4 FC E6 01 F2 */ fmul f7, f6, f7 +/* 80268378 002652B8 FC E0 38 18 */ frsp f7, f7 +/* 8026837C 002652BC 48 00 00 90 */ b lbl_8026840C +lbl_80268380: +/* 80268380 002652C0 C8 E2 B7 10 */ lfd f7, lbl_80455110-_SDA2_BASE_(r2) +/* 80268384 002652C4 FC 06 38 40 */ fcmpo cr0, f6, f7 +/* 80268388 002652C8 40 80 00 10 */ bge lbl_80268398 +/* 8026838C 002652CC 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 80268390 002652D0 C0 E3 0A E0 */ lfs f7, lbl_80450AE0@l(r3) +/* 80268394 002652D4 48 00 00 78 */ b lbl_8026840C +lbl_80268398: +/* 80268398 002652D8 D0 C1 00 0C */ stfs f6, 0xc(r1) +/* 8026839C 002652DC 80 C1 00 0C */ lwz r6, 0xc(r1) +/* 802683A0 002652E0 54 C3 00 50 */ rlwinm r3, r6, 0, 1, 8 +/* 802683A4 002652E4 3C 00 7F 80 */ lis r0, 0x7f80 +/* 802683A8 002652E8 7C 03 00 00 */ cmpw r3, r0 +/* 802683AC 002652EC 41 82 00 14 */ beq lbl_802683C0 +/* 802683B0 002652F0 40 80 00 40 */ bge lbl_802683F0 +/* 802683B4 002652F4 2C 03 00 00 */ cmpwi r3, 0 +/* 802683B8 002652F8 41 82 00 20 */ beq lbl_802683D8 +/* 802683BC 002652FC 48 00 00 34 */ b lbl_802683F0 +lbl_802683C0: +/* 802683C0 00265300 54 C0 02 7F */ clrlwi. r0, r6, 9 +/* 802683C4 00265304 41 82 00 0C */ beq lbl_802683D0 +/* 802683C8 00265308 38 00 00 01 */ li r0, 1 +/* 802683CC 0026530C 48 00 00 28 */ b lbl_802683F4 +lbl_802683D0: +/* 802683D0 00265310 38 00 00 02 */ li r0, 2 +/* 802683D4 00265314 48 00 00 20 */ b lbl_802683F4 +lbl_802683D8: +/* 802683D8 00265318 54 C0 02 7F */ clrlwi. r0, r6, 9 +/* 802683DC 0026531C 41 82 00 0C */ beq lbl_802683E8 +/* 802683E0 00265320 38 00 00 05 */ li r0, 5 +/* 802683E4 00265324 48 00 00 10 */ b lbl_802683F4 +lbl_802683E8: +/* 802683E8 00265328 38 00 00 03 */ li r0, 3 +/* 802683EC 0026532C 48 00 00 08 */ b lbl_802683F4 +lbl_802683F0: +/* 802683F0 00265330 38 00 00 04 */ li r0, 4 +lbl_802683F4: +/* 802683F4 00265334 2C 00 00 01 */ cmpwi r0, 1 +/* 802683F8 00265338 40 82 00 10 */ bne lbl_80268408 +/* 802683FC 0026533C 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 80268400 00265340 C0 E3 0A E0 */ lfs f7, lbl_80450AE0@l(r3) +/* 80268404 00265344 48 00 00 08 */ b lbl_8026840C +lbl_80268408: +/* 80268408 00265348 FC E0 30 90 */ fmr f7, f6 +lbl_8026840C: +/* 8026840C 0026534C FD 40 00 50 */ fneg f10, f0 +/* 80268410 00265350 EC 0A 38 2A */ fadds f0, f10, f7 +/* 80268414 00265354 ED 65 00 32 */ fmuls f11, f5, f0 +/* 80268418 00265358 C0 02 B6 F8 */ lfs f0, lbl_804550F8-_SDA2_BASE_(r2) +/* 8026841C 0026535C FC 06 00 40 */ fcmpo cr0, f6, f0 +/* 80268420 00265360 40 81 00 58 */ ble lbl_80268478 +/* 80268424 00265364 FC 00 30 34 */ frsqrte f0, f6 +/* 80268428 00265368 C9 22 B7 00 */ lfd f9, lbl_80455100-_SDA2_BASE_(r2) +/* 8026842C 0026536C FC E9 00 32 */ fmul f7, f9, f0 +/* 80268430 00265370 C9 02 B7 08 */ lfd f8, lbl_80455108-_SDA2_BASE_(r2) +/* 80268434 00265374 FC 00 00 32 */ fmul f0, f0, f0 +/* 80268438 00265378 FC 06 00 32 */ fmul f0, f6, f0 +/* 8026843C 0026537C FC 08 00 28 */ fsub f0, f8, f0 +/* 80268440 00265380 FC 07 00 32 */ fmul f0, f7, f0 +/* 80268444 00265384 FC E9 00 32 */ fmul f7, f9, f0 +/* 80268448 00265388 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026844C 0026538C FC 06 00 32 */ fmul f0, f6, f0 +/* 80268450 00265390 FC 08 00 28 */ fsub f0, f8, f0 +/* 80268454 00265394 FC 07 00 32 */ fmul f0, f7, f0 +/* 80268458 00265398 FC E9 00 32 */ fmul f7, f9, f0 +/* 8026845C 0026539C FC 00 00 32 */ fmul f0, f0, f0 +/* 80268460 002653A0 FC 06 00 32 */ fmul f0, f6, f0 +/* 80268464 002653A4 FC 08 00 28 */ fsub f0, f8, f0 +/* 80268468 002653A8 FC 07 00 32 */ fmul f0, f7, f0 +/* 8026846C 002653AC FC 06 00 32 */ fmul f0, f6, f0 +/* 80268470 002653B0 FC 00 00 18 */ frsp f0, f0 +/* 80268474 002653B4 48 00 00 90 */ b lbl_80268504 +lbl_80268478: +/* 80268478 002653B8 C8 02 B7 10 */ lfd f0, lbl_80455110-_SDA2_BASE_(r2) +/* 8026847C 002653BC FC 06 00 40 */ fcmpo cr0, f6, f0 +/* 80268480 002653C0 40 80 00 10 */ bge lbl_80268490 +/* 80268484 002653C4 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 80268488 002653C8 C0 03 0A E0 */ lfs f0, lbl_80450AE0@l(r3) +/* 8026848C 002653CC 48 00 00 78 */ b lbl_80268504 +lbl_80268490: +/* 80268490 002653D0 D0 C1 00 08 */ stfs f6, 8(r1) +/* 80268494 002653D4 80 C1 00 08 */ lwz r6, 8(r1) +/* 80268498 002653D8 54 C3 00 50 */ rlwinm r3, r6, 0, 1, 8 +/* 8026849C 002653DC 3C 00 7F 80 */ lis r0, 0x7f80 +/* 802684A0 002653E0 7C 03 00 00 */ cmpw r3, r0 +/* 802684A4 002653E4 41 82 00 14 */ beq lbl_802684B8 +/* 802684A8 002653E8 40 80 00 40 */ bge lbl_802684E8 +/* 802684AC 002653EC 2C 03 00 00 */ cmpwi r3, 0 +/* 802684B0 002653F0 41 82 00 20 */ beq lbl_802684D0 +/* 802684B4 002653F4 48 00 00 34 */ b lbl_802684E8 +lbl_802684B8: +/* 802684B8 002653F8 54 C0 02 7F */ clrlwi. r0, r6, 9 +/* 802684BC 002653FC 41 82 00 0C */ beq lbl_802684C8 +/* 802684C0 00265400 38 00 00 01 */ li r0, 1 +/* 802684C4 00265404 48 00 00 28 */ b lbl_802684EC +lbl_802684C8: +/* 802684C8 00265408 38 00 00 02 */ li r0, 2 +/* 802684CC 0026540C 48 00 00 20 */ b lbl_802684EC +lbl_802684D0: +/* 802684D0 00265410 54 C0 02 7F */ clrlwi. r0, r6, 9 +/* 802684D4 00265414 41 82 00 0C */ beq lbl_802684E0 +/* 802684D8 00265418 38 00 00 05 */ li r0, 5 +/* 802684DC 0026541C 48 00 00 10 */ b lbl_802684EC +lbl_802684E0: +/* 802684E0 00265420 38 00 00 03 */ li r0, 3 +/* 802684E4 00265424 48 00 00 08 */ b lbl_802684EC +lbl_802684E8: +/* 802684E8 00265428 38 00 00 04 */ li r0, 4 +lbl_802684EC: +/* 802684EC 0026542C 2C 00 00 01 */ cmpwi r0, 1 +/* 802684F0 00265430 40 82 00 10 */ bne lbl_80268500 +/* 802684F4 00265434 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 802684F8 00265438 C0 03 0A E0 */ lfs f0, lbl_80450AE0@l(r3) +/* 802684FC 0026543C 48 00 00 08 */ b lbl_80268504 +lbl_80268500: +/* 80268500 00265440 FC 00 30 90 */ fmr f0, f6 +lbl_80268504: +/* 80268504 00265444 EC 0A 00 28 */ fsubs f0, f10, f0 +/* 80268508 00265448 EC 05 00 32 */ fmuls f0, f5, f0 +/* 8026850C 0026544C FC 0B 00 40 */ fcmpo cr0, f11, f0 +/* 80268510 00265450 40 81 00 0C */ ble lbl_8026851C +/* 80268514 00265454 FC A0 58 90 */ fmr f5, f11 +/* 80268518 00265458 48 00 00 08 */ b lbl_80268520 +lbl_8026851C: +/* 8026851C 0026545C FC A0 00 90 */ fmr f5, f0 +lbl_80268520: +/* 80268520 00265460 FC 00 2A 10 */ fabs f0, f5 +/* 80268524 00265464 FC C0 00 18 */ frsp f6, f0 +/* 80268528 00265468 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026852C 0026546C FC 06 00 40 */ fcmpo cr0, f6, f0 +/* 80268530 00265470 40 80 00 10 */ bge lbl_80268540 +/* 80268534 00265474 D0 24 00 00 */ stfs f1, 0(r4) +/* 80268538 00265478 D0 45 00 00 */ stfs f2, 0(r5) +/* 8026853C 0026547C 48 00 00 1C */ b lbl_80268558 +lbl_80268540: +/* 80268540 00265480 EC 05 00 F2 */ fmuls f0, f5, f3 +/* 80268544 00265484 EC 01 00 2A */ fadds f0, f1, f0 +/* 80268548 00265488 D0 04 00 00 */ stfs f0, 0(r4) +/* 8026854C 0026548C EC 05 01 32 */ fmuls f0, f5, f4 +/* 80268550 00265490 EC 02 00 2A */ fadds f0, f2, f0 +/* 80268554 00265494 D0 05 00 00 */ stfs f0, 0(r5) +lbl_80268558: +/* 80268558 00265498 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026855C 0026549C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d.h b/include/SComponent/c_m3d.h new file mode 100644 index 0000000000..a9ab86909a --- /dev/null +++ b/include/SComponent/c_m3d.h @@ -0,0 +1,82 @@ +#ifndef __C_M3D_H_ +#define __C_M3D_H_ + +#include "SComponent/c_m3d_g_aab.h" +#include "SComponent/c_m3d_g_cps.h" +#include "SComponent/c_m3d_g_cyl.h" +#include "SComponent/c_m3d_g_lin.h" +#include "SComponent/c_m3d_g_pla.h" +#include "SComponent/c_m3d_g_tri.h" +#include "SComponent/c_sxyz.h" +#include "SComponent/c_xyz.h" +#include "global.h" + +struct cM3d_Range; + +void cM3d_InDivPos1(const Vec*, const Vec*, float, Vec*); +void cM3d_InDivPos2(const Vec*, const Vec*, float, Vec*); +float cM3d_Len2dSq(float, float, float, float); +bool cM3d_Len2dSqPntAndSegLine(float, float, float, float, float, float, float*, float*, float*); +bool cM3d_Len3dSqPntAndSegLine(const cM3dGLin*, const Vec*, Vec*, float*); +float cM3d_SignedLenPlaAndPos(const cM3dGPla*, const Vec*); +float cM3d_VectorProduct2d(float, float, float, float, float, float); +void cM3d_VectorProduct(const cXyz*, const cXyz*, const cXyz*, cXyz*); +void cM3d_CalcPla(const Vec*, const Vec*, const Vec*, Vec*, float*); +bool cM3d_Cross_AabAab(const cM3dGAab*, const cM3dGAab*); +bool cM3d_Cross_AabCyl(const cM3dGAab*, const cM3dGCyl*); +bool cM3d_Cross_AabSph(const cM3dGAab*, const cM3dGSph*); +int cM3d_Check_LinLin(const cM3dGLin*, const cM3dGLin*, float*, float*); +bool cM3d_CrossInfLineVsInfPlane_proc(float, float, const Vec*, const Vec*, Vec*); +bool cM3d_Cross_LinPla(const cM3dGLin*, const cM3dGPla*, Vec*, bool, bool); +bool cM3d_Cross_MinMaxBoxLine(const Vec*, const Vec*, const Vec*, const Vec*); +bool cM3d_InclusionCheckPosIn3PosBox3d(const Vec*, const Vec*, const Vec*, const Vec*, float); +bool cM3d_InclusionCheckPosIn3PosBox2d(float, float, float, float, float, float, float, float, + float); +bool cM3d_CrossX_Tri(const cM3dGTri*, const Vec*, float); +bool cM3d_CrossX_Tri(const cM3dGTri*, const Vec*); +bool cM3d_CrossX_LinTri_proc(const cM3dGTri*, const Vec*); +bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*); +bool cM3d_CrossY_LinTri_proc(const cM3dGTri*, const Vec*); +bool cM3d_CrossY_Tri(const Vec&, const Vec&, const Vec&, const cM3dGPla&, const Vec*); +bool cM3d_CrossY_Tri_Front(const Vec&, const Vec&, const Vec&, const Vec*); +bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, float*); +bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, float); +bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, const cM3d_Range*, float*); +bool cM3d_CrossZ_Tri(const cM3dGTri*, const Vec*, float); +bool cM3d_CrossZ_Tri(const cM3dGTri*, const Vec*); +bool cM3d_CrossZ_LinTri_proc(const cM3dGTri*, const Vec*); +bool cM3d_Cross_LinTri(const cM3dGLin*, const cM3dGTri*, Vec*, bool, bool); +bool cM3d_Cross_LinTri_Easy(const cM3dGTri*, const Vec*); +bool cM3d_Cross_SphPnt(const cM3dGSph*, const Vec*); +bool cM3d_Cross_LinSph(const cM3dGLin*, const cM3dGSph*, Vec*); +int cM3d_Cross_LinSph_CrossPos(const cM3dGSph&, const cM3dGLin&, Vec*, Vec*); +bool cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, float*); +bool cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, Vec*, float*); +bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, float*); +bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, float*, float*); +void cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, Vec*); +void cM3d_CalcSphVsTriCrossPoint(const cM3dGSph*, const cM3dGTri*, Vec*); +bool cM3d_Cross_SphTri(const cM3dGSph*, const cM3dGTri*, Vec*); +bool cM3d_Cross_CylCyl(const cM3dGCyl*, const cM3dGCyl*, float*); +bool cM3d_Cross_CylCyl(const cM3dGCyl*, const cM3dGCyl*, Vec*); +bool cM3d_Cross_CylTri(const cM3dGCyl*, const cM3dGTri*, Vec*); +int cM3d_Cross_CylLin(const cM3dGCyl*, const cM3dGLin*, Vec*, Vec*); +int cM3d_Cross_CylPntPnt(const cM3dGCyl*, const Vec*, const Vec*, Vec*, Vec*); +bool cM3d_Cross_CylPnt(const cM3dGCyl*, const Vec*); +bool cM3d_Cross_CpsCps(const cM3dGCps&, const cM3dGCps&, Vec*); +bool cM3d_Cross_CpsCyl(const cM3dGCps&, const cM3dGCyl&, Vec*); +bool cM3d_Cross_CpsSph_CrossPos(const cM3dGCps&, const cM3dGSph&, const Vec&, Vec*); +bool cM3d_Cross_CpsSph(const cM3dGCps&, const cM3dGSph&, Vec*); +bool cM3d_Cross_TriTri(const cM3dGTri&, const cM3dGTri&, Vec*); +bool cM3d_Cross_CpsTri(const cM3dGCps&, cM3dGTri, Vec*); +void cM3d_CalcVecAngle(const Vec&, short*, short*); +void cM3d_CalcVecZAngle(const Vec&, csXyz*); +void cM3d_PlaneCrossLineProcWork(float, float, float, float, float, float, float, float*, float*); +int cM3d_2PlaneCrossLine(const cM3dGPla&, const cM3dGPla&, cM3dGLin*); +bool cM3d_3PlaneCrossPos(const cM3dGPla&, const cM3dGPla&, const cM3dGPla&, Vec*); +float cM3d_lineVsPosSuisenCross(const cM3dGLin*, const Vec*, Vec*); +float cM3d_lineVsPosSuisenCross(const Vec&, const Vec&, const Vec&, Vec*); +int cM3d_2PlaneLinePosNearPos(const cM3dGPla&, const cM3dGPla&, const Vec*, Vec*); +void cM3d_CrawVec(const Vec&, const Vec&, Vec*); + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_m3d/asm/func_80268560.s b/include/SComponent/c_m3d/asm/func_80268560.s new file mode 100644 index 0000000000..3704d6ea87 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80268560.s @@ -0,0 +1,20 @@ +/* 80268560 002654A0 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80268564 002654A4 7C 08 02 A6 */ mflr r0 +/* 80268568 002654A8 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026856C 002654AC 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 80268570 002654B0 93 C1 00 18 */ stw r30, 0x18(r1) +/* 80268574 002654B4 7C 7E 1B 78 */ mr r30, r3 +/* 80268578 002654B8 7C BF 2B 78 */ mr r31, r5 +/* 8026857C 002654BC 7C 83 23 78 */ mr r3, r4 +/* 80268580 002654C0 38 81 00 08 */ addi r4, r1, 8 +/* 80268584 002654C4 48 0D EB 55 */ bl PSVECScale +/* 80268588 002654C8 38 61 00 08 */ addi r3, r1, 8 +/* 8026858C 002654CC 7F C4 F3 78 */ mr r4, r30 +/* 80268590 002654D0 7F E5 FB 78 */ mr r5, r31 +/* 80268594 002654D4 48 0D EA FD */ bl PSVECAdd +/* 80268598 002654D8 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026859C 002654DC 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 802685A0 002654E0 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802685A4 002654E4 7C 08 03 A6 */ mtlr r0 +/* 802685A8 002654E8 38 21 00 20 */ addi r1, r1, 0x20 +/* 802685AC 002654EC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_802685B0.s b/include/SComponent/c_m3d/asm/func_802685B0.s new file mode 100644 index 0000000000..da2081ce8a --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_802685B0.s @@ -0,0 +1,25 @@ +/* 802685B0 002654F0 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 802685B4 002654F4 7C 08 02 A6 */ mflr r0 +/* 802685B8 002654F8 90 01 00 34 */ stw r0, 0x34(r1) +/* 802685BC 002654FC DB E1 00 28 */ stfd f31, 0x28(r1) +/* 802685C0 00265500 93 E1 00 24 */ stw r31, 0x24(r1) +/* 802685C4 00265504 93 C1 00 20 */ stw r30, 0x20(r1) +/* 802685C8 00265508 7C 7E 1B 78 */ mr r30, r3 +/* 802685CC 0026550C FF E0 08 90 */ fmr f31, f1 +/* 802685D0 00265510 7C BF 2B 78 */ mr r31, r5 +/* 802685D4 00265514 7C 83 23 78 */ mr r3, r4 +/* 802685D8 00265518 7F C4 F3 78 */ mr r4, r30 +/* 802685DC 0026551C 38 A1 00 08 */ addi r5, r1, 8 +/* 802685E0 00265520 48 0D EA D5 */ bl PSVECSubtract +/* 802685E4 00265524 7F C3 F3 78 */ mr r3, r30 +/* 802685E8 00265528 38 81 00 08 */ addi r4, r1, 8 +/* 802685EC 0026552C FC 20 F8 90 */ fmr f1, f31 +/* 802685F0 00265530 7F E5 FB 78 */ mr r5, r31 +/* 802685F4 00265534 4B FF FF 6D */ bl cM3d_InDivPos1__FPC3VecPC3VecfP3Vec +/* 802685F8 00265538 CB E1 00 28 */ lfd f31, 0x28(r1) +/* 802685FC 0026553C 83 E1 00 24 */ lwz r31, 0x24(r1) +/* 80268600 00265540 83 C1 00 20 */ lwz r30, 0x20(r1) +/* 80268604 00265544 80 01 00 34 */ lwz r0, 0x34(r1) +/* 80268608 00265548 7C 08 03 A6 */ mtlr r0 +/* 8026860C 0026554C 38 21 00 30 */ addi r1, r1, 0x30 +/* 80268610 00265550 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268614.s b/include/SComponent/c_m3d/asm/func_80268614.s new file mode 100644 index 0000000000..bfa914c4f8 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80268614.s @@ -0,0 +1,6 @@ +/* 80268614 00265554 EC 01 18 28 */ fsubs f0, f1, f3 +/* 80268618 00265558 EC 42 20 28 */ fsubs f2, f2, f4 +/* 8026861C 0026555C EC 20 00 32 */ fmuls f1, f0, f0 +/* 80268620 00265560 EC 02 00 B2 */ fmuls f0, f2, f2 +/* 80268624 00265564 EC 21 00 2A */ fadds f1, f1, f0 +/* 80268628 00265568 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026862C.s b/include/SComponent/c_m3d/asm/func_8026862C.s new file mode 100644 index 0000000000..b6281b66d3 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026862C.s @@ -0,0 +1,60 @@ +/* 8026862C 0026556C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80268630 00265570 7C 08 02 A6 */ mflr r0 +/* 80268634 00265574 90 01 00 14 */ stw r0, 0x14(r1) +/* 80268638 00265578 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026863C 0026557C 93 C1 00 08 */ stw r30, 8(r1) +/* 80268640 00265580 FD 00 08 90 */ fmr f8, f1 +/* 80268644 00265584 FC E0 10 90 */ fmr f7, f2 +/* 80268648 00265588 7C BE 2B 78 */ mr r30, r5 +/* 8026864C 0026558C 3B E0 00 00 */ li r31, 0 +/* 80268650 00265590 EC 45 18 28 */ fsubs f2, f5, f3 +/* 80268654 00265594 EC A6 20 28 */ fsubs f5, f6, f4 +/* 80268658 00265598 EC 22 00 B2 */ fmuls f1, f2, f2 +/* 8026865C 0026559C EC 05 01 72 */ fmuls f0, f5, f5 +/* 80268660 002655A0 EC C1 00 2A */ fadds f6, f1, f0 +/* 80268664 002655A4 FC 00 32 10 */ fabs f0, f6 +/* 80268668 002655A8 FC 20 00 18 */ frsp f1, f0 +/* 8026866C 002655AC C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 80268670 002655B0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268674 002655B4 40 80 00 14 */ bge lbl_80268688 +/* 80268678 002655B8 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026867C 002655BC D0 1E 00 00 */ stfs f0, 0(r30) +/* 80268680 002655C0 38 60 00 00 */ li r3, 0 +/* 80268684 002655C4 48 00 00 74 */ b lbl_802686F8 +lbl_80268688: +/* 80268688 002655C8 EC 08 18 28 */ fsubs f0, f8, f3 +/* 8026868C 002655CC EC 22 00 32 */ fmuls f1, f2, f0 +/* 80268690 002655D0 EC 07 20 28 */ fsubs f0, f7, f4 +/* 80268694 002655D4 EC 05 00 32 */ fmuls f0, f5, f0 +/* 80268698 002655D8 EC 01 00 2A */ fadds f0, f1, f0 +/* 8026869C 002655DC EC 20 30 24 */ fdivs f1, f0, f6 +/* 802686A0 002655E0 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 802686A4 002655E4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802686A8 002655E8 4C 41 13 82 */ cror 2, 1, 2 +/* 802686AC 002655EC 40 82 00 18 */ bne lbl_802686C4 +/* 802686B0 002655F0 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 802686B4 002655F4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802686B8 002655F8 4C 40 13 82 */ cror 2, 0, 2 +/* 802686BC 002655FC 40 82 00 08 */ bne lbl_802686C4 +/* 802686C0 00265600 3B E0 00 01 */ li r31, 1 +lbl_802686C4: +/* 802686C4 00265604 EC 02 00 72 */ fmuls f0, f2, f1 +/* 802686C8 00265608 EC 03 00 2A */ fadds f0, f3, f0 +/* 802686CC 0026560C D0 03 00 00 */ stfs f0, 0(r3) +/* 802686D0 00265610 EC 05 00 72 */ fmuls f0, f5, f1 +/* 802686D4 00265614 EC 04 00 2A */ fadds f0, f4, f0 +/* 802686D8 00265618 D0 04 00 00 */ stfs f0, 0(r4) +/* 802686DC 0026561C C0 23 00 00 */ lfs f1, 0(r3) +/* 802686E0 00265620 C0 44 00 00 */ lfs f2, 0(r4) +/* 802686E4 00265624 FC 60 40 90 */ fmr f3, f8 +/* 802686E8 00265628 FC 80 38 90 */ fmr f4, f7 +/* 802686EC 0026562C 4B FF FF 29 */ bl cM3d_Len2dSq__Fffff +/* 802686F0 00265630 D0 3E 00 00 */ stfs f1, 0(r30) +/* 802686F4 00265634 7F E3 FB 78 */ mr r3, r31 +lbl_802686F8: +/* 802686F8 00265638 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802686FC 0026563C 83 C1 00 08 */ lwz r30, 8(r1) +/* 80268700 00265640 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80268704 00265644 7C 08 03 A6 */ mtlr r0 +/* 80268708 00265648 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026870C 0026564C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268710.s b/include/SComponent/c_m3d/asm/func_80268710.s new file mode 100644 index 0000000000..61cc804c41 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80268710.s @@ -0,0 +1,70 @@ +/* 80268710 00265650 94 21 FF B0 */ stwu r1, -0x50(r1) +/* 80268714 00265654 7C 08 02 A6 */ mflr r0 +/* 80268718 00265658 90 01 00 54 */ stw r0, 0x54(r1) +/* 8026871C 0026565C DB E1 00 40 */ stfd f31, 0x40(r1) +/* 80268720 00265660 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 +/* 80268724 00265664 39 61 00 40 */ addi r11, r1, 0x40 +/* 80268728 00265668 48 0F 9A AD */ bl _savegpr_27 +/* 8026872C 0026566C 7C 7B 1B 78 */ mr r27, r3 +/* 80268730 00265670 7C 9C 23 78 */ mr r28, r4 +/* 80268734 00265674 7C BD 2B 78 */ mr r29, r5 +/* 80268738 00265678 7C DE 33 78 */ mr r30, r6 +/* 8026873C 0026567C 38 7B 00 0C */ addi r3, r27, 0xc +/* 80268740 00265680 7F 64 DB 78 */ mr r4, r27 +/* 80268744 00265684 38 A1 00 14 */ addi r5, r1, 0x14 +/* 80268748 00265688 48 0D E9 6D */ bl PSVECSubtract +/* 8026874C 0026568C 38 61 00 14 */ addi r3, r1, 0x14 +/* 80268750 00265690 7C 64 1B 78 */ mr r4, r3 +/* 80268754 00265694 48 0D EA 41 */ bl PSVECDotProduct +/* 80268758 00265698 FF E0 08 90 */ fmr f31, f1 +/* 8026875C 0026569C FC 00 FA 10 */ fabs f0, f31 +/* 80268760 002656A0 FC 20 00 18 */ frsp f1, f0 +/* 80268764 002656A4 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 80268768 002656A8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026876C 002656AC 40 80 00 14 */ bge lbl_80268780 +/* 80268770 002656B0 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 80268774 002656B4 D0 1E 00 00 */ stfs f0, 0(r30) +/* 80268778 002656B8 38 60 00 00 */ li r3, 0 +/* 8026877C 002656BC 48 00 00 78 */ b lbl_802687F4 +lbl_80268780: +/* 80268780 002656C0 7F 83 E3 78 */ mr r3, r28 +/* 80268784 002656C4 7F 64 DB 78 */ mr r4, r27 +/* 80268788 002656C8 38 A1 00 08 */ addi r5, r1, 8 +/* 8026878C 002656CC 48 0D E9 29 */ bl PSVECSubtract +/* 80268790 002656D0 38 61 00 08 */ addi r3, r1, 8 +/* 80268794 002656D4 38 81 00 14 */ addi r4, r1, 0x14 +/* 80268798 002656D8 48 0D E9 FD */ bl PSVECDotProduct +/* 8026879C 002656DC EC 21 F8 24 */ fdivs f1, f1, f31 +/* 802687A0 002656E0 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 802687A4 002656E4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802687A8 002656E8 41 80 00 10 */ blt lbl_802687B8 +/* 802687AC 002656EC C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 802687B0 002656F0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802687B4 002656F4 40 81 00 0C */ ble lbl_802687C0 +lbl_802687B8: +/* 802687B8 002656F8 3B E0 00 00 */ li r31, 0 +/* 802687BC 002656FC 48 00 00 08 */ b lbl_802687C4 +lbl_802687C0: +/* 802687C0 00265700 3B E0 00 01 */ li r31, 1 +lbl_802687C4: +/* 802687C4 00265704 38 61 00 14 */ addi r3, r1, 0x14 +/* 802687C8 00265708 7C 64 1B 78 */ mr r4, r3 +/* 802687CC 0026570C 48 0D E9 0D */ bl PSVECScale +/* 802687D0 00265710 38 61 00 14 */ addi r3, r1, 0x14 +/* 802687D4 00265714 7F 64 DB 78 */ mr r4, r27 +/* 802687D8 00265718 7F A5 EB 78 */ mr r5, r29 +/* 802687DC 0026571C 48 0D E8 B5 */ bl PSVECAdd +/* 802687E0 00265720 7F A3 EB 78 */ mr r3, r29 +/* 802687E4 00265724 7F 84 E3 78 */ mr r4, r28 +/* 802687E8 00265728 48 0D EB B5 */ bl PSVECSquareDistance +/* 802687EC 0026572C D0 3E 00 00 */ stfs f1, 0(r30) +/* 802687F0 00265730 7F E3 FB 78 */ mr r3, r31 +lbl_802687F4: +/* 802687F4 00265734 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 +/* 802687F8 00265738 CB E1 00 40 */ lfd f31, 0x40(r1) +/* 802687FC 0026573C 39 61 00 40 */ addi r11, r1, 0x40 +/* 80268800 00265740 48 0F 9A 21 */ bl _restgpr_27 +/* 80268804 00265744 80 01 00 54 */ lwz r0, 0x54(r1) +/* 80268808 00265748 7C 08 03 A6 */ mtlr r0 +/* 8026880C 0026574C 38 21 00 50 */ addi r1, r1, 0x50 +/* 80268810 00265750 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268814.s b/include/SComponent/c_m3d/asm/func_80268814.s new file mode 100644 index 0000000000..143baa8b8a --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80268814.s @@ -0,0 +1,34 @@ +/* 80268814 00265754 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80268818 00265758 7C 08 02 A6 */ mflr r0 +/* 8026881C 0026575C 90 01 00 24 */ stw r0, 0x24(r1) +/* 80268820 00265760 DB E1 00 10 */ stfd f31, 0x10(r1) +/* 80268824 00265764 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 +/* 80268828 00265768 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026882C 0026576C 93 C1 00 08 */ stw r30, 8(r1) +/* 80268830 00265770 7C 7E 1B 78 */ mr r30, r3 +/* 80268834 00265774 7C 9F 23 78 */ mr r31, r4 +/* 80268838 00265778 48 0D E9 19 */ bl PSVECMag +/* 8026883C 0026577C FF E0 08 90 */ fmr f31, f1 +/* 80268840 00265780 FC 00 FA 10 */ fabs f0, f31 +/* 80268844 00265784 FC 20 00 18 */ frsp f1, f0 +/* 80268848 00265788 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026884C 0026578C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268850 00265790 40 80 00 0C */ bge lbl_8026885C +/* 80268854 00265794 C0 22 B7 18 */ lfs f1, lbl_80455118-_SDA2_BASE_(r2) +/* 80268858 00265798 48 00 00 1C */ b lbl_80268874 +lbl_8026885C: +/* 8026885C 0026579C 7F C3 F3 78 */ mr r3, r30 +/* 80268860 002657A0 7F E4 FB 78 */ mr r4, r31 +/* 80268864 002657A4 48 0D E9 31 */ bl PSVECDotProduct +/* 80268868 002657A8 C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026886C 002657AC EC 00 08 2A */ fadds f0, f0, f1 +/* 80268870 002657B0 EC 20 F8 24 */ fdivs f1, f0, f31 +lbl_80268874: +/* 80268874 002657B4 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 +/* 80268878 002657B8 CB E1 00 10 */ lfd f31, 0x10(r1) +/* 8026887C 002657BC 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80268880 002657C0 83 C1 00 08 */ lwz r30, 8(r1) +/* 80268884 002657C4 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80268888 002657C8 7C 08 03 A6 */ mtlr r0 +/* 8026888C 002657CC 38 21 00 20 */ addi r1, r1, 0x20 +/* 80268890 002657D0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268894.s b/include/SComponent/c_m3d/asm/func_80268894.s new file mode 100644 index 0000000000..571a81b3d9 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80268894.s @@ -0,0 +1,8 @@ +/* 80268894 002657D4 EC 63 08 28 */ fsubs f3, f3, f1 +/* 80268898 002657D8 EC 06 10 28 */ fsubs f0, f6, f2 +/* 8026889C 002657DC EC 63 00 32 */ fmuls f3, f3, f0 +/* 802688A0 002657E0 EC 44 10 28 */ fsubs f2, f4, f2 +/* 802688A4 002657E4 EC 05 08 28 */ fsubs f0, f5, f1 +/* 802688A8 002657E8 EC 02 00 32 */ fmuls f0, f2, f0 +/* 802688AC 002657EC EC 23 00 28 */ fsubs f1, f3, f0 +/* 802688B0 002657F0 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d/asm/func_802688B4.s b/include/SComponent/c_m3d/asm/func_802688B4.s new file mode 100644 index 0000000000..8d619ef553 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_802688B4.s @@ -0,0 +1,26 @@ +/* 802688B4 002657F4 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 802688B8 002657F8 7C 08 02 A6 */ mflr r0 +/* 802688BC 002657FC 90 01 00 34 */ stw r0, 0x34(r1) +/* 802688C0 00265800 39 61 00 30 */ addi r11, r1, 0x30 +/* 802688C4 00265804 48 0F 99 19 */ bl _savegpr_29 +/* 802688C8 00265808 7C 7D 1B 78 */ mr r29, r3 +/* 802688CC 0026580C 7C BE 2B 78 */ mr r30, r5 +/* 802688D0 00265810 7C DF 33 78 */ mr r31, r6 +/* 802688D4 00265814 7C 83 23 78 */ mr r3, r4 +/* 802688D8 00265818 7F A4 EB 78 */ mr r4, r29 +/* 802688DC 0026581C 38 A1 00 14 */ addi r5, r1, 0x14 +/* 802688E0 00265820 48 0D E7 D5 */ bl PSVECSubtract +/* 802688E4 00265824 7F C3 F3 78 */ mr r3, r30 +/* 802688E8 00265828 7F A4 EB 78 */ mr r4, r29 +/* 802688EC 0026582C 38 A1 00 08 */ addi r5, r1, 8 +/* 802688F0 00265830 48 0D E7 C5 */ bl PSVECSubtract +/* 802688F4 00265834 38 61 00 14 */ addi r3, r1, 0x14 +/* 802688F8 00265838 38 81 00 08 */ addi r4, r1, 8 +/* 802688FC 0026583C 7F E5 FB 78 */ mr r5, r31 +/* 80268900 00265840 48 0D E8 B5 */ bl PSVECCrossProduct +/* 80268904 00265844 39 61 00 30 */ addi r11, r1, 0x30 +/* 80268908 00265848 48 0F 99 21 */ bl _restgpr_29 +/* 8026890C 0026584C 80 01 00 34 */ lwz r0, 0x34(r1) +/* 80268910 00265850 7C 08 03 A6 */ mtlr r0 +/* 80268914 00265854 38 21 00 30 */ addi r1, r1, 0x30 +/* 80268918 00265858 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026891C.s b/include/SComponent/c_m3d/asm/func_8026891C.s new file mode 100644 index 0000000000..701a05376d --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026891C.s @@ -0,0 +1,53 @@ +/* 8026891C 0026585C 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 80268920 00265860 7C 08 02 A6 */ mflr r0 +/* 80268924 00265864 90 01 00 34 */ stw r0, 0x34(r1) +/* 80268928 00265868 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026892C 0026586C 48 0F 98 AD */ bl _savegpr_28 +/* 80268930 00265870 7C 7C 1B 78 */ mr r28, r3 +/* 80268934 00265874 7C BD 2B 78 */ mr r29, r5 +/* 80268938 00265878 7C DE 33 78 */ mr r30, r6 +/* 8026893C 0026587C 7C FF 3B 78 */ mr r31, r7 +/* 80268940 00265880 7C 83 23 78 */ mr r3, r4 +/* 80268944 00265884 7F 84 E3 78 */ mr r4, r28 +/* 80268948 00265888 38 A1 00 08 */ addi r5, r1, 8 +/* 8026894C 0026588C 48 0D E7 69 */ bl PSVECSubtract +/* 80268950 00265890 7F A3 EB 78 */ mr r3, r29 +/* 80268954 00265894 7F 84 E3 78 */ mr r4, r28 +/* 80268958 00265898 38 A1 00 14 */ addi r5, r1, 0x14 +/* 8026895C 0026589C 48 0D E7 59 */ bl PSVECSubtract +/* 80268960 002658A0 38 61 00 08 */ addi r3, r1, 8 +/* 80268964 002658A4 38 81 00 14 */ addi r4, r1, 0x14 +/* 80268968 002658A8 7F C5 F3 78 */ mr r5, r30 +/* 8026896C 002658AC 48 0D E8 49 */ bl PSVECCrossProduct +/* 80268970 002658B0 7F C3 F3 78 */ mr r3, r30 +/* 80268974 002658B4 48 0D E7 DD */ bl PSVECMag +/* 80268978 002658B8 FC 00 0A 10 */ fabs f0, f1 +/* 8026897C 002658BC FC 40 00 18 */ frsp f2, f0 +/* 80268980 002658C0 C0 02 B7 3C */ lfs f0, lbl_8045513C-_SDA2_BASE_(r2) +/* 80268984 002658C4 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 80268988 002658C8 4C 41 13 82 */ cror 2, 1, 2 +/* 8026898C 002658CC 40 82 00 30 */ bne lbl_802689BC +/* 80268990 002658D0 7F C3 F3 78 */ mr r3, r30 +/* 80268994 002658D4 7F C4 F3 78 */ mr r4, r30 +/* 80268998 002658D8 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026899C 002658DC EC 20 08 24 */ fdivs f1, f0, f1 +/* 802689A0 002658E0 48 0D E7 39 */ bl PSVECScale +/* 802689A4 002658E4 7F C3 F3 78 */ mr r3, r30 +/* 802689A8 002658E8 7F 84 E3 78 */ mr r4, r28 +/* 802689AC 002658EC 48 0D E7 E9 */ bl PSVECDotProduct +/* 802689B0 002658F0 FC 00 08 50 */ fneg f0, f1 +/* 802689B4 002658F4 D0 1F 00 00 */ stfs f0, 0(r31) +/* 802689B8 002658F8 48 00 00 18 */ b lbl_802689D0 +lbl_802689BC: +/* 802689BC 002658FC C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 802689C0 00265900 D0 1E 00 04 */ stfs f0, 4(r30) +/* 802689C4 00265904 D0 1F 00 00 */ stfs f0, 0(r31) +/* 802689C8 00265908 D0 1E 00 08 */ stfs f0, 8(r30) +/* 802689CC 0026590C D0 1E 00 00 */ stfs f0, 0(r30) +lbl_802689D0: +/* 802689D0 00265910 39 61 00 30 */ addi r11, r1, 0x30 +/* 802689D4 00265914 48 0F 98 51 */ bl _restgpr_28 +/* 802689D8 00265918 80 01 00 34 */ lwz r0, 0x34(r1) +/* 802689DC 0026591C 7C 08 03 A6 */ mtlr r0 +/* 802689E0 00265920 38 21 00 30 */ addi r1, r1, 0x30 +/* 802689E4 00265924 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_802689E8.s b/include/SComponent/c_m3d/asm/func_802689E8.s new file mode 100644 index 0000000000..c0dea96fc3 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_802689E8.s @@ -0,0 +1,89 @@ +/* 802689E8 00265928 C0 64 00 0C */ lfs f3, 0xc(r4) +/* 802689EC 0026592C C0 44 00 00 */ lfs f2, 0(r4) +/* 802689F0 00265930 C0 23 00 0C */ lfs f1, 0xc(r3) +/* 802689F4 00265934 C0 03 00 00 */ lfs f0, 0(r3) +/* 802689F8 00265938 FC 00 18 40 */ fcmpo cr0, f0, f3 +/* 802689FC 0026593C 40 81 00 0C */ ble lbl_80268A08 +/* 80268A00 00265940 38 00 00 00 */ li r0, 0 +/* 80268A04 00265944 48 00 00 38 */ b lbl_80268A3C +lbl_80268A08: +/* 80268A08 00265948 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 80268A0C 0026594C 40 80 00 0C */ bge lbl_80268A18 +/* 80268A10 00265950 38 00 00 00 */ li r0, 0 +/* 80268A14 00265954 48 00 00 28 */ b lbl_80268A3C +lbl_80268A18: +/* 80268A18 00265958 FC 02 08 40 */ fcmpo cr0, f2, f1 +/* 80268A1C 0026595C 40 81 00 0C */ ble lbl_80268A28 +/* 80268A20 00265960 38 00 00 00 */ li r0, 0 +/* 80268A24 00265964 48 00 00 18 */ b lbl_80268A3C +lbl_80268A28: +/* 80268A28 00265968 FC 03 00 40 */ fcmpo cr0, f3, f0 +/* 80268A2C 0026596C 40 80 00 0C */ bge lbl_80268A38 +/* 80268A30 00265970 38 00 00 00 */ li r0, 0 +/* 80268A34 00265974 48 00 00 08 */ b lbl_80268A3C +lbl_80268A38: +/* 80268A38 00265978 38 00 00 01 */ li r0, 1 +lbl_80268A3C: +/* 80268A3C 0026597C 54 00 06 3F */ clrlwi. r0, r0, 0x18 +/* 80268A40 00265980 41 82 00 C4 */ beq lbl_80268B04 +/* 80268A44 00265984 C0 64 00 10 */ lfs f3, 0x10(r4) +/* 80268A48 00265988 C0 44 00 04 */ lfs f2, 4(r4) +/* 80268A4C 0026598C C0 23 00 10 */ lfs f1, 0x10(r3) +/* 80268A50 00265990 C0 03 00 04 */ lfs f0, 4(r3) +/* 80268A54 00265994 FC 00 18 40 */ fcmpo cr0, f0, f3 +/* 80268A58 00265998 40 81 00 0C */ ble lbl_80268A64 +/* 80268A5C 0026599C 38 00 00 00 */ li r0, 0 +/* 80268A60 002659A0 48 00 00 38 */ b lbl_80268A98 +lbl_80268A64: +/* 80268A64 002659A4 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 80268A68 002659A8 40 80 00 0C */ bge lbl_80268A74 +/* 80268A6C 002659AC 38 00 00 00 */ li r0, 0 +/* 80268A70 002659B0 48 00 00 28 */ b lbl_80268A98 +lbl_80268A74: +/* 80268A74 002659B4 FC 02 08 40 */ fcmpo cr0, f2, f1 +/* 80268A78 002659B8 40 81 00 0C */ ble lbl_80268A84 +/* 80268A7C 002659BC 38 00 00 00 */ li r0, 0 +/* 80268A80 002659C0 48 00 00 18 */ b lbl_80268A98 +lbl_80268A84: +/* 80268A84 002659C4 FC 03 00 40 */ fcmpo cr0, f3, f0 +/* 80268A88 002659C8 40 80 00 0C */ bge lbl_80268A94 +/* 80268A8C 002659CC 38 00 00 00 */ li r0, 0 +/* 80268A90 002659D0 48 00 00 08 */ b lbl_80268A98 +lbl_80268A94: +/* 80268A94 002659D4 38 00 00 01 */ li r0, 1 +lbl_80268A98: +/* 80268A98 002659D8 54 00 06 3F */ clrlwi. r0, r0, 0x18 +/* 80268A9C 002659DC 41 82 00 68 */ beq lbl_80268B04 +/* 80268AA0 002659E0 C0 64 00 14 */ lfs f3, 0x14(r4) +/* 80268AA4 002659E4 C0 44 00 08 */ lfs f2, 8(r4) +/* 80268AA8 002659E8 C0 23 00 14 */ lfs f1, 0x14(r3) +/* 80268AAC 002659EC C0 03 00 08 */ lfs f0, 8(r3) +/* 80268AB0 002659F0 FC 00 18 40 */ fcmpo cr0, f0, f3 +/* 80268AB4 002659F4 40 81 00 0C */ ble lbl_80268AC0 +/* 80268AB8 002659F8 38 00 00 00 */ li r0, 0 +/* 80268ABC 002659FC 48 00 00 38 */ b lbl_80268AF4 +lbl_80268AC0: +/* 80268AC0 00265A00 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 80268AC4 00265A04 40 80 00 0C */ bge lbl_80268AD0 +/* 80268AC8 00265A08 38 00 00 00 */ li r0, 0 +/* 80268ACC 00265A0C 48 00 00 28 */ b lbl_80268AF4 +lbl_80268AD0: +/* 80268AD0 00265A10 FC 02 08 40 */ fcmpo cr0, f2, f1 +/* 80268AD4 00265A14 40 81 00 0C */ ble lbl_80268AE0 +/* 80268AD8 00265A18 38 00 00 00 */ li r0, 0 +/* 80268ADC 00265A1C 48 00 00 18 */ b lbl_80268AF4 +lbl_80268AE0: +/* 80268AE0 00265A20 FC 03 00 40 */ fcmpo cr0, f3, f0 +/* 80268AE4 00265A24 40 80 00 0C */ bge lbl_80268AF0 +/* 80268AE8 00265A28 38 00 00 00 */ li r0, 0 +/* 80268AEC 00265A2C 48 00 00 08 */ b lbl_80268AF4 +lbl_80268AF0: +/* 80268AF0 00265A30 38 00 00 01 */ li r0, 1 +lbl_80268AF4: +/* 80268AF4 00265A34 54 00 06 3F */ clrlwi. r0, r0, 0x18 +/* 80268AF8 00265A38 41 82 00 0C */ beq lbl_80268B04 +/* 80268AFC 00265A3C 38 60 00 01 */ li r3, 1 +/* 80268B00 00265A40 4E 80 00 20 */ blr +lbl_80268B04: +/* 80268B04 00265A44 38 60 00 00 */ li r3, 0 +/* 80268B08 00265A48 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268B0C.s b/include/SComponent/c_m3d/asm/func_80268B0C.s new file mode 100644 index 0000000000..8905a3eea6 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80268B0C.s @@ -0,0 +1,47 @@ +/* 80268B0C 00265A4C C0 23 00 00 */ lfs f1, 0(r3) +/* 80268B10 00265A50 C0 44 00 00 */ lfs f2, 0(r4) +/* 80268B14 00265A54 C0 64 00 0C */ lfs f3, 0xc(r4) +/* 80268B18 00265A58 EC 02 18 2A */ fadds f0, f2, f3 +/* 80268B1C 00265A5C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268B20 00265A60 40 81 00 0C */ ble lbl_80268B2C +/* 80268B24 00265A64 38 60 00 00 */ li r3, 0 +/* 80268B28 00265A68 4E 80 00 20 */ blr +lbl_80268B2C: +/* 80268B2C 00265A6C C0 23 00 0C */ lfs f1, 0xc(r3) +/* 80268B30 00265A70 EC 02 18 28 */ fsubs f0, f2, f3 +/* 80268B34 00265A74 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268B38 00265A78 40 80 00 0C */ bge lbl_80268B44 +/* 80268B3C 00265A7C 38 60 00 00 */ li r3, 0 +/* 80268B40 00265A80 4E 80 00 20 */ blr +lbl_80268B44: +/* 80268B44 00265A84 C0 23 00 08 */ lfs f1, 8(r3) +/* 80268B48 00265A88 C0 44 00 08 */ lfs f2, 8(r4) +/* 80268B4C 00265A8C EC 02 18 2A */ fadds f0, f2, f3 +/* 80268B50 00265A90 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268B54 00265A94 40 81 00 0C */ ble lbl_80268B60 +/* 80268B58 00265A98 38 60 00 00 */ li r3, 0 +/* 80268B5C 00265A9C 4E 80 00 20 */ blr +lbl_80268B60: +/* 80268B60 00265AA0 C0 23 00 14 */ lfs f1, 0x14(r3) +/* 80268B64 00265AA4 EC 02 18 28 */ fsubs f0, f2, f3 +/* 80268B68 00265AA8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268B6C 00265AAC 40 80 00 0C */ bge lbl_80268B78 +/* 80268B70 00265AB0 38 60 00 00 */ li r3, 0 +/* 80268B74 00265AB4 4E 80 00 20 */ blr +lbl_80268B78: +/* 80268B78 00265AB8 C0 23 00 04 */ lfs f1, 4(r3) +/* 80268B7C 00265ABC C0 44 00 04 */ lfs f2, 4(r4) +/* 80268B80 00265AC0 C0 04 00 10 */ lfs f0, 0x10(r4) +/* 80268B84 00265AC4 EC 02 00 2A */ fadds f0, f2, f0 +/* 80268B88 00265AC8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268B8C 00265ACC 40 81 00 0C */ ble lbl_80268B98 +/* 80268B90 00265AD0 38 60 00 00 */ li r3, 0 +/* 80268B94 00265AD4 4E 80 00 20 */ blr +lbl_80268B98: +/* 80268B98 00265AD8 C0 03 00 10 */ lfs f0, 0x10(r3) +/* 80268B9C 00265ADC FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 80268BA0 00265AE0 7C 00 00 26 */ mfcr r0 +/* 80268BA4 00265AE4 54 00 0F FE */ srwi r0, r0, 0x1f +/* 80268BA8 00265AE8 7C 00 00 34 */ cntlzw r0, r0 +/* 80268BAC 00265AEC 54 03 D9 7E */ srwi r3, r0, 5 +/* 80268BB0 00265AF0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268BB4.s b/include/SComponent/c_m3d/asm/func_80268BB4.s new file mode 100644 index 0000000000..eae7e5abf6 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80268BB4.s @@ -0,0 +1,47 @@ +/* 80268BB4 00265AF4 C0 44 00 0C */ lfs f2, 0xc(r4) +/* 80268BB8 00265AF8 C0 64 00 00 */ lfs f3, 0(r4) +/* 80268BBC 00265AFC C0 23 00 00 */ lfs f1, 0(r3) +/* 80268BC0 00265B00 EC 03 10 2A */ fadds f0, f3, f2 +/* 80268BC4 00265B04 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268BC8 00265B08 40 81 00 0C */ ble lbl_80268BD4 +/* 80268BCC 00265B0C 38 60 00 00 */ li r3, 0 +/* 80268BD0 00265B10 4E 80 00 20 */ blr +lbl_80268BD4: +/* 80268BD4 00265B14 C0 23 00 0C */ lfs f1, 0xc(r3) +/* 80268BD8 00265B18 EC 03 10 28 */ fsubs f0, f3, f2 +/* 80268BDC 00265B1C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268BE0 00265B20 40 80 00 0C */ bge lbl_80268BEC +/* 80268BE4 00265B24 38 60 00 00 */ li r3, 0 +/* 80268BE8 00265B28 4E 80 00 20 */ blr +lbl_80268BEC: +/* 80268BEC 00265B2C C0 64 00 08 */ lfs f3, 8(r4) +/* 80268BF0 00265B30 C0 23 00 08 */ lfs f1, 8(r3) +/* 80268BF4 00265B34 EC 03 10 2A */ fadds f0, f3, f2 +/* 80268BF8 00265B38 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268BFC 00265B3C 40 81 00 0C */ ble lbl_80268C08 +/* 80268C00 00265B40 38 60 00 00 */ li r3, 0 +/* 80268C04 00265B44 4E 80 00 20 */ blr +lbl_80268C08: +/* 80268C08 00265B48 C0 23 00 14 */ lfs f1, 0x14(r3) +/* 80268C0C 00265B4C EC 03 10 28 */ fsubs f0, f3, f2 +/* 80268C10 00265B50 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268C14 00265B54 40 80 00 0C */ bge lbl_80268C20 +/* 80268C18 00265B58 38 60 00 00 */ li r3, 0 +/* 80268C1C 00265B5C 4E 80 00 20 */ blr +lbl_80268C20: +/* 80268C20 00265B60 C0 64 00 04 */ lfs f3, 4(r4) +/* 80268C24 00265B64 C0 23 00 04 */ lfs f1, 4(r3) +/* 80268C28 00265B68 EC 03 10 2A */ fadds f0, f3, f2 +/* 80268C2C 00265B6C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268C30 00265B70 40 81 00 0C */ ble lbl_80268C3C +/* 80268C34 00265B74 38 60 00 00 */ li r3, 0 +/* 80268C38 00265B78 4E 80 00 20 */ blr +lbl_80268C3C: +/* 80268C3C 00265B7C C0 23 00 10 */ lfs f1, 0x10(r3) +/* 80268C40 00265B80 EC 03 10 28 */ fsubs f0, f3, f2 +/* 80268C44 00265B84 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268C48 00265B88 7C 00 00 26 */ mfcr r0 +/* 80268C4C 00265B8C 54 00 0F FE */ srwi r0, r0, 0x1f +/* 80268C50 00265B90 7C 00 00 34 */ cntlzw r0, r0 +/* 80268C54 00265B94 54 03 D9 7E */ srwi r3, r0, 5 +/* 80268C58 00265B98 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268C5C.s b/include/SComponent/c_m3d/asm/func_80268C5C.s new file mode 100644 index 0000000000..6092f28ef6 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80268C5C.s @@ -0,0 +1,168 @@ +/* 80268C5C 00265B9C 94 21 FF 40 */ stwu r1, -0xc0(r1) +/* 80268C60 00265BA0 7C 08 02 A6 */ mflr r0 +/* 80268C64 00265BA4 90 01 00 C4 */ stw r0, 0xc4(r1) +/* 80268C68 00265BA8 DB E1 00 B0 */ stfd f31, 0xb0(r1) +/* 80268C6C 00265BAC F3 E1 00 B8 */ psq_st f31, 184(r1), 0, 0 +/* 80268C70 00265BB0 DB C1 00 A0 */ stfd f30, 0xa0(r1) +/* 80268C74 00265BB4 F3 C1 00 A8 */ psq_st f30, 168(r1), 0, 0 +/* 80268C78 00265BB8 DB A1 00 90 */ stfd f29, 0x90(r1) +/* 80268C7C 00265BBC F3 A1 00 98 */ psq_st f29, 152(r1), 0, 0 +/* 80268C80 00265BC0 DB 81 00 80 */ stfd f28, 0x80(r1) +/* 80268C84 00265BC4 F3 81 00 88 */ psq_st f28, 136(r1), 0, 0 +/* 80268C88 00265BC8 DB 61 00 70 */ stfd f27, 0x70(r1) +/* 80268C8C 00265BCC F3 61 00 78 */ psq_st f27, 120(r1), 0, 0 +/* 80268C90 00265BD0 DB 41 00 60 */ stfd f26, 0x60(r1) +/* 80268C94 00265BD4 F3 41 00 68 */ psq_st f26, 104(r1), 0, 0 +/* 80268C98 00265BD8 DB 21 00 50 */ stfd f25, 0x50(r1) +/* 80268C9C 00265BDC F3 21 00 58 */ psq_st f25, 88(r1), 0, 0 +/* 80268CA0 00265BE0 DB 01 00 40 */ stfd f24, 0x40(r1) +/* 80268CA4 00265BE4 F3 01 00 48 */ psq_st f24, 72(r1), 0, 0 +/* 80268CA8 00265BE8 39 61 00 40 */ addi r11, r1, 0x40 +/* 80268CAC 00265BEC 48 0F 95 2D */ bl _savegpr_28 +/* 80268CB0 00265BF0 7C 7C 1B 78 */ mr r28, r3 +/* 80268CB4 00265BF4 7C 9D 23 78 */ mr r29, r4 +/* 80268CB8 00265BF8 7C BE 2B 78 */ mr r30, r5 +/* 80268CBC 00265BFC 7C DF 33 78 */ mr r31, r6 +/* 80268CC0 00265C00 38 7C 00 0C */ addi r3, r28, 0xc +/* 80268CC4 00265C04 7F 84 E3 78 */ mr r4, r28 +/* 80268CC8 00265C08 38 A1 00 20 */ addi r5, r1, 0x20 +/* 80268CCC 00265C0C 48 0D E3 E9 */ bl PSVECSubtract +/* 80268CD0 00265C10 38 7D 00 0C */ addi r3, r29, 0xc +/* 80268CD4 00265C14 7F A4 EB 78 */ mr r4, r29 +/* 80268CD8 00265C18 38 A1 00 14 */ addi r5, r1, 0x14 +/* 80268CDC 00265C1C 48 0D E3 D9 */ bl PSVECSubtract +/* 80268CE0 00265C20 38 61 00 20 */ addi r3, r1, 0x20 +/* 80268CE4 00265C24 48 0D E4 6D */ bl PSVECMag +/* 80268CE8 00265C28 FF E0 08 90 */ fmr f31, f1 +/* 80268CEC 00265C2C 38 61 00 14 */ addi r3, r1, 0x14 +/* 80268CF0 00265C30 48 0D E4 61 */ bl PSVECMag +/* 80268CF4 00265C34 FF C0 08 90 */ fmr f30, f1 +/* 80268CF8 00265C38 FC 00 FA 10 */ fabs f0, f31 +/* 80268CFC 00265C3C FC 00 00 18 */ frsp f0, f0 +/* 80268D00 00265C40 C0 2D 8C 00 */ lfs f1, lbl_80451180-_SDA_BASE_(r13) +/* 80268D04 00265C44 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 80268D08 00265C48 41 80 00 14 */ blt lbl_80268D1C +/* 80268D0C 00265C4C FC 00 F2 10 */ fabs f0, f30 +/* 80268D10 00265C50 FC 00 00 18 */ frsp f0, f0 +/* 80268D14 00265C54 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 80268D18 00265C58 40 80 00 0C */ bge lbl_80268D24 +lbl_80268D1C: +/* 80268D1C 00265C5C 38 60 00 01 */ li r3, 1 +/* 80268D20 00265C60 48 00 01 5C */ b lbl_80268E7C +lbl_80268D24: +/* 80268D24 00265C64 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 80268D28 00265C68 EF A0 F8 24 */ fdivs f29, f0, f31 +/* 80268D2C 00265C6C EF 80 F0 24 */ fdivs f28, f0, f30 +/* 80268D30 00265C70 38 61 00 20 */ addi r3, r1, 0x20 +/* 80268D34 00265C74 7C 64 1B 78 */ mr r4, r3 +/* 80268D38 00265C78 FC 20 E8 90 */ fmr f1, f29 +/* 80268D3C 00265C7C 48 0D E3 9D */ bl PSVECScale +/* 80268D40 00265C80 38 61 00 14 */ addi r3, r1, 0x14 +/* 80268D44 00265C84 7C 64 1B 78 */ mr r4, r3 +/* 80268D48 00265C88 FC 20 E0 90 */ fmr f1, f28 +/* 80268D4C 00265C8C 48 0D E3 8D */ bl PSVECScale +/* 80268D50 00265C90 7F 83 E3 78 */ mr r3, r28 +/* 80268D54 00265C94 7F A4 EB 78 */ mr r4, r29 +/* 80268D58 00265C98 38 A1 00 08 */ addi r5, r1, 8 +/* 80268D5C 00265C9C 48 0D E3 59 */ bl PSVECSubtract +/* 80268D60 00265CA0 38 61 00 20 */ addi r3, r1, 0x20 +/* 80268D64 00265CA4 38 81 00 14 */ addi r4, r1, 0x14 +/* 80268D68 00265CA8 48 0D E4 2D */ bl PSVECDotProduct +/* 80268D6C 00265CAC FF 60 08 50 */ fneg f27, f1 +/* 80268D70 00265CB0 38 61 00 08 */ addi r3, r1, 8 +/* 80268D74 00265CB4 38 81 00 20 */ addi r4, r1, 0x20 +/* 80268D78 00265CB8 48 0D E4 1D */ bl PSVECDotProduct +/* 80268D7C 00265CBC FF 40 08 90 */ fmr f26, f1 +/* 80268D80 00265CC0 38 61 00 08 */ addi r3, r1, 8 +/* 80268D84 00265CC4 48 0D E3 B5 */ bl PSVECSquareMag +/* 80268D88 00265CC8 C0 22 B7 38 */ lfs f1, lbl_80455138-_SDA2_BASE_(r2) +/* 80268D8C 00265CCC EC 1B 06 F2 */ fmuls f0, f27, f27 +/* 80268D90 00265CD0 EC 01 00 28 */ fsubs f0, f1, f0 +/* 80268D94 00265CD4 FC 00 02 10 */ fabs f0, f0 +/* 80268D98 00265CD8 FF 20 00 18 */ frsp f25, f0 +/* 80268D9C 00265CDC FC 00 CA 10 */ fabs f0, f25 +/* 80268DA0 00265CE0 FC 20 00 18 */ frsp f1, f0 +/* 80268DA4 00265CE4 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 80268DA8 00265CE8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268DAC 00265CEC 41 80 00 4C */ blt lbl_80268DF8 +/* 80268DB0 00265CF0 38 61 00 08 */ addi r3, r1, 8 +/* 80268DB4 00265CF4 38 81 00 14 */ addi r4, r1, 0x14 +/* 80268DB8 00265CF8 48 0D E3 DD */ bl PSVECDotProduct +/* 80268DBC 00265CFC FC 20 08 50 */ fneg f1, f1 +/* 80268DC0 00265D00 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 80268DC4 00265D04 EC 40 C8 24 */ fdivs f2, f0, f25 +/* 80268DC8 00265D08 EC 1B 00 72 */ fmuls f0, f27, f1 +/* 80268DCC 00265D0C EC 00 D0 28 */ fsubs f0, f0, f26 +/* 80268DD0 00265D10 EC 02 00 32 */ fmuls f0, f2, f0 +/* 80268DD4 00265D14 EC 00 07 72 */ fmuls f0, f0, f29 +/* 80268DD8 00265D18 D0 1E 00 00 */ stfs f0, 0(r30) +/* 80268DDC 00265D1C EC 1B 06 B2 */ fmuls f0, f27, f26 +/* 80268DE0 00265D20 EC 00 08 28 */ fsubs f0, f0, f1 +/* 80268DE4 00265D24 EC 02 00 32 */ fmuls f0, f2, f0 +/* 80268DE8 00265D28 EC 00 07 32 */ fmuls f0, f0, f28 +/* 80268DEC 00265D2C D0 1F 00 00 */ stfs f0, 0(r31) +/* 80268DF0 00265D30 38 60 00 03 */ li r3, 3 +/* 80268DF4 00265D34 48 00 00 88 */ b lbl_80268E7C +lbl_80268DF8: +/* 80268DF8 00265D38 FF 20 D0 50 */ fneg f25, f26 +/* 80268DFC 00265D3C C3 02 B7 18 */ lfs f24, lbl_80455118-_SDA2_BASE_(r2) +/* 80268E00 00265D40 FC 19 C0 40 */ fcmpo cr0, f25, f24 +/* 80268E04 00265D44 41 80 00 0C */ blt lbl_80268E10 +/* 80268E08 00265D48 FC 19 F8 40 */ fcmpo cr0, f25, f31 +/* 80268E0C 00265D4C 40 81 00 10 */ ble lbl_80268E1C +lbl_80268E10: +/* 80268E10 00265D50 FF 00 F0 90 */ fmr f24, f30 +/* 80268E14 00265D54 EC 1E 06 F2 */ fmuls f0, f30, f27 +/* 80268E18 00265D58 EF 20 D0 28 */ fsubs f25, f0, f26 +lbl_80268E1C: +/* 80268E1C 00265D5C 38 61 00 08 */ addi r3, r1, 8 +/* 80268E20 00265D60 38 81 00 14 */ addi r4, r1, 0x14 +/* 80268E24 00265D64 48 0D E3 71 */ bl PSVECDotProduct +/* 80268E28 00265D68 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 80268E2C 00265D6C FC 19 00 40 */ fcmpo cr0, f25, f0 +/* 80268E30 00265D70 41 80 00 0C */ blt lbl_80268E3C +/* 80268E34 00265D74 FC 19 F8 40 */ fcmpo cr0, f25, f31 +/* 80268E38 00265D78 40 81 00 0C */ ble lbl_80268E44 +lbl_80268E3C: +/* 80268E3C 00265D7C C3 22 B7 18 */ lfs f25, lbl_80455118-_SDA2_BASE_(r2) +/* 80268E40 00265D80 FF 00 08 90 */ fmr f24, f1 +lbl_80268E44: +/* 80268E44 00265D84 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 80268E48 00265D88 FC 18 00 40 */ fcmpo cr0, f24, f0 +/* 80268E4C 00265D8C 41 80 00 0C */ blt lbl_80268E58 +/* 80268E50 00265D90 FC 18 F0 40 */ fcmpo cr0, f24, f30 +/* 80268E54 00265D94 40 81 00 14 */ ble lbl_80268E68 +lbl_80268E58: +/* 80268E58 00265D98 FF 20 F8 90 */ fmr f25, f31 +/* 80268E5C 00265D9C FC 00 F8 50 */ fneg f0, f31 +/* 80268E60 00265DA0 EC 00 06 F2 */ fmuls f0, f0, f27 +/* 80268E64 00265DA4 EF 01 00 2A */ fadds f24, f1, f0 +lbl_80268E68: +/* 80268E68 00265DA8 EC 19 07 72 */ fmuls f0, f25, f29 +/* 80268E6C 00265DAC D0 1E 00 00 */ stfs f0, 0(r30) +/* 80268E70 00265DB0 EC 18 07 32 */ fmuls f0, f24, f28 +/* 80268E74 00265DB4 D0 1F 00 00 */ stfs f0, 0(r31) +/* 80268E78 00265DB8 38 60 00 02 */ li r3, 2 +lbl_80268E7C: +/* 80268E7C 00265DBC E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 +/* 80268E80 00265DC0 CB E1 00 B0 */ lfd f31, 0xb0(r1) +/* 80268E84 00265DC4 E3 C1 00 A8 */ psq_l f30, 168(r1), 0, 0 +/* 80268E88 00265DC8 CB C1 00 A0 */ lfd f30, 0xa0(r1) +/* 80268E8C 00265DCC E3 A1 00 98 */ psq_l f29, 152(r1), 0, 0 +/* 80268E90 00265DD0 CB A1 00 90 */ lfd f29, 0x90(r1) +/* 80268E94 00265DD4 E3 81 00 88 */ psq_l f28, 136(r1), 0, 0 +/* 80268E98 00265DD8 CB 81 00 80 */ lfd f28, 0x80(r1) +/* 80268E9C 00265DDC E3 61 00 78 */ psq_l f27, 120(r1), 0, 0 +/* 80268EA0 00265DE0 CB 61 00 70 */ lfd f27, 0x70(r1) +/* 80268EA4 00265DE4 E3 41 00 68 */ psq_l f26, 104(r1), 0, 0 +/* 80268EA8 00265DE8 CB 41 00 60 */ lfd f26, 0x60(r1) +/* 80268EAC 00265DEC E3 21 00 58 */ psq_l f25, 88(r1), 0, 0 +/* 80268EB0 00265DF0 CB 21 00 50 */ lfd f25, 0x50(r1) +/* 80268EB4 00265DF4 E3 01 00 48 */ psq_l f24, 72(r1), 0, 0 +/* 80268EB8 00265DF8 CB 01 00 40 */ lfd f24, 0x40(r1) +/* 80268EBC 00265DFC 39 61 00 40 */ addi r11, r1, 0x40 +/* 80268EC0 00265E00 48 0F 93 65 */ bl _restgpr_28 +/* 80268EC4 00265E04 80 01 00 C4 */ lwz r0, 0xc4(r1) +/* 80268EC8 00265E08 7C 08 03 A6 */ mtlr r0 +/* 80268ECC 00265E0C 38 21 00 C0 */ addi r1, r1, 0xc0 +/* 80268ED0 00265E10 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268ED4.s b/include/SComponent/c_m3d/asm/func_80268ED4.s new file mode 100644 index 0000000000..b4f2be8c60 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80268ED4.s @@ -0,0 +1,26 @@ +/* 80268ED4 00265E14 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80268ED8 00265E18 7C 08 02 A6 */ mflr r0 +/* 80268EDC 00265E1C 90 01 00 14 */ stw r0, 0x14(r1) +/* 80268EE0 00265E20 EC 61 10 28 */ fsubs f3, f1, f2 +/* 80268EE4 00265E24 FC 00 1A 10 */ fabs f0, f3 +/* 80268EE8 00265E28 FC 40 00 18 */ frsp f2, f0 +/* 80268EEC 00265E2C C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 80268EF0 00265E30 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 80268EF4 00265E34 40 80 00 24 */ bge lbl_80268F18 +/* 80268EF8 00265E38 C0 04 00 00 */ lfs f0, 0(r4) +/* 80268EFC 00265E3C D0 05 00 00 */ stfs f0, 0(r5) +/* 80268F00 00265E40 C0 04 00 04 */ lfs f0, 4(r4) +/* 80268F04 00265E44 D0 05 00 04 */ stfs f0, 4(r5) +/* 80268F08 00265E48 C0 04 00 08 */ lfs f0, 8(r4) +/* 80268F0C 00265E4C D0 05 00 08 */ stfs f0, 8(r5) +/* 80268F10 00265E50 38 60 00 00 */ li r3, 0 +/* 80268F14 00265E54 48 00 00 10 */ b lbl_80268F24 +lbl_80268F18: +/* 80268F18 00265E58 EC 21 18 24 */ fdivs f1, f1, f3 +/* 80268F1C 00265E5C 4B FF F6 95 */ bl cM3d_InDivPos2__FPC3VecPC3VecfP3Vec +/* 80268F20 00265E60 38 60 00 01 */ li r3, 1 +lbl_80268F24: +/* 80268F24 00265E64 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80268F28 00265E68 7C 08 03 A6 */ mtlr r0 +/* 80268F2C 00265E6C 38 21 00 10 */ addi r1, r1, 0x10 +/* 80268F30 00265E70 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268F34.s b/include/SComponent/c_m3d/asm/func_80268F34.s new file mode 100644 index 0000000000..d81fa3f3e0 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80268F34.s @@ -0,0 +1,75 @@ +/* 80268F34 00265E74 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 80268F38 00265E78 7C 08 02 A6 */ mflr r0 +/* 80268F3C 00265E7C 90 01 00 34 */ stw r0, 0x34(r1) +/* 80268F40 00265E80 DB E1 00 20 */ stfd f31, 0x20(r1) +/* 80268F44 00265E84 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 +/* 80268F48 00265E88 39 61 00 20 */ addi r11, r1, 0x20 +/* 80268F4C 00265E8C 48 0F 92 89 */ bl _savegpr_27 +/* 80268F50 00265E90 7C 7B 1B 78 */ mr r27, r3 +/* 80268F54 00265E94 7C 9C 23 78 */ mr r28, r4 +/* 80268F58 00265E98 7C BD 2B 78 */ mr r29, r5 +/* 80268F5C 00265E9C 7C DE 33 78 */ mr r30, r6 +/* 80268F60 00265EA0 7C FF 3B 78 */ mr r31, r7 +/* 80268F64 00265EA4 7F 83 E3 78 */ mr r3, r28 +/* 80268F68 00265EA8 7F 64 DB 78 */ mr r4, r27 +/* 80268F6C 00265EAC 48 0D E2 29 */ bl PSVECDotProduct +/* 80268F70 00265EB0 C0 1C 00 0C */ lfs f0, 0xc(r28) +/* 80268F74 00265EB4 EF E0 08 2A */ fadds f31, f0, f1 +/* 80268F78 00265EB8 7F 83 E3 78 */ mr r3, r28 +/* 80268F7C 00265EBC 38 9B 00 0C */ addi r4, r27, 0xc +/* 80268F80 00265EC0 48 0D E2 15 */ bl PSVECDotProduct +/* 80268F84 00265EC4 C0 1C 00 0C */ lfs f0, 0xc(r28) +/* 80268F88 00265EC8 EC 40 08 2A */ fadds f2, f0, f1 +/* 80268F8C 00265ECC EC 3F 00 B2 */ fmuls f1, f31, f2 +/* 80268F90 00265ED0 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 80268F94 00265ED4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80268F98 00265ED8 40 81 00 24 */ ble lbl_80268FBC +/* 80268F9C 00265EDC C0 1B 00 0C */ lfs f0, 0xc(r27) +/* 80268FA0 00265EE0 D0 1D 00 00 */ stfs f0, 0(r29) +/* 80268FA4 00265EE4 C0 1B 00 10 */ lfs f0, 0x10(r27) +/* 80268FA8 00265EE8 D0 1D 00 04 */ stfs f0, 4(r29) +/* 80268FAC 00265EEC C0 1B 00 14 */ lfs f0, 0x14(r27) +/* 80268FB0 00265EF0 D0 1D 00 08 */ stfs f0, 8(r29) +/* 80268FB4 00265EF4 38 60 00 00 */ li r3, 0 +/* 80268FB8 00265EF8 48 00 00 78 */ b lbl_80269030 +lbl_80268FBC: +/* 80268FBC 00265EFC FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 80268FC0 00265F00 4C 41 13 82 */ cror 2, 1, 2 +/* 80268FC4 00265F04 40 82 00 30 */ bne lbl_80268FF4 +/* 80268FC8 00265F08 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 80268FCC 00265F0C 4C 40 13 82 */ cror 2, 0, 2 +/* 80268FD0 00265F10 40 82 00 24 */ bne lbl_80268FF4 +/* 80268FD4 00265F14 57 C0 06 3F */ clrlwi. r0, r30, 0x18 +/* 80268FD8 00265F18 41 82 00 3C */ beq lbl_80269014 +/* 80268FDC 00265F1C FC 20 F8 90 */ fmr f1, f31 +/* 80268FE0 00265F20 7F 63 DB 78 */ mr r3, r27 +/* 80268FE4 00265F24 38 9B 00 0C */ addi r4, r27, 0xc +/* 80268FE8 00265F28 7F A5 EB 78 */ mr r5, r29 +/* 80268FEC 00265F2C 4B FF FE E9 */ bl cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec +/* 80268FF0 00265F30 48 00 00 40 */ b lbl_80269030 +lbl_80268FF4: +/* 80268FF4 00265F34 57 E0 06 3F */ clrlwi. r0, r31, 0x18 +/* 80268FF8 00265F38 41 82 00 1C */ beq lbl_80269014 +/* 80268FFC 00265F3C FC 20 F8 90 */ fmr f1, f31 +/* 80269000 00265F40 7F 63 DB 78 */ mr r3, r27 +/* 80269004 00265F44 38 9B 00 0C */ addi r4, r27, 0xc +/* 80269008 00265F48 7F A5 EB 78 */ mr r5, r29 +/* 8026900C 00265F4C 4B FF FE C9 */ bl cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec +/* 80269010 00265F50 48 00 00 20 */ b lbl_80269030 +lbl_80269014: +/* 80269014 00265F54 C0 1B 00 0C */ lfs f0, 0xc(r27) +/* 80269018 00265F58 D0 1D 00 00 */ stfs f0, 0(r29) +/* 8026901C 00265F5C C0 1B 00 10 */ lfs f0, 0x10(r27) +/* 80269020 00265F60 D0 1D 00 04 */ stfs f0, 4(r29) +/* 80269024 00265F64 C0 1B 00 14 */ lfs f0, 0x14(r27) +/* 80269028 00265F68 D0 1D 00 08 */ stfs f0, 8(r29) +/* 8026902C 00265F6C 38 60 00 00 */ li r3, 0 +lbl_80269030: +/* 80269030 00265F70 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 +/* 80269034 00265F74 CB E1 00 20 */ lfd f31, 0x20(r1) +/* 80269038 00265F78 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026903C 00265F7C 48 0F 91 E5 */ bl _restgpr_27 +/* 80269040 00265F80 80 01 00 34 */ lwz r0, 0x34(r1) +/* 80269044 00265F84 7C 08 03 A6 */ mtlr r0 +/* 80269048 00265F88 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026904C 00265F8C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80269050.s b/include/SComponent/c_m3d/asm/func_80269050.s new file mode 100644 index 0000000000..9997cbb8dd --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80269050.s @@ -0,0 +1,834 @@ +/* 80269050 00265F90 94 21 FE 00 */ stwu r1, -0x200(r1) +/* 80269054 00265F94 7C 08 02 A6 */ mflr r0 +/* 80269058 00265F98 90 01 02 04 */ stw r0, 0x204(r1) +/* 8026905C 00265F9C DB E1 01 F0 */ stfd f31, 0x1f0(r1) +/* 80269060 00265FA0 F3 E1 01 F8 */ psq_st f31, 504(r1), 0, 0 +/* 80269064 00265FA4 DB C1 01 E0 */ stfd f30, 0x1e0(r1) +/* 80269068 00265FA8 F3 C1 01 E8 */ psq_st f30, 488(r1), 0, 0 +/* 8026906C 00265FAC DB A1 01 D0 */ stfd f29, 0x1d0(r1) +/* 80269070 00265FB0 F3 A1 01 D8 */ psq_st f29, 472(r1), 0, 0 +/* 80269074 00265FB4 DB 81 01 C0 */ stfd f28, 0x1c0(r1) +/* 80269078 00265FB8 F3 81 01 C8 */ psq_st f28, 456(r1), 0, 0 +/* 8026907C 00265FBC DB 61 01 B0 */ stfd f27, 0x1b0(r1) +/* 80269080 00265FC0 F3 61 01 B8 */ psq_st f27, 440(r1), 0, 0 +/* 80269084 00265FC4 DB 41 01 A0 */ stfd f26, 0x1a0(r1) +/* 80269088 00265FC8 F3 41 01 A8 */ psq_st f26, 424(r1), 0, 0 +/* 8026908C 00265FCC DB 21 01 90 */ stfd f25, 0x190(r1) +/* 80269090 00265FD0 F3 21 01 98 */ psq_st f25, 408(r1), 0, 0 +/* 80269094 00265FD4 DB 01 01 80 */ stfd f24, 0x180(r1) +/* 80269098 00265FD8 F3 01 01 88 */ psq_st f24, 392(r1), 0, 0 +/* 8026909C 00265FDC DA E1 01 70 */ stfd f23, 0x170(r1) +/* 802690A0 00265FE0 F2 E1 01 78 */ psq_st f23, 376(r1), 0, 0 +/* 802690A4 00265FE4 DA C1 01 60 */ stfd f22, 0x160(r1) +/* 802690A8 00265FE8 F2 C1 01 68 */ psq_st f22, 360(r1), 0, 0 +/* 802690AC 00265FEC DA A1 01 50 */ stfd f21, 0x150(r1) +/* 802690B0 00265FF0 F2 A1 01 58 */ psq_st f21, 344(r1), 0, 0 +/* 802690B4 00265FF4 DA 81 01 40 */ stfd f20, 0x140(r1) +/* 802690B8 00265FF8 F2 81 01 48 */ psq_st f20, 328(r1), 0, 0 +/* 802690BC 00265FFC DA 61 01 30 */ stfd f19, 0x130(r1) +/* 802690C0 00266000 F2 61 01 38 */ psq_st f19, 312(r1), 0, 0 +/* 802690C4 00266004 DA 41 01 20 */ stfd f18, 0x120(r1) +/* 802690C8 00266008 F2 41 01 28 */ psq_st f18, 296(r1), 0, 0 +/* 802690CC 0026600C DA 21 01 10 */ stfd f17, 0x110(r1) +/* 802690D0 00266010 F2 21 01 18 */ psq_st f17, 280(r1), 0, 0 +/* 802690D4 00266014 39 61 01 10 */ addi r11, r1, 0x110 +/* 802690D8 00266018 48 0F 91 01 */ bl _savegpr_28 +/* 802690DC 0026601C 7C 7C 1B 78 */ mr r28, r3 +/* 802690E0 00266020 7C 9D 23 78 */ mr r29, r4 +/* 802690E4 00266024 3B E0 00 00 */ li r31, 0 +/* 802690E8 00266028 3B C0 00 00 */ li r30, 0 +/* 802690EC 0026602C C0 25 00 00 */ lfs f1, 0(r5) +/* 802690F0 00266030 C0 04 00 00 */ lfs f0, 0(r4) +/* 802690F4 00266034 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802690F8 00266038 40 81 00 20 */ ble lbl_80269118 +/* 802690FC 0026603C C0 46 00 00 */ lfs f2, 0(r6) +/* 80269100 00266040 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 80269104 00266044 40 81 00 0C */ ble lbl_80269110 +/* 80269108 00266048 38 60 00 00 */ li r3, 0 +/* 8026910C 0026604C 48 00 0A 90 */ b lbl_80269B9C +lbl_80269110: +/* 80269110 00266050 83 E2 B7 40 */ lwz r31, lbl_80455140-_SDA2_BASE_(r2) +/* 80269114 00266054 48 00 00 14 */ b lbl_80269128 +lbl_80269118: +/* 80269118 00266058 C0 46 00 00 */ lfs f2, 0(r6) +/* 8026911C 0026605C FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 80269120 00266060 40 81 00 08 */ ble lbl_80269128 +/* 80269124 00266064 83 C2 B7 40 */ lwz r30, lbl_80455140-_SDA2_BASE_(r2) +lbl_80269128: +/* 80269128 00266068 57 E0 07 FF */ clrlwi. r0, r31, 0x1f +/* 8026912C 0026606C 40 82 00 38 */ bne lbl_80269164 +/* 80269130 00266070 C0 7C 00 00 */ lfs f3, 0(r28) +/* 80269134 00266074 FC 01 18 40 */ fcmpo cr0, f1, f3 +/* 80269138 00266078 40 80 00 2C */ bge lbl_80269164 +/* 8026913C 0026607C 57 C0 07 FF */ clrlwi. r0, r30, 0x1f +/* 80269140 00266080 40 82 00 18 */ bne lbl_80269158 +/* 80269144 00266084 C0 46 00 00 */ lfs f2, 0(r6) +/* 80269148 00266088 FC 02 18 40 */ fcmpo cr0, f2, f3 +/* 8026914C 0026608C 40 80 00 0C */ bge lbl_80269158 +/* 80269150 00266090 38 60 00 00 */ li r3, 0 +/* 80269154 00266094 48 00 0A 48 */ b lbl_80269B9C +lbl_80269158: +/* 80269158 00266098 80 02 B7 44 */ lwz r0, lbl_80455144-_SDA2_BASE_(r2) +/* 8026915C 0026609C 7F FF 03 78 */ or r31, r31, r0 +/* 80269160 002660A0 48 00 00 24 */ b lbl_80269184 +lbl_80269164: +/* 80269164 002660A4 57 C0 07 FF */ clrlwi. r0, r30, 0x1f +/* 80269168 002660A8 40 82 00 1C */ bne lbl_80269184 +/* 8026916C 002660AC C0 66 00 00 */ lfs f3, 0(r6) +/* 80269170 002660B0 C0 5C 00 00 */ lfs f2, 0(r28) +/* 80269174 002660B4 FC 03 10 40 */ fcmpo cr0, f3, f2 +/* 80269178 002660B8 40 80 00 0C */ bge lbl_80269184 +/* 8026917C 002660BC 80 02 B7 44 */ lwz r0, lbl_80455144-_SDA2_BASE_(r2) +/* 80269180 002660C0 7F DE 03 78 */ or r30, r30, r0 +lbl_80269184: +/* 80269184 002660C4 C0 65 00 08 */ lfs f3, 8(r5) +/* 80269188 002660C8 C0 5D 00 08 */ lfs f2, 8(r29) +/* 8026918C 002660CC FC 03 10 40 */ fcmpo cr0, f3, f2 +/* 80269190 002660D0 40 81 00 24 */ ble lbl_802691B4 +/* 80269194 002660D4 C0 86 00 08 */ lfs f4, 8(r6) +/* 80269198 002660D8 FC 04 10 40 */ fcmpo cr0, f4, f2 +/* 8026919C 002660DC 40 81 00 0C */ ble lbl_802691A8 +/* 802691A0 002660E0 38 60 00 00 */ li r3, 0 +/* 802691A4 002660E4 48 00 09 F8 */ b lbl_80269B9C +lbl_802691A8: +/* 802691A8 002660E8 80 02 B7 48 */ lwz r0, lbl_80455148-_SDA2_BASE_(r2) +/* 802691AC 002660EC 7F FF 03 78 */ or r31, r31, r0 +/* 802691B0 002660F0 48 00 00 18 */ b lbl_802691C8 +lbl_802691B4: +/* 802691B4 002660F4 C0 86 00 08 */ lfs f4, 8(r6) +/* 802691B8 002660F8 FC 04 10 40 */ fcmpo cr0, f4, f2 +/* 802691BC 002660FC 40 81 00 0C */ ble lbl_802691C8 +/* 802691C0 00266100 80 02 B7 48 */ lwz r0, lbl_80455148-_SDA2_BASE_(r2) +/* 802691C4 00266104 7F DE 03 78 */ or r30, r30, r0 +lbl_802691C8: +/* 802691C8 00266108 57 E0 06 F7 */ rlwinm. r0, r31, 0, 0x1b, 0x1b +/* 802691CC 0026610C 40 82 00 38 */ bne lbl_80269204 +/* 802691D0 00266110 C0 BC 00 08 */ lfs f5, 8(r28) +/* 802691D4 00266114 FC 03 28 40 */ fcmpo cr0, f3, f5 +/* 802691D8 00266118 40 80 00 2C */ bge lbl_80269204 +/* 802691DC 0026611C 57 C0 06 F7 */ rlwinm. r0, r30, 0, 0x1b, 0x1b +/* 802691E0 00266120 40 82 00 18 */ bne lbl_802691F8 +/* 802691E4 00266124 C0 86 00 08 */ lfs f4, 8(r6) +/* 802691E8 00266128 FC 04 28 40 */ fcmpo cr0, f4, f5 +/* 802691EC 0026612C 40 80 00 0C */ bge lbl_802691F8 +/* 802691F0 00266130 38 60 00 00 */ li r3, 0 +/* 802691F4 00266134 48 00 09 A8 */ b lbl_80269B9C +lbl_802691F8: +/* 802691F8 00266138 80 02 B7 4C */ lwz r0, lbl_8045514C-_SDA2_BASE_(r2) +/* 802691FC 0026613C 7F FF 03 78 */ or r31, r31, r0 +/* 80269200 00266140 48 00 00 24 */ b lbl_80269224 +lbl_80269204: +/* 80269204 00266144 57 C0 06 F7 */ rlwinm. r0, r30, 0, 0x1b, 0x1b +/* 80269208 00266148 40 82 00 1C */ bne lbl_80269224 +/* 8026920C 0026614C C0 A6 00 08 */ lfs f5, 8(r6) +/* 80269210 00266150 C0 9C 00 08 */ lfs f4, 8(r28) +/* 80269214 00266154 FC 05 20 40 */ fcmpo cr0, f5, f4 +/* 80269218 00266158 40 80 00 0C */ bge lbl_80269224 +/* 8026921C 0026615C 80 02 B7 4C */ lwz r0, lbl_8045514C-_SDA2_BASE_(r2) +/* 80269220 00266160 7F DE 03 78 */ or r30, r30, r0 +lbl_80269224: +/* 80269224 00266164 C0 85 00 04 */ lfs f4, 4(r5) +/* 80269228 00266168 C1 7D 00 04 */ lfs f11, 4(r29) +/* 8026922C 0026616C FC 04 58 40 */ fcmpo cr0, f4, f11 +/* 80269230 00266170 40 81 00 24 */ ble lbl_80269254 +/* 80269234 00266174 C0 A6 00 04 */ lfs f5, 4(r6) +/* 80269238 00266178 FC 05 58 40 */ fcmpo cr0, f5, f11 +/* 8026923C 0026617C 40 81 00 0C */ ble lbl_80269248 +/* 80269240 00266180 38 60 00 00 */ li r3, 0 +/* 80269244 00266184 48 00 09 58 */ b lbl_80269B9C +lbl_80269248: +/* 80269248 00266188 80 02 B7 50 */ lwz r0, lbl_80455150-_SDA2_BASE_(r2) +/* 8026924C 0026618C 7F FF 03 78 */ or r31, r31, r0 +/* 80269250 00266190 48 00 00 18 */ b lbl_80269268 +lbl_80269254: +/* 80269254 00266194 C0 A6 00 04 */ lfs f5, 4(r6) +/* 80269258 00266198 FC 05 58 40 */ fcmpo cr0, f5, f11 +/* 8026925C 0026619C 40 81 00 0C */ ble lbl_80269268 +/* 80269260 002661A0 80 02 B7 50 */ lwz r0, lbl_80455150-_SDA2_BASE_(r2) +/* 80269264 002661A4 7F DE 03 78 */ or r30, r30, r0 +lbl_80269268: +/* 80269268 002661A8 57 E0 07 7B */ rlwinm. r0, r31, 0, 0x1d, 0x1d +/* 8026926C 002661AC 40 82 00 38 */ bne lbl_802692A4 +/* 80269270 002661B0 C0 DC 00 04 */ lfs f6, 4(r28) +/* 80269274 002661B4 FC 04 30 40 */ fcmpo cr0, f4, f6 +/* 80269278 002661B8 40 80 00 2C */ bge lbl_802692A4 +/* 8026927C 002661BC 57 C0 07 7B */ rlwinm. r0, r30, 0, 0x1d, 0x1d +/* 80269280 002661C0 40 82 00 18 */ bne lbl_80269298 +/* 80269284 002661C4 C0 A6 00 04 */ lfs f5, 4(r6) +/* 80269288 002661C8 FC 05 30 40 */ fcmpo cr0, f5, f6 +/* 8026928C 002661CC 40 80 00 0C */ bge lbl_80269298 +/* 80269290 002661D0 38 60 00 00 */ li r3, 0 +/* 80269294 002661D4 48 00 09 08 */ b lbl_80269B9C +lbl_80269298: +/* 80269298 002661D8 80 02 B7 54 */ lwz r0, lbl_80455154-_SDA2_BASE_(r2) +/* 8026929C 002661DC 7F FF 03 78 */ or r31, r31, r0 +/* 802692A0 002661E0 48 00 00 24 */ b lbl_802692C4 +lbl_802692A4: +/* 802692A4 002661E4 57 C0 07 7B */ rlwinm. r0, r30, 0, 0x1d, 0x1d +/* 802692A8 002661E8 40 82 00 1C */ bne lbl_802692C4 +/* 802692AC 002661EC C0 C6 00 04 */ lfs f6, 4(r6) +/* 802692B0 002661F0 C0 BC 00 04 */ lfs f5, 4(r28) +/* 802692B4 002661F4 FC 06 28 40 */ fcmpo cr0, f6, f5 +/* 802692B8 002661F8 40 80 00 0C */ bge lbl_802692C4 +/* 802692BC 002661FC 80 02 B7 54 */ lwz r0, lbl_80455154-_SDA2_BASE_(r2) +/* 802692C0 00266200 7F DE 03 78 */ or r30, r30, r0 +lbl_802692C4: +/* 802692C4 00266204 28 1F 00 00 */ cmplwi r31, 0 +/* 802692C8 00266208 40 82 00 0C */ bne lbl_802692D4 +/* 802692CC 0026620C 38 60 00 01 */ li r3, 1 +/* 802692D0 00266210 48 00 08 CC */ b lbl_80269B9C +lbl_802692D4: +/* 802692D4 00266214 28 1E 00 00 */ cmplwi r30, 0 +/* 802692D8 00266218 40 82 00 0C */ bne lbl_802692E4 +/* 802692DC 0026621C 38 60 00 01 */ li r3, 1 +/* 802692E0 00266220 48 00 08 BC */ b lbl_80269B9C +lbl_802692E4: +/* 802692E4 00266224 38 60 00 00 */ li r3, 0 +/* 802692E8 00266228 FE 80 08 50 */ fneg f20, f1 +/* 802692EC 0026622C EC B4 20 2A */ fadds f5, f20, f4 +/* 802692F0 00266230 C1 BC 00 00 */ lfs f13, 0(r28) +/* 802692F4 00266234 FE A0 68 50 */ fneg f21, f13 +/* 802692F8 00266238 ED 35 58 2A */ fadds f9, f21, f11 +/* 802692FC 0026623C FC 05 48 40 */ fcmpo cr0, f5, f9 +/* 80269300 00266240 40 81 00 08 */ ble lbl_80269308 +/* 80269304 00266244 80 62 B7 58 */ lwz r3, lbl_80455158-_SDA2_BASE_(r2) +lbl_80269308: +/* 80269308 00266248 FC E0 00 50 */ fneg f7, f0 +/* 8026930C 0026624C C0 DC 00 04 */ lfs f6, 4(r28) +/* 80269310 00266250 ED 47 30 2A */ fadds f10, f7, f6 +/* 80269314 00266254 FC 05 50 40 */ fcmpo cr0, f5, f10 +/* 80269318 00266258 40 80 00 0C */ bge lbl_80269324 +/* 8026931C 0026625C 80 02 B7 5C */ lwz r0, lbl_8045515C-_SDA2_BASE_(r2) +/* 80269320 00266260 7C 63 03 78 */ or r3, r3, r0 +lbl_80269324: +/* 80269324 00266264 EC E1 20 2A */ fadds f7, f1, f4 +/* 80269328 00266268 ED 80 58 2A */ fadds f12, f0, f11 +/* 8026932C 0026626C FC 07 60 40 */ fcmpo cr0, f7, f12 +/* 80269330 00266270 40 81 00 0C */ ble lbl_8026933C +/* 80269334 00266274 80 02 B7 60 */ lwz r0, lbl_80455160-_SDA2_BASE_(r2) +/* 80269338 00266278 7C 63 03 78 */ or r3, r3, r0 +lbl_8026933C: +/* 8026933C 0026627C EF CD 30 2A */ fadds f30, f13, f6 +/* 80269340 00266280 FC 07 F0 40 */ fcmpo cr0, f7, f30 +/* 80269344 00266284 40 80 00 0C */ bge lbl_80269350 +/* 80269348 00266288 80 02 B7 64 */ lwz r0, lbl_80455164-_SDA2_BASE_(r2) +/* 8026934C 0026628C 7C 63 03 78 */ or r3, r3, r0 +lbl_80269350: +/* 80269350 00266290 FE E0 18 50 */ fneg f23, f3 +/* 80269354 00266294 EE 77 20 2A */ fadds f19, f23, f4 +/* 80269358 00266298 C1 1C 00 08 */ lfs f8, 8(r28) +/* 8026935C 0026629C FE C0 40 50 */ fneg f22, f8 +/* 80269360 002662A0 EF B6 58 2A */ fadds f29, f22, f11 +/* 80269364 002662A4 FC 13 E8 40 */ fcmpo cr0, f19, f29 +/* 80269368 002662A8 40 81 00 0C */ ble lbl_80269374 +/* 8026936C 002662AC 80 02 B7 68 */ lwz r0, lbl_80455168-_SDA2_BASE_(r2) +/* 80269370 002662B0 7C 63 03 78 */ or r3, r3, r0 +lbl_80269374: +/* 80269374 002662B4 FF 00 10 50 */ fneg f24, f2 +/* 80269378 002662B8 EF 98 30 2A */ fadds f28, f24, f6 +/* 8026937C 002662BC FC 13 E0 40 */ fcmpo cr0, f19, f28 +/* 80269380 002662C0 40 80 00 0C */ bge lbl_8026938C +/* 80269384 002662C4 80 02 B7 6C */ lwz r0, lbl_8045516C-_SDA2_BASE_(r2) +/* 80269388 002662C8 7C 63 03 78 */ or r3, r3, r0 +lbl_8026938C: +/* 8026938C 002662CC EE 63 20 2A */ fadds f19, f3, f4 +/* 80269390 002662D0 EF 62 58 2A */ fadds f27, f2, f11 +/* 80269394 002662D4 FC 13 D8 40 */ fcmpo cr0, f19, f27 +/* 80269398 002662D8 40 81 00 0C */ ble lbl_802693A4 +/* 8026939C 002662DC 80 02 B7 70 */ lwz r0, lbl_80455170-_SDA2_BASE_(r2) +/* 802693A0 002662E0 7C 63 03 78 */ or r3, r3, r0 +lbl_802693A4: +/* 802693A4 002662E4 EF 48 30 2A */ fadds f26, f8, f6 +/* 802693A8 002662E8 FC 13 D0 40 */ fcmpo cr0, f19, f26 +/* 802693AC 002662EC 40 80 00 0C */ bge lbl_802693B8 +/* 802693B0 002662F0 80 02 B7 74 */ lwz r0, lbl_80455174-_SDA2_BASE_(r2) +/* 802693B4 002662F4 7C 63 03 78 */ or r3, r3, r0 +lbl_802693B8: +/* 802693B8 002662F8 ED 77 08 2A */ fadds f11, f23, f1 +/* 802693BC 002662FC EF 36 00 2A */ fadds f25, f22, f0 +/* 802693C0 00266300 FC 0B C8 40 */ fcmpo cr0, f11, f25 +/* 802693C4 00266304 40 81 00 0C */ ble lbl_802693D0 +/* 802693C8 00266308 80 02 B7 78 */ lwz r0, lbl_80455178-_SDA2_BASE_(r2) +/* 802693CC 0026630C 7C 63 03 78 */ or r3, r3, r0 +lbl_802693D0: +/* 802693D0 00266310 EF 18 68 2A */ fadds f24, f24, f13 +/* 802693D4 00266314 FC 0B C0 40 */ fcmpo cr0, f11, f24 +/* 802693D8 00266318 40 80 00 0C */ bge lbl_802693E4 +/* 802693DC 0026631C 80 02 B7 7C */ lwz r0, lbl_8045517C-_SDA2_BASE_(r2) +/* 802693E0 00266320 7C 63 03 78 */ or r3, r3, r0 +lbl_802693E4: +/* 802693E4 00266324 ED 63 08 2A */ fadds f11, f3, f1 +/* 802693E8 00266328 EE E2 00 2A */ fadds f23, f2, f0 +/* 802693EC 0026632C FC 0B B8 40 */ fcmpo cr0, f11, f23 +/* 802693F0 00266330 40 81 00 0C */ ble lbl_802693FC +/* 802693F4 00266334 80 02 B7 80 */ lwz r0, lbl_80455180-_SDA2_BASE_(r2) +/* 802693F8 00266338 7C 63 03 78 */ or r3, r3, r0 +lbl_802693FC: +/* 802693FC 0026633C EE C8 68 2A */ fadds f22, f8, f13 +/* 80269400 00266340 FC 0B B0 40 */ fcmpo cr0, f11, f22 +/* 80269404 00266344 40 80 00 0C */ bge lbl_80269410 +/* 80269408 00266348 80 02 B7 84 */ lwz r0, lbl_80455184-_SDA2_BASE_(r2) +/* 8026940C 0026634C 7C 63 03 78 */ or r3, r3, r0 +lbl_80269410: +/* 80269410 00266350 54 60 40 2E */ slwi r0, r3, 8 +/* 80269414 00266354 7F FF 03 78 */ or r31, r31, r0 +/* 80269418 00266358 38 60 00 00 */ li r3, 0 +/* 8026941C 0026635C C3 E6 00 00 */ lfs f31, 0(r6) +/* 80269420 00266360 FE 60 F8 50 */ fneg f19, f31 +/* 80269424 00266364 C1 A6 00 04 */ lfs f13, 4(r6) +/* 80269428 00266368 ED 73 68 2A */ fadds f11, f19, f13 +/* 8026942C 0026636C FC 0B 48 40 */ fcmpo cr0, f11, f9 +/* 80269430 00266370 40 81 00 08 */ ble lbl_80269438 +/* 80269434 00266374 80 62 B7 58 */ lwz r3, lbl_80455158-_SDA2_BASE_(r2) +lbl_80269438: +/* 80269438 00266378 FC 0B 50 40 */ fcmpo cr0, f11, f10 +/* 8026943C 0026637C 40 80 00 0C */ bge lbl_80269448 +/* 80269440 00266380 80 02 B7 5C */ lwz r0, lbl_8045515C-_SDA2_BASE_(r2) +/* 80269444 00266384 7C 63 03 78 */ or r3, r3, r0 +lbl_80269448: +/* 80269448 00266388 ED 5F 68 2A */ fadds f10, f31, f13 +/* 8026944C 0026638C FC 0A 60 40 */ fcmpo cr0, f10, f12 +/* 80269450 00266390 40 81 00 0C */ ble lbl_8026945C +/* 80269454 00266394 80 02 B7 60 */ lwz r0, lbl_80455160-_SDA2_BASE_(r2) +/* 80269458 00266398 7C 63 03 78 */ or r3, r3, r0 +lbl_8026945C: +/* 8026945C 0026639C FC 0A F0 40 */ fcmpo cr0, f10, f30 +/* 80269460 002663A0 40 80 00 0C */ bge lbl_8026946C +/* 80269464 002663A4 80 02 B7 64 */ lwz r0, lbl_80455164-_SDA2_BASE_(r2) +/* 80269468 002663A8 7C 63 03 78 */ or r3, r3, r0 +lbl_8026946C: +/* 8026946C 002663AC C3 C6 00 08 */ lfs f30, 8(r6) +/* 80269470 002663B0 FE 20 F0 50 */ fneg f17, f30 +/* 80269474 002663B4 EE 51 68 2A */ fadds f18, f17, f13 +/* 80269478 002663B8 FC 12 E8 40 */ fcmpo cr0, f18, f29 +/* 8026947C 002663BC 40 81 00 0C */ ble lbl_80269488 +/* 80269480 002663C0 80 02 B7 68 */ lwz r0, lbl_80455168-_SDA2_BASE_(r2) +/* 80269484 002663C4 7C 63 03 78 */ or r3, r3, r0 +lbl_80269488: +/* 80269488 002663C8 FC 12 E0 40 */ fcmpo cr0, f18, f28 +/* 8026948C 002663CC 40 80 00 0C */ bge lbl_80269498 +/* 80269490 002663D0 80 02 B7 6C */ lwz r0, lbl_8045516C-_SDA2_BASE_(r2) +/* 80269494 002663D4 7C 63 03 78 */ or r3, r3, r0 +lbl_80269498: +/* 80269498 002663D8 EE 5E 68 2A */ fadds f18, f30, f13 +/* 8026949C 002663DC FC 12 D8 40 */ fcmpo cr0, f18, f27 +/* 802694A0 002663E0 40 81 00 0C */ ble lbl_802694AC +/* 802694A4 002663E4 80 02 B7 70 */ lwz r0, lbl_80455170-_SDA2_BASE_(r2) +/* 802694A8 002663E8 7C 63 03 78 */ or r3, r3, r0 +lbl_802694AC: +/* 802694AC 002663EC FC 12 D0 40 */ fcmpo cr0, f18, f26 +/* 802694B0 002663F0 40 80 00 0C */ bge lbl_802694BC +/* 802694B4 002663F4 80 02 B7 74 */ lwz r0, lbl_80455174-_SDA2_BASE_(r2) +/* 802694B8 002663F8 7C 63 03 78 */ or r3, r3, r0 +lbl_802694BC: +/* 802694BC 002663FC EE 31 F8 2A */ fadds f17, f17, f31 +/* 802694C0 00266400 FC 11 C8 40 */ fcmpo cr0, f17, f25 +/* 802694C4 00266404 40 81 00 0C */ ble lbl_802694D0 +/* 802694C8 00266408 80 02 B7 78 */ lwz r0, lbl_80455178-_SDA2_BASE_(r2) +/* 802694CC 0026640C 7C 63 03 78 */ or r3, r3, r0 +lbl_802694D0: +/* 802694D0 00266410 FC 11 C0 40 */ fcmpo cr0, f17, f24 +/* 802694D4 00266414 40 80 00 0C */ bge lbl_802694E0 +/* 802694D8 00266418 80 02 B7 7C */ lwz r0, lbl_8045517C-_SDA2_BASE_(r2) +/* 802694DC 0026641C 7C 63 03 78 */ or r3, r3, r0 +lbl_802694E0: +/* 802694E0 00266420 EE 3E F8 2A */ fadds f17, f30, f31 +/* 802694E4 00266424 FC 11 B8 40 */ fcmpo cr0, f17, f23 +/* 802694E8 00266428 40 81 00 0C */ ble lbl_802694F4 +/* 802694EC 0026642C 80 02 B7 80 */ lwz r0, lbl_80455180-_SDA2_BASE_(r2) +/* 802694F0 00266430 7C 63 03 78 */ or r3, r3, r0 +lbl_802694F4: +/* 802694F4 00266434 FC 11 B0 40 */ fcmpo cr0, f17, f22 +/* 802694F8 00266438 40 80 00 0C */ bge lbl_80269504 +/* 802694FC 0026643C 80 02 B7 84 */ lwz r0, lbl_80455184-_SDA2_BASE_(r2) +/* 80269500 00266440 7C 63 03 78 */ or r3, r3, r0 +lbl_80269504: +/* 80269504 00266444 54 60 40 2E */ slwi r0, r3, 8 +/* 80269508 00266448 7F DE 03 78 */ or r30, r30, r0 +/* 8026950C 0026644C 7F E0 F0 39 */ and. r0, r31, r30 +/* 80269510 00266450 41 82 00 0C */ beq lbl_8026951C +/* 80269514 00266454 38 60 00 00 */ li r3, 0 +/* 80269518 00266458 48 00 06 84 */ b lbl_80269B9C +lbl_8026951C: +/* 8026951C 0026645C 38 60 00 00 */ li r3, 0 +/* 80269520 00266460 EE E3 38 2A */ fadds f23, f3, f7 +/* 80269524 00266464 EE C2 60 2A */ fadds f22, f2, f12 +/* 80269528 00266468 FC 17 B0 40 */ fcmpo cr0, f23, f22 +/* 8026952C 0026646C 40 81 00 08 */ ble lbl_80269534 +/* 80269530 00266470 80 62 B7 88 */ lwz r3, lbl_80455188-_SDA2_BASE_(r2) +lbl_80269534: +/* 80269534 00266474 EF 03 28 2A */ fadds f24, f3, f5 +/* 80269538 00266478 EE E2 48 2A */ fadds f23, f2, f9 +/* 8026953C 0026647C FC 18 B8 40 */ fcmpo cr0, f24, f23 +/* 80269540 00266480 40 81 00 0C */ ble lbl_8026954C +/* 80269544 00266484 80 02 B7 8C */ lwz r0, lbl_8045518C-_SDA2_BASE_(r2) +/* 80269548 00266488 7C 63 03 78 */ or r3, r3, r0 +lbl_8026954C: +/* 8026954C 0026648C EF 05 18 28 */ fsubs f24, f5, f3 +/* 80269550 00266490 EC A9 40 28 */ fsubs f5, f9, f8 +/* 80269554 00266494 FC 18 28 40 */ fcmpo cr0, f24, f5 +/* 80269558 00266498 40 81 00 0C */ ble lbl_80269564 +/* 8026955C 0026649C 80 02 B7 90 */ lwz r0, lbl_80455190-_SDA2_BASE_(r2) +/* 80269560 002664A0 7C 63 03 78 */ or r3, r3, r0 +lbl_80269564: +/* 80269564 002664A4 EC E7 18 28 */ fsubs f7, f7, f3 +/* 80269568 002664A8 ED 2C 40 28 */ fsubs f9, f12, f8 +/* 8026956C 002664AC FC 07 48 40 */ fcmpo cr0, f7, f9 +/* 80269570 002664B0 40 81 00 0C */ ble lbl_8026957C +/* 80269574 002664B4 80 02 B7 94 */ lwz r0, lbl_80455194-_SDA2_BASE_(r2) +/* 80269578 002664B8 7C 63 03 78 */ or r3, r3, r0 +lbl_8026957C: +/* 8026957C 002664BC EC E1 20 28 */ fsubs f7, f1, f4 +/* 80269580 002664C0 EC E3 38 2A */ fadds f7, f3, f7 +/* 80269584 002664C4 EC 00 30 28 */ fsubs f0, f0, f6 +/* 80269588 002664C8 ED 82 00 2A */ fadds f12, f2, f0 +/* 8026958C 002664CC FC 07 60 40 */ fcmpo cr0, f7, f12 +/* 80269590 002664D0 40 81 00 0C */ ble lbl_8026959C +/* 80269594 002664D4 80 02 B7 98 */ lwz r0, lbl_80455198-_SDA2_BASE_(r2) +/* 80269598 002664D8 7C 63 03 78 */ or r3, r3, r0 +lbl_8026959C: +/* 8026959C 002664DC EC F4 20 28 */ fsubs f7, f20, f4 +/* 802695A0 002664E0 EC 03 38 2A */ fadds f0, f3, f7 +/* 802695A4 002664E4 EC 95 30 28 */ fsubs f4, f21, f6 +/* 802695A8 002664E8 EC 42 20 2A */ fadds f2, f2, f4 +/* 802695AC 002664EC FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 802695B0 002664F0 40 81 00 0C */ ble lbl_802695BC +/* 802695B4 002664F4 80 02 B7 9C */ lwz r0, lbl_8045519C-_SDA2_BASE_(r2) +/* 802695B8 002664F8 7C 63 03 78 */ or r3, r3, r0 +lbl_802695BC: +/* 802695BC 002664FC FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 802695C0 00266500 40 81 00 0C */ ble lbl_802695CC +/* 802695C4 00266504 80 02 B7 A0 */ lwz r0, lbl_804551A0-_SDA2_BASE_(r2) +/* 802695C8 00266508 7C 63 03 78 */ or r3, r3, r0 +lbl_802695CC: +/* 802695CC 0026650C EC 07 18 28 */ fsubs f0, f7, f3 +/* 802695D0 00266510 EC 64 40 28 */ fsubs f3, f4, f8 +/* 802695D4 00266514 FC 00 18 40 */ fcmpo cr0, f0, f3 +/* 802695D8 00266518 40 81 00 0C */ ble lbl_802695E4 +/* 802695DC 0026651C 80 02 B7 A4 */ lwz r0, lbl_804551A4-_SDA2_BASE_(r2) +/* 802695E0 00266520 7C 63 03 78 */ or r3, r3, r0 +lbl_802695E4: +/* 802695E4 00266524 54 60 C0 0E */ slwi r0, r3, 0x18 +/* 802695E8 00266528 7F FF 03 78 */ or r31, r31, r0 +/* 802695EC 0026652C 38 60 00 00 */ li r3, 0 +/* 802695F0 00266530 EC 1E 50 2A */ fadds f0, f30, f10 +/* 802695F4 00266534 FC 00 B0 40 */ fcmpo cr0, f0, f22 +/* 802695F8 00266538 40 81 00 08 */ ble lbl_80269600 +/* 802695FC 0026653C 80 62 B7 88 */ lwz r3, lbl_80455188-_SDA2_BASE_(r2) +lbl_80269600: +/* 80269600 00266540 EC 1E 58 2A */ fadds f0, f30, f11 +/* 80269604 00266544 FC 00 B8 40 */ fcmpo cr0, f0, f23 +/* 80269608 00266548 40 81 00 0C */ ble lbl_80269614 +/* 8026960C 0026654C 80 02 B7 8C */ lwz r0, lbl_8045518C-_SDA2_BASE_(r2) +/* 80269610 00266550 7C 63 03 78 */ or r3, r3, r0 +lbl_80269614: +/* 80269614 00266554 EC 0B F0 28 */ fsubs f0, f11, f30 +/* 80269618 00266558 FC 00 28 40 */ fcmpo cr0, f0, f5 +/* 8026961C 0026655C 40 81 00 0C */ ble lbl_80269628 +/* 80269620 00266560 80 02 B7 90 */ lwz r0, lbl_80455190-_SDA2_BASE_(r2) +/* 80269624 00266564 7C 63 03 78 */ or r3, r3, r0 +lbl_80269628: +/* 80269628 00266568 EC 0A F0 28 */ fsubs f0, f10, f30 +/* 8026962C 0026656C FC 00 48 40 */ fcmpo cr0, f0, f9 +/* 80269630 00266570 40 81 00 0C */ ble lbl_8026963C +/* 80269634 00266574 80 02 B7 94 */ lwz r0, lbl_80455194-_SDA2_BASE_(r2) +/* 80269638 00266578 7C 63 03 78 */ or r3, r3, r0 +lbl_8026963C: +/* 8026963C 0026657C EC 1F 68 28 */ fsubs f0, f31, f13 +/* 80269640 00266580 EC 1E 00 2A */ fadds f0, f30, f0 +/* 80269644 00266584 FC 00 60 40 */ fcmpo cr0, f0, f12 +/* 80269648 00266588 40 81 00 0C */ ble lbl_80269654 +/* 8026964C 0026658C 80 02 B7 98 */ lwz r0, lbl_80455198-_SDA2_BASE_(r2) +/* 80269650 00266590 7C 63 03 78 */ or r3, r3, r0 +lbl_80269654: +/* 80269654 00266594 EC 93 68 28 */ fsubs f4, f19, f13 +/* 80269658 00266598 EC 1E 20 2A */ fadds f0, f30, f4 +/* 8026965C 0026659C FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 80269660 002665A0 40 81 00 0C */ ble lbl_8026966C +/* 80269664 002665A4 80 02 B7 9C */ lwz r0, lbl_8045519C-_SDA2_BASE_(r2) +/* 80269668 002665A8 7C 63 03 78 */ or r3, r3, r0 +lbl_8026966C: +/* 8026966C 002665AC FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 80269670 002665B0 40 81 00 0C */ ble lbl_8026967C +/* 80269674 002665B4 80 02 B7 A0 */ lwz r0, lbl_804551A0-_SDA2_BASE_(r2) +/* 80269678 002665B8 7C 63 03 78 */ or r3, r3, r0 +lbl_8026967C: +/* 8026967C 002665BC EC 04 F0 28 */ fsubs f0, f4, f30 +/* 80269680 002665C0 FC 00 18 40 */ fcmpo cr0, f0, f3 +/* 80269684 002665C4 40 81 00 0C */ ble lbl_80269690 +/* 80269688 002665C8 80 02 B7 A4 */ lwz r0, lbl_804551A4-_SDA2_BASE_(r2) +/* 8026968C 002665CC 7C 63 03 78 */ or r3, r3, r0 +lbl_80269690: +/* 80269690 002665D0 54 60 C0 0E */ slwi r0, r3, 0x18 +/* 80269694 002665D4 7F DE 03 78 */ or r30, r30, r0 +/* 80269698 002665D8 7F E0 F0 39 */ and. r0, r31, r30 +/* 8026969C 002665DC 41 82 00 0C */ beq lbl_802696A8 +/* 802696A0 002665E0 38 60 00 00 */ li r3, 0 +/* 802696A4 002665E4 48 00 04 F8 */ b lbl_80269B9C +lbl_802696A8: +/* 802696A8 002665E8 D0 21 00 14 */ stfs f1, 0x14(r1) +/* 802696AC 002665EC C0 05 00 04 */ lfs f0, 4(r5) +/* 802696B0 002665F0 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 802696B4 002665F4 C0 05 00 08 */ lfs f0, 8(r5) +/* 802696B8 002665F8 D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 802696BC 002665FC C0 06 00 00 */ lfs f0, 0(r6) +/* 802696C0 00266600 D0 01 00 08 */ stfs f0, 8(r1) +/* 802696C4 00266604 C0 06 00 04 */ lfs f0, 4(r6) +/* 802696C8 00266608 D0 01 00 0C */ stfs f0, 0xc(r1) +/* 802696CC 0026660C C0 06 00 08 */ lfs f0, 8(r6) +/* 802696D0 00266610 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 802696D4 00266614 38 61 00 E0 */ addi r3, r1, 0xe0 +/* 802696D8 00266618 38 81 00 14 */ addi r4, r1, 0x14 +/* 802696DC 0026661C 38 A1 00 08 */ addi r5, r1, 8 +/* 802696E0 00266620 48 00 5B C9 */ bl __ct__8cM3dGLinFRC4cXyzRC4cXyz +/* 802696E4 00266624 7F FF F2 78 */ xor r31, r31, r30 +/* 802696E8 00266628 57 E0 07 FF */ clrlwi. r0, r31, 0x1f +/* 802696EC 0026662C 41 82 00 C4 */ beq lbl_802697B0 +/* 802696F0 00266630 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 802696F4 00266634 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 802696F8 00266638 90 01 00 DC */ stw r0, 0xdc(r1) +/* 802696FC 0026663C C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 80269700 00266640 D0 01 00 CC */ stfs f0, 0xcc(r1) +/* 80269704 00266644 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 80269708 00266648 D0 01 00 D0 */ stfs f0, 0xd0(r1) +/* 8026970C 0026664C D0 01 00 D4 */ stfs f0, 0xd4(r1) +/* 80269710 00266650 C0 1D 00 00 */ lfs f0, 0(r29) +/* 80269714 00266654 FC 00 00 50 */ fneg f0, f0 +/* 80269718 00266658 D0 01 00 D8 */ stfs f0, 0xd8(r1) +/* 8026971C 0026665C 38 61 00 E0 */ addi r3, r1, 0xe0 +/* 80269720 00266660 38 81 00 CC */ addi r4, r1, 0xcc +/* 80269724 00266664 38 A1 00 5C */ addi r5, r1, 0x5c +/* 80269728 00266668 38 C0 00 01 */ li r6, 1 +/* 8026972C 0026666C 38 E0 00 01 */ li r7, 1 +/* 80269730 00266670 4B FF F8 05 */ bl cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb +/* 80269734 00266674 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80269738 00266678 41 82 00 6C */ beq lbl_802697A4 +/* 8026973C 0026667C C0 1C 00 04 */ lfs f0, 4(r28) +/* 80269740 00266680 C0 21 00 60 */ lfs f1, 0x60(r1) +/* 80269744 00266684 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 80269748 00266688 4C 40 13 82 */ cror 2, 0, 2 +/* 8026974C 0026668C 40 82 00 58 */ bne lbl_802697A4 +/* 80269750 00266690 C0 1D 00 04 */ lfs f0, 4(r29) +/* 80269754 00266694 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80269758 00266698 4C 40 13 82 */ cror 2, 0, 2 +/* 8026975C 0026669C 40 82 00 48 */ bne lbl_802697A4 +/* 80269760 002666A0 C0 1C 00 08 */ lfs f0, 8(r28) +/* 80269764 002666A4 C0 21 00 64 */ lfs f1, 0x64(r1) +/* 80269768 002666A8 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026976C 002666AC 4C 40 13 82 */ cror 2, 0, 2 +/* 80269770 002666B0 40 82 00 34 */ bne lbl_802697A4 +/* 80269774 002666B4 C0 1D 00 08 */ lfs f0, 8(r29) +/* 80269778 002666B8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026977C 002666BC 4C 40 13 82 */ cror 2, 0, 2 +/* 80269780 002666C0 40 82 00 24 */ bne lbl_802697A4 +/* 80269784 002666C4 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 80269788 002666C8 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 8026978C 002666CC 90 01 00 DC */ stw r0, 0xdc(r1) +/* 80269790 002666D0 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 80269794 002666D4 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 80269798 002666D8 90 01 00 F8 */ stw r0, 0xf8(r1) +/* 8026979C 002666DC 38 60 00 01 */ li r3, 1 +/* 802697A0 002666E0 48 00 03 FC */ b lbl_80269B9C +lbl_802697A4: +/* 802697A4 002666E4 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 802697A8 002666E8 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 802697AC 002666EC 90 01 00 DC */ stw r0, 0xdc(r1) +lbl_802697B0: +/* 802697B0 002666F0 57 E0 07 BD */ rlwinm. r0, r31, 0, 0x1e, 0x1e +/* 802697B4 002666F4 41 82 00 C0 */ beq lbl_80269874 +/* 802697B8 002666F8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 802697BC 002666FC 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 802697C0 00266700 90 01 00 C8 */ stw r0, 0xc8(r1) +/* 802697C4 00266704 C0 02 B7 A8 */ lfs f0, lbl_804551A8-_SDA2_BASE_(r2) +/* 802697C8 00266708 D0 01 00 B8 */ stfs f0, 0xb8(r1) +/* 802697CC 0026670C C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 802697D0 00266710 D0 01 00 BC */ stfs f0, 0xbc(r1) +/* 802697D4 00266714 D0 01 00 C0 */ stfs f0, 0xc0(r1) +/* 802697D8 00266718 C0 1C 00 00 */ lfs f0, 0(r28) +/* 802697DC 0026671C D0 01 00 C4 */ stfs f0, 0xc4(r1) +/* 802697E0 00266720 38 61 00 E0 */ addi r3, r1, 0xe0 +/* 802697E4 00266724 38 81 00 B8 */ addi r4, r1, 0xb8 +/* 802697E8 00266728 38 A1 00 50 */ addi r5, r1, 0x50 +/* 802697EC 0026672C 38 C0 00 01 */ li r6, 1 +/* 802697F0 00266730 38 E0 00 01 */ li r7, 1 +/* 802697F4 00266734 4B FF F7 41 */ bl cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb +/* 802697F8 00266738 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802697FC 0026673C 41 82 00 6C */ beq lbl_80269868 +/* 80269800 00266740 C0 1C 00 04 */ lfs f0, 4(r28) +/* 80269804 00266744 C0 21 00 54 */ lfs f1, 0x54(r1) +/* 80269808 00266748 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026980C 0026674C 4C 40 13 82 */ cror 2, 0, 2 +/* 80269810 00266750 40 82 00 58 */ bne lbl_80269868 +/* 80269814 00266754 C0 1D 00 04 */ lfs f0, 4(r29) +/* 80269818 00266758 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026981C 0026675C 4C 40 13 82 */ cror 2, 0, 2 +/* 80269820 00266760 40 82 00 48 */ bne lbl_80269868 +/* 80269824 00266764 C0 1C 00 08 */ lfs f0, 8(r28) +/* 80269828 00266768 C0 21 00 58 */ lfs f1, 0x58(r1) +/* 8026982C 0026676C FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 80269830 00266770 4C 40 13 82 */ cror 2, 0, 2 +/* 80269834 00266774 40 82 00 34 */ bne lbl_80269868 +/* 80269838 00266778 C0 1D 00 08 */ lfs f0, 8(r29) +/* 8026983C 0026677C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80269840 00266780 4C 40 13 82 */ cror 2, 0, 2 +/* 80269844 00266784 40 82 00 24 */ bne lbl_80269868 +/* 80269848 00266788 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 8026984C 0026678C 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 80269850 00266790 90 01 00 C8 */ stw r0, 0xc8(r1) +/* 80269854 00266794 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 80269858 00266798 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026985C 0026679C 90 01 00 F8 */ stw r0, 0xf8(r1) +/* 80269860 002667A0 38 60 00 01 */ li r3, 1 +/* 80269864 002667A4 48 00 03 38 */ b lbl_80269B9C +lbl_80269868: +/* 80269868 002667A8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 8026986C 002667AC 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 80269870 002667B0 90 01 00 C8 */ stw r0, 0xc8(r1) +lbl_80269874: +/* 80269874 002667B4 57 E0 07 7B */ rlwinm. r0, r31, 0, 0x1d, 0x1d +/* 80269878 002667B8 41 82 00 C4 */ beq lbl_8026993C +/* 8026987C 002667BC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 80269880 002667C0 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 80269884 002667C4 90 01 00 B4 */ stw r0, 0xb4(r1) +/* 80269888 002667C8 C0 22 B7 18 */ lfs f1, lbl_80455118-_SDA2_BASE_(r2) +/* 8026988C 002667CC D0 21 00 A4 */ stfs f1, 0xa4(r1) +/* 80269890 002667D0 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 80269894 002667D4 D0 01 00 A8 */ stfs f0, 0xa8(r1) +/* 80269898 002667D8 D0 21 00 AC */ stfs f1, 0xac(r1) +/* 8026989C 002667DC C0 1D 00 04 */ lfs f0, 4(r29) +/* 802698A0 002667E0 FC 00 00 50 */ fneg f0, f0 +/* 802698A4 002667E4 D0 01 00 B0 */ stfs f0, 0xb0(r1) +/* 802698A8 002667E8 38 61 00 E0 */ addi r3, r1, 0xe0 +/* 802698AC 002667EC 38 81 00 A4 */ addi r4, r1, 0xa4 +/* 802698B0 002667F0 38 A1 00 44 */ addi r5, r1, 0x44 +/* 802698B4 002667F4 38 C0 00 01 */ li r6, 1 +/* 802698B8 002667F8 38 E0 00 01 */ li r7, 1 +/* 802698BC 002667FC 4B FF F6 79 */ bl cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb +/* 802698C0 00266800 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802698C4 00266804 41 82 00 6C */ beq lbl_80269930 +/* 802698C8 00266808 C0 1C 00 00 */ lfs f0, 0(r28) +/* 802698CC 0026680C C0 21 00 44 */ lfs f1, 0x44(r1) +/* 802698D0 00266810 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 802698D4 00266814 4C 40 13 82 */ cror 2, 0, 2 +/* 802698D8 00266818 40 82 00 58 */ bne lbl_80269930 +/* 802698DC 0026681C C0 1D 00 00 */ lfs f0, 0(r29) +/* 802698E0 00266820 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802698E4 00266824 4C 40 13 82 */ cror 2, 0, 2 +/* 802698E8 00266828 40 82 00 48 */ bne lbl_80269930 +/* 802698EC 0026682C C0 1C 00 08 */ lfs f0, 8(r28) +/* 802698F0 00266830 C0 21 00 4C */ lfs f1, 0x4c(r1) +/* 802698F4 00266834 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 802698F8 00266838 4C 40 13 82 */ cror 2, 0, 2 +/* 802698FC 0026683C 40 82 00 34 */ bne lbl_80269930 +/* 80269900 00266840 C0 1D 00 08 */ lfs f0, 8(r29) +/* 80269904 00266844 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80269908 00266848 4C 40 13 82 */ cror 2, 0, 2 +/* 8026990C 0026684C 40 82 00 24 */ bne lbl_80269930 +/* 80269910 00266850 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 80269914 00266854 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 80269918 00266858 90 01 00 B4 */ stw r0, 0xb4(r1) +/* 8026991C 0026685C 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 80269920 00266860 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 80269924 00266864 90 01 00 F8 */ stw r0, 0xf8(r1) +/* 80269928 00266868 38 60 00 01 */ li r3, 1 +/* 8026992C 0026686C 48 00 02 70 */ b lbl_80269B9C +lbl_80269930: +/* 80269930 00266870 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 80269934 00266874 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 80269938 00266878 90 01 00 B4 */ stw r0, 0xb4(r1) +lbl_8026993C: +/* 8026993C 0026687C 57 E0 07 39 */ rlwinm. r0, r31, 0, 0x1c, 0x1c +/* 80269940 00266880 41 82 00 C0 */ beq lbl_80269A00 +/* 80269944 00266884 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 80269948 00266888 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 8026994C 0026688C 90 01 00 A0 */ stw r0, 0xa0(r1) +/* 80269950 00266890 C0 22 B7 18 */ lfs f1, lbl_80455118-_SDA2_BASE_(r2) +/* 80269954 00266894 D0 21 00 90 */ stfs f1, 0x90(r1) +/* 80269958 00266898 C0 02 B7 A8 */ lfs f0, lbl_804551A8-_SDA2_BASE_(r2) +/* 8026995C 0026689C D0 01 00 94 */ stfs f0, 0x94(r1) +/* 80269960 002668A0 D0 21 00 98 */ stfs f1, 0x98(r1) +/* 80269964 002668A4 C0 1C 00 04 */ lfs f0, 4(r28) +/* 80269968 002668A8 D0 01 00 9C */ stfs f0, 0x9c(r1) +/* 8026996C 002668AC 38 61 00 E0 */ addi r3, r1, 0xe0 +/* 80269970 002668B0 38 81 00 90 */ addi r4, r1, 0x90 +/* 80269974 002668B4 38 A1 00 38 */ addi r5, r1, 0x38 +/* 80269978 002668B8 38 C0 00 01 */ li r6, 1 +/* 8026997C 002668BC 38 E0 00 01 */ li r7, 1 +/* 80269980 002668C0 4B FF F5 B5 */ bl cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb +/* 80269984 002668C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80269988 002668C8 41 82 00 6C */ beq lbl_802699F4 +/* 8026998C 002668CC C0 1C 00 00 */ lfs f0, 0(r28) +/* 80269990 002668D0 C0 21 00 38 */ lfs f1, 0x38(r1) +/* 80269994 002668D4 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 80269998 002668D8 4C 40 13 82 */ cror 2, 0, 2 +/* 8026999C 002668DC 40 82 00 58 */ bne lbl_802699F4 +/* 802699A0 002668E0 C0 1D 00 00 */ lfs f0, 0(r29) +/* 802699A4 002668E4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802699A8 002668E8 4C 40 13 82 */ cror 2, 0, 2 +/* 802699AC 002668EC 40 82 00 48 */ bne lbl_802699F4 +/* 802699B0 002668F0 C0 1C 00 08 */ lfs f0, 8(r28) +/* 802699B4 002668F4 C0 21 00 40 */ lfs f1, 0x40(r1) +/* 802699B8 002668F8 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 802699BC 002668FC 4C 40 13 82 */ cror 2, 0, 2 +/* 802699C0 00266900 40 82 00 34 */ bne lbl_802699F4 +/* 802699C4 00266904 C0 1D 00 08 */ lfs f0, 8(r29) +/* 802699C8 00266908 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802699CC 0026690C 4C 40 13 82 */ cror 2, 0, 2 +/* 802699D0 00266910 40 82 00 24 */ bne lbl_802699F4 +/* 802699D4 00266914 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 802699D8 00266918 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 802699DC 0026691C 90 01 00 A0 */ stw r0, 0xa0(r1) +/* 802699E0 00266920 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 802699E4 00266924 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 802699E8 00266928 90 01 00 F8 */ stw r0, 0xf8(r1) +/* 802699EC 0026692C 38 60 00 01 */ li r3, 1 +/* 802699F0 00266930 48 00 01 AC */ b lbl_80269B9C +lbl_802699F4: +/* 802699F4 00266934 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 802699F8 00266938 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 802699FC 0026693C 90 01 00 A0 */ stw r0, 0xa0(r1) +lbl_80269A00: +/* 80269A00 00266940 57 E0 06 F7 */ rlwinm. r0, r31, 0, 0x1b, 0x1b +/* 80269A04 00266944 41 82 00 C4 */ beq lbl_80269AC8 +/* 80269A08 00266948 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 80269A0C 0026694C 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 80269A10 00266950 90 01 00 8C */ stw r0, 0x8c(r1) +/* 80269A14 00266954 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 80269A18 00266958 D0 01 00 7C */ stfs f0, 0x7c(r1) +/* 80269A1C 0026695C D0 01 00 80 */ stfs f0, 0x80(r1) +/* 80269A20 00266960 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 80269A24 00266964 D0 01 00 84 */ stfs f0, 0x84(r1) +/* 80269A28 00266968 C0 1D 00 08 */ lfs f0, 8(r29) +/* 80269A2C 0026696C FC 00 00 50 */ fneg f0, f0 +/* 80269A30 00266970 D0 01 00 88 */ stfs f0, 0x88(r1) +/* 80269A34 00266974 38 61 00 E0 */ addi r3, r1, 0xe0 +/* 80269A38 00266978 38 81 00 7C */ addi r4, r1, 0x7c +/* 80269A3C 0026697C 38 A1 00 2C */ addi r5, r1, 0x2c +/* 80269A40 00266980 38 C0 00 01 */ li r6, 1 +/* 80269A44 00266984 38 E0 00 01 */ li r7, 1 +/* 80269A48 00266988 4B FF F4 ED */ bl cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb +/* 80269A4C 0026698C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80269A50 00266990 41 82 00 6C */ beq lbl_80269ABC +/* 80269A54 00266994 C0 1C 00 00 */ lfs f0, 0(r28) +/* 80269A58 00266998 C0 21 00 2C */ lfs f1, 0x2c(r1) +/* 80269A5C 0026699C FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 80269A60 002669A0 4C 40 13 82 */ cror 2, 0, 2 +/* 80269A64 002669A4 40 82 00 58 */ bne lbl_80269ABC +/* 80269A68 002669A8 C0 1D 00 00 */ lfs f0, 0(r29) +/* 80269A6C 002669AC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80269A70 002669B0 4C 40 13 82 */ cror 2, 0, 2 +/* 80269A74 002669B4 40 82 00 48 */ bne lbl_80269ABC +/* 80269A78 002669B8 C0 1C 00 04 */ lfs f0, 4(r28) +/* 80269A7C 002669BC C0 21 00 30 */ lfs f1, 0x30(r1) +/* 80269A80 002669C0 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 80269A84 002669C4 4C 40 13 82 */ cror 2, 0, 2 +/* 80269A88 002669C8 40 82 00 34 */ bne lbl_80269ABC +/* 80269A8C 002669CC C0 1D 00 04 */ lfs f0, 4(r29) +/* 80269A90 002669D0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80269A94 002669D4 4C 40 13 82 */ cror 2, 0, 2 +/* 80269A98 002669D8 40 82 00 24 */ bne lbl_80269ABC +/* 80269A9C 002669DC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 80269AA0 002669E0 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 80269AA4 002669E4 90 01 00 8C */ stw r0, 0x8c(r1) +/* 80269AA8 002669E8 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 80269AAC 002669EC 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 80269AB0 002669F0 90 01 00 F8 */ stw r0, 0xf8(r1) +/* 80269AB4 002669F4 38 60 00 01 */ li r3, 1 +/* 80269AB8 002669F8 48 00 00 E4 */ b lbl_80269B9C +lbl_80269ABC: +/* 80269ABC 002669FC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 80269AC0 00266A00 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 80269AC4 00266A04 90 01 00 8C */ stw r0, 0x8c(r1) +lbl_80269AC8: +/* 80269AC8 00266A08 57 E0 06 B5 */ rlwinm. r0, r31, 0, 0x1a, 0x1a +/* 80269ACC 00266A0C 41 82 00 C0 */ beq lbl_80269B8C +/* 80269AD0 00266A10 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 80269AD4 00266A14 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 80269AD8 00266A18 90 01 00 78 */ stw r0, 0x78(r1) +/* 80269ADC 00266A1C C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 80269AE0 00266A20 D0 01 00 68 */ stfs f0, 0x68(r1) +/* 80269AE4 00266A24 D0 01 00 6C */ stfs f0, 0x6c(r1) +/* 80269AE8 00266A28 C0 02 B7 A8 */ lfs f0, lbl_804551A8-_SDA2_BASE_(r2) +/* 80269AEC 00266A2C D0 01 00 70 */ stfs f0, 0x70(r1) +/* 80269AF0 00266A30 C0 1C 00 08 */ lfs f0, 8(r28) +/* 80269AF4 00266A34 D0 01 00 74 */ stfs f0, 0x74(r1) +/* 80269AF8 00266A38 38 61 00 E0 */ addi r3, r1, 0xe0 +/* 80269AFC 00266A3C 38 81 00 68 */ addi r4, r1, 0x68 +/* 80269B00 00266A40 38 A1 00 20 */ addi r5, r1, 0x20 +/* 80269B04 00266A44 38 C0 00 01 */ li r6, 1 +/* 80269B08 00266A48 38 E0 00 01 */ li r7, 1 +/* 80269B0C 00266A4C 4B FF F4 29 */ bl cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb +/* 80269B10 00266A50 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80269B14 00266A54 41 82 00 6C */ beq lbl_80269B80 +/* 80269B18 00266A58 C0 1C 00 00 */ lfs f0, 0(r28) +/* 80269B1C 00266A5C C0 21 00 20 */ lfs f1, 0x20(r1) +/* 80269B20 00266A60 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 80269B24 00266A64 4C 40 13 82 */ cror 2, 0, 2 +/* 80269B28 00266A68 40 82 00 58 */ bne lbl_80269B80 +/* 80269B2C 00266A6C C0 1D 00 00 */ lfs f0, 0(r29) +/* 80269B30 00266A70 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80269B34 00266A74 4C 40 13 82 */ cror 2, 0, 2 +/* 80269B38 00266A78 40 82 00 48 */ bne lbl_80269B80 +/* 80269B3C 00266A7C C0 1C 00 04 */ lfs f0, 4(r28) +/* 80269B40 00266A80 C0 21 00 24 */ lfs f1, 0x24(r1) +/* 80269B44 00266A84 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 80269B48 00266A88 4C 40 13 82 */ cror 2, 0, 2 +/* 80269B4C 00266A8C 40 82 00 34 */ bne lbl_80269B80 +/* 80269B50 00266A90 C0 1D 00 04 */ lfs f0, 4(r29) +/* 80269B54 00266A94 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80269B58 00266A98 4C 40 13 82 */ cror 2, 0, 2 +/* 80269B5C 00266A9C 40 82 00 24 */ bne lbl_80269B80 +/* 80269B60 00266AA0 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 80269B64 00266AA4 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 80269B68 00266AA8 90 01 00 78 */ stw r0, 0x78(r1) +/* 80269B6C 00266AAC 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 80269B70 00266AB0 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 80269B74 00266AB4 90 01 00 F8 */ stw r0, 0xf8(r1) +/* 80269B78 00266AB8 38 60 00 01 */ li r3, 1 +/* 80269B7C 00266ABC 48 00 00 20 */ b lbl_80269B9C +lbl_80269B80: +/* 80269B80 00266AC0 3C 60 80 3A */ lis r3, lbl_803A37C0@ha +/* 80269B84 00266AC4 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l +/* 80269B88 00266AC8 90 01 00 78 */ stw r0, 0x78(r1) +lbl_80269B8C: +/* 80269B8C 00266ACC 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 80269B90 00266AD0 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 80269B94 00266AD4 90 01 00 F8 */ stw r0, 0xf8(r1) +/* 80269B98 00266AD8 38 60 00 00 */ li r3, 0 +lbl_80269B9C: +/* 80269B9C 00266ADC E3 E1 01 F8 */ psq_l f31, 504(r1), 0, 0 +/* 80269BA0 00266AE0 CB E1 01 F0 */ lfd f31, 0x1f0(r1) +/* 80269BA4 00266AE4 E3 C1 01 E8 */ psq_l f30, 488(r1), 0, 0 +/* 80269BA8 00266AE8 CB C1 01 E0 */ lfd f30, 0x1e0(r1) +/* 80269BAC 00266AEC E3 A1 01 D8 */ psq_l f29, 472(r1), 0, 0 +/* 80269BB0 00266AF0 CB A1 01 D0 */ lfd f29, 0x1d0(r1) +/* 80269BB4 00266AF4 E3 81 01 C8 */ psq_l f28, 456(r1), 0, 0 +/* 80269BB8 00266AF8 CB 81 01 C0 */ lfd f28, 0x1c0(r1) +/* 80269BBC 00266AFC E3 61 01 B8 */ psq_l f27, 440(r1), 0, 0 +/* 80269BC0 00266B00 CB 61 01 B0 */ lfd f27, 0x1b0(r1) +/* 80269BC4 00266B04 E3 41 01 A8 */ psq_l f26, 424(r1), 0, 0 +/* 80269BC8 00266B08 CB 41 01 A0 */ lfd f26, 0x1a0(r1) +/* 80269BCC 00266B0C E3 21 01 98 */ psq_l f25, 408(r1), 0, 0 +/* 80269BD0 00266B10 CB 21 01 90 */ lfd f25, 0x190(r1) +/* 80269BD4 00266B14 E3 01 01 88 */ psq_l f24, 392(r1), 0, 0 +/* 80269BD8 00266B18 CB 01 01 80 */ lfd f24, 0x180(r1) +/* 80269BDC 00266B1C E2 E1 01 78 */ psq_l f23, 376(r1), 0, 0 +/* 80269BE0 00266B20 CA E1 01 70 */ lfd f23, 0x170(r1) +/* 80269BE4 00266B24 E2 C1 01 68 */ psq_l f22, 360(r1), 0, 0 +/* 80269BE8 00266B28 CA C1 01 60 */ lfd f22, 0x160(r1) +/* 80269BEC 00266B2C E2 A1 01 58 */ psq_l f21, 344(r1), 0, 0 +/* 80269BF0 00266B30 CA A1 01 50 */ lfd f21, 0x150(r1) +/* 80269BF4 00266B34 E2 81 01 48 */ psq_l f20, 328(r1), 0, 0 +/* 80269BF8 00266B38 CA 81 01 40 */ lfd f20, 0x140(r1) +/* 80269BFC 00266B3C E2 61 01 38 */ psq_l f19, 312(r1), 0, 0 +/* 80269C00 00266B40 CA 61 01 30 */ lfd f19, 0x130(r1) +/* 80269C04 00266B44 E2 41 01 28 */ psq_l f18, 296(r1), 0, 0 +/* 80269C08 00266B48 CA 41 01 20 */ lfd f18, 0x120(r1) +/* 80269C0C 00266B4C E2 21 01 18 */ psq_l f17, 280(r1), 0, 0 +/* 80269C10 00266B50 CA 21 01 10 */ lfd f17, 0x110(r1) +/* 80269C14 00266B54 39 61 01 10 */ addi r11, r1, 0x110 +/* 80269C18 00266B58 48 0F 86 0D */ bl _restgpr_28 +/* 80269C1C 00266B5C 80 01 02 04 */ lwz r0, 0x204(r1) +/* 80269C20 00266B60 7C 08 03 A6 */ mtlr r0 +/* 80269C24 00266B64 38 21 02 00 */ addi r1, r1, 0x200 +/* 80269C28 00266B68 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80269C2C.s b/include/SComponent/c_m3d/asm/func_80269C2C.s new file mode 100644 index 0000000000..181bc35608 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80269C2C.s @@ -0,0 +1,96 @@ +/* 80269C2C 00266B6C C0 03 00 00 */ lfs f0, 0(r3) +/* 80269C30 00266B70 C0 44 00 00 */ lfs f2, 0(r4) +/* 80269C34 00266B74 FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 80269C38 00266B78 40 80 00 10 */ bge lbl_80269C48 +/* 80269C3C 00266B7C FC 60 00 90 */ fmr f3, f0 +/* 80269C40 00266B80 FC 80 10 90 */ fmr f4, f2 +/* 80269C44 00266B84 48 00 00 0C */ b lbl_80269C50 +lbl_80269C48: +/* 80269C48 00266B88 FC 60 10 90 */ fmr f3, f2 +/* 80269C4C 00266B8C FC 80 00 90 */ fmr f4, f0 +lbl_80269C50: +/* 80269C50 00266B90 C0 05 00 00 */ lfs f0, 0(r5) +/* 80269C54 00266B94 FC 03 00 40 */ fcmpo cr0, f3, f0 +/* 80269C58 00266B98 40 81 00 0C */ ble lbl_80269C64 +/* 80269C5C 00266B9C FC 60 00 90 */ fmr f3, f0 +/* 80269C60 00266BA0 48 00 00 10 */ b lbl_80269C70 +lbl_80269C64: +/* 80269C64 00266BA4 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 80269C68 00266BA8 40 80 00 08 */ bge lbl_80269C70 +/* 80269C6C 00266BAC FC 80 00 90 */ fmr f4, f0 +lbl_80269C70: +/* 80269C70 00266BB0 EC 03 08 28 */ fsubs f0, f3, f1 +/* 80269C74 00266BB4 C0 46 00 00 */ lfs f2, 0(r6) +/* 80269C78 00266BB8 FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 80269C7C 00266BBC 41 81 00 10 */ bgt lbl_80269C8C +/* 80269C80 00266BC0 EC 04 08 2A */ fadds f0, f4, f1 +/* 80269C84 00266BC4 FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 80269C88 00266BC8 40 80 00 0C */ bge lbl_80269C94 +lbl_80269C8C: +/* 80269C8C 00266BCC 38 60 00 00 */ li r3, 0 +/* 80269C90 00266BD0 4E 80 00 20 */ blr +lbl_80269C94: +/* 80269C94 00266BD4 C0 03 00 08 */ lfs f0, 8(r3) +/* 80269C98 00266BD8 C0 64 00 08 */ lfs f3, 8(r4) +/* 80269C9C 00266BDC FC 00 18 40 */ fcmpo cr0, f0, f3 +/* 80269CA0 00266BE0 40 80 00 0C */ bge lbl_80269CAC +/* 80269CA4 00266BE4 FC 40 00 90 */ fmr f2, f0 +/* 80269CA8 00266BE8 48 00 00 0C */ b lbl_80269CB4 +lbl_80269CAC: +/* 80269CAC 00266BEC FC 40 18 90 */ fmr f2, f3 +/* 80269CB0 00266BF0 FC 60 00 90 */ fmr f3, f0 +lbl_80269CB4: +/* 80269CB4 00266BF4 C0 05 00 08 */ lfs f0, 8(r5) +/* 80269CB8 00266BF8 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 80269CBC 00266BFC 40 81 00 0C */ ble lbl_80269CC8 +/* 80269CC0 00266C00 FC 40 00 90 */ fmr f2, f0 +/* 80269CC4 00266C04 48 00 00 10 */ b lbl_80269CD4 +lbl_80269CC8: +/* 80269CC8 00266C08 FC 03 00 40 */ fcmpo cr0, f3, f0 +/* 80269CCC 00266C0C 40 80 00 08 */ bge lbl_80269CD4 +/* 80269CD0 00266C10 FC 60 00 90 */ fmr f3, f0 +lbl_80269CD4: +/* 80269CD4 00266C14 EC 02 08 28 */ fsubs f0, f2, f1 +/* 80269CD8 00266C18 C0 46 00 08 */ lfs f2, 8(r6) +/* 80269CDC 00266C1C FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 80269CE0 00266C20 41 81 00 10 */ bgt lbl_80269CF0 +/* 80269CE4 00266C24 EC 03 08 2A */ fadds f0, f3, f1 +/* 80269CE8 00266C28 FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 80269CEC 00266C2C 40 80 00 0C */ bge lbl_80269CF8 +lbl_80269CF0: +/* 80269CF0 00266C30 38 60 00 00 */ li r3, 0 +/* 80269CF4 00266C34 4E 80 00 20 */ blr +lbl_80269CF8: +/* 80269CF8 00266C38 C0 03 00 04 */ lfs f0, 4(r3) +/* 80269CFC 00266C3C C0 64 00 04 */ lfs f3, 4(r4) +/* 80269D00 00266C40 FC 00 18 40 */ fcmpo cr0, f0, f3 +/* 80269D04 00266C44 40 80 00 0C */ bge lbl_80269D10 +/* 80269D08 00266C48 FC 40 00 90 */ fmr f2, f0 +/* 80269D0C 00266C4C 48 00 00 0C */ b lbl_80269D18 +lbl_80269D10: +/* 80269D10 00266C50 FC 40 18 90 */ fmr f2, f3 +/* 80269D14 00266C54 FC 60 00 90 */ fmr f3, f0 +lbl_80269D18: +/* 80269D18 00266C58 C0 05 00 04 */ lfs f0, 4(r5) +/* 80269D1C 00266C5C FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 80269D20 00266C60 40 81 00 0C */ ble lbl_80269D2C +/* 80269D24 00266C64 FC 40 00 90 */ fmr f2, f0 +/* 80269D28 00266C68 48 00 00 10 */ b lbl_80269D38 +lbl_80269D2C: +/* 80269D2C 00266C6C FC 03 00 40 */ fcmpo cr0, f3, f0 +/* 80269D30 00266C70 40 80 00 08 */ bge lbl_80269D38 +/* 80269D34 00266C74 FC 60 00 90 */ fmr f3, f0 +lbl_80269D38: +/* 80269D38 00266C78 EC 02 08 28 */ fsubs f0, f2, f1 +/* 80269D3C 00266C7C C0 46 00 04 */ lfs f2, 4(r6) +/* 80269D40 00266C80 FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 80269D44 00266C84 41 81 00 10 */ bgt lbl_80269D54 +/* 80269D48 00266C88 EC 03 08 2A */ fadds f0, f3, f1 +/* 80269D4C 00266C8C FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 80269D50 00266C90 40 80 00 0C */ bge lbl_80269D5C +lbl_80269D54: +/* 80269D54 00266C94 38 60 00 00 */ li r3, 0 +/* 80269D58 00266C98 4E 80 00 20 */ blr +lbl_80269D5C: +/* 80269D5C 00266C9C 38 60 00 01 */ li r3, 1 +/* 80269D60 00266CA0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80269D64.s b/include/SComponent/c_m3d/asm/func_80269D64.s new file mode 100644 index 0000000000..c0745cc8e9 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80269D64.s @@ -0,0 +1,57 @@ +/* 80269D64 00266CA4 C1 21 00 08 */ lfs f9, 8(r1) +/* 80269D68 00266CA8 FC 01 18 40 */ fcmpo cr0, f1, f3 +/* 80269D6C 00266CAC 40 80 00 0C */ bge lbl_80269D78 +/* 80269D70 00266CB0 FC 00 08 90 */ fmr f0, f1 +/* 80269D74 00266CB4 48 00 00 0C */ b lbl_80269D80 +lbl_80269D78: +/* 80269D78 00266CB8 FC 00 18 90 */ fmr f0, f3 +/* 80269D7C 00266CBC FC 60 08 90 */ fmr f3, f1 +lbl_80269D80: +/* 80269D80 00266CC0 FC 00 28 40 */ fcmpo cr0, f0, f5 +/* 80269D84 00266CC4 40 81 00 0C */ ble lbl_80269D90 +/* 80269D88 00266CC8 FC 00 28 90 */ fmr f0, f5 +/* 80269D8C 00266CCC 48 00 00 10 */ b lbl_80269D9C +lbl_80269D90: +/* 80269D90 00266CD0 FC 03 28 40 */ fcmpo cr0, f3, f5 +/* 80269D94 00266CD4 40 80 00 08 */ bge lbl_80269D9C +/* 80269D98 00266CD8 FC 60 28 90 */ fmr f3, f5 +lbl_80269D9C: +/* 80269D9C 00266CDC EC 00 48 28 */ fsubs f0, f0, f9 +/* 80269DA0 00266CE0 FC 00 38 40 */ fcmpo cr0, f0, f7 +/* 80269DA4 00266CE4 41 81 00 10 */ bgt lbl_80269DB4 +/* 80269DA8 00266CE8 EC 03 48 2A */ fadds f0, f3, f9 +/* 80269DAC 00266CEC FC 00 38 40 */ fcmpo cr0, f0, f7 +/* 80269DB0 00266CF0 40 80 00 0C */ bge lbl_80269DBC +lbl_80269DB4: +/* 80269DB4 00266CF4 38 60 00 00 */ li r3, 0 +/* 80269DB8 00266CF8 4E 80 00 20 */ blr +lbl_80269DBC: +/* 80269DBC 00266CFC FC 02 20 40 */ fcmpo cr0, f2, f4 +/* 80269DC0 00266D00 40 80 00 0C */ bge lbl_80269DCC +/* 80269DC4 00266D04 FC 00 10 90 */ fmr f0, f2 +/* 80269DC8 00266D08 48 00 00 0C */ b lbl_80269DD4 +lbl_80269DCC: +/* 80269DCC 00266D0C FC 00 20 90 */ fmr f0, f4 +/* 80269DD0 00266D10 FC 80 10 90 */ fmr f4, f2 +lbl_80269DD4: +/* 80269DD4 00266D14 FC 00 30 40 */ fcmpo cr0, f0, f6 +/* 80269DD8 00266D18 40 81 00 0C */ ble lbl_80269DE4 +/* 80269DDC 00266D1C FC 00 30 90 */ fmr f0, f6 +/* 80269DE0 00266D20 48 00 00 10 */ b lbl_80269DF0 +lbl_80269DE4: +/* 80269DE4 00266D24 FC 04 30 40 */ fcmpo cr0, f4, f6 +/* 80269DE8 00266D28 40 80 00 08 */ bge lbl_80269DF0 +/* 80269DEC 00266D2C FC 80 30 90 */ fmr f4, f6 +lbl_80269DF0: +/* 80269DF0 00266D30 EC 00 48 28 */ fsubs f0, f0, f9 +/* 80269DF4 00266D34 FC 00 40 40 */ fcmpo cr0, f0, f8 +/* 80269DF8 00266D38 41 81 00 10 */ bgt lbl_80269E08 +/* 80269DFC 00266D3C EC 04 48 2A */ fadds f0, f4, f9 +/* 80269E00 00266D40 FC 00 40 40 */ fcmpo cr0, f0, f8 +/* 80269E04 00266D44 40 80 00 0C */ bge lbl_80269E10 +lbl_80269E08: +/* 80269E08 00266D48 38 60 00 00 */ li r3, 0 +/* 80269E0C 00266D4C 4E 80 00 20 */ blr +lbl_80269E10: +/* 80269E10 00266D50 38 60 00 01 */ li r3, 1 +/* 80269E14 00266D54 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80269E18.s b/include/SComponent/c_m3d/asm/func_80269E18.s new file mode 100644 index 0000000000..92be243e5c --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80269E18.s @@ -0,0 +1,110 @@ +/* 80269E18 00266D58 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 80269E1C 00266D5C 7C 08 02 A6 */ mflr r0 +/* 80269E20 00266D60 90 01 00 44 */ stw r0, 0x44(r1) +/* 80269E24 00266D64 DB E1 00 30 */ stfd f31, 0x30(r1) +/* 80269E28 00266D68 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 +/* 80269E2C 00266D6C DB C1 00 20 */ stfd f30, 0x20(r1) +/* 80269E30 00266D70 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 +/* 80269E34 00266D74 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 80269E38 00266D78 93 C1 00 18 */ stw r30, 0x18(r1) +/* 80269E3C 00266D7C 7C 7E 1B 78 */ mr r30, r3 +/* 80269E40 00266D80 7C 9F 23 78 */ mr r31, r4 +/* 80269E44 00266D84 FF C0 08 90 */ fmr f30, f1 +/* 80269E48 00266D88 C0 03 00 00 */ lfs f0, 0(r3) +/* 80269E4C 00266D8C FC 00 02 10 */ fabs f0, f0 +/* 80269E50 00266D90 FC 20 00 18 */ frsp f1, f0 +/* 80269E54 00266D94 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 80269E58 00266D98 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80269E5C 00266D9C 40 80 00 0C */ bge lbl_80269E68 +/* 80269E60 00266DA0 38 60 00 00 */ li r3, 0 +/* 80269E64 00266DA4 48 00 01 30 */ b lbl_80269F94 +lbl_80269E68: +/* 80269E68 00266DA8 C0 02 B7 AC */ lfs f0, lbl_804551AC-_SDA2_BASE_(r2) +/* 80269E6C 00266DAC D0 01 00 08 */ stfs f0, 8(r1) +/* 80269E70 00266DB0 C0 3E 00 18 */ lfs f1, 0x18(r30) +/* 80269E74 00266DB4 C0 5E 00 1C */ lfs f2, 0x1c(r30) +/* 80269E78 00266DB8 C0 7E 00 24 */ lfs f3, 0x24(r30) +/* 80269E7C 00266DBC C0 9E 00 28 */ lfs f4, 0x28(r30) +/* 80269E80 00266DC0 C0 BE 00 30 */ lfs f5, 0x30(r30) +/* 80269E84 00266DC4 C0 DE 00 34 */ lfs f6, 0x34(r30) +/* 80269E88 00266DC8 C0 FF 00 04 */ lfs f7, 4(r31) +/* 80269E8C 00266DCC C1 1F 00 08 */ lfs f8, 8(r31) +/* 80269E90 00266DD0 4B FF FE D5 */ bl cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff +/* 80269E94 00266DD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80269E98 00266DD8 40 82 00 0C */ bne lbl_80269EA4 +/* 80269E9C 00266DDC 38 60 00 00 */ li r3, 0 +/* 80269EA0 00266DE0 48 00 00 F4 */ b lbl_80269F94 +lbl_80269EA4: +/* 80269EA4 00266DE4 C0 3E 00 18 */ lfs f1, 0x18(r30) +/* 80269EA8 00266DE8 C0 5E 00 1C */ lfs f2, 0x1c(r30) +/* 80269EAC 00266DEC C0 7E 00 24 */ lfs f3, 0x24(r30) +/* 80269EB0 00266DF0 C0 9E 00 28 */ lfs f4, 0x28(r30) +/* 80269EB4 00266DF4 C0 BF 00 04 */ lfs f5, 4(r31) +/* 80269EB8 00266DF8 C0 DF 00 08 */ lfs f6, 8(r31) +/* 80269EBC 00266DFC 4B FF E9 D9 */ bl cM3d_VectorProduct2d__Fffffff +/* 80269EC0 00266E00 FF E0 08 90 */ fmr f31, f1 +/* 80269EC4 00266E04 FC 1F F0 40 */ fcmpo cr0, f31, f30 +/* 80269EC8 00266E08 4C 40 13 82 */ cror 2, 0, 2 +/* 80269ECC 00266E0C 40 82 00 5C */ bne lbl_80269F28 +/* 80269ED0 00266E10 C0 3E 00 24 */ lfs f1, 0x24(r30) +/* 80269ED4 00266E14 C0 5E 00 28 */ lfs f2, 0x28(r30) +/* 80269ED8 00266E18 C0 7E 00 30 */ lfs f3, 0x30(r30) +/* 80269EDC 00266E1C C0 9E 00 34 */ lfs f4, 0x34(r30) +/* 80269EE0 00266E20 C0 BF 00 04 */ lfs f5, 4(r31) +/* 80269EE4 00266E24 C0 DF 00 08 */ lfs f6, 8(r31) +/* 80269EE8 00266E28 4B FF E9 AD */ bl cM3d_VectorProduct2d__Fffffff +/* 80269EEC 00266E2C FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 80269EF0 00266E30 4C 40 13 82 */ cror 2, 0, 2 +/* 80269EF4 00266E34 40 82 00 34 */ bne lbl_80269F28 +/* 80269EF8 00266E38 C0 3E 00 30 */ lfs f1, 0x30(r30) +/* 80269EFC 00266E3C C0 5E 00 34 */ lfs f2, 0x34(r30) +/* 80269F00 00266E40 C0 7E 00 18 */ lfs f3, 0x18(r30) +/* 80269F04 00266E44 C0 9E 00 1C */ lfs f4, 0x1c(r30) +/* 80269F08 00266E48 C0 BF 00 04 */ lfs f5, 4(r31) +/* 80269F0C 00266E4C C0 DF 00 08 */ lfs f6, 8(r31) +/* 80269F10 00266E50 4B FF E9 85 */ bl cM3d_VectorProduct2d__Fffffff +/* 80269F14 00266E54 FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 80269F18 00266E58 4C 40 13 82 */ cror 2, 0, 2 +/* 80269F1C 00266E5C 40 82 00 0C */ bne lbl_80269F28 +/* 80269F20 00266E60 38 60 00 01 */ li r3, 1 +/* 80269F24 00266E64 48 00 00 70 */ b lbl_80269F94 +lbl_80269F28: +/* 80269F28 00266E68 FF C0 F0 50 */ fneg f30, f30 +/* 80269F2C 00266E6C FC 1F F0 40 */ fcmpo cr0, f31, f30 +/* 80269F30 00266E70 4C 41 13 82 */ cror 2, 1, 2 +/* 80269F34 00266E74 40 82 00 5C */ bne lbl_80269F90 +/* 80269F38 00266E78 C0 3E 00 24 */ lfs f1, 0x24(r30) +/* 80269F3C 00266E7C C0 5E 00 28 */ lfs f2, 0x28(r30) +/* 80269F40 00266E80 C0 7E 00 30 */ lfs f3, 0x30(r30) +/* 80269F44 00266E84 C0 9E 00 34 */ lfs f4, 0x34(r30) +/* 80269F48 00266E88 C0 BF 00 04 */ lfs f5, 4(r31) +/* 80269F4C 00266E8C C0 DF 00 08 */ lfs f6, 8(r31) +/* 80269F50 00266E90 4B FF E9 45 */ bl cM3d_VectorProduct2d__Fffffff +/* 80269F54 00266E94 FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 80269F58 00266E98 4C 41 13 82 */ cror 2, 1, 2 +/* 80269F5C 00266E9C 40 82 00 34 */ bne lbl_80269F90 +/* 80269F60 00266EA0 C0 3E 00 30 */ lfs f1, 0x30(r30) +/* 80269F64 00266EA4 C0 5E 00 34 */ lfs f2, 0x34(r30) +/* 80269F68 00266EA8 C0 7E 00 18 */ lfs f3, 0x18(r30) +/* 80269F6C 00266EAC C0 9E 00 1C */ lfs f4, 0x1c(r30) +/* 80269F70 00266EB0 C0 BF 00 04 */ lfs f5, 4(r31) +/* 80269F74 00266EB4 C0 DF 00 08 */ lfs f6, 8(r31) +/* 80269F78 00266EB8 4B FF E9 1D */ bl cM3d_VectorProduct2d__Fffffff +/* 80269F7C 00266EBC FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 80269F80 00266EC0 4C 41 13 82 */ cror 2, 1, 2 +/* 80269F84 00266EC4 40 82 00 0C */ bne lbl_80269F90 +/* 80269F88 00266EC8 38 60 00 01 */ li r3, 1 +/* 80269F8C 00266ECC 48 00 00 08 */ b lbl_80269F94 +lbl_80269F90: +/* 80269F90 00266ED0 38 60 00 00 */ li r3, 0 +lbl_80269F94: +/* 80269F94 00266ED4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 +/* 80269F98 00266ED8 CB E1 00 30 */ lfd f31, 0x30(r1) +/* 80269F9C 00266EDC E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 +/* 80269FA0 00266EE0 CB C1 00 20 */ lfd f30, 0x20(r1) +/* 80269FA4 00266EE4 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 80269FA8 00266EE8 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 80269FAC 00266EEC 80 01 00 44 */ lwz r0, 0x44(r1) +/* 80269FB0 00266EF0 7C 08 03 A6 */ mtlr r0 +/* 80269FB4 00266EF4 38 21 00 40 */ addi r1, r1, 0x40 +/* 80269FB8 00266EF8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80269FBC.s b/include/SComponent/c_m3d/asm/func_80269FBC.s new file mode 100644 index 0000000000..620e501908 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_80269FBC.s @@ -0,0 +1,110 @@ +/* 80269FBC 00266EFC 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 80269FC0 00266F00 7C 08 02 A6 */ mflr r0 +/* 80269FC4 00266F04 90 01 00 34 */ stw r0, 0x34(r1) +/* 80269FC8 00266F08 DB E1 00 20 */ stfd f31, 0x20(r1) +/* 80269FCC 00266F0C F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 +/* 80269FD0 00266F10 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 80269FD4 00266F14 93 C1 00 18 */ stw r30, 0x18(r1) +/* 80269FD8 00266F18 7C 7E 1B 78 */ mr r30, r3 +/* 80269FDC 00266F1C 7C 9F 23 78 */ mr r31, r4 +/* 80269FE0 00266F20 C0 03 00 00 */ lfs f0, 0(r3) +/* 80269FE4 00266F24 FC 00 02 10 */ fabs f0, f0 +/* 80269FE8 00266F28 FC 20 00 18 */ frsp f1, f0 +/* 80269FEC 00266F2C C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 80269FF0 00266F30 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80269FF4 00266F34 40 80 00 0C */ bge lbl_8026A000 +/* 80269FF8 00266F38 38 60 00 00 */ li r3, 0 +/* 80269FFC 00266F3C 48 00 01 44 */ b lbl_8026A140 +lbl_8026A000: +/* 8026A000 00266F40 C0 02 B7 AC */ lfs f0, lbl_804551AC-_SDA2_BASE_(r2) +/* 8026A004 00266F44 D0 01 00 08 */ stfs f0, 8(r1) +/* 8026A008 00266F48 C0 3E 00 18 */ lfs f1, 0x18(r30) +/* 8026A00C 00266F4C C0 5E 00 1C */ lfs f2, 0x1c(r30) +/* 8026A010 00266F50 C0 7E 00 24 */ lfs f3, 0x24(r30) +/* 8026A014 00266F54 C0 9E 00 28 */ lfs f4, 0x28(r30) +/* 8026A018 00266F58 C0 BE 00 30 */ lfs f5, 0x30(r30) +/* 8026A01C 00266F5C C0 DE 00 34 */ lfs f6, 0x34(r30) +/* 8026A020 00266F60 C0 FF 00 04 */ lfs f7, 4(r31) +/* 8026A024 00266F64 C1 1F 00 08 */ lfs f8, 8(r31) +/* 8026A028 00266F68 4B FF FD 3D */ bl cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff +/* 8026A02C 00266F6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026A030 00266F70 40 82 00 0C */ bne lbl_8026A03C +/* 8026A034 00266F74 38 60 00 00 */ li r3, 0 +/* 8026A038 00266F78 48 00 01 08 */ b lbl_8026A140 +lbl_8026A03C: +/* 8026A03C 00266F7C C0 3E 00 18 */ lfs f1, 0x18(r30) +/* 8026A040 00266F80 C0 5E 00 1C */ lfs f2, 0x1c(r30) +/* 8026A044 00266F84 C0 7E 00 24 */ lfs f3, 0x24(r30) +/* 8026A048 00266F88 C0 9E 00 28 */ lfs f4, 0x28(r30) +/* 8026A04C 00266F8C C0 BF 00 04 */ lfs f5, 4(r31) +/* 8026A050 00266F90 C0 DF 00 08 */ lfs f6, 8(r31) +/* 8026A054 00266F94 4B FF E8 41 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A058 00266F98 FF E0 08 90 */ fmr f31, f1 +/* 8026A05C 00266F9C C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A060 00266FA0 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026A064 00266FA4 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A068 00266FA8 40 82 00 64 */ bne lbl_8026A0CC +/* 8026A06C 00266FAC C0 3E 00 24 */ lfs f1, 0x24(r30) +/* 8026A070 00266FB0 C0 5E 00 28 */ lfs f2, 0x28(r30) +/* 8026A074 00266FB4 C0 7E 00 30 */ lfs f3, 0x30(r30) +/* 8026A078 00266FB8 C0 9E 00 34 */ lfs f4, 0x34(r30) +/* 8026A07C 00266FBC C0 BF 00 04 */ lfs f5, 4(r31) +/* 8026A080 00266FC0 C0 DF 00 08 */ lfs f6, 8(r31) +/* 8026A084 00266FC4 4B FF E8 11 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A088 00266FC8 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A08C 00266FCC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A090 00266FD0 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A094 00266FD4 40 82 00 38 */ bne lbl_8026A0CC +/* 8026A098 00266FD8 C0 3E 00 30 */ lfs f1, 0x30(r30) +/* 8026A09C 00266FDC C0 5E 00 34 */ lfs f2, 0x34(r30) +/* 8026A0A0 00266FE0 C0 7E 00 18 */ lfs f3, 0x18(r30) +/* 8026A0A4 00266FE4 C0 9E 00 1C */ lfs f4, 0x1c(r30) +/* 8026A0A8 00266FE8 C0 BF 00 04 */ lfs f5, 4(r31) +/* 8026A0AC 00266FEC C0 DF 00 08 */ lfs f6, 8(r31) +/* 8026A0B0 00266FF0 4B FF E7 E5 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A0B4 00266FF4 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A0B8 00266FF8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A0BC 00266FFC 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A0C0 00267000 40 82 00 0C */ bne lbl_8026A0CC +/* 8026A0C4 00267004 38 60 00 01 */ li r3, 1 +/* 8026A0C8 00267008 48 00 00 78 */ b lbl_8026A140 +lbl_8026A0CC: +/* 8026A0CC 0026700C C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A0D0 00267010 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026A0D4 00267014 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A0D8 00267018 40 82 00 64 */ bne lbl_8026A13C +/* 8026A0DC 0026701C C0 3E 00 24 */ lfs f1, 0x24(r30) +/* 8026A0E0 00267020 C0 5E 00 28 */ lfs f2, 0x28(r30) +/* 8026A0E4 00267024 C0 7E 00 30 */ lfs f3, 0x30(r30) +/* 8026A0E8 00267028 C0 9E 00 34 */ lfs f4, 0x34(r30) +/* 8026A0EC 0026702C C0 BF 00 04 */ lfs f5, 4(r31) +/* 8026A0F0 00267030 C0 DF 00 08 */ lfs f6, 8(r31) +/* 8026A0F4 00267034 4B FF E7 A1 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A0F8 00267038 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A0FC 0026703C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A100 00267040 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A104 00267044 40 82 00 38 */ bne lbl_8026A13C +/* 8026A108 00267048 C0 3E 00 30 */ lfs f1, 0x30(r30) +/* 8026A10C 0026704C C0 5E 00 34 */ lfs f2, 0x34(r30) +/* 8026A110 00267050 C0 7E 00 18 */ lfs f3, 0x18(r30) +/* 8026A114 00267054 C0 9E 00 1C */ lfs f4, 0x1c(r30) +/* 8026A118 00267058 C0 BF 00 04 */ lfs f5, 4(r31) +/* 8026A11C 0026705C C0 DF 00 08 */ lfs f6, 8(r31) +/* 8026A120 00267060 4B FF E7 75 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A124 00267064 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A128 00267068 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A12C 0026706C 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A130 00267070 40 82 00 0C */ bne lbl_8026A13C +/* 8026A134 00267074 38 60 00 01 */ li r3, 1 +/* 8026A138 00267078 48 00 00 08 */ b lbl_8026A140 +lbl_8026A13C: +/* 8026A13C 0026707C 38 60 00 00 */ li r3, 0 +lbl_8026A140: +/* 8026A140 00267080 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 +/* 8026A144 00267084 CB E1 00 20 */ lfd f31, 0x20(r1) +/* 8026A148 00267088 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026A14C 0026708C 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8026A150 00267090 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026A154 00267094 7C 08 03 A6 */ mtlr r0 +/* 8026A158 00267098 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026A15C 0026709C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026A160.s b/include/SComponent/c_m3d/asm/func_8026A160.s new file mode 100644 index 0000000000..2e9926229f --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026A160.s @@ -0,0 +1,101 @@ +/* 8026A160 002670A0 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026A164 002670A4 7C 08 02 A6 */ mflr r0 +/* 8026A168 002670A8 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026A16C 002670AC DB E1 00 20 */ stfd f31, 0x20(r1) +/* 8026A170 002670B0 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 +/* 8026A174 002670B4 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8026A178 002670B8 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8026A17C 002670BC 7C 7E 1B 78 */ mr r30, r3 +/* 8026A180 002670C0 7C 9F 23 78 */ mr r31, r4 +/* 8026A184 002670C4 C0 02 B7 AC */ lfs f0, lbl_804551AC-_SDA2_BASE_(r2) +/* 8026A188 002670C8 D0 01 00 08 */ stfs f0, 8(r1) +/* 8026A18C 002670CC C0 23 00 18 */ lfs f1, 0x18(r3) +/* 8026A190 002670D0 C0 43 00 1C */ lfs f2, 0x1c(r3) +/* 8026A194 002670D4 C0 63 00 24 */ lfs f3, 0x24(r3) +/* 8026A198 002670D8 C0 83 00 28 */ lfs f4, 0x28(r3) +/* 8026A19C 002670DC C0 A3 00 30 */ lfs f5, 0x30(r3) +/* 8026A1A0 002670E0 C0 C3 00 34 */ lfs f6, 0x34(r3) +/* 8026A1A4 002670E4 C0 E4 00 04 */ lfs f7, 4(r4) +/* 8026A1A8 002670E8 C1 04 00 08 */ lfs f8, 8(r4) +/* 8026A1AC 002670EC 4B FF FB B9 */ bl cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff +/* 8026A1B0 002670F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026A1B4 002670F4 40 82 00 0C */ bne lbl_8026A1C0 +/* 8026A1B8 002670F8 38 60 00 00 */ li r3, 0 +/* 8026A1BC 002670FC 48 00 01 08 */ b lbl_8026A2C4 +lbl_8026A1C0: +/* 8026A1C0 00267100 C0 3E 00 18 */ lfs f1, 0x18(r30) +/* 8026A1C4 00267104 C0 5E 00 1C */ lfs f2, 0x1c(r30) +/* 8026A1C8 00267108 C0 7E 00 24 */ lfs f3, 0x24(r30) +/* 8026A1CC 0026710C C0 9E 00 28 */ lfs f4, 0x28(r30) +/* 8026A1D0 00267110 C0 BF 00 04 */ lfs f5, 4(r31) +/* 8026A1D4 00267114 C0 DF 00 08 */ lfs f6, 8(r31) +/* 8026A1D8 00267118 4B FF E6 BD */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A1DC 0026711C FF E0 08 90 */ fmr f31, f1 +/* 8026A1E0 00267120 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A1E4 00267124 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026A1E8 00267128 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A1EC 0026712C 40 82 00 64 */ bne lbl_8026A250 +/* 8026A1F0 00267130 C0 3E 00 24 */ lfs f1, 0x24(r30) +/* 8026A1F4 00267134 C0 5E 00 28 */ lfs f2, 0x28(r30) +/* 8026A1F8 00267138 C0 7E 00 30 */ lfs f3, 0x30(r30) +/* 8026A1FC 0026713C C0 9E 00 34 */ lfs f4, 0x34(r30) +/* 8026A200 00267140 C0 BF 00 04 */ lfs f5, 4(r31) +/* 8026A204 00267144 C0 DF 00 08 */ lfs f6, 8(r31) +/* 8026A208 00267148 4B FF E6 8D */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A20C 0026714C C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A210 00267150 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A214 00267154 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A218 00267158 40 82 00 38 */ bne lbl_8026A250 +/* 8026A21C 0026715C C0 3E 00 30 */ lfs f1, 0x30(r30) +/* 8026A220 00267160 C0 5E 00 34 */ lfs f2, 0x34(r30) +/* 8026A224 00267164 C0 7E 00 18 */ lfs f3, 0x18(r30) +/* 8026A228 00267168 C0 9E 00 1C */ lfs f4, 0x1c(r30) +/* 8026A22C 0026716C C0 BF 00 04 */ lfs f5, 4(r31) +/* 8026A230 00267170 C0 DF 00 08 */ lfs f6, 8(r31) +/* 8026A234 00267174 4B FF E6 61 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A238 00267178 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A23C 0026717C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A240 00267180 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A244 00267184 40 82 00 0C */ bne lbl_8026A250 +/* 8026A248 00267188 38 60 00 01 */ li r3, 1 +/* 8026A24C 0026718C 48 00 00 78 */ b lbl_8026A2C4 +lbl_8026A250: +/* 8026A250 00267190 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A254 00267194 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026A258 00267198 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A25C 0026719C 40 82 00 64 */ bne lbl_8026A2C0 +/* 8026A260 002671A0 C0 3E 00 24 */ lfs f1, 0x24(r30) +/* 8026A264 002671A4 C0 5E 00 28 */ lfs f2, 0x28(r30) +/* 8026A268 002671A8 C0 7E 00 30 */ lfs f3, 0x30(r30) +/* 8026A26C 002671AC C0 9E 00 34 */ lfs f4, 0x34(r30) +/* 8026A270 002671B0 C0 BF 00 04 */ lfs f5, 4(r31) +/* 8026A274 002671B4 C0 DF 00 08 */ lfs f6, 8(r31) +/* 8026A278 002671B8 4B FF E6 1D */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A27C 002671BC C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A280 002671C0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A284 002671C4 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A288 002671C8 40 82 00 38 */ bne lbl_8026A2C0 +/* 8026A28C 002671CC C0 3E 00 30 */ lfs f1, 0x30(r30) +/* 8026A290 002671D0 C0 5E 00 34 */ lfs f2, 0x34(r30) +/* 8026A294 002671D4 C0 7E 00 18 */ lfs f3, 0x18(r30) +/* 8026A298 002671D8 C0 9E 00 1C */ lfs f4, 0x1c(r30) +/* 8026A29C 002671DC C0 BF 00 04 */ lfs f5, 4(r31) +/* 8026A2A0 002671E0 C0 DF 00 08 */ lfs f6, 8(r31) +/* 8026A2A4 002671E4 4B FF E5 F1 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A2A8 002671E8 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A2AC 002671EC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A2B0 002671F0 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A2B4 002671F4 40 82 00 0C */ bne lbl_8026A2C0 +/* 8026A2B8 002671F8 38 60 00 01 */ li r3, 1 +/* 8026A2BC 002671FC 48 00 00 08 */ b lbl_8026A2C4 +lbl_8026A2C0: +/* 8026A2C0 00267200 38 60 00 00 */ li r3, 0 +lbl_8026A2C4: +/* 8026A2C4 00267204 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 +/* 8026A2C8 00267208 CB E1 00 20 */ lfd f31, 0x20(r1) +/* 8026A2CC 0026720C 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026A2D0 00267210 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8026A2D4 00267214 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026A2D8 00267218 7C 08 03 A6 */ mtlr r0 +/* 8026A2DC 0026721C 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026A2E0 00267220 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026A2E4.s b/include/SComponent/c_m3d/asm/func_8026A2E4.s new file mode 100644 index 0000000000..9652a991bd --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026A2E4.s @@ -0,0 +1,110 @@ +/* 8026A2E4 00267224 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026A2E8 00267228 7C 08 02 A6 */ mflr r0 +/* 8026A2EC 0026722C 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026A2F0 00267230 DB E1 00 20 */ stfd f31, 0x20(r1) +/* 8026A2F4 00267234 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 +/* 8026A2F8 00267238 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8026A2FC 0026723C 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8026A300 00267240 7C 7E 1B 78 */ mr r30, r3 +/* 8026A304 00267244 7C 9F 23 78 */ mr r31, r4 +/* 8026A308 00267248 C0 03 00 04 */ lfs f0, 4(r3) +/* 8026A30C 0026724C FC 00 02 10 */ fabs f0, f0 +/* 8026A310 00267250 FC 20 00 18 */ frsp f1, f0 +/* 8026A314 00267254 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026A318 00267258 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A31C 0026725C 40 80 00 0C */ bge lbl_8026A328 +/* 8026A320 00267260 38 60 00 00 */ li r3, 0 +/* 8026A324 00267264 48 00 01 44 */ b lbl_8026A468 +lbl_8026A328: +/* 8026A328 00267268 C0 02 B7 AC */ lfs f0, lbl_804551AC-_SDA2_BASE_(r2) +/* 8026A32C 0026726C D0 01 00 08 */ stfs f0, 8(r1) +/* 8026A330 00267270 C0 3E 00 1C */ lfs f1, 0x1c(r30) +/* 8026A334 00267274 C0 5E 00 14 */ lfs f2, 0x14(r30) +/* 8026A338 00267278 C0 7E 00 28 */ lfs f3, 0x28(r30) +/* 8026A33C 0026727C C0 9E 00 20 */ lfs f4, 0x20(r30) +/* 8026A340 00267280 C0 BE 00 34 */ lfs f5, 0x34(r30) +/* 8026A344 00267284 C0 DE 00 2C */ lfs f6, 0x2c(r30) +/* 8026A348 00267288 C0 FF 00 08 */ lfs f7, 8(r31) +/* 8026A34C 0026728C C1 1F 00 00 */ lfs f8, 0(r31) +/* 8026A350 00267290 4B FF FA 15 */ bl cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff +/* 8026A354 00267294 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026A358 00267298 40 82 00 0C */ bne lbl_8026A364 +/* 8026A35C 0026729C 38 60 00 00 */ li r3, 0 +/* 8026A360 002672A0 48 00 01 08 */ b lbl_8026A468 +lbl_8026A364: +/* 8026A364 002672A4 C0 3E 00 1C */ lfs f1, 0x1c(r30) +/* 8026A368 002672A8 C0 5E 00 14 */ lfs f2, 0x14(r30) +/* 8026A36C 002672AC C0 7E 00 28 */ lfs f3, 0x28(r30) +/* 8026A370 002672B0 C0 9E 00 20 */ lfs f4, 0x20(r30) +/* 8026A374 002672B4 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A378 002672B8 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A37C 002672BC 4B FF E5 19 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A380 002672C0 FF E0 08 90 */ fmr f31, f1 +/* 8026A384 002672C4 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A388 002672C8 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026A38C 002672CC 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A390 002672D0 40 82 00 64 */ bne lbl_8026A3F4 +/* 8026A394 002672D4 C0 3E 00 28 */ lfs f1, 0x28(r30) +/* 8026A398 002672D8 C0 5E 00 20 */ lfs f2, 0x20(r30) +/* 8026A39C 002672DC C0 7E 00 34 */ lfs f3, 0x34(r30) +/* 8026A3A0 002672E0 C0 9E 00 2C */ lfs f4, 0x2c(r30) +/* 8026A3A4 002672E4 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A3A8 002672E8 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A3AC 002672EC 4B FF E4 E9 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A3B0 002672F0 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A3B4 002672F4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A3B8 002672F8 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A3BC 002672FC 40 82 00 38 */ bne lbl_8026A3F4 +/* 8026A3C0 00267300 C0 3E 00 34 */ lfs f1, 0x34(r30) +/* 8026A3C4 00267304 C0 5E 00 2C */ lfs f2, 0x2c(r30) +/* 8026A3C8 00267308 C0 7E 00 1C */ lfs f3, 0x1c(r30) +/* 8026A3CC 0026730C C0 9E 00 14 */ lfs f4, 0x14(r30) +/* 8026A3D0 00267310 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A3D4 00267314 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A3D8 00267318 4B FF E4 BD */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A3DC 0026731C C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A3E0 00267320 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A3E4 00267324 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A3E8 00267328 40 82 00 0C */ bne lbl_8026A3F4 +/* 8026A3EC 0026732C 38 60 00 01 */ li r3, 1 +/* 8026A3F0 00267330 48 00 00 78 */ b lbl_8026A468 +lbl_8026A3F4: +/* 8026A3F4 00267334 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A3F8 00267338 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026A3FC 0026733C 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A400 00267340 40 82 00 64 */ bne lbl_8026A464 +/* 8026A404 00267344 C0 3E 00 28 */ lfs f1, 0x28(r30) +/* 8026A408 00267348 C0 5E 00 20 */ lfs f2, 0x20(r30) +/* 8026A40C 0026734C C0 7E 00 34 */ lfs f3, 0x34(r30) +/* 8026A410 00267350 C0 9E 00 2C */ lfs f4, 0x2c(r30) +/* 8026A414 00267354 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A418 00267358 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A41C 0026735C 4B FF E4 79 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A420 00267360 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A424 00267364 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A428 00267368 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A42C 0026736C 40 82 00 38 */ bne lbl_8026A464 +/* 8026A430 00267370 C0 3E 00 34 */ lfs f1, 0x34(r30) +/* 8026A434 00267374 C0 5E 00 2C */ lfs f2, 0x2c(r30) +/* 8026A438 00267378 C0 7E 00 1C */ lfs f3, 0x1c(r30) +/* 8026A43C 0026737C C0 9E 00 14 */ lfs f4, 0x14(r30) +/* 8026A440 00267380 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A444 00267384 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A448 00267388 4B FF E4 4D */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A44C 0026738C C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A450 00267390 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A454 00267394 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A458 00267398 40 82 00 0C */ bne lbl_8026A464 +/* 8026A45C 0026739C 38 60 00 01 */ li r3, 1 +/* 8026A460 002673A0 48 00 00 08 */ b lbl_8026A468 +lbl_8026A464: +/* 8026A464 002673A4 38 60 00 00 */ li r3, 0 +lbl_8026A468: +/* 8026A468 002673A8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 +/* 8026A46C 002673AC CB E1 00 20 */ lfd f31, 0x20(r1) +/* 8026A470 002673B0 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026A474 002673B4 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8026A478 002673B8 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026A47C 002673BC 7C 08 03 A6 */ mtlr r0 +/* 8026A480 002673C0 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026A484 002673C4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026A488.s b/include/SComponent/c_m3d/asm/func_8026A488.s new file mode 100644 index 0000000000..71c16a4065 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026A488.s @@ -0,0 +1,101 @@ +/* 8026A488 002673C8 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026A48C 002673CC 7C 08 02 A6 */ mflr r0 +/* 8026A490 002673D0 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026A494 002673D4 DB E1 00 20 */ stfd f31, 0x20(r1) +/* 8026A498 002673D8 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 +/* 8026A49C 002673DC 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8026A4A0 002673E0 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8026A4A4 002673E4 7C 7E 1B 78 */ mr r30, r3 +/* 8026A4A8 002673E8 7C 9F 23 78 */ mr r31, r4 +/* 8026A4AC 002673EC C0 02 B7 AC */ lfs f0, lbl_804551AC-_SDA2_BASE_(r2) +/* 8026A4B0 002673F0 D0 01 00 08 */ stfs f0, 8(r1) +/* 8026A4B4 002673F4 C0 23 00 1C */ lfs f1, 0x1c(r3) +/* 8026A4B8 002673F8 C0 43 00 14 */ lfs f2, 0x14(r3) +/* 8026A4BC 002673FC C0 63 00 28 */ lfs f3, 0x28(r3) +/* 8026A4C0 00267400 C0 83 00 20 */ lfs f4, 0x20(r3) +/* 8026A4C4 00267404 C0 A3 00 34 */ lfs f5, 0x34(r3) +/* 8026A4C8 00267408 C0 C3 00 2C */ lfs f6, 0x2c(r3) +/* 8026A4CC 0026740C C0 E4 00 08 */ lfs f7, 8(r4) +/* 8026A4D0 00267410 C1 04 00 00 */ lfs f8, 0(r4) +/* 8026A4D4 00267414 4B FF F8 91 */ bl cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff +/* 8026A4D8 00267418 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026A4DC 0026741C 40 82 00 0C */ bne lbl_8026A4E8 +/* 8026A4E0 00267420 38 60 00 00 */ li r3, 0 +/* 8026A4E4 00267424 48 00 01 08 */ b lbl_8026A5EC +lbl_8026A4E8: +/* 8026A4E8 00267428 C0 3E 00 1C */ lfs f1, 0x1c(r30) +/* 8026A4EC 0026742C C0 5E 00 14 */ lfs f2, 0x14(r30) +/* 8026A4F0 00267430 C0 7E 00 28 */ lfs f3, 0x28(r30) +/* 8026A4F4 00267434 C0 9E 00 20 */ lfs f4, 0x20(r30) +/* 8026A4F8 00267438 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A4FC 0026743C C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A500 00267440 4B FF E3 95 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A504 00267444 FF E0 08 90 */ fmr f31, f1 +/* 8026A508 00267448 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A50C 0026744C FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026A510 00267450 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A514 00267454 40 82 00 64 */ bne lbl_8026A578 +/* 8026A518 00267458 C0 3E 00 28 */ lfs f1, 0x28(r30) +/* 8026A51C 0026745C C0 5E 00 20 */ lfs f2, 0x20(r30) +/* 8026A520 00267460 C0 7E 00 34 */ lfs f3, 0x34(r30) +/* 8026A524 00267464 C0 9E 00 2C */ lfs f4, 0x2c(r30) +/* 8026A528 00267468 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A52C 0026746C C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A530 00267470 4B FF E3 65 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A534 00267474 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A538 00267478 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A53C 0026747C 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A540 00267480 40 82 00 38 */ bne lbl_8026A578 +/* 8026A544 00267484 C0 3E 00 34 */ lfs f1, 0x34(r30) +/* 8026A548 00267488 C0 5E 00 2C */ lfs f2, 0x2c(r30) +/* 8026A54C 0026748C C0 7E 00 1C */ lfs f3, 0x1c(r30) +/* 8026A550 00267490 C0 9E 00 14 */ lfs f4, 0x14(r30) +/* 8026A554 00267494 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A558 00267498 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A55C 0026749C 4B FF E3 39 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A560 002674A0 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A564 002674A4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A568 002674A8 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A56C 002674AC 40 82 00 0C */ bne lbl_8026A578 +/* 8026A570 002674B0 38 60 00 01 */ li r3, 1 +/* 8026A574 002674B4 48 00 00 78 */ b lbl_8026A5EC +lbl_8026A578: +/* 8026A578 002674B8 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A57C 002674BC FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026A580 002674C0 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A584 002674C4 40 82 00 64 */ bne lbl_8026A5E8 +/* 8026A588 002674C8 C0 3E 00 28 */ lfs f1, 0x28(r30) +/* 8026A58C 002674CC C0 5E 00 20 */ lfs f2, 0x20(r30) +/* 8026A590 002674D0 C0 7E 00 34 */ lfs f3, 0x34(r30) +/* 8026A594 002674D4 C0 9E 00 2C */ lfs f4, 0x2c(r30) +/* 8026A598 002674D8 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A59C 002674DC C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A5A0 002674E0 4B FF E2 F5 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A5A4 002674E4 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A5A8 002674E8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A5AC 002674EC 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A5B0 002674F0 40 82 00 38 */ bne lbl_8026A5E8 +/* 8026A5B4 002674F4 C0 3E 00 34 */ lfs f1, 0x34(r30) +/* 8026A5B8 002674F8 C0 5E 00 2C */ lfs f2, 0x2c(r30) +/* 8026A5BC 002674FC C0 7E 00 1C */ lfs f3, 0x1c(r30) +/* 8026A5C0 00267500 C0 9E 00 14 */ lfs f4, 0x14(r30) +/* 8026A5C4 00267504 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A5C8 00267508 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A5CC 0026750C 4B FF E2 C9 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A5D0 00267510 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A5D4 00267514 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A5D8 00267518 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A5DC 0026751C 40 82 00 0C */ bne lbl_8026A5E8 +/* 8026A5E0 00267520 38 60 00 01 */ li r3, 1 +/* 8026A5E4 00267524 48 00 00 08 */ b lbl_8026A5EC +lbl_8026A5E8: +/* 8026A5E8 00267528 38 60 00 00 */ li r3, 0 +lbl_8026A5EC: +/* 8026A5EC 0026752C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 +/* 8026A5F0 00267530 CB E1 00 20 */ lfd f31, 0x20(r1) +/* 8026A5F4 00267534 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026A5F8 00267538 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8026A5FC 0026753C 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026A600 00267540 7C 08 03 A6 */ mtlr r0 +/* 8026A604 00267544 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026A608 00267548 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026A60C.s b/include/SComponent/c_m3d/asm/func_8026A60C.s new file mode 100644 index 0000000000..954def42a6 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026A60C.s @@ -0,0 +1,112 @@ +/* 8026A60C 0026754C 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026A610 00267550 7C 08 02 A6 */ mflr r0 +/* 8026A614 00267554 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026A618 00267558 DB E1 00 20 */ stfd f31, 0x20(r1) +/* 8026A61C 0026755C F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 +/* 8026A620 00267560 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026A624 00267564 48 0F 7B B5 */ bl _savegpr_28 +/* 8026A628 00267568 7C 7C 1B 78 */ mr r28, r3 +/* 8026A62C 0026756C 7C 9D 23 78 */ mr r29, r4 +/* 8026A630 00267570 7C BE 2B 78 */ mr r30, r5 +/* 8026A634 00267574 7C FF 3B 78 */ mr r31, r7 +/* 8026A638 00267578 C0 06 00 04 */ lfs f0, 4(r6) +/* 8026A63C 0026757C FC 00 02 10 */ fabs f0, f0 +/* 8026A640 00267580 FC 20 00 18 */ frsp f1, f0 +/* 8026A644 00267584 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026A648 00267588 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A64C 0026758C 40 80 00 0C */ bge lbl_8026A658 +/* 8026A650 00267590 38 60 00 00 */ li r3, 0 +/* 8026A654 00267594 48 00 01 44 */ b lbl_8026A798 +lbl_8026A658: +/* 8026A658 00267598 C0 02 B7 AC */ lfs f0, lbl_804551AC-_SDA2_BASE_(r2) +/* 8026A65C 0026759C D0 01 00 08 */ stfs f0, 8(r1) +/* 8026A660 002675A0 C0 3C 00 08 */ lfs f1, 8(r28) +/* 8026A664 002675A4 C0 5C 00 00 */ lfs f2, 0(r28) +/* 8026A668 002675A8 C0 7D 00 08 */ lfs f3, 8(r29) +/* 8026A66C 002675AC C0 9D 00 00 */ lfs f4, 0(r29) +/* 8026A670 002675B0 C0 BE 00 08 */ lfs f5, 8(r30) +/* 8026A674 002675B4 C0 DE 00 00 */ lfs f6, 0(r30) +/* 8026A678 002675B8 C0 FF 00 08 */ lfs f7, 8(r31) +/* 8026A67C 002675BC C1 1F 00 00 */ lfs f8, 0(r31) +/* 8026A680 002675C0 4B FF F6 E5 */ bl cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff +/* 8026A684 002675C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026A688 002675C8 40 82 00 0C */ bne lbl_8026A694 +/* 8026A68C 002675CC 38 60 00 00 */ li r3, 0 +/* 8026A690 002675D0 48 00 01 08 */ b lbl_8026A798 +lbl_8026A694: +/* 8026A694 002675D4 C0 3C 00 08 */ lfs f1, 8(r28) +/* 8026A698 002675D8 C0 5C 00 00 */ lfs f2, 0(r28) +/* 8026A69C 002675DC C0 7D 00 08 */ lfs f3, 8(r29) +/* 8026A6A0 002675E0 C0 9D 00 00 */ lfs f4, 0(r29) +/* 8026A6A4 002675E4 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A6A8 002675E8 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A6AC 002675EC 4B FF E1 E9 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A6B0 002675F0 FF E0 08 90 */ fmr f31, f1 +/* 8026A6B4 002675F4 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A6B8 002675F8 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026A6BC 002675FC 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A6C0 00267600 40 82 00 64 */ bne lbl_8026A724 +/* 8026A6C4 00267604 C0 3D 00 08 */ lfs f1, 8(r29) +/* 8026A6C8 00267608 C0 5D 00 00 */ lfs f2, 0(r29) +/* 8026A6CC 0026760C C0 7E 00 08 */ lfs f3, 8(r30) +/* 8026A6D0 00267610 C0 9E 00 00 */ lfs f4, 0(r30) +/* 8026A6D4 00267614 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A6D8 00267618 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A6DC 0026761C 4B FF E1 B9 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A6E0 00267620 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A6E4 00267624 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A6E8 00267628 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A6EC 0026762C 40 82 00 38 */ bne lbl_8026A724 +/* 8026A6F0 00267630 C0 3E 00 08 */ lfs f1, 8(r30) +/* 8026A6F4 00267634 C0 5E 00 00 */ lfs f2, 0(r30) +/* 8026A6F8 00267638 C0 7C 00 08 */ lfs f3, 8(r28) +/* 8026A6FC 0026763C C0 9C 00 00 */ lfs f4, 0(r28) +/* 8026A700 00267640 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A704 00267644 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A708 00267648 4B FF E1 8D */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A70C 0026764C C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026A710 00267650 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A714 00267654 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A718 00267658 40 82 00 0C */ bne lbl_8026A724 +/* 8026A71C 0026765C 38 60 00 01 */ li r3, 1 +/* 8026A720 00267660 48 00 00 78 */ b lbl_8026A798 +lbl_8026A724: +/* 8026A724 00267664 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A728 00267668 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026A72C 0026766C 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A730 00267670 40 82 00 64 */ bne lbl_8026A794 +/* 8026A734 00267674 C0 3D 00 08 */ lfs f1, 8(r29) +/* 8026A738 00267678 C0 5D 00 00 */ lfs f2, 0(r29) +/* 8026A73C 0026767C C0 7E 00 08 */ lfs f3, 8(r30) +/* 8026A740 00267680 C0 9E 00 00 */ lfs f4, 0(r30) +/* 8026A744 00267684 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A748 00267688 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A74C 0026768C 4B FF E1 49 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A750 00267690 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A754 00267694 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A758 00267698 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A75C 0026769C 40 82 00 38 */ bne lbl_8026A794 +/* 8026A760 002676A0 C0 3E 00 08 */ lfs f1, 8(r30) +/* 8026A764 002676A4 C0 5E 00 00 */ lfs f2, 0(r30) +/* 8026A768 002676A8 C0 7C 00 08 */ lfs f3, 8(r28) +/* 8026A76C 002676AC C0 9C 00 00 */ lfs f4, 0(r28) +/* 8026A770 002676B0 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A774 002676B4 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A778 002676B8 4B FF E1 1D */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A77C 002676BC C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A780 002676C0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A784 002676C4 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A788 002676C8 40 82 00 0C */ bne lbl_8026A794 +/* 8026A78C 002676CC 38 60 00 01 */ li r3, 1 +/* 8026A790 002676D0 48 00 00 08 */ b lbl_8026A798 +lbl_8026A794: +/* 8026A794 002676D4 38 60 00 00 */ li r3, 0 +lbl_8026A798: +/* 8026A798 002676D8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 +/* 8026A79C 002676DC CB E1 00 20 */ lfd f31, 0x20(r1) +/* 8026A7A0 002676E0 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026A7A4 002676E4 48 0F 7A 81 */ bl _restgpr_28 +/* 8026A7A8 002676E8 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026A7AC 002676EC 7C 08 03 A6 */ mtlr r0 +/* 8026A7B0 002676F0 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026A7B4 002676F4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026A7B8.s b/include/SComponent/c_m3d/asm/func_8026A7B8.s new file mode 100644 index 0000000000..ee9e416916 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026A7B8.s @@ -0,0 +1,69 @@ +/* 8026A7B8 002676F8 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026A7BC 002676FC 7C 08 02 A6 */ mflr r0 +/* 8026A7C0 00267700 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026A7C4 00267704 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026A7C8 00267708 48 0F 7A 11 */ bl _savegpr_28 +/* 8026A7CC 0026770C 7C 7C 1B 78 */ mr r28, r3 +/* 8026A7D0 00267710 7C 9D 23 78 */ mr r29, r4 +/* 8026A7D4 00267714 7C BE 2B 78 */ mr r30, r5 +/* 8026A7D8 00267718 7C DF 33 78 */ mr r31, r6 +/* 8026A7DC 0026771C C0 02 B7 AC */ lfs f0, lbl_804551AC-_SDA2_BASE_(r2) +/* 8026A7E0 00267720 D0 01 00 08 */ stfs f0, 8(r1) +/* 8026A7E4 00267724 C0 23 00 08 */ lfs f1, 8(r3) +/* 8026A7E8 00267728 C0 43 00 00 */ lfs f2, 0(r3) +/* 8026A7EC 0026772C C0 64 00 08 */ lfs f3, 8(r4) +/* 8026A7F0 00267730 C0 84 00 00 */ lfs f4, 0(r4) +/* 8026A7F4 00267734 C0 A5 00 08 */ lfs f5, 8(r5) +/* 8026A7F8 00267738 C0 C5 00 00 */ lfs f6, 0(r5) +/* 8026A7FC 0026773C C0 E6 00 08 */ lfs f7, 8(r6) +/* 8026A800 00267740 C1 06 00 00 */ lfs f8, 0(r6) +/* 8026A804 00267744 4B FF F5 61 */ bl cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff +/* 8026A808 00267748 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026A80C 0026774C 40 82 00 0C */ bne lbl_8026A818 +/* 8026A810 00267750 38 60 00 00 */ li r3, 0 +/* 8026A814 00267754 48 00 00 94 */ b lbl_8026A8A8 +lbl_8026A818: +/* 8026A818 00267758 C0 3C 00 08 */ lfs f1, 8(r28) +/* 8026A81C 0026775C C0 5C 00 00 */ lfs f2, 0(r28) +/* 8026A820 00267760 C0 7D 00 08 */ lfs f3, 8(r29) +/* 8026A824 00267764 C0 9D 00 00 */ lfs f4, 0(r29) +/* 8026A828 00267768 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A82C 0026776C C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A830 00267770 4B FF E0 65 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A834 00267774 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A838 00267778 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A83C 0026777C 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A840 00267780 40 82 00 64 */ bne lbl_8026A8A4 +/* 8026A844 00267784 C0 3D 00 08 */ lfs f1, 8(r29) +/* 8026A848 00267788 C0 5D 00 00 */ lfs f2, 0(r29) +/* 8026A84C 0026778C C0 7E 00 08 */ lfs f3, 8(r30) +/* 8026A850 00267790 C0 9E 00 00 */ lfs f4, 0(r30) +/* 8026A854 00267794 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A858 00267798 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A85C 0026779C 4B FF E0 39 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A860 002677A0 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A864 002677A4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A868 002677A8 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A86C 002677AC 40 82 00 38 */ bne lbl_8026A8A4 +/* 8026A870 002677B0 C0 3E 00 08 */ lfs f1, 8(r30) +/* 8026A874 002677B4 C0 5E 00 00 */ lfs f2, 0(r30) +/* 8026A878 002677B8 C0 7C 00 08 */ lfs f3, 8(r28) +/* 8026A87C 002677BC C0 9C 00 00 */ lfs f4, 0(r28) +/* 8026A880 002677C0 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A884 002677C4 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A888 002677C8 4B FF E0 0D */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A88C 002677CC C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026A890 002677D0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A894 002677D4 4C 41 13 82 */ cror 2, 1, 2 +/* 8026A898 002677D8 40 82 00 0C */ bne lbl_8026A8A4 +/* 8026A89C 002677DC 38 60 00 01 */ li r3, 1 +/* 8026A8A0 002677E0 48 00 00 08 */ b lbl_8026A8A8 +lbl_8026A8A4: +/* 8026A8A4 002677E4 38 60 00 00 */ li r3, 0 +lbl_8026A8A8: +/* 8026A8A8 002677E8 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026A8AC 002677EC 48 0F 79 79 */ bl _restgpr_28 +/* 8026A8B0 002677F0 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026A8B4 002677F4 7C 08 03 A6 */ mtlr r0 +/* 8026A8B8 002677F8 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026A8BC 002677FC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026A8C0.s b/include/SComponent/c_m3d/asm/func_8026A8C0.s new file mode 100644 index 0000000000..b0a82ac8c9 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026A8C0.s @@ -0,0 +1,35 @@ +/* 8026A8C0 00267800 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026A8C4 00267804 7C 08 02 A6 */ mflr r0 +/* 8026A8C8 00267808 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026A8CC 0026780C 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026A8D0 00267810 48 0F 79 0D */ bl _savegpr_29 +/* 8026A8D4 00267814 7C 7D 1B 78 */ mr r29, r3 +/* 8026A8D8 00267818 7C 9E 23 78 */ mr r30, r4 +/* 8026A8DC 0026781C 7C BF 2B 78 */ mr r31, r5 +/* 8026A8E0 00267820 4B FF FA 05 */ bl cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vec +/* 8026A8E4 00267824 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026A8E8 00267828 41 82 00 40 */ beq lbl_8026A928 +/* 8026A8EC 0026782C C0 3E 00 00 */ lfs f1, 0(r30) +/* 8026A8F0 00267830 C0 1D 00 00 */ lfs f0, 0(r29) +/* 8026A8F4 00267834 FC 00 00 50 */ fneg f0, f0 +/* 8026A8F8 00267838 EC 41 00 32 */ fmuls f2, f1, f0 +/* 8026A8FC 0026783C C0 3E 00 08 */ lfs f1, 8(r30) +/* 8026A900 00267840 C0 1D 00 08 */ lfs f0, 8(r29) +/* 8026A904 00267844 EC 01 00 32 */ fmuls f0, f1, f0 +/* 8026A908 00267848 EC 22 00 28 */ fsubs f1, f2, f0 +/* 8026A90C 0026784C C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026A910 00267850 EC 21 00 28 */ fsubs f1, f1, f0 +/* 8026A914 00267854 C0 1D 00 04 */ lfs f0, 4(r29) +/* 8026A918 00267858 EC 01 00 24 */ fdivs f0, f1, f0 +/* 8026A91C 0026785C D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026A920 00267860 38 60 00 01 */ li r3, 1 +/* 8026A924 00267864 48 00 00 08 */ b lbl_8026A92C +lbl_8026A928: +/* 8026A928 00267868 38 60 00 00 */ li r3, 0 +lbl_8026A92C: +/* 8026A92C 0026786C 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026A930 00267870 48 0F 78 F9 */ bl _restgpr_29 +/* 8026A934 00267874 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026A938 00267878 7C 08 03 A6 */ mtlr r0 +/* 8026A93C 0026787C 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026A940 00267880 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026A944.s b/include/SComponent/c_m3d/asm/func_8026A944.s new file mode 100644 index 0000000000..64bf532e1d --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026A944.s @@ -0,0 +1,110 @@ +/* 8026A944 00267884 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 8026A948 00267888 7C 08 02 A6 */ mflr r0 +/* 8026A94C 0026788C 90 01 00 44 */ stw r0, 0x44(r1) +/* 8026A950 00267890 DB E1 00 30 */ stfd f31, 0x30(r1) +/* 8026A954 00267894 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 +/* 8026A958 00267898 DB C1 00 20 */ stfd f30, 0x20(r1) +/* 8026A95C 0026789C F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 +/* 8026A960 002678A0 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8026A964 002678A4 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8026A968 002678A8 7C 7E 1B 78 */ mr r30, r3 +/* 8026A96C 002678AC 7C 9F 23 78 */ mr r31, r4 +/* 8026A970 002678B0 FF C0 08 90 */ fmr f30, f1 +/* 8026A974 002678B4 C0 03 00 04 */ lfs f0, 4(r3) +/* 8026A978 002678B8 FC 00 02 10 */ fabs f0, f0 +/* 8026A97C 002678BC FC 20 00 18 */ frsp f1, f0 +/* 8026A980 002678C0 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026A984 002678C4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026A988 002678C8 40 80 00 0C */ bge lbl_8026A994 +/* 8026A98C 002678CC 38 60 00 00 */ li r3, 0 +/* 8026A990 002678D0 48 00 01 30 */ b lbl_8026AAC0 +lbl_8026A994: +/* 8026A994 002678D4 C0 02 B7 AC */ lfs f0, lbl_804551AC-_SDA2_BASE_(r2) +/* 8026A998 002678D8 D0 01 00 08 */ stfs f0, 8(r1) +/* 8026A99C 002678DC C0 3E 00 1C */ lfs f1, 0x1c(r30) +/* 8026A9A0 002678E0 C0 5E 00 14 */ lfs f2, 0x14(r30) +/* 8026A9A4 002678E4 C0 7E 00 28 */ lfs f3, 0x28(r30) +/* 8026A9A8 002678E8 C0 9E 00 20 */ lfs f4, 0x20(r30) +/* 8026A9AC 002678EC C0 BE 00 34 */ lfs f5, 0x34(r30) +/* 8026A9B0 002678F0 C0 DE 00 2C */ lfs f6, 0x2c(r30) +/* 8026A9B4 002678F4 C0 FF 00 08 */ lfs f7, 8(r31) +/* 8026A9B8 002678F8 C1 1F 00 00 */ lfs f8, 0(r31) +/* 8026A9BC 002678FC 4B FF F3 A9 */ bl cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff +/* 8026A9C0 00267900 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026A9C4 00267904 40 82 00 0C */ bne lbl_8026A9D0 +/* 8026A9C8 00267908 38 60 00 00 */ li r3, 0 +/* 8026A9CC 0026790C 48 00 00 F4 */ b lbl_8026AAC0 +lbl_8026A9D0: +/* 8026A9D0 00267910 C0 3E 00 1C */ lfs f1, 0x1c(r30) +/* 8026A9D4 00267914 C0 5E 00 14 */ lfs f2, 0x14(r30) +/* 8026A9D8 00267918 C0 7E 00 28 */ lfs f3, 0x28(r30) +/* 8026A9DC 0026791C C0 9E 00 20 */ lfs f4, 0x20(r30) +/* 8026A9E0 00267920 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026A9E4 00267924 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026A9E8 00267928 4B FF DE AD */ bl cM3d_VectorProduct2d__Fffffff +/* 8026A9EC 0026792C FF E0 08 90 */ fmr f31, f1 +/* 8026A9F0 00267930 FC 1F F0 40 */ fcmpo cr0, f31, f30 +/* 8026A9F4 00267934 4C 40 13 82 */ cror 2, 0, 2 +/* 8026A9F8 00267938 40 82 00 5C */ bne lbl_8026AA54 +/* 8026A9FC 0026793C C0 3E 00 28 */ lfs f1, 0x28(r30) +/* 8026AA00 00267940 C0 5E 00 20 */ lfs f2, 0x20(r30) +/* 8026AA04 00267944 C0 7E 00 34 */ lfs f3, 0x34(r30) +/* 8026AA08 00267948 C0 9E 00 2C */ lfs f4, 0x2c(r30) +/* 8026AA0C 0026794C C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026AA10 00267950 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026AA14 00267954 4B FF DE 81 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AA18 00267958 FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 8026AA1C 0026795C 4C 40 13 82 */ cror 2, 0, 2 +/* 8026AA20 00267960 40 82 00 34 */ bne lbl_8026AA54 +/* 8026AA24 00267964 C0 3E 00 34 */ lfs f1, 0x34(r30) +/* 8026AA28 00267968 C0 5E 00 2C */ lfs f2, 0x2c(r30) +/* 8026AA2C 0026796C C0 7E 00 1C */ lfs f3, 0x1c(r30) +/* 8026AA30 00267970 C0 9E 00 14 */ lfs f4, 0x14(r30) +/* 8026AA34 00267974 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026AA38 00267978 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026AA3C 0026797C 4B FF DE 59 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AA40 00267980 FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 8026AA44 00267984 4C 40 13 82 */ cror 2, 0, 2 +/* 8026AA48 00267988 40 82 00 0C */ bne lbl_8026AA54 +/* 8026AA4C 0026798C 38 60 00 01 */ li r3, 1 +/* 8026AA50 00267990 48 00 00 70 */ b lbl_8026AAC0 +lbl_8026AA54: +/* 8026AA54 00267994 FF C0 F0 50 */ fneg f30, f30 +/* 8026AA58 00267998 FC 1F F0 40 */ fcmpo cr0, f31, f30 +/* 8026AA5C 0026799C 4C 41 13 82 */ cror 2, 1, 2 +/* 8026AA60 002679A0 40 82 00 5C */ bne lbl_8026AABC +/* 8026AA64 002679A4 C0 3E 00 28 */ lfs f1, 0x28(r30) +/* 8026AA68 002679A8 C0 5E 00 20 */ lfs f2, 0x20(r30) +/* 8026AA6C 002679AC C0 7E 00 34 */ lfs f3, 0x34(r30) +/* 8026AA70 002679B0 C0 9E 00 2C */ lfs f4, 0x2c(r30) +/* 8026AA74 002679B4 C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026AA78 002679B8 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026AA7C 002679BC 4B FF DE 19 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AA80 002679C0 FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 8026AA84 002679C4 4C 41 13 82 */ cror 2, 1, 2 +/* 8026AA88 002679C8 40 82 00 34 */ bne lbl_8026AABC +/* 8026AA8C 002679CC C0 3E 00 34 */ lfs f1, 0x34(r30) +/* 8026AA90 002679D0 C0 5E 00 2C */ lfs f2, 0x2c(r30) +/* 8026AA94 002679D4 C0 7E 00 1C */ lfs f3, 0x1c(r30) +/* 8026AA98 002679D8 C0 9E 00 14 */ lfs f4, 0x14(r30) +/* 8026AA9C 002679DC C0 BF 00 08 */ lfs f5, 8(r31) +/* 8026AAA0 002679E0 C0 DF 00 00 */ lfs f6, 0(r31) +/* 8026AAA4 002679E4 4B FF DD F1 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AAA8 002679E8 FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 8026AAAC 002679EC 4C 41 13 82 */ cror 2, 1, 2 +/* 8026AAB0 002679F0 40 82 00 0C */ bne lbl_8026AABC +/* 8026AAB4 002679F4 38 60 00 01 */ li r3, 1 +/* 8026AAB8 002679F8 48 00 00 08 */ b lbl_8026AAC0 +lbl_8026AABC: +/* 8026AABC 002679FC 38 60 00 00 */ li r3, 0 +lbl_8026AAC0: +/* 8026AAC0 00267A00 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 +/* 8026AAC4 00267A04 CB E1 00 30 */ lfd f31, 0x30(r1) +/* 8026AAC8 00267A08 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 +/* 8026AACC 00267A0C CB C1 00 20 */ lfd f30, 0x20(r1) +/* 8026AAD0 00267A10 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026AAD4 00267A14 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8026AAD8 00267A18 80 01 00 44 */ lwz r0, 0x44(r1) +/* 8026AADC 00267A1C 7C 08 03 A6 */ mtlr r0 +/* 8026AAE0 00267A20 38 21 00 40 */ addi r1, r1, 0x40 +/* 8026AAE4 00267A24 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026AAE8.s b/include/SComponent/c_m3d/asm/func_8026AAE8.s new file mode 100644 index 0000000000..28ff44e6f2 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026AAE8.s @@ -0,0 +1,65 @@ +/* 8026AAE8 00267A28 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 8026AAEC 00267A2C 7C 08 02 A6 */ mflr r0 +/* 8026AAF0 00267A30 90 01 00 44 */ stw r0, 0x44(r1) +/* 8026AAF4 00267A34 DB E1 00 30 */ stfd f31, 0x30(r1) +/* 8026AAF8 00267A38 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 +/* 8026AAFC 00267A3C 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026AB00 00267A40 48 0F 76 D9 */ bl _savegpr_28 +/* 8026AB04 00267A44 7C 7C 1B 78 */ mr r28, r3 +/* 8026AB08 00267A48 7C 9D 23 78 */ mr r29, r4 +/* 8026AB0C 00267A4C 7C BE 2B 78 */ mr r30, r5 +/* 8026AB10 00267A50 7C DF 33 78 */ mr r31, r6 +/* 8026AB14 00267A54 C0 03 00 04 */ lfs f0, 4(r3) +/* 8026AB18 00267A58 FC 00 02 10 */ fabs f0, f0 +/* 8026AB1C 00267A5C FC 20 00 18 */ frsp f1, f0 +/* 8026AB20 00267A60 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026AB24 00267A64 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026AB28 00267A68 40 80 00 0C */ bge lbl_8026AB34 +/* 8026AB2C 00267A6C 38 60 00 00 */ li r3, 0 +/* 8026AB30 00267A70 48 00 00 88 */ b lbl_8026ABB8 +lbl_8026AB34: +/* 8026AB34 00267A74 C0 1D 00 00 */ lfs f0, 0(r29) +/* 8026AB38 00267A78 D0 01 00 08 */ stfs f0, 8(r1) +/* 8026AB3C 00267A7C C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026AB40 00267A80 D0 01 00 0C */ stfs f0, 0xc(r1) +/* 8026AB44 00267A84 C0 1D 00 08 */ lfs f0, 8(r29) +/* 8026AB48 00267A88 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 8026AB4C 00267A8C 38 81 00 08 */ addi r4, r1, 8 +/* 8026AB50 00267A90 48 0D C6 45 */ bl PSVECDotProduct +/* 8026AB54 00267A94 C0 1C 00 0C */ lfs f0, 0xc(r28) +/* 8026AB58 00267A98 EF E0 08 2A */ fadds f31, f0, f1 +/* 8026AB5C 00267A9C C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026AB60 00267AA0 D0 01 00 0C */ stfs f0, 0xc(r1) +/* 8026AB64 00267AA4 7F 83 E3 78 */ mr r3, r28 +/* 8026AB68 00267AA8 38 81 00 08 */ addi r4, r1, 8 +/* 8026AB6C 00267AAC 48 0D C6 29 */ bl PSVECDotProduct +/* 8026AB70 00267AB0 C0 1C 00 0C */ lfs f0, 0xc(r28) +/* 8026AB74 00267AB4 EC 20 08 2A */ fadds f1, f0, f1 +/* 8026AB78 00267AB8 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026AB7C 00267ABC FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026AB80 00267AC0 40 81 00 0C */ ble lbl_8026AB8C +/* 8026AB84 00267AC4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026AB88 00267AC8 41 81 00 18 */ bgt lbl_8026ABA0 +lbl_8026AB8C: +/* 8026AB8C 00267ACC C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026AB90 00267AD0 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026AB94 00267AD4 40 80 00 14 */ bge lbl_8026ABA8 +/* 8026AB98 00267AD8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026AB9C 00267ADC 40 80 00 0C */ bge lbl_8026ABA8 +lbl_8026ABA0: +/* 8026ABA0 00267AE0 38 60 00 00 */ li r3, 0 +/* 8026ABA4 00267AE4 48 00 00 14 */ b lbl_8026ABB8 +lbl_8026ABA8: +/* 8026ABA8 00267AE8 7F 83 E3 78 */ mr r3, r28 +/* 8026ABAC 00267AEC 7F A4 EB 78 */ mr r4, r29 +/* 8026ABB0 00267AF0 7F E5 FB 78 */ mr r5, r31 +/* 8026ABB4 00267AF4 4B FF FD 0D */ bl cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPf +lbl_8026ABB8: +/* 8026ABB8 00267AF8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 +/* 8026ABBC 00267AFC CB E1 00 30 */ lfd f31, 0x30(r1) +/* 8026ABC0 00267B00 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026ABC4 00267B04 48 0F 76 61 */ bl _restgpr_28 +/* 8026ABC8 00267B08 80 01 00 44 */ lwz r0, 0x44(r1) +/* 8026ABCC 00267B0C 7C 08 03 A6 */ mtlr r0 +/* 8026ABD0 00267B10 38 21 00 40 */ addi r1, r1, 0x40 +/* 8026ABD4 00267B14 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026ABD8.s b/include/SComponent/c_m3d/asm/func_8026ABD8.s new file mode 100644 index 0000000000..441d9085b5 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026ABD8.s @@ -0,0 +1,110 @@ +/* 8026ABD8 00267B18 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 8026ABDC 00267B1C 7C 08 02 A6 */ mflr r0 +/* 8026ABE0 00267B20 90 01 00 44 */ stw r0, 0x44(r1) +/* 8026ABE4 00267B24 DB E1 00 30 */ stfd f31, 0x30(r1) +/* 8026ABE8 00267B28 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 +/* 8026ABEC 00267B2C DB C1 00 20 */ stfd f30, 0x20(r1) +/* 8026ABF0 00267B30 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 +/* 8026ABF4 00267B34 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8026ABF8 00267B38 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8026ABFC 00267B3C 7C 7E 1B 78 */ mr r30, r3 +/* 8026AC00 00267B40 7C 9F 23 78 */ mr r31, r4 +/* 8026AC04 00267B44 FF C0 08 90 */ fmr f30, f1 +/* 8026AC08 00267B48 C0 03 00 08 */ lfs f0, 8(r3) +/* 8026AC0C 00267B4C FC 00 02 10 */ fabs f0, f0 +/* 8026AC10 00267B50 FC 20 00 18 */ frsp f1, f0 +/* 8026AC14 00267B54 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026AC18 00267B58 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026AC1C 00267B5C 40 80 00 0C */ bge lbl_8026AC28 +/* 8026AC20 00267B60 38 60 00 00 */ li r3, 0 +/* 8026AC24 00267B64 48 00 01 30 */ b lbl_8026AD54 +lbl_8026AC28: +/* 8026AC28 00267B68 C0 02 B7 AC */ lfs f0, lbl_804551AC-_SDA2_BASE_(r2) +/* 8026AC2C 00267B6C D0 01 00 08 */ stfs f0, 8(r1) +/* 8026AC30 00267B70 C0 3E 00 14 */ lfs f1, 0x14(r30) +/* 8026AC34 00267B74 C0 5E 00 18 */ lfs f2, 0x18(r30) +/* 8026AC38 00267B78 C0 7E 00 20 */ lfs f3, 0x20(r30) +/* 8026AC3C 00267B7C C0 9E 00 24 */ lfs f4, 0x24(r30) +/* 8026AC40 00267B80 C0 BE 00 2C */ lfs f5, 0x2c(r30) +/* 8026AC44 00267B84 C0 DE 00 30 */ lfs f6, 0x30(r30) +/* 8026AC48 00267B88 C0 FF 00 00 */ lfs f7, 0(r31) +/* 8026AC4C 00267B8C C1 1F 00 04 */ lfs f8, 4(r31) +/* 8026AC50 00267B90 4B FF F1 15 */ bl cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff +/* 8026AC54 00267B94 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026AC58 00267B98 40 82 00 0C */ bne lbl_8026AC64 +/* 8026AC5C 00267B9C 38 60 00 00 */ li r3, 0 +/* 8026AC60 00267BA0 48 00 00 F4 */ b lbl_8026AD54 +lbl_8026AC64: +/* 8026AC64 00267BA4 C0 3E 00 14 */ lfs f1, 0x14(r30) +/* 8026AC68 00267BA8 C0 5E 00 18 */ lfs f2, 0x18(r30) +/* 8026AC6C 00267BAC C0 7E 00 20 */ lfs f3, 0x20(r30) +/* 8026AC70 00267BB0 C0 9E 00 24 */ lfs f4, 0x24(r30) +/* 8026AC74 00267BB4 C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026AC78 00267BB8 C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026AC7C 00267BBC 4B FF DC 19 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AC80 00267BC0 FF E0 08 90 */ fmr f31, f1 +/* 8026AC84 00267BC4 FC 1F F0 40 */ fcmpo cr0, f31, f30 +/* 8026AC88 00267BC8 4C 40 13 82 */ cror 2, 0, 2 +/* 8026AC8C 00267BCC 40 82 00 5C */ bne lbl_8026ACE8 +/* 8026AC90 00267BD0 C0 3E 00 20 */ lfs f1, 0x20(r30) +/* 8026AC94 00267BD4 C0 5E 00 24 */ lfs f2, 0x24(r30) +/* 8026AC98 00267BD8 C0 7E 00 2C */ lfs f3, 0x2c(r30) +/* 8026AC9C 00267BDC C0 9E 00 30 */ lfs f4, 0x30(r30) +/* 8026ACA0 00267BE0 C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026ACA4 00267BE4 C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026ACA8 00267BE8 4B FF DB ED */ bl cM3d_VectorProduct2d__Fffffff +/* 8026ACAC 00267BEC FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 8026ACB0 00267BF0 4C 40 13 82 */ cror 2, 0, 2 +/* 8026ACB4 00267BF4 40 82 00 34 */ bne lbl_8026ACE8 +/* 8026ACB8 00267BF8 C0 3E 00 2C */ lfs f1, 0x2c(r30) +/* 8026ACBC 00267BFC C0 5E 00 30 */ lfs f2, 0x30(r30) +/* 8026ACC0 00267C00 C0 7E 00 14 */ lfs f3, 0x14(r30) +/* 8026ACC4 00267C04 C0 9E 00 18 */ lfs f4, 0x18(r30) +/* 8026ACC8 00267C08 C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026ACCC 00267C0C C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026ACD0 00267C10 4B FF DB C5 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026ACD4 00267C14 FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 8026ACD8 00267C18 4C 40 13 82 */ cror 2, 0, 2 +/* 8026ACDC 00267C1C 40 82 00 0C */ bne lbl_8026ACE8 +/* 8026ACE0 00267C20 38 60 00 01 */ li r3, 1 +/* 8026ACE4 00267C24 48 00 00 70 */ b lbl_8026AD54 +lbl_8026ACE8: +/* 8026ACE8 00267C28 FF C0 F0 50 */ fneg f30, f30 +/* 8026ACEC 00267C2C FC 1F F0 40 */ fcmpo cr0, f31, f30 +/* 8026ACF0 00267C30 4C 41 13 82 */ cror 2, 1, 2 +/* 8026ACF4 00267C34 40 82 00 5C */ bne lbl_8026AD50 +/* 8026ACF8 00267C38 C0 3E 00 20 */ lfs f1, 0x20(r30) +/* 8026ACFC 00267C3C C0 5E 00 24 */ lfs f2, 0x24(r30) +/* 8026AD00 00267C40 C0 7E 00 2C */ lfs f3, 0x2c(r30) +/* 8026AD04 00267C44 C0 9E 00 30 */ lfs f4, 0x30(r30) +/* 8026AD08 00267C48 C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026AD0C 00267C4C C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026AD10 00267C50 4B FF DB 85 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AD14 00267C54 FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 8026AD18 00267C58 4C 41 13 82 */ cror 2, 1, 2 +/* 8026AD1C 00267C5C 40 82 00 34 */ bne lbl_8026AD50 +/* 8026AD20 00267C60 C0 3E 00 2C */ lfs f1, 0x2c(r30) +/* 8026AD24 00267C64 C0 5E 00 30 */ lfs f2, 0x30(r30) +/* 8026AD28 00267C68 C0 7E 00 14 */ lfs f3, 0x14(r30) +/* 8026AD2C 00267C6C C0 9E 00 18 */ lfs f4, 0x18(r30) +/* 8026AD30 00267C70 C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026AD34 00267C74 C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026AD38 00267C78 4B FF DB 5D */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AD3C 00267C7C FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 8026AD40 00267C80 4C 41 13 82 */ cror 2, 1, 2 +/* 8026AD44 00267C84 40 82 00 0C */ bne lbl_8026AD50 +/* 8026AD48 00267C88 38 60 00 01 */ li r3, 1 +/* 8026AD4C 00267C8C 48 00 00 08 */ b lbl_8026AD54 +lbl_8026AD50: +/* 8026AD50 00267C90 38 60 00 00 */ li r3, 0 +lbl_8026AD54: +/* 8026AD54 00267C94 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 +/* 8026AD58 00267C98 CB E1 00 30 */ lfd f31, 0x30(r1) +/* 8026AD5C 00267C9C E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 +/* 8026AD60 00267CA0 CB C1 00 20 */ lfd f30, 0x20(r1) +/* 8026AD64 00267CA4 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026AD68 00267CA8 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8026AD6C 00267CAC 80 01 00 44 */ lwz r0, 0x44(r1) +/* 8026AD70 00267CB0 7C 08 03 A6 */ mtlr r0 +/* 8026AD74 00267CB4 38 21 00 40 */ addi r1, r1, 0x40 +/* 8026AD78 00267CB8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026AD7C.s b/include/SComponent/c_m3d/asm/func_8026AD7C.s new file mode 100644 index 0000000000..7513d7727d --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026AD7C.s @@ -0,0 +1,110 @@ +/* 8026AD7C 00267CBC 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026AD80 00267CC0 7C 08 02 A6 */ mflr r0 +/* 8026AD84 00267CC4 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026AD88 00267CC8 DB E1 00 20 */ stfd f31, 0x20(r1) +/* 8026AD8C 00267CCC F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 +/* 8026AD90 00267CD0 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8026AD94 00267CD4 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8026AD98 00267CD8 7C 7E 1B 78 */ mr r30, r3 +/* 8026AD9C 00267CDC 7C 9F 23 78 */ mr r31, r4 +/* 8026ADA0 00267CE0 C0 03 00 08 */ lfs f0, 8(r3) +/* 8026ADA4 00267CE4 FC 00 02 10 */ fabs f0, f0 +/* 8026ADA8 00267CE8 FC 20 00 18 */ frsp f1, f0 +/* 8026ADAC 00267CEC C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026ADB0 00267CF0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026ADB4 00267CF4 40 80 00 0C */ bge lbl_8026ADC0 +/* 8026ADB8 00267CF8 38 60 00 00 */ li r3, 0 +/* 8026ADBC 00267CFC 48 00 01 44 */ b lbl_8026AF00 +lbl_8026ADC0: +/* 8026ADC0 00267D00 C0 02 B7 AC */ lfs f0, lbl_804551AC-_SDA2_BASE_(r2) +/* 8026ADC4 00267D04 D0 01 00 08 */ stfs f0, 8(r1) +/* 8026ADC8 00267D08 C0 3E 00 14 */ lfs f1, 0x14(r30) +/* 8026ADCC 00267D0C C0 5E 00 18 */ lfs f2, 0x18(r30) +/* 8026ADD0 00267D10 C0 7E 00 20 */ lfs f3, 0x20(r30) +/* 8026ADD4 00267D14 C0 9E 00 24 */ lfs f4, 0x24(r30) +/* 8026ADD8 00267D18 C0 BE 00 2C */ lfs f5, 0x2c(r30) +/* 8026ADDC 00267D1C C0 DE 00 30 */ lfs f6, 0x30(r30) +/* 8026ADE0 00267D20 C0 FF 00 00 */ lfs f7, 0(r31) +/* 8026ADE4 00267D24 C1 1F 00 04 */ lfs f8, 4(r31) +/* 8026ADE8 00267D28 4B FF EF 7D */ bl cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff +/* 8026ADEC 00267D2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026ADF0 00267D30 40 82 00 0C */ bne lbl_8026ADFC +/* 8026ADF4 00267D34 38 60 00 00 */ li r3, 0 +/* 8026ADF8 00267D38 48 00 01 08 */ b lbl_8026AF00 +lbl_8026ADFC: +/* 8026ADFC 00267D3C C0 3E 00 14 */ lfs f1, 0x14(r30) +/* 8026AE00 00267D40 C0 5E 00 18 */ lfs f2, 0x18(r30) +/* 8026AE04 00267D44 C0 7E 00 20 */ lfs f3, 0x20(r30) +/* 8026AE08 00267D48 C0 9E 00 24 */ lfs f4, 0x24(r30) +/* 8026AE0C 00267D4C C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026AE10 00267D50 C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026AE14 00267D54 4B FF DA 81 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AE18 00267D58 FF E0 08 90 */ fmr f31, f1 +/* 8026AE1C 00267D5C C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026AE20 00267D60 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026AE24 00267D64 4C 40 13 82 */ cror 2, 0, 2 +/* 8026AE28 00267D68 40 82 00 64 */ bne lbl_8026AE8C +/* 8026AE2C 00267D6C C0 3E 00 20 */ lfs f1, 0x20(r30) +/* 8026AE30 00267D70 C0 5E 00 24 */ lfs f2, 0x24(r30) +/* 8026AE34 00267D74 C0 7E 00 2C */ lfs f3, 0x2c(r30) +/* 8026AE38 00267D78 C0 9E 00 30 */ lfs f4, 0x30(r30) +/* 8026AE3C 00267D7C C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026AE40 00267D80 C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026AE44 00267D84 4B FF DA 51 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AE48 00267D88 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026AE4C 00267D8C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026AE50 00267D90 4C 40 13 82 */ cror 2, 0, 2 +/* 8026AE54 00267D94 40 82 00 38 */ bne lbl_8026AE8C +/* 8026AE58 00267D98 C0 3E 00 2C */ lfs f1, 0x2c(r30) +/* 8026AE5C 00267D9C C0 5E 00 30 */ lfs f2, 0x30(r30) +/* 8026AE60 00267DA0 C0 7E 00 14 */ lfs f3, 0x14(r30) +/* 8026AE64 00267DA4 C0 9E 00 18 */ lfs f4, 0x18(r30) +/* 8026AE68 00267DA8 C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026AE6C 00267DAC C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026AE70 00267DB0 4B FF DA 25 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AE74 00267DB4 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026AE78 00267DB8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026AE7C 00267DBC 4C 40 13 82 */ cror 2, 0, 2 +/* 8026AE80 00267DC0 40 82 00 0C */ bne lbl_8026AE8C +/* 8026AE84 00267DC4 38 60 00 01 */ li r3, 1 +/* 8026AE88 00267DC8 48 00 00 78 */ b lbl_8026AF00 +lbl_8026AE8C: +/* 8026AE8C 00267DCC C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026AE90 00267DD0 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026AE94 00267DD4 4C 41 13 82 */ cror 2, 1, 2 +/* 8026AE98 00267DD8 40 82 00 64 */ bne lbl_8026AEFC +/* 8026AE9C 00267DDC C0 3E 00 20 */ lfs f1, 0x20(r30) +/* 8026AEA0 00267DE0 C0 5E 00 24 */ lfs f2, 0x24(r30) +/* 8026AEA4 00267DE4 C0 7E 00 2C */ lfs f3, 0x2c(r30) +/* 8026AEA8 00267DE8 C0 9E 00 30 */ lfs f4, 0x30(r30) +/* 8026AEAC 00267DEC C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026AEB0 00267DF0 C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026AEB4 00267DF4 4B FF D9 E1 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AEB8 00267DF8 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026AEBC 00267DFC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026AEC0 00267E00 4C 41 13 82 */ cror 2, 1, 2 +/* 8026AEC4 00267E04 40 82 00 38 */ bne lbl_8026AEFC +/* 8026AEC8 00267E08 C0 3E 00 2C */ lfs f1, 0x2c(r30) +/* 8026AECC 00267E0C C0 5E 00 30 */ lfs f2, 0x30(r30) +/* 8026AED0 00267E10 C0 7E 00 14 */ lfs f3, 0x14(r30) +/* 8026AED4 00267E14 C0 9E 00 18 */ lfs f4, 0x18(r30) +/* 8026AED8 00267E18 C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026AEDC 00267E1C C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026AEE0 00267E20 4B FF D9 B5 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AEE4 00267E24 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026AEE8 00267E28 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026AEEC 00267E2C 4C 41 13 82 */ cror 2, 1, 2 +/* 8026AEF0 00267E30 40 82 00 0C */ bne lbl_8026AEFC +/* 8026AEF4 00267E34 38 60 00 01 */ li r3, 1 +/* 8026AEF8 00267E38 48 00 00 08 */ b lbl_8026AF00 +lbl_8026AEFC: +/* 8026AEFC 00267E3C 38 60 00 00 */ li r3, 0 +lbl_8026AF00: +/* 8026AF00 00267E40 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 +/* 8026AF04 00267E44 CB E1 00 20 */ lfd f31, 0x20(r1) +/* 8026AF08 00267E48 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026AF0C 00267E4C 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8026AF10 00267E50 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026AF14 00267E54 7C 08 03 A6 */ mtlr r0 +/* 8026AF18 00267E58 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026AF1C 00267E5C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026AF20.s b/include/SComponent/c_m3d/asm/func_8026AF20.s new file mode 100644 index 0000000000..a3eed6d81e --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026AF20.s @@ -0,0 +1,101 @@ +/* 8026AF20 00267E60 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026AF24 00267E64 7C 08 02 A6 */ mflr r0 +/* 8026AF28 00267E68 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026AF2C 00267E6C DB E1 00 20 */ stfd f31, 0x20(r1) +/* 8026AF30 00267E70 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 +/* 8026AF34 00267E74 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8026AF38 00267E78 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8026AF3C 00267E7C 7C 7E 1B 78 */ mr r30, r3 +/* 8026AF40 00267E80 7C 9F 23 78 */ mr r31, r4 +/* 8026AF44 00267E84 C0 02 B7 AC */ lfs f0, lbl_804551AC-_SDA2_BASE_(r2) +/* 8026AF48 00267E88 D0 01 00 08 */ stfs f0, 8(r1) +/* 8026AF4C 00267E8C C0 23 00 14 */ lfs f1, 0x14(r3) +/* 8026AF50 00267E90 C0 43 00 18 */ lfs f2, 0x18(r3) +/* 8026AF54 00267E94 C0 63 00 20 */ lfs f3, 0x20(r3) +/* 8026AF58 00267E98 C0 83 00 24 */ lfs f4, 0x24(r3) +/* 8026AF5C 00267E9C C0 A3 00 2C */ lfs f5, 0x2c(r3) +/* 8026AF60 00267EA0 C0 C3 00 30 */ lfs f6, 0x30(r3) +/* 8026AF64 00267EA4 C0 E4 00 00 */ lfs f7, 0(r4) +/* 8026AF68 00267EA8 C1 04 00 04 */ lfs f8, 4(r4) +/* 8026AF6C 00267EAC 4B FF ED F9 */ bl cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff +/* 8026AF70 00267EB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026AF74 00267EB4 40 82 00 0C */ bne lbl_8026AF80 +/* 8026AF78 00267EB8 38 60 00 00 */ li r3, 0 +/* 8026AF7C 00267EBC 48 00 01 08 */ b lbl_8026B084 +lbl_8026AF80: +/* 8026AF80 00267EC0 C0 3E 00 14 */ lfs f1, 0x14(r30) +/* 8026AF84 00267EC4 C0 5E 00 18 */ lfs f2, 0x18(r30) +/* 8026AF88 00267EC8 C0 7E 00 20 */ lfs f3, 0x20(r30) +/* 8026AF8C 00267ECC C0 9E 00 24 */ lfs f4, 0x24(r30) +/* 8026AF90 00267ED0 C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026AF94 00267ED4 C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026AF98 00267ED8 4B FF D8 FD */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AF9C 00267EDC FF E0 08 90 */ fmr f31, f1 +/* 8026AFA0 00267EE0 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026AFA4 00267EE4 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026AFA8 00267EE8 4C 40 13 82 */ cror 2, 0, 2 +/* 8026AFAC 00267EEC 40 82 00 64 */ bne lbl_8026B010 +/* 8026AFB0 00267EF0 C0 3E 00 20 */ lfs f1, 0x20(r30) +/* 8026AFB4 00267EF4 C0 5E 00 24 */ lfs f2, 0x24(r30) +/* 8026AFB8 00267EF8 C0 7E 00 2C */ lfs f3, 0x2c(r30) +/* 8026AFBC 00267EFC C0 9E 00 30 */ lfs f4, 0x30(r30) +/* 8026AFC0 00267F00 C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026AFC4 00267F04 C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026AFC8 00267F08 4B FF D8 CD */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AFCC 00267F0C C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026AFD0 00267F10 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026AFD4 00267F14 4C 40 13 82 */ cror 2, 0, 2 +/* 8026AFD8 00267F18 40 82 00 38 */ bne lbl_8026B010 +/* 8026AFDC 00267F1C C0 3E 00 2C */ lfs f1, 0x2c(r30) +/* 8026AFE0 00267F20 C0 5E 00 30 */ lfs f2, 0x30(r30) +/* 8026AFE4 00267F24 C0 7E 00 14 */ lfs f3, 0x14(r30) +/* 8026AFE8 00267F28 C0 9E 00 18 */ lfs f4, 0x18(r30) +/* 8026AFEC 00267F2C C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026AFF0 00267F30 C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026AFF4 00267F34 4B FF D8 A1 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026AFF8 00267F38 C0 02 B7 B0 */ lfs f0, lbl_804551B0-_SDA2_BASE_(r2) +/* 8026AFFC 00267F3C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B000 00267F40 4C 40 13 82 */ cror 2, 0, 2 +/* 8026B004 00267F44 40 82 00 0C */ bne lbl_8026B010 +/* 8026B008 00267F48 38 60 00 01 */ li r3, 1 +/* 8026B00C 00267F4C 48 00 00 78 */ b lbl_8026B084 +lbl_8026B010: +/* 8026B010 00267F50 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026B014 00267F54 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026B018 00267F58 4C 41 13 82 */ cror 2, 1, 2 +/* 8026B01C 00267F5C 40 82 00 64 */ bne lbl_8026B080 +/* 8026B020 00267F60 C0 3E 00 20 */ lfs f1, 0x20(r30) +/* 8026B024 00267F64 C0 5E 00 24 */ lfs f2, 0x24(r30) +/* 8026B028 00267F68 C0 7E 00 2C */ lfs f3, 0x2c(r30) +/* 8026B02C 00267F6C C0 9E 00 30 */ lfs f4, 0x30(r30) +/* 8026B030 00267F70 C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026B034 00267F74 C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026B038 00267F78 4B FF D8 5D */ bl cM3d_VectorProduct2d__Fffffff +/* 8026B03C 00267F7C C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026B040 00267F80 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B044 00267F84 4C 41 13 82 */ cror 2, 1, 2 +/* 8026B048 00267F88 40 82 00 38 */ bne lbl_8026B080 +/* 8026B04C 00267F8C C0 3E 00 2C */ lfs f1, 0x2c(r30) +/* 8026B050 00267F90 C0 5E 00 30 */ lfs f2, 0x30(r30) +/* 8026B054 00267F94 C0 7E 00 14 */ lfs f3, 0x14(r30) +/* 8026B058 00267F98 C0 9E 00 18 */ lfs f4, 0x18(r30) +/* 8026B05C 00267F9C C0 BF 00 00 */ lfs f5, 0(r31) +/* 8026B060 00267FA0 C0 DF 00 04 */ lfs f6, 4(r31) +/* 8026B064 00267FA4 4B FF D8 31 */ bl cM3d_VectorProduct2d__Fffffff +/* 8026B068 00267FA8 C0 02 B7 B4 */ lfs f0, lbl_804551B4-_SDA2_BASE_(r2) +/* 8026B06C 00267FAC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B070 00267FB0 4C 41 13 82 */ cror 2, 1, 2 +/* 8026B074 00267FB4 40 82 00 0C */ bne lbl_8026B080 +/* 8026B078 00267FB8 38 60 00 01 */ li r3, 1 +/* 8026B07C 00267FBC 48 00 00 08 */ b lbl_8026B084 +lbl_8026B080: +/* 8026B080 00267FC0 38 60 00 00 */ li r3, 0 +lbl_8026B084: +/* 8026B084 00267FC4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 +/* 8026B088 00267FC8 CB E1 00 20 */ lfd f31, 0x20(r1) +/* 8026B08C 00267FCC 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026B090 00267FD0 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8026B094 00267FD4 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026B098 00267FD8 7C 08 03 A6 */ mtlr r0 +/* 8026B09C 00267FDC 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026B0A0 00267FE0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026B0A4.s b/include/SComponent/c_m3d/asm/func_8026B0A4.s new file mode 100644 index 0000000000..c162134182 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026B0A4.s @@ -0,0 +1,60 @@ +/* 8026B0A4 00267FE4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026B0A8 00267FE8 7C 08 02 A6 */ mflr r0 +/* 8026B0AC 00267FEC 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026B0B0 00267FF0 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026B0B4 00267FF4 93 C1 00 08 */ stw r30, 8(r1) +/* 8026B0B8 00267FF8 7C 9E 23 78 */ mr r30, r4 +/* 8026B0BC 00267FFC 7C BF 2B 78 */ mr r31, r5 +/* 8026B0C0 00268000 4B FF DE 75 */ bl cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb +/* 8026B0C4 00268004 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026B0C8 00268008 40 82 00 0C */ bne lbl_8026B0D4 +/* 8026B0CC 0026800C 38 60 00 00 */ li r3, 0 +/* 8026B0D0 00268010 48 00 00 94 */ b lbl_8026B164 +lbl_8026B0D4: +/* 8026B0D4 00268014 C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026B0D8 00268018 FC 00 02 10 */ fabs f0, f0 +/* 8026B0DC 0026801C FC 20 00 18 */ frsp f1, f0 +/* 8026B0E0 00268020 C0 02 B7 B8 */ lfs f0, lbl_804551B8-_SDA2_BASE_(r2) +/* 8026B0E4 00268024 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B0E8 00268028 41 80 00 18 */ blt lbl_8026B100 +/* 8026B0EC 0026802C 7F C3 F3 78 */ mr r3, r30 +/* 8026B0F0 00268030 7F E4 FB 78 */ mr r4, r31 +/* 8026B0F4 00268034 4B FF F0 6D */ bl cM3d_CrossX_LinTri_proc__FPC8cM3dGTriPC3Vec +/* 8026B0F8 00268038 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026B0FC 0026803C 41 82 00 64 */ beq lbl_8026B160 +lbl_8026B100: +/* 8026B100 00268040 C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026B104 00268044 FC 00 02 10 */ fabs f0, f0 +/* 8026B108 00268048 FC 20 00 18 */ frsp f1, f0 +/* 8026B10C 0026804C C0 02 B7 B8 */ lfs f0, lbl_804551B8-_SDA2_BASE_(r2) +/* 8026B110 00268050 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B114 00268054 41 80 00 18 */ blt lbl_8026B12C +/* 8026B118 00268058 7F C3 F3 78 */ mr r3, r30 +/* 8026B11C 0026805C 7F E4 FB 78 */ mr r4, r31 +/* 8026B120 00268060 4B FF F3 69 */ bl cM3d_CrossY_LinTri_proc__FPC8cM3dGTriPC3Vec +/* 8026B124 00268064 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026B128 00268068 41 82 00 38 */ beq lbl_8026B160 +lbl_8026B12C: +/* 8026B12C 0026806C C0 1E 00 08 */ lfs f0, 8(r30) +/* 8026B130 00268070 FC 00 02 10 */ fabs f0, f0 +/* 8026B134 00268074 FC 20 00 18 */ frsp f1, f0 +/* 8026B138 00268078 C0 02 B7 B8 */ lfs f0, lbl_804551B8-_SDA2_BASE_(r2) +/* 8026B13C 0026807C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B140 00268080 41 80 00 18 */ blt lbl_8026B158 +/* 8026B144 00268084 7F C3 F3 78 */ mr r3, r30 +/* 8026B148 00268088 7F E4 FB 78 */ mr r4, r31 +/* 8026B14C 0026808C 4B FF FD D5 */ bl cM3d_CrossZ_LinTri_proc__FPC8cM3dGTriPC3Vec +/* 8026B150 00268090 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026B154 00268094 41 82 00 0C */ beq lbl_8026B160 +lbl_8026B158: +/* 8026B158 00268098 38 60 00 01 */ li r3, 1 +/* 8026B15C 0026809C 48 00 00 08 */ b lbl_8026B164 +lbl_8026B160: +/* 8026B160 002680A0 38 60 00 00 */ li r3, 0 +lbl_8026B164: +/* 8026B164 002680A4 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026B168 002680A8 83 C1 00 08 */ lwz r30, 8(r1) +/* 8026B16C 002680AC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026B170 002680B0 7C 08 03 A6 */ mtlr r0 +/* 8026B174 002680B4 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026B178 002680B8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026B17C.s b/include/SComponent/c_m3d/asm/func_8026B17C.s new file mode 100644 index 0000000000..789957aa8d --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026B17C.s @@ -0,0 +1,52 @@ +/* 8026B17C 002680BC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026B180 002680C0 7C 08 02 A6 */ mflr r0 +/* 8026B184 002680C4 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026B188 002680C8 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026B18C 002680CC 93 C1 00 08 */ stw r30, 8(r1) +/* 8026B190 002680D0 7C 7E 1B 78 */ mr r30, r3 +/* 8026B194 002680D4 7C 9F 23 78 */ mr r31, r4 +/* 8026B198 002680D8 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026B19C 002680DC FC 00 02 10 */ fabs f0, f0 +/* 8026B1A0 002680E0 FC 20 00 18 */ frsp f1, f0 +/* 8026B1A4 002680E4 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026B1A8 002680E8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B1AC 002680EC 41 80 00 10 */ blt lbl_8026B1BC +/* 8026B1B0 002680F0 4B FF EE 0D */ bl cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vec +/* 8026B1B4 002680F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026B1B8 002680F8 41 82 00 64 */ beq lbl_8026B21C +lbl_8026B1BC: +/* 8026B1BC 002680FC C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026B1C0 00268100 FC 00 02 10 */ fabs f0, f0 +/* 8026B1C4 00268104 FC 20 00 18 */ frsp f1, f0 +/* 8026B1C8 00268108 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026B1CC 0026810C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B1D0 00268110 41 80 00 18 */ blt lbl_8026B1E8 +/* 8026B1D4 00268114 7F C3 F3 78 */ mr r3, r30 +/* 8026B1D8 00268118 7F E4 FB 78 */ mr r4, r31 +/* 8026B1DC 0026811C 4B FF F1 09 */ bl cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vec +/* 8026B1E0 00268120 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026B1E4 00268124 41 82 00 38 */ beq lbl_8026B21C +lbl_8026B1E8: +/* 8026B1E8 00268128 C0 1E 00 08 */ lfs f0, 8(r30) +/* 8026B1EC 0026812C FC 00 02 10 */ fabs f0, f0 +/* 8026B1F0 00268130 FC 20 00 18 */ frsp f1, f0 +/* 8026B1F4 00268134 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026B1F8 00268138 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B1FC 0026813C 41 80 00 18 */ blt lbl_8026B214 +/* 8026B200 00268140 7F C3 F3 78 */ mr r3, r30 +/* 8026B204 00268144 7F E4 FB 78 */ mr r4, r31 +/* 8026B208 00268148 4B FF FB 75 */ bl cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vec +/* 8026B20C 0026814C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026B210 00268150 41 82 00 0C */ beq lbl_8026B21C +lbl_8026B214: +/* 8026B214 00268154 38 60 00 01 */ li r3, 1 +/* 8026B218 00268158 48 00 00 08 */ b lbl_8026B220 +lbl_8026B21C: +/* 8026B21C 0026815C 38 60 00 00 */ li r3, 0 +lbl_8026B220: +/* 8026B220 00268160 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026B224 00268164 83 C1 00 08 */ lwz r30, 8(r1) +/* 8026B228 00268168 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026B22C 0026816C 7C 08 03 A6 */ mtlr r0 +/* 8026B230 00268170 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026B234 00268174 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026B238.s b/include/SComponent/c_m3d/asm/func_8026B238.s new file mode 100644 index 0000000000..ea21dd1046 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026B238.s @@ -0,0 +1,18 @@ +/* 8026B238 00268178 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026B23C 0026817C 7C 08 02 A6 */ mflr r0 +/* 8026B240 00268180 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026B244 00268184 DB E1 00 10 */ stfd f31, 0x10(r1) +/* 8026B248 00268188 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 +/* 8026B24C 0026818C C3 E3 00 0C */ lfs f31, 0xc(r3) +/* 8026B250 00268190 48 0D C1 4D */ bl PSVECSquareDistance +/* 8026B254 00268194 EC 1F 07 F2 */ fmuls f0, f31, f31 +/* 8026B258 00268198 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B25C 0026819C 4C 40 13 82 */ cror 2, 0, 2 +/* 8026B260 002681A0 7C 00 00 26 */ mfcr r0 +/* 8026B264 002681A4 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f +/* 8026B268 002681A8 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 +/* 8026B26C 002681AC CB E1 00 10 */ lfd f31, 0x10(r1) +/* 8026B270 002681B0 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026B274 002681B4 7C 08 03 A6 */ mtlr r0 +/* 8026B278 002681B8 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026B27C 002681BC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026B280.s b/include/SComponent/c_m3d/asm/func_8026B280.s new file mode 100644 index 0000000000..afd7d76531 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026B280.s @@ -0,0 +1,166 @@ +/* 8026B280 002681C0 94 21 FF B0 */ stwu r1, -0x50(r1) +/* 8026B284 002681C4 7C 08 02 A6 */ mflr r0 +/* 8026B288 002681C8 90 01 00 54 */ stw r0, 0x54(r1) +/* 8026B28C 002681CC DB E1 00 40 */ stfd f31, 0x40(r1) +/* 8026B290 002681D0 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 +/* 8026B294 002681D4 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026B298 002681D8 48 0F 6F 45 */ bl _savegpr_29 +/* 8026B29C 002681DC 7C 7D 1B 78 */ mr r29, r3 +/* 8026B2A0 002681E0 7C 9F 23 78 */ mr r31, r4 +/* 8026B2A4 002681E4 7C BE 2B 78 */ mr r30, r5 +/* 8026B2A8 002681E8 C0 44 00 00 */ lfs f2, 0(r4) +/* 8026B2AC 002681EC C0 24 00 0C */ lfs f1, 0xc(r4) +/* 8026B2B0 002681F0 EC 82 08 2A */ fadds f4, f2, f1 +/* 8026B2B4 002681F4 C0 63 00 00 */ lfs f3, 0(r3) +/* 8026B2B8 002681F8 FC 04 18 40 */ fcmpo cr0, f4, f3 +/* 8026B2BC 002681FC 40 80 00 18 */ bge lbl_8026B2D4 +/* 8026B2C0 00268200 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026B2C4 00268204 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 8026B2C8 00268208 40 80 00 0C */ bge lbl_8026B2D4 +/* 8026B2CC 0026820C 38 60 00 00 */ li r3, 0 +/* 8026B2D0 00268210 48 00 01 F8 */ b lbl_8026B4C8 +lbl_8026B2D4: +/* 8026B2D4 00268214 EC 42 08 28 */ fsubs f2, f2, f1 +/* 8026B2D8 00268218 FC 02 18 40 */ fcmpo cr0, f2, f3 +/* 8026B2DC 0026821C 40 81 00 18 */ ble lbl_8026B2F4 +/* 8026B2E0 00268220 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026B2E4 00268224 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026B2E8 00268228 40 81 00 0C */ ble lbl_8026B2F4 +/* 8026B2EC 0026822C 38 60 00 00 */ li r3, 0 +/* 8026B2F0 00268230 48 00 01 D8 */ b lbl_8026B4C8 +lbl_8026B2F4: +/* 8026B2F4 00268234 C0 5F 00 04 */ lfs f2, 4(r31) +/* 8026B2F8 00268238 EC 82 08 2A */ fadds f4, f2, f1 +/* 8026B2FC 0026823C C0 7D 00 04 */ lfs f3, 4(r29) +/* 8026B300 00268240 FC 04 18 40 */ fcmpo cr0, f4, f3 +/* 8026B304 00268244 40 80 00 18 */ bge lbl_8026B31C +/* 8026B308 00268248 C0 1D 00 10 */ lfs f0, 0x10(r29) +/* 8026B30C 0026824C FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 8026B310 00268250 40 80 00 0C */ bge lbl_8026B31C +/* 8026B314 00268254 38 60 00 00 */ li r3, 0 +/* 8026B318 00268258 48 00 01 B0 */ b lbl_8026B4C8 +lbl_8026B31C: +/* 8026B31C 0026825C EC 42 08 28 */ fsubs f2, f2, f1 +/* 8026B320 00268260 FC 02 18 40 */ fcmpo cr0, f2, f3 +/* 8026B324 00268264 40 81 00 18 */ ble lbl_8026B33C +/* 8026B328 00268268 C0 1D 00 10 */ lfs f0, 0x10(r29) +/* 8026B32C 0026826C FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026B330 00268270 40 81 00 0C */ ble lbl_8026B33C +/* 8026B334 00268274 38 60 00 00 */ li r3, 0 +/* 8026B338 00268278 48 00 01 90 */ b lbl_8026B4C8 +lbl_8026B33C: +/* 8026B33C 0026827C C0 5F 00 08 */ lfs f2, 8(r31) +/* 8026B340 00268280 EC 82 08 2A */ fadds f4, f2, f1 +/* 8026B344 00268284 C0 7D 00 08 */ lfs f3, 8(r29) +/* 8026B348 00268288 FC 04 18 40 */ fcmpo cr0, f4, f3 +/* 8026B34C 0026828C 40 80 00 18 */ bge lbl_8026B364 +/* 8026B350 00268290 C0 1D 00 14 */ lfs f0, 0x14(r29) +/* 8026B354 00268294 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 8026B358 00268298 40 80 00 0C */ bge lbl_8026B364 +/* 8026B35C 0026829C 38 60 00 00 */ li r3, 0 +/* 8026B360 002682A0 48 00 01 68 */ b lbl_8026B4C8 +lbl_8026B364: +/* 8026B364 002682A4 EC 22 08 28 */ fsubs f1, f2, f1 +/* 8026B368 002682A8 FC 01 18 40 */ fcmpo cr0, f1, f3 +/* 8026B36C 002682AC 40 81 00 18 */ ble lbl_8026B384 +/* 8026B370 002682B0 C0 1D 00 14 */ lfs f0, 0x14(r29) +/* 8026B374 002682B4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B378 002682B8 40 81 00 0C */ ble lbl_8026B384 +/* 8026B37C 002682BC 38 60 00 00 */ li r3, 0 +/* 8026B380 002682C0 48 00 01 48 */ b lbl_8026B4C8 +lbl_8026B384: +/* 8026B384 002682C4 38 7D 00 0C */ addi r3, r29, 0xc +/* 8026B388 002682C8 7F A4 EB 78 */ mr r4, r29 +/* 8026B38C 002682CC 38 A1 00 20 */ addi r5, r1, 0x20 +/* 8026B390 002682D0 48 0D BD 25 */ bl PSVECSubtract +/* 8026B394 002682D4 38 61 00 20 */ addi r3, r1, 0x20 +/* 8026B398 002682D8 48 0D BD A1 */ bl PSVECSquareMag +/* 8026B39C 002682DC FF E0 08 90 */ fmr f31, f1 +/* 8026B3A0 002682E0 FC 00 FA 10 */ fabs f0, f31 +/* 8026B3A4 002682E4 FC 20 00 18 */ frsp f1, f0 +/* 8026B3A8 002682E8 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026B3AC 002682EC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B3B0 002682F0 40 80 00 0C */ bge lbl_8026B3BC +/* 8026B3B4 002682F4 38 60 00 00 */ li r3, 0 +/* 8026B3B8 002682F8 48 00 01 10 */ b lbl_8026B4C8 +lbl_8026B3BC: +/* 8026B3BC 002682FC 7F E3 FB 78 */ mr r3, r31 +/* 8026B3C0 00268300 7F A4 EB 78 */ mr r4, r29 +/* 8026B3C4 00268304 38 A1 00 14 */ addi r5, r1, 0x14 +/* 8026B3C8 00268308 48 0D BC ED */ bl PSVECSubtract +/* 8026B3CC 0026830C 38 61 00 14 */ addi r3, r1, 0x14 +/* 8026B3D0 00268310 38 81 00 20 */ addi r4, r1, 0x20 +/* 8026B3D4 00268314 48 0D BD C1 */ bl PSVECDotProduct +/* 8026B3D8 00268318 EC 21 F8 24 */ fdivs f1, f1, f31 +/* 8026B3DC 0026831C C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026B3E0 00268320 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B3E4 00268324 41 80 00 10 */ blt lbl_8026B3F4 +/* 8026B3E8 00268328 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026B3EC 0026832C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B3F0 00268330 40 81 00 98 */ ble lbl_8026B488 +lbl_8026B3F4: +/* 8026B3F4 00268334 38 7D 00 0C */ addi r3, r29, 0xc +/* 8026B3F8 00268338 7F E4 FB 78 */ mr r4, r31 +/* 8026B3FC 0026833C 48 0D BF A1 */ bl PSVECSquareDistance +/* 8026B400 00268340 FF E0 08 90 */ fmr f31, f1 +/* 8026B404 00268344 7F A3 EB 78 */ mr r3, r29 +/* 8026B408 00268348 7F E4 FB 78 */ mr r4, r31 +/* 8026B40C 0026834C 48 0D BF 91 */ bl PSVECSquareDistance +/* 8026B410 00268350 FC 01 F8 40 */ fcmpo cr0, f1, f31 +/* 8026B414 00268354 40 80 00 38 */ bge lbl_8026B44C +/* 8026B418 00268358 7F E3 FB 78 */ mr r3, r31 +/* 8026B41C 0026835C 7F A4 EB 78 */ mr r4, r29 +/* 8026B420 00268360 4B FF FE 19 */ bl cM3d_Cross_SphPnt__FPC8cM3dGSphPC3Vec +/* 8026B424 00268364 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026B428 00268368 41 82 00 58 */ beq lbl_8026B480 +/* 8026B42C 0026836C C0 1D 00 00 */ lfs f0, 0(r29) +/* 8026B430 00268370 D0 1E 00 00 */ stfs f0, 0(r30) +/* 8026B434 00268374 C0 1D 00 04 */ lfs f0, 4(r29) +/* 8026B438 00268378 D0 1E 00 04 */ stfs f0, 4(r30) +/* 8026B43C 0026837C C0 1D 00 08 */ lfs f0, 8(r29) +/* 8026B440 00268380 D0 1E 00 08 */ stfs f0, 8(r30) +/* 8026B444 00268384 38 60 00 01 */ li r3, 1 +/* 8026B448 00268388 48 00 00 80 */ b lbl_8026B4C8 +lbl_8026B44C: +/* 8026B44C 0026838C 7F E3 FB 78 */ mr r3, r31 +/* 8026B450 00268390 38 9D 00 0C */ addi r4, r29, 0xc +/* 8026B454 00268394 4B FF FD E5 */ bl cM3d_Cross_SphPnt__FPC8cM3dGSphPC3Vec +/* 8026B458 00268398 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026B45C 0026839C 41 82 00 24 */ beq lbl_8026B480 +/* 8026B460 002683A0 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026B464 002683A4 D0 1E 00 00 */ stfs f0, 0(r30) +/* 8026B468 002683A8 C0 1D 00 10 */ lfs f0, 0x10(r29) +/* 8026B46C 002683AC D0 1E 00 04 */ stfs f0, 4(r30) +/* 8026B470 002683B0 C0 1D 00 14 */ lfs f0, 0x14(r29) +/* 8026B474 002683B4 D0 1E 00 08 */ stfs f0, 8(r30) +/* 8026B478 002683B8 38 60 00 01 */ li r3, 1 +/* 8026B47C 002683BC 48 00 00 4C */ b lbl_8026B4C8 +lbl_8026B480: +/* 8026B480 002683C0 38 60 00 00 */ li r3, 0 +/* 8026B484 002683C4 48 00 00 44 */ b lbl_8026B4C8 +lbl_8026B488: +/* 8026B488 002683C8 38 61 00 20 */ addi r3, r1, 0x20 +/* 8026B48C 002683CC 38 81 00 08 */ addi r4, r1, 8 +/* 8026B490 002683D0 48 0D BC 49 */ bl PSVECScale +/* 8026B494 002683D4 38 61 00 08 */ addi r3, r1, 8 +/* 8026B498 002683D8 7F A4 EB 78 */ mr r4, r29 +/* 8026B49C 002683DC 7F C5 F3 78 */ mr r5, r30 +/* 8026B4A0 002683E0 48 0D BB F1 */ bl PSVECAdd +/* 8026B4A4 002683E4 C3 FF 00 0C */ lfs f31, 0xc(r31) +/* 8026B4A8 002683E8 7F C3 F3 78 */ mr r3, r30 +/* 8026B4AC 002683EC 7F E4 FB 78 */ mr r4, r31 +/* 8026B4B0 002683F0 48 0D BE ED */ bl PSVECSquareDistance +/* 8026B4B4 002683F4 EC 1F 07 F2 */ fmuls f0, f31, f31 +/* 8026B4B8 002683F8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B4BC 002683FC 4C 40 13 82 */ cror 2, 0, 2 +/* 8026B4C0 00268400 7C 00 00 26 */ mfcr r0 +/* 8026B4C4 00268404 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f +lbl_8026B4C8: +/* 8026B4C8 00268408 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 +/* 8026B4CC 0026840C CB E1 00 40 */ lfd f31, 0x40(r1) +/* 8026B4D0 00268410 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026B4D4 00268414 48 0F 6D 55 */ bl _restgpr_29 +/* 8026B4D8 00268418 80 01 00 54 */ lwz r0, 0x54(r1) +/* 8026B4DC 0026841C 7C 08 03 A6 */ mtlr r0 +/* 8026B4E0 00268420 38 21 00 50 */ addi r1, r1, 0x50 +/* 8026B4E4 00268424 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026B4E8.s b/include/SComponent/c_m3d/asm/func_8026B4E8.s new file mode 100644 index 0000000000..48d1f2787d --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026B4E8.s @@ -0,0 +1,265 @@ +/* 8026B4E8 00268428 94 21 FF 70 */ stwu r1, -0x90(r1) +/* 8026B4EC 0026842C 7C 08 02 A6 */ mflr r0 +/* 8026B4F0 00268430 90 01 00 94 */ stw r0, 0x94(r1) +/* 8026B4F4 00268434 DB E1 00 80 */ stfd f31, 0x80(r1) +/* 8026B4F8 00268438 F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 +/* 8026B4FC 0026843C DB C1 00 70 */ stfd f30, 0x70(r1) +/* 8026B500 00268440 F3 C1 00 78 */ psq_st f30, 120(r1), 0, 0 +/* 8026B504 00268444 DB A1 00 60 */ stfd f29, 0x60(r1) +/* 8026B508 00268448 F3 A1 00 68 */ psq_st f29, 104(r1), 0, 0 +/* 8026B50C 0026844C 39 61 00 60 */ addi r11, r1, 0x60 +/* 8026B510 00268450 48 0F 6C C9 */ bl _savegpr_28 +/* 8026B514 00268454 7C 7F 1B 78 */ mr r31, r3 +/* 8026B518 00268458 7C 9C 23 78 */ mr r28, r4 +/* 8026B51C 0026845C 7C BD 2B 78 */ mr r29, r5 +/* 8026B520 00268460 7C DE 33 78 */ mr r30, r6 +/* 8026B524 00268464 38 7C 00 0C */ addi r3, r28, 0xc +/* 8026B528 00268468 38 A1 00 40 */ addi r5, r1, 0x40 +/* 8026B52C 0026846C 48 0D BB 89 */ bl PSVECSubtract +/* 8026B530 00268470 7F 83 E3 78 */ mr r3, r28 +/* 8026B534 00268474 7F E4 FB 78 */ mr r4, r31 +/* 8026B538 00268478 38 A1 00 34 */ addi r5, r1, 0x34 +/* 8026B53C 0026847C 48 0D BB 79 */ bl PSVECSubtract +/* 8026B540 00268480 38 61 00 40 */ addi r3, r1, 0x40 +/* 8026B544 00268484 7C 64 1B 78 */ mr r4, r3 +/* 8026B548 00268488 48 0D BC 4D */ bl PSVECDotProduct +/* 8026B54C 0026848C FF C0 08 90 */ fmr f30, f1 +/* 8026B550 00268490 38 61 00 40 */ addi r3, r1, 0x40 +/* 8026B554 00268494 38 81 00 34 */ addi r4, r1, 0x34 +/* 8026B558 00268498 48 0D BC 3D */ bl PSVECDotProduct +/* 8026B55C 0026849C C0 02 B7 BC */ lfs f0, lbl_804551BC-_SDA2_BASE_(r2) +/* 8026B560 002684A0 EF E0 00 72 */ fmuls f31, f0, f1 +/* 8026B564 002684A4 38 61 00 34 */ addi r3, r1, 0x34 +/* 8026B568 002684A8 7C 64 1B 78 */ mr r4, r3 +/* 8026B56C 002684AC 48 0D BC 29 */ bl PSVECDotProduct +/* 8026B570 002684B0 C0 1F 00 0C */ lfs f0, 0xc(r31) +/* 8026B574 002684B4 EC 00 00 32 */ fmuls f0, f0, f0 +/* 8026B578 002684B8 EC 61 00 28 */ fsubs f3, f1, f0 +/* 8026B57C 002684BC FC 00 F2 10 */ fabs f0, f30 +/* 8026B580 002684C0 FC 00 00 18 */ frsp f0, f0 +/* 8026B584 002684C4 C0 4D 8C 00 */ lfs f2, lbl_80451180-_SDA_BASE_(r13) +/* 8026B588 002684C8 FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 8026B58C 002684CC 40 80 00 48 */ bge lbl_8026B5D4 +/* 8026B590 002684D0 FC 00 FA 10 */ fabs f0, f31 +/* 8026B594 002684D4 FC 00 00 18 */ frsp f0, f0 +/* 8026B598 002684D8 FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 8026B59C 002684DC 40 80 00 0C */ bge lbl_8026B5A8 +/* 8026B5A0 002684E0 38 60 00 00 */ li r3, 0 +/* 8026B5A4 002684E4 48 00 02 D0 */ b lbl_8026B874 +lbl_8026B5A8: +/* 8026B5A8 002684E8 3B E0 00 01 */ li r31, 1 +/* 8026B5AC 002684EC 38 61 00 40 */ addi r3, r1, 0x40 +/* 8026B5B0 002684F0 38 81 00 28 */ addi r4, r1, 0x28 +/* 8026B5B4 002684F4 FC 00 18 50 */ fneg f0, f3 +/* 8026B5B8 002684F8 EC 20 F8 24 */ fdivs f1, f0, f31 +/* 8026B5BC 002684FC 48 0D BB 1D */ bl PSVECScale +/* 8026B5C0 00268500 38 61 00 28 */ addi r3, r1, 0x28 +/* 8026B5C4 00268504 7F 84 E3 78 */ mr r4, r28 +/* 8026B5C8 00268508 7F A5 EB 78 */ mr r5, r29 +/* 8026B5CC 0026850C 48 0D BA C5 */ bl PSVECAdd +/* 8026B5D0 00268510 48 00 02 A0 */ b lbl_8026B870 +lbl_8026B5D4: +/* 8026B5D4 00268514 EC 3F 07 F2 */ fmuls f1, f31, f31 +/* 8026B5D8 00268518 C0 02 B7 C0 */ lfs f0, lbl_804551C0-_SDA2_BASE_(r2) +/* 8026B5DC 0026851C EC 00 07 B2 */ fmuls f0, f0, f30 +/* 8026B5E0 00268520 EC 00 00 F2 */ fmuls f0, f0, f3 +/* 8026B5E4 00268524 EC 01 00 28 */ fsubs f0, f1, f0 +/* 8026B5E8 00268528 FC 20 02 10 */ fabs f1, f0 +/* 8026B5EC 0026852C FC 20 08 18 */ frsp f1, f1 +/* 8026B5F0 00268530 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026B5F4 00268534 40 80 00 38 */ bge lbl_8026B62C +/* 8026B5F8 00268538 3B E0 00 01 */ li r31, 1 +/* 8026B5FC 0026853C 38 61 00 40 */ addi r3, r1, 0x40 +/* 8026B600 00268540 38 81 00 1C */ addi r4, r1, 0x1c +/* 8026B604 00268544 FC 20 F8 50 */ fneg f1, f31 +/* 8026B608 00268548 C0 02 B7 BC */ lfs f0, lbl_804551BC-_SDA2_BASE_(r2) +/* 8026B60C 0026854C EC 00 07 B2 */ fmuls f0, f0, f30 +/* 8026B610 00268550 EC 21 00 24 */ fdivs f1, f1, f0 +/* 8026B614 00268554 48 0D BA C5 */ bl PSVECScale +/* 8026B618 00268558 38 61 00 1C */ addi r3, r1, 0x1c +/* 8026B61C 0026855C 7F 84 E3 78 */ mr r4, r28 +/* 8026B620 00268560 7F A5 EB 78 */ mr r5, r29 +/* 8026B624 00268564 48 0D BA 6D */ bl PSVECAdd +/* 8026B628 00268568 48 00 02 48 */ b lbl_8026B870 +lbl_8026B62C: +/* 8026B62C 0026856C C0 22 B7 18 */ lfs f1, lbl_80455118-_SDA2_BASE_(r2) +/* 8026B630 00268570 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026B634 00268574 40 80 00 0C */ bge lbl_8026B640 +/* 8026B638 00268578 3B E0 00 00 */ li r31, 0 +/* 8026B63C 0026857C 48 00 02 34 */ b lbl_8026B870 +lbl_8026B640: +/* 8026B640 00268580 3B E0 00 02 */ li r31, 2 +/* 8026B644 00268584 C0 42 B7 38 */ lfs f2, lbl_80455138-_SDA2_BASE_(r2) +/* 8026B648 00268588 C0 22 B7 BC */ lfs f1, lbl_804551BC-_SDA2_BASE_(r2) +/* 8026B64C 0026858C EC 21 07 B2 */ fmuls f1, f1, f30 +/* 8026B650 00268590 EF C2 08 24 */ fdivs f30, f2, f1 +/* 8026B654 00268594 40 81 00 58 */ ble lbl_8026B6AC +/* 8026B658 00268598 FC 20 00 34 */ frsqrte f1, f0 +/* 8026B65C 0026859C C8 82 B7 20 */ lfd f4, lbl_80455120-_SDA2_BASE_(r2) +/* 8026B660 002685A0 FC 44 00 72 */ fmul f2, f4, f1 +/* 8026B664 002685A4 C8 62 B7 28 */ lfd f3, lbl_80455128-_SDA2_BASE_(r2) +/* 8026B668 002685A8 FC 21 00 72 */ fmul f1, f1, f1 +/* 8026B66C 002685AC FC 20 00 72 */ fmul f1, f0, f1 +/* 8026B670 002685B0 FC 23 08 28 */ fsub f1, f3, f1 +/* 8026B674 002685B4 FC 22 00 72 */ fmul f1, f2, f1 +/* 8026B678 002685B8 FC 44 00 72 */ fmul f2, f4, f1 +/* 8026B67C 002685BC FC 21 00 72 */ fmul f1, f1, f1 +/* 8026B680 002685C0 FC 20 00 72 */ fmul f1, f0, f1 +/* 8026B684 002685C4 FC 23 08 28 */ fsub f1, f3, f1 +/* 8026B688 002685C8 FC 22 00 72 */ fmul f1, f2, f1 +/* 8026B68C 002685CC FC 44 00 72 */ fmul f2, f4, f1 +/* 8026B690 002685D0 FC 21 00 72 */ fmul f1, f1, f1 +/* 8026B694 002685D4 FC 20 00 72 */ fmul f1, f0, f1 +/* 8026B698 002685D8 FC 23 08 28 */ fsub f1, f3, f1 +/* 8026B69C 002685DC FC 22 00 72 */ fmul f1, f2, f1 +/* 8026B6A0 002685E0 FC 20 00 72 */ fmul f1, f0, f1 +/* 8026B6A4 002685E4 FC 20 08 18 */ frsp f1, f1 +/* 8026B6A8 002685E8 48 00 00 90 */ b lbl_8026B738 +lbl_8026B6AC: +/* 8026B6AC 002685EC C8 22 B7 30 */ lfd f1, lbl_80455130-_SDA2_BASE_(r2) +/* 8026B6B0 002685F0 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026B6B4 002685F4 40 80 00 10 */ bge lbl_8026B6C4 +/* 8026B6B8 002685F8 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026B6BC 002685FC C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 8026B6C0 00268600 48 00 00 78 */ b lbl_8026B738 +lbl_8026B6C4: +/* 8026B6C4 00268604 D0 01 00 0C */ stfs f0, 0xc(r1) +/* 8026B6C8 00268608 80 81 00 0C */ lwz r4, 0xc(r1) +/* 8026B6CC 0026860C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8026B6D0 00268610 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026B6D4 00268614 7C 03 00 00 */ cmpw r3, r0 +/* 8026B6D8 00268618 41 82 00 14 */ beq lbl_8026B6EC +/* 8026B6DC 0026861C 40 80 00 40 */ bge lbl_8026B71C +/* 8026B6E0 00268620 2C 03 00 00 */ cmpwi r3, 0 +/* 8026B6E4 00268624 41 82 00 20 */ beq lbl_8026B704 +/* 8026B6E8 00268628 48 00 00 34 */ b lbl_8026B71C +lbl_8026B6EC: +/* 8026B6EC 0026862C 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026B6F0 00268630 41 82 00 0C */ beq lbl_8026B6FC +/* 8026B6F4 00268634 38 00 00 01 */ li r0, 1 +/* 8026B6F8 00268638 48 00 00 28 */ b lbl_8026B720 +lbl_8026B6FC: +/* 8026B6FC 0026863C 38 00 00 02 */ li r0, 2 +/* 8026B700 00268640 48 00 00 20 */ b lbl_8026B720 +lbl_8026B704: +/* 8026B704 00268644 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026B708 00268648 41 82 00 0C */ beq lbl_8026B714 +/* 8026B70C 0026864C 38 00 00 05 */ li r0, 5 +/* 8026B710 00268650 48 00 00 10 */ b lbl_8026B720 +lbl_8026B714: +/* 8026B714 00268654 38 00 00 03 */ li r0, 3 +/* 8026B718 00268658 48 00 00 08 */ b lbl_8026B720 +lbl_8026B71C: +/* 8026B71C 0026865C 38 00 00 04 */ li r0, 4 +lbl_8026B720: +/* 8026B720 00268660 2C 00 00 01 */ cmpwi r0, 1 +/* 8026B724 00268664 40 82 00 10 */ bne lbl_8026B734 +/* 8026B728 00268668 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026B72C 0026866C C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 8026B730 00268670 48 00 00 08 */ b lbl_8026B738 +lbl_8026B734: +/* 8026B734 00268674 FC 20 00 90 */ fmr f1, f0 +lbl_8026B738: +/* 8026B738 00268678 FF E0 F8 50 */ fneg f31, f31 +/* 8026B73C 0026867C EC 3F 08 2A */ fadds f1, f31, f1 +/* 8026B740 00268680 EC 3E 00 72 */ fmuls f1, f30, f1 +/* 8026B744 00268684 C0 42 B7 18 */ lfs f2, lbl_80455118-_SDA2_BASE_(r2) +/* 8026B748 00268688 FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 8026B74C 0026868C 40 81 00 58 */ ble lbl_8026B7A4 +/* 8026B750 00268690 FC 40 00 34 */ frsqrte f2, f0 +/* 8026B754 00268694 C8 A2 B7 20 */ lfd f5, lbl_80455120-_SDA2_BASE_(r2) +/* 8026B758 00268698 FC 65 00 B2 */ fmul f3, f5, f2 +/* 8026B75C 0026869C C8 82 B7 28 */ lfd f4, lbl_80455128-_SDA2_BASE_(r2) +/* 8026B760 002686A0 FC 42 00 B2 */ fmul f2, f2, f2 +/* 8026B764 002686A4 FC 40 00 B2 */ fmul f2, f0, f2 +/* 8026B768 002686A8 FC 44 10 28 */ fsub f2, f4, f2 +/* 8026B76C 002686AC FC 43 00 B2 */ fmul f2, f3, f2 +/* 8026B770 002686B0 FC 65 00 B2 */ fmul f3, f5, f2 +/* 8026B774 002686B4 FC 42 00 B2 */ fmul f2, f2, f2 +/* 8026B778 002686B8 FC 40 00 B2 */ fmul f2, f0, f2 +/* 8026B77C 002686BC FC 44 10 28 */ fsub f2, f4, f2 +/* 8026B780 002686C0 FC 43 00 B2 */ fmul f2, f3, f2 +/* 8026B784 002686C4 FC 65 00 B2 */ fmul f3, f5, f2 +/* 8026B788 002686C8 FC 42 00 B2 */ fmul f2, f2, f2 +/* 8026B78C 002686CC FC 40 00 B2 */ fmul f2, f0, f2 +/* 8026B790 002686D0 FC 44 10 28 */ fsub f2, f4, f2 +/* 8026B794 002686D4 FC 43 00 B2 */ fmul f2, f3, f2 +/* 8026B798 002686D8 FF A0 00 B2 */ fmul f29, f0, f2 +/* 8026B79C 002686DC FF A0 E8 18 */ frsp f29, f29 +/* 8026B7A0 002686E0 48 00 00 90 */ b lbl_8026B830 +lbl_8026B7A4: +/* 8026B7A4 002686E4 C8 42 B7 30 */ lfd f2, lbl_80455130-_SDA2_BASE_(r2) +/* 8026B7A8 002686E8 FC 00 10 40 */ fcmpo cr0, f0, f2 +/* 8026B7AC 002686EC 40 80 00 10 */ bge lbl_8026B7BC +/* 8026B7B0 002686F0 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026B7B4 002686F4 C3 A3 0A E0 */ lfs f29, lbl_80450AE0@l(r3) +/* 8026B7B8 002686F8 48 00 00 78 */ b lbl_8026B830 +lbl_8026B7BC: +/* 8026B7BC 002686FC D0 01 00 08 */ stfs f0, 8(r1) +/* 8026B7C0 00268700 80 81 00 08 */ lwz r4, 8(r1) +/* 8026B7C4 00268704 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8026B7C8 00268708 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026B7CC 0026870C 7C 03 00 00 */ cmpw r3, r0 +/* 8026B7D0 00268710 41 82 00 14 */ beq lbl_8026B7E4 +/* 8026B7D4 00268714 40 80 00 40 */ bge lbl_8026B814 +/* 8026B7D8 00268718 2C 03 00 00 */ cmpwi r3, 0 +/* 8026B7DC 0026871C 41 82 00 20 */ beq lbl_8026B7FC +/* 8026B7E0 00268720 48 00 00 34 */ b lbl_8026B814 +lbl_8026B7E4: +/* 8026B7E4 00268724 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026B7E8 00268728 41 82 00 0C */ beq lbl_8026B7F4 +/* 8026B7EC 0026872C 38 00 00 01 */ li r0, 1 +/* 8026B7F0 00268730 48 00 00 28 */ b lbl_8026B818 +lbl_8026B7F4: +/* 8026B7F4 00268734 38 00 00 02 */ li r0, 2 +/* 8026B7F8 00268738 48 00 00 20 */ b lbl_8026B818 +lbl_8026B7FC: +/* 8026B7FC 0026873C 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026B800 00268740 41 82 00 0C */ beq lbl_8026B80C +/* 8026B804 00268744 38 00 00 05 */ li r0, 5 +/* 8026B808 00268748 48 00 00 10 */ b lbl_8026B818 +lbl_8026B80C: +/* 8026B80C 0026874C 38 00 00 03 */ li r0, 3 +/* 8026B810 00268750 48 00 00 08 */ b lbl_8026B818 +lbl_8026B814: +/* 8026B814 00268754 38 00 00 04 */ li r0, 4 +lbl_8026B818: +/* 8026B818 00268758 2C 00 00 01 */ cmpwi r0, 1 +/* 8026B81C 0026875C 40 82 00 10 */ bne lbl_8026B82C +/* 8026B820 00268760 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026B824 00268764 C3 A3 0A E0 */ lfs f29, lbl_80450AE0@l(r3) +/* 8026B828 00268768 48 00 00 08 */ b lbl_8026B830 +lbl_8026B82C: +/* 8026B82C 0026876C FF A0 00 90 */ fmr f29, f0 +lbl_8026B830: +/* 8026B830 00268770 38 61 00 40 */ addi r3, r1, 0x40 +/* 8026B834 00268774 38 81 00 10 */ addi r4, r1, 0x10 +/* 8026B838 00268778 48 0D B8 A1 */ bl PSVECScale +/* 8026B83C 0026877C 38 61 00 10 */ addi r3, r1, 0x10 +/* 8026B840 00268780 7F 84 E3 78 */ mr r4, r28 +/* 8026B844 00268784 7F A5 EB 78 */ mr r5, r29 +/* 8026B848 00268788 48 0D B8 49 */ bl PSVECAdd +/* 8026B84C 0026878C 38 61 00 40 */ addi r3, r1, 0x40 +/* 8026B850 00268790 38 81 00 10 */ addi r4, r1, 0x10 +/* 8026B854 00268794 EC 1F E8 28 */ fsubs f0, f31, f29 +/* 8026B858 00268798 EC 3E 00 32 */ fmuls f1, f30, f0 +/* 8026B85C 0026879C 48 0D B8 7D */ bl PSVECScale +/* 8026B860 002687A0 38 61 00 10 */ addi r3, r1, 0x10 +/* 8026B864 002687A4 7F 84 E3 78 */ mr r4, r28 +/* 8026B868 002687A8 7F C5 F3 78 */ mr r5, r30 +/* 8026B86C 002687AC 48 0D B8 25 */ bl PSVECAdd +lbl_8026B870: +/* 8026B870 002687B0 7F E3 FB 78 */ mr r3, r31 +lbl_8026B874: +/* 8026B874 002687B4 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 +/* 8026B878 002687B8 CB E1 00 80 */ lfd f31, 0x80(r1) +/* 8026B87C 002687BC E3 C1 00 78 */ psq_l f30, 120(r1), 0, 0 +/* 8026B880 002687C0 CB C1 00 70 */ lfd f30, 0x70(r1) +/* 8026B884 002687C4 E3 A1 00 68 */ psq_l f29, 104(r1), 0, 0 +/* 8026B888 002687C8 CB A1 00 60 */ lfd f29, 0x60(r1) +/* 8026B88C 002687CC 39 61 00 60 */ addi r11, r1, 0x60 +/* 8026B890 002687D0 48 0F 69 95 */ bl _restgpr_28 +/* 8026B894 002687D4 80 01 00 94 */ lwz r0, 0x94(r1) +/* 8026B898 002687D8 7C 08 03 A6 */ mtlr r0 +/* 8026B89C 002687DC 38 21 00 90 */ addi r1, r1, 0x90 +/* 8026B8A0 002687E0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026B8A4.s b/include/SComponent/c_m3d/asm/func_8026B8A4.s new file mode 100644 index 0000000000..be3a99b79b --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026B8A4.s @@ -0,0 +1,117 @@ +/* 8026B8A4 002687E4 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026B8A8 002687E8 7C 08 02 A6 */ mflr r0 +/* 8026B8AC 002687EC 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026B8B0 002687F0 DB E1 00 20 */ stfd f31, 0x20(r1) +/* 8026B8B4 002687F4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 +/* 8026B8B8 002687F8 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026B8BC 002687FC 48 0F 69 21 */ bl _savegpr_29 +/* 8026B8C0 00268800 7C 7D 1B 78 */ mr r29, r3 +/* 8026B8C4 00268804 7C 9E 23 78 */ mr r30, r4 +/* 8026B8C8 00268808 7C BF 2B 78 */ mr r31, r5 +/* 8026B8CC 0026880C C0 23 00 0C */ lfs f1, 0xc(r3) +/* 8026B8D0 00268810 C0 04 00 0C */ lfs f0, 0xc(r4) +/* 8026B8D4 00268814 EF E1 00 2A */ fadds f31, f1, f0 +/* 8026B8D8 00268818 C0 24 00 00 */ lfs f1, 0(r4) +/* 8026B8DC 0026881C C0 44 00 08 */ lfs f2, 8(r4) +/* 8026B8E0 00268820 C0 63 00 00 */ lfs f3, 0(r3) +/* 8026B8E4 00268824 C0 83 00 08 */ lfs f4, 8(r3) +/* 8026B8E8 00268828 4B FF CD 2D */ bl cM3d_Len2dSq__Fffff +/* 8026B8EC 0026882C C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026B8F0 00268830 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B8F4 00268834 40 81 00 58 */ ble lbl_8026B94C +/* 8026B8F8 00268838 FC 00 08 34 */ frsqrte f0, f1 +/* 8026B8FC 0026883C C8 82 B7 20 */ lfd f4, lbl_80455120-_SDA2_BASE_(r2) +/* 8026B900 00268840 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026B904 00268844 C8 62 B7 28 */ lfd f3, lbl_80455128-_SDA2_BASE_(r2) +/* 8026B908 00268848 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026B90C 0026884C FC 01 00 32 */ fmul f0, f1, f0 +/* 8026B910 00268850 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026B914 00268854 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026B918 00268858 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026B91C 0026885C FC 00 00 32 */ fmul f0, f0, f0 +/* 8026B920 00268860 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026B924 00268864 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026B928 00268868 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026B92C 0026886C FC 44 00 32 */ fmul f2, f4, f0 +/* 8026B930 00268870 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026B934 00268874 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026B938 00268878 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026B93C 0026887C FC 02 00 32 */ fmul f0, f2, f0 +/* 8026B940 00268880 FC 21 00 32 */ fmul f1, f1, f0 +/* 8026B944 00268884 FC 20 08 18 */ frsp f1, f1 +/* 8026B948 00268888 48 00 00 88 */ b lbl_8026B9D0 +lbl_8026B94C: +/* 8026B94C 0026888C C8 02 B7 30 */ lfd f0, lbl_80455130-_SDA2_BASE_(r2) +/* 8026B950 00268890 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026B954 00268894 40 80 00 10 */ bge lbl_8026B964 +/* 8026B958 00268898 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026B95C 0026889C C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 8026B960 002688A0 48 00 00 70 */ b lbl_8026B9D0 +lbl_8026B964: +/* 8026B964 002688A4 D0 21 00 08 */ stfs f1, 8(r1) +/* 8026B968 002688A8 80 81 00 08 */ lwz r4, 8(r1) +/* 8026B96C 002688AC 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8026B970 002688B0 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026B974 002688B4 7C 03 00 00 */ cmpw r3, r0 +/* 8026B978 002688B8 41 82 00 14 */ beq lbl_8026B98C +/* 8026B97C 002688BC 40 80 00 40 */ bge lbl_8026B9BC +/* 8026B980 002688C0 2C 03 00 00 */ cmpwi r3, 0 +/* 8026B984 002688C4 41 82 00 20 */ beq lbl_8026B9A4 +/* 8026B988 002688C8 48 00 00 34 */ b lbl_8026B9BC +lbl_8026B98C: +/* 8026B98C 002688CC 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026B990 002688D0 41 82 00 0C */ beq lbl_8026B99C +/* 8026B994 002688D4 38 00 00 01 */ li r0, 1 +/* 8026B998 002688D8 48 00 00 28 */ b lbl_8026B9C0 +lbl_8026B99C: +/* 8026B99C 002688DC 38 00 00 02 */ li r0, 2 +/* 8026B9A0 002688E0 48 00 00 20 */ b lbl_8026B9C0 +lbl_8026B9A4: +/* 8026B9A4 002688E4 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026B9A8 002688E8 41 82 00 0C */ beq lbl_8026B9B4 +/* 8026B9AC 002688EC 38 00 00 05 */ li r0, 5 +/* 8026B9B0 002688F0 48 00 00 10 */ b lbl_8026B9C0 +lbl_8026B9B4: +/* 8026B9B4 002688F4 38 00 00 03 */ li r0, 3 +/* 8026B9B8 002688F8 48 00 00 08 */ b lbl_8026B9C0 +lbl_8026B9BC: +/* 8026B9BC 002688FC 38 00 00 04 */ li r0, 4 +lbl_8026B9C0: +/* 8026B9C0 00268900 2C 00 00 01 */ cmpwi r0, 1 +/* 8026B9C4 00268904 40 82 00 0C */ bne lbl_8026B9D0 +/* 8026B9C8 00268908 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026B9CC 0026890C C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +lbl_8026B9D0: +/* 8026B9D0 00268910 FC 1F 08 40 */ fcmpo cr0, f31, f1 +/* 8026B9D4 00268914 40 80 00 0C */ bge lbl_8026B9E0 +/* 8026B9D8 00268918 38 60 00 00 */ li r3, 0 +/* 8026B9DC 0026891C 48 00 00 4C */ b lbl_8026BA28 +lbl_8026B9E0: +/* 8026B9E0 00268920 C0 9E 00 04 */ lfs f4, 4(r30) +/* 8026B9E4 00268924 C0 5E 00 0C */ lfs f2, 0xc(r30) +/* 8026B9E8 00268928 EC 04 10 2A */ fadds f0, f4, f2 +/* 8026B9EC 0026892C C0 7D 00 04 */ lfs f3, 4(r29) +/* 8026B9F0 00268930 FC 00 18 40 */ fcmpo cr0, f0, f3 +/* 8026B9F4 00268934 4C 41 13 82 */ cror 2, 1, 2 +/* 8026B9F8 00268938 40 82 00 2C */ bne lbl_8026BA24 +/* 8026B9FC 0026893C EC 44 10 28 */ fsubs f2, f4, f2 +/* 8026BA00 00268940 C0 1D 00 10 */ lfs f0, 0x10(r29) +/* 8026BA04 00268944 EC 03 00 2A */ fadds f0, f3, f0 +/* 8026BA08 00268948 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026BA0C 0026894C 4C 40 13 82 */ cror 2, 0, 2 +/* 8026BA10 00268950 40 82 00 14 */ bne lbl_8026BA24 +/* 8026BA14 00268954 EC 1F 08 28 */ fsubs f0, f31, f1 +/* 8026BA18 00268958 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026BA1C 0026895C 38 60 00 01 */ li r3, 1 +/* 8026BA20 00268960 48 00 00 08 */ b lbl_8026BA28 +lbl_8026BA24: +/* 8026BA24 00268964 38 60 00 00 */ li r3, 0 +lbl_8026BA28: +/* 8026BA28 00268968 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 +/* 8026BA2C 0026896C CB E1 00 20 */ lfd f31, 0x20(r1) +/* 8026BA30 00268970 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026BA34 00268974 48 0F 67 F5 */ bl _restgpr_29 +/* 8026BA38 00268978 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026BA3C 0026897C 7C 08 03 A6 */ mtlr r0 +/* 8026BA40 00268980 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026BA44 00268984 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026BA48.s b/include/SComponent/c_m3d/asm/func_8026BA48.s new file mode 100644 index 0000000000..024f0f296a --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026BA48.s @@ -0,0 +1,156 @@ +/* 8026BA48 00268988 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 8026BA4C 0026898C 7C 08 02 A6 */ mflr r0 +/* 8026BA50 00268990 90 01 00 44 */ stw r0, 0x44(r1) +/* 8026BA54 00268994 DB E1 00 30 */ stfd f31, 0x30(r1) +/* 8026BA58 00268998 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 +/* 8026BA5C 0026899C 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026BA60 002689A0 48 0F 67 79 */ bl _savegpr_28 +/* 8026BA64 002689A4 7C 7E 1B 78 */ mr r30, r3 +/* 8026BA68 002689A8 7C 9F 23 78 */ mr r31, r4 +/* 8026BA6C 002689AC 7C BC 2B 78 */ mr r28, r5 +/* 8026BA70 002689B0 7C DD 33 78 */ mr r29, r6 +/* 8026BA74 002689B4 C0 23 00 0C */ lfs f1, 0xc(r3) +/* 8026BA78 002689B8 C0 04 00 0C */ lfs f0, 0xc(r4) +/* 8026BA7C 002689BC EF E1 00 2A */ fadds f31, f1, f0 +/* 8026BA80 002689C0 C0 24 00 00 */ lfs f1, 0(r4) +/* 8026BA84 002689C4 C0 44 00 08 */ lfs f2, 8(r4) +/* 8026BA88 002689C8 C0 63 00 00 */ lfs f3, 0(r3) +/* 8026BA8C 002689CC C0 83 00 08 */ lfs f4, 8(r3) +/* 8026BA90 002689D0 4B FF CB 85 */ bl cM3d_Len2dSq__Fffff +/* 8026BA94 002689D4 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026BA98 002689D8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026BA9C 002689DC 40 81 00 58 */ ble lbl_8026BAF4 +/* 8026BAA0 002689E0 FC 00 08 34 */ frsqrte f0, f1 +/* 8026BAA4 002689E4 C8 82 B7 20 */ lfd f4, lbl_80455120-_SDA2_BASE_(r2) +/* 8026BAA8 002689E8 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026BAAC 002689EC C8 62 B7 28 */ lfd f3, lbl_80455128-_SDA2_BASE_(r2) +/* 8026BAB0 002689F0 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026BAB4 002689F4 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026BAB8 002689F8 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026BABC 002689FC FC 02 00 32 */ fmul f0, f2, f0 +/* 8026BAC0 00268A00 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026BAC4 00268A04 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026BAC8 00268A08 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026BACC 00268A0C FC 03 00 28 */ fsub f0, f3, f0 +/* 8026BAD0 00268A10 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026BAD4 00268A14 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026BAD8 00268A18 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026BADC 00268A1C FC 01 00 32 */ fmul f0, f1, f0 +/* 8026BAE0 00268A20 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026BAE4 00268A24 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026BAE8 00268A28 FC 21 00 32 */ fmul f1, f1, f0 +/* 8026BAEC 00268A2C FC 20 08 18 */ frsp f1, f1 +/* 8026BAF0 00268A30 48 00 00 88 */ b lbl_8026BB78 +lbl_8026BAF4: +/* 8026BAF4 00268A34 C8 02 B7 30 */ lfd f0, lbl_80455130-_SDA2_BASE_(r2) +/* 8026BAF8 00268A38 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026BAFC 00268A3C 40 80 00 10 */ bge lbl_8026BB0C +/* 8026BB00 00268A40 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026BB04 00268A44 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +/* 8026BB08 00268A48 48 00 00 70 */ b lbl_8026BB78 +lbl_8026BB0C: +/* 8026BB0C 00268A4C D0 21 00 08 */ stfs f1, 8(r1) +/* 8026BB10 00268A50 80 81 00 08 */ lwz r4, 8(r1) +/* 8026BB14 00268A54 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8026BB18 00268A58 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026BB1C 00268A5C 7C 03 00 00 */ cmpw r3, r0 +/* 8026BB20 00268A60 41 82 00 14 */ beq lbl_8026BB34 +/* 8026BB24 00268A64 40 80 00 40 */ bge lbl_8026BB64 +/* 8026BB28 00268A68 2C 03 00 00 */ cmpwi r3, 0 +/* 8026BB2C 00268A6C 41 82 00 20 */ beq lbl_8026BB4C +/* 8026BB30 00268A70 48 00 00 34 */ b lbl_8026BB64 +lbl_8026BB34: +/* 8026BB34 00268A74 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026BB38 00268A78 41 82 00 0C */ beq lbl_8026BB44 +/* 8026BB3C 00268A7C 38 00 00 01 */ li r0, 1 +/* 8026BB40 00268A80 48 00 00 28 */ b lbl_8026BB68 +lbl_8026BB44: +/* 8026BB44 00268A84 38 00 00 02 */ li r0, 2 +/* 8026BB48 00268A88 48 00 00 20 */ b lbl_8026BB68 +lbl_8026BB4C: +/* 8026BB4C 00268A8C 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026BB50 00268A90 41 82 00 0C */ beq lbl_8026BB5C +/* 8026BB54 00268A94 38 00 00 05 */ li r0, 5 +/* 8026BB58 00268A98 48 00 00 10 */ b lbl_8026BB68 +lbl_8026BB5C: +/* 8026BB5C 00268A9C 38 00 00 03 */ li r0, 3 +/* 8026BB60 00268AA0 48 00 00 08 */ b lbl_8026BB68 +lbl_8026BB64: +/* 8026BB64 00268AA4 38 00 00 04 */ li r0, 4 +lbl_8026BB68: +/* 8026BB68 00268AA8 2C 00 00 01 */ cmpwi r0, 1 +/* 8026BB6C 00268AAC 40 82 00 0C */ bne lbl_8026BB78 +/* 8026BB70 00268AB0 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026BB74 00268AB4 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) +lbl_8026BB78: +/* 8026BB78 00268AB8 FC 1F 08 40 */ fcmpo cr0, f31, f1 +/* 8026BB7C 00268ABC 40 80 00 0C */ bge lbl_8026BB88 +/* 8026BB80 00268AC0 38 60 00 00 */ li r3, 0 +/* 8026BB84 00268AC4 48 00 00 D8 */ b lbl_8026BC5C +lbl_8026BB88: +/* 8026BB88 00268AC8 C0 9F 00 04 */ lfs f4, 4(r31) +/* 8026BB8C 00268ACC C0 5F 00 0C */ lfs f2, 0xc(r31) +/* 8026BB90 00268AD0 EC 04 10 2A */ fadds f0, f4, f2 +/* 8026BB94 00268AD4 C0 7E 00 04 */ lfs f3, 4(r30) +/* 8026BB98 00268AD8 FC 00 18 40 */ fcmpo cr0, f0, f3 +/* 8026BB9C 00268ADC 4C 41 13 82 */ cror 2, 1, 2 +/* 8026BBA0 00268AE0 40 82 00 B8 */ bne lbl_8026BC58 +/* 8026BBA4 00268AE4 EC 44 10 28 */ fsubs f2, f4, f2 +/* 8026BBA8 00268AE8 C0 1E 00 10 */ lfs f0, 0x10(r30) +/* 8026BBAC 00268AEC EC 03 00 2A */ fadds f0, f3, f0 +/* 8026BBB0 00268AF0 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026BBB4 00268AF4 4C 40 13 82 */ cror 2, 0, 2 +/* 8026BBB8 00268AF8 40 82 00 A0 */ bne lbl_8026BC58 +/* 8026BBBC 00268AFC EC 1F 08 28 */ fsubs f0, f31, f1 +/* 8026BBC0 00268B00 D0 1D 00 00 */ stfs f0, 0(r29) +/* 8026BBC4 00268B04 FC 00 0A 10 */ fabs f0, f1 +/* 8026BBC8 00268B08 FC 40 00 18 */ frsp f2, f0 +/* 8026BBCC 00268B0C C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026BBD0 00268B10 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026BBD4 00268B14 41 80 00 68 */ blt lbl_8026BC3C +/* 8026BBD8 00268B18 C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026BBDC 00268B1C EF E0 08 24 */ fdivs f31, f0, f1 +/* 8026BBE0 00268B20 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026BBE4 00268B24 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026BBE8 00268B28 4C 40 13 82 */ cror 2, 0, 2 +/* 8026BBEC 00268B2C 40 82 00 38 */ bne lbl_8026BC24 +/* 8026BBF0 00268B30 7F E3 FB 78 */ mr r3, r31 +/* 8026BBF4 00268B34 7F C4 F3 78 */ mr r4, r30 +/* 8026BBF8 00268B38 38 A1 00 0C */ addi r5, r1, 0xc +/* 8026BBFC 00268B3C 48 0D B4 B9 */ bl PSVECSubtract +/* 8026BC00 00268B40 38 61 00 0C */ addi r3, r1, 0xc +/* 8026BC04 00268B44 7C 64 1B 78 */ mr r4, r3 +/* 8026BC08 00268B48 FC 20 F8 90 */ fmr f1, f31 +/* 8026BC0C 00268B4C 48 0D B4 CD */ bl PSVECScale +/* 8026BC10 00268B50 38 61 00 0C */ addi r3, r1, 0xc +/* 8026BC14 00268B54 7F C4 F3 78 */ mr r4, r30 +/* 8026BC18 00268B58 7F 85 E3 78 */ mr r5, r28 +/* 8026BC1C 00268B5C 48 0D B4 75 */ bl PSVECAdd +/* 8026BC20 00268B60 48 00 00 30 */ b lbl_8026BC50 +lbl_8026BC24: +/* 8026BC24 00268B64 C0 1F 00 00 */ lfs f0, 0(r31) +/* 8026BC28 00268B68 D0 1C 00 00 */ stfs f0, 0(r28) +/* 8026BC2C 00268B6C D0 9C 00 04 */ stfs f4, 4(r28) +/* 8026BC30 00268B70 C0 1F 00 08 */ lfs f0, 8(r31) +/* 8026BC34 00268B74 D0 1C 00 08 */ stfs f0, 8(r28) +/* 8026BC38 00268B78 48 00 00 18 */ b lbl_8026BC50 +lbl_8026BC3C: +/* 8026BC3C 00268B7C C0 1F 00 00 */ lfs f0, 0(r31) +/* 8026BC40 00268B80 D0 1C 00 00 */ stfs f0, 0(r28) +/* 8026BC44 00268B84 D0 9C 00 04 */ stfs f4, 4(r28) +/* 8026BC48 00268B88 C0 1F 00 08 */ lfs f0, 8(r31) +/* 8026BC4C 00268B8C D0 1C 00 08 */ stfs f0, 8(r28) +lbl_8026BC50: +/* 8026BC50 00268B90 38 60 00 01 */ li r3, 1 +/* 8026BC54 00268B94 48 00 00 08 */ b lbl_8026BC5C +lbl_8026BC58: +/* 8026BC58 00268B98 38 60 00 00 */ li r3, 0 +lbl_8026BC5C: +/* 8026BC5C 00268B9C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 +/* 8026BC60 00268BA0 CB E1 00 30 */ lfd f31, 0x30(r1) +/* 8026BC64 00268BA4 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026BC68 00268BA8 48 0F 65 BD */ bl _restgpr_28 +/* 8026BC6C 00268BAC 80 01 00 44 */ lwz r0, 0x44(r1) +/* 8026BC70 00268BB0 7C 08 03 A6 */ mtlr r0 +/* 8026BC74 00268BB4 38 21 00 40 */ addi r1, r1, 0x40 +/* 8026BC78 00268BB8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026BC7C.s b/include/SComponent/c_m3d/asm/func_8026BC7C.s new file mode 100644 index 0000000000..f32799e46c --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026BC7C.s @@ -0,0 +1,34 @@ +/* 8026BC7C 00268BBC 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026BC80 00268BC0 7C 08 02 A6 */ mflr r0 +/* 8026BC84 00268BC4 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026BC88 00268BC8 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026BC8C 00268BCC 48 0F 65 51 */ bl _savegpr_29 +/* 8026BC90 00268BD0 7C 7D 1B 78 */ mr r29, r3 +/* 8026BC94 00268BD4 7C 9E 23 78 */ mr r30, r4 +/* 8026BC98 00268BD8 7C BF 2B 78 */ mr r31, r5 +/* 8026BC9C 00268BDC 38 A1 00 08 */ addi r5, r1, 8 +/* 8026BCA0 00268BE0 48 0D B4 15 */ bl PSVECSubtract +/* 8026BCA4 00268BE4 38 61 00 08 */ addi r3, r1, 8 +/* 8026BCA8 00268BE8 48 0D B4 A9 */ bl PSVECMag +/* 8026BCAC 00268BEC C0 5D 00 0C */ lfs f2, 0xc(r29) +/* 8026BCB0 00268BF0 C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026BCB4 00268BF4 EC 02 00 2A */ fadds f0, f2, f0 +/* 8026BCB8 00268BF8 EC 00 08 28 */ fsubs f0, f0, f1 +/* 8026BCBC 00268BFC D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026BCC0 00268C00 C0 3F 00 00 */ lfs f1, 0(r31) +/* 8026BCC4 00268C04 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026BCC8 00268C08 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026BCCC 00268C0C 40 81 00 0C */ ble lbl_8026BCD8 +/* 8026BCD0 00268C10 38 60 00 01 */ li r3, 1 +/* 8026BCD4 00268C14 48 00 00 10 */ b lbl_8026BCE4 +lbl_8026BCD8: +/* 8026BCD8 00268C18 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026BCDC 00268C1C D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026BCE0 00268C20 38 60 00 00 */ li r3, 0 +lbl_8026BCE4: +/* 8026BCE4 00268C24 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026BCE8 00268C28 48 0F 65 41 */ bl _restgpr_29 +/* 8026BCEC 00268C2C 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026BCF0 00268C30 7C 08 03 A6 */ mtlr r0 +/* 8026BCF4 00268C34 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026BCF8 00268C38 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026BCFC.s b/include/SComponent/c_m3d/asm/func_8026BCFC.s new file mode 100644 index 0000000000..d1d7827fab --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026BCFC.s @@ -0,0 +1,37 @@ +/* 8026BCFC 00268C3C 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026BD00 00268C40 7C 08 02 A6 */ mflr r0 +/* 8026BD04 00268C44 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026BD08 00268C48 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026BD0C 00268C4C 48 0F 64 CD */ bl _savegpr_28 +/* 8026BD10 00268C50 7C 7C 1B 78 */ mr r28, r3 +/* 8026BD14 00268C54 7C 9D 23 78 */ mr r29, r4 +/* 8026BD18 00268C58 7C BE 2B 78 */ mr r30, r5 +/* 8026BD1C 00268C5C 7C DF 33 78 */ mr r31, r6 +/* 8026BD20 00268C60 38 A1 00 08 */ addi r5, r1, 8 +/* 8026BD24 00268C64 48 0D B3 91 */ bl PSVECSubtract +/* 8026BD28 00268C68 38 61 00 08 */ addi r3, r1, 8 +/* 8026BD2C 00268C6C 48 0D B4 25 */ bl PSVECMag +/* 8026BD30 00268C70 D0 3E 00 00 */ stfs f1, 0(r30) +/* 8026BD34 00268C74 C0 3C 00 0C */ lfs f1, 0xc(r28) +/* 8026BD38 00268C78 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026BD3C 00268C7C EC 21 00 2A */ fadds f1, f1, f0 +/* 8026BD40 00268C80 C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026BD44 00268C84 EC 01 00 28 */ fsubs f0, f1, f0 +/* 8026BD48 00268C88 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026BD4C 00268C8C C0 3F 00 00 */ lfs f1, 0(r31) +/* 8026BD50 00268C90 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026BD54 00268C94 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026BD58 00268C98 40 81 00 0C */ ble lbl_8026BD64 +/* 8026BD5C 00268C9C 38 60 00 01 */ li r3, 1 +/* 8026BD60 00268CA0 48 00 00 10 */ b lbl_8026BD70 +lbl_8026BD64: +/* 8026BD64 00268CA4 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026BD68 00268CA8 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026BD6C 00268CAC 38 60 00 00 */ li r3, 0 +lbl_8026BD70: +/* 8026BD70 00268CB0 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026BD74 00268CB4 48 0F 64 B1 */ bl _restgpr_28 +/* 8026BD78 00268CB8 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026BD7C 00268CBC 7C 08 03 A6 */ mtlr r0 +/* 8026BD80 00268CC0 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026BD84 00268CC4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026BD88.s b/include/SComponent/c_m3d/asm/func_8026BD88.s new file mode 100644 index 0000000000..eafdfcba6a --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026BD88.s @@ -0,0 +1,57 @@ +/* 8026BD88 00268CC8 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 8026BD8C 00268CCC 7C 08 02 A6 */ mflr r0 +/* 8026BD90 00268CD0 90 01 00 44 */ stw r0, 0x44(r1) +/* 8026BD94 00268CD4 DB E1 00 30 */ stfd f31, 0x30(r1) +/* 8026BD98 00268CD8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 +/* 8026BD9C 00268CDC 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026BDA0 00268CE0 48 0F 64 3D */ bl _savegpr_29 +/* 8026BDA4 00268CE4 7C 7D 1B 78 */ mr r29, r3 +/* 8026BDA8 00268CE8 7C 9E 23 78 */ mr r30, r4 +/* 8026BDAC 00268CEC 7C BF 2B 78 */ mr r31, r5 +/* 8026BDB0 00268CF0 38 A1 00 0C */ addi r5, r1, 0xc +/* 8026BDB4 00268CF4 38 C1 00 08 */ addi r6, r1, 8 +/* 8026BDB8 00268CF8 4B FF FF 45 */ bl cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf +/* 8026BDBC 00268CFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026BDC0 00268D00 41 82 00 78 */ beq lbl_8026BE38 +/* 8026BDC4 00268D04 C0 41 00 0C */ lfs f2, 0xc(r1) +/* 8026BDC8 00268D08 FC 00 12 10 */ fabs f0, f2 +/* 8026BDCC 00268D0C FC 20 00 18 */ frsp f1, f0 +/* 8026BDD0 00268D10 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026BDD4 00268D14 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026BDD8 00268D18 41 80 00 40 */ blt lbl_8026BE18 +/* 8026BDDC 00268D1C C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026BDE0 00268D20 EF E0 10 24 */ fdivs f31, f0, f2 +/* 8026BDE4 00268D24 7F A3 EB 78 */ mr r3, r29 +/* 8026BDE8 00268D28 7F C4 F3 78 */ mr r4, r30 +/* 8026BDEC 00268D2C 38 A1 00 10 */ addi r5, r1, 0x10 +/* 8026BDF0 00268D30 48 0D B2 C5 */ bl PSVECSubtract +/* 8026BDF4 00268D34 38 61 00 10 */ addi r3, r1, 0x10 +/* 8026BDF8 00268D38 7C 64 1B 78 */ mr r4, r3 +/* 8026BDFC 00268D3C FC 20 F8 90 */ fmr f1, f31 +/* 8026BE00 00268D40 48 0D B2 D9 */ bl PSVECScale +/* 8026BE04 00268D44 38 61 00 10 */ addi r3, r1, 0x10 +/* 8026BE08 00268D48 7F C4 F3 78 */ mr r4, r30 +/* 8026BE0C 00268D4C 7F E5 FB 78 */ mr r5, r31 +/* 8026BE10 00268D50 48 0D B2 81 */ bl PSVECAdd +/* 8026BE14 00268D54 48 00 00 1C */ b lbl_8026BE30 +lbl_8026BE18: +/* 8026BE18 00268D58 C0 1D 00 00 */ lfs f0, 0(r29) +/* 8026BE1C 00268D5C D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026BE20 00268D60 C0 1D 00 04 */ lfs f0, 4(r29) +/* 8026BE24 00268D64 D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026BE28 00268D68 C0 1D 00 08 */ lfs f0, 8(r29) +/* 8026BE2C 00268D6C D0 1F 00 08 */ stfs f0, 8(r31) +lbl_8026BE30: +/* 8026BE30 00268D70 38 60 00 01 */ li r3, 1 +/* 8026BE34 00268D74 48 00 00 08 */ b lbl_8026BE3C +lbl_8026BE38: +/* 8026BE38 00268D78 38 60 00 00 */ li r3, 0 +lbl_8026BE3C: +/* 8026BE3C 00268D7C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 +/* 8026BE40 00268D80 CB E1 00 30 */ lfd f31, 0x30(r1) +/* 8026BE44 00268D84 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026BE48 00268D88 48 0F 63 E1 */ bl _restgpr_29 +/* 8026BE4C 00268D8C 80 01 00 44 */ lwz r0, 0x44(r1) +/* 8026BE50 00268D90 7C 08 03 A6 */ mtlr r0 +/* 8026BE54 00268D94 38 21 00 40 */ addi r1, r1, 0x40 +/* 8026BE58 00268D98 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026BE5C.s b/include/SComponent/c_m3d/asm/func_8026BE5C.s new file mode 100644 index 0000000000..e68f9f061d --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026BE5C.s @@ -0,0 +1,44 @@ +/* 8026BE5C 00268D9C 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026BE60 00268DA0 7C 08 02 A6 */ mflr r0 +/* 8026BE64 00268DA4 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026BE68 00268DA8 93 E1 00 2C */ stw r31, 0x2c(r1) +/* 8026BE6C 00268DAC 93 C1 00 28 */ stw r30, 0x28(r1) +/* 8026BE70 00268DB0 7C 7E 1B 78 */ mr r30, r3 +/* 8026BE74 00268DB4 7C BF 2B 78 */ mr r31, r5 +/* 8026BE78 00268DB8 38 64 00 14 */ addi r3, r4, 0x14 +/* 8026BE7C 00268DBC 38 84 00 20 */ addi r4, r4, 0x20 +/* 8026BE80 00268DC0 38 A1 00 08 */ addi r5, r1, 8 +/* 8026BE84 00268DC4 48 0D B2 0D */ bl PSVECAdd +/* 8026BE88 00268DC8 38 61 00 08 */ addi r3, r1, 8 +/* 8026BE8C 00268DCC 38 81 00 14 */ addi r4, r1, 0x14 +/* 8026BE90 00268DD0 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026BE94 00268DD4 48 0D B2 45 */ bl PSVECScale +/* 8026BE98 00268DD8 38 61 00 14 */ addi r3, r1, 0x14 +/* 8026BE9C 00268DDC 7F C4 F3 78 */ mr r4, r30 +/* 8026BEA0 00268DE0 48 0D B4 FD */ bl PSVECSquareDistance +/* 8026BEA4 00268DE4 FC 00 0A 10 */ fabs f0, f1 +/* 8026BEA8 00268DE8 FC 40 00 18 */ frsp f2, f0 +/* 8026BEAC 00268DEC C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026BEB0 00268DF0 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026BEB4 00268DF4 40 80 00 20 */ bge lbl_8026BED4 +/* 8026BEB8 00268DF8 C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026BEBC 00268DFC D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026BEC0 00268E00 C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026BEC4 00268E04 D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026BEC8 00268E08 C0 1E 00 08 */ lfs f0, 8(r30) +/* 8026BECC 00268E0C D0 1F 00 08 */ stfs f0, 8(r31) +/* 8026BED0 00268E10 48 00 00 1C */ b lbl_8026BEEC +lbl_8026BED4: +/* 8026BED4 00268E14 7F C3 F3 78 */ mr r3, r30 +/* 8026BED8 00268E18 38 81 00 14 */ addi r4, r1, 0x14 +/* 8026BEDC 00268E1C C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026BEE0 00268E20 EC 20 08 24 */ fdivs f1, f0, f1 +/* 8026BEE4 00268E24 7F E5 FB 78 */ mr r5, r31 +/* 8026BEE8 00268E28 4B FF C6 C9 */ bl cM3d_InDivPos2__FPC3VecPC3VecfP3Vec +lbl_8026BEEC: +/* 8026BEEC 00268E2C 83 E1 00 2C */ lwz r31, 0x2c(r1) +/* 8026BEF0 00268E30 83 C1 00 28 */ lwz r30, 0x28(r1) +/* 8026BEF4 00268E34 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026BEF8 00268E38 7C 08 03 A6 */ mtlr r0 +/* 8026BEFC 00268E3C 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026BF00 00268E40 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026BF04.s b/include/SComponent/c_m3d/asm/func_8026BF04.s new file mode 100644 index 0000000000..ac3c3ea1ac --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026BF04.s @@ -0,0 +1,217 @@ +/* 8026BF04 00268E44 94 21 FF 10 */ stwu r1, -0xf0(r1) +/* 8026BF08 00268E48 7C 08 02 A6 */ mflr r0 +/* 8026BF0C 00268E4C 90 01 00 F4 */ stw r0, 0xf4(r1) +/* 8026BF10 00268E50 39 61 00 F0 */ addi r11, r1, 0xf0 +/* 8026BF14 00268E54 48 0F 62 C9 */ bl _savegpr_29 +/* 8026BF18 00268E58 7C 7D 1B 78 */ mr r29, r3 +/* 8026BF1C 00268E5C 7C 9E 23 78 */ mr r30, r4 +/* 8026BF20 00268E60 7C BF 2B 78 */ mr r31, r5 +/* 8026BF24 00268E64 38 7E 00 14 */ addi r3, r30, 0x14 +/* 8026BF28 00268E68 38 9E 00 20 */ addi r4, r30, 0x20 +/* 8026BF2C 00268E6C 38 BE 00 2C */ addi r5, r30, 0x2c +/* 8026BF30 00268E70 7F A6 EB 78 */ mr r6, r29 +/* 8026BF34 00268E74 C0 3D 00 0C */ lfs f1, 0xc(r29) +/* 8026BF38 00268E78 4B FF DC F5 */ bl cM3d_InclusionCheckPosIn3PosBox3d__FPC3VecPC3VecPC3VecPC3Vecf +/* 8026BF3C 00268E7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026BF40 00268E80 40 82 00 0C */ bne lbl_8026BF4C +/* 8026BF44 00268E84 38 60 00 00 */ li r3, 0 +/* 8026BF48 00268E88 48 00 02 CC */ b lbl_8026C214 +lbl_8026BF4C: +/* 8026BF4C 00268E8C 7F C3 F3 78 */ mr r3, r30 +/* 8026BF50 00268E90 7F A4 EB 78 */ mr r4, r29 +/* 8026BF54 00268E94 4B FF C8 C1 */ bl cM3d_SignedLenPlaAndPos__FPC8cM3dGPlaPC3Vec +/* 8026BF58 00268E98 FC 00 0A 10 */ fabs f0, f1 +/* 8026BF5C 00268E9C FC 40 00 18 */ frsp f2, f0 +/* 8026BF60 00268EA0 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026BF64 00268EA4 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026BF68 00268EA8 40 81 00 0C */ ble lbl_8026BF74 +/* 8026BF6C 00268EAC 38 60 00 00 */ li r3, 0 +/* 8026BF70 00268EB0 48 00 02 A4 */ b lbl_8026C214 +lbl_8026BF74: +/* 8026BF74 00268EB4 7F C3 F3 78 */ mr r3, r30 +/* 8026BF78 00268EB8 38 81 00 74 */ addi r4, r1, 0x74 +/* 8026BF7C 00268EBC 48 0D B1 5D */ bl PSVECScale +/* 8026BF80 00268EC0 7F A3 EB 78 */ mr r3, r29 +/* 8026BF84 00268EC4 38 81 00 74 */ addi r4, r1, 0x74 +/* 8026BF88 00268EC8 38 A1 00 80 */ addi r5, r1, 0x80 +/* 8026BF8C 00268ECC 48 0D B1 29 */ bl PSVECSubtract +/* 8026BF90 00268ED0 C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026BF94 00268ED4 FC 00 02 10 */ fabs f0, f0 +/* 8026BF98 00268ED8 FC 00 00 18 */ frsp f0, f0 +/* 8026BF9C 00268EDC C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026BFA0 00268EE0 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026BFA4 00268EE4 40 81 00 3C */ ble lbl_8026BFE0 +/* 8026BFA8 00268EE8 7F C3 F3 78 */ mr r3, r30 +/* 8026BFAC 00268EEC 38 81 00 80 */ addi r4, r1, 0x80 +/* 8026BFB0 00268EF0 C0 22 B7 18 */ lfs f1, lbl_80455118-_SDA2_BASE_(r2) +/* 8026BFB4 00268EF4 4B FF E9 91 */ bl cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vecf +/* 8026BFB8 00268EF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026BFBC 00268EFC 41 82 00 A8 */ beq lbl_8026C064 +/* 8026BFC0 00268F00 28 1F 00 00 */ cmplwi r31, 0 +/* 8026BFC4 00268F04 41 82 00 14 */ beq lbl_8026BFD8 +/* 8026BFC8 00268F08 7F A3 EB 78 */ mr r3, r29 +/* 8026BFCC 00268F0C 7F C4 F3 78 */ mr r4, r30 +/* 8026BFD0 00268F10 7F E5 FB 78 */ mr r5, r31 +/* 8026BFD4 00268F14 4B FF FE 89 */ bl cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec +lbl_8026BFD8: +/* 8026BFD8 00268F18 38 60 00 01 */ li r3, 1 +/* 8026BFDC 00268F1C 48 00 02 38 */ b lbl_8026C214 +lbl_8026BFE0: +/* 8026BFE0 00268F20 C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026BFE4 00268F24 FC 00 02 10 */ fabs f0, f0 +/* 8026BFE8 00268F28 FC 00 00 18 */ frsp f0, f0 +/* 8026BFEC 00268F2C FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026BFF0 00268F30 40 81 00 3C */ ble lbl_8026C02C +/* 8026BFF4 00268F34 7F C3 F3 78 */ mr r3, r30 +/* 8026BFF8 00268F38 38 81 00 80 */ addi r4, r1, 0x80 +/* 8026BFFC 00268F3C C0 22 B7 18 */ lfs f1, lbl_80455118-_SDA2_BASE_(r2) +/* 8026C000 00268F40 4B FF DE 19 */ bl cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf +/* 8026C004 00268F44 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026C008 00268F48 41 82 00 5C */ beq lbl_8026C064 +/* 8026C00C 00268F4C 28 1F 00 00 */ cmplwi r31, 0 +/* 8026C010 00268F50 41 82 00 14 */ beq lbl_8026C024 +/* 8026C014 00268F54 7F A3 EB 78 */ mr r3, r29 +/* 8026C018 00268F58 7F C4 F3 78 */ mr r4, r30 +/* 8026C01C 00268F5C 7F E5 FB 78 */ mr r5, r31 +/* 8026C020 00268F60 4B FF FE 3D */ bl cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec +lbl_8026C024: +/* 8026C024 00268F64 38 60 00 01 */ li r3, 1 +/* 8026C028 00268F68 48 00 01 EC */ b lbl_8026C214 +lbl_8026C02C: +/* 8026C02C 00268F6C 7F C3 F3 78 */ mr r3, r30 +/* 8026C030 00268F70 38 81 00 80 */ addi r4, r1, 0x80 +/* 8026C034 00268F74 C0 22 B7 18 */ lfs f1, lbl_80455118-_SDA2_BASE_(r2) +/* 8026C038 00268F78 4B FF EB A1 */ bl cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vecf +/* 8026C03C 00268F7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026C040 00268F80 41 82 00 24 */ beq lbl_8026C064 +/* 8026C044 00268F84 28 1F 00 00 */ cmplwi r31, 0 +/* 8026C048 00268F88 41 82 00 14 */ beq lbl_8026C05C +/* 8026C04C 00268F8C 7F A3 EB 78 */ mr r3, r29 +/* 8026C050 00268F90 7F C4 F3 78 */ mr r4, r30 +/* 8026C054 00268F94 7F E5 FB 78 */ mr r5, r31 +/* 8026C058 00268F98 4B FF FE 05 */ bl cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec +lbl_8026C05C: +/* 8026C05C 00268F9C 38 60 00 01 */ li r3, 1 +/* 8026C060 00268FA0 48 00 01 B4 */ b lbl_8026C214 +lbl_8026C064: +/* 8026C064 00268FA4 C0 1E 00 14 */ lfs f0, 0x14(r30) +/* 8026C068 00268FA8 D0 01 00 68 */ stfs f0, 0x68(r1) +/* 8026C06C 00268FAC C0 1E 00 18 */ lfs f0, 0x18(r30) +/* 8026C070 00268FB0 D0 01 00 6C */ stfs f0, 0x6c(r1) +/* 8026C074 00268FB4 C0 1E 00 1C */ lfs f0, 0x1c(r30) +/* 8026C078 00268FB8 D0 01 00 70 */ stfs f0, 0x70(r1) +/* 8026C07C 00268FBC C0 1E 00 20 */ lfs f0, 0x20(r30) +/* 8026C080 00268FC0 D0 01 00 5C */ stfs f0, 0x5c(r1) +/* 8026C084 00268FC4 C0 1E 00 24 */ lfs f0, 0x24(r30) +/* 8026C088 00268FC8 D0 01 00 60 */ stfs f0, 0x60(r1) +/* 8026C08C 00268FCC C0 1E 00 28 */ lfs f0, 0x28(r30) +/* 8026C090 00268FD0 D0 01 00 64 */ stfs f0, 0x64(r1) +/* 8026C094 00268FD4 38 61 00 C4 */ addi r3, r1, 0xc4 +/* 8026C098 00268FD8 38 81 00 68 */ addi r4, r1, 0x68 +/* 8026C09C 00268FDC 38 A1 00 5C */ addi r5, r1, 0x5c +/* 8026C0A0 00268FE0 48 00 32 09 */ bl __ct__8cM3dGLinFRC4cXyzRC4cXyz +/* 8026C0A4 00268FE4 38 61 00 C4 */ addi r3, r1, 0xc4 +/* 8026C0A8 00268FE8 7F A4 EB 78 */ mr r4, r29 +/* 8026C0AC 00268FEC 38 A1 00 20 */ addi r5, r1, 0x20 +/* 8026C0B0 00268FF0 4B FF F1 D1 */ bl cM3d_Cross_LinSph__FPC8cM3dGLinPC8cM3dGSphP3Vec +/* 8026C0B4 00268FF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026C0B8 00268FF8 41 82 00 30 */ beq lbl_8026C0E8 +/* 8026C0BC 00268FFC 28 1F 00 00 */ cmplwi r31, 0 +/* 8026C0C0 00269000 41 82 00 14 */ beq lbl_8026C0D4 +/* 8026C0C4 00269004 7F A3 EB 78 */ mr r3, r29 +/* 8026C0C8 00269008 7F C4 F3 78 */ mr r4, r30 +/* 8026C0CC 0026900C 7F E5 FB 78 */ mr r5, r31 +/* 8026C0D0 00269010 4B FF FD 8D */ bl cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec +lbl_8026C0D4: +/* 8026C0D4 00269014 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026C0D8 00269018 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026C0DC 0026901C 90 01 00 DC */ stw r0, 0xdc(r1) +/* 8026C0E0 00269020 38 60 00 01 */ li r3, 1 +/* 8026C0E4 00269024 48 00 01 30 */ b lbl_8026C214 +lbl_8026C0E8: +/* 8026C0E8 00269028 C0 1E 00 20 */ lfs f0, 0x20(r30) +/* 8026C0EC 0026902C D0 01 00 50 */ stfs f0, 0x50(r1) +/* 8026C0F0 00269030 C0 1E 00 24 */ lfs f0, 0x24(r30) +/* 8026C0F4 00269034 D0 01 00 54 */ stfs f0, 0x54(r1) +/* 8026C0F8 00269038 C0 1E 00 28 */ lfs f0, 0x28(r30) +/* 8026C0FC 0026903C D0 01 00 58 */ stfs f0, 0x58(r1) +/* 8026C100 00269040 C0 1E 00 2C */ lfs f0, 0x2c(r30) +/* 8026C104 00269044 D0 01 00 44 */ stfs f0, 0x44(r1) +/* 8026C108 00269048 C0 1E 00 30 */ lfs f0, 0x30(r30) +/* 8026C10C 0026904C D0 01 00 48 */ stfs f0, 0x48(r1) +/* 8026C110 00269050 C0 1E 00 34 */ lfs f0, 0x34(r30) +/* 8026C114 00269054 D0 01 00 4C */ stfs f0, 0x4c(r1) +/* 8026C118 00269058 38 61 00 A8 */ addi r3, r1, 0xa8 +/* 8026C11C 0026905C 38 81 00 50 */ addi r4, r1, 0x50 +/* 8026C120 00269060 38 A1 00 44 */ addi r5, r1, 0x44 +/* 8026C124 00269064 48 00 31 85 */ bl __ct__8cM3dGLinFRC4cXyzRC4cXyz +/* 8026C128 00269068 38 61 00 A8 */ addi r3, r1, 0xa8 +/* 8026C12C 0026906C 7F A4 EB 78 */ mr r4, r29 +/* 8026C130 00269070 38 A1 00 14 */ addi r5, r1, 0x14 +/* 8026C134 00269074 4B FF F1 4D */ bl cM3d_Cross_LinSph__FPC8cM3dGLinPC8cM3dGSphP3Vec +/* 8026C138 00269078 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026C13C 0026907C 41 82 00 34 */ beq lbl_8026C170 +/* 8026C140 00269080 28 1F 00 00 */ cmplwi r31, 0 +/* 8026C144 00269084 41 82 00 14 */ beq lbl_8026C158 +/* 8026C148 00269088 7F A3 EB 78 */ mr r3, r29 +/* 8026C14C 0026908C 7F C4 F3 78 */ mr r4, r30 +/* 8026C150 00269090 7F E5 FB 78 */ mr r5, r31 +/* 8026C154 00269094 4B FF FD 09 */ bl cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec +lbl_8026C158: +/* 8026C158 00269098 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026C15C 0026909C 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026C160 002690A0 90 01 00 C0 */ stw r0, 0xc0(r1) +/* 8026C164 002690A4 90 01 00 DC */ stw r0, 0xdc(r1) +/* 8026C168 002690A8 38 60 00 01 */ li r3, 1 +/* 8026C16C 002690AC 48 00 00 A8 */ b lbl_8026C214 +lbl_8026C170: +/* 8026C170 002690B0 C0 1E 00 2C */ lfs f0, 0x2c(r30) +/* 8026C174 002690B4 D0 01 00 38 */ stfs f0, 0x38(r1) +/* 8026C178 002690B8 C0 1E 00 30 */ lfs f0, 0x30(r30) +/* 8026C17C 002690BC D0 01 00 3C */ stfs f0, 0x3c(r1) +/* 8026C180 002690C0 C0 1E 00 34 */ lfs f0, 0x34(r30) +/* 8026C184 002690C4 D0 01 00 40 */ stfs f0, 0x40(r1) +/* 8026C188 002690C8 C0 1E 00 14 */ lfs f0, 0x14(r30) +/* 8026C18C 002690CC D0 01 00 2C */ stfs f0, 0x2c(r1) +/* 8026C190 002690D0 C0 1E 00 18 */ lfs f0, 0x18(r30) +/* 8026C194 002690D4 D0 01 00 30 */ stfs f0, 0x30(r1) +/* 8026C198 002690D8 C0 1E 00 1C */ lfs f0, 0x1c(r30) +/* 8026C19C 002690DC D0 01 00 34 */ stfs f0, 0x34(r1) +/* 8026C1A0 002690E0 38 61 00 8C */ addi r3, r1, 0x8c +/* 8026C1A4 002690E4 38 81 00 38 */ addi r4, r1, 0x38 +/* 8026C1A8 002690E8 38 A1 00 2C */ addi r5, r1, 0x2c +/* 8026C1AC 002690EC 48 00 30 FD */ bl __ct__8cM3dGLinFRC4cXyzRC4cXyz +/* 8026C1B0 002690F0 38 61 00 8C */ addi r3, r1, 0x8c +/* 8026C1B4 002690F4 7F A4 EB 78 */ mr r4, r29 +/* 8026C1B8 002690F8 38 A1 00 08 */ addi r5, r1, 8 +/* 8026C1BC 002690FC 4B FF F0 C5 */ bl cM3d_Cross_LinSph__FPC8cM3dGLinPC8cM3dGSphP3Vec +/* 8026C1C0 00269100 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026C1C4 00269104 41 82 00 38 */ beq lbl_8026C1FC +/* 8026C1C8 00269108 28 1F 00 00 */ cmplwi r31, 0 +/* 8026C1CC 0026910C 41 82 00 14 */ beq lbl_8026C1E0 +/* 8026C1D0 00269110 7F A3 EB 78 */ mr r3, r29 +/* 8026C1D4 00269114 7F C4 F3 78 */ mr r4, r30 +/* 8026C1D8 00269118 7F E5 FB 78 */ mr r5, r31 +/* 8026C1DC 0026911C 4B FF FC 81 */ bl cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec +lbl_8026C1E0: +/* 8026C1E0 00269120 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026C1E4 00269124 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026C1E8 00269128 90 01 00 A4 */ stw r0, 0xa4(r1) +/* 8026C1EC 0026912C 90 01 00 C0 */ stw r0, 0xc0(r1) +/* 8026C1F0 00269130 90 01 00 DC */ stw r0, 0xdc(r1) +/* 8026C1F4 00269134 38 60 00 01 */ li r3, 1 +/* 8026C1F8 00269138 48 00 00 1C */ b lbl_8026C214 +lbl_8026C1FC: +/* 8026C1FC 0026913C 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026C200 00269140 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026C204 00269144 90 01 00 A4 */ stw r0, 0xa4(r1) +/* 8026C208 00269148 90 01 00 C0 */ stw r0, 0xc0(r1) +/* 8026C20C 0026914C 90 01 00 DC */ stw r0, 0xdc(r1) +/* 8026C210 00269150 38 60 00 00 */ li r3, 0 +lbl_8026C214: +/* 8026C214 00269154 39 61 00 F0 */ addi r11, r1, 0xf0 +/* 8026C218 00269158 48 0F 60 11 */ bl _restgpr_29 +/* 8026C21C 0026915C 80 01 00 F4 */ lwz r0, 0xf4(r1) +/* 8026C220 00269160 7C 08 03 A6 */ mtlr r0 +/* 8026C224 00269164 38 21 00 F0 */ addi r1, r1, 0xf0 +/* 8026C228 00269168 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026C22C.s b/include/SComponent/c_m3d/asm/func_8026C22C.s new file mode 100644 index 0000000000..2ae3a1d9dc --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026C22C.s @@ -0,0 +1,112 @@ +/* 8026C22C 0026916C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026C230 00269170 C0 23 00 00 */ lfs f1, 0(r3) +/* 8026C234 00269174 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026C238 00269178 EC 41 00 28 */ fsubs f2, f1, f0 +/* 8026C23C 0026917C C0 23 00 08 */ lfs f1, 8(r3) +/* 8026C240 00269180 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026C244 00269184 EC 01 00 28 */ fsubs f0, f1, f0 +/* 8026C248 00269188 EC 22 00 B2 */ fmuls f1, f2, f2 +/* 8026C24C 0026918C EC 00 00 32 */ fmuls f0, f0, f0 +/* 8026C250 00269190 EC 81 00 2A */ fadds f4, f1, f0 +/* 8026C254 00269194 C0 23 00 0C */ lfs f1, 0xc(r3) +/* 8026C258 00269198 C0 04 00 0C */ lfs f0, 0xc(r4) +/* 8026C25C 0026919C EC A1 00 2A */ fadds f5, f1, f0 +/* 8026C260 002691A0 EC 05 01 72 */ fmuls f0, f5, f5 +/* 8026C264 002691A4 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 8026C268 002691A8 40 81 00 14 */ ble lbl_8026C27C +/* 8026C26C 002691AC C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026C270 002691B0 D0 05 00 00 */ stfs f0, 0(r5) +/* 8026C274 002691B4 38 60 00 00 */ li r3, 0 +/* 8026C278 002691B8 48 00 01 34 */ b lbl_8026C3AC +lbl_8026C27C: +/* 8026C27C 002691BC C0 43 00 04 */ lfs f2, 4(r3) +/* 8026C280 002691C0 C0 03 00 10 */ lfs f0, 0x10(r3) +/* 8026C284 002691C4 EC 02 00 2A */ fadds f0, f2, f0 +/* 8026C288 002691C8 C0 24 00 04 */ lfs f1, 4(r4) +/* 8026C28C 002691CC FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026C290 002691D0 41 80 00 14 */ blt lbl_8026C2A4 +/* 8026C294 002691D4 C0 04 00 10 */ lfs f0, 0x10(r4) +/* 8026C298 002691D8 EC 01 00 2A */ fadds f0, f1, f0 +/* 8026C29C 002691DC FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026C2A0 002691E0 40 81 00 14 */ ble lbl_8026C2B4 +lbl_8026C2A4: +/* 8026C2A4 002691E4 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026C2A8 002691E8 D0 05 00 00 */ stfs f0, 0(r5) +/* 8026C2AC 002691EC 38 60 00 00 */ li r3, 0 +/* 8026C2B0 002691F0 48 00 00 FC */ b lbl_8026C3AC +lbl_8026C2B4: +/* 8026C2B4 002691F4 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026C2B8 002691F8 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 8026C2BC 002691FC 40 81 00 58 */ ble lbl_8026C314 +/* 8026C2C0 00269200 FC 00 20 34 */ frsqrte f0, f4 +/* 8026C2C4 00269204 C8 62 B7 20 */ lfd f3, lbl_80455120-_SDA2_BASE_(r2) +/* 8026C2C8 00269208 FC 23 00 32 */ fmul f1, f3, f0 +/* 8026C2CC 0026920C C8 42 B7 28 */ lfd f2, lbl_80455128-_SDA2_BASE_(r2) +/* 8026C2D0 00269210 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026C2D4 00269214 FC 04 00 32 */ fmul f0, f4, f0 +/* 8026C2D8 00269218 FC 02 00 28 */ fsub f0, f2, f0 +/* 8026C2DC 0026921C FC 01 00 32 */ fmul f0, f1, f0 +/* 8026C2E0 00269220 FC 23 00 32 */ fmul f1, f3, f0 +/* 8026C2E4 00269224 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026C2E8 00269228 FC 04 00 32 */ fmul f0, f4, f0 +/* 8026C2EC 0026922C FC 02 00 28 */ fsub f0, f2, f0 +/* 8026C2F0 00269230 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026C2F4 00269234 FC 23 00 32 */ fmul f1, f3, f0 +/* 8026C2F8 00269238 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026C2FC 0026923C FC 04 00 32 */ fmul f0, f4, f0 +/* 8026C300 00269240 FC 02 00 28 */ fsub f0, f2, f0 +/* 8026C304 00269244 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026C308 00269248 FC 04 00 32 */ fmul f0, f4, f0 +/* 8026C30C 0026924C FC 00 00 18 */ frsp f0, f0 +/* 8026C310 00269250 48 00 00 90 */ b lbl_8026C3A0 +lbl_8026C314: +/* 8026C314 00269254 C8 02 B7 30 */ lfd f0, lbl_80455130-_SDA2_BASE_(r2) +/* 8026C318 00269258 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 8026C31C 0026925C 40 80 00 10 */ bge lbl_8026C32C +/* 8026C320 00269260 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026C324 00269264 C0 03 0A E0 */ lfs f0, lbl_80450AE0@l(r3) +/* 8026C328 00269268 48 00 00 78 */ b lbl_8026C3A0 +lbl_8026C32C: +/* 8026C32C 0026926C D0 81 00 08 */ stfs f4, 8(r1) +/* 8026C330 00269270 80 81 00 08 */ lwz r4, 8(r1) +/* 8026C334 00269274 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8026C338 00269278 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026C33C 0026927C 7C 03 00 00 */ cmpw r3, r0 +/* 8026C340 00269280 41 82 00 14 */ beq lbl_8026C354 +/* 8026C344 00269284 40 80 00 40 */ bge lbl_8026C384 +/* 8026C348 00269288 2C 03 00 00 */ cmpwi r3, 0 +/* 8026C34C 0026928C 41 82 00 20 */ beq lbl_8026C36C +/* 8026C350 00269290 48 00 00 34 */ b lbl_8026C384 +lbl_8026C354: +/* 8026C354 00269294 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026C358 00269298 41 82 00 0C */ beq lbl_8026C364 +/* 8026C35C 0026929C 38 00 00 01 */ li r0, 1 +/* 8026C360 002692A0 48 00 00 28 */ b lbl_8026C388 +lbl_8026C364: +/* 8026C364 002692A4 38 00 00 02 */ li r0, 2 +/* 8026C368 002692A8 48 00 00 20 */ b lbl_8026C388 +lbl_8026C36C: +/* 8026C36C 002692AC 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026C370 002692B0 41 82 00 0C */ beq lbl_8026C37C +/* 8026C374 002692B4 38 00 00 05 */ li r0, 5 +/* 8026C378 002692B8 48 00 00 10 */ b lbl_8026C388 +lbl_8026C37C: +/* 8026C37C 002692BC 38 00 00 03 */ li r0, 3 +/* 8026C380 002692C0 48 00 00 08 */ b lbl_8026C388 +lbl_8026C384: +/* 8026C384 002692C4 38 00 00 04 */ li r0, 4 +lbl_8026C388: +/* 8026C388 002692C8 2C 00 00 01 */ cmpwi r0, 1 +/* 8026C38C 002692CC 40 82 00 10 */ bne lbl_8026C39C +/* 8026C390 002692D0 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026C394 002692D4 C0 03 0A E0 */ lfs f0, lbl_80450AE0@l(r3) +/* 8026C398 002692D8 48 00 00 08 */ b lbl_8026C3A0 +lbl_8026C39C: +/* 8026C39C 002692DC FC 00 20 90 */ fmr f0, f4 +lbl_8026C3A0: +/* 8026C3A0 002692E0 EC 05 00 28 */ fsubs f0, f5, f0 +/* 8026C3A4 002692E4 D0 05 00 00 */ stfs f0, 0(r5) +/* 8026C3A8 002692E8 38 60 00 01 */ li r3, 1 +lbl_8026C3AC: +/* 8026C3AC 002692EC 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026C3B0 002692F0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026C3B4.s b/include/SComponent/c_m3d/asm/func_8026C3B4.s new file mode 100644 index 0000000000..87b9aa686b --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026C3B4.s @@ -0,0 +1,153 @@ +/* 8026C3B4 002692F4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026C3B8 002692F8 C0 23 00 00 */ lfs f1, 0(r3) +/* 8026C3BC 002692FC C0 04 00 00 */ lfs f0, 0(r4) +/* 8026C3C0 00269300 EC 41 00 28 */ fsubs f2, f1, f0 +/* 8026C3C4 00269304 C0 23 00 08 */ lfs f1, 8(r3) +/* 8026C3C8 00269308 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026C3CC 0026930C EC 01 00 28 */ fsubs f0, f1, f0 +/* 8026C3D0 00269310 EC 22 00 B2 */ fmuls f1, f2, f2 +/* 8026C3D4 00269314 EC 00 00 32 */ fmuls f0, f0, f0 +/* 8026C3D8 00269318 EC 81 00 2A */ fadds f4, f1, f0 +/* 8026C3DC 0026931C C0 23 00 0C */ lfs f1, 0xc(r3) +/* 8026C3E0 00269320 C0 04 00 0C */ lfs f0, 0xc(r4) +/* 8026C3E4 00269324 EC 01 00 2A */ fadds f0, f1, f0 +/* 8026C3E8 00269328 EC 00 00 32 */ fmuls f0, f0, f0 +/* 8026C3EC 0026932C FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 8026C3F0 00269330 40 81 00 0C */ ble lbl_8026C3FC +/* 8026C3F4 00269334 38 60 00 00 */ li r3, 0 +/* 8026C3F8 00269338 48 00 01 D0 */ b lbl_8026C5C8 +lbl_8026C3FC: +/* 8026C3FC 0026933C C0 43 00 04 */ lfs f2, 4(r3) +/* 8026C400 00269340 C0 03 00 10 */ lfs f0, 0x10(r3) +/* 8026C404 00269344 EC 02 00 2A */ fadds f0, f2, f0 +/* 8026C408 00269348 C0 24 00 04 */ lfs f1, 4(r4) +/* 8026C40C 0026934C FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026C410 00269350 41 80 00 14 */ blt lbl_8026C424 +/* 8026C414 00269354 C0 04 00 10 */ lfs f0, 0x10(r4) +/* 8026C418 00269358 EC 01 00 2A */ fadds f0, f1, f0 +/* 8026C41C 0026935C FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026C420 00269360 40 81 00 0C */ ble lbl_8026C42C +lbl_8026C424: +/* 8026C424 00269364 38 60 00 00 */ li r3, 0 +/* 8026C428 00269368 48 00 01 A0 */ b lbl_8026C5C8 +lbl_8026C42C: +/* 8026C42C 0026936C C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026C430 00269370 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 8026C434 00269374 40 81 00 58 */ ble lbl_8026C48C +/* 8026C438 00269378 FC 00 20 34 */ frsqrte f0, f4 +/* 8026C43C 0026937C C8 62 B7 20 */ lfd f3, lbl_80455120-_SDA2_BASE_(r2) +/* 8026C440 00269380 FC 23 00 32 */ fmul f1, f3, f0 +/* 8026C444 00269384 C8 42 B7 28 */ lfd f2, lbl_80455128-_SDA2_BASE_(r2) +/* 8026C448 00269388 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026C44C 0026938C FC 04 00 32 */ fmul f0, f4, f0 +/* 8026C450 00269390 FC 02 00 28 */ fsub f0, f2, f0 +/* 8026C454 00269394 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026C458 00269398 FC 23 00 32 */ fmul f1, f3, f0 +/* 8026C45C 0026939C FC 00 00 32 */ fmul f0, f0, f0 +/* 8026C460 002693A0 FC 04 00 32 */ fmul f0, f4, f0 +/* 8026C464 002693A4 FC 02 00 28 */ fsub f0, f2, f0 +/* 8026C468 002693A8 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026C46C 002693AC FC 23 00 32 */ fmul f1, f3, f0 +/* 8026C470 002693B0 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026C474 002693B4 FC 04 00 32 */ fmul f0, f4, f0 +/* 8026C478 002693B8 FC 02 00 28 */ fsub f0, f2, f0 +/* 8026C47C 002693BC FC 01 00 32 */ fmul f0, f1, f0 +/* 8026C480 002693C0 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026C484 002693C4 FC 40 10 18 */ frsp f2, f2 +/* 8026C488 002693C8 48 00 00 90 */ b lbl_8026C518 +lbl_8026C48C: +/* 8026C48C 002693CC C8 02 B7 30 */ lfd f0, lbl_80455130-_SDA2_BASE_(r2) +/* 8026C490 002693D0 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 8026C494 002693D4 40 80 00 10 */ bge lbl_8026C4A4 +/* 8026C498 002693D8 3C C0 80 45 */ lis r6, lbl_80450AE0@ha +/* 8026C49C 002693DC C0 46 0A E0 */ lfs f2, lbl_80450AE0@l(r6) +/* 8026C4A0 002693E0 48 00 00 78 */ b lbl_8026C518 +lbl_8026C4A4: +/* 8026C4A4 002693E4 D0 81 00 08 */ stfs f4, 8(r1) +/* 8026C4A8 002693E8 80 E1 00 08 */ lwz r7, 8(r1) +/* 8026C4AC 002693EC 54 E6 00 50 */ rlwinm r6, r7, 0, 1, 8 +/* 8026C4B0 002693F0 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026C4B4 002693F4 7C 06 00 00 */ cmpw r6, r0 +/* 8026C4B8 002693F8 41 82 00 14 */ beq lbl_8026C4CC +/* 8026C4BC 002693FC 40 80 00 40 */ bge lbl_8026C4FC +/* 8026C4C0 00269400 2C 06 00 00 */ cmpwi r6, 0 +/* 8026C4C4 00269404 41 82 00 20 */ beq lbl_8026C4E4 +/* 8026C4C8 00269408 48 00 00 34 */ b lbl_8026C4FC +lbl_8026C4CC: +/* 8026C4CC 0026940C 54 E0 02 7F */ clrlwi. r0, r7, 9 +/* 8026C4D0 00269410 41 82 00 0C */ beq lbl_8026C4DC +/* 8026C4D4 00269414 38 00 00 01 */ li r0, 1 +/* 8026C4D8 00269418 48 00 00 28 */ b lbl_8026C500 +lbl_8026C4DC: +/* 8026C4DC 0026941C 38 00 00 02 */ li r0, 2 +/* 8026C4E0 00269420 48 00 00 20 */ b lbl_8026C500 +lbl_8026C4E4: +/* 8026C4E4 00269424 54 E0 02 7F */ clrlwi. r0, r7, 9 +/* 8026C4E8 00269428 41 82 00 0C */ beq lbl_8026C4F4 +/* 8026C4EC 0026942C 38 00 00 05 */ li r0, 5 +/* 8026C4F0 00269430 48 00 00 10 */ b lbl_8026C500 +lbl_8026C4F4: +/* 8026C4F4 00269434 38 00 00 03 */ li r0, 3 +/* 8026C4F8 00269438 48 00 00 08 */ b lbl_8026C500 +lbl_8026C4FC: +/* 8026C4FC 0026943C 38 00 00 04 */ li r0, 4 +lbl_8026C500: +/* 8026C500 00269440 2C 00 00 01 */ cmpwi r0, 1 +/* 8026C504 00269444 40 82 00 10 */ bne lbl_8026C514 +/* 8026C508 00269448 3C C0 80 45 */ lis r6, lbl_80450AE0@ha +/* 8026C50C 0026944C C0 46 0A E0 */ lfs f2, lbl_80450AE0@l(r6) +/* 8026C510 00269450 48 00 00 08 */ b lbl_8026C518 +lbl_8026C514: +/* 8026C514 00269454 FC 40 20 90 */ fmr f2, f4 +lbl_8026C518: +/* 8026C518 00269458 FC 00 12 10 */ fabs f0, f2 +/* 8026C51C 0026945C FC 20 00 18 */ frsp f1, f0 +/* 8026C520 00269460 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026C524 00269464 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026C528 00269468 41 80 00 84 */ blt lbl_8026C5AC +/* 8026C52C 0026946C C0 04 00 0C */ lfs f0, 0xc(r4) +/* 8026C530 00269470 EC 60 10 24 */ fdivs f3, f0, f2 +/* 8026C534 00269474 C0 44 00 04 */ lfs f2, 4(r4) +/* 8026C538 00269478 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026C53C 0026947C C0 04 00 10 */ lfs f0, 0x10(r4) +/* 8026C540 00269480 EC 01 00 32 */ fmuls f0, f1, f0 +/* 8026C544 00269484 EC 02 00 2A */ fadds f0, f2, f0 +/* 8026C548 00269488 D0 05 00 04 */ stfs f0, 4(r5) +/* 8026C54C 0026948C C0 43 00 04 */ lfs f2, 4(r3) +/* 8026C550 00269490 C0 25 00 04 */ lfs f1, 4(r5) +/* 8026C554 00269494 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026C558 00269498 40 80 00 0C */ bge lbl_8026C564 +/* 8026C55C 0026949C D0 45 00 04 */ stfs f2, 4(r5) +/* 8026C560 002694A0 48 00 00 18 */ b lbl_8026C578 +lbl_8026C564: +/* 8026C564 002694A4 C0 03 00 10 */ lfs f0, 0x10(r3) +/* 8026C568 002694A8 EC 42 00 2A */ fadds f2, f2, f0 +/* 8026C56C 002694AC FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026C570 002694B0 40 81 00 08 */ ble lbl_8026C578 +/* 8026C574 002694B4 D0 45 00 04 */ stfs f2, 4(r5) +lbl_8026C578: +/* 8026C578 002694B8 C0 24 00 00 */ lfs f1, 0(r4) +/* 8026C57C 002694BC C0 03 00 00 */ lfs f0, 0(r3) +/* 8026C580 002694C0 EC 00 08 28 */ fsubs f0, f0, f1 +/* 8026C584 002694C4 EC 03 00 32 */ fmuls f0, f3, f0 +/* 8026C588 002694C8 EC 01 00 2A */ fadds f0, f1, f0 +/* 8026C58C 002694CC D0 05 00 00 */ stfs f0, 0(r5) +/* 8026C590 002694D0 C0 24 00 08 */ lfs f1, 8(r4) +/* 8026C594 002694D4 C0 03 00 08 */ lfs f0, 8(r3) +/* 8026C598 002694D8 EC 00 08 28 */ fsubs f0, f0, f1 +/* 8026C59C 002694DC EC 03 00 32 */ fmuls f0, f3, f0 +/* 8026C5A0 002694E0 EC 01 00 2A */ fadds f0, f1, f0 +/* 8026C5A4 002694E4 D0 05 00 08 */ stfs f0, 8(r5) +/* 8026C5A8 002694E8 48 00 00 1C */ b lbl_8026C5C4 +lbl_8026C5AC: +/* 8026C5AC 002694EC C0 04 00 00 */ lfs f0, 0(r4) +/* 8026C5B0 002694F0 D0 05 00 00 */ stfs f0, 0(r5) +/* 8026C5B4 002694F4 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026C5B8 002694F8 D0 05 00 04 */ stfs f0, 4(r5) +/* 8026C5BC 002694FC C0 04 00 08 */ lfs f0, 8(r4) +/* 8026C5C0 00269500 D0 05 00 08 */ stfs f0, 8(r5) +lbl_8026C5C4: +/* 8026C5C4 00269504 38 60 00 01 */ li r3, 1 +lbl_8026C5C8: +/* 8026C5C8 00269508 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026C5CC 0026950C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026C5D0.s b/include/SComponent/c_m3d/asm/func_8026C5D0.s new file mode 100644 index 0000000000..47f887efa6 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026C5D0.s @@ -0,0 +1,241 @@ +/* 8026C5D0 00269510 94 21 FF 70 */ stwu r1, -0x90(r1) +/* 8026C5D4 00269514 7C 08 02 A6 */ mflr r0 +/* 8026C5D8 00269518 90 01 00 94 */ stw r0, 0x94(r1) +/* 8026C5DC 0026951C DB E1 00 80 */ stfd f31, 0x80(r1) +/* 8026C5E0 00269520 F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 +/* 8026C5E4 00269524 DB C1 00 70 */ stfd f30, 0x70(r1) +/* 8026C5E8 00269528 F3 C1 00 78 */ psq_st f30, 120(r1), 0, 0 +/* 8026C5EC 0026952C 39 61 00 70 */ addi r11, r1, 0x70 +/* 8026C5F0 00269530 48 0F 5B ED */ bl _savegpr_29 +/* 8026C5F4 00269534 7C 7D 1B 78 */ mr r29, r3 +/* 8026C5F8 00269538 7C 9E 23 78 */ mr r30, r4 +/* 8026C5FC 0026953C 7C BF 2B 78 */ mr r31, r5 +/* 8026C600 00269540 C0 23 00 04 */ lfs f1, 4(r3) +/* 8026C604 00269544 C0 03 00 10 */ lfs f0, 0x10(r3) +/* 8026C608 00269548 EF E1 00 2A */ fadds f31, f1, f0 +/* 8026C60C 0026954C C0 44 00 18 */ lfs f2, 0x18(r4) +/* 8026C610 00269550 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026C614 00269554 40 81 00 1C */ ble lbl_8026C630 +/* 8026C618 00269558 C0 1E 00 24 */ lfs f0, 0x24(r30) +/* 8026C61C 0026955C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026C620 00269560 40 81 00 10 */ ble lbl_8026C630 +/* 8026C624 00269564 C0 1E 00 30 */ lfs f0, 0x30(r30) +/* 8026C628 00269568 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026C62C 0026956C 41 81 00 24 */ bgt lbl_8026C650 +lbl_8026C630: +/* 8026C630 00269570 FC 1F 10 40 */ fcmpo cr0, f31, f2 +/* 8026C634 00269574 40 80 00 24 */ bge lbl_8026C658 +/* 8026C638 00269578 C0 1E 00 24 */ lfs f0, 0x24(r30) +/* 8026C63C 0026957C FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026C640 00269580 40 80 00 18 */ bge lbl_8026C658 +/* 8026C644 00269584 C0 1E 00 30 */ lfs f0, 0x30(r30) +/* 8026C648 00269588 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026C64C 0026958C 40 80 00 0C */ bge lbl_8026C658 +lbl_8026C650: +/* 8026C650 00269590 38 60 00 00 */ li r3, 0 +/* 8026C654 00269594 48 00 02 C8 */ b lbl_8026C91C +lbl_8026C658: +/* 8026C658 00269598 C3 C2 B7 C8 */ lfs f30, lbl_804551C8-_SDA2_BASE_(r2) +/* 8026C65C 0026959C 7F A3 EB 78 */ mr r3, r29 +/* 8026C660 002695A0 38 9E 00 14 */ addi r4, r30, 0x14 +/* 8026C664 002695A4 38 BE 00 20 */ addi r5, r30, 0x20 +/* 8026C668 002695A8 38 C1 00 54 */ addi r6, r1, 0x54 +/* 8026C66C 002695AC 38 E1 00 48 */ addi r7, r1, 0x48 +/* 8026C670 002695B0 48 00 09 D5 */ bl cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec +/* 8026C674 002695B4 2C 03 00 00 */ cmpwi r3, 0 +/* 8026C678 002695B8 41 82 00 2C */ beq lbl_8026C6A4 +/* 8026C67C 002695BC 38 61 00 54 */ addi r3, r1, 0x54 +/* 8026C680 002695C0 38 9E 00 14 */ addi r4, r30, 0x14 +/* 8026C684 002695C4 48 0D AD 19 */ bl PSVECSquareDistance +/* 8026C688 002695C8 FF C0 08 90 */ fmr f30, f1 +/* 8026C68C 002695CC C0 01 00 54 */ lfs f0, 0x54(r1) +/* 8026C690 002695D0 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026C694 002695D4 C0 01 00 58 */ lfs f0, 0x58(r1) +/* 8026C698 002695D8 D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026C69C 002695DC C0 01 00 5C */ lfs f0, 0x5c(r1) +/* 8026C6A0 002695E0 D0 1F 00 08 */ stfs f0, 8(r31) +lbl_8026C6A4: +/* 8026C6A4 002695E4 7F A3 EB 78 */ mr r3, r29 +/* 8026C6A8 002695E8 38 9E 00 2C */ addi r4, r30, 0x2c +/* 8026C6AC 002695EC 38 BE 00 20 */ addi r5, r30, 0x20 +/* 8026C6B0 002695F0 38 C1 00 54 */ addi r6, r1, 0x54 +/* 8026C6B4 002695F4 38 E1 00 48 */ addi r7, r1, 0x48 +/* 8026C6B8 002695F8 48 00 09 8D */ bl cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec +/* 8026C6BC 002695FC 2C 03 00 00 */ cmpwi r3, 0 +/* 8026C6C0 00269600 41 82 00 34 */ beq lbl_8026C6F4 +/* 8026C6C4 00269604 38 61 00 54 */ addi r3, r1, 0x54 +/* 8026C6C8 00269608 38 9E 00 2C */ addi r4, r30, 0x2c +/* 8026C6CC 0026960C 48 0D AC D1 */ bl PSVECSquareDistance +/* 8026C6D0 00269610 FC 1E 08 40 */ fcmpo cr0, f30, f1 +/* 8026C6D4 00269614 40 81 00 20 */ ble lbl_8026C6F4 +/* 8026C6D8 00269618 FF C0 08 90 */ fmr f30, f1 +/* 8026C6DC 0026961C C0 01 00 54 */ lfs f0, 0x54(r1) +/* 8026C6E0 00269620 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026C6E4 00269624 C0 01 00 58 */ lfs f0, 0x58(r1) +/* 8026C6E8 00269628 D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026C6EC 0026962C C0 01 00 5C */ lfs f0, 0x5c(r1) +/* 8026C6F0 00269630 D0 1F 00 08 */ stfs f0, 8(r31) +lbl_8026C6F4: +/* 8026C6F4 00269634 7F A3 EB 78 */ mr r3, r29 +/* 8026C6F8 00269638 38 9E 00 14 */ addi r4, r30, 0x14 +/* 8026C6FC 0026963C 38 BE 00 2C */ addi r5, r30, 0x2c +/* 8026C700 00269640 38 C1 00 54 */ addi r6, r1, 0x54 +/* 8026C704 00269644 38 E1 00 48 */ addi r7, r1, 0x48 +/* 8026C708 00269648 48 00 09 3D */ bl cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec +/* 8026C70C 0026964C 2C 03 00 00 */ cmpwi r3, 0 +/* 8026C710 00269650 41 82 00 34 */ beq lbl_8026C744 +/* 8026C714 00269654 38 61 00 54 */ addi r3, r1, 0x54 +/* 8026C718 00269658 38 9E 00 14 */ addi r4, r30, 0x14 +/* 8026C71C 0026965C 48 0D AC 81 */ bl PSVECSquareDistance +/* 8026C720 00269660 FC 1E 08 40 */ fcmpo cr0, f30, f1 +/* 8026C724 00269664 40 81 00 20 */ ble lbl_8026C744 +/* 8026C728 00269668 FF C0 08 90 */ fmr f30, f1 +/* 8026C72C 0026966C C0 01 00 54 */ lfs f0, 0x54(r1) +/* 8026C730 00269670 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026C734 00269674 C0 01 00 58 */ lfs f0, 0x58(r1) +/* 8026C738 00269678 D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026C73C 0026967C C0 01 00 5C */ lfs f0, 0x5c(r1) +/* 8026C740 00269680 D0 1F 00 08 */ stfs f0, 8(r31) +lbl_8026C744: +/* 8026C744 00269684 C0 02 B7 C8 */ lfs f0, lbl_804551C8-_SDA2_BASE_(r2) +/* 8026C748 00269688 FC 00 F0 00 */ fcmpu cr0, f0, f30 +/* 8026C74C 0026968C 41 82 00 0C */ beq lbl_8026C758 +/* 8026C750 00269690 38 60 00 01 */ li r3, 1 +/* 8026C754 00269694 48 00 01 C8 */ b lbl_8026C91C +lbl_8026C758: +/* 8026C758 00269698 C0 1D 00 04 */ lfs f0, 4(r29) +/* 8026C75C 0026969C D0 01 00 10 */ stfs f0, 0x10(r1) +/* 8026C760 002696A0 D3 E1 00 14 */ stfs f31, 0x14(r1) +/* 8026C764 002696A4 7F C3 F3 78 */ mr r3, r30 +/* 8026C768 002696A8 7F A4 EB 78 */ mr r4, r29 +/* 8026C76C 002696AC 38 A1 00 10 */ addi r5, r1, 0x10 +/* 8026C770 002696B0 38 C1 00 0C */ addi r6, r1, 0xc +/* 8026C774 002696B4 4B FF E3 75 */ bl cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPC10cM3d_RangePf +/* 8026C778 002696B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026C77C 002696BC 41 82 01 9C */ beq lbl_8026C918 +/* 8026C780 002696C0 C0 1D 00 00 */ lfs f0, 0(r29) +/* 8026C784 002696C4 D0 01 00 3C */ stfs f0, 0x3c(r1) +/* 8026C788 002696C8 C0 1D 00 04 */ lfs f0, 4(r29) +/* 8026C78C 002696CC D0 01 00 40 */ stfs f0, 0x40(r1) +/* 8026C790 002696D0 C0 1D 00 08 */ lfs f0, 8(r29) +/* 8026C794 002696D4 D0 01 00 44 */ stfs f0, 0x44(r1) +/* 8026C798 002696D8 C0 01 00 0C */ lfs f0, 0xc(r1) +/* 8026C79C 002696DC D0 01 00 40 */ stfs f0, 0x40(r1) +/* 8026C7A0 002696E0 38 7E 00 14 */ addi r3, r30, 0x14 +/* 8026C7A4 002696E4 38 9E 00 20 */ addi r4, r30, 0x20 +/* 8026C7A8 002696E8 38 A1 00 18 */ addi r5, r1, 0x18 +/* 8026C7AC 002696EC 48 0D A8 E5 */ bl PSVECAdd +/* 8026C7B0 002696F0 38 61 00 18 */ addi r3, r1, 0x18 +/* 8026C7B4 002696F4 38 81 00 30 */ addi r4, r1, 0x30 +/* 8026C7B8 002696F8 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026C7BC 002696FC 48 0D A9 1D */ bl PSVECScale +/* 8026C7C0 00269700 38 61 00 30 */ addi r3, r1, 0x30 +/* 8026C7C4 00269704 38 81 00 3C */ addi r4, r1, 0x3c +/* 8026C7C8 00269708 38 A1 00 24 */ addi r5, r1, 0x24 +/* 8026C7CC 0026970C 48 0D A8 E9 */ bl PSVECSubtract +/* 8026C7D0 00269710 C0 01 00 24 */ lfs f0, 0x24(r1) +/* 8026C7D4 00269714 EC 20 00 32 */ fmuls f1, f0, f0 +/* 8026C7D8 00269718 C0 01 00 2C */ lfs f0, 0x2c(r1) +/* 8026C7DC 0026971C EC 00 00 32 */ fmuls f0, f0, f0 +/* 8026C7E0 00269720 EC 81 00 2A */ fadds f4, f1, f0 +/* 8026C7E4 00269724 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026C7E8 00269728 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 8026C7EC 0026972C 40 81 00 58 */ ble lbl_8026C844 +/* 8026C7F0 00269730 FC 00 20 34 */ frsqrte f0, f4 +/* 8026C7F4 00269734 C8 62 B7 20 */ lfd f3, lbl_80455120-_SDA2_BASE_(r2) +/* 8026C7F8 00269738 FC 23 00 32 */ fmul f1, f3, f0 +/* 8026C7FC 0026973C C8 42 B7 28 */ lfd f2, lbl_80455128-_SDA2_BASE_(r2) +/* 8026C800 00269740 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026C804 00269744 FC 04 00 32 */ fmul f0, f4, f0 +/* 8026C808 00269748 FC 02 00 28 */ fsub f0, f2, f0 +/* 8026C80C 0026974C FC 01 00 32 */ fmul f0, f1, f0 +/* 8026C810 00269750 FC 23 00 32 */ fmul f1, f3, f0 +/* 8026C814 00269754 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026C818 00269758 FC 04 00 32 */ fmul f0, f4, f0 +/* 8026C81C 0026975C FC 02 00 28 */ fsub f0, f2, f0 +/* 8026C820 00269760 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026C824 00269764 FC 23 00 32 */ fmul f1, f3, f0 +/* 8026C828 00269768 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026C82C 0026976C FC 04 00 32 */ fmul f0, f4, f0 +/* 8026C830 00269770 FC 02 00 28 */ fsub f0, f2, f0 +/* 8026C834 00269774 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026C838 00269778 FC 84 00 32 */ fmul f4, f4, f0 +/* 8026C83C 0026977C FC 80 20 18 */ frsp f4, f4 +/* 8026C840 00269780 48 00 00 88 */ b lbl_8026C8C8 +lbl_8026C844: +/* 8026C844 00269784 C8 02 B7 30 */ lfd f0, lbl_80455130-_SDA2_BASE_(r2) +/* 8026C848 00269788 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 8026C84C 0026978C 40 80 00 10 */ bge lbl_8026C85C +/* 8026C850 00269790 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026C854 00269794 C0 83 0A E0 */ lfs f4, lbl_80450AE0@l(r3) +/* 8026C858 00269798 48 00 00 70 */ b lbl_8026C8C8 +lbl_8026C85C: +/* 8026C85C 0026979C D0 81 00 08 */ stfs f4, 8(r1) +/* 8026C860 002697A0 80 81 00 08 */ lwz r4, 8(r1) +/* 8026C864 002697A4 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8026C868 002697A8 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026C86C 002697AC 7C 03 00 00 */ cmpw r3, r0 +/* 8026C870 002697B0 41 82 00 14 */ beq lbl_8026C884 +/* 8026C874 002697B4 40 80 00 40 */ bge lbl_8026C8B4 +/* 8026C878 002697B8 2C 03 00 00 */ cmpwi r3, 0 +/* 8026C87C 002697BC 41 82 00 20 */ beq lbl_8026C89C +/* 8026C880 002697C0 48 00 00 34 */ b lbl_8026C8B4 +lbl_8026C884: +/* 8026C884 002697C4 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026C888 002697C8 41 82 00 0C */ beq lbl_8026C894 +/* 8026C88C 002697CC 38 00 00 01 */ li r0, 1 +/* 8026C890 002697D0 48 00 00 28 */ b lbl_8026C8B8 +lbl_8026C894: +/* 8026C894 002697D4 38 00 00 02 */ li r0, 2 +/* 8026C898 002697D8 48 00 00 20 */ b lbl_8026C8B8 +lbl_8026C89C: +/* 8026C89C 002697DC 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026C8A0 002697E0 41 82 00 0C */ beq lbl_8026C8AC +/* 8026C8A4 002697E4 38 00 00 05 */ li r0, 5 +/* 8026C8A8 002697E8 48 00 00 10 */ b lbl_8026C8B8 +lbl_8026C8AC: +/* 8026C8AC 002697EC 38 00 00 03 */ li r0, 3 +/* 8026C8B0 002697F0 48 00 00 08 */ b lbl_8026C8B8 +lbl_8026C8B4: +/* 8026C8B4 002697F4 38 00 00 04 */ li r0, 4 +lbl_8026C8B8: +/* 8026C8B8 002697F8 2C 00 00 01 */ cmpwi r0, 1 +/* 8026C8BC 002697FC 40 82 00 0C */ bne lbl_8026C8C8 +/* 8026C8C0 00269800 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026C8C4 00269804 C0 83 0A E0 */ lfs f4, lbl_80450AE0@l(r3) +lbl_8026C8C8: +/* 8026C8C8 00269808 FC 00 22 10 */ fabs f0, f4 +/* 8026C8CC 0026980C FC 20 00 18 */ frsp f1, f0 +/* 8026C8D0 00269810 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026C8D4 00269814 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026C8D8 00269818 40 80 00 20 */ bge lbl_8026C8F8 +/* 8026C8DC 0026981C C0 01 00 30 */ lfs f0, 0x30(r1) +/* 8026C8E0 00269820 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026C8E4 00269824 C0 01 00 34 */ lfs f0, 0x34(r1) +/* 8026C8E8 00269828 D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026C8EC 0026982C C0 01 00 38 */ lfs f0, 0x38(r1) +/* 8026C8F0 00269830 D0 1F 00 08 */ stfs f0, 8(r31) +/* 8026C8F4 00269834 48 00 00 1C */ b lbl_8026C910 +lbl_8026C8F8: +/* 8026C8F8 00269838 38 61 00 3C */ addi r3, r1, 0x3c +/* 8026C8FC 0026983C 38 81 00 24 */ addi r4, r1, 0x24 +/* 8026C900 00269840 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026C904 00269844 EC 20 20 24 */ fdivs f1, f0, f4 +/* 8026C908 00269848 7F E5 FB 78 */ mr r5, r31 +/* 8026C90C 0026984C 4B FF BC 55 */ bl cM3d_InDivPos1__FPC3VecPC3VecfP3Vec +lbl_8026C910: +/* 8026C910 00269850 38 60 00 01 */ li r3, 1 +/* 8026C914 00269854 48 00 00 08 */ b lbl_8026C91C +lbl_8026C918: +/* 8026C918 00269858 38 60 00 00 */ li r3, 0 +lbl_8026C91C: +/* 8026C91C 0026985C E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 +/* 8026C920 00269860 CB E1 00 80 */ lfd f31, 0x80(r1) +/* 8026C924 00269864 E3 C1 00 78 */ psq_l f30, 120(r1), 0, 0 +/* 8026C928 00269868 CB C1 00 70 */ lfd f30, 0x70(r1) +/* 8026C92C 0026986C 39 61 00 70 */ addi r11, r1, 0x70 +/* 8026C930 00269870 48 0F 58 F9 */ bl _restgpr_29 +/* 8026C934 00269874 80 01 00 94 */ lwz r0, 0x94(r1) +/* 8026C938 00269878 7C 08 03 A6 */ mtlr r0 +/* 8026C93C 0026987C 38 21 00 90 */ addi r1, r1, 0x90 +/* 8026C940 00269880 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026C944.s b/include/SComponent/c_m3d/asm/func_8026C944.s new file mode 100644 index 0000000000..449957054f --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026C944.s @@ -0,0 +1,492 @@ +/* 8026C944 00269884 94 21 FF 20 */ stwu r1, -0xe0(r1) +/* 8026C948 00269888 7C 08 02 A6 */ mflr r0 +/* 8026C94C 0026988C 90 01 00 E4 */ stw r0, 0xe4(r1) +/* 8026C950 00269890 DB E1 00 D0 */ stfd f31, 0xd0(r1) +/* 8026C954 00269894 F3 E1 00 D8 */ psq_st f31, 216(r1), 0, 0 +/* 8026C958 00269898 DB C1 00 C0 */ stfd f30, 0xc0(r1) +/* 8026C95C 0026989C F3 C1 00 C8 */ psq_st f30, 200(r1), 0, 0 +/* 8026C960 002698A0 39 61 00 C0 */ addi r11, r1, 0xc0 +/* 8026C964 002698A4 48 0F 58 6D */ bl _savegpr_26 +/* 8026C968 002698A8 7C 7E 1B 78 */ mr r30, r3 +/* 8026C96C 002698AC 7C 9B 23 78 */ mr r27, r4 +/* 8026C970 002698B0 7C BC 2B 78 */ mr r28, r5 +/* 8026C974 002698B4 7C DD 33 78 */ mr r29, r6 +/* 8026C978 002698B8 C3 E2 B7 18 */ lfs f31, lbl_80455118-_SDA2_BASE_(r2) +/* 8026C97C 002698BC FF C0 F8 90 */ fmr f30, f31 +/* 8026C980 002698C0 3B E0 00 00 */ li r31, 0 +/* 8026C984 002698C4 48 00 07 2D */ bl cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec +/* 8026C988 002698C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026C98C 002698CC 41 82 00 50 */ beq lbl_8026C9DC +/* 8026C990 002698D0 7F C3 F3 78 */ mr r3, r30 +/* 8026C994 002698D4 38 9B 00 0C */ addi r4, r27, 0xc +/* 8026C998 002698D8 48 00 07 19 */ bl cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec +/* 8026C99C 002698DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026C9A0 002698E0 41 82 00 3C */ beq lbl_8026C9DC +/* 8026C9A4 002698E4 C0 1B 00 00 */ lfs f0, 0(r27) +/* 8026C9A8 002698E8 D0 1C 00 00 */ stfs f0, 0(r28) +/* 8026C9AC 002698EC C0 1B 00 04 */ lfs f0, 4(r27) +/* 8026C9B0 002698F0 D0 1C 00 04 */ stfs f0, 4(r28) +/* 8026C9B4 002698F4 C0 1B 00 08 */ lfs f0, 8(r27) +/* 8026C9B8 002698F8 D0 1C 00 08 */ stfs f0, 8(r28) +/* 8026C9BC 002698FC C0 1B 00 0C */ lfs f0, 0xc(r27) +/* 8026C9C0 00269900 D0 1D 00 00 */ stfs f0, 0(r29) +/* 8026C9C4 00269904 C0 1B 00 10 */ lfs f0, 0x10(r27) +/* 8026C9C8 00269908 D0 1D 00 04 */ stfs f0, 4(r29) +/* 8026C9CC 0026990C C0 1B 00 14 */ lfs f0, 0x14(r27) +/* 8026C9D0 00269910 D0 1D 00 08 */ stfs f0, 8(r29) +/* 8026C9D4 00269914 38 60 00 02 */ li r3, 2 +/* 8026C9D8 00269918 48 00 06 44 */ b lbl_8026D01C +lbl_8026C9DC: +/* 8026C9DC 0026991C 7F 63 DB 78 */ mr r3, r27 +/* 8026C9E0 00269920 7F C4 F3 78 */ mr r4, r30 +/* 8026C9E4 00269924 38 A1 00 6C */ addi r5, r1, 0x6c +/* 8026C9E8 00269928 48 0D A6 CD */ bl PSVECSubtract +/* 8026C9EC 0026992C 38 7B 00 0C */ addi r3, r27, 0xc +/* 8026C9F0 00269930 7F C4 F3 78 */ mr r4, r30 +/* 8026C9F4 00269934 38 A1 00 60 */ addi r5, r1, 0x60 +/* 8026C9F8 00269938 48 0D A6 BD */ bl PSVECSubtract +/* 8026C9FC 0026993C 38 61 00 60 */ addi r3, r1, 0x60 +/* 8026CA00 00269940 38 81 00 6C */ addi r4, r1, 0x6c +/* 8026CA04 00269944 38 A1 00 54 */ addi r5, r1, 0x54 +/* 8026CA08 00269948 48 0D A6 AD */ bl PSVECSubtract +/* 8026CA0C 0026994C C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026CA10 00269950 EC 20 00 32 */ fmuls f1, f0, f0 +/* 8026CA14 00269954 C0 81 00 58 */ lfs f4, 0x58(r1) +/* 8026CA18 00269958 FC 00 22 10 */ fabs f0, f4 +/* 8026CA1C 0026995C FC 40 00 18 */ frsp f2, f0 +/* 8026CA20 00269960 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026CA24 00269964 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026CA28 00269968 41 80 01 10 */ blt lbl_8026CB38 +/* 8026CA2C 0026996C C0 A1 00 70 */ lfs f5, 0x70(r1) +/* 8026CA30 00269970 FC 00 28 50 */ fneg f0, f5 +/* 8026CA34 00269974 EC 60 20 24 */ fdivs f3, f0, f4 +/* 8026CA38 00269978 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026CA3C 0026997C FC 03 00 40 */ fcmpo cr0, f3, f0 +/* 8026CA40 00269980 4C 41 13 82 */ cror 2, 1, 2 +/* 8026CA44 00269984 40 82 00 6C */ bne lbl_8026CAB0 +/* 8026CA48 00269988 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026CA4C 0026998C FC 03 00 40 */ fcmpo cr0, f3, f0 +/* 8026CA50 00269990 4C 40 13 82 */ cror 2, 0, 2 +/* 8026CA54 00269994 40 82 00 5C */ bne lbl_8026CAB0 +/* 8026CA58 00269998 C0 41 00 6C */ lfs f2, 0x6c(r1) +/* 8026CA5C 0026999C C0 01 00 54 */ lfs f0, 0x54(r1) +/* 8026CA60 002699A0 EC 00 00 F2 */ fmuls f0, f0, f3 +/* 8026CA64 002699A4 EC C2 00 2A */ fadds f6, f2, f0 +/* 8026CA68 002699A8 C0 41 00 74 */ lfs f2, 0x74(r1) +/* 8026CA6C 002699AC C0 01 00 5C */ lfs f0, 0x5c(r1) +/* 8026CA70 002699B0 EC 00 00 F2 */ fmuls f0, f0, f3 +/* 8026CA74 002699B4 EC 62 00 2A */ fadds f3, f2, f0 +/* 8026CA78 002699B8 EC 46 01 B2 */ fmuls f2, f6, f6 +/* 8026CA7C 002699BC EC 03 00 F2 */ fmuls f0, f3, f3 +/* 8026CA80 002699C0 EC 02 00 2A */ fadds f0, f2, f0 +/* 8026CA84 002699C4 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026CA88 002699C8 40 80 00 28 */ bge lbl_8026CAB0 +/* 8026CA8C 002699CC 63 FF 00 01 */ ori r31, r31, 1 +/* 8026CA90 002699D0 C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026CA94 002699D4 EC 06 00 2A */ fadds f0, f6, f0 +/* 8026CA98 002699D8 D0 01 00 78 */ stfs f0, 0x78(r1) +/* 8026CA9C 002699DC C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026CAA0 002699E0 D0 01 00 7C */ stfs f0, 0x7c(r1) +/* 8026CAA4 002699E4 C0 1E 00 08 */ lfs f0, 8(r30) +/* 8026CAA8 002699E8 EC 03 00 2A */ fadds f0, f3, f0 +/* 8026CAAC 002699EC D0 01 00 80 */ stfs f0, 0x80(r1) +lbl_8026CAB0: +/* 8026CAB0 002699F0 C0 7E 00 10 */ lfs f3, 0x10(r30) +/* 8026CAB4 002699F4 EC 03 28 28 */ fsubs f0, f3, f5 +/* 8026CAB8 002699F8 EF E0 20 24 */ fdivs f31, f0, f4 +/* 8026CABC 002699FC C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026CAC0 00269A00 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026CAC4 00269A04 4C 41 13 82 */ cror 2, 1, 2 +/* 8026CAC8 00269A08 40 82 00 70 */ bne lbl_8026CB38 +/* 8026CACC 00269A0C C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026CAD0 00269A10 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026CAD4 00269A14 4C 40 13 82 */ cror 2, 0, 2 +/* 8026CAD8 00269A18 40 82 00 60 */ bne lbl_8026CB38 +/* 8026CADC 00269A1C C0 41 00 6C */ lfs f2, 0x6c(r1) +/* 8026CAE0 00269A20 C0 01 00 54 */ lfs f0, 0x54(r1) +/* 8026CAE4 00269A24 EC 00 07 F2 */ fmuls f0, f0, f31 +/* 8026CAE8 00269A28 EC 82 00 2A */ fadds f4, f2, f0 +/* 8026CAEC 00269A2C C0 41 00 74 */ lfs f2, 0x74(r1) +/* 8026CAF0 00269A30 C0 01 00 5C */ lfs f0, 0x5c(r1) +/* 8026CAF4 00269A34 EC 00 07 F2 */ fmuls f0, f0, f31 +/* 8026CAF8 00269A38 EC A2 00 2A */ fadds f5, f2, f0 +/* 8026CAFC 00269A3C EC 44 01 32 */ fmuls f2, f4, f4 +/* 8026CB00 00269A40 EC 05 01 72 */ fmuls f0, f5, f5 +/* 8026CB04 00269A44 EC 02 00 2A */ fadds f0, f2, f0 +/* 8026CB08 00269A48 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026CB0C 00269A4C 40 80 00 2C */ bge lbl_8026CB38 +/* 8026CB10 00269A50 63 FF 00 02 */ ori r31, r31, 2 +/* 8026CB14 00269A54 C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026CB18 00269A58 EC 04 00 2A */ fadds f0, f4, f0 +/* 8026CB1C 00269A5C D0 01 00 84 */ stfs f0, 0x84(r1) +/* 8026CB20 00269A60 C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026CB24 00269A64 EC 00 18 2A */ fadds f0, f0, f3 +/* 8026CB28 00269A68 D0 01 00 88 */ stfs f0, 0x88(r1) +/* 8026CB2C 00269A6C C0 1E 00 08 */ lfs f0, 8(r30) +/* 8026CB30 00269A70 EC 05 00 2A */ fadds f0, f5, f0 +/* 8026CB34 00269A74 D0 01 00 8C */ stfs f0, 0x8c(r1) +lbl_8026CB38: +/* 8026CB38 00269A78 C0 A1 00 54 */ lfs f5, 0x54(r1) +/* 8026CB3C 00269A7C EC 45 01 72 */ fmuls f2, f5, f5 +/* 8026CB40 00269A80 C0 61 00 5C */ lfs f3, 0x5c(r1) +/* 8026CB44 00269A84 EC 03 00 F2 */ fmuls f0, f3, f3 +/* 8026CB48 00269A88 EC E2 00 2A */ fadds f7, f2, f0 +/* 8026CB4C 00269A8C C0 82 B7 BC */ lfs f4, lbl_804551BC-_SDA2_BASE_(r2) +/* 8026CB50 00269A90 C0 C1 00 6C */ lfs f6, 0x6c(r1) +/* 8026CB54 00269A94 EC 45 01 B2 */ fmuls f2, f5, f6 +/* 8026CB58 00269A98 C0 A1 00 74 */ lfs f5, 0x74(r1) +/* 8026CB5C 00269A9C EC 03 01 72 */ fmuls f0, f3, f5 +/* 8026CB60 00269AA0 EC 02 00 2A */ fadds f0, f2, f0 +/* 8026CB64 00269AA4 EC 04 00 32 */ fmuls f0, f4, f0 +/* 8026CB68 00269AA8 EC 66 01 B2 */ fmuls f3, f6, f6 +/* 8026CB6C 00269AAC EC 45 01 72 */ fmuls f2, f5, f5 +/* 8026CB70 00269AB0 EC 43 10 2A */ fadds f2, f3, f2 +/* 8026CB74 00269AB4 EC A2 08 28 */ fsubs f5, f2, f1 +/* 8026CB78 00269AB8 EC 24 01 F2 */ fmuls f1, f4, f7 +/* 8026CB7C 00269ABC FC 40 0A 10 */ fabs f2, f1 +/* 8026CB80 00269AC0 FC 60 10 18 */ frsp f3, f2 +/* 8026CB84 00269AC4 C0 4D 8C 00 */ lfs f2, lbl_80451180-_SDA_BASE_(r13) +/* 8026CB88 00269AC8 FC 03 10 40 */ fcmpo cr0, f3, f2 +/* 8026CB8C 00269ACC 41 80 01 5C */ blt lbl_8026CCE8 +/* 8026CB90 00269AD0 EC 60 00 32 */ fmuls f3, f0, f0 +/* 8026CB94 00269AD4 C0 42 B7 C0 */ lfs f2, lbl_804551C0-_SDA2_BASE_(r2) +/* 8026CB98 00269AD8 EC 42 01 F2 */ fmuls f2, f2, f7 +/* 8026CB9C 00269ADC EC 42 01 72 */ fmuls f2, f2, f5 +/* 8026CBA0 00269AE0 EC C3 10 28 */ fsubs f6, f3, f2 +/* 8026CBA4 00269AE4 C0 42 B7 18 */ lfs f2, lbl_80455118-_SDA2_BASE_(r2) +/* 8026CBA8 00269AE8 FC 06 10 40 */ fcmpo cr0, f6, f2 +/* 8026CBAC 00269AEC 40 80 00 0C */ bge lbl_8026CBB8 +/* 8026CBB0 00269AF0 38 60 00 00 */ li r3, 0 +/* 8026CBB4 00269AF4 48 00 04 68 */ b lbl_8026D01C +lbl_8026CBB8: +/* 8026CBB8 00269AF8 40 81 00 10 */ ble lbl_8026CBC8 +/* 8026CBBC 00269AFC 38 C0 00 01 */ li r6, 1 +/* 8026CBC0 00269B00 38 A0 00 01 */ li r5, 1 +/* 8026CBC4 00269B04 48 00 00 0C */ b lbl_8026CBD0 +lbl_8026CBC8: +/* 8026CBC8 00269B08 38 A0 00 01 */ li r5, 1 +/* 8026CBCC 00269B0C 38 C0 00 00 */ li r6, 0 +lbl_8026CBD0: +/* 8026CBD0 00269B10 C0 42 B7 18 */ lfs f2, lbl_80455118-_SDA2_BASE_(r2) +/* 8026CBD4 00269B14 FC 06 10 40 */ fcmpo cr0, f6, f2 +/* 8026CBD8 00269B18 40 81 00 58 */ ble lbl_8026CC30 +/* 8026CBDC 00269B1C FC 40 30 34 */ frsqrte f2, f6 +/* 8026CBE0 00269B20 C8 A2 B7 20 */ lfd f5, lbl_80455120-_SDA2_BASE_(r2) +/* 8026CBE4 00269B24 FC 65 00 B2 */ fmul f3, f5, f2 +/* 8026CBE8 00269B28 C8 82 B7 28 */ lfd f4, lbl_80455128-_SDA2_BASE_(r2) +/* 8026CBEC 00269B2C FC 42 00 B2 */ fmul f2, f2, f2 +/* 8026CBF0 00269B30 FC 46 00 B2 */ fmul f2, f6, f2 +/* 8026CBF4 00269B34 FC 44 10 28 */ fsub f2, f4, f2 +/* 8026CBF8 00269B38 FC 43 00 B2 */ fmul f2, f3, f2 +/* 8026CBFC 00269B3C FC 65 00 B2 */ fmul f3, f5, f2 +/* 8026CC00 00269B40 FC 42 00 B2 */ fmul f2, f2, f2 +/* 8026CC04 00269B44 FC 46 00 B2 */ fmul f2, f6, f2 +/* 8026CC08 00269B48 FC 44 10 28 */ fsub f2, f4, f2 +/* 8026CC0C 00269B4C FC 43 00 B2 */ fmul f2, f3, f2 +/* 8026CC10 00269B50 FC 65 00 B2 */ fmul f3, f5, f2 +/* 8026CC14 00269B54 FC 42 00 B2 */ fmul f2, f2, f2 +/* 8026CC18 00269B58 FC 46 00 B2 */ fmul f2, f6, f2 +/* 8026CC1C 00269B5C FC 44 10 28 */ fsub f2, f4, f2 +/* 8026CC20 00269B60 FC 43 00 B2 */ fmul f2, f3, f2 +/* 8026CC24 00269B64 FC 66 00 B2 */ fmul f3, f6, f2 +/* 8026CC28 00269B68 FC 60 18 18 */ frsp f3, f3 +/* 8026CC2C 00269B6C 48 00 00 90 */ b lbl_8026CCBC +lbl_8026CC30: +/* 8026CC30 00269B70 C8 42 B7 30 */ lfd f2, lbl_80455130-_SDA2_BASE_(r2) +/* 8026CC34 00269B74 FC 06 10 40 */ fcmpo cr0, f6, f2 +/* 8026CC38 00269B78 40 80 00 10 */ bge lbl_8026CC48 +/* 8026CC3C 00269B7C 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026CC40 00269B80 C0 63 0A E0 */ lfs f3, lbl_80450AE0@l(r3) +/* 8026CC44 00269B84 48 00 00 78 */ b lbl_8026CCBC +lbl_8026CC48: +/* 8026CC48 00269B88 D0 C1 00 08 */ stfs f6, 8(r1) +/* 8026CC4C 00269B8C 80 81 00 08 */ lwz r4, 8(r1) +/* 8026CC50 00269B90 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8026CC54 00269B94 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026CC58 00269B98 7C 03 00 00 */ cmpw r3, r0 +/* 8026CC5C 00269B9C 41 82 00 14 */ beq lbl_8026CC70 +/* 8026CC60 00269BA0 40 80 00 40 */ bge lbl_8026CCA0 +/* 8026CC64 00269BA4 2C 03 00 00 */ cmpwi r3, 0 +/* 8026CC68 00269BA8 41 82 00 20 */ beq lbl_8026CC88 +/* 8026CC6C 00269BAC 48 00 00 34 */ b lbl_8026CCA0 +lbl_8026CC70: +/* 8026CC70 00269BB0 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026CC74 00269BB4 41 82 00 0C */ beq lbl_8026CC80 +/* 8026CC78 00269BB8 38 00 00 01 */ li r0, 1 +/* 8026CC7C 00269BBC 48 00 00 28 */ b lbl_8026CCA4 +lbl_8026CC80: +/* 8026CC80 00269BC0 38 00 00 02 */ li r0, 2 +/* 8026CC84 00269BC4 48 00 00 20 */ b lbl_8026CCA4 +lbl_8026CC88: +/* 8026CC88 00269BC8 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026CC8C 00269BCC 41 82 00 0C */ beq lbl_8026CC98 +/* 8026CC90 00269BD0 38 00 00 05 */ li r0, 5 +/* 8026CC94 00269BD4 48 00 00 10 */ b lbl_8026CCA4 +lbl_8026CC98: +/* 8026CC98 00269BD8 38 00 00 03 */ li r0, 3 +/* 8026CC9C 00269BDC 48 00 00 08 */ b lbl_8026CCA4 +lbl_8026CCA0: +/* 8026CCA0 00269BE0 38 00 00 04 */ li r0, 4 +lbl_8026CCA4: +/* 8026CCA4 00269BE4 2C 00 00 01 */ cmpwi r0, 1 +/* 8026CCA8 00269BE8 40 82 00 10 */ bne lbl_8026CCB8 +/* 8026CCAC 00269BEC 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026CCB0 00269BF0 C0 63 0A E0 */ lfs f3, lbl_80450AE0@l(r3) +/* 8026CCB4 00269BF4 48 00 00 08 */ b lbl_8026CCBC +lbl_8026CCB8: +/* 8026CCB8 00269BF8 FC 60 30 90 */ fmr f3, f6 +lbl_8026CCBC: +/* 8026CCBC 00269BFC 2C 05 00 00 */ cmpwi r5, 0 +/* 8026CCC0 00269C00 41 82 00 10 */ beq lbl_8026CCD0 +/* 8026CCC4 00269C04 FC 40 00 50 */ fneg f2, f0 +/* 8026CCC8 00269C08 EC 42 18 2A */ fadds f2, f2, f3 +/* 8026CCCC 00269C0C EF E2 08 24 */ fdivs f31, f2, f1 +lbl_8026CCD0: +/* 8026CCD0 00269C10 2C 06 00 00 */ cmpwi r6, 0 +/* 8026CCD4 00269C14 41 82 00 40 */ beq lbl_8026CD14 +/* 8026CCD8 00269C18 FC 00 00 50 */ fneg f0, f0 +/* 8026CCDC 00269C1C EC 00 18 28 */ fsubs f0, f0, f3 +/* 8026CCE0 00269C20 EF C0 08 24 */ fdivs f30, f0, f1 +/* 8026CCE4 00269C24 48 00 00 30 */ b lbl_8026CD14 +lbl_8026CCE8: +/* 8026CCE8 00269C28 FC 20 02 10 */ fabs f1, f0 +/* 8026CCEC 00269C2C FC 20 08 18 */ frsp f1, f1 +/* 8026CCF0 00269C30 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026CCF4 00269C34 41 80 00 18 */ blt lbl_8026CD0C +/* 8026CCF8 00269C38 38 A0 00 01 */ li r5, 1 +/* 8026CCFC 00269C3C 38 C0 00 00 */ li r6, 0 +/* 8026CD00 00269C40 FC 20 28 50 */ fneg f1, f5 +/* 8026CD04 00269C44 EF E1 00 24 */ fdivs f31, f1, f0 +/* 8026CD08 00269C48 48 00 00 0C */ b lbl_8026CD14 +lbl_8026CD0C: +/* 8026CD0C 00269C4C 38 60 00 00 */ li r3, 0 +/* 8026CD10 00269C50 48 00 03 0C */ b lbl_8026D01C +lbl_8026CD14: +/* 8026CD14 00269C54 2C 05 00 00 */ cmpwi r5, 0 +/* 8026CD18 00269C58 41 82 00 2C */ beq lbl_8026CD44 +/* 8026CD1C 00269C5C 2C 06 00 00 */ cmpwi r6, 0 +/* 8026CD20 00269C60 40 82 00 24 */ bne lbl_8026CD44 +/* 8026CD24 00269C64 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026CD28 00269C68 FC 00 F8 40 */ fcmpo cr0, f0, f31 +/* 8026CD2C 00269C6C 41 81 00 10 */ bgt lbl_8026CD3C +/* 8026CD30 00269C70 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026CD34 00269C74 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026CD38 00269C78 40 81 00 84 */ ble lbl_8026CDBC +lbl_8026CD3C: +/* 8026CD3C 00269C7C 38 60 00 00 */ li r3, 0 +/* 8026CD40 00269C80 48 00 02 DC */ b lbl_8026D01C +lbl_8026CD44: +/* 8026CD44 00269C84 38 00 00 00 */ li r0, 0 +/* 8026CD48 00269C88 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026CD4C 00269C8C FC 00 F8 40 */ fcmpo cr0, f0, f31 +/* 8026CD50 00269C90 41 81 00 10 */ bgt lbl_8026CD60 +/* 8026CD54 00269C94 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026CD58 00269C98 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026CD5C 00269C9C 40 81 00 08 */ ble lbl_8026CD64 +lbl_8026CD60: +/* 8026CD60 00269CA0 38 00 00 01 */ li r0, 1 +lbl_8026CD64: +/* 8026CD64 00269CA4 54 03 06 3E */ clrlwi r3, r0, 0x18 +/* 8026CD68 00269CA8 38 00 00 00 */ li r0, 0 +/* 8026CD6C 00269CAC C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026CD70 00269CB0 FC 00 F0 40 */ fcmpo cr0, f0, f30 +/* 8026CD74 00269CB4 41 81 00 10 */ bgt lbl_8026CD84 +/* 8026CD78 00269CB8 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026CD7C 00269CBC FC 1E 00 40 */ fcmpo cr0, f30, f0 +/* 8026CD80 00269CC0 40 81 00 08 */ ble lbl_8026CD88 +lbl_8026CD84: +/* 8026CD84 00269CC4 38 00 00 01 */ li r0, 1 +lbl_8026CD88: +/* 8026CD88 00269CC8 54 00 06 3E */ clrlwi r0, r0, 0x18 +/* 8026CD8C 00269CCC 2C 03 00 00 */ cmpwi r3, 0 +/* 8026CD90 00269CD0 41 82 00 14 */ beq lbl_8026CDA4 +/* 8026CD94 00269CD4 2C 00 00 00 */ cmpwi r0, 0 +/* 8026CD98 00269CD8 41 82 00 0C */ beq lbl_8026CDA4 +/* 8026CD9C 00269CDC 38 60 00 00 */ li r3, 0 +/* 8026CDA0 00269CE0 48 00 02 7C */ b lbl_8026D01C +lbl_8026CDA4: +/* 8026CDA4 00269CE4 2C 03 00 00 */ cmpwi r3, 0 +/* 8026CDA8 00269CE8 41 82 00 08 */ beq lbl_8026CDB0 +/* 8026CDAC 00269CEC 38 A0 00 00 */ li r5, 0 +lbl_8026CDB0: +/* 8026CDB0 00269CF0 2C 00 00 00 */ cmpwi r0, 0 +/* 8026CDB4 00269CF4 41 82 00 08 */ beq lbl_8026CDBC +/* 8026CDB8 00269CF8 38 C0 00 00 */ li r6, 0 +lbl_8026CDBC: +/* 8026CDBC 00269CFC 2C 05 00 00 */ cmpwi r5, 0 +/* 8026CDC0 00269D00 41 82 00 30 */ beq lbl_8026CDF0 +/* 8026CDC4 00269D04 C0 21 00 70 */ lfs f1, 0x70(r1) +/* 8026CDC8 00269D08 C0 01 00 58 */ lfs f0, 0x58(r1) +/* 8026CDCC 00269D0C EC 1F 00 32 */ fmuls f0, f31, f0 +/* 8026CDD0 00269D10 EC 21 00 2A */ fadds f1, f1, f0 +/* 8026CDD4 00269D14 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026CDD8 00269D18 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026CDDC 00269D1C 41 80 00 10 */ blt lbl_8026CDEC +/* 8026CDE0 00269D20 C0 1E 00 10 */ lfs f0, 0x10(r30) +/* 8026CDE4 00269D24 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026CDE8 00269D28 40 81 00 08 */ ble lbl_8026CDF0 +lbl_8026CDEC: +/* 8026CDEC 00269D2C 38 A0 00 00 */ li r5, 0 +lbl_8026CDF0: +/* 8026CDF0 00269D30 2C 06 00 00 */ cmpwi r6, 0 +/* 8026CDF4 00269D34 41 82 00 30 */ beq lbl_8026CE24 +/* 8026CDF8 00269D38 C0 21 00 70 */ lfs f1, 0x70(r1) +/* 8026CDFC 00269D3C C0 01 00 58 */ lfs f0, 0x58(r1) +/* 8026CE00 00269D40 EC 1E 00 32 */ fmuls f0, f30, f0 +/* 8026CE04 00269D44 EC 21 00 2A */ fadds f1, f1, f0 +/* 8026CE08 00269D48 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026CE0C 00269D4C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026CE10 00269D50 41 80 00 10 */ blt lbl_8026CE20 +/* 8026CE14 00269D54 C0 1E 00 10 */ lfs f0, 0x10(r30) +/* 8026CE18 00269D58 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026CE1C 00269D5C 40 81 00 08 */ ble lbl_8026CE24 +lbl_8026CE20: +/* 8026CE20 00269D60 38 C0 00 00 */ li r6, 0 +lbl_8026CE24: +/* 8026CE24 00269D64 2C 05 00 00 */ cmpwi r5, 0 +/* 8026CE28 00269D68 40 82 00 14 */ bne lbl_8026CE3C +/* 8026CE2C 00269D6C 2C 06 00 00 */ cmpwi r6, 0 +/* 8026CE30 00269D70 40 82 00 0C */ bne lbl_8026CE3C +/* 8026CE34 00269D74 38 60 00 00 */ li r3, 0 +/* 8026CE38 00269D78 48 00 01 E4 */ b lbl_8026D01C +lbl_8026CE3C: +/* 8026CE3C 00269D7C 2C 05 00 00 */ cmpwi r5, 0 +/* 8026CE40 00269D80 41 82 00 64 */ beq lbl_8026CEA4 +/* 8026CE44 00269D84 2C 06 00 00 */ cmpwi r6, 0 +/* 8026CE48 00269D88 41 82 00 5C */ beq lbl_8026CEA4 +/* 8026CE4C 00269D8C 38 61 00 6C */ addi r3, r1, 0x6c +/* 8026CE50 00269D90 7F C4 F3 78 */ mr r4, r30 +/* 8026CE54 00269D94 38 A1 00 48 */ addi r5, r1, 0x48 +/* 8026CE58 00269D98 48 0D A2 39 */ bl PSVECAdd +/* 8026CE5C 00269D9C 38 61 00 54 */ addi r3, r1, 0x54 +/* 8026CE60 00269DA0 38 81 00 3C */ addi r4, r1, 0x3c +/* 8026CE64 00269DA4 FC 20 F8 90 */ fmr f1, f31 +/* 8026CE68 00269DA8 48 0D A2 71 */ bl PSVECScale +/* 8026CE6C 00269DAC 38 61 00 3C */ addi r3, r1, 0x3c +/* 8026CE70 00269DB0 38 81 00 48 */ addi r4, r1, 0x48 +/* 8026CE74 00269DB4 38 A1 00 90 */ addi r5, r1, 0x90 +/* 8026CE78 00269DB8 48 0D A2 19 */ bl PSVECAdd +/* 8026CE7C 00269DBC 63 FF 00 0C */ ori r31, r31, 0xc +/* 8026CE80 00269DC0 38 61 00 54 */ addi r3, r1, 0x54 +/* 8026CE84 00269DC4 38 81 00 3C */ addi r4, r1, 0x3c +/* 8026CE88 00269DC8 FC 20 F0 90 */ fmr f1, f30 +/* 8026CE8C 00269DCC 48 0D A2 4D */ bl PSVECScale +/* 8026CE90 00269DD0 38 61 00 3C */ addi r3, r1, 0x3c +/* 8026CE94 00269DD4 38 81 00 48 */ addi r4, r1, 0x48 +/* 8026CE98 00269DD8 38 A1 00 9C */ addi r5, r1, 0x9c +/* 8026CE9C 00269DDC 48 0D A1 F5 */ bl PSVECAdd +/* 8026CEA0 00269DE0 48 00 00 80 */ b lbl_8026CF20 +lbl_8026CEA4: +/* 8026CEA4 00269DE4 2C 05 00 00 */ cmpwi r5, 0 +/* 8026CEA8 00269DE8 41 82 00 3C */ beq lbl_8026CEE4 +/* 8026CEAC 00269DEC 63 FF 00 04 */ ori r31, r31, 4 +/* 8026CEB0 00269DF0 38 61 00 54 */ addi r3, r1, 0x54 +/* 8026CEB4 00269DF4 38 81 00 30 */ addi r4, r1, 0x30 +/* 8026CEB8 00269DF8 FC 20 F8 90 */ fmr f1, f31 +/* 8026CEBC 00269DFC 48 0D A2 1D */ bl PSVECScale +/* 8026CEC0 00269E00 38 61 00 30 */ addi r3, r1, 0x30 +/* 8026CEC4 00269E04 38 81 00 6C */ addi r4, r1, 0x6c +/* 8026CEC8 00269E08 38 A1 00 24 */ addi r5, r1, 0x24 +/* 8026CECC 00269E0C 48 0D A1 C5 */ bl PSVECAdd +/* 8026CED0 00269E10 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026CED4 00269E14 7F C4 F3 78 */ mr r4, r30 +/* 8026CED8 00269E18 38 A1 00 90 */ addi r5, r1, 0x90 +/* 8026CEDC 00269E1C 48 0D A1 B5 */ bl PSVECAdd +/* 8026CEE0 00269E20 48 00 00 40 */ b lbl_8026CF20 +lbl_8026CEE4: +/* 8026CEE4 00269E24 2C 06 00 00 */ cmpwi r6, 0 +/* 8026CEE8 00269E28 41 82 00 38 */ beq lbl_8026CF20 +/* 8026CEEC 00269E2C 63 FF 00 04 */ ori r31, r31, 4 +/* 8026CEF0 00269E30 38 61 00 54 */ addi r3, r1, 0x54 +/* 8026CEF4 00269E34 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026CEF8 00269E38 FC 20 F0 90 */ fmr f1, f30 +/* 8026CEFC 00269E3C 48 0D A1 DD */ bl PSVECScale +/* 8026CF00 00269E40 38 61 00 18 */ addi r3, r1, 0x18 +/* 8026CF04 00269E44 38 81 00 6C */ addi r4, r1, 0x6c +/* 8026CF08 00269E48 38 A1 00 0C */ addi r5, r1, 0xc +/* 8026CF0C 00269E4C 48 0D A1 85 */ bl PSVECAdd +/* 8026CF10 00269E50 38 61 00 0C */ addi r3, r1, 0xc +/* 8026CF14 00269E54 7F C4 F3 78 */ mr r4, r30 +/* 8026CF18 00269E58 38 A1 00 90 */ addi r5, r1, 0x90 +/* 8026CF1C 00269E5C 48 0D A1 75 */ bl PSVECAdd +lbl_8026CF20: +/* 8026CF20 00269E60 3B 40 00 00 */ li r26, 0 +/* 8026CF24 00269E64 38 C0 00 00 */ li r6, 0 +/* 8026CF28 00269E68 38 60 00 00 */ li r3, 0 +/* 8026CF2C 00269E6C 38 80 00 01 */ li r4, 1 +/* 8026CF30 00269E70 38 00 00 04 */ li r0, 4 +/* 8026CF34 00269E74 7C 09 03 A6 */ mtctr r0 +lbl_8026CF38: +/* 8026CF38 00269E78 7C 80 30 30 */ slw r0, r4, r6 +/* 8026CF3C 00269E7C 7F E0 00 39 */ and. r0, r31, r0 +/* 8026CF40 00269E80 41 82 00 CC */ beq lbl_8026D00C +/* 8026CF44 00269E84 2C 1A 00 00 */ cmpwi r26, 0 +/* 8026CF48 00269E88 40 82 00 28 */ bne lbl_8026CF70 +/* 8026CF4C 00269E8C 38 A1 00 78 */ addi r5, r1, 0x78 +/* 8026CF50 00269E90 7C A5 1A 14 */ add r5, r5, r3 +/* 8026CF54 00269E94 C0 05 00 00 */ lfs f0, 0(r5) +/* 8026CF58 00269E98 D0 1C 00 00 */ stfs f0, 0(r28) +/* 8026CF5C 00269E9C C0 05 00 04 */ lfs f0, 4(r5) +/* 8026CF60 00269EA0 D0 1C 00 04 */ stfs f0, 4(r28) +/* 8026CF64 00269EA4 C0 05 00 08 */ lfs f0, 8(r5) +/* 8026CF68 00269EA8 D0 1C 00 08 */ stfs f0, 8(r28) +/* 8026CF6C 00269EAC 48 00 00 9C */ b lbl_8026D008 +lbl_8026CF70: +/* 8026CF70 00269EB0 2C 1A 00 01 */ cmpwi r26, 1 +/* 8026CF74 00269EB4 40 82 00 94 */ bne lbl_8026D008 +/* 8026CF78 00269EB8 7F 63 DB 78 */ mr r3, r27 +/* 8026CF7C 00269EBC 1F E6 00 0C */ mulli r31, r6, 0xc +/* 8026CF80 00269EC0 3B C1 00 78 */ addi r30, r1, 0x78 +/* 8026CF84 00269EC4 7F DE FA 14 */ add r30, r30, r31 +/* 8026CF88 00269EC8 7F C4 F3 78 */ mr r4, r30 +/* 8026CF8C 00269ECC 48 0D A4 11 */ bl PSVECSquareDistance +/* 8026CF90 00269ED0 FF C0 08 90 */ fmr f30, f1 +/* 8026CF94 00269ED4 7F 63 DB 78 */ mr r3, r27 +/* 8026CF98 00269ED8 7F 84 E3 78 */ mr r4, r28 +/* 8026CF9C 00269EDC 48 0D A4 01 */ bl PSVECSquareDistance +/* 8026CFA0 00269EE0 FC 01 F0 40 */ fcmpo cr0, f1, f30 +/* 8026CFA4 00269EE4 40 80 00 28 */ bge lbl_8026CFCC +/* 8026CFA8 00269EE8 C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026CFAC 00269EEC D0 1D 00 00 */ stfs f0, 0(r29) +/* 8026CFB0 00269EF0 38 61 00 7C */ addi r3, r1, 0x7c +/* 8026CFB4 00269EF4 7C 03 FC 2E */ lfsx f0, r3, r31 +/* 8026CFB8 00269EF8 D0 1D 00 04 */ stfs f0, 4(r29) +/* 8026CFBC 00269EFC 38 61 00 80 */ addi r3, r1, 0x80 +/* 8026CFC0 00269F00 7C 03 FC 2E */ lfsx f0, r3, r31 +/* 8026CFC4 00269F04 D0 1D 00 08 */ stfs f0, 8(r29) +/* 8026CFC8 00269F08 48 00 00 50 */ b lbl_8026D018 +lbl_8026CFCC: +/* 8026CFCC 00269F0C C0 1C 00 00 */ lfs f0, 0(r28) +/* 8026CFD0 00269F10 D0 1D 00 00 */ stfs f0, 0(r29) +/* 8026CFD4 00269F14 C0 1C 00 04 */ lfs f0, 4(r28) +/* 8026CFD8 00269F18 D0 1D 00 04 */ stfs f0, 4(r29) +/* 8026CFDC 00269F1C C0 1C 00 08 */ lfs f0, 8(r28) +/* 8026CFE0 00269F20 D0 1D 00 08 */ stfs f0, 8(r29) +/* 8026CFE4 00269F24 C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026CFE8 00269F28 D0 1C 00 00 */ stfs f0, 0(r28) +/* 8026CFEC 00269F2C 38 61 00 7C */ addi r3, r1, 0x7c +/* 8026CFF0 00269F30 7C 03 FC 2E */ lfsx f0, r3, r31 +/* 8026CFF4 00269F34 D0 1C 00 04 */ stfs f0, 4(r28) +/* 8026CFF8 00269F38 38 61 00 80 */ addi r3, r1, 0x80 +/* 8026CFFC 00269F3C 7C 03 FC 2E */ lfsx f0, r3, r31 +/* 8026D000 00269F40 D0 1C 00 08 */ stfs f0, 8(r28) +/* 8026D004 00269F44 48 00 00 14 */ b lbl_8026D018 +lbl_8026D008: +/* 8026D008 00269F48 3B 5A 00 01 */ addi r26, r26, 1 +lbl_8026D00C: +/* 8026D00C 00269F4C 38 C6 00 01 */ addi r6, r6, 1 +/* 8026D010 00269F50 38 63 00 0C */ addi r3, r3, 0xc +/* 8026D014 00269F54 42 00 FF 24 */ bdnz lbl_8026CF38 +lbl_8026D018: +/* 8026D018 00269F58 7F 43 D3 78 */ mr r3, r26 +lbl_8026D01C: +/* 8026D01C 00269F5C E3 E1 00 D8 */ psq_l f31, 216(r1), 0, 0 +/* 8026D020 00269F60 CB E1 00 D0 */ lfd f31, 0xd0(r1) +/* 8026D024 00269F64 E3 C1 00 C8 */ psq_l f30, 200(r1), 0, 0 +/* 8026D028 00269F68 CB C1 00 C0 */ lfd f30, 0xc0(r1) +/* 8026D02C 00269F6C 39 61 00 C0 */ addi r11, r1, 0xc0 +/* 8026D030 00269F70 48 0F 51 ED */ bl _restgpr_26 +/* 8026D034 00269F74 80 01 00 E4 */ lwz r0, 0xe4(r1) +/* 8026D038 00269F78 7C 08 03 A6 */ mtlr r0 +/* 8026D03C 00269F7C 38 21 00 E0 */ addi r1, r1, 0xe0 +/* 8026D040 00269F80 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026D044.s b/include/SComponent/c_m3d/asm/func_8026D044.s new file mode 100644 index 0000000000..b1e783e5dd --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026D044.s @@ -0,0 +1,27 @@ +/* 8026D044 00269F84 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 8026D048 00269F88 7C 08 02 A6 */ mflr r0 +/* 8026D04C 00269F8C 90 01 00 44 */ stw r0, 0x44(r1) +/* 8026D050 00269F90 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026D054 00269F94 48 0F 51 89 */ bl _savegpr_29 +/* 8026D058 00269F98 7C 7D 1B 78 */ mr r29, r3 +/* 8026D05C 00269F9C 7C DE 33 78 */ mr r30, r6 +/* 8026D060 00269FA0 7C FF 3B 78 */ mr r31, r7 +/* 8026D064 00269FA4 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026D068 00269FA8 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026D06C 00269FAC 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026D070 00269FB0 38 61 00 08 */ addi r3, r1, 8 +/* 8026D074 00269FB4 48 00 22 A9 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec +/* 8026D078 00269FB8 7F A3 EB 78 */ mr r3, r29 +/* 8026D07C 00269FBC 38 81 00 08 */ addi r4, r1, 8 +/* 8026D080 00269FC0 7F C5 F3 78 */ mr r5, r30 +/* 8026D084 00269FC4 7F E6 FB 78 */ mr r6, r31 +/* 8026D088 00269FC8 4B FF F8 BD */ bl cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec +/* 8026D08C 00269FCC 3C 80 80 3A */ lis r4, lbl_803A78F8@ha +/* 8026D090 00269FD0 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l +/* 8026D094 00269FD4 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026D098 00269FD8 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026D09C 00269FDC 48 0F 51 8D */ bl _restgpr_29 +/* 8026D0A0 00269FE0 80 01 00 44 */ lwz r0, 0x44(r1) +/* 8026D0A4 00269FE4 7C 08 03 A6 */ mtlr r0 +/* 8026D0A8 00269FE8 38 21 00 40 */ addi r1, r1, 0x40 +/* 8026D0AC 00269FEC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026D0B0.s b/include/SComponent/c_m3d/asm/func_8026D0B0.s new file mode 100644 index 0000000000..1d604dd810 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026D0B0.s @@ -0,0 +1,26 @@ +/* 8026D0B0 00269FF0 C0 23 00 00 */ lfs f1, 0(r3) +/* 8026D0B4 00269FF4 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026D0B8 00269FF8 EC 41 00 28 */ fsubs f2, f1, f0 +/* 8026D0BC 00269FFC C0 23 00 08 */ lfs f1, 8(r3) +/* 8026D0C0 0026A000 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026D0C4 0026A004 EC 61 00 28 */ fsubs f3, f1, f0 +/* 8026D0C8 0026A008 C0 83 00 04 */ lfs f4, 4(r3) +/* 8026D0CC 0026A00C C0 03 00 10 */ lfs f0, 0x10(r3) +/* 8026D0D0 0026A010 EC A4 00 2A */ fadds f5, f4, f0 +/* 8026D0D4 0026A014 EC 22 00 B2 */ fmuls f1, f2, f2 +/* 8026D0D8 0026A018 EC 03 00 F2 */ fmuls f0, f3, f3 +/* 8026D0DC 0026A01C EC 21 00 2A */ fadds f1, f1, f0 +/* 8026D0E0 0026A020 C0 03 00 0C */ lfs f0, 0xc(r3) +/* 8026D0E4 0026A024 EC 00 00 32 */ fmuls f0, f0, f0 +/* 8026D0E8 0026A028 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D0EC 0026A02C 40 80 00 20 */ bge lbl_8026D10C +/* 8026D0F0 0026A030 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026D0F4 0026A034 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 8026D0F8 0026A038 40 80 00 14 */ bge lbl_8026D10C +/* 8026D0FC 0026A03C FC 05 00 40 */ fcmpo cr0, f5, f0 +/* 8026D100 0026A040 40 81 00 0C */ ble lbl_8026D10C +/* 8026D104 0026A044 38 60 00 01 */ li r3, 1 +/* 8026D108 0026A048 4E 80 00 20 */ blr +lbl_8026D10C: +/* 8026D10C 0026A04C 38 60 00 00 */ li r3, 0 +/* 8026D110 0026A050 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026D114.s b/include/SComponent/c_m3d/asm/func_8026D114.s new file mode 100644 index 0000000000..23f87a2db7 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026D114.s @@ -0,0 +1,190 @@ +/* 8026D114 0026A054 94 21 FF B0 */ stwu r1, -0x50(r1) +/* 8026D118 0026A058 7C 08 02 A6 */ mflr r0 +/* 8026D11C 0026A05C 90 01 00 54 */ stw r0, 0x54(r1) +/* 8026D120 0026A060 39 61 00 50 */ addi r11, r1, 0x50 +/* 8026D124 0026A064 48 0F 50 B9 */ bl _savegpr_29 +/* 8026D128 0026A068 7C 7D 1B 78 */ mr r29, r3 +/* 8026D12C 0026A06C 7C 9E 23 78 */ mr r30, r4 +/* 8026D130 0026A070 7C BF 2B 78 */ mr r31, r5 +/* 8026D134 0026A074 38 A1 00 0C */ addi r5, r1, 0xc +/* 8026D138 0026A078 38 C1 00 08 */ addi r6, r1, 8 +/* 8026D13C 0026A07C 4B FF BB 21 */ bl cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf +/* 8026D140 0026A080 2C 03 00 01 */ cmpwi r3, 1 +/* 8026D144 0026A084 40 82 00 0C */ bne lbl_8026D150 +/* 8026D148 0026A088 38 60 00 00 */ li r3, 0 +/* 8026D14C 0026A08C 48 00 02 70 */ b lbl_8026D3BC +lbl_8026D150: +/* 8026D150 0026A090 2C 03 00 02 */ cmpwi r3, 2 +/* 8026D154 0026A094 40 82 00 98 */ bne lbl_8026D1EC +/* 8026D158 0026A098 C0 21 00 0C */ lfs f1, 0xc(r1) +/* 8026D15C 0026A09C C0 42 B7 18 */ lfs f2, lbl_80455118-_SDA2_BASE_(r2) +/* 8026D160 0026A0A0 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026D164 0026A0A4 40 81 02 54 */ ble lbl_8026D3B8 +/* 8026D168 0026A0A8 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026D16C 0026A0AC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D170 0026A0B0 40 80 02 48 */ bge lbl_8026D3B8 +/* 8026D174 0026A0B4 C0 61 00 08 */ lfs f3, 8(r1) +/* 8026D178 0026A0B8 FC 03 10 40 */ fcmpo cr0, f3, f2 +/* 8026D17C 0026A0BC 40 81 02 3C */ ble lbl_8026D3B8 +/* 8026D180 0026A0C0 FC 03 00 40 */ fcmpo cr0, f3, f0 +/* 8026D184 0026A0C4 40 80 02 34 */ bge lbl_8026D3B8 +/* 8026D188 0026A0C8 7F A3 EB 78 */ mr r3, r29 +/* 8026D18C 0026A0CC 38 81 00 34 */ addi r4, r1, 0x34 +/* 8026D190 0026A0D0 48 00 21 C1 */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026D194 0026A0D4 7F C3 F3 78 */ mr r3, r30 +/* 8026D198 0026A0D8 38 81 00 28 */ addi r4, r1, 0x28 +/* 8026D19C 0026A0DC C0 21 00 08 */ lfs f1, 8(r1) +/* 8026D1A0 0026A0E0 48 00 21 B1 */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026D1A4 0026A0E4 38 61 00 34 */ addi r3, r1, 0x34 +/* 8026D1A8 0026A0E8 38 81 00 28 */ addi r4, r1, 0x28 +/* 8026D1AC 0026A0EC 48 0D A2 19 */ bl PSVECDistance +/* 8026D1B0 0026A0F0 C0 5D 00 1C */ lfs f2, 0x1c(r29) +/* 8026D1B4 0026A0F4 C0 1E 00 1C */ lfs f0, 0x1c(r30) +/* 8026D1B8 0026A0F8 EC 02 00 2A */ fadds f0, f2, f0 +/* 8026D1BC 0026A0FC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D1C0 0026A100 40 80 01 F8 */ bge lbl_8026D3B8 +/* 8026D1C4 0026A104 38 61 00 34 */ addi r3, r1, 0x34 +/* 8026D1C8 0026A108 38 81 00 28 */ addi r4, r1, 0x28 +/* 8026D1CC 0026A10C 7F E5 FB 78 */ mr r5, r31 +/* 8026D1D0 0026A110 48 0D 9E C1 */ bl PSVECAdd +/* 8026D1D4 0026A114 7F E3 FB 78 */ mr r3, r31 +/* 8026D1D8 0026A118 7F E4 FB 78 */ mr r4, r31 +/* 8026D1DC 0026A11C C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026D1E0 0026A120 48 0D 9E F9 */ bl PSVECScale +/* 8026D1E4 0026A124 38 60 00 01 */ li r3, 1 +/* 8026D1E8 0026A128 48 00 01 D4 */ b lbl_8026D3BC +lbl_8026D1EC: +/* 8026D1EC 0026A12C 2C 03 00 03 */ cmpwi r3, 3 +/* 8026D1F0 0026A130 40 82 01 C8 */ bne lbl_8026D3B8 +/* 8026D1F4 0026A134 C0 21 00 0C */ lfs f1, 0xc(r1) +/* 8026D1F8 0026A138 C0 62 B7 18 */ lfs f3, lbl_80455118-_SDA2_BASE_(r2) +/* 8026D1FC 0026A13C FC 01 18 40 */ fcmpo cr0, f1, f3 +/* 8026D200 0026A140 40 80 00 7C */ bge lbl_8026D27C +/* 8026D204 0026A144 C0 1D 00 00 */ lfs f0, 0(r29) +/* 8026D208 0026A148 D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 8026D20C 0026A14C C0 1D 00 04 */ lfs f0, 4(r29) +/* 8026D210 0026A150 D0 01 00 20 */ stfs f0, 0x20(r1) +/* 8026D214 0026A154 C0 1D 00 08 */ lfs f0, 8(r29) +/* 8026D218 0026A158 D0 01 00 24 */ stfs f0, 0x24(r1) +/* 8026D21C 0026A15C C0 21 00 08 */ lfs f1, 8(r1) +/* 8026D220 0026A160 FC 01 18 40 */ fcmpo cr0, f1, f3 +/* 8026D224 0026A164 40 80 00 20 */ bge lbl_8026D244 +/* 8026D228 0026A168 C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026D22C 0026A16C D0 01 00 10 */ stfs f0, 0x10(r1) +/* 8026D230 0026A170 C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026D234 0026A174 D0 01 00 14 */ stfs f0, 0x14(r1) +/* 8026D238 0026A178 C0 1E 00 08 */ lfs f0, 8(r30) +/* 8026D23C 0026A17C D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026D240 0026A180 48 00 01 28 */ b lbl_8026D368 +lbl_8026D244: +/* 8026D244 0026A184 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026D248 0026A188 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D24C 0026A18C 40 81 00 20 */ ble lbl_8026D26C +/* 8026D250 0026A190 C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026D254 0026A194 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 8026D258 0026A198 C0 1E 00 10 */ lfs f0, 0x10(r30) +/* 8026D25C 0026A19C D0 01 00 14 */ stfs f0, 0x14(r1) +/* 8026D260 0026A1A0 C0 1E 00 14 */ lfs f0, 0x14(r30) +/* 8026D264 0026A1A4 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026D268 0026A1A8 48 00 01 00 */ b lbl_8026D368 +lbl_8026D26C: +/* 8026D26C 0026A1AC 7F C3 F3 78 */ mr r3, r30 +/* 8026D270 0026A1B0 38 81 00 10 */ addi r4, r1, 0x10 +/* 8026D274 0026A1B4 48 00 20 DD */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026D278 0026A1B8 48 00 00 F0 */ b lbl_8026D368 +lbl_8026D27C: +/* 8026D27C 0026A1BC C0 42 B7 38 */ lfs f2, lbl_80455138-_SDA2_BASE_(r2) +/* 8026D280 0026A1C0 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026D284 0026A1C4 40 81 00 78 */ ble lbl_8026D2FC +/* 8026D288 0026A1C8 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026D28C 0026A1CC D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 8026D290 0026A1D0 C0 1D 00 10 */ lfs f0, 0x10(r29) +/* 8026D294 0026A1D4 D0 01 00 20 */ stfs f0, 0x20(r1) +/* 8026D298 0026A1D8 C0 1D 00 14 */ lfs f0, 0x14(r29) +/* 8026D29C 0026A1DC D0 01 00 24 */ stfs f0, 0x24(r1) +/* 8026D2A0 0026A1E0 C0 21 00 08 */ lfs f1, 8(r1) +/* 8026D2A4 0026A1E4 FC 01 18 40 */ fcmpo cr0, f1, f3 +/* 8026D2A8 0026A1E8 40 80 00 20 */ bge lbl_8026D2C8 +/* 8026D2AC 0026A1EC C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026D2B0 0026A1F0 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 8026D2B4 0026A1F4 C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026D2B8 0026A1F8 D0 01 00 14 */ stfs f0, 0x14(r1) +/* 8026D2BC 0026A1FC C0 1E 00 08 */ lfs f0, 8(r30) +/* 8026D2C0 0026A200 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026D2C4 0026A204 48 00 00 A4 */ b lbl_8026D368 +lbl_8026D2C8: +/* 8026D2C8 0026A208 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026D2CC 0026A20C 40 81 00 20 */ ble lbl_8026D2EC +/* 8026D2D0 0026A210 C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026D2D4 0026A214 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 8026D2D8 0026A218 C0 1E 00 10 */ lfs f0, 0x10(r30) +/* 8026D2DC 0026A21C D0 01 00 14 */ stfs f0, 0x14(r1) +/* 8026D2E0 0026A220 C0 1E 00 14 */ lfs f0, 0x14(r30) +/* 8026D2E4 0026A224 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026D2E8 0026A228 48 00 00 80 */ b lbl_8026D368 +lbl_8026D2EC: +/* 8026D2EC 0026A22C 7F C3 F3 78 */ mr r3, r30 +/* 8026D2F0 0026A230 38 81 00 10 */ addi r4, r1, 0x10 +/* 8026D2F4 0026A234 48 00 20 5D */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026D2F8 0026A238 48 00 00 70 */ b lbl_8026D368 +lbl_8026D2FC: +/* 8026D2FC 0026A23C 7F A3 EB 78 */ mr r3, r29 +/* 8026D300 0026A240 38 81 00 1C */ addi r4, r1, 0x1c +/* 8026D304 0026A244 48 00 20 4D */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026D308 0026A248 C0 21 00 08 */ lfs f1, 8(r1) +/* 8026D30C 0026A24C C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026D310 0026A250 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D314 0026A254 40 80 00 20 */ bge lbl_8026D334 +/* 8026D318 0026A258 C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026D31C 0026A25C D0 01 00 10 */ stfs f0, 0x10(r1) +/* 8026D320 0026A260 C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026D324 0026A264 D0 01 00 14 */ stfs f0, 0x14(r1) +/* 8026D328 0026A268 C0 1E 00 08 */ lfs f0, 8(r30) +/* 8026D32C 0026A26C D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026D330 0026A270 48 00 00 38 */ b lbl_8026D368 +lbl_8026D334: +/* 8026D334 0026A274 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026D338 0026A278 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D33C 0026A27C 40 81 00 20 */ ble lbl_8026D35C +/* 8026D340 0026A280 C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026D344 0026A284 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 8026D348 0026A288 C0 1E 00 10 */ lfs f0, 0x10(r30) +/* 8026D34C 0026A28C D0 01 00 14 */ stfs f0, 0x14(r1) +/* 8026D350 0026A290 C0 1E 00 14 */ lfs f0, 0x14(r30) +/* 8026D354 0026A294 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026D358 0026A298 48 00 00 10 */ b lbl_8026D368 +lbl_8026D35C: +/* 8026D35C 0026A29C 7F C3 F3 78 */ mr r3, r30 +/* 8026D360 0026A2A0 38 81 00 10 */ addi r4, r1, 0x10 +/* 8026D364 0026A2A4 48 00 1F ED */ bl CalcPos__8cM3dGLinCFP3Vecf +lbl_8026D368: +/* 8026D368 0026A2A8 38 61 00 1C */ addi r3, r1, 0x1c +/* 8026D36C 0026A2AC 38 81 00 10 */ addi r4, r1, 0x10 +/* 8026D370 0026A2B0 48 0D A0 55 */ bl PSVECDistance +/* 8026D374 0026A2B4 C0 5D 00 1C */ lfs f2, 0x1c(r29) +/* 8026D378 0026A2B8 C0 1E 00 1C */ lfs f0, 0x1c(r30) +/* 8026D37C 0026A2BC EC 02 00 2A */ fadds f0, f2, f0 +/* 8026D380 0026A2C0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D384 0026A2C4 40 80 00 2C */ bge lbl_8026D3B0 +/* 8026D388 0026A2C8 38 61 00 1C */ addi r3, r1, 0x1c +/* 8026D38C 0026A2CC 38 81 00 10 */ addi r4, r1, 0x10 +/* 8026D390 0026A2D0 7F E5 FB 78 */ mr r5, r31 +/* 8026D394 0026A2D4 48 0D 9C FD */ bl PSVECAdd +/* 8026D398 0026A2D8 7F E3 FB 78 */ mr r3, r31 +/* 8026D39C 0026A2DC 7F E4 FB 78 */ mr r4, r31 +/* 8026D3A0 0026A2E0 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026D3A4 0026A2E4 48 0D 9D 35 */ bl PSVECScale +/* 8026D3A8 0026A2E8 38 60 00 01 */ li r3, 1 +/* 8026D3AC 0026A2EC 48 00 00 10 */ b lbl_8026D3BC +lbl_8026D3B0: +/* 8026D3B0 0026A2F0 38 60 00 00 */ li r3, 0 +/* 8026D3B4 0026A2F4 48 00 00 08 */ b lbl_8026D3BC +lbl_8026D3B8: +/* 8026D3B8 0026A2F8 38 60 00 00 */ li r3, 0 +lbl_8026D3BC: +/* 8026D3BC 0026A2FC 39 61 00 50 */ addi r11, r1, 0x50 +/* 8026D3C0 0026A300 48 0F 4E 69 */ bl _restgpr_29 +/* 8026D3C4 0026A304 80 01 00 54 */ lwz r0, 0x54(r1) +/* 8026D3C8 0026A308 7C 08 03 A6 */ mtlr r0 +/* 8026D3CC 0026A30C 38 21 00 50 */ addi r1, r1, 0x50 +/* 8026D3D0 0026A310 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026D3D4.s b/include/SComponent/c_m3d/asm/func_8026D3D4.s new file mode 100644 index 0000000000..c2731d1fc3 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026D3D4.s @@ -0,0 +1,481 @@ +/* 8026D3D4 0026A314 94 21 FF 60 */ stwu r1, -0xa0(r1) +/* 8026D3D8 0026A318 7C 08 02 A6 */ mflr r0 +/* 8026D3DC 0026A31C 90 01 00 A4 */ stw r0, 0xa4(r1) +/* 8026D3E0 0026A320 39 61 00 A0 */ addi r11, r1, 0xa0 +/* 8026D3E4 0026A324 48 0F 4D F5 */ bl _savegpr_28 +/* 8026D3E8 0026A328 7C 7C 1B 78 */ mr r28, r3 +/* 8026D3EC 0026A32C 7C 9D 23 78 */ mr r29, r4 +/* 8026D3F0 0026A330 7C BE 2B 78 */ mr r30, r5 +/* 8026D3F4 0026A334 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026D3F8 0026A338 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026D3FC 0026A33C 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026D400 0026A340 7F A3 EB 78 */ mr r3, r29 +/* 8026D404 0026A344 38 9C 00 0C */ addi r4, r28, 0xc +/* 8026D408 0026A348 4B FF FC A9 */ bl cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec +/* 8026D40C 0026A34C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026D410 0026A350 41 82 00 30 */ beq lbl_8026D440 +/* 8026D414 0026A354 C0 1C 00 0C */ lfs f0, 0xc(r28) +/* 8026D418 0026A358 D0 1E 00 00 */ stfs f0, 0(r30) +/* 8026D41C 0026A35C C0 1C 00 10 */ lfs f0, 0x10(r28) +/* 8026D420 0026A360 D0 1E 00 04 */ stfs f0, 4(r30) +/* 8026D424 0026A364 C0 1C 00 14 */ lfs f0, 0x14(r28) +/* 8026D428 0026A368 D0 1E 00 08 */ stfs f0, 8(r30) +/* 8026D42C 0026A36C 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026D430 0026A370 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026D434 0026A374 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026D438 0026A378 38 60 00 01 */ li r3, 1 +/* 8026D43C 0026A37C 48 00 06 8C */ b lbl_8026DAC8 +lbl_8026D440: +/* 8026D440 0026A380 7F A3 EB 78 */ mr r3, r29 +/* 8026D444 0026A384 7F 84 E3 78 */ mr r4, r28 +/* 8026D448 0026A388 4B FF FC 69 */ bl cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec +/* 8026D44C 0026A38C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026D450 0026A390 41 82 00 30 */ beq lbl_8026D480 +/* 8026D454 0026A394 C0 1C 00 00 */ lfs f0, 0(r28) +/* 8026D458 0026A398 D0 1E 00 00 */ stfs f0, 0(r30) +/* 8026D45C 0026A39C C0 1C 00 04 */ lfs f0, 4(r28) +/* 8026D460 0026A3A0 D0 1E 00 04 */ stfs f0, 4(r30) +/* 8026D464 0026A3A4 C0 1C 00 08 */ lfs f0, 8(r28) +/* 8026D468 0026A3A8 D0 1E 00 08 */ stfs f0, 8(r30) +/* 8026D46C 0026A3AC 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026D470 0026A3B0 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026D474 0026A3B4 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026D478 0026A3B8 38 60 00 01 */ li r3, 1 +/* 8026D47C 0026A3BC 48 00 06 4C */ b lbl_8026DAC8 +lbl_8026D480: +/* 8026D480 0026A3C0 C0 5D 00 00 */ lfs f2, 0(r29) +/* 8026D484 0026A3C4 D0 41 00 68 */ stfs f2, 0x68(r1) +/* 8026D488 0026A3C8 C0 3D 00 04 */ lfs f1, 4(r29) +/* 8026D48C 0026A3CC D0 21 00 6C */ stfs f1, 0x6c(r1) +/* 8026D490 0026A3D0 C0 1D 00 08 */ lfs f0, 8(r29) +/* 8026D494 0026A3D4 D0 01 00 70 */ stfs f0, 0x70(r1) +/* 8026D498 0026A3D8 3B E1 00 74 */ addi r31, r1, 0x74 +/* 8026D49C 0026A3DC D0 41 00 74 */ stfs f2, 0x74(r1) +/* 8026D4A0 0026A3E0 D0 21 00 78 */ stfs f1, 0x78(r1) +/* 8026D4A4 0026A3E4 D0 01 00 7C */ stfs f0, 0x7c(r1) +/* 8026D4A8 0026A3E8 C0 1D 00 10 */ lfs f0, 0x10(r29) +/* 8026D4AC 0026A3EC EC 01 00 2A */ fadds f0, f1, f0 +/* 8026D4B0 0026A3F0 D0 01 00 78 */ stfs f0, 0x78(r1) +/* 8026D4B4 0026A3F4 7F 83 E3 78 */ mr r3, r28 +/* 8026D4B8 0026A3F8 7F E4 FB 78 */ mr r4, r31 +/* 8026D4BC 0026A3FC 38 A1 00 48 */ addi r5, r1, 0x48 +/* 8026D4C0 0026A400 38 C1 00 14 */ addi r6, r1, 0x14 +/* 8026D4C4 0026A404 4B FF B2 4D */ bl cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf +/* 8026D4C8 0026A408 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026D4CC 0026A40C 41 82 00 68 */ beq lbl_8026D534 +/* 8026D4D0 0026A410 7F E3 FB 78 */ mr r3, r31 +/* 8026D4D4 0026A414 38 81 00 48 */ addi r4, r1, 0x48 +/* 8026D4D8 0026A418 48 0D 9E ED */ bl PSVECDistance +/* 8026D4DC 0026A41C C0 1C 00 1C */ lfs f0, 0x1c(r28) +/* 8026D4E0 0026A420 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D4E4 0026A424 40 80 00 50 */ bge lbl_8026D534 +/* 8026D4E8 0026A428 7F E3 FB 78 */ mr r3, r31 +/* 8026D4EC 0026A42C 38 81 00 48 */ addi r4, r1, 0x48 +/* 8026D4F0 0026A430 7F C5 F3 78 */ mr r5, r30 +/* 8026D4F4 0026A434 48 0D 9B 9D */ bl PSVECAdd +/* 8026D4F8 0026A438 7F C3 F3 78 */ mr r3, r30 +/* 8026D4FC 0026A43C 7F C4 F3 78 */ mr r4, r30 +/* 8026D500 0026A440 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026D504 0026A444 48 0D 9B D5 */ bl PSVECScale +/* 8026D508 0026A448 C0 01 00 74 */ lfs f0, 0x74(r1) +/* 8026D50C 0026A44C D0 1E 00 00 */ stfs f0, 0(r30) +/* 8026D510 0026A450 C0 01 00 78 */ lfs f0, 0x78(r1) +/* 8026D514 0026A454 D0 1E 00 04 */ stfs f0, 4(r30) +/* 8026D518 0026A458 C0 01 00 7C */ lfs f0, 0x7c(r1) +/* 8026D51C 0026A45C D0 1E 00 08 */ stfs f0, 8(r30) +/* 8026D520 0026A460 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026D524 0026A464 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026D528 0026A468 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026D52C 0026A46C 38 60 00 01 */ li r3, 1 +/* 8026D530 0026A470 48 00 05 98 */ b lbl_8026DAC8 +lbl_8026D534: +/* 8026D534 0026A474 7F 83 E3 78 */ mr r3, r28 +/* 8026D538 0026A478 38 81 00 68 */ addi r4, r1, 0x68 +/* 8026D53C 0026A47C 38 A1 00 48 */ addi r5, r1, 0x48 +/* 8026D540 0026A480 38 C1 00 14 */ addi r6, r1, 0x14 +/* 8026D544 0026A484 4B FF B1 CD */ bl cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf +/* 8026D548 0026A488 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026D54C 0026A48C 41 82 00 50 */ beq lbl_8026D59C +/* 8026D550 0026A490 38 61 00 68 */ addi r3, r1, 0x68 +/* 8026D554 0026A494 38 81 00 48 */ addi r4, r1, 0x48 +/* 8026D558 0026A498 48 0D 9E 6D */ bl PSVECDistance +/* 8026D55C 0026A49C C0 1C 00 1C */ lfs f0, 0x1c(r28) +/* 8026D560 0026A4A0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D564 0026A4A4 40 80 00 38 */ bge lbl_8026D59C +/* 8026D568 0026A4A8 38 61 00 68 */ addi r3, r1, 0x68 +/* 8026D56C 0026A4AC 38 81 00 48 */ addi r4, r1, 0x48 +/* 8026D570 0026A4B0 7F C5 F3 78 */ mr r5, r30 +/* 8026D574 0026A4B4 48 0D 9B 1D */ bl PSVECAdd +/* 8026D578 0026A4B8 7F C3 F3 78 */ mr r3, r30 +/* 8026D57C 0026A4BC 7F C4 F3 78 */ mr r4, r30 +/* 8026D580 0026A4C0 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026D584 0026A4C4 48 0D 9B 55 */ bl PSVECScale +/* 8026D588 0026A4C8 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026D58C 0026A4CC 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026D590 0026A4D0 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026D594 0026A4D4 38 60 00 01 */ li r3, 1 +/* 8026D598 0026A4D8 48 00 05 30 */ b lbl_8026DAC8 +lbl_8026D59C: +/* 8026D59C 0026A4DC 7F 83 E3 78 */ mr r3, r28 +/* 8026D5A0 0026A4E0 38 81 00 68 */ addi r4, r1, 0x68 +/* 8026D5A4 0026A4E4 38 A1 00 10 */ addi r5, r1, 0x10 +/* 8026D5A8 0026A4E8 38 C1 00 0C */ addi r6, r1, 0xc +/* 8026D5AC 0026A4EC 4B FF B6 B1 */ bl cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf +/* 8026D5B0 0026A4F0 2C 03 00 01 */ cmpwi r3, 1 +/* 8026D5B4 0026A4F4 40 82 00 58 */ bne lbl_8026D60C +/* 8026D5B8 0026A4F8 3C 60 80 3A */ lis r3, lbl_803A7904@ha +/* 8026D5BC 0026A4FC 38 03 79 04 */ addi r0, r3, lbl_803A7904@l +/* 8026D5C0 0026A500 90 01 00 64 */ stw r0, 0x64(r1) +/* 8026D5C4 0026A504 38 61 00 54 */ addi r3, r1, 0x54 +/* 8026D5C8 0026A508 C0 3C 00 1C */ lfs f1, 0x1c(r28) +/* 8026D5CC 0026A50C 48 00 21 3D */ bl SetR__8cM3dGSphFf +/* 8026D5D0 0026A510 38 61 00 54 */ addi r3, r1, 0x54 +/* 8026D5D4 0026A514 7F 84 E3 78 */ mr r4, r28 +/* 8026D5D8 0026A518 48 00 20 71 */ bl SetC__8cM3dGSphFRC4cXyz +/* 8026D5DC 0026A51C 7F A3 EB 78 */ mr r3, r29 +/* 8026D5E0 0026A520 38 81 00 54 */ addi r4, r1, 0x54 +/* 8026D5E4 0026A524 7F C5 F3 78 */ mr r5, r30 +/* 8026D5E8 0026A528 38 C1 00 08 */ addi r6, r1, 8 +/* 8026D5EC 0026A52C 4B FF E4 5D */ bl cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf +/* 8026D5F0 0026A530 3C 80 80 3A */ lis r4, lbl_803A7904@ha +/* 8026D5F4 0026A534 38 04 79 04 */ addi r0, r4, lbl_803A7904@l +/* 8026D5F8 0026A538 90 01 00 64 */ stw r0, 0x64(r1) +/* 8026D5FC 0026A53C 3C 80 80 3A */ lis r4, lbl_803A78F8@ha +/* 8026D600 0026A540 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l +/* 8026D604 0026A544 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026D608 0026A548 48 00 04 C0 */ b lbl_8026DAC8 +lbl_8026D60C: +/* 8026D60C 0026A54C 2C 03 00 02 */ cmpwi r3, 2 +/* 8026D610 0026A550 40 82 00 B4 */ bne lbl_8026D6C4 +/* 8026D614 0026A554 C0 21 00 10 */ lfs f1, 0x10(r1) +/* 8026D618 0026A558 C0 42 B7 18 */ lfs f2, lbl_80455118-_SDA2_BASE_(r2) +/* 8026D61C 0026A55C FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026D620 0026A560 4C 41 13 82 */ cror 2, 1, 2 +/* 8026D624 0026A564 40 82 04 94 */ bne lbl_8026DAB8 +/* 8026D628 0026A568 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026D62C 0026A56C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D630 0026A570 4C 40 13 82 */ cror 2, 0, 2 +/* 8026D634 0026A574 40 82 04 84 */ bne lbl_8026DAB8 +/* 8026D638 0026A578 C0 61 00 0C */ lfs f3, 0xc(r1) +/* 8026D63C 0026A57C FC 03 10 40 */ fcmpo cr0, f3, f2 +/* 8026D640 0026A580 4C 41 13 82 */ cror 2, 1, 2 +/* 8026D644 0026A584 40 82 04 74 */ bne lbl_8026DAB8 +/* 8026D648 0026A588 FC 03 00 40 */ fcmpo cr0, f3, f0 +/* 8026D64C 0026A58C 4C 40 13 82 */ cror 2, 0, 2 +/* 8026D650 0026A590 40 82 04 68 */ bne lbl_8026DAB8 +/* 8026D654 0026A594 7F 83 E3 78 */ mr r3, r28 +/* 8026D658 0026A598 38 81 00 3C */ addi r4, r1, 0x3c +/* 8026D65C 0026A59C 48 00 1C F5 */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026D660 0026A5A0 38 61 00 68 */ addi r3, r1, 0x68 +/* 8026D664 0026A5A4 38 81 00 30 */ addi r4, r1, 0x30 +/* 8026D668 0026A5A8 C0 21 00 0C */ lfs f1, 0xc(r1) +/* 8026D66C 0026A5AC 48 00 1C E5 */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026D670 0026A5B0 38 61 00 3C */ addi r3, r1, 0x3c +/* 8026D674 0026A5B4 38 81 00 30 */ addi r4, r1, 0x30 +/* 8026D678 0026A5B8 48 0D 9D 4D */ bl PSVECDistance +/* 8026D67C 0026A5BC C0 5C 00 1C */ lfs f2, 0x1c(r28) +/* 8026D680 0026A5C0 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026D684 0026A5C4 EC 02 00 2A */ fadds f0, f2, f0 +/* 8026D688 0026A5C8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D68C 0026A5CC 40 80 04 2C */ bge lbl_8026DAB8 +/* 8026D690 0026A5D0 38 61 00 3C */ addi r3, r1, 0x3c +/* 8026D694 0026A5D4 38 81 00 30 */ addi r4, r1, 0x30 +/* 8026D698 0026A5D8 7F C5 F3 78 */ mr r5, r30 +/* 8026D69C 0026A5DC 48 0D 99 F5 */ bl PSVECAdd +/* 8026D6A0 0026A5E0 7F C3 F3 78 */ mr r3, r30 +/* 8026D6A4 0026A5E4 7F C4 F3 78 */ mr r4, r30 +/* 8026D6A8 0026A5E8 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026D6AC 0026A5EC 48 0D 9A 2D */ bl PSVECScale +/* 8026D6B0 0026A5F0 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026D6B4 0026A5F4 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026D6B8 0026A5F8 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026D6BC 0026A5FC 38 60 00 01 */ li r3, 1 +/* 8026D6C0 0026A600 48 00 04 08 */ b lbl_8026DAC8 +lbl_8026D6C4: +/* 8026D6C4 0026A604 2C 03 00 03 */ cmpwi r3, 3 +/* 8026D6C8 0026A608 40 82 03 F0 */ bne lbl_8026DAB8 +/* 8026D6CC 0026A60C C0 21 00 10 */ lfs f1, 0x10(r1) +/* 8026D6D0 0026A610 C0 62 B7 18 */ lfs f3, lbl_80455118-_SDA2_BASE_(r2) +/* 8026D6D4 0026A614 FC 01 18 40 */ fcmpo cr0, f1, f3 +/* 8026D6D8 0026A618 40 80 01 2C */ bge lbl_8026D804 +/* 8026D6DC 0026A61C C0 1C 00 00 */ lfs f0, 0(r28) +/* 8026D6E0 0026A620 D0 01 00 24 */ stfs f0, 0x24(r1) +/* 8026D6E4 0026A624 C0 1C 00 04 */ lfs f0, 4(r28) +/* 8026D6E8 0026A628 D0 01 00 28 */ stfs f0, 0x28(r1) +/* 8026D6EC 0026A62C C0 1C 00 08 */ lfs f0, 8(r28) +/* 8026D6F0 0026A630 D0 01 00 2C */ stfs f0, 0x2c(r1) +/* 8026D6F4 0026A634 C0 21 00 0C */ lfs f1, 0xc(r1) +/* 8026D6F8 0026A638 FC 01 18 40 */ fcmpo cr0, f1, f3 +/* 8026D6FC 0026A63C 40 80 00 78 */ bge lbl_8026D774 +/* 8026D700 0026A640 C0 01 00 68 */ lfs f0, 0x68(r1) +/* 8026D704 0026A644 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026D708 0026A648 C0 01 00 6C */ lfs f0, 0x6c(r1) +/* 8026D70C 0026A64C D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 8026D710 0026A650 C0 01 00 70 */ lfs f0, 0x70(r1) +/* 8026D714 0026A654 D0 01 00 20 */ stfs f0, 0x20(r1) +/* 8026D718 0026A658 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026D71C 0026A65C 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D720 0026A660 48 0D 9C A5 */ bl PSVECDistance +/* 8026D724 0026A664 C0 5C 00 1C */ lfs f2, 0x1c(r28) +/* 8026D728 0026A668 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026D72C 0026A66C EC 02 00 2A */ fadds f0, f2, f0 +/* 8026D730 0026A670 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D734 0026A674 40 80 00 2C */ bge lbl_8026D760 +/* 8026D738 0026A678 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026D73C 0026A67C 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D740 0026A680 7F C5 F3 78 */ mr r5, r30 +/* 8026D744 0026A684 48 0D 99 4D */ bl PSVECAdd +/* 8026D748 0026A688 7F C3 F3 78 */ mr r3, r30 +/* 8026D74C 0026A68C 7F C4 F3 78 */ mr r4, r30 +/* 8026D750 0026A690 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026D754 0026A694 48 0D 99 85 */ bl PSVECScale +/* 8026D758 0026A698 38 60 00 01 */ li r3, 1 +/* 8026D75C 0026A69C 48 00 00 08 */ b lbl_8026D764 +lbl_8026D760: +/* 8026D760 0026A6A0 38 60 00 00 */ li r3, 0 +lbl_8026D764: +/* 8026D764 0026A6A4 3C 80 80 3A */ lis r4, lbl_803A78F8@ha +/* 8026D768 0026A6A8 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l +/* 8026D76C 0026A6AC 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026D770 0026A6B0 48 00 03 58 */ b lbl_8026DAC8 +lbl_8026D774: +/* 8026D774 0026A6B4 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026D778 0026A6B8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D77C 0026A6BC 40 81 00 78 */ ble lbl_8026D7F4 +/* 8026D780 0026A6C0 C0 01 00 74 */ lfs f0, 0x74(r1) +/* 8026D784 0026A6C4 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026D788 0026A6C8 C0 01 00 78 */ lfs f0, 0x78(r1) +/* 8026D78C 0026A6CC D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 8026D790 0026A6D0 C0 01 00 7C */ lfs f0, 0x7c(r1) +/* 8026D794 0026A6D4 D0 01 00 20 */ stfs f0, 0x20(r1) +/* 8026D798 0026A6D8 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026D79C 0026A6DC 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D7A0 0026A6E0 48 0D 9C 25 */ bl PSVECDistance +/* 8026D7A4 0026A6E4 C0 5C 00 1C */ lfs f2, 0x1c(r28) +/* 8026D7A8 0026A6E8 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026D7AC 0026A6EC EC 02 00 2A */ fadds f0, f2, f0 +/* 8026D7B0 0026A6F0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D7B4 0026A6F4 40 80 00 2C */ bge lbl_8026D7E0 +/* 8026D7B8 0026A6F8 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026D7BC 0026A6FC 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D7C0 0026A700 7F C5 F3 78 */ mr r5, r30 +/* 8026D7C4 0026A704 48 0D 98 CD */ bl PSVECAdd +/* 8026D7C8 0026A708 7F C3 F3 78 */ mr r3, r30 +/* 8026D7CC 0026A70C 7F C4 F3 78 */ mr r4, r30 +/* 8026D7D0 0026A710 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026D7D4 0026A714 48 0D 99 05 */ bl PSVECScale +/* 8026D7D8 0026A718 38 60 00 01 */ li r3, 1 +/* 8026D7DC 0026A71C 48 00 00 08 */ b lbl_8026D7E4 +lbl_8026D7E0: +/* 8026D7E0 0026A720 38 60 00 00 */ li r3, 0 +lbl_8026D7E4: +/* 8026D7E4 0026A724 3C 80 80 3A */ lis r4, lbl_803A78F8@ha +/* 8026D7E8 0026A728 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l +/* 8026D7EC 0026A72C 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026D7F0 0026A730 48 00 02 D8 */ b lbl_8026DAC8 +lbl_8026D7F4: +/* 8026D7F4 0026A734 38 61 00 68 */ addi r3, r1, 0x68 +/* 8026D7F8 0026A738 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D7FC 0026A73C 48 00 1B 55 */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026D800 0026A740 48 00 02 50 */ b lbl_8026DA50 +lbl_8026D804: +/* 8026D804 0026A744 C0 42 B7 38 */ lfs f2, lbl_80455138-_SDA2_BASE_(r2) +/* 8026D808 0026A748 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026D80C 0026A74C 40 81 01 28 */ ble lbl_8026D934 +/* 8026D810 0026A750 C0 1C 00 0C */ lfs f0, 0xc(r28) +/* 8026D814 0026A754 D0 01 00 24 */ stfs f0, 0x24(r1) +/* 8026D818 0026A758 C0 1C 00 10 */ lfs f0, 0x10(r28) +/* 8026D81C 0026A75C D0 01 00 28 */ stfs f0, 0x28(r1) +/* 8026D820 0026A760 C0 1C 00 14 */ lfs f0, 0x14(r28) +/* 8026D824 0026A764 D0 01 00 2C */ stfs f0, 0x2c(r1) +/* 8026D828 0026A768 C0 21 00 0C */ lfs f1, 0xc(r1) +/* 8026D82C 0026A76C FC 01 18 40 */ fcmpo cr0, f1, f3 +/* 8026D830 0026A770 40 80 00 78 */ bge lbl_8026D8A8 +/* 8026D834 0026A774 C0 01 00 68 */ lfs f0, 0x68(r1) +/* 8026D838 0026A778 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026D83C 0026A77C C0 01 00 6C */ lfs f0, 0x6c(r1) +/* 8026D840 0026A780 D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 8026D844 0026A784 C0 01 00 70 */ lfs f0, 0x70(r1) +/* 8026D848 0026A788 D0 01 00 20 */ stfs f0, 0x20(r1) +/* 8026D84C 0026A78C 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026D850 0026A790 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D854 0026A794 48 0D 9B 71 */ bl PSVECDistance +/* 8026D858 0026A798 C0 5C 00 1C */ lfs f2, 0x1c(r28) +/* 8026D85C 0026A79C C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026D860 0026A7A0 EC 02 00 2A */ fadds f0, f2, f0 +/* 8026D864 0026A7A4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D868 0026A7A8 40 80 00 2C */ bge lbl_8026D894 +/* 8026D86C 0026A7AC 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026D870 0026A7B0 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D874 0026A7B4 7F C5 F3 78 */ mr r5, r30 +/* 8026D878 0026A7B8 48 0D 98 19 */ bl PSVECAdd +/* 8026D87C 0026A7BC 7F C3 F3 78 */ mr r3, r30 +/* 8026D880 0026A7C0 7F C4 F3 78 */ mr r4, r30 +/* 8026D884 0026A7C4 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026D888 0026A7C8 48 0D 98 51 */ bl PSVECScale +/* 8026D88C 0026A7CC 38 60 00 01 */ li r3, 1 +/* 8026D890 0026A7D0 48 00 00 08 */ b lbl_8026D898 +lbl_8026D894: +/* 8026D894 0026A7D4 38 60 00 00 */ li r3, 0 +lbl_8026D898: +/* 8026D898 0026A7D8 3C 80 80 3A */ lis r4, lbl_803A78F8@ha +/* 8026D89C 0026A7DC 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l +/* 8026D8A0 0026A7E0 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026D8A4 0026A7E4 48 00 02 24 */ b lbl_8026DAC8 +lbl_8026D8A8: +/* 8026D8A8 0026A7E8 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026D8AC 0026A7EC 40 81 00 78 */ ble lbl_8026D924 +/* 8026D8B0 0026A7F0 C0 01 00 74 */ lfs f0, 0x74(r1) +/* 8026D8B4 0026A7F4 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026D8B8 0026A7F8 C0 01 00 78 */ lfs f0, 0x78(r1) +/* 8026D8BC 0026A7FC D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 8026D8C0 0026A800 C0 01 00 7C */ lfs f0, 0x7c(r1) +/* 8026D8C4 0026A804 D0 01 00 20 */ stfs f0, 0x20(r1) +/* 8026D8C8 0026A808 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026D8CC 0026A80C 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D8D0 0026A810 48 0D 9A F5 */ bl PSVECDistance +/* 8026D8D4 0026A814 C0 5C 00 1C */ lfs f2, 0x1c(r28) +/* 8026D8D8 0026A818 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026D8DC 0026A81C EC 02 00 2A */ fadds f0, f2, f0 +/* 8026D8E0 0026A820 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D8E4 0026A824 40 80 00 2C */ bge lbl_8026D910 +/* 8026D8E8 0026A828 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026D8EC 0026A82C 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D8F0 0026A830 7F C5 F3 78 */ mr r5, r30 +/* 8026D8F4 0026A834 48 0D 97 9D */ bl PSVECAdd +/* 8026D8F8 0026A838 7F C3 F3 78 */ mr r3, r30 +/* 8026D8FC 0026A83C 7F C4 F3 78 */ mr r4, r30 +/* 8026D900 0026A840 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026D904 0026A844 48 0D 97 D5 */ bl PSVECScale +/* 8026D908 0026A848 38 60 00 01 */ li r3, 1 +/* 8026D90C 0026A84C 48 00 00 08 */ b lbl_8026D914 +lbl_8026D910: +/* 8026D910 0026A850 38 60 00 00 */ li r3, 0 +lbl_8026D914: +/* 8026D914 0026A854 3C 80 80 3A */ lis r4, lbl_803A78F8@ha +/* 8026D918 0026A858 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l +/* 8026D91C 0026A85C 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026D920 0026A860 48 00 01 A8 */ b lbl_8026DAC8 +lbl_8026D924: +/* 8026D924 0026A864 38 61 00 68 */ addi r3, r1, 0x68 +/* 8026D928 0026A868 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D92C 0026A86C 48 00 1A 25 */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026D930 0026A870 48 00 01 20 */ b lbl_8026DA50 +lbl_8026D934: +/* 8026D934 0026A874 7F 83 E3 78 */ mr r3, r28 +/* 8026D938 0026A878 38 81 00 24 */ addi r4, r1, 0x24 +/* 8026D93C 0026A87C 48 00 1A 15 */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026D940 0026A880 C0 21 00 0C */ lfs f1, 0xc(r1) +/* 8026D944 0026A884 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026D948 0026A888 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D94C 0026A88C 40 80 00 78 */ bge lbl_8026D9C4 +/* 8026D950 0026A890 C0 01 00 68 */ lfs f0, 0x68(r1) +/* 8026D954 0026A894 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026D958 0026A898 C0 01 00 6C */ lfs f0, 0x6c(r1) +/* 8026D95C 0026A89C D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 8026D960 0026A8A0 C0 01 00 70 */ lfs f0, 0x70(r1) +/* 8026D964 0026A8A4 D0 01 00 20 */ stfs f0, 0x20(r1) +/* 8026D968 0026A8A8 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026D96C 0026A8AC 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D970 0026A8B0 48 0D 9A 55 */ bl PSVECDistance +/* 8026D974 0026A8B4 C0 5C 00 1C */ lfs f2, 0x1c(r28) +/* 8026D978 0026A8B8 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026D97C 0026A8BC EC 02 00 2A */ fadds f0, f2, f0 +/* 8026D980 0026A8C0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D984 0026A8C4 40 80 00 2C */ bge lbl_8026D9B0 +/* 8026D988 0026A8C8 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026D98C 0026A8CC 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D990 0026A8D0 7F C5 F3 78 */ mr r5, r30 +/* 8026D994 0026A8D4 48 0D 96 FD */ bl PSVECAdd +/* 8026D998 0026A8D8 7F C3 F3 78 */ mr r3, r30 +/* 8026D99C 0026A8DC 7F C4 F3 78 */ mr r4, r30 +/* 8026D9A0 0026A8E0 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026D9A4 0026A8E4 48 0D 97 35 */ bl PSVECScale +/* 8026D9A8 0026A8E8 38 60 00 01 */ li r3, 1 +/* 8026D9AC 0026A8EC 48 00 00 08 */ b lbl_8026D9B4 +lbl_8026D9B0: +/* 8026D9B0 0026A8F0 38 60 00 00 */ li r3, 0 +lbl_8026D9B4: +/* 8026D9B4 0026A8F4 3C 80 80 3A */ lis r4, lbl_803A78F8@ha +/* 8026D9B8 0026A8F8 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l +/* 8026D9BC 0026A8FC 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026D9C0 0026A900 48 00 01 08 */ b lbl_8026DAC8 +lbl_8026D9C4: +/* 8026D9C4 0026A904 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026D9C8 0026A908 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026D9CC 0026A90C 40 81 00 78 */ ble lbl_8026DA44 +/* 8026D9D0 0026A910 C0 01 00 74 */ lfs f0, 0x74(r1) +/* 8026D9D4 0026A914 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 8026D9D8 0026A918 C0 01 00 78 */ lfs f0, 0x78(r1) +/* 8026D9DC 0026A91C D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 8026D9E0 0026A920 C0 01 00 7C */ lfs f0, 0x7c(r1) +/* 8026D9E4 0026A924 D0 01 00 20 */ stfs f0, 0x20(r1) +/* 8026D9E8 0026A928 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026D9EC 0026A92C 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026D9F0 0026A930 48 0D 99 D5 */ bl PSVECDistance +/* 8026D9F4 0026A934 C0 5C 00 1C */ lfs f2, 0x1c(r28) +/* 8026D9F8 0026A938 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026D9FC 0026A93C EC 02 00 2A */ fadds f0, f2, f0 +/* 8026DA00 0026A940 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026DA04 0026A944 40 80 00 2C */ bge lbl_8026DA30 +/* 8026DA08 0026A948 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026DA0C 0026A94C 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026DA10 0026A950 7F C5 F3 78 */ mr r5, r30 +/* 8026DA14 0026A954 48 0D 96 7D */ bl PSVECAdd +/* 8026DA18 0026A958 7F C3 F3 78 */ mr r3, r30 +/* 8026DA1C 0026A95C 7F C4 F3 78 */ mr r4, r30 +/* 8026DA20 0026A960 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026DA24 0026A964 48 0D 96 B5 */ bl PSVECScale +/* 8026DA28 0026A968 38 60 00 01 */ li r3, 1 +/* 8026DA2C 0026A96C 48 00 00 08 */ b lbl_8026DA34 +lbl_8026DA30: +/* 8026DA30 0026A970 38 60 00 00 */ li r3, 0 +lbl_8026DA34: +/* 8026DA34 0026A974 3C 80 80 3A */ lis r4, lbl_803A78F8@ha +/* 8026DA38 0026A978 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l +/* 8026DA3C 0026A97C 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026DA40 0026A980 48 00 00 88 */ b lbl_8026DAC8 +lbl_8026DA44: +/* 8026DA44 0026A984 38 61 00 68 */ addi r3, r1, 0x68 +/* 8026DA48 0026A988 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026DA4C 0026A98C 48 00 19 05 */ bl CalcPos__8cM3dGLinCFP3Vecf +lbl_8026DA50: +/* 8026DA50 0026A990 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026DA54 0026A994 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026DA58 0026A998 48 0D 99 6D */ bl PSVECDistance +/* 8026DA5C 0026A99C C0 5C 00 1C */ lfs f2, 0x1c(r28) +/* 8026DA60 0026A9A0 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026DA64 0026A9A4 EC 02 00 2A */ fadds f0, f2, f0 +/* 8026DA68 0026A9A8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026DA6C 0026A9AC 40 80 00 38 */ bge lbl_8026DAA4 +/* 8026DA70 0026A9B0 38 61 00 24 */ addi r3, r1, 0x24 +/* 8026DA74 0026A9B4 38 81 00 18 */ addi r4, r1, 0x18 +/* 8026DA78 0026A9B8 7F C5 F3 78 */ mr r5, r30 +/* 8026DA7C 0026A9BC 48 0D 96 15 */ bl PSVECAdd +/* 8026DA80 0026A9C0 7F C3 F3 78 */ mr r3, r30 +/* 8026DA84 0026A9C4 7F C4 F3 78 */ mr r4, r30 +/* 8026DA88 0026A9C8 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026DA8C 0026A9CC 48 0D 96 4D */ bl PSVECScale +/* 8026DA90 0026A9D0 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026DA94 0026A9D4 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026DA98 0026A9D8 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026DA9C 0026A9DC 38 60 00 01 */ li r3, 1 +/* 8026DAA0 0026A9E0 48 00 00 28 */ b lbl_8026DAC8 +lbl_8026DAA4: +/* 8026DAA4 0026A9E4 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026DAA8 0026A9E8 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026DAAC 0026A9EC 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026DAB0 0026A9F0 38 60 00 00 */ li r3, 0 +/* 8026DAB4 0026A9F4 48 00 00 14 */ b lbl_8026DAC8 +lbl_8026DAB8: +/* 8026DAB8 0026A9F8 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026DABC 0026A9FC 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026DAC0 0026AA00 90 01 00 80 */ stw r0, 0x80(r1) +/* 8026DAC4 0026AA04 38 60 00 00 */ li r3, 0 +lbl_8026DAC8: +/* 8026DAC8 0026AA08 39 61 00 A0 */ addi r11, r1, 0xa0 +/* 8026DACC 0026AA0C 48 0F 47 59 */ bl _restgpr_28 +/* 8026DAD0 0026AA10 80 01 00 A4 */ lwz r0, 0xa4(r1) +/* 8026DAD4 0026AA14 7C 08 03 A6 */ mtlr r0 +/* 8026DAD8 0026AA18 38 21 00 A0 */ addi r1, r1, 0xa0 +/* 8026DADC 0026AA1C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026DAE0.s b/include/SComponent/c_m3d/asm/func_8026DAE0.s new file mode 100644 index 0000000000..fdf4866e6b --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026DAE0.s @@ -0,0 +1,92 @@ +/* 8026DAE0 0026AA20 94 21 FF B0 */ stwu r1, -0x50(r1) +/* 8026DAE4 0026AA24 7C 08 02 A6 */ mflr r0 +/* 8026DAE8 0026AA28 90 01 00 54 */ stw r0, 0x54(r1) +/* 8026DAEC 0026AA2C DB E1 00 40 */ stfd f31, 0x40(r1) +/* 8026DAF0 0026AA30 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 +/* 8026DAF4 0026AA34 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026DAF8 0026AA38 48 0F 46 E1 */ bl _savegpr_28 +/* 8026DAFC 0026AA3C 7C 7C 1B 78 */ mr r28, r3 +/* 8026DB00 0026AA40 7C 9D 23 78 */ mr r29, r4 +/* 8026DB04 0026AA44 7C BE 2B 78 */ mr r30, r5 +/* 8026DB08 0026AA48 7C DF 33 78 */ mr r31, r6 +/* 8026DB0C 0026AA4C 7F A3 EB 78 */ mr r3, r29 +/* 8026DB10 0026AA50 7F 84 E3 78 */ mr r4, r28 +/* 8026DB14 0026AA54 38 A1 00 20 */ addi r5, r1, 0x20 +/* 8026DB18 0026AA58 38 C1 00 14 */ addi r6, r1, 0x14 +/* 8026DB1C 0026AA5C 4B FF D9 CD */ bl cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec +/* 8026DB20 0026AA60 2C 03 00 01 */ cmpwi r3, 1 +/* 8026DB24 0026AA64 40 82 00 20 */ bne lbl_8026DB44 +/* 8026DB28 0026AA68 C0 01 00 20 */ lfs f0, 0x20(r1) +/* 8026DB2C 0026AA6C D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026DB30 0026AA70 C0 01 00 24 */ lfs f0, 0x24(r1) +/* 8026DB34 0026AA74 D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026DB38 0026AA78 C0 01 00 28 */ lfs f0, 0x28(r1) +/* 8026DB3C 0026AA7C D0 1F 00 08 */ stfs f0, 8(r31) +/* 8026DB40 0026AA80 48 00 00 DC */ b lbl_8026DC1C +lbl_8026DB44: +/* 8026DB44 0026AA84 2C 03 00 02 */ cmpwi r3, 2 +/* 8026DB48 0026AA88 40 82 00 60 */ bne lbl_8026DBA8 +/* 8026DB4C 0026AA8C 38 61 00 20 */ addi r3, r1, 0x20 +/* 8026DB50 0026AA90 7F 84 E3 78 */ mr r4, r28 +/* 8026DB54 0026AA94 48 0D 98 49 */ bl PSVECSquareDistance +/* 8026DB58 0026AA98 FF E0 08 90 */ fmr f31, f1 +/* 8026DB5C 0026AA9C 38 61 00 14 */ addi r3, r1, 0x14 +/* 8026DB60 0026AAA0 7F 84 E3 78 */ mr r4, r28 +/* 8026DB64 0026AAA4 48 0D 98 39 */ bl PSVECSquareDistance +/* 8026DB68 0026AAA8 FC 1F 08 40 */ fcmpo cr0, f31, f1 +/* 8026DB6C 0026AAAC 40 80 00 20 */ bge lbl_8026DB8C +/* 8026DB70 0026AAB0 C0 01 00 20 */ lfs f0, 0x20(r1) +/* 8026DB74 0026AAB4 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026DB78 0026AAB8 C0 01 00 24 */ lfs f0, 0x24(r1) +/* 8026DB7C 0026AABC D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026DB80 0026AAC0 C0 01 00 28 */ lfs f0, 0x28(r1) +/* 8026DB84 0026AAC4 D0 1F 00 08 */ stfs f0, 8(r31) +/* 8026DB88 0026AAC8 48 00 00 94 */ b lbl_8026DC1C +lbl_8026DB8C: +/* 8026DB8C 0026AACC C0 01 00 14 */ lfs f0, 0x14(r1) +/* 8026DB90 0026AAD0 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026DB94 0026AAD4 C0 01 00 18 */ lfs f0, 0x18(r1) +/* 8026DB98 0026AAD8 D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026DB9C 0026AADC C0 01 00 1C */ lfs f0, 0x1c(r1) +/* 8026DBA0 0026AAE0 D0 1F 00 08 */ stfs f0, 8(r31) +/* 8026DBA4 0026AAE4 48 00 00 78 */ b lbl_8026DC1C +lbl_8026DBA8: +/* 8026DBA8 0026AAE8 C0 3C 00 1C */ lfs f1, 0x1c(r28) +/* 8026DBAC 0026AAEC C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026DBB0 0026AAF0 EC 01 00 2A */ fadds f0, f1, f0 +/* 8026DBB4 0026AAF4 C0 9E 00 00 */ lfs f4, 0(r30) +/* 8026DBB8 0026AAF8 D0 9F 00 00 */ stfs f4, 0(r31) +/* 8026DBBC 0026AAFC C0 7E 00 04 */ lfs f3, 4(r30) +/* 8026DBC0 0026AB00 D0 7F 00 04 */ stfs f3, 4(r31) +/* 8026DBC4 0026AB04 C0 5E 00 08 */ lfs f2, 8(r30) +/* 8026DBC8 0026AB08 D0 5F 00 08 */ stfs f2, 8(r31) +/* 8026DBCC 0026AB0C FC 00 02 10 */ fabs f0, f0 +/* 8026DBD0 0026AB10 FC 20 00 18 */ frsp f1, f0 +/* 8026DBD4 0026AB14 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026DBD8 0026AB18 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026DBDC 0026AB1C 40 80 00 10 */ bge lbl_8026DBEC +/* 8026DBE0 0026AB20 D0 9F 00 00 */ stfs f4, 0(r31) +/* 8026DBE4 0026AB24 D0 7F 00 04 */ stfs f3, 4(r31) +/* 8026DBE8 0026AB28 D0 5F 00 08 */ stfs f2, 8(r31) +lbl_8026DBEC: +/* 8026DBEC 0026AB2C 7F C3 F3 78 */ mr r3, r30 +/* 8026DBF0 0026AB30 7F A4 EB 78 */ mr r4, r29 +/* 8026DBF4 0026AB34 38 A1 00 08 */ addi r5, r1, 8 +/* 8026DBF8 0026AB38 48 0D 94 BD */ bl PSVECSubtract +/* 8026DBFC 0026AB3C 38 61 00 08 */ addi r3, r1, 8 +/* 8026DC00 0026AB40 7C 64 1B 78 */ mr r4, r3 +/* 8026DC04 0026AB44 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026DC08 0026AB48 48 0D 94 D1 */ bl PSVECScale +/* 8026DC0C 0026AB4C 7F E3 FB 78 */ mr r3, r31 +/* 8026DC10 0026AB50 38 81 00 08 */ addi r4, r1, 8 +/* 8026DC14 0026AB54 7F E5 FB 78 */ mr r5, r31 +/* 8026DC18 0026AB58 48 0D 94 79 */ bl PSVECAdd +lbl_8026DC1C: +/* 8026DC1C 0026AB5C E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 +/* 8026DC20 0026AB60 CB E1 00 40 */ lfd f31, 0x40(r1) +/* 8026DC24 0026AB64 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026DC28 0026AB68 48 0F 45 FD */ bl _restgpr_28 +/* 8026DC2C 0026AB6C 80 01 00 54 */ lwz r0, 0x54(r1) +/* 8026DC30 0026AB70 7C 08 03 A6 */ mtlr r0 +/* 8026DC34 0026AB74 38 21 00 50 */ addi r1, r1, 0x50 +/* 8026DC38 0026AB78 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026DC3C.s b/include/SComponent/c_m3d/asm/func_8026DC3C.s new file mode 100644 index 0000000000..afe939fbad --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026DC3C.s @@ -0,0 +1,137 @@ +/* 8026DC3C 0026AB7C 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026DC40 0026AB80 7C 08 02 A6 */ mflr r0 +/* 8026DC44 0026AB84 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026DC48 0026AB88 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026DC4C 0026AB8C 48 0F 45 91 */ bl _savegpr_29 +/* 8026DC50 0026AB90 7C 7D 1B 78 */ mr r29, r3 +/* 8026DC54 0026AB94 7C 9E 23 78 */ mr r30, r4 +/* 8026DC58 0026AB98 7C BF 2B 78 */ mr r31, r5 +/* 8026DC5C 0026AB9C 48 0D 97 69 */ bl PSVECDistance +/* 8026DC60 0026ABA0 D0 21 00 0C */ stfs f1, 0xc(r1) +/* 8026DC64 0026ABA4 FC 40 08 18 */ frsp f2, f1 +/* 8026DC68 0026ABA8 C0 3D 00 1C */ lfs f1, 0x1c(r29) +/* 8026DC6C 0026ABAC C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026DC70 0026ABB0 EC 01 00 2A */ fadds f0, f1, f0 +/* 8026DC74 0026ABB4 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026DC78 0026ABB8 40 80 00 20 */ bge lbl_8026DC98 +/* 8026DC7C 0026ABBC 7F A3 EB 78 */ mr r3, r29 +/* 8026DC80 0026ABC0 7F C4 F3 78 */ mr r4, r30 +/* 8026DC84 0026ABC4 7F A5 EB 78 */ mr r5, r29 +/* 8026DC88 0026ABC8 7F E6 FB 78 */ mr r6, r31 +/* 8026DC8C 0026ABCC 4B FF FE 55 */ bl cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec +/* 8026DC90 0026ABD0 38 60 00 01 */ li r3, 1 +/* 8026DC94 0026ABD4 48 00 01 80 */ b lbl_8026DE14 +lbl_8026DC98: +/* 8026DC98 0026ABD8 38 7D 00 0C */ addi r3, r29, 0xc +/* 8026DC9C 0026ABDC 7F C4 F3 78 */ mr r4, r30 +/* 8026DCA0 0026ABE0 48 0D 97 25 */ bl PSVECDistance +/* 8026DCA4 0026ABE4 D0 21 00 0C */ stfs f1, 0xc(r1) +/* 8026DCA8 0026ABE8 FC 40 08 18 */ frsp f2, f1 +/* 8026DCAC 0026ABEC C0 3D 00 1C */ lfs f1, 0x1c(r29) +/* 8026DCB0 0026ABF0 C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026DCB4 0026ABF4 EC 01 00 2A */ fadds f0, f1, f0 +/* 8026DCB8 0026ABF8 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026DCBC 0026ABFC 40 80 00 20 */ bge lbl_8026DCDC +/* 8026DCC0 0026AC00 7F A3 EB 78 */ mr r3, r29 +/* 8026DCC4 0026AC04 7F C4 F3 78 */ mr r4, r30 +/* 8026DCC8 0026AC08 38 BD 00 0C */ addi r5, r29, 0xc +/* 8026DCCC 0026AC0C 7F E6 FB 78 */ mr r6, r31 +/* 8026DCD0 0026AC10 4B FF FE 11 */ bl cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec +/* 8026DCD4 0026AC14 38 60 00 01 */ li r3, 1 +/* 8026DCD8 0026AC18 48 00 01 3C */ b lbl_8026DE14 +lbl_8026DCDC: +/* 8026DCDC 0026AC1C 7F A3 EB 78 */ mr r3, r29 +/* 8026DCE0 0026AC20 7F C4 F3 78 */ mr r4, r30 +/* 8026DCE4 0026AC24 38 A1 00 10 */ addi r5, r1, 0x10 +/* 8026DCE8 0026AC28 38 C1 00 0C */ addi r6, r1, 0xc +/* 8026DCEC 0026AC2C 4B FF AA 25 */ bl cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf +/* 8026DCF0 0026AC30 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026DCF4 0026AC34 41 82 01 1C */ beq lbl_8026DE10 +/* 8026DCF8 0026AC38 C0 9D 00 1C */ lfs f4, 0x1c(r29) +/* 8026DCFC 0026AC3C C0 BE 00 0C */ lfs f5, 0xc(r30) +/* 8026DD00 0026AC40 C0 C1 00 0C */ lfs f6, 0xc(r1) +/* 8026DD04 0026AC44 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026DD08 0026AC48 FC 06 00 40 */ fcmpo cr0, f6, f0 +/* 8026DD0C 0026AC4C 40 81 00 58 */ ble lbl_8026DD64 +/* 8026DD10 0026AC50 FC 00 30 34 */ frsqrte f0, f6 +/* 8026DD14 0026AC54 C8 62 B7 20 */ lfd f3, lbl_80455120-_SDA2_BASE_(r2) +/* 8026DD18 0026AC58 FC 23 00 32 */ fmul f1, f3, f0 +/* 8026DD1C 0026AC5C C8 42 B7 28 */ lfd f2, lbl_80455128-_SDA2_BASE_(r2) +/* 8026DD20 0026AC60 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026DD24 0026AC64 FC 06 00 32 */ fmul f0, f6, f0 +/* 8026DD28 0026AC68 FC 02 00 28 */ fsub f0, f2, f0 +/* 8026DD2C 0026AC6C FC 01 00 32 */ fmul f0, f1, f0 +/* 8026DD30 0026AC70 FC 23 00 32 */ fmul f1, f3, f0 +/* 8026DD34 0026AC74 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026DD38 0026AC78 FC 06 00 32 */ fmul f0, f6, f0 +/* 8026DD3C 0026AC7C FC 02 00 28 */ fsub f0, f2, f0 +/* 8026DD40 0026AC80 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026DD44 0026AC84 FC 23 00 32 */ fmul f1, f3, f0 +/* 8026DD48 0026AC88 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026DD4C 0026AC8C FC 06 00 32 */ fmul f0, f6, f0 +/* 8026DD50 0026AC90 FC 02 00 28 */ fsub f0, f2, f0 +/* 8026DD54 0026AC94 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026DD58 0026AC98 FC C6 00 32 */ fmul f6, f6, f0 +/* 8026DD5C 0026AC9C FC C0 30 18 */ frsp f6, f6 +/* 8026DD60 0026ACA0 48 00 00 88 */ b lbl_8026DDE8 +lbl_8026DD64: +/* 8026DD64 0026ACA4 C8 02 B7 30 */ lfd f0, lbl_80455130-_SDA2_BASE_(r2) +/* 8026DD68 0026ACA8 FC 06 00 40 */ fcmpo cr0, f6, f0 +/* 8026DD6C 0026ACAC 40 80 00 10 */ bge lbl_8026DD7C +/* 8026DD70 0026ACB0 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026DD74 0026ACB4 C0 C3 0A E0 */ lfs f6, lbl_80450AE0@l(r3) +/* 8026DD78 0026ACB8 48 00 00 70 */ b lbl_8026DDE8 +lbl_8026DD7C: +/* 8026DD7C 0026ACBC D0 C1 00 08 */ stfs f6, 8(r1) +/* 8026DD80 0026ACC0 80 81 00 08 */ lwz r4, 8(r1) +/* 8026DD84 0026ACC4 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8026DD88 0026ACC8 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026DD8C 0026ACCC 7C 03 00 00 */ cmpw r3, r0 +/* 8026DD90 0026ACD0 41 82 00 14 */ beq lbl_8026DDA4 +/* 8026DD94 0026ACD4 40 80 00 40 */ bge lbl_8026DDD4 +/* 8026DD98 0026ACD8 2C 03 00 00 */ cmpwi r3, 0 +/* 8026DD9C 0026ACDC 41 82 00 20 */ beq lbl_8026DDBC +/* 8026DDA0 0026ACE0 48 00 00 34 */ b lbl_8026DDD4 +lbl_8026DDA4: +/* 8026DDA4 0026ACE4 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026DDA8 0026ACE8 41 82 00 0C */ beq lbl_8026DDB4 +/* 8026DDAC 0026ACEC 38 00 00 01 */ li r0, 1 +/* 8026DDB0 0026ACF0 48 00 00 28 */ b lbl_8026DDD8 +lbl_8026DDB4: +/* 8026DDB4 0026ACF4 38 00 00 02 */ li r0, 2 +/* 8026DDB8 0026ACF8 48 00 00 20 */ b lbl_8026DDD8 +lbl_8026DDBC: +/* 8026DDBC 0026ACFC 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026DDC0 0026AD00 41 82 00 0C */ beq lbl_8026DDCC +/* 8026DDC4 0026AD04 38 00 00 05 */ li r0, 5 +/* 8026DDC8 0026AD08 48 00 00 10 */ b lbl_8026DDD8 +lbl_8026DDCC: +/* 8026DDCC 0026AD0C 38 00 00 03 */ li r0, 3 +/* 8026DDD0 0026AD10 48 00 00 08 */ b lbl_8026DDD8 +lbl_8026DDD4: +/* 8026DDD4 0026AD14 38 00 00 04 */ li r0, 4 +lbl_8026DDD8: +/* 8026DDD8 0026AD18 2C 00 00 01 */ cmpwi r0, 1 +/* 8026DDDC 0026AD1C 40 82 00 0C */ bne lbl_8026DDE8 +/* 8026DDE0 0026AD20 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026DDE4 0026AD24 C0 C3 0A E0 */ lfs f6, lbl_80450AE0@l(r3) +lbl_8026DDE8: +/* 8026DDE8 0026AD28 EC 04 28 2A */ fadds f0, f4, f5 +/* 8026DDEC 0026AD2C FC 06 00 40 */ fcmpo cr0, f6, f0 +/* 8026DDF0 0026AD30 40 80 00 20 */ bge lbl_8026DE10 +/* 8026DDF4 0026AD34 7F A3 EB 78 */ mr r3, r29 +/* 8026DDF8 0026AD38 7F C4 F3 78 */ mr r4, r30 +/* 8026DDFC 0026AD3C 38 A1 00 10 */ addi r5, r1, 0x10 +/* 8026DE00 0026AD40 7F E6 FB 78 */ mr r6, r31 +/* 8026DE04 0026AD44 4B FF FC DD */ bl cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec +/* 8026DE08 0026AD48 38 60 00 01 */ li r3, 1 +/* 8026DE0C 0026AD4C 48 00 00 08 */ b lbl_8026DE14 +lbl_8026DE10: +/* 8026DE10 0026AD50 38 60 00 00 */ li r3, 0 +lbl_8026DE14: +/* 8026DE14 0026AD54 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026DE18 0026AD58 48 0F 44 11 */ bl _restgpr_29 +/* 8026DE1C 0026AD5C 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026DE20 0026AD60 7C 08 03 A6 */ mtlr r0 +/* 8026DE24 0026AD64 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026DE28 0026AD68 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026DE2C.s b/include/SComponent/c_m3d/asm/func_8026DE2C.s new file mode 100644 index 0000000000..11bb646f80 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026DE2C.s @@ -0,0 +1,205 @@ +/* 8026DE2C 0026AD6C 94 21 FF A0 */ stwu r1, -0x60(r1) +/* 8026DE30 0026AD70 7C 08 02 A6 */ mflr r0 +/* 8026DE34 0026AD74 90 01 00 64 */ stw r0, 0x64(r1) +/* 8026DE38 0026AD78 DB E1 00 50 */ stfd f31, 0x50(r1) +/* 8026DE3C 0026AD7C F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 +/* 8026DE40 0026AD80 DB C1 00 40 */ stfd f30, 0x40(r1) +/* 8026DE44 0026AD84 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 +/* 8026DE48 0026AD88 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026DE4C 0026AD8C 48 0F 43 91 */ bl _savegpr_29 +/* 8026DE50 0026AD90 7C 7D 1B 78 */ mr r29, r3 +/* 8026DE54 0026AD94 7C 9E 23 78 */ mr r30, r4 +/* 8026DE58 0026AD98 7C BF 2B 78 */ mr r31, r5 +/* 8026DE5C 0026AD9C 38 9E 00 14 */ addi r4, r30, 0x14 +/* 8026DE60 0026ADA0 48 0D 93 35 */ bl PSVECDotProduct +/* 8026DE64 0026ADA4 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026DE68 0026ADA8 EF E0 08 2A */ fadds f31, f0, f1 +/* 8026DE6C 0026ADAC 7F A3 EB 78 */ mr r3, r29 +/* 8026DE70 0026ADB0 38 9E 00 20 */ addi r4, r30, 0x20 +/* 8026DE74 0026ADB4 48 0D 93 21 */ bl PSVECDotProduct +/* 8026DE78 0026ADB8 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026DE7C 0026ADBC EF C0 08 2A */ fadds f30, f0, f1 +/* 8026DE80 0026ADC0 7F A3 EB 78 */ mr r3, r29 +/* 8026DE84 0026ADC4 38 9E 00 2C */ addi r4, r30, 0x2c +/* 8026DE88 0026ADC8 48 0D 93 0D */ bl PSVECDotProduct +/* 8026DE8C 0026ADCC C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026DE90 0026ADD0 EC 20 08 2A */ fadds f1, f0, f1 +/* 8026DE94 0026ADD4 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026DE98 0026ADD8 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026DE9C 0026ADDC 40 81 00 14 */ ble lbl_8026DEB0 +/* 8026DEA0 0026ADE0 FC 1E 00 40 */ fcmpo cr0, f30, f0 +/* 8026DEA4 0026ADE4 40 81 00 0C */ ble lbl_8026DEB0 +/* 8026DEA8 0026ADE8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026DEAC 0026ADEC 41 81 00 20 */ bgt lbl_8026DECC +lbl_8026DEB0: +/* 8026DEB0 0026ADF0 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026DEB4 0026ADF4 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026DEB8 0026ADF8 40 80 00 1C */ bge lbl_8026DED4 +/* 8026DEBC 0026ADFC FC 1E 00 40 */ fcmpo cr0, f30, f0 +/* 8026DEC0 0026AE00 40 80 00 14 */ bge lbl_8026DED4 +/* 8026DEC4 0026AE04 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026DEC8 0026AE08 40 80 00 0C */ bge lbl_8026DED4 +lbl_8026DECC: +/* 8026DECC 0026AE0C 38 60 00 00 */ li r3, 0 +/* 8026DED0 0026AE10 48 00 02 34 */ b lbl_8026E104 +lbl_8026DED4: +/* 8026DED4 0026AE14 7F C3 F3 78 */ mr r3, r30 +/* 8026DED8 0026AE18 38 9D 00 14 */ addi r4, r29, 0x14 +/* 8026DEDC 0026AE1C 48 0D 92 B9 */ bl PSVECDotProduct +/* 8026DEE0 0026AE20 C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026DEE4 0026AE24 EF C0 08 2A */ fadds f30, f0, f1 +/* 8026DEE8 0026AE28 7F C3 F3 78 */ mr r3, r30 +/* 8026DEEC 0026AE2C 38 9D 00 20 */ addi r4, r29, 0x20 +/* 8026DEF0 0026AE30 48 0D 92 A5 */ bl PSVECDotProduct +/* 8026DEF4 0026AE34 C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026DEF8 0026AE38 EF E0 08 2A */ fadds f31, f0, f1 +/* 8026DEFC 0026AE3C 7F C3 F3 78 */ mr r3, r30 +/* 8026DF00 0026AE40 38 9D 00 2C */ addi r4, r29, 0x2c +/* 8026DF04 0026AE44 48 0D 92 91 */ bl PSVECDotProduct +/* 8026DF08 0026AE48 C0 1E 00 0C */ lfs f0, 0xc(r30) +/* 8026DF0C 0026AE4C EC 20 08 2A */ fadds f1, f0, f1 +/* 8026DF10 0026AE50 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026DF14 0026AE54 FC 1E 00 40 */ fcmpo cr0, f30, f0 +/* 8026DF18 0026AE58 40 81 00 14 */ ble lbl_8026DF2C +/* 8026DF1C 0026AE5C FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026DF20 0026AE60 40 81 00 0C */ ble lbl_8026DF2C +/* 8026DF24 0026AE64 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026DF28 0026AE68 41 81 00 20 */ bgt lbl_8026DF48 +lbl_8026DF2C: +/* 8026DF2C 0026AE6C C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026DF30 0026AE70 FC 1E 00 40 */ fcmpo cr0, f30, f0 +/* 8026DF34 0026AE74 40 80 00 1C */ bge lbl_8026DF50 +/* 8026DF38 0026AE78 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026DF3C 0026AE7C 40 80 00 14 */ bge lbl_8026DF50 +/* 8026DF40 0026AE80 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026DF44 0026AE84 40 80 00 0C */ bge lbl_8026DF50 +lbl_8026DF48: +/* 8026DF48 0026AE88 38 60 00 00 */ li r3, 0 +/* 8026DF4C 0026AE8C 48 00 01 B8 */ b lbl_8026E104 +lbl_8026DF50: +/* 8026DF50 0026AE90 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026DF54 0026AE94 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026DF58 0026AE98 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026DF5C 0026AE9C 38 61 00 08 */ addi r3, r1, 8 +/* 8026DF60 0026AEA0 38 9E 00 14 */ addi r4, r30, 0x14 +/* 8026DF64 0026AEA4 38 BE 00 20 */ addi r5, r30, 0x20 +/* 8026DF68 0026AEA8 48 00 13 B5 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec +/* 8026DF6C 0026AEAC 38 61 00 08 */ addi r3, r1, 8 +/* 8026DF70 0026AEB0 7F A4 EB 78 */ mr r4, r29 +/* 8026DF74 0026AEB4 7F E5 FB 78 */ mr r5, r31 +/* 8026DF78 0026AEB8 38 C0 00 00 */ li r6, 0 +/* 8026DF7C 0026AEBC 38 E0 00 00 */ li r7, 0 +/* 8026DF80 0026AEC0 4B FF D1 25 */ bl cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb +/* 8026DF84 0026AEC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026DF88 0026AEC8 41 82 00 18 */ beq lbl_8026DFA0 +/* 8026DF8C 0026AECC 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026DF90 0026AED0 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026DF94 0026AED4 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026DF98 0026AED8 38 60 00 01 */ li r3, 1 +/* 8026DF9C 0026AEDC 48 00 01 68 */ b lbl_8026E104 +lbl_8026DFA0: +/* 8026DFA0 0026AEE0 38 61 00 08 */ addi r3, r1, 8 +/* 8026DFA4 0026AEE4 38 9E 00 20 */ addi r4, r30, 0x20 +/* 8026DFA8 0026AEE8 38 BE 00 2C */ addi r5, r30, 0x2c +/* 8026DFAC 0026AEEC 48 00 13 71 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec +/* 8026DFB0 0026AEF0 38 61 00 08 */ addi r3, r1, 8 +/* 8026DFB4 0026AEF4 7F A4 EB 78 */ mr r4, r29 +/* 8026DFB8 0026AEF8 7F E5 FB 78 */ mr r5, r31 +/* 8026DFBC 0026AEFC 38 C0 00 00 */ li r6, 0 +/* 8026DFC0 0026AF00 38 E0 00 00 */ li r7, 0 +/* 8026DFC4 0026AF04 4B FF D0 E1 */ bl cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb +/* 8026DFC8 0026AF08 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026DFCC 0026AF0C 41 82 00 18 */ beq lbl_8026DFE4 +/* 8026DFD0 0026AF10 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026DFD4 0026AF14 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026DFD8 0026AF18 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026DFDC 0026AF1C 38 60 00 01 */ li r3, 1 +/* 8026DFE0 0026AF20 48 00 01 24 */ b lbl_8026E104 +lbl_8026DFE4: +/* 8026DFE4 0026AF24 38 61 00 08 */ addi r3, r1, 8 +/* 8026DFE8 0026AF28 38 9E 00 14 */ addi r4, r30, 0x14 +/* 8026DFEC 0026AF2C 38 BE 00 20 */ addi r5, r30, 0x20 +/* 8026DFF0 0026AF30 48 00 13 2D */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec +/* 8026DFF4 0026AF34 38 61 00 08 */ addi r3, r1, 8 +/* 8026DFF8 0026AF38 7F A4 EB 78 */ mr r4, r29 +/* 8026DFFC 0026AF3C 7F E5 FB 78 */ mr r5, r31 +/* 8026E000 0026AF40 38 C0 00 00 */ li r6, 0 +/* 8026E004 0026AF44 38 E0 00 00 */ li r7, 0 +/* 8026E008 0026AF48 4B FF D0 9D */ bl cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb +/* 8026E00C 0026AF4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026E010 0026AF50 41 82 00 18 */ beq lbl_8026E028 +/* 8026E014 0026AF54 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E018 0026AF58 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E01C 0026AF5C 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026E020 0026AF60 38 60 00 01 */ li r3, 1 +/* 8026E024 0026AF64 48 00 00 E0 */ b lbl_8026E104 +lbl_8026E028: +/* 8026E028 0026AF68 38 61 00 08 */ addi r3, r1, 8 +/* 8026E02C 0026AF6C 38 9D 00 14 */ addi r4, r29, 0x14 +/* 8026E030 0026AF70 38 BD 00 20 */ addi r5, r29, 0x20 +/* 8026E034 0026AF74 48 00 12 E9 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec +/* 8026E038 0026AF78 38 61 00 08 */ addi r3, r1, 8 +/* 8026E03C 0026AF7C 7F C4 F3 78 */ mr r4, r30 +/* 8026E040 0026AF80 7F E5 FB 78 */ mr r5, r31 +/* 8026E044 0026AF84 38 C0 00 00 */ li r6, 0 +/* 8026E048 0026AF88 38 E0 00 00 */ li r7, 0 +/* 8026E04C 0026AF8C 4B FF D0 59 */ bl cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb +/* 8026E050 0026AF90 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026E054 0026AF94 41 82 00 18 */ beq lbl_8026E06C +/* 8026E058 0026AF98 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E05C 0026AF9C 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E060 0026AFA0 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026E064 0026AFA4 38 60 00 01 */ li r3, 1 +/* 8026E068 0026AFA8 48 00 00 9C */ b lbl_8026E104 +lbl_8026E06C: +/* 8026E06C 0026AFAC 38 61 00 08 */ addi r3, r1, 8 +/* 8026E070 0026AFB0 38 9D 00 20 */ addi r4, r29, 0x20 +/* 8026E074 0026AFB4 38 BD 00 2C */ addi r5, r29, 0x2c +/* 8026E078 0026AFB8 48 00 12 A5 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec +/* 8026E07C 0026AFBC 38 61 00 08 */ addi r3, r1, 8 +/* 8026E080 0026AFC0 7F C4 F3 78 */ mr r4, r30 +/* 8026E084 0026AFC4 7F E5 FB 78 */ mr r5, r31 +/* 8026E088 0026AFC8 38 C0 00 00 */ li r6, 0 +/* 8026E08C 0026AFCC 38 E0 00 00 */ li r7, 0 +/* 8026E090 0026AFD0 4B FF D0 15 */ bl cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb +/* 8026E094 0026AFD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026E098 0026AFD8 41 82 00 18 */ beq lbl_8026E0B0 +/* 8026E09C 0026AFDC 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E0A0 0026AFE0 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E0A4 0026AFE4 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026E0A8 0026AFE8 38 60 00 01 */ li r3, 1 +/* 8026E0AC 0026AFEC 48 00 00 58 */ b lbl_8026E104 +lbl_8026E0B0: +/* 8026E0B0 0026AFF0 38 61 00 08 */ addi r3, r1, 8 +/* 8026E0B4 0026AFF4 38 9D 00 14 */ addi r4, r29, 0x14 +/* 8026E0B8 0026AFF8 38 BD 00 20 */ addi r5, r29, 0x20 +/* 8026E0BC 0026AFFC 48 00 12 61 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec +/* 8026E0C0 0026B000 38 61 00 08 */ addi r3, r1, 8 +/* 8026E0C4 0026B004 7F C4 F3 78 */ mr r4, r30 +/* 8026E0C8 0026B008 7F E5 FB 78 */ mr r5, r31 +/* 8026E0CC 0026B00C 38 C0 00 00 */ li r6, 0 +/* 8026E0D0 0026B010 38 E0 00 00 */ li r7, 0 +/* 8026E0D4 0026B014 4B FF CF D1 */ bl cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb +/* 8026E0D8 0026B018 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026E0DC 0026B01C 41 82 00 18 */ beq lbl_8026E0F4 +/* 8026E0E0 0026B020 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E0E4 0026B024 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E0E8 0026B028 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026E0EC 0026B02C 38 60 00 01 */ li r3, 1 +/* 8026E0F0 0026B030 48 00 00 14 */ b lbl_8026E104 +lbl_8026E0F4: +/* 8026E0F4 0026B034 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E0F8 0026B038 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E0FC 0026B03C 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026E100 0026B040 38 60 00 00 */ li r3, 0 +lbl_8026E104: +/* 8026E104 0026B044 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 +/* 8026E108 0026B048 CB E1 00 50 */ lfd f31, 0x50(r1) +/* 8026E10C 0026B04C E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 +/* 8026E110 0026B050 CB C1 00 40 */ lfd f30, 0x40(r1) +/* 8026E114 0026B054 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026E118 0026B058 48 0F 41 11 */ bl _restgpr_29 +/* 8026E11C 0026B05C 80 01 00 64 */ lwz r0, 0x64(r1) +/* 8026E120 0026B060 7C 08 03 A6 */ mtlr r0 +/* 8026E124 0026B064 38 21 00 60 */ addi r1, r1, 0x60 +/* 8026E128 0026B068 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026E12C.s b/include/SComponent/c_m3d/asm/func_8026E12C.s new file mode 100644 index 0000000000..267f2c67ad --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026E12C.s @@ -0,0 +1,252 @@ +/* 8026E12C 0026B06C 94 21 FF 50 */ stwu r1, -0xb0(r1) +/* 8026E130 0026B070 7C 08 02 A6 */ mflr r0 +/* 8026E134 0026B074 90 01 00 B4 */ stw r0, 0xb4(r1) +/* 8026E138 0026B078 DB E1 00 A0 */ stfd f31, 0xa0(r1) +/* 8026E13C 0026B07C F3 E1 00 A8 */ psq_st f31, 168(r1), 0, 0 +/* 8026E140 0026B080 39 61 00 A0 */ addi r11, r1, 0xa0 +/* 8026E144 0026B084 48 0F 40 99 */ bl _savegpr_29 +/* 8026E148 0026B088 7C 7D 1B 78 */ mr r29, r3 +/* 8026E14C 0026B08C 7C 9E 23 78 */ mr r30, r4 +/* 8026E150 0026B090 7C BF 2B 78 */ mr r31, r5 +/* 8026E154 0026B094 3C 60 80 3A */ lis r3, lbl_803A7904@ha +/* 8026E158 0026B098 38 03 79 04 */ addi r0, r3, lbl_803A7904@l +/* 8026E15C 0026B09C 90 01 00 84 */ stw r0, 0x84(r1) +/* 8026E160 0026B0A0 38 61 00 74 */ addi r3, r1, 0x74 +/* 8026E164 0026B0A4 7F A4 EB 78 */ mr r4, r29 +/* 8026E168 0026B0A8 48 00 14 E1 */ bl SetC__8cM3dGSphFRC4cXyz +/* 8026E16C 0026B0AC 38 61 00 74 */ addi r3, r1, 0x74 +/* 8026E170 0026B0B0 C0 3D 00 1C */ lfs f1, 0x1c(r29) +/* 8026E174 0026B0B4 48 00 15 95 */ bl SetR__8cM3dGSphFf +/* 8026E178 0026B0B8 38 61 00 74 */ addi r3, r1, 0x74 +/* 8026E17C 0026B0BC 7F C4 F3 78 */ mr r4, r30 +/* 8026E180 0026B0C0 7F E5 FB 78 */ mr r5, r31 +/* 8026E184 0026B0C4 4B FF DD 81 */ bl cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec +/* 8026E188 0026B0C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026E18C 0026B0CC 41 82 00 18 */ beq lbl_8026E1A4 +/* 8026E190 0026B0D0 3C 60 80 3A */ lis r3, lbl_803A7904@ha +/* 8026E194 0026B0D4 38 03 79 04 */ addi r0, r3, lbl_803A7904@l +/* 8026E198 0026B0D8 90 01 00 84 */ stw r0, 0x84(r1) +/* 8026E19C 0026B0DC 38 60 00 01 */ li r3, 1 +/* 8026E1A0 0026B0E0 48 00 03 3C */ b lbl_8026E4DC +lbl_8026E1A4: +/* 8026E1A4 0026B0E4 38 61 00 74 */ addi r3, r1, 0x74 +/* 8026E1A8 0026B0E8 38 9D 00 0C */ addi r4, r29, 0xc +/* 8026E1AC 0026B0EC 48 00 14 9D */ bl SetC__8cM3dGSphFRC4cXyz +/* 8026E1B0 0026B0F0 38 61 00 74 */ addi r3, r1, 0x74 +/* 8026E1B4 0026B0F4 C0 3D 00 1C */ lfs f1, 0x1c(r29) +/* 8026E1B8 0026B0F8 48 00 15 51 */ bl SetR__8cM3dGSphFf +/* 8026E1BC 0026B0FC 38 61 00 74 */ addi r3, r1, 0x74 +/* 8026E1C0 0026B100 7F C4 F3 78 */ mr r4, r30 +/* 8026E1C4 0026B104 7F E5 FB 78 */ mr r5, r31 +/* 8026E1C8 0026B108 4B FF DD 3D */ bl cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec +/* 8026E1CC 0026B10C 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026E1D0 0026B110 41 82 00 18 */ beq lbl_8026E1E8 +/* 8026E1D4 0026B114 3C 60 80 3A */ lis r3, lbl_803A7904@ha +/* 8026E1D8 0026B118 38 03 79 04 */ addi r0, r3, lbl_803A7904@l +/* 8026E1DC 0026B11C 90 01 00 84 */ stw r0, 0x84(r1) +/* 8026E1E0 0026B120 38 60 00 01 */ li r3, 1 +/* 8026E1E4 0026B124 48 00 02 F8 */ b lbl_8026E4DC +lbl_8026E1E8: +/* 8026E1E8 0026B128 7F A3 EB 78 */ mr r3, r29 +/* 8026E1EC 0026B12C 7F C4 F3 78 */ mr r4, r30 +/* 8026E1F0 0026B130 7F E5 FB 78 */ mr r5, r31 +/* 8026E1F4 0026B134 38 C0 00 01 */ li r6, 1 +/* 8026E1F8 0026B138 38 E0 00 01 */ li r7, 1 +/* 8026E1FC 0026B13C 4B FF AD 39 */ bl cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb +/* 8026E200 0026B140 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026E204 0026B144 40 82 00 18 */ bne lbl_8026E21C +/* 8026E208 0026B148 3C 60 80 3A */ lis r3, lbl_803A7904@ha +/* 8026E20C 0026B14C 38 03 79 04 */ addi r0, r3, lbl_803A7904@l +/* 8026E210 0026B150 90 01 00 84 */ stw r0, 0x84(r1) +/* 8026E214 0026B154 38 60 00 00 */ li r3, 0 +/* 8026E218 0026B158 48 00 02 C4 */ b lbl_8026E4DC +lbl_8026E21C: +/* 8026E21C 0026B15C 7F C3 F3 78 */ mr r3, r30 +/* 8026E220 0026B160 7F E4 FB 78 */ mr r4, r31 +/* 8026E224 0026B164 4B FF CF 59 */ bl cM3d_Cross_LinTri_Easy__FPC8cM3dGTriPC3Vec +/* 8026E228 0026B168 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026E22C 0026B16C 41 82 00 18 */ beq lbl_8026E244 +/* 8026E230 0026B170 3C 60 80 3A */ lis r3, lbl_803A7904@ha +/* 8026E234 0026B174 38 03 79 04 */ addi r0, r3, lbl_803A7904@l +/* 8026E238 0026B178 90 01 00 84 */ stw r0, 0x84(r1) +/* 8026E23C 0026B17C 38 60 00 01 */ li r3, 1 +/* 8026E240 0026B180 48 00 02 9C */ b lbl_8026E4DC +lbl_8026E244: +/* 8026E244 0026B184 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E248 0026B188 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E24C 0026B18C 90 01 00 70 */ stw r0, 0x70(r1) +/* 8026E250 0026B190 38 61 00 58 */ addi r3, r1, 0x58 +/* 8026E254 0026B194 38 9E 00 14 */ addi r4, r30, 0x14 +/* 8026E258 0026B198 38 BE 00 20 */ addi r5, r30, 0x20 +/* 8026E25C 0026B19C 48 00 10 C1 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec +/* 8026E260 0026B1A0 7F A3 EB 78 */ mr r3, r29 +/* 8026E264 0026B1A4 38 81 00 58 */ addi r4, r1, 0x58 +/* 8026E268 0026B1A8 38 A1 00 0C */ addi r5, r1, 0xc +/* 8026E26C 0026B1AC 38 C1 00 08 */ addi r6, r1, 8 +/* 8026E270 0026B1B0 4B FF A9 ED */ bl cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf +/* 8026E274 0026B1B4 2C 03 00 02 */ cmpwi r3, 2 +/* 8026E278 0026B1B8 41 80 00 A8 */ blt lbl_8026E320 +/* 8026E27C 0026B1BC C0 21 00 0C */ lfs f1, 0xc(r1) +/* 8026E280 0026B1C0 C0 42 B7 18 */ lfs f2, lbl_80455118-_SDA2_BASE_(r2) +/* 8026E284 0026B1C4 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026E288 0026B1C8 40 81 00 98 */ ble lbl_8026E320 +/* 8026E28C 0026B1CC C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026E290 0026B1D0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026E294 0026B1D4 40 80 00 8C */ bge lbl_8026E320 +/* 8026E298 0026B1D8 C3 E1 00 08 */ lfs f31, 8(r1) +/* 8026E29C 0026B1DC FC 1F 10 40 */ fcmpo cr0, f31, f2 +/* 8026E2A0 0026B1E0 40 81 00 80 */ ble lbl_8026E320 +/* 8026E2A4 0026B1E4 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026E2A8 0026B1E8 40 80 00 78 */ bge lbl_8026E320 +/* 8026E2AC 0026B1EC 7F A3 EB 78 */ mr r3, r29 +/* 8026E2B0 0026B1F0 38 81 00 40 */ addi r4, r1, 0x40 +/* 8026E2B4 0026B1F4 48 00 10 9D */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026E2B8 0026B1F8 38 61 00 58 */ addi r3, r1, 0x58 +/* 8026E2BC 0026B1FC 38 81 00 4C */ addi r4, r1, 0x4c +/* 8026E2C0 0026B200 FC 20 F8 90 */ fmr f1, f31 +/* 8026E2C4 0026B204 48 00 10 8D */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026E2C8 0026B208 38 61 00 40 */ addi r3, r1, 0x40 +/* 8026E2CC 0026B20C 38 81 00 4C */ addi r4, r1, 0x4c +/* 8026E2D0 0026B210 7F E5 FB 78 */ mr r5, r31 +/* 8026E2D4 0026B214 48 0D 8D BD */ bl PSVECAdd +/* 8026E2D8 0026B218 7F E3 FB 78 */ mr r3, r31 +/* 8026E2DC 0026B21C 7F E4 FB 78 */ mr r4, r31 +/* 8026E2E0 0026B220 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026E2E4 0026B224 48 0D 8D F5 */ bl PSVECScale +/* 8026E2E8 0026B228 38 61 00 40 */ addi r3, r1, 0x40 +/* 8026E2EC 0026B22C 38 81 00 4C */ addi r4, r1, 0x4c +/* 8026E2F0 0026B230 48 0D 90 D5 */ bl PSVECDistance +/* 8026E2F4 0026B234 C0 1D 00 1C */ lfs f0, 0x1c(r29) +/* 8026E2F8 0026B238 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026E2FC 0026B23C 40 80 00 24 */ bge lbl_8026E320 +/* 8026E300 0026B240 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E304 0026B244 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E308 0026B248 90 01 00 70 */ stw r0, 0x70(r1) +/* 8026E30C 0026B24C 3C 60 80 3A */ lis r3, lbl_803A7904@ha +/* 8026E310 0026B250 38 03 79 04 */ addi r0, r3, lbl_803A7904@l +/* 8026E314 0026B254 90 01 00 84 */ stw r0, 0x84(r1) +/* 8026E318 0026B258 38 60 00 01 */ li r3, 1 +/* 8026E31C 0026B25C 48 00 01 C0 */ b lbl_8026E4DC +lbl_8026E320: +/* 8026E320 0026B260 38 61 00 58 */ addi r3, r1, 0x58 +/* 8026E324 0026B264 38 9E 00 20 */ addi r4, r30, 0x20 +/* 8026E328 0026B268 38 BE 00 2C */ addi r5, r30, 0x2c +/* 8026E32C 0026B26C 48 00 0F F1 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec +/* 8026E330 0026B270 7F A3 EB 78 */ mr r3, r29 +/* 8026E334 0026B274 38 81 00 58 */ addi r4, r1, 0x58 +/* 8026E338 0026B278 38 A1 00 0C */ addi r5, r1, 0xc +/* 8026E33C 0026B27C 38 C1 00 08 */ addi r6, r1, 8 +/* 8026E340 0026B280 4B FF A9 1D */ bl cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf +/* 8026E344 0026B284 2C 03 00 02 */ cmpwi r3, 2 +/* 8026E348 0026B288 41 80 00 A8 */ blt lbl_8026E3F0 +/* 8026E34C 0026B28C C0 21 00 0C */ lfs f1, 0xc(r1) +/* 8026E350 0026B290 C0 42 B7 18 */ lfs f2, lbl_80455118-_SDA2_BASE_(r2) +/* 8026E354 0026B294 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026E358 0026B298 40 81 00 98 */ ble lbl_8026E3F0 +/* 8026E35C 0026B29C C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026E360 0026B2A0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026E364 0026B2A4 40 80 00 8C */ bge lbl_8026E3F0 +/* 8026E368 0026B2A8 C3 E1 00 08 */ lfs f31, 8(r1) +/* 8026E36C 0026B2AC FC 1F 10 40 */ fcmpo cr0, f31, f2 +/* 8026E370 0026B2B0 40 81 00 80 */ ble lbl_8026E3F0 +/* 8026E374 0026B2B4 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026E378 0026B2B8 40 80 00 78 */ bge lbl_8026E3F0 +/* 8026E37C 0026B2BC 7F A3 EB 78 */ mr r3, r29 +/* 8026E380 0026B2C0 38 81 00 28 */ addi r4, r1, 0x28 +/* 8026E384 0026B2C4 48 00 0F CD */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026E388 0026B2C8 38 61 00 58 */ addi r3, r1, 0x58 +/* 8026E38C 0026B2CC 38 81 00 34 */ addi r4, r1, 0x34 +/* 8026E390 0026B2D0 FC 20 F8 90 */ fmr f1, f31 +/* 8026E394 0026B2D4 48 00 0F BD */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026E398 0026B2D8 38 61 00 28 */ addi r3, r1, 0x28 +/* 8026E39C 0026B2DC 38 81 00 34 */ addi r4, r1, 0x34 +/* 8026E3A0 0026B2E0 7F E5 FB 78 */ mr r5, r31 +/* 8026E3A4 0026B2E4 48 0D 8C ED */ bl PSVECAdd +/* 8026E3A8 0026B2E8 7F E3 FB 78 */ mr r3, r31 +/* 8026E3AC 0026B2EC 7F E4 FB 78 */ mr r4, r31 +/* 8026E3B0 0026B2F0 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026E3B4 0026B2F4 48 0D 8D 25 */ bl PSVECScale +/* 8026E3B8 0026B2F8 38 61 00 28 */ addi r3, r1, 0x28 +/* 8026E3BC 0026B2FC 38 81 00 34 */ addi r4, r1, 0x34 +/* 8026E3C0 0026B300 48 0D 90 05 */ bl PSVECDistance +/* 8026E3C4 0026B304 C0 1D 00 1C */ lfs f0, 0x1c(r29) +/* 8026E3C8 0026B308 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026E3CC 0026B30C 40 80 00 24 */ bge lbl_8026E3F0 +/* 8026E3D0 0026B310 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E3D4 0026B314 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E3D8 0026B318 90 01 00 70 */ stw r0, 0x70(r1) +/* 8026E3DC 0026B31C 3C 60 80 3A */ lis r3, lbl_803A7904@ha +/* 8026E3E0 0026B320 38 03 79 04 */ addi r0, r3, lbl_803A7904@l +/* 8026E3E4 0026B324 90 01 00 84 */ stw r0, 0x84(r1) +/* 8026E3E8 0026B328 38 60 00 01 */ li r3, 1 +/* 8026E3EC 0026B32C 48 00 00 F0 */ b lbl_8026E4DC +lbl_8026E3F0: +/* 8026E3F0 0026B330 38 61 00 58 */ addi r3, r1, 0x58 +/* 8026E3F4 0026B334 38 9E 00 2C */ addi r4, r30, 0x2c +/* 8026E3F8 0026B338 38 BE 00 14 */ addi r5, r30, 0x14 +/* 8026E3FC 0026B33C 48 00 0F 21 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec +/* 8026E400 0026B340 7F A3 EB 78 */ mr r3, r29 +/* 8026E404 0026B344 38 81 00 58 */ addi r4, r1, 0x58 +/* 8026E408 0026B348 38 A1 00 0C */ addi r5, r1, 0xc +/* 8026E40C 0026B34C 38 C1 00 08 */ addi r6, r1, 8 +/* 8026E410 0026B350 4B FF A8 4D */ bl cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf +/* 8026E414 0026B354 2C 03 00 02 */ cmpwi r3, 2 +/* 8026E418 0026B358 41 80 00 A8 */ blt lbl_8026E4C0 +/* 8026E41C 0026B35C C0 21 00 0C */ lfs f1, 0xc(r1) +/* 8026E420 0026B360 C0 42 B7 18 */ lfs f2, lbl_80455118-_SDA2_BASE_(r2) +/* 8026E424 0026B364 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026E428 0026B368 40 81 00 98 */ ble lbl_8026E4C0 +/* 8026E42C 0026B36C C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) +/* 8026E430 0026B370 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026E434 0026B374 40 80 00 8C */ bge lbl_8026E4C0 +/* 8026E438 0026B378 C3 E1 00 08 */ lfs f31, 8(r1) +/* 8026E43C 0026B37C FC 1F 10 40 */ fcmpo cr0, f31, f2 +/* 8026E440 0026B380 40 81 00 80 */ ble lbl_8026E4C0 +/* 8026E444 0026B384 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 8026E448 0026B388 40 80 00 78 */ bge lbl_8026E4C0 +/* 8026E44C 0026B38C 7F A3 EB 78 */ mr r3, r29 +/* 8026E450 0026B390 38 81 00 10 */ addi r4, r1, 0x10 +/* 8026E454 0026B394 48 00 0E FD */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026E458 0026B398 38 61 00 58 */ addi r3, r1, 0x58 +/* 8026E45C 0026B39C 38 81 00 1C */ addi r4, r1, 0x1c +/* 8026E460 0026B3A0 FC 20 F8 90 */ fmr f1, f31 +/* 8026E464 0026B3A4 48 00 0E ED */ bl CalcPos__8cM3dGLinCFP3Vecf +/* 8026E468 0026B3A8 38 61 00 10 */ addi r3, r1, 0x10 +/* 8026E46C 0026B3AC 38 81 00 1C */ addi r4, r1, 0x1c +/* 8026E470 0026B3B0 7F E5 FB 78 */ mr r5, r31 +/* 8026E474 0026B3B4 48 0D 8C 1D */ bl PSVECAdd +/* 8026E478 0026B3B8 7F E3 FB 78 */ mr r3, r31 +/* 8026E47C 0026B3BC 7F E4 FB 78 */ mr r4, r31 +/* 8026E480 0026B3C0 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) +/* 8026E484 0026B3C4 48 0D 8C 55 */ bl PSVECScale +/* 8026E488 0026B3C8 38 61 00 10 */ addi r3, r1, 0x10 +/* 8026E48C 0026B3CC 38 81 00 1C */ addi r4, r1, 0x1c +/* 8026E490 0026B3D0 48 0D 8F 35 */ bl PSVECDistance +/* 8026E494 0026B3D4 C0 1D 00 1C */ lfs f0, 0x1c(r29) +/* 8026E498 0026B3D8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026E49C 0026B3DC 40 80 00 24 */ bge lbl_8026E4C0 +/* 8026E4A0 0026B3E0 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E4A4 0026B3E4 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E4A8 0026B3E8 90 01 00 70 */ stw r0, 0x70(r1) +/* 8026E4AC 0026B3EC 3C 60 80 3A */ lis r3, lbl_803A7904@ha +/* 8026E4B0 0026B3F0 38 03 79 04 */ addi r0, r3, lbl_803A7904@l +/* 8026E4B4 0026B3F4 90 01 00 84 */ stw r0, 0x84(r1) +/* 8026E4B8 0026B3F8 38 60 00 01 */ li r3, 1 +/* 8026E4BC 0026B3FC 48 00 00 20 */ b lbl_8026E4DC +lbl_8026E4C0: +/* 8026E4C0 0026B400 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E4C4 0026B404 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E4C8 0026B408 90 01 00 70 */ stw r0, 0x70(r1) +/* 8026E4CC 0026B40C 3C 60 80 3A */ lis r3, lbl_803A7904@ha +/* 8026E4D0 0026B410 38 03 79 04 */ addi r0, r3, lbl_803A7904@l +/* 8026E4D4 0026B414 90 01 00 84 */ stw r0, 0x84(r1) +/* 8026E4D8 0026B418 38 60 00 00 */ li r3, 0 +lbl_8026E4DC: +/* 8026E4DC 0026B41C E3 E1 00 A8 */ psq_l f31, 168(r1), 0, 0 +/* 8026E4E0 0026B420 CB E1 00 A0 */ lfd f31, 0xa0(r1) +/* 8026E4E4 0026B424 39 61 00 A0 */ addi r11, r1, 0xa0 +/* 8026E4E8 0026B428 48 0F 3D 41 */ bl _restgpr_29 +/* 8026E4EC 0026B42C 80 01 00 B4 */ lwz r0, 0xb4(r1) +/* 8026E4F0 0026B430 7C 08 03 A6 */ mtlr r0 +/* 8026E4F4 0026B434 38 21 00 B0 */ addi r1, r1, 0xb0 +/* 8026E4F8 0026B438 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d/asm/func_8026E4FC.s b/include/SComponent/c_m3d/asm/func_8026E4FC.s new file mode 100644 index 0000000000..9867f78763 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026E4FC.s @@ -0,0 +1,29 @@ +/* 8026E4FC 0026B43C 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026E500 0026B440 7C 08 02 A6 */ mflr r0 +/* 8026E504 0026B444 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026E508 0026B448 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026E50C 0026B44C 48 0F 3C D1 */ bl _savegpr_29 +/* 8026E510 0026B450 7C 7D 1B 78 */ mr r29, r3 +/* 8026E514 0026B454 7C 9E 23 78 */ mr r30, r4 +/* 8026E518 0026B458 7C BF 2B 78 */ mr r31, r5 +/* 8026E51C 0026B45C C0 03 00 08 */ lfs f0, 8(r3) +/* 8026E520 0026B460 FC 20 00 50 */ fneg f1, f0 +/* 8026E524 0026B464 C0 03 00 04 */ lfs f0, 4(r3) +/* 8026E528 0026B468 EC 21 00 32 */ fmuls f1, f1, f0 +/* 8026E52C 0026B46C C0 42 B7 38 */ lfs f2, lbl_80455138-_SDA2_BASE_(r2) +/* 8026E530 0026B470 4B FF 91 45 */ bl cM_atan2s__Fff +/* 8026E534 0026B474 7C 03 00 D0 */ neg r0, r3 +/* 8026E538 0026B478 B0 1E 00 00 */ sth r0, 0(r30) +/* 8026E53C 0026B47C C0 1D 00 00 */ lfs f0, 0(r29) +/* 8026E540 0026B480 FC 20 00 50 */ fneg f1, f0 +/* 8026E544 0026B484 C0 1D 00 04 */ lfs f0, 4(r29) +/* 8026E548 0026B488 EC 21 00 32 */ fmuls f1, f1, f0 +/* 8026E54C 0026B48C C0 42 B7 38 */ lfs f2, lbl_80455138-_SDA2_BASE_(r2) +/* 8026E550 0026B490 4B FF 91 25 */ bl cM_atan2s__Fff +/* 8026E554 0026B494 B0 7F 00 00 */ sth r3, 0(r31) +/* 8026E558 0026B498 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026E55C 0026B49C 48 0F 3C CD */ bl _restgpr_29 +/* 8026E560 0026B4A0 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026E564 0026B4A4 7C 08 03 A6 */ mtlr r0 +/* 8026E568 0026B4A8 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026E56C 0026B4AC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026E570.s b/include/SComponent/c_m3d/asm/func_8026E570.s new file mode 100644 index 0000000000..dc8395aab7 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026E570.s @@ -0,0 +1,94 @@ +/* 8026E570 0026B4B0 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026E574 0026B4B4 7C 08 02 A6 */ mflr r0 +/* 8026E578 0026B4B8 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026E57C 0026B4BC 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8026E580 0026B4C0 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8026E584 0026B4C4 7C 7E 1B 78 */ mr r30, r3 +/* 8026E588 0026B4C8 7C 9F 23 78 */ mr r31, r4 +/* 8026E58C 0026B4CC C0 03 00 00 */ lfs f0, 0(r3) +/* 8026E590 0026B4D0 EC 20 00 32 */ fmuls f1, f0, f0 +/* 8026E594 0026B4D4 C0 03 00 08 */ lfs f0, 8(r3) +/* 8026E598 0026B4D8 EC 00 00 32 */ fmuls f0, f0, f0 +/* 8026E59C 0026B4DC EC 41 00 2A */ fadds f2, f1, f0 +/* 8026E5A0 0026B4E0 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026E5A4 0026B4E4 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026E5A8 0026B4E8 40 81 00 58 */ ble lbl_8026E600 +/* 8026E5AC 0026B4EC FC 00 10 34 */ frsqrte f0, f2 +/* 8026E5B0 0026B4F0 C8 82 B7 20 */ lfd f4, lbl_80455120-_SDA2_BASE_(r2) +/* 8026E5B4 0026B4F4 FC 24 00 32 */ fmul f1, f4, f0 +/* 8026E5B8 0026B4F8 C8 62 B7 28 */ lfd f3, lbl_80455128-_SDA2_BASE_(r2) +/* 8026E5BC 0026B4FC FC 00 00 32 */ fmul f0, f0, f0 +/* 8026E5C0 0026B500 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026E5C4 0026B504 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026E5C8 0026B508 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026E5CC 0026B50C FC 24 00 32 */ fmul f1, f4, f0 +/* 8026E5D0 0026B510 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026E5D4 0026B514 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026E5D8 0026B518 FC 03 00 28 */ fsub f0, f3, f0 +/* 8026E5DC 0026B51C FC 01 00 32 */ fmul f0, f1, f0 +/* 8026E5E0 0026B520 FC 24 00 32 */ fmul f1, f4, f0 +/* 8026E5E4 0026B524 FC 00 00 32 */ fmul f0, f0, f0 +/* 8026E5E8 0026B528 FC 02 00 32 */ fmul f0, f2, f0 +/* 8026E5EC 0026B52C FC 03 00 28 */ fsub f0, f3, f0 +/* 8026E5F0 0026B530 FC 01 00 32 */ fmul f0, f1, f0 +/* 8026E5F4 0026B534 FC 42 00 32 */ fmul f2, f2, f0 +/* 8026E5F8 0026B538 FC 40 10 18 */ frsp f2, f2 +/* 8026E5FC 0026B53C 48 00 00 88 */ b lbl_8026E684 +lbl_8026E600: +/* 8026E600 0026B540 C8 02 B7 30 */ lfd f0, lbl_80455130-_SDA2_BASE_(r2) +/* 8026E604 0026B544 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026E608 0026B548 40 80 00 10 */ bge lbl_8026E618 +/* 8026E60C 0026B54C 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026E610 0026B550 C0 43 0A E0 */ lfs f2, lbl_80450AE0@l(r3) +/* 8026E614 0026B554 48 00 00 70 */ b lbl_8026E684 +lbl_8026E618: +/* 8026E618 0026B558 D0 41 00 08 */ stfs f2, 8(r1) +/* 8026E61C 0026B55C 80 81 00 08 */ lwz r4, 8(r1) +/* 8026E620 0026B560 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 8026E624 0026B564 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026E628 0026B568 7C 03 00 00 */ cmpw r3, r0 +/* 8026E62C 0026B56C 41 82 00 14 */ beq lbl_8026E640 +/* 8026E630 0026B570 40 80 00 40 */ bge lbl_8026E670 +/* 8026E634 0026B574 2C 03 00 00 */ cmpwi r3, 0 +/* 8026E638 0026B578 41 82 00 20 */ beq lbl_8026E658 +/* 8026E63C 0026B57C 48 00 00 34 */ b lbl_8026E670 +lbl_8026E640: +/* 8026E640 0026B580 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026E644 0026B584 41 82 00 0C */ beq lbl_8026E650 +/* 8026E648 0026B588 38 00 00 01 */ li r0, 1 +/* 8026E64C 0026B58C 48 00 00 28 */ b lbl_8026E674 +lbl_8026E650: +/* 8026E650 0026B590 38 00 00 02 */ li r0, 2 +/* 8026E654 0026B594 48 00 00 20 */ b lbl_8026E674 +lbl_8026E658: +/* 8026E658 0026B598 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 8026E65C 0026B59C 41 82 00 0C */ beq lbl_8026E668 +/* 8026E660 0026B5A0 38 00 00 05 */ li r0, 5 +/* 8026E664 0026B5A4 48 00 00 10 */ b lbl_8026E674 +lbl_8026E668: +/* 8026E668 0026B5A8 38 00 00 03 */ li r0, 3 +/* 8026E66C 0026B5AC 48 00 00 08 */ b lbl_8026E674 +lbl_8026E670: +/* 8026E670 0026B5B0 38 00 00 04 */ li r0, 4 +lbl_8026E674: +/* 8026E674 0026B5B4 2C 00 00 01 */ cmpwi r0, 1 +/* 8026E678 0026B5B8 40 82 00 0C */ bne lbl_8026E684 +/* 8026E67C 0026B5BC 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 8026E680 0026B5C0 C0 43 0A E0 */ lfs f2, lbl_80450AE0@l(r3) +lbl_8026E684: +/* 8026E684 0026B5C4 C0 3E 00 04 */ lfs f1, 4(r30) +/* 8026E688 0026B5C8 4B FF 8F ED */ bl cM_atan2s__Fff +/* 8026E68C 0026B5CC 7C 03 00 D0 */ neg r0, r3 +/* 8026E690 0026B5D0 B0 1F 00 00 */ sth r0, 0(r31) +/* 8026E694 0026B5D4 C0 3E 00 00 */ lfs f1, 0(r30) +/* 8026E698 0026B5D8 C0 5E 00 08 */ lfs f2, 8(r30) +/* 8026E69C 0026B5DC 4B FF 8F D9 */ bl cM_atan2s__Fff +/* 8026E6A0 0026B5E0 B0 7F 00 02 */ sth r3, 2(r31) +/* 8026E6A4 0026B5E4 38 00 00 00 */ li r0, 0 +/* 8026E6A8 0026B5E8 B0 1F 00 04 */ sth r0, 4(r31) +/* 8026E6AC 0026B5EC 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026E6B0 0026B5F0 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8026E6B4 0026B5F4 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026E6B8 0026B5F8 7C 08 03 A6 */ mtlr r0 +/* 8026E6BC 0026B5FC 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026E6C0 0026B600 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026E6C4.s b/include/SComponent/c_m3d/asm/func_8026E6C4.s new file mode 100644 index 0000000000..4879a46882 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026E6C4.s @@ -0,0 +1,11 @@ +/* 8026E6C4 0026B604 EC 42 01 F2 */ fmuls f2, f2, f7 +/* 8026E6C8 0026B608 EC 04 01 B2 */ fmuls f0, f4, f6 +/* 8026E6CC 0026B60C EC 02 00 28 */ fsubs f0, f2, f0 +/* 8026E6D0 0026B610 EC 00 28 24 */ fdivs f0, f0, f5 +/* 8026E6D4 0026B614 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026E6D8 0026B618 EC 43 01 B2 */ fmuls f2, f3, f6 +/* 8026E6DC 0026B61C EC 01 01 F2 */ fmuls f0, f1, f7 +/* 8026E6E0 0026B620 EC 02 00 28 */ fsubs f0, f2, f0 +/* 8026E6E4 0026B624 EC 00 28 24 */ fdivs f0, f0, f5 +/* 8026E6E8 0026B628 D0 04 00 00 */ stfs f0, 0(r4) +/* 8026E6EC 0026B62C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026E6F0.s b/include/SComponent/c_m3d/asm/func_8026E6F0.s new file mode 100644 index 0000000000..02bd84a3e8 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026E6F0.s @@ -0,0 +1,114 @@ +/* 8026E6F0 0026B630 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026E6F4 0026B634 7C 08 02 A6 */ mflr r0 +/* 8026E6F8 0026B638 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026E6FC 0026B63C 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026E700 0026B640 48 0F 3A DD */ bl _savegpr_29 +/* 8026E704 0026B644 7C 7D 1B 78 */ mr r29, r3 +/* 8026E708 0026B648 7C 9E 23 78 */ mr r30, r4 +/* 8026E70C 0026B64C 7C BF 2B 78 */ mr r31, r5 +/* 8026E710 0026B650 38 A1 00 08 */ addi r5, r1, 8 +/* 8026E714 0026B654 48 0D 8A A1 */ bl PSVECCrossProduct +/* 8026E718 0026B658 C0 01 00 08 */ lfs f0, 8(r1) +/* 8026E71C 0026B65C FC 00 02 10 */ fabs f0, f0 +/* 8026E720 0026B660 FC 00 00 18 */ frsp f0, f0 +/* 8026E724 0026B664 C0 2D 8C 00 */ lfs f1, lbl_80451180-_SDA_BASE_(r13) +/* 8026E728 0026B668 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026E72C 0026B66C 40 80 00 34 */ bge lbl_8026E760 +/* 8026E730 0026B670 C0 01 00 0C */ lfs f0, 0xc(r1) +/* 8026E734 0026B674 FC 00 02 10 */ fabs f0, f0 +/* 8026E738 0026B678 FC 00 00 18 */ frsp f0, f0 +/* 8026E73C 0026B67C FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026E740 0026B680 40 80 00 20 */ bge lbl_8026E760 +/* 8026E744 0026B684 C0 01 00 10 */ lfs f0, 0x10(r1) +/* 8026E748 0026B688 FC 00 02 10 */ fabs f0, f0 +/* 8026E74C 0026B68C FC 00 00 18 */ frsp f0, f0 +/* 8026E750 0026B690 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026E754 0026B694 40 80 00 0C */ bge lbl_8026E760 +/* 8026E758 0026B698 38 60 00 00 */ li r3, 0 +/* 8026E75C 0026B69C 48 00 01 2C */ b lbl_8026E888 +lbl_8026E760: +/* 8026E760 0026B6A0 C0 A1 00 08 */ lfs f5, 8(r1) +/* 8026E764 0026B6A4 FC 00 2A 10 */ fabs f0, f5 +/* 8026E768 0026B6A8 FC 20 00 18 */ frsp f1, f0 +/* 8026E76C 0026B6AC C0 01 00 0C */ lfs f0, 0xc(r1) +/* 8026E770 0026B6B0 FC 00 02 10 */ fabs f0, f0 +/* 8026E774 0026B6B4 FC 40 00 18 */ frsp f2, f0 +/* 8026E778 0026B6B8 C0 01 00 10 */ lfs f0, 0x10(r1) +/* 8026E77C 0026B6BC FC 00 02 10 */ fabs f0, f0 +/* 8026E780 0026B6C0 FC 00 00 18 */ frsp f0, f0 +/* 8026E784 0026B6C4 FC 01 10 40 */ fcmpo cr0, f1, f2 +/* 8026E788 0026B6C8 4C 41 13 82 */ cror 2, 1, 2 +/* 8026E78C 0026B6CC 40 82 00 40 */ bne lbl_8026E7CC +/* 8026E790 0026B6D0 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026E794 0026B6D4 4C 41 13 82 */ cror 2, 1, 2 +/* 8026E798 0026B6D8 40 82 00 34 */ bne lbl_8026E7CC +/* 8026E79C 0026B6DC C0 3D 00 04 */ lfs f1, 4(r29) +/* 8026E7A0 0026B6E0 C0 5D 00 08 */ lfs f2, 8(r29) +/* 8026E7A4 0026B6E4 C0 7E 00 04 */ lfs f3, 4(r30) +/* 8026E7A8 0026B6E8 C0 9E 00 08 */ lfs f4, 8(r30) +/* 8026E7AC 0026B6EC C0 DD 00 0C */ lfs f6, 0xc(r29) +/* 8026E7B0 0026B6F0 C0 FE 00 0C */ lfs f7, 0xc(r30) +/* 8026E7B4 0026B6F4 38 7F 00 04 */ addi r3, r31, 4 +/* 8026E7B8 0026B6F8 38 9F 00 08 */ addi r4, r31, 8 +/* 8026E7BC 0026B6FC 4B FF FF 09 */ bl cM3d_PlaneCrossLineProcWork__FfffffffPfPf +/* 8026E7C0 0026B700 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026E7C4 0026B704 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026E7C8 0026B708 48 00 00 80 */ b lbl_8026E848 +lbl_8026E7CC: +/* 8026E7CC 0026B70C FC 02 08 40 */ fcmpo cr0, f2, f1 +/* 8026E7D0 0026B710 4C 41 13 82 */ cror 2, 1, 2 +/* 8026E7D4 0026B714 40 82 00 44 */ bne lbl_8026E818 +/* 8026E7D8 0026B718 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026E7DC 0026B71C 4C 41 13 82 */ cror 2, 1, 2 +/* 8026E7E0 0026B720 40 82 00 38 */ bne lbl_8026E818 +/* 8026E7E4 0026B724 C0 3D 00 08 */ lfs f1, 8(r29) +/* 8026E7E8 0026B728 C0 5D 00 00 */ lfs f2, 0(r29) +/* 8026E7EC 0026B72C C0 7E 00 08 */ lfs f3, 8(r30) +/* 8026E7F0 0026B730 C0 9E 00 00 */ lfs f4, 0(r30) +/* 8026E7F4 0026B734 C0 A1 00 0C */ lfs f5, 0xc(r1) +/* 8026E7F8 0026B738 C0 DD 00 0C */ lfs f6, 0xc(r29) +/* 8026E7FC 0026B73C C0 FE 00 0C */ lfs f7, 0xc(r30) +/* 8026E800 0026B740 38 7F 00 08 */ addi r3, r31, 8 +/* 8026E804 0026B744 7F E4 FB 78 */ mr r4, r31 +/* 8026E808 0026B748 4B FF FE BD */ bl cM3d_PlaneCrossLineProcWork__FfffffffPfPf +/* 8026E80C 0026B74C C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026E810 0026B750 D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026E814 0026B754 48 00 00 34 */ b lbl_8026E848 +lbl_8026E818: +/* 8026E818 0026B758 C0 3D 00 00 */ lfs f1, 0(r29) +/* 8026E81C 0026B75C C0 5D 00 04 */ lfs f2, 4(r29) +/* 8026E820 0026B760 C0 7E 00 00 */ lfs f3, 0(r30) +/* 8026E824 0026B764 C0 9E 00 04 */ lfs f4, 4(r30) +/* 8026E828 0026B768 C0 A1 00 10 */ lfs f5, 0x10(r1) +/* 8026E82C 0026B76C C0 DD 00 0C */ lfs f6, 0xc(r29) +/* 8026E830 0026B770 C0 FE 00 0C */ lfs f7, 0xc(r30) +/* 8026E834 0026B774 7F E3 FB 78 */ mr r3, r31 +/* 8026E838 0026B778 38 9F 00 04 */ addi r4, r31, 4 +/* 8026E83C 0026B77C 4B FF FE 89 */ bl cM3d_PlaneCrossLineProcWork__FfffffffPfPf +/* 8026E840 0026B780 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) +/* 8026E844 0026B784 D0 1F 00 08 */ stfs f0, 8(r31) +lbl_8026E848: +/* 8026E848 0026B788 7F E3 FB 78 */ mr r3, r31 +/* 8026E84C 0026B78C 48 0D 89 05 */ bl PSVECMag +/* 8026E850 0026B790 FC 00 0A 10 */ fabs f0, f1 +/* 8026E854 0026B794 FC 40 00 18 */ frsp f2, f0 +/* 8026E858 0026B798 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026E85C 0026B79C FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026E860 0026B7A0 40 80 00 08 */ bge lbl_8026E868 +/* 8026E864 0026B7A4 C0 22 B7 38 */ lfs f1, lbl_80455138-_SDA2_BASE_(r2) +lbl_8026E868: +/* 8026E868 0026B7A8 38 61 00 08 */ addi r3, r1, 8 +/* 8026E86C 0026B7AC 7C 64 1B 78 */ mr r4, r3 +/* 8026E870 0026B7B0 48 0D 88 69 */ bl PSVECScale +/* 8026E874 0026B7B4 7F E3 FB 78 */ mr r3, r31 +/* 8026E878 0026B7B8 38 81 00 08 */ addi r4, r1, 8 +/* 8026E87C 0026B7BC 38 BF 00 0C */ addi r5, r31, 0xc +/* 8026E880 0026B7C0 48 0D 88 11 */ bl PSVECAdd +/* 8026E884 0026B7C4 38 60 00 01 */ li r3, 1 +lbl_8026E888: +/* 8026E888 0026B7C8 39 61 00 30 */ addi r11, r1, 0x30 +/* 8026E88C 0026B7CC 48 0F 39 9D */ bl _restgpr_29 +/* 8026E890 0026B7D0 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026E894 0026B7D4 7C 08 03 A6 */ mtlr r0 +/* 8026E898 0026B7D8 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026E89C 0026B7DC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026E8A0.s b/include/SComponent/c_m3d/asm/func_8026E8A0.s new file mode 100644 index 0000000000..bba9c70615 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026E8A0.s @@ -0,0 +1,59 @@ +/* 8026E8A0 0026B7E0 94 21 FF B0 */ stwu r1, -0x50(r1) +/* 8026E8A4 0026B7E4 7C 08 02 A6 */ mflr r0 +/* 8026E8A8 0026B7E8 90 01 00 54 */ stw r0, 0x54(r1) +/* 8026E8AC 0026B7EC DB E1 00 40 */ stfd f31, 0x40(r1) +/* 8026E8B0 0026B7F0 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 +/* 8026E8B4 0026B7F4 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026E8B8 0026B7F8 48 0F 39 25 */ bl _savegpr_29 +/* 8026E8BC 0026B7FC 7C BD 2B 78 */ mr r29, r5 +/* 8026E8C0 0026B800 7C DE 33 78 */ mr r30, r6 +/* 8026E8C4 0026B804 3C A0 80 3A */ lis r5, lbl_803A78F8@ha +/* 8026E8C8 0026B808 38 05 78 F8 */ addi r0, r5, lbl_803A78F8@l +/* 8026E8CC 0026B80C 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026E8D0 0026B810 38 A1 00 08 */ addi r5, r1, 8 +/* 8026E8D4 0026B814 4B FF FE 1D */ bl cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin +/* 8026E8D8 0026B818 2C 03 00 00 */ cmpwi r3, 0 +/* 8026E8DC 0026B81C 40 82 00 18 */ bne lbl_8026E8F4 +/* 8026E8E0 0026B820 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E8E4 0026B824 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E8E8 0026B828 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026E8EC 0026B82C 38 60 00 00 */ li r3, 0 +/* 8026E8F0 0026B830 48 00 00 70 */ b lbl_8026E960 +lbl_8026E8F4: +/* 8026E8F4 0026B834 3B E1 00 14 */ addi r31, r1, 0x14 +/* 8026E8F8 0026B838 7F A3 EB 78 */ mr r3, r29 +/* 8026E8FC 0026B83C 38 81 00 08 */ addi r4, r1, 8 +/* 8026E900 0026B840 48 0D 88 95 */ bl PSVECDotProduct +/* 8026E904 0026B844 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026E908 0026B848 EF E0 08 2A */ fadds f31, f0, f1 +/* 8026E90C 0026B84C 7F A3 EB 78 */ mr r3, r29 +/* 8026E910 0026B850 7F E4 FB 78 */ mr r4, r31 +/* 8026E914 0026B854 48 0D 88 81 */ bl PSVECDotProduct +/* 8026E918 0026B858 C0 1D 00 0C */ lfs f0, 0xc(r29) +/* 8026E91C 0026B85C EC 40 08 2A */ fadds f2, f0, f1 +/* 8026E920 0026B860 FC 20 F8 90 */ fmr f1, f31 +/* 8026E924 0026B864 38 61 00 08 */ addi r3, r1, 8 +/* 8026E928 0026B868 7F E4 FB 78 */ mr r4, r31 +/* 8026E92C 0026B86C 7F C5 F3 78 */ mr r5, r30 +/* 8026E930 0026B870 4B FF A5 A5 */ bl cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec +/* 8026E934 0026B874 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8026E938 0026B878 40 82 00 18 */ bne lbl_8026E950 +/* 8026E93C 0026B87C 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E940 0026B880 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E944 0026B884 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026E948 0026B888 38 60 00 00 */ li r3, 0 +/* 8026E94C 0026B88C 48 00 00 14 */ b lbl_8026E960 +lbl_8026E950: +/* 8026E950 0026B890 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026E954 0026B894 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026E958 0026B898 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026E95C 0026B89C 38 60 00 01 */ li r3, 1 +lbl_8026E960: +/* 8026E960 0026B8A0 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 +/* 8026E964 0026B8A4 CB E1 00 40 */ lfd f31, 0x40(r1) +/* 8026E968 0026B8A8 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026E96C 0026B8AC 48 0F 38 BD */ bl _restgpr_29 +/* 8026E970 0026B8B0 80 01 00 54 */ lwz r0, 0x54(r1) +/* 8026E974 0026B8B4 7C 08 03 A6 */ mtlr r0 +/* 8026E978 0026B8B8 38 21 00 50 */ addi r1, r1, 0x50 +/* 8026E97C 0026B8BC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026E980.s b/include/SComponent/c_m3d/asm/func_8026E980.s new file mode 100644 index 0000000000..f2fe191bba --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026E980.s @@ -0,0 +1,57 @@ +/* 8026E980 0026B8C0 94 21 FF B0 */ stwu r1, -0x50(r1) +/* 8026E984 0026B8C4 7C 08 02 A6 */ mflr r0 +/* 8026E988 0026B8C8 90 01 00 54 */ stw r0, 0x54(r1) +/* 8026E98C 0026B8CC DB E1 00 40 */ stfd f31, 0x40(r1) +/* 8026E990 0026B8D0 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 +/* 8026E994 0026B8D4 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026E998 0026B8D8 48 0F 38 45 */ bl _savegpr_29 +/* 8026E99C 0026B8DC 7C 7D 1B 78 */ mr r29, r3 +/* 8026E9A0 0026B8E0 7C 9E 23 78 */ mr r30, r4 +/* 8026E9A4 0026B8E4 7C BF 2B 78 */ mr r31, r5 +/* 8026E9A8 0026B8E8 38 7D 00 0C */ addi r3, r29, 0xc +/* 8026E9AC 0026B8EC 7F A4 EB 78 */ mr r4, r29 +/* 8026E9B0 0026B8F0 38 A1 00 20 */ addi r5, r1, 0x20 +/* 8026E9B4 0026B8F4 48 0D 87 01 */ bl PSVECSubtract +/* 8026E9B8 0026B8F8 38 61 00 20 */ addi r3, r1, 0x20 +/* 8026E9BC 0026B8FC 48 0D 87 7D */ bl PSVECSquareMag +/* 8026E9C0 0026B900 FF E0 08 90 */ fmr f31, f1 +/* 8026E9C4 0026B904 FC 00 FA 10 */ fabs f0, f31 +/* 8026E9C8 0026B908 FC 20 00 18 */ frsp f1, f0 +/* 8026E9CC 0026B90C C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026E9D0 0026B910 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026E9D4 0026B914 40 80 00 24 */ bge lbl_8026E9F8 +/* 8026E9D8 0026B918 C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026E9DC 0026B91C D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026E9E0 0026B920 C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026E9E4 0026B924 D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026E9E8 0026B928 C0 1E 00 08 */ lfs f0, 8(r30) +/* 8026E9EC 0026B92C D0 1F 00 08 */ stfs f0, 8(r31) +/* 8026E9F0 0026B930 C0 22 B7 18 */ lfs f1, lbl_80455118-_SDA2_BASE_(r2) +/* 8026E9F4 0026B934 48 00 00 48 */ b lbl_8026EA3C +lbl_8026E9F8: +/* 8026E9F8 0026B938 7F C3 F3 78 */ mr r3, r30 +/* 8026E9FC 0026B93C 7F A4 EB 78 */ mr r4, r29 +/* 8026EA00 0026B940 38 A1 00 14 */ addi r5, r1, 0x14 +/* 8026EA04 0026B944 48 0D 86 B1 */ bl PSVECSubtract +/* 8026EA08 0026B948 38 61 00 14 */ addi r3, r1, 0x14 +/* 8026EA0C 0026B94C 38 81 00 20 */ addi r4, r1, 0x20 +/* 8026EA10 0026B950 48 0D 87 85 */ bl PSVECDotProduct +/* 8026EA14 0026B954 EF E1 F8 24 */ fdivs f31, f1, f31 +/* 8026EA18 0026B958 38 61 00 20 */ addi r3, r1, 0x20 +/* 8026EA1C 0026B95C 38 81 00 08 */ addi r4, r1, 8 +/* 8026EA20 0026B960 FC 20 F8 90 */ fmr f1, f31 +/* 8026EA24 0026B964 48 0D 86 B5 */ bl PSVECScale +/* 8026EA28 0026B968 38 61 00 08 */ addi r3, r1, 8 +/* 8026EA2C 0026B96C 7F A4 EB 78 */ mr r4, r29 +/* 8026EA30 0026B970 7F E5 FB 78 */ mr r5, r31 +/* 8026EA34 0026B974 48 0D 86 5D */ bl PSVECAdd +/* 8026EA38 0026B978 FC 20 F8 90 */ fmr f1, f31 +lbl_8026EA3C: +/* 8026EA3C 0026B97C E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 +/* 8026EA40 0026B980 CB E1 00 40 */ lfd f31, 0x40(r1) +/* 8026EA44 0026B984 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026EA48 0026B988 48 0F 37 E1 */ bl _restgpr_29 +/* 8026EA4C 0026B98C 80 01 00 54 */ lwz r0, 0x54(r1) +/* 8026EA50 0026B990 7C 08 03 A6 */ mtlr r0 +/* 8026EA54 0026B994 38 21 00 50 */ addi r1, r1, 0x50 +/* 8026EA58 0026B998 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026EA5C.s b/include/SComponent/c_m3d/asm/func_8026EA5C.s new file mode 100644 index 0000000000..a0cf4792f8 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026EA5C.s @@ -0,0 +1,57 @@ +/* 8026EA5C 0026B99C 94 21 FF B0 */ stwu r1, -0x50(r1) +/* 8026EA60 0026B9A0 7C 08 02 A6 */ mflr r0 +/* 8026EA64 0026B9A4 90 01 00 54 */ stw r0, 0x54(r1) +/* 8026EA68 0026B9A8 DB E1 00 40 */ stfd f31, 0x40(r1) +/* 8026EA6C 0026B9AC F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 +/* 8026EA70 0026B9B0 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026EA74 0026B9B4 48 0F 37 69 */ bl _savegpr_29 +/* 8026EA78 0026B9B8 7C 7D 1B 78 */ mr r29, r3 +/* 8026EA7C 0026B9BC 7C BE 2B 78 */ mr r30, r5 +/* 8026EA80 0026B9C0 7C DF 33 78 */ mr r31, r6 +/* 8026EA84 0026B9C4 7C 83 23 78 */ mr r3, r4 +/* 8026EA88 0026B9C8 7F A4 EB 78 */ mr r4, r29 +/* 8026EA8C 0026B9CC 38 A1 00 20 */ addi r5, r1, 0x20 +/* 8026EA90 0026B9D0 48 0D 86 25 */ bl PSVECSubtract +/* 8026EA94 0026B9D4 38 61 00 20 */ addi r3, r1, 0x20 +/* 8026EA98 0026B9D8 48 0D 86 A1 */ bl PSVECSquareMag +/* 8026EA9C 0026B9DC FF E0 08 90 */ fmr f31, f1 +/* 8026EAA0 0026B9E0 FC 00 FA 10 */ fabs f0, f31 +/* 8026EAA4 0026B9E4 FC 20 00 18 */ frsp f1, f0 +/* 8026EAA8 0026B9E8 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026EAAC 0026B9EC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026EAB0 0026B9F0 40 80 00 24 */ bge lbl_8026EAD4 +/* 8026EAB4 0026B9F4 C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026EAB8 0026B9F8 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026EABC 0026B9FC C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026EAC0 0026BA00 D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026EAC4 0026BA04 C0 1E 00 08 */ lfs f0, 8(r30) +/* 8026EAC8 0026BA08 D0 1F 00 08 */ stfs f0, 8(r31) +/* 8026EACC 0026BA0C C0 22 B7 18 */ lfs f1, lbl_80455118-_SDA2_BASE_(r2) +/* 8026EAD0 0026BA10 48 00 00 48 */ b lbl_8026EB18 +lbl_8026EAD4: +/* 8026EAD4 0026BA14 7F C3 F3 78 */ mr r3, r30 +/* 8026EAD8 0026BA18 7F A4 EB 78 */ mr r4, r29 +/* 8026EADC 0026BA1C 38 A1 00 14 */ addi r5, r1, 0x14 +/* 8026EAE0 0026BA20 48 0D 85 D5 */ bl PSVECSubtract +/* 8026EAE4 0026BA24 38 61 00 14 */ addi r3, r1, 0x14 +/* 8026EAE8 0026BA28 38 81 00 20 */ addi r4, r1, 0x20 +/* 8026EAEC 0026BA2C 48 0D 86 A9 */ bl PSVECDotProduct +/* 8026EAF0 0026BA30 EF E1 F8 24 */ fdivs f31, f1, f31 +/* 8026EAF4 0026BA34 38 61 00 20 */ addi r3, r1, 0x20 +/* 8026EAF8 0026BA38 38 81 00 08 */ addi r4, r1, 8 +/* 8026EAFC 0026BA3C FC 20 F8 90 */ fmr f1, f31 +/* 8026EB00 0026BA40 48 0D 85 D9 */ bl PSVECScale +/* 8026EB04 0026BA44 38 61 00 08 */ addi r3, r1, 8 +/* 8026EB08 0026BA48 7F A4 EB 78 */ mr r4, r29 +/* 8026EB0C 0026BA4C 7F E5 FB 78 */ mr r5, r31 +/* 8026EB10 0026BA50 48 0D 85 81 */ bl PSVECAdd +/* 8026EB14 0026BA54 FC 20 F8 90 */ fmr f1, f31 +lbl_8026EB18: +/* 8026EB18 0026BA58 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 +/* 8026EB1C 0026BA5C CB E1 00 40 */ lfd f31, 0x40(r1) +/* 8026EB20 0026BA60 39 61 00 40 */ addi r11, r1, 0x40 +/* 8026EB24 0026BA64 48 0F 37 05 */ bl _restgpr_29 +/* 8026EB28 0026BA68 80 01 00 54 */ lwz r0, 0x54(r1) +/* 8026EB2C 0026BA6C 7C 08 03 A6 */ mtlr r0 +/* 8026EB30 0026BA70 38 21 00 50 */ addi r1, r1, 0x50 +/* 8026EB34 0026BA74 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026EB38.s b/include/SComponent/c_m3d/asm/func_8026EB38.s new file mode 100644 index 0000000000..17a50cfde8 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026EB38.s @@ -0,0 +1,35 @@ +/* 8026EB38 0026BA78 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026EB3C 0026BA7C 7C 08 02 A6 */ mflr r0 +/* 8026EB40 0026BA80 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026EB44 0026BA84 93 E1 00 2C */ stw r31, 0x2c(r1) +/* 8026EB48 0026BA88 93 C1 00 28 */ stw r30, 0x28(r1) +/* 8026EB4C 0026BA8C 7C BE 2B 78 */ mr r30, r5 +/* 8026EB50 0026BA90 7C DF 33 78 */ mr r31, r6 +/* 8026EB54 0026BA94 3C A0 80 3A */ lis r5, lbl_803A78F8@ha +/* 8026EB58 0026BA98 38 05 78 F8 */ addi r0, r5, lbl_803A78F8@l +/* 8026EB5C 0026BA9C 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026EB60 0026BAA0 38 A1 00 08 */ addi r5, r1, 8 +/* 8026EB64 0026BAA4 4B FF FB 8D */ bl cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin +/* 8026EB68 0026BAA8 2C 03 00 00 */ cmpwi r3, 0 +/* 8026EB6C 0026BAAC 40 82 00 18 */ bne lbl_8026EB84 +/* 8026EB70 0026BAB0 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026EB74 0026BAB4 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026EB78 0026BAB8 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026EB7C 0026BABC 38 60 00 00 */ li r3, 0 +/* 8026EB80 0026BAC0 48 00 00 24 */ b lbl_8026EBA4 +lbl_8026EB84: +/* 8026EB84 0026BAC4 38 61 00 08 */ addi r3, r1, 8 +/* 8026EB88 0026BAC8 7F C4 F3 78 */ mr r4, r30 +/* 8026EB8C 0026BACC 7F E5 FB 78 */ mr r5, r31 +/* 8026EB90 0026BAD0 4B FF FD F1 */ bl cM3d_lineVsPosSuisenCross__FPC8cM3dGLinPC3VecP3Vec +/* 8026EB94 0026BAD4 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026EB98 0026BAD8 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026EB9C 0026BADC 90 01 00 20 */ stw r0, 0x20(r1) +/* 8026EBA0 0026BAE0 38 60 00 01 */ li r3, 1 +lbl_8026EBA4: +/* 8026EBA4 0026BAE4 83 E1 00 2C */ lwz r31, 0x2c(r1) +/* 8026EBA8 0026BAE8 83 C1 00 28 */ lwz r30, 0x28(r1) +/* 8026EBAC 0026BAEC 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026EBB0 0026BAF0 7C 08 03 A6 */ mtlr r0 +/* 8026EBB4 0026BAF4 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026EBB8 0026BAF8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026EBBC.s b/include/SComponent/c_m3d/asm/func_8026EBBC.s new file mode 100644 index 0000000000..42e61ff9e9 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026EBBC.s @@ -0,0 +1,32 @@ +/* 8026EBBC 0026BAFC 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026EBC0 0026BB00 7C 08 02 A6 */ mflr r0 +/* 8026EBC4 0026BB04 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026EBC8 0026BB08 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8026EBCC 0026BB0C 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8026EBD0 0026BB10 7C 9E 23 78 */ mr r30, r4 +/* 8026EBD4 0026BB14 7C BF 2B 78 */ mr r31, r5 +/* 8026EBD8 0026BB18 C0 24 00 08 */ lfs f1, 8(r4) +/* 8026EBDC 0026BB1C C0 03 00 08 */ lfs f0, 8(r3) +/* 8026EBE0 0026BB20 EC 61 00 32 */ fmuls f3, f1, f0 +/* 8026EBE4 0026BB24 C0 24 00 00 */ lfs f1, 0(r4) +/* 8026EBE8 0026BB28 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026EBEC 0026BB2C EC 41 00 32 */ fmuls f2, f1, f0 +/* 8026EBF0 0026BB30 C0 24 00 04 */ lfs f1, 4(r4) +/* 8026EBF4 0026BB34 C0 03 00 04 */ lfs f0, 4(r3) +/* 8026EBF8 0026BB38 EC 01 00 32 */ fmuls f0, f1, f0 +/* 8026EBFC 0026BB3C EC 02 00 2A */ fadds f0, f2, f0 +/* 8026EC00 0026BB40 EC 03 00 2A */ fadds f0, f3, f0 +/* 8026EC04 0026BB44 FC 00 02 10 */ fabs f0, f0 +/* 8026EC08 0026BB48 FC 20 00 18 */ frsp f1, f0 +/* 8026EC0C 0026BB4C 38 81 00 08 */ addi r4, r1, 8 +/* 8026EC10 0026BB50 48 0D 84 C9 */ bl PSVECScale +/* 8026EC14 0026BB54 38 61 00 08 */ addi r3, r1, 8 +/* 8026EC18 0026BB58 7F C4 F3 78 */ mr r4, r30 +/* 8026EC1C 0026BB5C 7F E5 FB 78 */ mr r5, r31 +/* 8026EC20 0026BB60 48 0D 84 71 */ bl PSVECAdd +/* 8026EC24 0026BB64 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026EC28 0026BB68 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8026EC2C 0026BB6C 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026EC30 0026BB70 7C 08 03 A6 */ mtlr r0 +/* 8026EC34 0026BB74 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026EC38 0026BB78 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d/asm/func_8026EC3C.s b/include/SComponent/c_m3d/asm/func_8026EC3C.s new file mode 100644 index 0000000000..3d13bb5654 --- /dev/null +++ b/include/SComponent/c_m3d/asm/func_8026EC3C.s @@ -0,0 +1,6 @@ +/* 8026EC3C 0026BB7C C0 22 B7 CC */ lfs f1, lbl_804551CC-_SDA2_BASE_(r2) +/* 8026EC40 0026BB80 3C 60 80 45 */ lis r3, lbl_80450AEC@ha +/* 8026EC44 0026BB84 C0 03 0A EC */ lfs f0, lbl_80450AEC@l(r3) +/* 8026EC48 0026BB88 EC 01 00 32 */ fmuls f0, f1, f0 +/* 8026EC4C 0026BB8C D0 0D 8C 00 */ stfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026EC50 0026BB90 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_aab.h b/include/SComponent/c_m3d_g_aab.h new file mode 100644 index 0000000000..1f3bc776cd --- /dev/null +++ b/include/SComponent/c_m3d_g_aab.h @@ -0,0 +1,22 @@ +#ifndef __C_M3D_G_AAB_H_ +#define __C_M3D_G_AAB_H_ + +#include "SComponent/c_xyz.h" +#include "global.h" + +class cM3dGAab { +public: + void Set(const cXyz*, const cXyz*); + bool CrossY(const cXyz*) const; + bool UnderPlaneYUnder(float) const; + bool TopPlaneYUnder(float) const; + void ClearForMinMax(void); + void SetMinMax(const cXyz&); + void SetMinMax(const cM3dGAab&); + void SetMin(const cXyz&); + void SetMax(const cXyz&); + void CalcCenter(cXyz*) const; + void PlusR(float); +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026EC54.s b/include/SComponent/c_m3d_g_aab/asm/func_8026EC54.s new file mode 100644 index 0000000000..ee48d8c14f --- /dev/null +++ b/include/SComponent/c_m3d_g_aab/asm/func_8026EC54.s @@ -0,0 +1,13 @@ +/* 8026EC54 0026BB94 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026EC58 0026BB98 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026EC5C 0026BB9C C0 04 00 04 */ lfs f0, 4(r4) +/* 8026EC60 0026BBA0 D0 03 00 04 */ stfs f0, 4(r3) +/* 8026EC64 0026BBA4 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026EC68 0026BBA8 D0 03 00 08 */ stfs f0, 8(r3) +/* 8026EC6C 0026BBAC C0 05 00 00 */ lfs f0, 0(r5) +/* 8026EC70 0026BBB0 D0 03 00 0C */ stfs f0, 0xc(r3) +/* 8026EC74 0026BBB4 C0 05 00 04 */ lfs f0, 4(r5) +/* 8026EC78 0026BBB8 D0 03 00 10 */ stfs f0, 0x10(r3) +/* 8026EC7C 0026BBBC C0 05 00 08 */ lfs f0, 8(r5) +/* 8026EC80 0026BBC0 D0 03 00 14 */ stfs f0, 0x14(r3) +/* 8026EC84 0026BBC4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026EC88.s b/include/SComponent/c_m3d_g_aab/asm/func_8026EC88.s new file mode 100644 index 0000000000..26461e9db2 --- /dev/null +++ b/include/SComponent/c_m3d_g_aab/asm/func_8026EC88.s @@ -0,0 +1,20 @@ +/* 8026EC88 0026BBC8 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026EC8C 0026BBCC C0 24 00 00 */ lfs f1, 0(r4) +/* 8026EC90 0026BBD0 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026EC94 0026BBD4 41 81 00 2C */ bgt lbl_8026ECC0 +/* 8026EC98 0026BBD8 C0 03 00 0C */ lfs f0, 0xc(r3) +/* 8026EC9C 0026BBDC FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026ECA0 0026BBE0 41 80 00 20 */ blt lbl_8026ECC0 +/* 8026ECA4 0026BBE4 C0 03 00 08 */ lfs f0, 8(r3) +/* 8026ECA8 0026BBE8 C0 24 00 08 */ lfs f1, 8(r4) +/* 8026ECAC 0026BBEC FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026ECB0 0026BBF0 41 81 00 10 */ bgt lbl_8026ECC0 +/* 8026ECB4 0026BBF4 C0 03 00 14 */ lfs f0, 0x14(r3) +/* 8026ECB8 0026BBF8 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026ECBC 0026BBFC 40 80 00 0C */ bge lbl_8026ECC8 +lbl_8026ECC0: +/* 8026ECC0 0026BC00 38 60 00 00 */ li r3, 0 +/* 8026ECC4 0026BC04 4E 80 00 20 */ blr +lbl_8026ECC8: +/* 8026ECC8 0026BC08 38 60 00 01 */ li r3, 1 +/* 8026ECCC 0026BC0C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026ECD0.s b/include/SComponent/c_m3d_g_aab/asm/func_8026ECD0.s new file mode 100644 index 0000000000..0eaf6aac55 --- /dev/null +++ b/include/SComponent/c_m3d_g_aab/asm/func_8026ECD0.s @@ -0,0 +1,5 @@ +/* 8026ECD0 0026BC10 C0 03 00 04 */ lfs f0, 4(r3) +/* 8026ECD4 0026BC14 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026ECD8 0026BC18 7C 00 00 26 */ mfcr r0 +/* 8026ECDC 0026BC1C 54 03 0F FE */ srwi r3, r0, 0x1f +/* 8026ECE0 0026BC20 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026ECE4.s b/include/SComponent/c_m3d_g_aab/asm/func_8026ECE4.s new file mode 100644 index 0000000000..b91c2e5cc7 --- /dev/null +++ b/include/SComponent/c_m3d_g_aab/asm/func_8026ECE4.s @@ -0,0 +1,5 @@ +/* 8026ECE4 0026BC24 C0 03 00 10 */ lfs f0, 0x10(r3) +/* 8026ECE8 0026BC28 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026ECEC 0026BC2C 7C 00 00 26 */ mfcr r0 +/* 8026ECF0 0026BC30 54 03 0F FE */ srwi r3, r0, 0x1f +/* 8026ECF4 0026BC34 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026ECF8.s b/include/SComponent/c_m3d_g_aab/asm/func_8026ECF8.s new file mode 100644 index 0000000000..1606b58f6c --- /dev/null +++ b/include/SComponent/c_m3d_g_aab/asm/func_8026ECF8.s @@ -0,0 +1,9 @@ +/* 8026ECF8 0026BC38 C0 02 B7 D0 */ lfs f0, lbl_804551D0-_SDA2_BASE_(r2) +/* 8026ECFC 0026BC3C D0 03 00 08 */ stfs f0, 8(r3) +/* 8026ED00 0026BC40 D0 03 00 04 */ stfs f0, 4(r3) +/* 8026ED04 0026BC44 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026ED08 0026BC48 C0 02 B7 D4 */ lfs f0, lbl_804551D4-_SDA2_BASE_(r2) +/* 8026ED0C 0026BC4C D0 03 00 14 */ stfs f0, 0x14(r3) +/* 8026ED10 0026BC50 D0 03 00 10 */ stfs f0, 0x10(r3) +/* 8026ED14 0026BC54 D0 03 00 0C */ stfs f0, 0xc(r3) +/* 8026ED18 0026BC58 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026ED1C.s b/include/SComponent/c_m3d_g_aab/asm/func_8026ED1C.s new file mode 100644 index 0000000000..ac37532cfb --- /dev/null +++ b/include/SComponent/c_m3d_g_aab/asm/func_8026ED1C.s @@ -0,0 +1,17 @@ +/* 8026ED1C 0026BC5C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026ED20 0026BC60 7C 08 02 A6 */ mflr r0 +/* 8026ED24 0026BC64 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026ED28 0026BC68 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026ED2C 0026BC6C 93 C1 00 08 */ stw r30, 8(r1) +/* 8026ED30 0026BC70 7C 7E 1B 78 */ mr r30, r3 +/* 8026ED34 0026BC74 7C 9F 23 78 */ mr r31, r4 +/* 8026ED38 0026BC78 48 00 00 6D */ bl SetMin__8cM3dGAabFRC4cXyz +/* 8026ED3C 0026BC7C 7F C3 F3 78 */ mr r3, r30 +/* 8026ED40 0026BC80 7F E4 FB 78 */ mr r4, r31 +/* 8026ED44 0026BC84 48 00 00 A1 */ bl SetMax__8cM3dGAabFRC4cXyz +/* 8026ED48 0026BC88 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026ED4C 0026BC8C 83 C1 00 08 */ lwz r30, 8(r1) +/* 8026ED50 0026BC90 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026ED54 0026BC94 7C 08 03 A6 */ mtlr r0 +/* 8026ED58 0026BC98 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026ED5C 0026BC9C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026ED60.s b/include/SComponent/c_m3d_g_aab/asm/func_8026ED60.s new file mode 100644 index 0000000000..4adb753e44 --- /dev/null +++ b/include/SComponent/c_m3d_g_aab/asm/func_8026ED60.s @@ -0,0 +1,17 @@ +/* 8026ED60 0026BCA0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026ED64 0026BCA4 7C 08 02 A6 */ mflr r0 +/* 8026ED68 0026BCA8 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026ED6C 0026BCAC 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026ED70 0026BCB0 93 C1 00 08 */ stw r30, 8(r1) +/* 8026ED74 0026BCB4 7C 7E 1B 78 */ mr r30, r3 +/* 8026ED78 0026BCB8 7C 9F 23 78 */ mr r31, r4 +/* 8026ED7C 0026BCBC 4B FF FF A1 */ bl SetMinMax__8cM3dGAabFRC4cXyz +/* 8026ED80 0026BCC0 7F C3 F3 78 */ mr r3, r30 +/* 8026ED84 0026BCC4 38 9F 00 0C */ addi r4, r31, 0xc +/* 8026ED88 0026BCC8 4B FF FF 95 */ bl SetMinMax__8cM3dGAabFRC4cXyz +/* 8026ED8C 0026BCCC 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026ED90 0026BCD0 83 C1 00 08 */ lwz r30, 8(r1) +/* 8026ED94 0026BCD4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026ED98 0026BCD8 7C 08 03 A6 */ mtlr r0 +/* 8026ED9C 0026BCDC 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026EDA0 0026BCE0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026EDA4.s b/include/SComponent/c_m3d_g_aab/asm/func_8026EDA4.s new file mode 100644 index 0000000000..2321c02b39 --- /dev/null +++ b/include/SComponent/c_m3d_g_aab/asm/func_8026EDA4.s @@ -0,0 +1,18 @@ +/* 8026EDA4 0026BCE4 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026EDA8 0026BCE8 C0 24 00 00 */ lfs f1, 0(r4) +/* 8026EDAC 0026BCEC FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026EDB0 0026BCF0 40 81 00 08 */ ble lbl_8026EDB8 +/* 8026EDB4 0026BCF4 D0 23 00 00 */ stfs f1, 0(r3) +lbl_8026EDB8: +/* 8026EDB8 0026BCF8 C0 03 00 04 */ lfs f0, 4(r3) +/* 8026EDBC 0026BCFC C0 24 00 04 */ lfs f1, 4(r4) +/* 8026EDC0 0026BD00 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026EDC4 0026BD04 40 81 00 08 */ ble lbl_8026EDCC +/* 8026EDC8 0026BD08 D0 23 00 04 */ stfs f1, 4(r3) +lbl_8026EDCC: +/* 8026EDCC 0026BD0C C0 03 00 08 */ lfs f0, 8(r3) +/* 8026EDD0 0026BD10 C0 24 00 08 */ lfs f1, 8(r4) +/* 8026EDD4 0026BD14 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026EDD8 0026BD18 4C 81 00 20 */ blelr +/* 8026EDDC 0026BD1C D0 23 00 08 */ stfs f1, 8(r3) +/* 8026EDE0 0026BD20 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026EDE4.s b/include/SComponent/c_m3d_g_aab/asm/func_8026EDE4.s new file mode 100644 index 0000000000..5512a1a5cf --- /dev/null +++ b/include/SComponent/c_m3d_g_aab/asm/func_8026EDE4.s @@ -0,0 +1,18 @@ +/* 8026EDE4 0026BD24 C0 03 00 0C */ lfs f0, 0xc(r3) +/* 8026EDE8 0026BD28 C0 24 00 00 */ lfs f1, 0(r4) +/* 8026EDEC 0026BD2C FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026EDF0 0026BD30 40 80 00 08 */ bge lbl_8026EDF8 +/* 8026EDF4 0026BD34 D0 23 00 0C */ stfs f1, 0xc(r3) +lbl_8026EDF8: +/* 8026EDF8 0026BD38 C0 03 00 10 */ lfs f0, 0x10(r3) +/* 8026EDFC 0026BD3C C0 24 00 04 */ lfs f1, 4(r4) +/* 8026EE00 0026BD40 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026EE04 0026BD44 40 80 00 08 */ bge lbl_8026EE0C +/* 8026EE08 0026BD48 D0 23 00 10 */ stfs f1, 0x10(r3) +lbl_8026EE0C: +/* 8026EE0C 0026BD4C C0 03 00 14 */ lfs f0, 0x14(r3) +/* 8026EE10 0026BD50 C0 24 00 08 */ lfs f1, 8(r4) +/* 8026EE14 0026BD54 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8026EE18 0026BD58 4C 80 00 20 */ bgelr +/* 8026EE1C 0026BD5C D0 23 00 14 */ stfs f1, 0x14(r3) +/* 8026EE20 0026BD60 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026EE24.s b/include/SComponent/c_m3d_g_aab/asm/func_8026EE24.s new file mode 100644 index 0000000000..f39caf94a3 --- /dev/null +++ b/include/SComponent/c_m3d_g_aab/asm/func_8026EE24.s @@ -0,0 +1,17 @@ +/* 8026EE24 0026BD64 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026EE28 0026BD68 7C 08 02 A6 */ mflr r0 +/* 8026EE2C 0026BD6C 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026EE30 0026BD70 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026EE34 0026BD74 7C 9F 23 78 */ mr r31, r4 +/* 8026EE38 0026BD78 38 83 00 0C */ addi r4, r3, 0xc +/* 8026EE3C 0026BD7C 7F E5 FB 78 */ mr r5, r31 +/* 8026EE40 0026BD80 48 0D 82 51 */ bl PSVECAdd +/* 8026EE44 0026BD84 7F E3 FB 78 */ mr r3, r31 +/* 8026EE48 0026BD88 7F E4 FB 78 */ mr r4, r31 +/* 8026EE4C 0026BD8C C0 22 B7 D8 */ lfs f1, lbl_804551D8-_SDA2_BASE_(r2) +/* 8026EE50 0026BD90 48 0D 82 89 */ bl PSVECScale +/* 8026EE54 0026BD94 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026EE58 0026BD98 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026EE5C 0026BD9C 7C 08 03 A6 */ mtlr r0 +/* 8026EE60 0026BDA0 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026EE64 0026BDA4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026EE68.s b/include/SComponent/c_m3d_g_aab/asm/func_8026EE68.s new file mode 100644 index 0000000000..89ffa194b8 --- /dev/null +++ b/include/SComponent/c_m3d_g_aab/asm/func_8026EE68.s @@ -0,0 +1,19 @@ +/* 8026EE68 0026BDA8 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026EE6C 0026BDAC EC 00 08 28 */ fsubs f0, f0, f1 +/* 8026EE70 0026BDB0 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026EE74 0026BDB4 C0 03 00 04 */ lfs f0, 4(r3) +/* 8026EE78 0026BDB8 EC 00 08 28 */ fsubs f0, f0, f1 +/* 8026EE7C 0026BDBC D0 03 00 04 */ stfs f0, 4(r3) +/* 8026EE80 0026BDC0 C0 03 00 08 */ lfs f0, 8(r3) +/* 8026EE84 0026BDC4 EC 00 08 28 */ fsubs f0, f0, f1 +/* 8026EE88 0026BDC8 D0 03 00 08 */ stfs f0, 8(r3) +/* 8026EE8C 0026BDCC C0 03 00 0C */ lfs f0, 0xc(r3) +/* 8026EE90 0026BDD0 EC 00 08 2A */ fadds f0, f0, f1 +/* 8026EE94 0026BDD4 D0 03 00 0C */ stfs f0, 0xc(r3) +/* 8026EE98 0026BDD8 C0 03 00 10 */ lfs f0, 0x10(r3) +/* 8026EE9C 0026BDDC EC 00 08 2A */ fadds f0, f0, f1 +/* 8026EEA0 0026BDE0 D0 03 00 10 */ stfs f0, 0x10(r3) +/* 8026EEA4 0026BDE4 C0 03 00 14 */ lfs f0, 0x14(r3) +/* 8026EEA8 0026BDE8 EC 00 08 2A */ fadds f0, f0, f1 +/* 8026EEAC 0026BDEC D0 03 00 14 */ stfs f0, 0x14(r3) +/* 8026EEB0 0026BDF0 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_cir.h b/include/SComponent/c_m3d_g_cir.h new file mode 100644 index 0000000000..8b0b2fa7b2 --- /dev/null +++ b/include/SComponent/c_m3d_g_cir.h @@ -0,0 +1,13 @@ +#ifndef __C_M3D_G_CIR_H_ +#define __C_M3D_G_CIR_H_ + +#include "global.h" + +class cM3dGCir { +public: + cM3dGCir(void); + ~cM3dGCir(void); + void Set(float, float, float, float); +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_cir/asm/func_8026EEB4.s b/include/SComponent/c_m3d_g_cir/asm/func_8026EEB4.s new file mode 100644 index 0000000000..9d92a3051f --- /dev/null +++ b/include/SComponent/c_m3d_g_cir/asm/func_8026EEB4.s @@ -0,0 +1,7 @@ +/* 8026EEB4 0026BDF4 3C 80 80 3C */ lis r4, lbl_803C3FEC@ha +/* 8026EEB8 0026BDF8 38 04 3F EC */ addi r0, r4, lbl_803C3FEC@l +/* 8026EEBC 0026BDFC 90 03 00 0C */ stw r0, 0xc(r3) +/* 8026EEC0 0026BE00 3C 80 80 3C */ lis r4, lbl_803C3FE0@ha +/* 8026EEC4 0026BE04 38 04 3F E0 */ addi r0, r4, lbl_803C3FE0@l +/* 8026EEC8 0026BE08 90 03 00 0C */ stw r0, 0xc(r3) +/* 8026EECC 0026BE0C 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_cir/asm/func_8026EED0.s b/include/SComponent/c_m3d_g_cir/asm/func_8026EED0.s new file mode 100644 index 0000000000..84637b9a49 --- /dev/null +++ b/include/SComponent/c_m3d_g_cir/asm/func_8026EED0.s @@ -0,0 +1,19 @@ +/* 8026EED0 0026BE10 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026EED4 0026BE14 7C 08 02 A6 */ mflr r0 +/* 8026EED8 0026BE18 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026EEDC 0026BE1C 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026EEE0 0026BE20 7C 7F 1B 79 */ or. r31, r3, r3 +/* 8026EEE4 0026BE24 41 82 00 1C */ beq lbl_8026EF00 +/* 8026EEE8 0026BE28 3C A0 80 3C */ lis r5, lbl_803C3FEC@ha +/* 8026EEEC 0026BE2C 38 05 3F EC */ addi r0, r5, lbl_803C3FEC@l +/* 8026EEF0 0026BE30 90 1F 00 0C */ stw r0, 0xc(r31) +/* 8026EEF4 0026BE34 7C 80 07 35 */ extsh. r0, r4 +/* 8026EEF8 0026BE38 40 81 00 08 */ ble lbl_8026EF00 +/* 8026EEFC 0026BE3C 48 05 FE 41 */ bl __dl__FPv +lbl_8026EF00: +/* 8026EF00 0026BE40 7F E3 FB 78 */ mr r3, r31 +/* 8026EF04 0026BE44 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026EF08 0026BE48 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026EF0C 0026BE4C 7C 08 03 A6 */ mtlr r0 +/* 8026EF10 0026BE50 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026EF14 0026BE54 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cir/asm/func_8026EF18.s b/include/SComponent/c_m3d_g_cir/asm/func_8026EF18.s new file mode 100644 index 0000000000..3040f4fc5c --- /dev/null +++ b/include/SComponent/c_m3d_g_cir/asm/func_8026EF18.s @@ -0,0 +1,25 @@ +/* 8026EF18 0026BE58 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026EF1C 0026BE5C 7C 08 02 A6 */ mflr r0 +/* 8026EF20 0026BE60 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026EF24 0026BE64 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026EF28 0026BE68 7C 7F 1B 79 */ or. r31, r3, r3 +/* 8026EF2C 0026BE6C 41 82 00 30 */ beq lbl_8026EF5C +/* 8026EF30 0026BE70 3C 60 80 3C */ lis r3, lbl_803C3FE0@ha +/* 8026EF34 0026BE74 38 03 3F E0 */ addi r0, r3, lbl_803C3FE0@l +/* 8026EF38 0026BE78 90 1F 00 0C */ stw r0, 0xc(r31) +/* 8026EF3C 0026BE7C 41 82 00 10 */ beq lbl_8026EF4C +/* 8026EF40 0026BE80 3C 60 80 3C */ lis r3, lbl_803C3FEC@ha +/* 8026EF44 0026BE84 38 03 3F EC */ addi r0, r3, lbl_803C3FEC@l +/* 8026EF48 0026BE88 90 1F 00 0C */ stw r0, 0xc(r31) +lbl_8026EF4C: +/* 8026EF4C 0026BE8C 7C 80 07 35 */ extsh. r0, r4 +/* 8026EF50 0026BE90 40 81 00 0C */ ble lbl_8026EF5C +/* 8026EF54 0026BE94 7F E3 FB 78 */ mr r3, r31 +/* 8026EF58 0026BE98 48 05 FD E5 */ bl __dl__FPv +lbl_8026EF5C: +/* 8026EF5C 0026BE9C 7F E3 FB 78 */ mr r3, r31 +/* 8026EF60 0026BEA0 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026EF64 0026BEA4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026EF68 0026BEA8 7C 08 03 A6 */ mtlr r0 +/* 8026EF6C 0026BEAC 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026EF70 0026BEB0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cir/asm/func_8026EF74.s b/include/SComponent/c_m3d_g_cir/asm/func_8026EF74.s new file mode 100644 index 0000000000..0c13de6465 --- /dev/null +++ b/include/SComponent/c_m3d_g_cir/asm/func_8026EF74.s @@ -0,0 +1,5 @@ +/* 8026EF74 0026BEB4 D0 23 00 00 */ stfs f1, 0(r3) +/* 8026EF78 0026BEB8 D0 43 00 04 */ stfs f2, 4(r3) +/* 8026EF7C 0026BEBC D0 83 00 08 */ stfs f4, 8(r3) +/* 8026EF80 0026BEC0 D0 63 00 10 */ stfs f3, 0x10(r3) +/* 8026EF84 0026BEC4 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_cps.h b/include/SComponent/c_m3d_g_cps.h new file mode 100644 index 0000000000..f7c6070e26 --- /dev/null +++ b/include/SComponent/c_m3d_g_cps.h @@ -0,0 +1,18 @@ +#ifndef __C_M3D_G_CPS_H_ +#define __C_M3D_G_CPS_H_ + +#include "SComponent/c_xyz.h" +#include "global.h" + +struct cM3dGCpsS; + +class cM3dGCps { +public: + cM3dGCps(void); + ~cM3dGCps(void); + void Set(const cXyz&, const cXyz&, float); + void Set(const cM3dGCpsS&); + void SetCps(const cM3dGCps&); +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_cps/asm/func_8026EF88.s b/include/SComponent/c_m3d_g_cps/asm/func_8026EF88.s new file mode 100644 index 0000000000..6b9c26293f --- /dev/null +++ b/include/SComponent/c_m3d_g_cps/asm/func_8026EF88.s @@ -0,0 +1,7 @@ +/* 8026EF88 0026BEC8 3C 80 80 3A */ lis r4, lbl_803A78F8@ha +/* 8026EF8C 0026BECC 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l +/* 8026EF90 0026BED0 90 03 00 18 */ stw r0, 0x18(r3) +/* 8026EF94 0026BED4 3C 80 80 3C */ lis r4, lbl_803C3FF8@ha +/* 8026EF98 0026BED8 38 04 3F F8 */ addi r0, r4, lbl_803C3FF8@l +/* 8026EF9C 0026BEDC 90 03 00 18 */ stw r0, 0x18(r3) +/* 8026EFA0 0026BEE0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cps/asm/func_8026EFA4.s b/include/SComponent/c_m3d_g_cps/asm/func_8026EFA4.s new file mode 100644 index 0000000000..f53c18b425 --- /dev/null +++ b/include/SComponent/c_m3d_g_cps/asm/func_8026EFA4.s @@ -0,0 +1,25 @@ +/* 8026EFA4 0026BEE4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026EFA8 0026BEE8 7C 08 02 A6 */ mflr r0 +/* 8026EFAC 0026BEEC 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026EFB0 0026BEF0 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026EFB4 0026BEF4 7C 7F 1B 79 */ or. r31, r3, r3 +/* 8026EFB8 0026BEF8 41 82 00 30 */ beq lbl_8026EFE8 +/* 8026EFBC 0026BEFC 3C 60 80 3C */ lis r3, lbl_803C3FF8@ha +/* 8026EFC0 0026BF00 38 03 3F F8 */ addi r0, r3, lbl_803C3FF8@l +/* 8026EFC4 0026BF04 90 1F 00 18 */ stw r0, 0x18(r31) +/* 8026EFC8 0026BF08 41 82 00 10 */ beq lbl_8026EFD8 +/* 8026EFCC 0026BF0C 3C 60 80 3A */ lis r3, lbl_803A78F8@ha +/* 8026EFD0 0026BF10 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l +/* 8026EFD4 0026BF14 90 1F 00 18 */ stw r0, 0x18(r31) +lbl_8026EFD8: +/* 8026EFD8 0026BF18 7C 80 07 35 */ extsh. r0, r4 +/* 8026EFDC 0026BF1C 40 81 00 0C */ ble lbl_8026EFE8 +/* 8026EFE0 0026BF20 7F E3 FB 78 */ mr r3, r31 +/* 8026EFE4 0026BF24 48 05 FD 59 */ bl __dl__FPv +lbl_8026EFE8: +/* 8026EFE8 0026BF28 7F E3 FB 78 */ mr r3, r31 +/* 8026EFEC 0026BF2C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026EFF0 0026BF30 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026EFF4 0026BF34 7C 08 03 A6 */ mtlr r0 +/* 8026EFF8 0026BF38 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026EFFC 0026BF3C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cps/asm/func_8026F000.s b/include/SComponent/c_m3d_g_cps/asm/func_8026F000.s new file mode 100644 index 0000000000..05af2d1d60 --- /dev/null +++ b/include/SComponent/c_m3d_g_cps/asm/func_8026F000.s @@ -0,0 +1,15 @@ +/* 8026F000 0026BF40 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026F004 0026BF44 7C 08 02 A6 */ mflr r0 +/* 8026F008 0026BF48 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026F00C 0026BF4C DB E1 00 18 */ stfd f31, 0x18(r1) +/* 8026F010 0026BF50 93 E1 00 14 */ stw r31, 0x14(r1) +/* 8026F014 0026BF54 7C 7F 1B 78 */ mr r31, r3 +/* 8026F018 0026BF58 FF E0 08 90 */ fmr f31, f1 +/* 8026F01C 0026BF5C 48 00 02 CD */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz +/* 8026F020 0026BF60 D3 FF 00 1C */ stfs f31, 0x1c(r31) +/* 8026F024 0026BF64 CB E1 00 18 */ lfd f31, 0x18(r1) +/* 8026F028 0026BF68 83 E1 00 14 */ lwz r31, 0x14(r1) +/* 8026F02C 0026BF6C 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026F030 0026BF70 7C 08 03 A6 */ mtlr r0 +/* 8026F034 0026BF74 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026F038 0026BF78 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cps/asm/func_8026F03C.s b/include/SComponent/c_m3d_g_cps/asm/func_8026F03C.s new file mode 100644 index 0000000000..870817332e --- /dev/null +++ b/include/SComponent/c_m3d_g_cps/asm/func_8026F03C.s @@ -0,0 +1,17 @@ +/* 8026F03C 0026BF7C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F040 0026BF80 7C 08 02 A6 */ mflr r0 +/* 8026F044 0026BF84 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F048 0026BF88 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026F04C 0026BF8C 93 C1 00 08 */ stw r30, 8(r1) +/* 8026F050 0026BF90 7C 7E 1B 78 */ mr r30, r3 +/* 8026F054 0026BF94 7C 9F 23 78 */ mr r31, r4 +/* 8026F058 0026BF98 38 BF 00 0C */ addi r5, r31, 0xc +/* 8026F05C 0026BF9C 48 00 02 C1 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec +/* 8026F060 0026BFA0 C0 1F 00 18 */ lfs f0, 0x18(r31) +/* 8026F064 0026BFA4 D0 1E 00 1C */ stfs f0, 0x1c(r30) +/* 8026F068 0026BFA8 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026F06C 0026BFAC 83 C1 00 08 */ lwz r30, 8(r1) +/* 8026F070 0026BFB0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F074 0026BFB4 7C 08 03 A6 */ mtlr r0 +/* 8026F078 0026BFB8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F07C 0026BFBC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cps/asm/func_8026F080.s b/include/SComponent/c_m3d_g_cps/asm/func_8026F080.s new file mode 100644 index 0000000000..ab6cc845ae --- /dev/null +++ b/include/SComponent/c_m3d_g_cps/asm/func_8026F080.s @@ -0,0 +1,10 @@ +/* 8026F080 0026BFC0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F084 0026BFC4 7C 08 02 A6 */ mflr r0 +/* 8026F088 0026BFC8 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F08C 0026BFCC 38 A4 00 0C */ addi r5, r4, 0xc +/* 8026F090 0026BFD0 C0 24 00 1C */ lfs f1, 0x1c(r4) +/* 8026F094 0026BFD4 4B FF FF 6D */ bl Set__8cM3dGCpsFRC4cXyzRC4cXyzf +/* 8026F098 0026BFD8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F09C 0026BFDC 7C 08 03 A6 */ mtlr r0 +/* 8026F0A0 0026BFE0 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F0A4 0026BFE4 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_cyl.h b/include/SComponent/c_m3d_g_cyl.h new file mode 100644 index 0000000000..bcf7e25149 --- /dev/null +++ b/include/SComponent/c_m3d_g_cyl.h @@ -0,0 +1,23 @@ +#ifndef __C_M3D_G_CYL_H_ +#define __C_M3D_G_CYL_H_ + +#include "SComponent/c_xyz.h" +#include "global.h" + +struct cM3dGCylS; +struct cM3dGSph; + +class cM3dGCyl { +public: + cM3dGCyl(const cXyz*, float, float); + void Set(const cM3dGCylS&); + void Set(const cXyz&, float, float); + void SetC(const cXyz&); + void SetH(float); + void SetR(float); + bool cross(const cM3dGSph*, cXyz*) const; + bool cross(const cM3dGCyl*, cXyz*) const; + void calcMinMax(cXyz*, cXyz*); +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F0A8.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F0A8.s new file mode 100644 index 0000000000..6299d39be5 --- /dev/null +++ b/include/SComponent/c_m3d_g_cyl/asm/func_8026F0A8.s @@ -0,0 +1,27 @@ +/* 8026F0A8 0026BFE8 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026F0AC 0026BFEC 7C 08 02 A6 */ mflr r0 +/* 8026F0B0 0026BFF0 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026F0B4 0026BFF4 DB E1 00 18 */ stfd f31, 0x18(r1) +/* 8026F0B8 0026BFF8 DB C1 00 10 */ stfd f30, 0x10(r1) +/* 8026F0BC 0026BFFC 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026F0C0 0026C000 7C 7F 1B 78 */ mr r31, r3 +/* 8026F0C4 0026C004 FF C0 08 90 */ fmr f30, f1 +/* 8026F0C8 0026C008 FF E0 10 90 */ fmr f31, f2 +/* 8026F0CC 0026C00C 3C A0 80 3A */ lis r5, lbl_803A720C@ha +/* 8026F0D0 0026C010 38 05 72 0C */ addi r0, r5, lbl_803A720C@l +/* 8026F0D4 0026C014 90 03 00 14 */ stw r0, 0x14(r3) +/* 8026F0D8 0026C018 48 00 01 05 */ bl SetC__8cM3dGCylFRC4cXyz +/* 8026F0DC 0026C01C 7F E3 FB 78 */ mr r3, r31 +/* 8026F0E0 0026C020 FC 20 F0 90 */ fmr f1, f30 +/* 8026F0E4 0026C024 48 00 01 1D */ bl SetR__8cM3dGCylFf +/* 8026F0E8 0026C028 7F E3 FB 78 */ mr r3, r31 +/* 8026F0EC 0026C02C FC 20 F8 90 */ fmr f1, f31 +/* 8026F0F0 0026C030 48 00 01 09 */ bl SetH__8cM3dGCylFf +/* 8026F0F4 0026C034 7F E3 FB 78 */ mr r3, r31 +/* 8026F0F8 0026C038 CB E1 00 18 */ lfd f31, 0x18(r1) +/* 8026F0FC 0026C03C CB C1 00 10 */ lfd f30, 0x10(r1) +/* 8026F100 0026C040 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026F104 0026C044 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026F108 0026C048 7C 08 03 A6 */ mtlr r0 +/* 8026F10C 0026C04C 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026F110 0026C050 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F114.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F114.s new file mode 100644 index 0000000000..8d3593573a --- /dev/null +++ b/include/SComponent/c_m3d_g_cyl/asm/func_8026F114.s @@ -0,0 +1,27 @@ +/* 8026F114 0026C054 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026F118 0026C058 7C 08 02 A6 */ mflr r0 +/* 8026F11C 0026C05C 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026F120 0026C060 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8026F124 0026C064 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8026F128 0026C068 7C 7E 1B 78 */ mr r30, r3 +/* 8026F12C 0026C06C 7C 9F 23 78 */ mr r31, r4 +/* 8026F130 0026C070 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F134 0026C074 D0 01 00 08 */ stfs f0, 8(r1) +/* 8026F138 0026C078 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F13C 0026C07C D0 01 00 0C */ stfs f0, 0xc(r1) +/* 8026F140 0026C080 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F144 0026C084 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 8026F148 0026C088 38 81 00 08 */ addi r4, r1, 8 +/* 8026F14C 0026C08C 48 00 00 91 */ bl SetC__8cM3dGCylFRC4cXyz +/* 8026F150 0026C090 7F C3 F3 78 */ mr r3, r30 +/* 8026F154 0026C094 C0 3F 00 0C */ lfs f1, 0xc(r31) +/* 8026F158 0026C098 48 00 00 A9 */ bl SetR__8cM3dGCylFf +/* 8026F15C 0026C09C 7F C3 F3 78 */ mr r3, r30 +/* 8026F160 0026C0A0 C0 3F 00 10 */ lfs f1, 0x10(r31) +/* 8026F164 0026C0A4 48 00 00 95 */ bl SetH__8cM3dGCylFf +/* 8026F168 0026C0A8 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026F16C 0026C0AC 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8026F170 0026C0B0 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026F174 0026C0B4 7C 08 03 A6 */ mtlr r0 +/* 8026F178 0026C0B8 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026F17C 0026C0BC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F180.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F180.s new file mode 100644 index 0000000000..df41ea289e --- /dev/null +++ b/include/SComponent/c_m3d_g_cyl/asm/func_8026F180.s @@ -0,0 +1,23 @@ +/* 8026F180 0026C0C0 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026F184 0026C0C4 7C 08 02 A6 */ mflr r0 +/* 8026F188 0026C0C8 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026F18C 0026C0CC DB E1 00 18 */ stfd f31, 0x18(r1) +/* 8026F190 0026C0D0 DB C1 00 10 */ stfd f30, 0x10(r1) +/* 8026F194 0026C0D4 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026F198 0026C0D8 7C 7F 1B 78 */ mr r31, r3 +/* 8026F19C 0026C0DC FF C0 08 90 */ fmr f30, f1 +/* 8026F1A0 0026C0E0 FF E0 10 90 */ fmr f31, f2 +/* 8026F1A4 0026C0E4 48 00 00 39 */ bl SetC__8cM3dGCylFRC4cXyz +/* 8026F1A8 0026C0E8 7F E3 FB 78 */ mr r3, r31 +/* 8026F1AC 0026C0EC FC 20 F0 90 */ fmr f1, f30 +/* 8026F1B0 0026C0F0 48 00 00 51 */ bl SetR__8cM3dGCylFf +/* 8026F1B4 0026C0F4 7F E3 FB 78 */ mr r3, r31 +/* 8026F1B8 0026C0F8 FC 20 F8 90 */ fmr f1, f31 +/* 8026F1BC 0026C0FC 48 00 00 3D */ bl SetH__8cM3dGCylFf +/* 8026F1C0 0026C100 CB E1 00 18 */ lfd f31, 0x18(r1) +/* 8026F1C4 0026C104 CB C1 00 10 */ lfd f30, 0x10(r1) +/* 8026F1C8 0026C108 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026F1CC 0026C10C 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026F1D0 0026C110 7C 08 03 A6 */ mtlr r0 +/* 8026F1D4 0026C114 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026F1D8 0026C118 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F1DC.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F1DC.s new file mode 100644 index 0000000000..990e8af2d7 --- /dev/null +++ b/include/SComponent/c_m3d_g_cyl/asm/func_8026F1DC.s @@ -0,0 +1,7 @@ +/* 8026F1DC 0026C11C C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F1E0 0026C120 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026F1E4 0026C124 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F1E8 0026C128 D0 03 00 04 */ stfs f0, 4(r3) +/* 8026F1EC 0026C12C C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F1F0 0026C130 D0 03 00 08 */ stfs f0, 8(r3) +/* 8026F1F4 0026C134 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F1F8.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F1F8.s new file mode 100644 index 0000000000..16de3d7eed --- /dev/null +++ b/include/SComponent/c_m3d_g_cyl/asm/func_8026F1F8.s @@ -0,0 +1,2 @@ +/* 8026F1F8 0026C138 D0 23 00 10 */ stfs f1, 0x10(r3) +/* 8026F1FC 0026C13C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F200.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F200.s new file mode 100644 index 0000000000..de03746cb8 --- /dev/null +++ b/include/SComponent/c_m3d_g_cyl/asm/func_8026F200.s @@ -0,0 +1,2 @@ +/* 8026F200 0026C140 D0 23 00 0C */ stfs f1, 0xc(r3) +/* 8026F204 0026C144 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F208.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F208.s new file mode 100644 index 0000000000..4b0d1fbbaf --- /dev/null +++ b/include/SComponent/c_m3d_g_cyl/asm/func_8026F208.s @@ -0,0 +1,9 @@ +/* 8026F208 0026C148 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F20C 0026C14C 7C 08 02 A6 */ mflr r0 +/* 8026F210 0026C150 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F214 0026C154 38 C1 00 08 */ addi r6, r1, 8 +/* 8026F218 0026C158 4B FF C8 31 */ bl cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf +/* 8026F21C 0026C15C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F220 0026C160 7C 08 03 A6 */ mtlr r0 +/* 8026F224 0026C164 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F228 0026C168 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F22C.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F22C.s new file mode 100644 index 0000000000..f57e724af5 --- /dev/null +++ b/include/SComponent/c_m3d_g_cyl/asm/func_8026F22C.s @@ -0,0 +1,8 @@ +/* 8026F22C 0026C16C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F230 0026C170 7C 08 02 A6 */ mflr r0 +/* 8026F234 0026C174 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F238 0026C178 4B FF D1 7D */ bl cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylP3Vec +/* 8026F23C 0026C17C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F240 0026C180 7C 08 03 A6 */ mtlr r0 +/* 8026F244 0026C184 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F248 0026C188 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F24C.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F24C.s new file mode 100644 index 0000000000..b800454404 --- /dev/null +++ b/include/SComponent/c_m3d_g_cyl/asm/func_8026F24C.s @@ -0,0 +1,23 @@ +/* 8026F24C 0026C18C C0 23 00 00 */ lfs f1, 0(r3) +/* 8026F250 0026C190 C0 03 00 0C */ lfs f0, 0xc(r3) +/* 8026F254 0026C194 EC 01 00 28 */ fsubs f0, f1, f0 +/* 8026F258 0026C198 D0 04 00 00 */ stfs f0, 0(r4) +/* 8026F25C 0026C19C C0 03 00 04 */ lfs f0, 4(r3) +/* 8026F260 0026C1A0 D0 04 00 04 */ stfs f0, 4(r4) +/* 8026F264 0026C1A4 C0 23 00 08 */ lfs f1, 8(r3) +/* 8026F268 0026C1A8 C0 03 00 0C */ lfs f0, 0xc(r3) +/* 8026F26C 0026C1AC EC 01 00 28 */ fsubs f0, f1, f0 +/* 8026F270 0026C1B0 D0 04 00 08 */ stfs f0, 8(r4) +/* 8026F274 0026C1B4 C0 23 00 00 */ lfs f1, 0(r3) +/* 8026F278 0026C1B8 C0 03 00 0C */ lfs f0, 0xc(r3) +/* 8026F27C 0026C1BC EC 01 00 2A */ fadds f0, f1, f0 +/* 8026F280 0026C1C0 D0 05 00 00 */ stfs f0, 0(r5) +/* 8026F284 0026C1C4 C0 23 00 04 */ lfs f1, 4(r3) +/* 8026F288 0026C1C8 C0 03 00 10 */ lfs f0, 0x10(r3) +/* 8026F28C 0026C1CC EC 01 00 2A */ fadds f0, f1, f0 +/* 8026F290 0026C1D0 D0 05 00 04 */ stfs f0, 4(r5) +/* 8026F294 0026C1D4 C0 23 00 08 */ lfs f1, 8(r3) +/* 8026F298 0026C1D8 C0 03 00 0C */ lfs f0, 0xc(r3) +/* 8026F29C 0026C1DC EC 01 00 2A */ fadds f0, f1, f0 +/* 8026F2A0 0026C1E0 D0 05 00 08 */ stfs f0, 8(r5) +/* 8026F2A4 0026C1E4 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_lin.h b/include/SComponent/c_m3d_g_lin.h new file mode 100644 index 0000000000..830a1b7fd4 --- /dev/null +++ b/include/SComponent/c_m3d_g_lin.h @@ -0,0 +1,16 @@ +#ifndef __C_M3D_G_LIN_H_ +#define __C_M3D_G_LIN_H_ + +#include "SComponent/c_xyz.h" +#include "global.h" + +class cM3dGLin { +public: + cM3dGLin(const cXyz&, const cXyz&); + void SetStartEnd(const cXyz&, const cXyz&); + void SetStartEnd(const Vec&, const Vec&); + void CalcPos(Vec*, float) const; + void SetEnd(const cXyz&); +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_lin/asm/func_8026F2A8.s b/include/SComponent/c_m3d_g_lin/asm/func_8026F2A8.s new file mode 100644 index 0000000000..5cd73c667f --- /dev/null +++ b/include/SComponent/c_m3d_g_lin/asm/func_8026F2A8.s @@ -0,0 +1,16 @@ +/* 8026F2A8 0026C1E8 3C C0 80 3A */ lis r6, lbl_803A78F8@ha +/* 8026F2AC 0026C1EC 38 06 78 F8 */ addi r0, r6, lbl_803A78F8@l +/* 8026F2B0 0026C1F0 90 03 00 18 */ stw r0, 0x18(r3) +/* 8026F2B4 0026C1F4 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F2B8 0026C1F8 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026F2BC 0026C1FC C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F2C0 0026C200 D0 03 00 04 */ stfs f0, 4(r3) +/* 8026F2C4 0026C204 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F2C8 0026C208 D0 03 00 08 */ stfs f0, 8(r3) +/* 8026F2CC 0026C20C C0 05 00 00 */ lfs f0, 0(r5) +/* 8026F2D0 0026C210 D0 03 00 0C */ stfs f0, 0xc(r3) +/* 8026F2D4 0026C214 C0 05 00 04 */ lfs f0, 4(r5) +/* 8026F2D8 0026C218 D0 03 00 10 */ stfs f0, 0x10(r3) +/* 8026F2DC 0026C21C C0 05 00 08 */ lfs f0, 8(r5) +/* 8026F2E0 0026C220 D0 03 00 14 */ stfs f0, 0x14(r3) +/* 8026F2E4 0026C224 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_lin/asm/func_8026F2E8.s b/include/SComponent/c_m3d_g_lin/asm/func_8026F2E8.s new file mode 100644 index 0000000000..2406f3ebdd --- /dev/null +++ b/include/SComponent/c_m3d_g_lin/asm/func_8026F2E8.s @@ -0,0 +1,13 @@ +/* 8026F2E8 0026C228 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F2EC 0026C22C D0 03 00 00 */ stfs f0, 0(r3) +/* 8026F2F0 0026C230 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F2F4 0026C234 D0 03 00 04 */ stfs f0, 4(r3) +/* 8026F2F8 0026C238 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F2FC 0026C23C D0 03 00 08 */ stfs f0, 8(r3) +/* 8026F300 0026C240 C0 05 00 00 */ lfs f0, 0(r5) +/* 8026F304 0026C244 D0 03 00 0C */ stfs f0, 0xc(r3) +/* 8026F308 0026C248 C0 05 00 04 */ lfs f0, 4(r5) +/* 8026F30C 0026C24C D0 03 00 10 */ stfs f0, 0x10(r3) +/* 8026F310 0026C250 C0 05 00 08 */ lfs f0, 8(r5) +/* 8026F314 0026C254 D0 03 00 14 */ stfs f0, 0x14(r3) +/* 8026F318 0026C258 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_lin/asm/func_8026F31C.s b/include/SComponent/c_m3d_g_lin/asm/func_8026F31C.s new file mode 100644 index 0000000000..d3a8ef59b8 --- /dev/null +++ b/include/SComponent/c_m3d_g_lin/asm/func_8026F31C.s @@ -0,0 +1,13 @@ +/* 8026F31C 0026C25C C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F320 0026C260 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026F324 0026C264 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F328 0026C268 D0 03 00 04 */ stfs f0, 4(r3) +/* 8026F32C 0026C26C C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F330 0026C270 D0 03 00 08 */ stfs f0, 8(r3) +/* 8026F334 0026C274 C0 05 00 00 */ lfs f0, 0(r5) +/* 8026F338 0026C278 D0 03 00 0C */ stfs f0, 0xc(r3) +/* 8026F33C 0026C27C C0 05 00 04 */ lfs f0, 4(r5) +/* 8026F340 0026C280 D0 03 00 10 */ stfs f0, 0x10(r3) +/* 8026F344 0026C284 C0 05 00 08 */ lfs f0, 8(r5) +/* 8026F348 0026C288 D0 03 00 14 */ stfs f0, 0x14(r3) +/* 8026F34C 0026C28C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_lin/asm/func_8026F350.s b/include/SComponent/c_m3d_g_lin/asm/func_8026F350.s new file mode 100644 index 0000000000..9dc6d718a5 --- /dev/null +++ b/include/SComponent/c_m3d_g_lin/asm/func_8026F350.s @@ -0,0 +1,28 @@ +/* 8026F350 0026C290 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026F354 0026C294 7C 08 02 A6 */ mflr r0 +/* 8026F358 0026C298 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026F35C 0026C29C DB E1 00 28 */ stfd f31, 0x28(r1) +/* 8026F360 0026C2A0 93 E1 00 24 */ stw r31, 0x24(r1) +/* 8026F364 0026C2A4 93 C1 00 20 */ stw r30, 0x20(r1) +/* 8026F368 0026C2A8 7C 7E 1B 78 */ mr r30, r3 +/* 8026F36C 0026C2AC 7C 9F 23 78 */ mr r31, r4 +/* 8026F370 0026C2B0 FF E0 08 90 */ fmr f31, f1 +/* 8026F374 0026C2B4 38 7E 00 0C */ addi r3, r30, 0xc +/* 8026F378 0026C2B8 7F C4 F3 78 */ mr r4, r30 +/* 8026F37C 0026C2BC 38 A1 00 08 */ addi r5, r1, 8 +/* 8026F380 0026C2C0 48 0D 7D 35 */ bl PSVECSubtract +/* 8026F384 0026C2C4 38 61 00 08 */ addi r3, r1, 8 +/* 8026F388 0026C2C8 7C 64 1B 78 */ mr r4, r3 +/* 8026F38C 0026C2CC FC 20 F8 90 */ fmr f1, f31 +/* 8026F390 0026C2D0 48 0D 7D 49 */ bl PSVECScale +/* 8026F394 0026C2D4 38 61 00 08 */ addi r3, r1, 8 +/* 8026F398 0026C2D8 7F C4 F3 78 */ mr r4, r30 +/* 8026F39C 0026C2DC 7F E5 FB 78 */ mr r5, r31 +/* 8026F3A0 0026C2E0 48 0D 7C F1 */ bl PSVECAdd +/* 8026F3A4 0026C2E4 CB E1 00 28 */ lfd f31, 0x28(r1) +/* 8026F3A8 0026C2E8 83 E1 00 24 */ lwz r31, 0x24(r1) +/* 8026F3AC 0026C2EC 83 C1 00 20 */ lwz r30, 0x20(r1) +/* 8026F3B0 0026C2F0 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026F3B4 0026C2F4 7C 08 03 A6 */ mtlr r0 +/* 8026F3B8 0026C2F8 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026F3BC 0026C2FC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_lin/asm/func_8026F3C0.s b/include/SComponent/c_m3d_g_lin/asm/func_8026F3C0.s new file mode 100644 index 0000000000..f16f3bd6e5 --- /dev/null +++ b/include/SComponent/c_m3d_g_lin/asm/func_8026F3C0.s @@ -0,0 +1,7 @@ +/* 8026F3C0 0026C300 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F3C4 0026C304 D0 03 00 0C */ stfs f0, 0xc(r3) +/* 8026F3C8 0026C308 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F3CC 0026C30C D0 03 00 10 */ stfs f0, 0x10(r3) +/* 8026F3D0 0026C310 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F3D4 0026C314 D0 03 00 14 */ stfs f0, 0x14(r3) +/* 8026F3D8 0026C318 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_pla.h b/include/SComponent/c_m3d_g_pla.h new file mode 100644 index 0000000000..865080aff3 --- /dev/null +++ b/include/SComponent/c_m3d_g_pla.h @@ -0,0 +1,18 @@ +#ifndef __C_M3C_G_PLA_H_ +#define __C_M3C_G_PLA_H_ + +#include "SComponent/c_xyz.h" +#include "global.h" + +class cM3dGPla { +public: + cM3dGPla(const cXyz*, float); + void crossInfLin(const cXyz&, const cXyz&, cXyz&) const; + void SetupNP0(const Vec&, const Vec&); + void SetupNP(const Vec&, const Vec&); + bool getCrossY(const cXyz&, float*) const; + bool getCrossYLessD(const Vec&, float*) const; + void Set(const cM3dGPla*); +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F3DC.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F3DC.s new file mode 100644 index 0000000000..ddbce712ac --- /dev/null +++ b/include/SComponent/c_m3d_g_pla/asm/func_8026F3DC.s @@ -0,0 +1,11 @@ +/* 8026F3DC 0026C31C 3C A0 80 3A */ lis r5, lbl_803A37C0@ha +/* 8026F3E0 0026C320 38 05 37 C0 */ addi r0, r5, lbl_803A37C0@l +/* 8026F3E4 0026C324 90 03 00 10 */ stw r0, 0x10(r3) +/* 8026F3E8 0026C328 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F3EC 0026C32C D0 03 00 00 */ stfs f0, 0(r3) +/* 8026F3F0 0026C330 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F3F4 0026C334 D0 03 00 04 */ stfs f0, 4(r3) +/* 8026F3F8 0026C338 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F3FC 0026C33C D0 03 00 08 */ stfs f0, 8(r3) +/* 8026F400 0026C340 D0 23 00 0C */ stfs f1, 0xc(r3) +/* 8026F404 0026C344 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F408.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F408.s new file mode 100644 index 0000000000..6b96452223 --- /dev/null +++ b/include/SComponent/c_m3d_g_pla/asm/func_8026F408.s @@ -0,0 +1,49 @@ +/* 8026F408 0026C348 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8026F40C 0026C34C 7C 08 02 A6 */ mflr r0 +/* 8026F410 0026C350 90 01 00 34 */ stw r0, 0x34(r1) +/* 8026F414 0026C354 DB E1 00 20 */ stfd f31, 0x20(r1) +/* 8026F418 0026C358 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 +/* 8026F41C 0026C35C 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026F420 0026C360 48 0F 2D B9 */ bl _savegpr_28 +/* 8026F424 0026C364 7C 7C 1B 78 */ mr r28, r3 +/* 8026F428 0026C368 7C 9D 23 78 */ mr r29, r4 +/* 8026F42C 0026C36C 7C BE 2B 78 */ mr r30, r5 +/* 8026F430 0026C370 7C DF 33 78 */ mr r31, r6 +/* 8026F434 0026C374 48 0D 7D 61 */ bl PSVECDotProduct +/* 8026F438 0026C378 C0 1C 00 0C */ lfs f0, 0xc(r28) +/* 8026F43C 0026C37C EF E0 08 2A */ fadds f31, f0, f1 +/* 8026F440 0026C380 7F 83 E3 78 */ mr r3, r28 +/* 8026F444 0026C384 7F C4 F3 78 */ mr r4, r30 +/* 8026F448 0026C388 48 0D 7D 4D */ bl PSVECDotProduct +/* 8026F44C 0026C38C C0 1C 00 0C */ lfs f0, 0xc(r28) +/* 8026F450 0026C390 EC 00 08 2A */ fadds f0, f0, f1 +/* 8026F454 0026C394 EC 5F 00 28 */ fsubs f2, f31, f0 +/* 8026F458 0026C398 FC 00 12 10 */ fabs f0, f2 +/* 8026F45C 0026C39C FC 20 00 18 */ frsp f1, f0 +/* 8026F460 0026C3A0 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026F464 0026C3A4 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026F468 0026C3A8 40 80 00 24 */ bge lbl_8026F48C +/* 8026F46C 0026C3AC C0 1E 00 00 */ lfs f0, 0(r30) +/* 8026F470 0026C3B0 D0 1F 00 00 */ stfs f0, 0(r31) +/* 8026F474 0026C3B4 C0 1E 00 04 */ lfs f0, 4(r30) +/* 8026F478 0026C3B8 D0 1F 00 04 */ stfs f0, 4(r31) +/* 8026F47C 0026C3BC C0 1E 00 08 */ lfs f0, 8(r30) +/* 8026F480 0026C3C0 D0 1F 00 08 */ stfs f0, 8(r31) +/* 8026F484 0026C3C4 38 60 00 00 */ li r3, 0 +/* 8026F488 0026C3C8 48 00 00 1C */ b lbl_8026F4A4 +lbl_8026F48C: +/* 8026F48C 0026C3CC 7F A3 EB 78 */ mr r3, r29 +/* 8026F490 0026C3D0 7F C4 F3 78 */ mr r4, r30 +/* 8026F494 0026C3D4 EC 3F 10 24 */ fdivs f1, f31, f2 +/* 8026F498 0026C3D8 7F E5 FB 78 */ mr r5, r31 +/* 8026F49C 0026C3DC 4B FF 91 15 */ bl cM3d_InDivPos2__FPC3VecPC3VecfP3Vec +/* 8026F4A0 0026C3E0 38 60 00 01 */ li r3, 1 +lbl_8026F4A4: +/* 8026F4A4 0026C3E4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 +/* 8026F4A8 0026C3E8 CB E1 00 20 */ lfd f31, 0x20(r1) +/* 8026F4AC 0026C3EC 39 61 00 20 */ addi r11, r1, 0x20 +/* 8026F4B0 0026C3F0 48 0F 2D 75 */ bl _restgpr_28 +/* 8026F4B4 0026C3F4 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8026F4B8 0026C3F8 7C 08 03 A6 */ mtlr r0 +/* 8026F4BC 0026C3FC 38 21 00 30 */ addi r1, r1, 0x30 +/* 8026F4C0 0026C400 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F4C4.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F4C4.s new file mode 100644 index 0000000000..11d6e5523e --- /dev/null +++ b/include/SComponent/c_m3d_g_pla/asm/func_8026F4C4.s @@ -0,0 +1,26 @@ +/* 8026F4C4 0026C404 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F4C8 0026C408 7C 08 02 A6 */ mflr r0 +/* 8026F4CC 0026C40C 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F4D0 0026C410 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026F4D4 0026C414 93 C1 00 08 */ stw r30, 8(r1) +/* 8026F4D8 0026C418 7C 7E 1B 78 */ mr r30, r3 +/* 8026F4DC 0026C41C 7C BF 2B 78 */ mr r31, r5 +/* 8026F4E0 0026C420 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F4E4 0026C424 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026F4E8 0026C428 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F4EC 0026C42C D0 03 00 04 */ stfs f0, 4(r3) +/* 8026F4F0 0026C430 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F4F4 0026C434 D0 03 00 08 */ stfs f0, 8(r3) +/* 8026F4F8 0026C438 7F C4 F3 78 */ mr r4, r30 +/* 8026F4FC 0026C43C 48 0D 7B F9 */ bl PSVECNormalize +/* 8026F500 0026C440 7F C3 F3 78 */ mr r3, r30 +/* 8026F504 0026C444 7F E4 FB 78 */ mr r4, r31 +/* 8026F508 0026C448 48 0D 7C 8D */ bl PSVECDotProduct +/* 8026F50C 0026C44C FC 00 08 50 */ fneg f0, f1 +/* 8026F510 0026C450 D0 1E 00 0C */ stfs f0, 0xc(r30) +/* 8026F514 0026C454 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026F518 0026C458 83 C1 00 08 */ lwz r30, 8(r1) +/* 8026F51C 0026C45C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F520 0026C460 7C 08 03 A6 */ mtlr r0 +/* 8026F524 0026C464 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F528 0026C468 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F52C.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F52C.s new file mode 100644 index 0000000000..071828b359 --- /dev/null +++ b/include/SComponent/c_m3d_g_pla/asm/func_8026F52C.s @@ -0,0 +1,20 @@ +/* 8026F52C 0026C46C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F530 0026C470 7C 08 02 A6 */ mflr r0 +/* 8026F534 0026C474 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F538 0026C478 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8026F53C 0026C47C 7C 7F 1B 78 */ mr r31, r3 +/* 8026F540 0026C480 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F544 0026C484 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026F548 0026C488 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F54C 0026C48C D0 03 00 04 */ stfs f0, 4(r3) +/* 8026F550 0026C490 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F554 0026C494 D0 03 00 08 */ stfs f0, 8(r3) +/* 8026F558 0026C498 7C A4 2B 78 */ mr r4, r5 +/* 8026F55C 0026C49C 48 0D 7C 39 */ bl PSVECDotProduct +/* 8026F560 0026C4A0 FC 00 08 50 */ fneg f0, f1 +/* 8026F564 0026C4A4 D0 1F 00 0C */ stfs f0, 0xc(r31) +/* 8026F568 0026C4A8 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8026F56C 0026C4AC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F570 0026C4B0 7C 08 03 A6 */ mtlr r0 +/* 8026F574 0026C4B4 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F578 0026C4B8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F57C.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F57C.s new file mode 100644 index 0000000000..8332636f23 --- /dev/null +++ b/include/SComponent/c_m3d_g_pla/asm/func_8026F57C.s @@ -0,0 +1,23 @@ +/* 8026F57C 0026C4BC C0 63 00 04 */ lfs f3, 4(r3) +/* 8026F580 0026C4C0 FC 00 1A 10 */ fabs f0, f3 +/* 8026F584 0026C4C4 FC 20 00 18 */ frsp f1, f0 +/* 8026F588 0026C4C8 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026F58C 0026C4CC FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026F590 0026C4D0 40 80 00 0C */ bge lbl_8026F59C +/* 8026F594 0026C4D4 38 60 00 00 */ li r3, 0 +/* 8026F598 0026C4D8 4E 80 00 20 */ blr +lbl_8026F59C: +/* 8026F59C 0026C4DC C0 03 00 00 */ lfs f0, 0(r3) +/* 8026F5A0 0026C4E0 FC 20 00 50 */ fneg f1, f0 +/* 8026F5A4 0026C4E4 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F5A8 0026C4E8 EC 41 00 32 */ fmuls f2, f1, f0 +/* 8026F5AC 0026C4EC C0 23 00 08 */ lfs f1, 8(r3) +/* 8026F5B0 0026C4F0 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F5B4 0026C4F4 EC 01 00 32 */ fmuls f0, f1, f0 +/* 8026F5B8 0026C4F8 EC 22 00 28 */ fsubs f1, f2, f0 +/* 8026F5BC 0026C4FC C0 03 00 0C */ lfs f0, 0xc(r3) +/* 8026F5C0 0026C500 EC 01 00 28 */ fsubs f0, f1, f0 +/* 8026F5C4 0026C504 EC 00 18 24 */ fdivs f0, f0, f3 +/* 8026F5C8 0026C508 D0 05 00 00 */ stfs f0, 0(r5) +/* 8026F5CC 0026C50C 38 60 00 01 */ li r3, 1 +/* 8026F5D0 0026C510 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F5D4.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F5D4.s new file mode 100644 index 0000000000..40b9cc4452 --- /dev/null +++ b/include/SComponent/c_m3d_g_pla/asm/func_8026F5D4.s @@ -0,0 +1,21 @@ +/* 8026F5D4 0026C514 C0 63 00 04 */ lfs f3, 4(r3) +/* 8026F5D8 0026C518 FC 00 1A 10 */ fabs f0, f3 +/* 8026F5DC 0026C51C FC 20 00 18 */ frsp f1, f0 +/* 8026F5E0 0026C520 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 8026F5E4 0026C524 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026F5E8 0026C528 40 80 00 0C */ bge lbl_8026F5F4 +/* 8026F5EC 0026C52C 38 60 00 00 */ li r3, 0 +/* 8026F5F0 0026C530 4E 80 00 20 */ blr +lbl_8026F5F4: +/* 8026F5F4 0026C534 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026F5F8 0026C538 FC 20 00 50 */ fneg f1, f0 +/* 8026F5FC 0026C53C C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F600 0026C540 EC 41 00 32 */ fmuls f2, f1, f0 +/* 8026F604 0026C544 C0 23 00 08 */ lfs f1, 8(r3) +/* 8026F608 0026C548 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F60C 0026C54C EC 01 00 32 */ fmuls f0, f1, f0 +/* 8026F610 0026C550 EC 02 00 28 */ fsubs f0, f2, f0 +/* 8026F614 0026C554 EC 00 18 24 */ fdivs f0, f0, f3 +/* 8026F618 0026C558 D0 05 00 00 */ stfs f0, 0(r5) +/* 8026F61C 0026C55C 38 60 00 01 */ li r3, 1 +/* 8026F620 0026C560 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F624.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F624.s new file mode 100644 index 0000000000..67bc63ec15 --- /dev/null +++ b/include/SComponent/c_m3d_g_pla/asm/func_8026F624.s @@ -0,0 +1,9 @@ +/* 8026F624 0026C564 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F628 0026C568 D0 03 00 00 */ stfs f0, 0(r3) +/* 8026F62C 0026C56C C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F630 0026C570 D0 03 00 04 */ stfs f0, 4(r3) +/* 8026F634 0026C574 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F638 0026C578 D0 03 00 08 */ stfs f0, 8(r3) +/* 8026F63C 0026C57C C0 04 00 0C */ lfs f0, 0xc(r4) +/* 8026F640 0026C580 D0 03 00 0C */ stfs f0, 0xc(r3) +/* 8026F644 0026C584 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_sph.h b/include/SComponent/c_m3d_g_sph.h new file mode 100644 index 0000000000..f606cb63da --- /dev/null +++ b/include/SComponent/c_m3d_g_sph.h @@ -0,0 +1,21 @@ +#ifndef __C_M3D_G_SPH_H_ +#define __C_M3D_G_SPH_H_ + +#include "SComponent/c_m3d_g_cyl.h" +#include "SComponent/c_xyz.h" +#include "global.h" + +struct cM3dGSphS; + +class cM3dGSph { +public: + void SetC(const cXyz&); + void Set(const cXyz&, float); + void Set(const cM3dGSphS&); + void SetR(float); + bool cross(const cM3dGSph*, cXyz*) const; + bool cross(const cM3dGCyl*, cXyz*) const; + void GetMinMaxCube(cXyz&, cXyz&) const; +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F648.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F648.s new file mode 100644 index 0000000000..ccd3e218a0 --- /dev/null +++ b/include/SComponent/c_m3d_g_sph/asm/func_8026F648.s @@ -0,0 +1,7 @@ +/* 8026F648 0026C588 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F64C 0026C58C D0 03 00 00 */ stfs f0, 0(r3) +/* 8026F650 0026C590 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F654 0026C594 D0 03 00 04 */ stfs f0, 4(r3) +/* 8026F658 0026C598 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F65C 0026C59C D0 03 00 08 */ stfs f0, 8(r3) +/* 8026F660 0026C5A0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F664.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F664.s new file mode 100644 index 0000000000..f0bc467d06 --- /dev/null +++ b/include/SComponent/c_m3d_g_sph/asm/func_8026F664.s @@ -0,0 +1,17 @@ +/* 8026F664 0026C5A4 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026F668 0026C5A8 7C 08 02 A6 */ mflr r0 +/* 8026F66C 0026C5AC 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026F670 0026C5B0 DB E1 00 18 */ stfd f31, 0x18(r1) +/* 8026F674 0026C5B4 93 E1 00 14 */ stw r31, 0x14(r1) +/* 8026F678 0026C5B8 7C 7F 1B 78 */ mr r31, r3 +/* 8026F67C 0026C5BC FF E0 08 90 */ fmr f31, f1 +/* 8026F680 0026C5C0 4B FF FF C9 */ bl SetC__8cM3dGSphFRC4cXyz +/* 8026F684 0026C5C4 7F E3 FB 78 */ mr r3, r31 +/* 8026F688 0026C5C8 FC 20 F8 90 */ fmr f1, f31 +/* 8026F68C 0026C5CC 48 00 00 7D */ bl SetR__8cM3dGSphFf +/* 8026F690 0026C5D0 CB E1 00 18 */ lfd f31, 0x18(r1) +/* 8026F694 0026C5D4 83 E1 00 14 */ lwz r31, 0x14(r1) +/* 8026F698 0026C5D8 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026F69C 0026C5DC 7C 08 03 A6 */ mtlr r0 +/* 8026F6A0 0026C5E0 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026F6A4 0026C5E4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F6A8.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F6A8.s new file mode 100644 index 0000000000..27af44ffe1 --- /dev/null +++ b/include/SComponent/c_m3d_g_sph/asm/func_8026F6A8.s @@ -0,0 +1,24 @@ +/* 8026F6A8 0026C5E8 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8026F6AC 0026C5EC 7C 08 02 A6 */ mflr r0 +/* 8026F6B0 0026C5F0 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026F6B4 0026C5F4 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8026F6B8 0026C5F8 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8026F6BC 0026C5FC 7C 7E 1B 78 */ mr r30, r3 +/* 8026F6C0 0026C600 7C 9F 23 78 */ mr r31, r4 +/* 8026F6C4 0026C604 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F6C8 0026C608 D0 01 00 08 */ stfs f0, 8(r1) +/* 8026F6CC 0026C60C C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F6D0 0026C610 D0 01 00 0C */ stfs f0, 0xc(r1) +/* 8026F6D4 0026C614 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F6D8 0026C618 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 8026F6DC 0026C61C 38 81 00 08 */ addi r4, r1, 8 +/* 8026F6E0 0026C620 4B FF FF 69 */ bl SetC__8cM3dGSphFRC4cXyz +/* 8026F6E4 0026C624 7F C3 F3 78 */ mr r3, r30 +/* 8026F6E8 0026C628 C0 3F 00 0C */ lfs f1, 0xc(r31) +/* 8026F6EC 0026C62C 48 00 00 1D */ bl SetR__8cM3dGSphFf +/* 8026F6F0 0026C630 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8026F6F4 0026C634 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8026F6F8 0026C638 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8026F6FC 0026C63C 7C 08 03 A6 */ mtlr r0 +/* 8026F700 0026C640 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026F704 0026C644 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F708.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F708.s new file mode 100644 index 0000000000..519eb584a8 --- /dev/null +++ b/include/SComponent/c_m3d_g_sph/asm/func_8026F708.s @@ -0,0 +1,2 @@ +/* 8026F708 0026C648 D0 23 00 0C */ stfs f1, 0xc(r3) +/* 8026F70C 0026C64C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F710.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F710.s new file mode 100644 index 0000000000..a481780420 --- /dev/null +++ b/include/SComponent/c_m3d_g_sph/asm/func_8026F710.s @@ -0,0 +1,11 @@ +/* 8026F710 0026C650 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F714 0026C654 7C 08 02 A6 */ mflr r0 +/* 8026F718 0026C658 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F71C 0026C65C 7C 60 1B 78 */ mr r0, r3 +/* 8026F720 0026C660 7C 83 23 78 */ mr r3, r4 +/* 8026F724 0026C664 7C 04 03 78 */ mr r4, r0 +/* 8026F728 0026C668 4B FF C6 61 */ bl cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphP3Vec +/* 8026F72C 0026C66C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F730 0026C670 7C 08 03 A6 */ mtlr r0 +/* 8026F734 0026C674 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F738 0026C678 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F73C.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F73C.s new file mode 100644 index 0000000000..9f6a1ffe97 --- /dev/null +++ b/include/SComponent/c_m3d_g_sph/asm/func_8026F73C.s @@ -0,0 +1,12 @@ +/* 8026F73C 0026C67C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F740 0026C680 7C 08 02 A6 */ mflr r0 +/* 8026F744 0026C684 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F748 0026C688 7C 60 1B 78 */ mr r0, r3 +/* 8026F74C 0026C68C 7C 83 23 78 */ mr r3, r4 +/* 8026F750 0026C690 7C 04 03 78 */ mr r4, r0 +/* 8026F754 0026C694 38 C1 00 08 */ addi r6, r1, 8 +/* 8026F758 0026C698 4B FF C2 F1 */ bl cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf +/* 8026F75C 0026C69C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F760 0026C6A0 7C 08 03 A6 */ mtlr r0 +/* 8026F764 0026C6A4 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F768 0026C6A8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F76C.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F76C.s new file mode 100644 index 0000000000..fa4e2aa4e4 --- /dev/null +++ b/include/SComponent/c_m3d_g_sph/asm/func_8026F76C.s @@ -0,0 +1,17 @@ +/* 8026F76C 0026C6AC C0 83 00 00 */ lfs f4, 0(r3) +/* 8026F770 0026C6B0 C0 63 00 0C */ lfs f3, 0xc(r3) +/* 8026F774 0026C6B4 EC 04 18 28 */ fsubs f0, f4, f3 +/* 8026F778 0026C6B8 D0 04 00 00 */ stfs f0, 0(r4) +/* 8026F77C 0026C6BC C0 43 00 04 */ lfs f2, 4(r3) +/* 8026F780 0026C6C0 EC 02 18 28 */ fsubs f0, f2, f3 +/* 8026F784 0026C6C4 D0 04 00 04 */ stfs f0, 4(r4) +/* 8026F788 0026C6C8 C0 23 00 08 */ lfs f1, 8(r3) +/* 8026F78C 0026C6CC EC 01 18 28 */ fsubs f0, f1, f3 +/* 8026F790 0026C6D0 D0 04 00 08 */ stfs f0, 8(r4) +/* 8026F794 0026C6D4 EC 04 18 2A */ fadds f0, f4, f3 +/* 8026F798 0026C6D8 D0 05 00 00 */ stfs f0, 0(r5) +/* 8026F79C 0026C6DC EC 02 18 2A */ fadds f0, f2, f3 +/* 8026F7A0 0026C6E0 D0 05 00 04 */ stfs f0, 4(r5) +/* 8026F7A4 0026C6E4 EC 01 18 2A */ fadds f0, f1, f3 +/* 8026F7A8 0026C6E8 D0 05 00 08 */ stfs f0, 8(r5) +/* 8026F7AC 0026C6EC 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_tri.h b/include/SComponent/c_m3d_g_tri.h new file mode 100644 index 0000000000..1b74ee4d5b --- /dev/null +++ b/include/SComponent/c_m3d_g_tri.h @@ -0,0 +1,17 @@ +#ifndef __C_M3D_G_TRI_H_ +#define __C_M3D_G_TRI_H_ + +#include "SComponent/c_m3d_g_cyl.h" +#include "SComponent/c_m3d_g_pla.h" +#include "SComponent/c_xyz.h" +#include "global.h" + +class cM3dGTri { +public: + bool cross(const cM3dGCyl*, Vec*) const; + void setPos(const Vec*, const Vec*, const Vec*); + void setBg(const Vec*, const Vec*, const Vec*, const cM3dGPla*); + void set(const Vec*, const Vec*, const Vec*, const Vec*); +}; + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_tri/asm/func_8026F7B0.s b/include/SComponent/c_m3d_g_tri/asm/func_8026F7B0.s new file mode 100644 index 0000000000..4fdcdca4a0 --- /dev/null +++ b/include/SComponent/c_m3d_g_tri/asm/func_8026F7B0.s @@ -0,0 +1,11 @@ +/* 8026F7B0 0026C6F0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F7B4 0026C6F4 7C 08 02 A6 */ mflr r0 +/* 8026F7B8 0026C6F8 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F7BC 0026C6FC 7C 60 1B 78 */ mr r0, r3 +/* 8026F7C0 0026C700 7C 83 23 78 */ mr r3, r4 +/* 8026F7C4 0026C704 7C 04 03 78 */ mr r4, r0 +/* 8026F7C8 0026C708 4B FF CE 09 */ bl cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec +/* 8026F7CC 0026C70C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F7D0 0026C710 7C 08 03 A6 */ mtlr r0 +/* 8026F7D4 0026C714 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F7D8 0026C718 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_m3d_g_tri/asm/func_8026F7DC.s b/include/SComponent/c_m3d_g_tri/asm/func_8026F7DC.s new file mode 100644 index 0000000000..5cff0327af --- /dev/null +++ b/include/SComponent/c_m3d_g_tri/asm/func_8026F7DC.s @@ -0,0 +1,32 @@ +/* 8026F7DC 0026C71C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F7E0 0026C720 7C 08 02 A6 */ mflr r0 +/* 8026F7E4 0026C724 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F7E8 0026C728 7C 67 1B 78 */ mr r7, r3 +/* 8026F7EC 0026C72C C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F7F0 0026C730 D0 03 00 14 */ stfs f0, 0x14(r3) +/* 8026F7F4 0026C734 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F7F8 0026C738 D0 03 00 18 */ stfs f0, 0x18(r3) +/* 8026F7FC 0026C73C C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F800 0026C740 D0 03 00 1C */ stfs f0, 0x1c(r3) +/* 8026F804 0026C744 C0 05 00 00 */ lfs f0, 0(r5) +/* 8026F808 0026C748 D0 03 00 20 */ stfs f0, 0x20(r3) +/* 8026F80C 0026C74C C0 05 00 04 */ lfs f0, 4(r5) +/* 8026F810 0026C750 D0 03 00 24 */ stfs f0, 0x24(r3) +/* 8026F814 0026C754 C0 05 00 08 */ lfs f0, 8(r5) +/* 8026F818 0026C758 D0 03 00 28 */ stfs f0, 0x28(r3) +/* 8026F81C 0026C75C C0 06 00 00 */ lfs f0, 0(r6) +/* 8026F820 0026C760 D0 03 00 2C */ stfs f0, 0x2c(r3) +/* 8026F824 0026C764 C0 06 00 04 */ lfs f0, 4(r6) +/* 8026F828 0026C768 D0 03 00 30 */ stfs f0, 0x30(r3) +/* 8026F82C 0026C76C C0 06 00 08 */ lfs f0, 8(r6) +/* 8026F830 0026C770 D0 03 00 34 */ stfs f0, 0x34(r3) +/* 8026F834 0026C774 38 67 00 14 */ addi r3, r7, 0x14 +/* 8026F838 0026C778 38 87 00 20 */ addi r4, r7, 0x20 +/* 8026F83C 0026C77C 38 A7 00 2C */ addi r5, r7, 0x2c +/* 8026F840 0026C780 7C E6 3B 78 */ mr r6, r7 +/* 8026F844 0026C784 38 E7 00 0C */ addi r7, r7, 0xc +/* 8026F848 0026C788 4B FF 90 D5 */ bl cM3d_CalcPla__FPC3VecPC3VecPC3VecP3VecPf +/* 8026F84C 0026C78C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F850 0026C790 7C 08 03 A6 */ mtlr r0 +/* 8026F854 0026C794 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F858 0026C798 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_tri/asm/func_8026F85C.s b/include/SComponent/c_m3d_g_tri/asm/func_8026F85C.s new file mode 100644 index 0000000000..0a53953221 --- /dev/null +++ b/include/SComponent/c_m3d_g_tri/asm/func_8026F85C.s @@ -0,0 +1,27 @@ +/* 8026F85C 0026C79C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F860 0026C7A0 7C 08 02 A6 */ mflr r0 +/* 8026F864 0026C7A4 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F868 0026C7A8 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F86C 0026C7AC D0 03 00 14 */ stfs f0, 0x14(r3) +/* 8026F870 0026C7B0 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F874 0026C7B4 D0 03 00 18 */ stfs f0, 0x18(r3) +/* 8026F878 0026C7B8 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F87C 0026C7BC D0 03 00 1C */ stfs f0, 0x1c(r3) +/* 8026F880 0026C7C0 C0 05 00 00 */ lfs f0, 0(r5) +/* 8026F884 0026C7C4 D0 03 00 20 */ stfs f0, 0x20(r3) +/* 8026F888 0026C7C8 C0 05 00 04 */ lfs f0, 4(r5) +/* 8026F88C 0026C7CC D0 03 00 24 */ stfs f0, 0x24(r3) +/* 8026F890 0026C7D0 C0 05 00 08 */ lfs f0, 8(r5) +/* 8026F894 0026C7D4 D0 03 00 28 */ stfs f0, 0x28(r3) +/* 8026F898 0026C7D8 C0 06 00 00 */ lfs f0, 0(r6) +/* 8026F89C 0026C7DC D0 03 00 2C */ stfs f0, 0x2c(r3) +/* 8026F8A0 0026C7E0 C0 06 00 04 */ lfs f0, 4(r6) +/* 8026F8A4 0026C7E4 D0 03 00 30 */ stfs f0, 0x30(r3) +/* 8026F8A8 0026C7E8 C0 06 00 08 */ lfs f0, 8(r6) +/* 8026F8AC 0026C7EC D0 03 00 34 */ stfs f0, 0x34(r3) +/* 8026F8B0 0026C7F0 7C E4 3B 78 */ mr r4, r7 +/* 8026F8B4 0026C7F4 4B FF FD 71 */ bl Set__8cM3dGPlaFPC8cM3dGPla +/* 8026F8B8 0026C7F8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F8BC 0026C7FC 7C 08 03 A6 */ mtlr r0 +/* 8026F8C0 0026C800 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F8C4 0026C804 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_tri/asm/func_8026F8C8.s b/include/SComponent/c_m3d_g_tri/asm/func_8026F8C8.s new file mode 100644 index 0000000000..6e0d5c45f3 --- /dev/null +++ b/include/SComponent/c_m3d_g_tri/asm/func_8026F8C8.s @@ -0,0 +1,29 @@ +/* 8026F8C8 0026C808 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026F8CC 0026C80C 7C 08 02 A6 */ mflr r0 +/* 8026F8D0 0026C810 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026F8D4 0026C814 7C 88 23 78 */ mr r8, r4 +/* 8026F8D8 0026C818 C0 04 00 00 */ lfs f0, 0(r4) +/* 8026F8DC 0026C81C D0 03 00 14 */ stfs f0, 0x14(r3) +/* 8026F8E0 0026C820 C0 04 00 04 */ lfs f0, 4(r4) +/* 8026F8E4 0026C824 D0 03 00 18 */ stfs f0, 0x18(r3) +/* 8026F8E8 0026C828 C0 04 00 08 */ lfs f0, 8(r4) +/* 8026F8EC 0026C82C D0 03 00 1C */ stfs f0, 0x1c(r3) +/* 8026F8F0 0026C830 C0 05 00 00 */ lfs f0, 0(r5) +/* 8026F8F4 0026C834 D0 03 00 20 */ stfs f0, 0x20(r3) +/* 8026F8F8 0026C838 C0 05 00 04 */ lfs f0, 4(r5) +/* 8026F8FC 0026C83C D0 03 00 24 */ stfs f0, 0x24(r3) +/* 8026F900 0026C840 C0 05 00 08 */ lfs f0, 8(r5) +/* 8026F904 0026C844 D0 03 00 28 */ stfs f0, 0x28(r3) +/* 8026F908 0026C848 C0 06 00 00 */ lfs f0, 0(r6) +/* 8026F90C 0026C84C D0 03 00 2C */ stfs f0, 0x2c(r3) +/* 8026F910 0026C850 C0 06 00 04 */ lfs f0, 4(r6) +/* 8026F914 0026C854 D0 03 00 30 */ stfs f0, 0x30(r3) +/* 8026F918 0026C858 C0 06 00 08 */ lfs f0, 8(r6) +/* 8026F91C 0026C85C D0 03 00 34 */ stfs f0, 0x34(r3) +/* 8026F920 0026C860 7C E4 3B 78 */ mr r4, r7 +/* 8026F924 0026C864 7D 05 43 78 */ mr r5, r8 +/* 8026F928 0026C868 4B FF FC 05 */ bl SetupNP__8cM3dGPlaFRC3VecRC3Vec +/* 8026F92C 0026C86C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8026F930 0026C870 7C 08 03 A6 */ mtlr r0 +/* 8026F934 0026C874 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026F938 0026C878 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_malloc.h b/include/SComponent/c_malloc.h new file mode 100644 index 0000000000..498b9164a6 --- /dev/null +++ b/include/SComponent/c_malloc.h @@ -0,0 +1,15 @@ +#ifndef __C_MALLOC_H_ +#define __C_MALLOC_H_ + +#include "JSystem/JKernel/JKRHeap/JKRHeap.h" +#include "global.h" + +class cMl { + static void init(JKRHeap*); + static void* memalignB(int, unsigned long); + static void free(void*); +}; + +extern JKRHeap* lbl_80451150; // SComponent::cMl::Heap + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_math.h b/include/SComponent/c_math.h new file mode 100644 index 0000000000..78886d4d36 --- /dev/null +++ b/include/SComponent/c_math.h @@ -0,0 +1,19 @@ +#ifndef __C_MATH_H_ +#define __C_MATH_H_ + +#include "global.h" + +s16 cM_rad2s(float); +u16 U_GetAtanTable(float, float); +s16 cM_atan2s(float, float); +float cM_atan2f(float, float); +void cM_initRnd(int, int, int); +float cM_rnd(void); +float cM_rndF(float); +float cM_rndFX(float); +void cM_initRnd2(int, int, int); +float cM_rnd2(void); +float cM_rndF2(float); +float cM_rndFX2(float); + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_math/asm/func_802675E4.s b/include/SComponent/c_math/asm/func_802675E4.s new file mode 100644 index 0000000000..db0bf34781 --- /dev/null +++ b/include/SComponent/c_math/asm/func_802675E4.s @@ -0,0 +1,25 @@ +/* 802675E4 00264524 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802675E8 00264528 7C 08 02 A6 */ mflr r0 +/* 802675EC 0026452C 90 01 00 14 */ stw r0, 0x14(r1) +/* 802675F0 00264530 C8 42 B6 A8 */ lfd f2, lbl_804550A8-_SDA2_BASE_(r2) +/* 802675F4 00264534 48 10 51 6D */ bl func_8036C760 +/* 802675F8 00264538 FC 20 08 18 */ frsp f1, f1 +/* 802675FC 0026453C C0 02 B6 B0 */ lfs f0, lbl_804550B0-_SDA2_BASE_(r2) +/* 80267600 00264540 EC 00 00 72 */ fmuls f0, f0, f1 +/* 80267604 00264544 FC 00 00 1E */ fctiwz f0, f0 +/* 80267608 00264548 D8 01 00 08 */ stfd f0, 8(r1) +/* 8026760C 0026454C 80 61 00 0C */ lwz r3, 0xc(r1) +/* 80267610 00264550 2C 03 80 00 */ cmpwi r3, -32768 +/* 80267614 00264554 40 80 00 0C */ bge lbl_80267620 +/* 80267618 00264558 3C 63 00 01 */ addis r3, r3, 1 +/* 8026761C 0026455C 48 00 00 10 */ b lbl_8026762C +lbl_80267620: +/* 80267620 00264560 2C 03 7F FF */ cmpwi r3, 0x7fff +/* 80267624 00264564 40 81 00 08 */ ble lbl_8026762C +/* 80267628 00264568 3C 63 FF FF */ addis r3, r3, 0xffff +lbl_8026762C: +/* 8026762C 0026456C 7C 63 07 34 */ extsh r3, r3 +/* 80267630 00264570 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80267634 00264574 7C 08 03 A6 */ mtlr r0 +/* 80267638 00264578 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026763C 0026457C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_math/asm/func_80267674.s b/include/SComponent/c_math/asm/func_80267674.s new file mode 100644 index 0000000000..7f9b38f342 --- /dev/null +++ b/include/SComponent/c_math/asm/func_80267674.s @@ -0,0 +1,116 @@ +/* 80267674 002645B4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80267678 002645B8 7C 08 02 A6 */ mflr r0 +/* 8026767C 002645BC 90 01 00 14 */ stw r0, 0x14(r1) +/* 80267680 002645C0 FC 80 08 90 */ fmr f4, f1 +/* 80267684 002645C4 FC 00 22 10 */ fabs f0, f4 +/* 80267688 002645C8 FC 00 00 18 */ frsp f0, f0 +/* 8026768C 002645CC C0 6D 8C 00 */ lfs f3, lbl_80451180-_SDA_BASE_(r13) +/* 80267690 002645D0 FC 00 18 40 */ fcmpo cr0, f0, f3 +/* 80267694 002645D4 40 80 00 28 */ bge lbl_802676BC +/* 80267698 002645D8 C0 02 B6 B8 */ lfs f0, lbl_804550B8-_SDA2_BASE_(r2) +/* 8026769C 002645DC FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 802676A0 002645E0 4C 41 13 82 */ cror 2, 1, 2 +/* 802676A4 002645E4 40 82 00 0C */ bne lbl_802676B0 +/* 802676A8 002645E8 38 60 00 00 */ li r3, 0 +/* 802676AC 002645EC 48 00 01 54 */ b lbl_80267800 +lbl_802676B0: +/* 802676B0 002645F0 3C 60 00 01 */ lis r3, 0x00008000@ha +/* 802676B4 002645F4 38 63 80 00 */ addi r3, r3, 0x00008000@l +/* 802676B8 002645F8 48 00 01 48 */ b lbl_80267800 +lbl_802676BC: +/* 802676BC 002645FC FC 00 12 10 */ fabs f0, f2 +/* 802676C0 00264600 FC 00 00 18 */ frsp f0, f0 +/* 802676C4 00264604 FC 00 18 40 */ fcmpo cr0, f0, f3 +/* 802676C8 00264608 40 80 00 28 */ bge lbl_802676F0 +/* 802676CC 0026460C C0 02 B6 B8 */ lfs f0, lbl_804550B8-_SDA2_BASE_(r2) +/* 802676D0 00264610 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 802676D4 00264614 4C 41 13 82 */ cror 2, 1, 2 +/* 802676D8 00264618 40 82 00 0C */ bne lbl_802676E4 +/* 802676DC 0026461C 38 60 40 00 */ li r3, 0x4000 +/* 802676E0 00264620 48 00 01 20 */ b lbl_80267800 +lbl_802676E4: +/* 802676E4 00264624 3C 60 00 01 */ lis r3, 0x0000C000@ha +/* 802676E8 00264628 38 63 C0 00 */ addi r3, r3, 0x0000C000@l +/* 802676EC 0026462C 48 00 01 14 */ b lbl_80267800 +lbl_802676F0: +/* 802676F0 00264630 C0 02 B6 B8 */ lfs f0, lbl_804550B8-_SDA2_BASE_(r2) +/* 802676F4 00264634 FC 04 00 40 */ fcmpo cr0, f4, f0 +/* 802676F8 00264638 4C 41 13 82 */ cror 2, 1, 2 +/* 802676FC 0026463C 40 82 00 7C */ bne lbl_80267778 +/* 80267700 00264640 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 80267704 00264644 4C 41 13 82 */ cror 2, 1, 2 +/* 80267708 00264648 40 82 00 34 */ bne lbl_8026773C +/* 8026770C 0026464C FC 02 20 40 */ fcmpo cr0, f2, f4 +/* 80267710 00264650 4C 41 13 82 */ cror 2, 1, 2 +/* 80267714 00264654 40 82 00 10 */ bne lbl_80267724 +/* 80267718 00264658 4B FF FF 29 */ bl U_GetAtanTable__Fff +/* 8026771C 0026465C 54 63 04 3E */ clrlwi r3, r3, 0x10 +/* 80267720 00264660 48 00 00 E0 */ b lbl_80267800 +lbl_80267724: +/* 80267724 00264664 FC 20 10 90 */ fmr f1, f2 +/* 80267728 00264668 FC 40 20 90 */ fmr f2, f4 +/* 8026772C 0026466C 4B FF FF 15 */ bl U_GetAtanTable__Fff +/* 80267730 00264670 54 60 04 3E */ clrlwi r0, r3, 0x10 +/* 80267734 00264674 20 60 40 00 */ subfic r3, r0, 0x4000 +/* 80267738 00264678 48 00 00 C8 */ b lbl_80267800 +lbl_8026773C: +/* 8026773C 0026467C FC 40 10 50 */ fneg f2, f2 +/* 80267740 00264680 FC 02 20 40 */ fcmpo cr0, f2, f4 +/* 80267744 00264684 40 80 00 1C */ bge lbl_80267760 +/* 80267748 00264688 FC 20 10 90 */ fmr f1, f2 +/* 8026774C 0026468C FC 40 20 90 */ fmr f2, f4 +/* 80267750 00264690 4B FF FE F1 */ bl U_GetAtanTable__Fff +/* 80267754 00264694 54 63 04 3E */ clrlwi r3, r3, 0x10 +/* 80267758 00264698 38 63 40 00 */ addi r3, r3, 0x4000 +/* 8026775C 0026469C 48 00 00 A4 */ b lbl_80267800 +lbl_80267760: +/* 80267760 002646A0 4B FF FE E1 */ bl U_GetAtanTable__Fff +/* 80267764 002646A4 54 64 04 3E */ clrlwi r4, r3, 0x10 +/* 80267768 002646A8 3C 60 00 01 */ lis r3, 0x00008000@ha +/* 8026776C 002646AC 38 03 80 00 */ addi r0, r3, 0x00008000@l +/* 80267770 002646B0 7C 64 00 50 */ subf r3, r4, r0 +/* 80267774 002646B4 48 00 00 8C */ b lbl_80267800 +lbl_80267778: +/* 80267778 002646B8 FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 8026777C 002646BC 40 80 00 4C */ bge lbl_802677C8 +/* 80267780 002646C0 FC 02 20 40 */ fcmpo cr0, f2, f4 +/* 80267784 002646C4 4C 40 13 82 */ cror 2, 0, 2 +/* 80267788 002646C8 40 82 00 20 */ bne lbl_802677A8 +/* 8026778C 002646CC FC 20 20 50 */ fneg f1, f4 +/* 80267790 002646D0 FC 40 10 50 */ fneg f2, f2 +/* 80267794 002646D4 4B FF FE AD */ bl U_GetAtanTable__Fff +/* 80267798 002646D8 54 63 04 3E */ clrlwi r3, r3, 0x10 +/* 8026779C 002646DC 3C 63 00 01 */ addis r3, r3, 1 +/* 802677A0 002646E0 38 63 80 00 */ addi r3, r3, -32768 +/* 802677A4 002646E4 48 00 00 5C */ b lbl_80267800 +lbl_802677A8: +/* 802677A8 002646E8 FC 20 10 50 */ fneg f1, f2 +/* 802677AC 002646EC FC 40 20 50 */ fneg f2, f4 +/* 802677B0 002646F0 4B FF FE 91 */ bl U_GetAtanTable__Fff +/* 802677B4 002646F4 54 64 04 3E */ clrlwi r4, r3, 0x10 +/* 802677B8 002646F8 3C 60 00 01 */ lis r3, 0x0000C000@ha +/* 802677BC 002646FC 38 03 C0 00 */ addi r0, r3, 0x0000C000@l +/* 802677C0 00264700 7C 64 00 50 */ subf r3, r4, r0 +/* 802677C4 00264704 48 00 00 3C */ b lbl_80267800 +lbl_802677C8: +/* 802677C8 00264708 FC 00 20 50 */ fneg f0, f4 +/* 802677CC 0026470C FC 02 00 40 */ fcmpo cr0, f2, f0 +/* 802677D0 00264710 40 80 00 20 */ bge lbl_802677F0 +/* 802677D4 00264714 FC 20 10 90 */ fmr f1, f2 +/* 802677D8 00264718 FC 40 00 90 */ fmr f2, f0 +/* 802677DC 0026471C 4B FF FE 65 */ bl U_GetAtanTable__Fff +/* 802677E0 00264720 54 63 04 3E */ clrlwi r3, r3, 0x10 +/* 802677E4 00264724 3C 63 00 01 */ addis r3, r3, 1 +/* 802677E8 00264728 38 63 C0 00 */ addi r3, r3, -16384 +/* 802677EC 0026472C 48 00 00 14 */ b lbl_80267800 +lbl_802677F0: +/* 802677F0 00264730 FC 20 00 90 */ fmr f1, f0 +/* 802677F4 00264734 4B FF FE 4D */ bl U_GetAtanTable__Fff +/* 802677F8 00264738 54 60 04 3E */ clrlwi r0, r3, 0x10 +/* 802677FC 0026473C 7C 60 00 D0 */ neg r3, r0 +lbl_80267800: +/* 80267800 00264740 7C 63 07 34 */ extsh r3, r3 +/* 80267804 00264744 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80267808 00264748 7C 08 03 A6 */ mtlr r0 +/* 8026780C 0026474C 38 21 00 10 */ addi r1, r1, 0x10 +/* 80267810 00264750 4E 80 00 20 */ blr diff --git a/include/SComponent/c_math/asm/func_80267814.s b/include/SComponent/c_math/asm/func_80267814.s new file mode 100644 index 0000000000..ebda507897 --- /dev/null +++ b/include/SComponent/c_math/asm/func_80267814.s @@ -0,0 +1,18 @@ +/* 80267814 00264754 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80267818 00264758 7C 08 02 A6 */ mflr r0 +/* 8026781C 0026475C 90 01 00 14 */ stw r0, 0x14(r1) +/* 80267820 00264760 4B FF FE 55 */ bl cM_atan2s__Fff +/* 80267824 00264764 7C 60 07 34 */ extsh r0, r3 +/* 80267828 00264768 C8 22 B6 C0 */ lfd f1, lbl_804550C0-_SDA2_BASE_(r2) +/* 8026782C 0026476C 6C 00 80 00 */ xoris r0, r0, 0x8000 +/* 80267830 00264770 90 01 00 0C */ stw r0, 0xc(r1) +/* 80267834 00264774 3C 00 43 30 */ lis r0, 0x4330 +/* 80267838 00264778 90 01 00 08 */ stw r0, 8(r1) +/* 8026783C 0026477C C8 01 00 08 */ lfd f0, 8(r1) +/* 80267840 00264780 EC 20 08 28 */ fsubs f1, f0, f1 +/* 80267844 00264784 C0 02 B6 BC */ lfs f0, lbl_804550BC-_SDA2_BASE_(r2) +/* 80267848 00264788 EC 20 00 72 */ fmuls f1, f0, f1 +/* 8026784C 0026478C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80267850 00264790 7C 08 03 A6 */ mtlr r0 +/* 80267854 00264794 38 21 00 10 */ addi r1, r1, 0x10 +/* 80267858 00264798 4E 80 00 20 */ blr diff --git a/include/SComponent/c_math/asm/func_8026786C.s b/include/SComponent/c_math/asm/func_8026786C.s new file mode 100644 index 0000000000..839c08684a --- /dev/null +++ b/include/SComponent/c_math/asm/func_8026786C.s @@ -0,0 +1,58 @@ +/* 8026786C 002647AC 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80267870 002647B0 7C 08 02 A6 */ mflr r0 +/* 80267874 002647B4 90 01 00 24 */ stw r0, 0x24(r1) +/* 80267878 002647B8 80 0D 8B E8 */ lwz r0, lbl_80451168-_SDA_BASE_(r13) +/* 8026787C 002647BC 1C 80 00 AB */ mulli r4, r0, 0xab +/* 80267880 002647C0 38 60 76 3D */ li r3, 0x763d +/* 80267884 002647C4 7C 04 1B D6 */ divw r0, r4, r3 +/* 80267888 002647C8 7C 00 19 D6 */ mullw r0, r0, r3 +/* 8026788C 002647CC 7C C0 20 50 */ subf r6, r0, r4 +/* 80267890 002647D0 90 CD 8B E8 */ stw r6, lbl_80451168-_SDA_BASE_(r13) +/* 80267894 002647D4 80 0D 8B EC */ lwz r0, lbl_8045116C-_SDA_BASE_(r13) +/* 80267898 002647D8 1C 80 00 AC */ mulli r4, r0, 0xac +/* 8026789C 002647DC 38 60 76 63 */ li r3, 0x7663 +/* 802678A0 002647E0 7C 04 1B D6 */ divw r0, r4, r3 +/* 802678A4 002647E4 7C 00 19 D6 */ mullw r0, r0, r3 +/* 802678A8 002647E8 7C A0 20 50 */ subf r5, r0, r4 +/* 802678AC 002647EC 90 AD 8B EC */ stw r5, lbl_8045116C-_SDA_BASE_(r13) +/* 802678B0 002647F0 80 0D 8B F0 */ lwz r0, lbl_80451170-_SDA_BASE_(r13) +/* 802678B4 002647F4 1C 80 00 AA */ mulli r4, r0, 0xaa +/* 802678B8 002647F8 38 60 76 73 */ li r3, 0x7673 +/* 802678BC 002647FC 7C 04 1B D6 */ divw r0, r4, r3 +/* 802678C0 00264800 7C 00 19 D6 */ mullw r0, r0, r3 +/* 802678C4 00264804 7C 00 20 50 */ subf r0, r0, r4 +/* 802678C8 00264808 90 0D 8B F0 */ stw r0, lbl_80451170-_SDA_BASE_(r13) +/* 802678CC 0026480C C8 82 B6 C0 */ lfd f4, lbl_804550C0-_SDA2_BASE_(r2) +/* 802678D0 00264810 6C 00 80 00 */ xoris r0, r0, 0x8000 +/* 802678D4 00264814 90 01 00 0C */ stw r0, 0xc(r1) +/* 802678D8 00264818 3C 60 43 30 */ lis r3, 0x4330 +/* 802678DC 0026481C 90 61 00 08 */ stw r3, 8(r1) +/* 802678E0 00264820 C8 01 00 08 */ lfd f0, 8(r1) +/* 802678E4 00264824 EC 20 20 28 */ fsubs f1, f0, f4 +/* 802678E8 00264828 C0 02 B6 C8 */ lfs f0, lbl_804550C8-_SDA2_BASE_(r2) +/* 802678EC 0026482C EC 61 00 24 */ fdivs f3, f1, f0 +/* 802678F0 00264830 6C C0 80 00 */ xoris r0, r6, 0x8000 +/* 802678F4 00264834 90 01 00 14 */ stw r0, 0x14(r1) +/* 802678F8 00264838 90 61 00 10 */ stw r3, 0x10(r1) +/* 802678FC 0026483C C8 01 00 10 */ lfd f0, 0x10(r1) +/* 80267900 00264840 EC 20 20 28 */ fsubs f1, f0, f4 +/* 80267904 00264844 C0 02 B6 CC */ lfs f0, lbl_804550CC-_SDA2_BASE_(r2) +/* 80267908 00264848 EC 41 00 24 */ fdivs f2, f1, f0 +/* 8026790C 0026484C 6C A0 80 00 */ xoris r0, r5, 0x8000 +/* 80267910 00264850 90 01 00 1C */ stw r0, 0x1c(r1) +/* 80267914 00264854 90 61 00 18 */ stw r3, 0x18(r1) +/* 80267918 00264858 C8 01 00 18 */ lfd f0, 0x18(r1) +/* 8026791C 0026485C EC 20 20 28 */ fsubs f1, f0, f4 +/* 80267920 00264860 C0 02 B6 D0 */ lfs f0, lbl_804550D0-_SDA2_BASE_(r2) +/* 80267924 00264864 EC 01 00 24 */ fdivs f0, f1, f0 +/* 80267928 00264868 EC 02 00 2A */ fadds f0, f2, f0 +/* 8026792C 0026486C EC 23 00 2A */ fadds f1, f3, f0 +/* 80267930 00264870 C8 42 B6 D8 */ lfd f2, lbl_804550D8-_SDA2_BASE_(r2) +/* 80267934 00264874 48 10 4E 2D */ bl func_8036C760 +/* 80267938 00264878 FC 00 08 18 */ frsp f0, f1 +/* 8026793C 0026487C FC 00 02 10 */ fabs f0, f0 +/* 80267940 00264880 FC 20 00 18 */ frsp f1, f0 +/* 80267944 00264884 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80267948 00264888 7C 08 03 A6 */ mtlr r0 +/* 8026794C 0026488C 38 21 00 20 */ addi r1, r1, 0x20 +/* 80267950 00264890 4E 80 00 20 */ blr diff --git a/include/SComponent/c_math/asm/func_802679E4.s b/include/SComponent/c_math/asm/func_802679E4.s new file mode 100644 index 0000000000..5789bcc546 --- /dev/null +++ b/include/SComponent/c_math/asm/func_802679E4.s @@ -0,0 +1,58 @@ +/* 802679E4 00264924 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802679E8 00264928 7C 08 02 A6 */ mflr r0 +/* 802679EC 0026492C 90 01 00 24 */ stw r0, 0x24(r1) +/* 802679F0 00264930 80 0D 8B F4 */ lwz r0, lbl_80451174-_SDA_BASE_(r13) +/* 802679F4 00264934 1C 80 00 AB */ mulli r4, r0, 0xab +/* 802679F8 00264938 38 60 76 3D */ li r3, 0x763d +/* 802679FC 0026493C 7C 04 1B D6 */ divw r0, r4, r3 +/* 80267A00 00264940 7C 00 19 D6 */ mullw r0, r0, r3 +/* 80267A04 00264944 7C C0 20 50 */ subf r6, r0, r4 +/* 80267A08 00264948 90 CD 8B F4 */ stw r6, lbl_80451174-_SDA_BASE_(r13) +/* 80267A0C 0026494C 80 0D 8B F8 */ lwz r0, lbl_80451178-_SDA_BASE_(r13) +/* 80267A10 00264950 1C 80 00 AC */ mulli r4, r0, 0xac +/* 80267A14 00264954 38 60 76 63 */ li r3, 0x7663 +/* 80267A18 00264958 7C 04 1B D6 */ divw r0, r4, r3 +/* 80267A1C 0026495C 7C 00 19 D6 */ mullw r0, r0, r3 +/* 80267A20 00264960 7C A0 20 50 */ subf r5, r0, r4 +/* 80267A24 00264964 90 AD 8B F8 */ stw r5, lbl_80451178-_SDA_BASE_(r13) +/* 80267A28 00264968 80 0D 8B FC */ lwz r0, lbl_8045117C-_SDA_BASE_(r13) +/* 80267A2C 0026496C 1C 80 00 AA */ mulli r4, r0, 0xaa +/* 80267A30 00264970 38 60 76 73 */ li r3, 0x7673 +/* 80267A34 00264974 7C 04 1B D6 */ divw r0, r4, r3 +/* 80267A38 00264978 7C 00 19 D6 */ mullw r0, r0, r3 +/* 80267A3C 0026497C 7C 00 20 50 */ subf r0, r0, r4 +/* 80267A40 00264980 90 0D 8B FC */ stw r0, lbl_8045117C-_SDA_BASE_(r13) +/* 80267A44 00264984 C8 82 B6 C0 */ lfd f4, lbl_804550C0-_SDA2_BASE_(r2) +/* 80267A48 00264988 6C 00 80 00 */ xoris r0, r0, 0x8000 +/* 80267A4C 0026498C 90 01 00 0C */ stw r0, 0xc(r1) +/* 80267A50 00264990 3C 60 43 30 */ lis r3, 0x4330 +/* 80267A54 00264994 90 61 00 08 */ stw r3, 8(r1) +/* 80267A58 00264998 C8 01 00 08 */ lfd f0, 8(r1) +/* 80267A5C 0026499C EC 20 20 28 */ fsubs f1, f0, f4 +/* 80267A60 002649A0 C0 02 B6 C8 */ lfs f0, lbl_804550C8-_SDA2_BASE_(r2) +/* 80267A64 002649A4 EC 61 00 24 */ fdivs f3, f1, f0 +/* 80267A68 002649A8 6C C0 80 00 */ xoris r0, r6, 0x8000 +/* 80267A6C 002649AC 90 01 00 14 */ stw r0, 0x14(r1) +/* 80267A70 002649B0 90 61 00 10 */ stw r3, 0x10(r1) +/* 80267A74 002649B4 C8 01 00 10 */ lfd f0, 0x10(r1) +/* 80267A78 002649B8 EC 20 20 28 */ fsubs f1, f0, f4 +/* 80267A7C 002649BC C0 02 B6 CC */ lfs f0, lbl_804550CC-_SDA2_BASE_(r2) +/* 80267A80 002649C0 EC 41 00 24 */ fdivs f2, f1, f0 +/* 80267A84 002649C4 6C A0 80 00 */ xoris r0, r5, 0x8000 +/* 80267A88 002649C8 90 01 00 1C */ stw r0, 0x1c(r1) +/* 80267A8C 002649CC 90 61 00 18 */ stw r3, 0x18(r1) +/* 80267A90 002649D0 C8 01 00 18 */ lfd f0, 0x18(r1) +/* 80267A94 002649D4 EC 20 20 28 */ fsubs f1, f0, f4 +/* 80267A98 002649D8 C0 02 B6 D0 */ lfs f0, lbl_804550D0-_SDA2_BASE_(r2) +/* 80267A9C 002649DC EC 01 00 24 */ fdivs f0, f1, f0 +/* 80267AA0 002649E0 EC 02 00 2A */ fadds f0, f2, f0 +/* 80267AA4 002649E4 EC 23 00 2A */ fadds f1, f3, f0 +/* 80267AA8 002649E8 C8 42 B6 D8 */ lfd f2, lbl_804550D8-_SDA2_BASE_(r2) +/* 80267AAC 002649EC 48 10 4C B5 */ bl func_8036C760 +/* 80267AB0 002649F0 FC 00 08 18 */ frsp f0, f1 +/* 80267AB4 002649F4 FC 00 02 10 */ fabs f0, f0 +/* 80267AB8 002649F8 FC 20 00 18 */ frsp f1, f0 +/* 80267ABC 002649FC 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80267AC0 00264A00 7C 08 03 A6 */ mtlr r0 +/* 80267AC4 00264A04 38 21 00 20 */ addi r1, r1, 0x20 +/* 80267AC8 00264A08 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_request.h b/include/SComponent/c_request.h new file mode 100644 index 0000000000..fbb5c801db --- /dev/null +++ b/include/SComponent/c_request.h @@ -0,0 +1,14 @@ +#ifndef __C_REQUEST_H_ +#define __C_REQUEST_H_ + +#include "f/f_pc/f_pc_base.h" +#include "global.h" + +struct request_base_class; + +int cReq_Is_Done(request_base_class*); +int cReq_Done(request_base_class*); +int cReq_Command(request_base_class*, u8); +int cReq_Create(request_base_class*, u8); + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_request/asm/func_802667D4.s b/include/SComponent/c_request/asm/func_802667D4.s new file mode 100644 index 0000000000..f19dfd5361 --- /dev/null +++ b/include/SComponent/c_request/asm/func_802667D4.s @@ -0,0 +1,12 @@ +/* 802667D4 00263714 88 83 00 00 */ lbz r4, 0(r3) +/* 802667D8 00263718 54 80 D7 FE */ rlwinm r0, r4, 0x1a, 0x1f, 0x1f +/* 802667DC 0026371C 28 00 00 01 */ cmplwi r0, 1 +/* 802667E0 00263720 40 82 00 18 */ bne lbl_802667F8 +/* 802667E4 00263724 38 00 00 00 */ li r0, 0 +/* 802667E8 00263728 50 04 36 72 */ rlwimi r4, r0, 6, 0x19, 0x19 +/* 802667EC 0026372C 98 83 00 00 */ stb r4, 0(r3) +/* 802667F0 00263730 38 60 00 01 */ li r3, 1 +/* 802667F4 00263734 4E 80 00 20 */ blr +lbl_802667F8: +/* 802667F8 00263738 38 60 00 00 */ li r3, 0 +/* 802667FC 0026373C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_request/asm/func_80266800.s b/include/SComponent/c_request/asm/func_80266800.s new file mode 100644 index 0000000000..69dcb5bae1 --- /dev/null +++ b/include/SComponent/c_request/asm/func_80266800.s @@ -0,0 +1,12 @@ +/* 80266800 00263740 38 A0 00 00 */ li r5, 0 +/* 80266804 00263744 88 03 00 00 */ lbz r0, 0(r3) +/* 80266808 00263748 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 +/* 8026680C 0026374C 98 03 00 00 */ stb r0, 0(r3) +/* 80266810 00263750 38 80 00 01 */ li r4, 1 +/* 80266814 00263754 88 03 00 00 */ lbz r0, 0(r3) +/* 80266818 00263758 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 +/* 8026681C 0026375C 98 03 00 00 */ stb r0, 0(r3) +/* 80266820 00263760 88 03 00 00 */ lbz r0, 0(r3) +/* 80266824 00263764 50 A0 06 BE */ rlwimi r0, r5, 0, 0x1a, 0x1f +/* 80266828 00263768 98 03 00 00 */ stb r0, 0(r3) +/* 8026682C 0026376C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_request/asm/func_80266830.s b/include/SComponent/c_request/asm/func_80266830.s new file mode 100644 index 0000000000..efea6e5006 --- /dev/null +++ b/include/SComponent/c_request/asm/func_80266830.s @@ -0,0 +1,8 @@ +/* 80266830 00263770 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80266834 00263774 7C 08 02 A6 */ mflr r0 +/* 80266838 00263778 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026683C 0026377C 48 00 00 15 */ bl cReq_Create__FP18request_base_classUc +/* 80266840 00263780 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80266844 00263784 7C 08 03 A6 */ mtlr r0 +/* 80266848 00263788 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026684C 0026378C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_request/asm/func_80266850.s b/include/SComponent/c_request/asm/func_80266850.s new file mode 100644 index 0000000000..39f681bdf3 --- /dev/null +++ b/include/SComponent/c_request/asm/func_80266850.s @@ -0,0 +1,12 @@ +/* 80266850 00263790 38 A0 00 01 */ li r5, 1 +/* 80266854 00263794 88 03 00 00 */ lbz r0, 0(r3) +/* 80266858 00263798 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 +/* 8026685C 0026379C 98 03 00 00 */ stb r0, 0(r3) +/* 80266860 002637A0 38 A0 00 00 */ li r5, 0 +/* 80266864 002637A4 88 03 00 00 */ lbz r0, 0(r3) +/* 80266868 002637A8 50 A0 36 72 */ rlwimi r0, r5, 6, 0x19, 0x19 +/* 8026686C 002637AC 98 03 00 00 */ stb r0, 0(r3) +/* 80266870 002637B0 88 03 00 00 */ lbz r0, 0(r3) +/* 80266874 002637B4 50 80 06 BE */ rlwimi r0, r4, 0, 0x1a, 0x1f +/* 80266878 002637B8 98 03 00 00 */ stb r0, 0(r3) +/* 8026687C 002637BC 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_sxyz.h b/include/SComponent/c_sxyz.h new file mode 100644 index 0000000000..d96d57cecb --- /dev/null +++ b/include/SComponent/c_sxyz.h @@ -0,0 +1,20 @@ +#ifndef __C_SXYZ_H_ +#define __C_SXYZ_H_ + +#include "global.h" + +class csXyz { +private: + s16 mX, mY, mZ; + +public: + csXyz(s16, s16, s16); + csXyz operator+(csXyz&); + void operator+=(csXyz&); + csXyz operator-(csXyz&); + csXyz operator*(float); +}; + +extern csXyz lbl_80451160; // SComponent::csXyz::Zero + +#endif
\ No newline at end of file diff --git a/include/SComponent/c_sxyz/asm/func_802674E8.s b/include/SComponent/c_sxyz/asm/func_802674E8.s new file mode 100644 index 0000000000..d3bab83b92 --- /dev/null +++ b/include/SComponent/c_sxyz/asm/func_802674E8.s @@ -0,0 +1,41 @@ +/* 802674E8 00264428 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 802674EC 0026442C 7C 08 02 A6 */ mflr r0 +/* 802674F0 00264430 90 01 00 44 */ stw r0, 0x44(r1) +/* 802674F4 00264434 7C 87 23 78 */ mr r7, r4 +/* 802674F8 00264438 A8 04 00 00 */ lha r0, 0(r4) +/* 802674FC 0026443C C8 42 B6 A0 */ lfd f2, lbl_804550A0-_SDA2_BASE_(r2) +/* 80267500 00264440 6C 00 80 00 */ xoris r0, r0, 0x8000 +/* 80267504 00264444 90 01 00 0C */ stw r0, 0xc(r1) +/* 80267508 00264448 3C C0 43 30 */ lis r6, 0x4330 +/* 8026750C 0026444C 90 C1 00 08 */ stw r6, 8(r1) +/* 80267510 00264450 C8 01 00 08 */ lfd f0, 8(r1) +/* 80267514 00264454 EC 00 10 28 */ fsubs f0, f0, f2 +/* 80267518 00264458 EC 00 00 72 */ fmuls f0, f0, f1 +/* 8026751C 0026445C FC 00 00 1E */ fctiwz f0, f0 +/* 80267520 00264460 D8 01 00 10 */ stfd f0, 0x10(r1) +/* 80267524 00264464 80 81 00 14 */ lwz r4, 0x14(r1) +/* 80267528 00264468 A8 07 00 02 */ lha r0, 2(r7) +/* 8026752C 0026446C 6C 00 80 00 */ xoris r0, r0, 0x8000 +/* 80267530 00264470 90 01 00 1C */ stw r0, 0x1c(r1) +/* 80267534 00264474 90 C1 00 18 */ stw r6, 0x18(r1) +/* 80267538 00264478 C8 01 00 18 */ lfd f0, 0x18(r1) +/* 8026753C 0026447C EC 00 10 28 */ fsubs f0, f0, f2 +/* 80267540 00264480 EC 00 00 72 */ fmuls f0, f0, f1 +/* 80267544 00264484 FC 00 00 1E */ fctiwz f0, f0 +/* 80267548 00264488 D8 01 00 20 */ stfd f0, 0x20(r1) +/* 8026754C 0026448C 80 A1 00 24 */ lwz r5, 0x24(r1) +/* 80267550 00264490 A8 07 00 04 */ lha r0, 4(r7) +/* 80267554 00264494 6C 00 80 00 */ xoris r0, r0, 0x8000 +/* 80267558 00264498 90 01 00 2C */ stw r0, 0x2c(r1) +/* 8026755C 0026449C 90 C1 00 28 */ stw r6, 0x28(r1) +/* 80267560 002644A0 C8 01 00 28 */ lfd f0, 0x28(r1) +/* 80267564 002644A4 EC 00 10 28 */ fsubs f0, f0, f2 +/* 80267568 002644A8 EC 00 00 72 */ fmuls f0, f0, f1 +/* 8026756C 002644AC FC 00 00 1E */ fctiwz f0, f0 +/* 80267570 002644B0 D8 01 00 30 */ stfd f0, 0x30(r1) +/* 80267574 002644B4 80 C1 00 34 */ lwz r6, 0x34(r1) +/* 80267578 002644B8 4B FF FE 7D */ bl __ct__5csXyzFsss +/* 8026757C 002644BC 80 01 00 44 */ lwz r0, 0x44(r1) +/* 80267580 002644C0 7C 08 03 A6 */ mtlr r0 +/* 80267584 002644C4 38 21 00 40 */ addi r1, r1, 0x40 +/* 80267588 002644C8 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_sxyz/asm/func_8026758C.s b/include/SComponent/c_sxyz/asm/func_8026758C.s new file mode 100644 index 0000000000..8923b6c46f --- /dev/null +++ b/include/SComponent/c_sxyz/asm/func_8026758C.s @@ -0,0 +1,24 @@ +/* 8026758C 002644CC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80267590 002644D0 7C 08 02 A6 */ mflr r0 +/* 80267594 002644D4 90 01 00 14 */ stw r0, 0x14(r1) +/* 80267598 002644D8 38 61 00 08 */ addi r3, r1, 8 +/* 8026759C 002644DC 38 80 00 00 */ li r4, 0 +/* 802675A0 002644E0 38 A0 00 00 */ li r5, 0 +/* 802675A4 002644E4 38 C0 00 00 */ li r6, 0 +/* 802675A8 002644E8 4B FF FE 4D */ bl __ct__5csXyzFsss +/* 802675AC 002644EC 80 01 00 08 */ lwz r0, 8(r1) +/* 802675B0 002644F0 90 0D 8B E0 */ stw r0, lbl_80451160-_SDA_BASE_(r13) +/* 802675B4 002644F4 A0 01 00 0C */ lhz r0, 0xc(r1) +/* 802675B8 002644F8 B0 0D 8B E4 */ sth r0, lbl_80451164-_SDA_BASE_(r13) +/* 802675BC 002644FC 38 6D 8B E0 */ addi r3, r13, 0x80451160 - 0x80458580 /*SDA HACK; original: lbl_80451160-_SDA_BASE_*/ +/*.global csXyz_NS_dtor*/ +/* 802675C0 00264500 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha +/*.global csXyz_NS_dtor*/ +/* 802675C4 00264504 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/* 802675C8 00264508 3C A0 80 43 */ lis r5, lbl_80430DA8@ha +/* 802675CC 0026450C 38 A5 0D A8 */ addi r5, r5, lbl_80430DA8@l +/* 802675D0 00264510 48 0F A6 55 */ bl func_80361C24 +/* 802675D4 00264514 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802675D8 00264518 7C 08 03 A6 */ mtlr r0 +/* 802675DC 0026451C 38 21 00 10 */ addi r1, r1, 0x10 +/* 802675E0 00264520 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_xyz.h b/include/SComponent/c_xyz.h index b011b57b52..57f7a47a89 100644 --- a/include/SComponent/c_xyz.h +++ b/include/SComponent/c_xyz.h @@ -1,9 +1,73 @@ #ifndef __C_XYZ_H_ #define __C_XYZ_H_ +#include "SComponent/c_math.h" #include "global.h" -class cXyz : public Vec {}; +extern float /* 1.0 */ lbl_80455070; +extern float /* epsilon */ lbl_80455074; +extern float lbl_80455078; +extern float lbl_8045507C; +extern float lbl_80455080; +extern float /* 32.0 */ lbl_80455084; +extern double lbl_80455088; +extern double lbl_80455090; +extern double lbl_80455098; +extern u8 lbl_80430CE8; + +class cXyz : public Vec { +public: + ~cXyz(){}; + cXyz() {} + cXyz(float x, float y, float z) { + this->x = x; + this->y = y; + this->z = z; + } + cXyz(const cXyz& vec) { + this->x = vec.x; + this->y = vec.y; + this->z = vec.z; + } + cXyz(const Vec& vec) { + this->x = vec.x; + this->y = vec.y; + this->z = vec.z; + } + cXyz operator=(const Vec& vec) { + cXyz ret; + ret.x = vec.x; + ret.y = vec.y; + ret.z = vec.z; + return ret; + } + cXyz operator+(const Vec& vec) const; + cXyz operator-(const Vec& vec) const; + cXyz operator*(float scale) const; + cXyz operator*(const Vec& vec) const; + cXyz operator/(float) const; + cXyz getCrossProduct(const Vec&) const; + cXyz outprod(const Vec&) const; + cXyz norm(void) const; + cXyz normZP(void) const; + cXyz normZC(void) const; + cXyz normalize(void); + cXyz normalizeZP(void); + bool normalizeRS(void); + bool operator==(const Vec&) const; + bool operator!=(const Vec&) const; + bool isZero(void) const; + s16 atan2sX_Z(void) const; + s16 atan2sY_XZ(void) const; + + void baseZ() { + this->x = lbl_80455080; + this->y = lbl_80455080; + this->z = lbl_80455070; + } + + bool checkEpsilon() const { return !(PSVECSquareMag(this) < lbl_80455074); } +}; extern cXyz lbl_80430CF4; // SComponent::cXyz::Zero extern cXyz lbl_80430D0C; // SComponent::cXyz::BaseX diff --git a/include/SComponent/c_xyz/asm/func_80266DC4.s b/include/SComponent/c_xyz/asm/func_80266DC4.s new file mode 100644 index 0000000000..65188bcd0c --- /dev/null +++ b/include/SComponent/c_xyz/asm/func_80266DC4.s @@ -0,0 +1,78 @@ +/* 80266DC4 00263D04 94 21 FF A0 */ stwu r1, -0x60(r1) +/* 80266DC8 00263D08 7C 08 02 A6 */ mflr r0 +/* 80266DCC 00263D0C 90 01 00 64 */ stw r0, 0x64(r1) +/* 80266DD0 00263D10 93 E1 00 5C */ stw r31, 0x5c(r1) +/* 80266DD4 00263D14 93 C1 00 58 */ stw r30, 0x58(r1) +/* 80266DD8 00263D18 7C 7E 1B 78 */ mr r30, r3 +/* 80266DDC 00263D1C 7C 9F 23 78 */ mr r31, r4 +/* 80266DE0 00263D20 7F E3 FB 78 */ mr r3, r31 +/* 80266DE4 00263D24 48 0E 03 55 */ bl PSVECSquareMag +/* 80266DE8 00263D28 C0 02 B6 74 */ lfs f0, lbl_80455074-_SDA2_BASE_(r2) +/* 80266DEC 00263D2C FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80266DF0 00263D30 7C 00 00 26 */ mfcr r0 +/* 80266DF4 00263D34 54 00 0F FF */ rlwinm. r0, r0, 1, 0x1f, 0x1f +/* 80266DF8 00263D38 40 82 00 14 */ bne lbl_80266E0C +/* 80266DFC 00263D3C 7F E3 FB 78 */ mr r3, r31 +/* 80266E00 00263D40 38 81 00 44 */ addi r4, r1, 0x44 +/* 80266E04 00263D44 48 0E 02 F1 */ bl PSVECNormalize +/* 80266E08 00263D48 48 00 00 BC */ b lbl_80266EC4 +lbl_80266E0C: +/* 80266E0C 00263D4C 38 61 00 38 */ addi r3, r1, 0x38 +/* 80266E10 00263D50 7F E4 FB 78 */ mr r4, r31 +/* 80266E14 00263D54 C0 22 B6 78 */ lfs f1, lbl_80455078-_SDA2_BASE_(r2) +/* 80266E18 00263D58 4B FF FD 6D */ bl __ml__4cXyzCFf +/* 80266E1C 00263D5C 38 61 00 2C */ addi r3, r1, 0x2c +/* 80266E20 00263D60 38 81 00 38 */ addi r4, r1, 0x38 +/* 80266E24 00263D64 C0 22 B6 7C */ lfs f1, lbl_8045507C-_SDA2_BASE_(r2) +/* 80266E28 00263D68 4B FF FD 5D */ bl __ml__4cXyzCFf +/* 80266E2C 00263D6C 38 61 00 20 */ addi r3, r1, 0x20 +/* 80266E30 00263D70 38 81 00 2C */ addi r4, r1, 0x2c +/* 80266E34 00263D74 4B FF FE FD */ bl normZP__4cXyzCFv +/* 80266E38 00263D78 C0 41 00 20 */ lfs f2, 0x20(r1) +/* 80266E3C 00263D7C D0 41 00 44 */ stfs f2, 0x44(r1) +/* 80266E40 00263D80 C0 21 00 24 */ lfs f1, 0x24(r1) +/* 80266E44 00263D84 D0 21 00 48 */ stfs f1, 0x48(r1) +/* 80266E48 00263D88 C0 01 00 28 */ lfs f0, 0x28(r1) +/* 80266E4C 00263D8C D0 01 00 4C */ stfs f0, 0x4c(r1) +/* 80266E50 00263D90 D0 41 00 14 */ stfs f2, 0x14(r1) +/* 80266E54 00263D94 D0 21 00 18 */ stfs f1, 0x18(r1) +/* 80266E58 00263D98 D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 80266E5C 00263D9C 38 61 00 14 */ addi r3, r1, 0x14 +/* 80266E60 00263DA0 48 0E 02 D9 */ bl PSVECSquareMag +/* 80266E64 00263DA4 C0 02 B6 74 */ lfs f0, lbl_80455074-_SDA2_BASE_(r2) +/* 80266E68 00263DA8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 80266E6C 00263DAC 7C 00 00 26 */ mfcr r0 +/* 80266E70 00263DB0 54 00 0F FF */ rlwinm. r0, r0, 1, 0x1f, 0x1f +/* 80266E74 00263DB4 41 82 00 50 */ beq lbl_80266EC4 +/* 80266E78 00263DB8 C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2) +/* 80266E7C 00263DBC D0 01 00 44 */ stfs f0, 0x44(r1) +/* 80266E80 00263DC0 D0 01 00 48 */ stfs f0, 0x48(r1) +/* 80266E84 00263DC4 C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2) +/* 80266E88 00263DC8 D0 01 00 4C */ stfs f0, 0x4c(r1) +/* 80266E8C 00263DCC 3C 60 80 3A */ lis r3, lbl_8039A868@ha +/* 80266E90 00263DD0 38 83 A8 68 */ addi r4, r3, lbl_8039A868@l +/* 80266E94 00263DD4 80 64 00 00 */ lwz r3, 0(r4) +/* 80266E98 00263DD8 80 04 00 04 */ lwz r0, 4(r4) +/* 80266E9C 00263DDC 90 61 00 08 */ stw r3, 8(r1) +/* 80266EA0 00263DE0 90 01 00 0C */ stw r0, 0xc(r1) +/* 80266EA4 00263DE4 80 04 00 08 */ lwz r0, 8(r4) +/* 80266EA8 00263DE8 90 01 00 10 */ stw r0, 0x10(r1) +/* 80266EAC 00263DEC C0 01 00 08 */ lfs f0, 8(r1) +/* 80266EB0 00263DF0 D0 01 00 44 */ stfs f0, 0x44(r1) +/* 80266EB4 00263DF4 C0 01 00 0C */ lfs f0, 0xc(r1) +/* 80266EB8 00263DF8 D0 01 00 48 */ stfs f0, 0x48(r1) +/* 80266EBC 00263DFC C0 01 00 10 */ lfs f0, 0x10(r1) +/* 80266EC0 00263E00 D0 01 00 4C */ stfs f0, 0x4c(r1) +lbl_80266EC4: +/* 80266EC4 00263E04 C0 01 00 44 */ lfs f0, 0x44(r1) +/* 80266EC8 00263E08 D0 1E 00 00 */ stfs f0, 0(r30) +/* 80266ECC 00263E0C C0 01 00 48 */ lfs f0, 0x48(r1) +/* 80266ED0 00263E10 D0 1E 00 04 */ stfs f0, 4(r30) +/* 80266ED4 00263E14 C0 01 00 4C */ lfs f0, 0x4c(r1) +/* 80266ED8 00263E18 D0 1E 00 08 */ stfs f0, 8(r30) +/* 80266EDC 00263E1C 83 E1 00 5C */ lwz r31, 0x5c(r1) +/* 80266EE0 00263E20 83 C1 00 58 */ lwz r30, 0x58(r1) +/* 80266EE4 00263E24 80 01 00 64 */ lwz r0, 0x64(r1) +/* 80266EE8 00263E28 7C 08 03 A6 */ mtlr r0 +/* 80266EEC 00263E2C 38 21 00 60 */ addi r1, r1, 0x60 +/* 80266EF0 00263E30 4E 80 00 20 */ blr diff --git a/include/SComponent/c_xyz/asm/func_80267128.s b/include/SComponent/c_xyz/asm/func_80267128.s new file mode 100644 index 0000000000..6624a48a71 --- /dev/null +++ b/include/SComponent/c_xyz/asm/func_80267128.s @@ -0,0 +1,10 @@ +/* 80267128 00264068 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8026712C 0026406C 7C 08 02 A6 */ mflr r0 +/* 80267130 00264070 90 01 00 14 */ stw r0, 0x14(r1) +/* 80267134 00264074 C0 23 00 00 */ lfs f1, 0(r3) +/* 80267138 00264078 C0 43 00 08 */ lfs f2, 8(r3) +/* 8026713C 0026407C 48 00 05 39 */ bl cM_atan2s__Fff +/* 80267140 00264080 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80267144 00264084 7C 08 03 A6 */ mtlr r0 +/* 80267148 00264088 38 21 00 10 */ addi r1, r1, 0x10 +/* 8026714C 0026408C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_xyz/asm/func_80267150.s b/include/SComponent/c_xyz/asm/func_80267150.s new file mode 100644 index 0000000000..9069991c8f --- /dev/null +++ b/include/SComponent/c_xyz/asm/func_80267150.s @@ -0,0 +1,90 @@ +/* 80267150 00264090 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80267154 00264094 7C 08 02 A6 */ mflr r0 +/* 80267158 00264098 90 01 00 24 */ stw r0, 0x24(r1) +/* 8026715C 0026409C 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 80267160 002640A0 7C 7F 1B 78 */ mr r31, r3 +/* 80267164 002640A4 C0 23 00 08 */ lfs f1, 8(r3) +/* 80267168 002640A8 C0 03 00 00 */ lfs f0, 0(r3) +/* 8026716C 002640AC D0 01 00 0C */ stfs f0, 0xc(r1) +/* 80267170 002640B0 C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2) +/* 80267174 002640B4 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 80267178 002640B8 D0 21 00 14 */ stfs f1, 0x14(r1) +/* 8026717C 002640BC 38 61 00 0C */ addi r3, r1, 0xc +/* 80267180 002640C0 48 0D FF B9 */ bl PSVECSquareMag +/* 80267184 002640C4 C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2) +/* 80267188 002640C8 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8026718C 002640CC 40 81 00 58 */ ble lbl_802671E4 +/* 80267190 002640D0 FC 00 08 34 */ frsqrte f0, f1 +/* 80267194 002640D4 C8 82 B6 88 */ lfd f4, lbl_80455088-_SDA2_BASE_(r2) +/* 80267198 002640D8 FC 44 00 32 */ fmul f2, f4, f0 +/* 8026719C 002640DC C8 62 B6 90 */ lfd f3, lbl_80455090-_SDA2_BASE_(r2) +/* 802671A0 002640E0 FC 00 00 32 */ fmul f0, f0, f0 +/* 802671A4 002640E4 FC 01 00 32 */ fmul f0, f1, f0 +/* 802671A8 002640E8 FC 03 00 28 */ fsub f0, f3, f0 +/* 802671AC 002640EC FC 02 00 32 */ fmul f0, f2, f0 +/* 802671B0 002640F0 FC 44 00 32 */ fmul f2, f4, f0 +/* 802671B4 002640F4 FC 00 00 32 */ fmul f0, f0, f0 +/* 802671B8 002640F8 FC 01 00 32 */ fmul f0, f1, f0 +/* 802671BC 002640FC FC 03 00 28 */ fsub f0, f3, f0 +/* 802671C0 00264100 FC 02 00 32 */ fmul f0, f2, f0 +/* 802671C4 00264104 FC 44 00 32 */ fmul f2, f4, f0 +/* 802671C8 00264108 FC 00 00 32 */ fmul f0, f0, f0 +/* 802671CC 0026410C FC 01 00 32 */ fmul f0, f1, f0 +/* 802671D0 00264110 FC 03 00 28 */ fsub f0, f3, f0 +/* 802671D4 00264114 FC 02 00 32 */ fmul f0, f2, f0 +/* 802671D8 00264118 FC 41 00 32 */ fmul f2, f1, f0 +/* 802671DC 0026411C FC 40 10 18 */ frsp f2, f2 +/* 802671E0 00264120 48 00 00 90 */ b lbl_80267270 +lbl_802671E4: +/* 802671E4 00264124 C8 02 B6 98 */ lfd f0, lbl_80455098-_SDA2_BASE_(r2) +/* 802671E8 00264128 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 802671EC 0026412C 40 80 00 10 */ bge lbl_802671FC +/* 802671F0 00264130 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 802671F4 00264134 C0 43 0A E0 */ lfs f2, lbl_80450AE0@l(r3) +/* 802671F8 00264138 48 00 00 78 */ b lbl_80267270 +lbl_802671FC: +/* 802671FC 0026413C D0 21 00 08 */ stfs f1, 8(r1) +/* 80267200 00264140 80 81 00 08 */ lwz r4, 8(r1) +/* 80267204 00264144 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 +/* 80267208 00264148 3C 00 7F 80 */ lis r0, 0x7f80 +/* 8026720C 0026414C 7C 03 00 00 */ cmpw r3, r0 +/* 80267210 00264150 41 82 00 14 */ beq lbl_80267224 +/* 80267214 00264154 40 80 00 40 */ bge lbl_80267254 +/* 80267218 00264158 2C 03 00 00 */ cmpwi r3, 0 +/* 8026721C 0026415C 41 82 00 20 */ beq lbl_8026723C +/* 80267220 00264160 48 00 00 34 */ b lbl_80267254 +lbl_80267224: +/* 80267224 00264164 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 80267228 00264168 41 82 00 0C */ beq lbl_80267234 +/* 8026722C 0026416C 38 00 00 01 */ li r0, 1 +/* 80267230 00264170 48 00 00 28 */ b lbl_80267258 +lbl_80267234: +/* 80267234 00264174 38 00 00 02 */ li r0, 2 +/* 80267238 00264178 48 00 00 20 */ b lbl_80267258 +lbl_8026723C: +/* 8026723C 0026417C 54 80 02 7F */ clrlwi. r0, r4, 9 +/* 80267240 00264180 41 82 00 0C */ beq lbl_8026724C +/* 80267244 00264184 38 00 00 05 */ li r0, 5 +/* 80267248 00264188 48 00 00 10 */ b lbl_80267258 +lbl_8026724C: +/* 8026724C 0026418C 38 00 00 03 */ li r0, 3 +/* 80267250 00264190 48 00 00 08 */ b lbl_80267258 +lbl_80267254: +/* 80267254 00264194 38 00 00 04 */ li r0, 4 +lbl_80267258: +/* 80267258 00264198 2C 00 00 01 */ cmpwi r0, 1 +/* 8026725C 0026419C 40 82 00 10 */ bne lbl_8026726C +/* 80267260 002641A0 3C 60 80 45 */ lis r3, lbl_80450AE0@ha +/* 80267264 002641A4 C0 43 0A E0 */ lfs f2, lbl_80450AE0@l(r3) +/* 80267268 002641A8 48 00 00 08 */ b lbl_80267270 +lbl_8026726C: +/* 8026726C 002641AC FC 40 08 90 */ fmr f2, f1 +lbl_80267270: +/* 80267270 002641B0 C0 1F 00 04 */ lfs f0, 4(r31) +/* 80267274 002641B4 FC 20 00 50 */ fneg f1, f0 +/* 80267278 002641B8 48 00 03 FD */ bl cM_atan2s__Fff +/* 8026727C 002641BC 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 80267280 002641C0 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80267284 002641C4 7C 08 03 A6 */ mtlr r0 +/* 80267288 002641C8 38 21 00 20 */ addi r1, r1, 0x20 +/* 8026728C 002641CC 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/SComponent/c_xyz/asm/func_80267290.s b/include/SComponent/c_xyz/asm/func_80267290.s new file mode 100644 index 0000000000..77a3ff6923 --- /dev/null +++ b/include/SComponent/c_xyz/asm/func_80267290.s @@ -0,0 +1,89 @@ +/* 80267290 002641D0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80267294 002641D4 7C 08 02 A6 */ mflr r0 +/* 80267298 002641D8 90 01 00 14 */ stw r0, 0x14(r1) +/* 8026729C 002641DC 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802672A0 002641E0 3C 60 80 43 */ lis r3, lbl_80430CE8@ha +/* 802672A4 002641E4 3B E3 0C E8 */ addi r31, r3, lbl_80430CE8@l +/* 802672A8 002641E8 C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2) +/* 802672AC 002641EC D0 1F 00 0C */ stfs f0, 0xc(r31) +/* 802672B0 002641F0 38 7F 00 0C */ addi r3, r31, 0xc +/* 802672B4 002641F4 D0 03 00 04 */ stfs f0, 4(r3) +/* 802672B8 002641F8 D0 03 00 08 */ stfs f0, 8(r3) +/* 802672BC 002641FC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha +/* 802672C0 00264200 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 802672C4 00264204 38 BF 00 00 */ addi r5, r31, 0 +/* 802672C8 00264208 48 0F A9 5D */ bl func_80361C24 +/* 802672CC 0026420C C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2) +/* 802672D0 00264210 D0 1F 00 24 */ stfs f0, 0x24(r31) +/* 802672D4 00264214 C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2) +/* 802672D8 00264218 38 7F 00 24 */ addi r3, r31, 0x24 +/* 802672DC 0026421C D0 03 00 04 */ stfs f0, 4(r3) +/* 802672E0 00264220 D0 03 00 08 */ stfs f0, 8(r3) +/* 802672E4 00264224 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha +/* 802672E8 00264228 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 802672EC 0026422C 38 BF 00 18 */ addi r5, r31, 0x18 +/* 802672F0 00264230 48 0F A9 35 */ bl func_80361C24 +/* 802672F4 00264234 C0 22 B6 80 */ lfs f1, lbl_80455080-_SDA2_BASE_(r2) +/* 802672F8 00264238 D0 3F 00 3C */ stfs f1, 0x3c(r31) +/* 802672FC 0026423C C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2) +/* 80267300 00264240 38 7F 00 3C */ addi r3, r31, 0x3c +/* 80267304 00264244 D0 03 00 04 */ stfs f0, 4(r3) +/* 80267308 00264248 D0 23 00 08 */ stfs f1, 8(r3) +/* 8026730C 0026424C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha +/* 80267310 00264250 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80267314 00264254 38 BF 00 30 */ addi r5, r31, 0x30 +/* 80267318 00264258 48 0F A9 0D */ bl func_80361C24 +/* 8026731C 0026425C C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2) +/* 80267320 00264260 D0 1F 00 54 */ stfs f0, 0x54(r31) +/* 80267324 00264264 38 7F 00 54 */ addi r3, r31, 0x54 +/* 80267328 00264268 D0 03 00 04 */ stfs f0, 4(r3) +/* 8026732C 0026426C C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2) +/* 80267330 00264270 D0 03 00 08 */ stfs f0, 8(r3) +/* 80267334 00264274 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha +/* 80267338 00264278 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8026733C 0026427C 38 BF 00 48 */ addi r5, r31, 0x48 +/* 80267340 00264280 48 0F A8 E5 */ bl func_80361C24 +/* 80267344 00264284 C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2) +/* 80267348 00264288 D0 1F 00 6C */ stfs f0, 0x6c(r31) +/* 8026734C 0026428C 38 7F 00 6C */ addi r3, r31, 0x6c +/* 80267350 00264290 D0 03 00 04 */ stfs f0, 4(r3) +/* 80267354 00264294 C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2) +/* 80267358 00264298 D0 03 00 08 */ stfs f0, 8(r3) +/* 8026735C 0026429C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha +/* 80267360 002642A0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80267364 002642A4 38 BF 00 60 */ addi r5, r31, 0x60 +/* 80267368 002642A8 48 0F A8 BD */ bl func_80361C24 +/* 8026736C 002642AC C0 22 B6 70 */ lfs f1, lbl_80455070-_SDA2_BASE_(r2) +/* 80267370 002642B0 D0 3F 00 84 */ stfs f1, 0x84(r31) +/* 80267374 002642B4 C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2) +/* 80267378 002642B8 38 7F 00 84 */ addi r3, r31, 0x84 +/* 8026737C 002642BC D0 03 00 04 */ stfs f0, 4(r3) +/* 80267380 002642C0 D0 23 00 08 */ stfs f1, 8(r3) +/* 80267384 002642C4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha +/* 80267388 002642C8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8026738C 002642CC 38 BF 00 78 */ addi r5, r31, 0x78 +/* 80267390 002642D0 48 0F A8 95 */ bl func_80361C24 +/* 80267394 002642D4 C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2) +/* 80267398 002642D8 D0 1F 00 9C */ stfs f0, 0x9c(r31) +/* 8026739C 002642DC C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2) +/* 802673A0 002642E0 38 7F 00 9C */ addi r3, r31, 0x9c +/* 802673A4 002642E4 D0 03 00 04 */ stfs f0, 4(r3) +/* 802673A8 002642E8 D0 03 00 08 */ stfs f0, 8(r3) +/* 802673AC 002642EC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha +/* 802673B0 002642F0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 802673B4 002642F4 38 BF 00 90 */ addi r5, r31, 0x90 +/* 802673B8 002642F8 48 0F A8 6D */ bl func_80361C24 +/* 802673BC 002642FC C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2) +/* 802673C0 00264300 D0 1F 00 B4 */ stfs f0, 0xb4(r31) +/* 802673C4 00264304 38 7F 00 B4 */ addi r3, r31, 0xb4 +/* 802673C8 00264308 D0 03 00 04 */ stfs f0, 4(r3) +/* 802673CC 0026430C D0 03 00 08 */ stfs f0, 8(r3) +/* 802673D0 00264310 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha +/* 802673D4 00264314 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 802673D8 00264318 38 BF 00 A8 */ addi r5, r31, 0xa8 +/* 802673DC 0026431C 48 0F A8 49 */ bl func_80361C24 +/* 802673E0 00264320 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802673E4 00264324 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802673E8 00264328 7C 08 03 A6 */ mtlr r0 +/* 802673EC 0026432C 38 21 00 10 */ addi r1, r1, 0x10 +/* 802673F0 00264330 4E 80 00 20 */ blr
\ No newline at end of file diff --git a/include/d/d_a/d_a_alink/asm/func_8009DD90.s b/include/d/d_a/d_a_alink/asm/func_8009DD90.s index 340af3476d..895e745295 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009DD90.s +++ b/include/d/d_a/d_a_alink/asm/func_8009DD90.s @@ -9,7 +9,7 @@ /* 8009DDB0 0009ACF0 38 80 00 00 */ li r4, 0 /* 8009DDB4 0009ACF4 38 A0 00 00 */ li r5, 0 /* 8009DDB8 0009ACF8 38 C0 00 00 */ li r6, 0 -/* 8009DDBC 0009ACFC 48 1C 96 39 */ bl csXyz_X1_ +/* 8009DDBC 0009ACFC 48 1C 96 39 */ bl __ct__5csXyzFsss /* 8009DDC0 0009AD00 3B 80 00 00 */ li r28, 0 /* 8009DDC4 0009AD04 80 DB 20 60 */ lwz r6, 0x2060(r27) /* 8009DDC8 0009AD08 80 06 00 1C */ lwz r0, 0x1c(r6) @@ -40,7 +40,7 @@ lbl_8009DDE4: /* 8009DE28 0009AD68 38 80 00 00 */ li r4, 0 /* 8009DE2C 0009AD6C 38 A0 00 01 */ li r5, 1 /* 8009DE30 0009AD70 38 C0 00 02 */ li r6, 2 -/* 8009DE34 0009AD74 48 1C 95 C1 */ bl csXyz_X1_ +/* 8009DE34 0009AD74 48 1C 95 C1 */ bl __ct__5csXyzFsss /* 8009DE38 0009AD78 80 1B 05 74 */ lwz r0, 0x574(r27) /* 8009DE3C 0009AD7C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8009DE40 0009AD80 41 82 02 1C */ beq lbl_8009E05C diff --git a/include/d/d_a/d_a_alink/asm/func_8009F034.s b/include/d/d_a/d_a_alink/asm/func_8009F034.s index 00b39a207d..ce137ff872 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009F034.s +++ b/include/d/d_a/d_a_alink/asm/func_8009F034.s @@ -103,7 +103,7 @@ lbl_8009F194: /* 8009F1AC 0009C0EC 38 61 00 7C */ addi r3, r1, 0x7c /* 8009F1B0 0009C0F0 38 9F 05 38 */ addi r4, r31, 0x538 /* 8009F1B4 0009C0F4 38 BF 34 E0 */ addi r5, r31, 0x34e0 -/* 8009F1B8 0009C0F8 48 1C 79 7D */ bl cXyz_NS___mi +/* 8009F1B8 0009C0F8 48 1C 79 7D */ bl __mi__4cXyzCFRC3Vec /* 8009F1BC 0009C0FC C0 01 00 7C */ lfs f0, 0x7c(r1) /* 8009F1C0 0009C100 D0 01 00 A0 */ stfs f0, 0xa0(r1) /* 8009F1C4 0009C104 C0 01 00 80 */ lfs f0, 0x80(r1) @@ -129,7 +129,7 @@ lbl_8009F194: /* 8009F214 0009C154 38 61 00 70 */ addi r3, r1, 0x70 /* 8009F218 0009C158 38 9F 34 E0 */ addi r4, r31, 0x34e0 /* 8009F21C 0009C15C 38 A1 00 AC */ addi r5, r1, 0xac -/* 8009F220 0009C160 48 1C 79 15 */ bl cXyz_NS___mi +/* 8009F220 0009C160 48 1C 79 15 */ bl __mi__4cXyzCFRC3Vec /* 8009F224 0009C164 C0 01 00 70 */ lfs f0, 0x70(r1) /* 8009F228 0009C168 D0 01 00 AC */ stfs f0, 0xac(r1) /* 8009F22C 0009C16C C0 01 00 74 */ lfs f0, 0x74(r1) @@ -142,7 +142,7 @@ lbl_8009F194: /* 8009F248 0009C188 48 2A 7C 05 */ bl PSMTXMultVecSR lbl_8009F24C: /* 8009F24C 0009C18C 38 61 00 A0 */ addi r3, r1, 0xa0 -/* 8009F250 0009C190 48 1C 7E D9 */ bl cXyz_NS_atan2sX_Z +/* 8009F250 0009C190 48 1C 7E D9 */ bl atan2sX_Z__4cXyzCFv /* 8009F254 0009C194 B0 7F 30 62 */ sth r3, 0x3062(r31) /* 8009F258 0009C198 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 8009F25C 0009C19C 28 00 00 C0 */ cmplwi r0, 0xc0 @@ -156,7 +156,7 @@ lbl_8009F24C: /* 8009F27C 0009C1BC 38 A1 00 AC */ addi r5, r1, 0xac /* 8009F280 0009C1C0 48 2A 7B CD */ bl PSMTXMultVecSR /* 8009F284 0009C1C4 38 61 00 AC */ addi r3, r1, 0xac -/* 8009F288 0009C1C8 48 1C 7E A1 */ bl cXyz_NS_atan2sX_Z +/* 8009F288 0009C1C8 48 1C 7E A1 */ bl atan2sX_Z__4cXyzCFv /* 8009F28C 0009C1CC 7C 79 1B 78 */ mr r25, r3 /* 8009F290 0009C1D0 48 00 00 9C */ b lbl_8009F32C lbl_8009F294: @@ -178,7 +178,7 @@ lbl_8009F294: /* 8009F2D0 0009C210 38 A1 00 AC */ addi r5, r1, 0xac /* 8009F2D4 0009C214 48 2A 7B 79 */ bl PSMTXMultVecSR /* 8009F2D8 0009C218 38 61 00 AC */ addi r3, r1, 0xac -/* 8009F2DC 0009C21C 48 1C 7E 4D */ bl cXyz_NS_atan2sX_Z +/* 8009F2DC 0009C21C 48 1C 7E 4D */ bl atan2sX_Z__4cXyzCFv /* 8009F2E0 0009C220 7C 79 1B 78 */ mr r25, r3 /* 8009F2E4 0009C224 48 00 00 48 */ b lbl_8009F32C lbl_8009F2E8: @@ -203,7 +203,7 @@ lbl_8009F31C: lbl_8009F32C: /* 8009F32C 0009C26C A8 7F 30 62 */ lha r3, 0x3062(r31) /* 8009F330 0009C270 7F 24 CB 78 */ mr r4, r25 -/* 8009F334 0009C274 48 1D 1A F1 */ bl cLib_distanceAngleS +/* 8009F334 0009C274 48 1D 1A F1 */ bl cLib_distanceAngleS__Fss /* 8009F338 0009C278 2C 03 70 00 */ cmpwi r3, 0x7000 /* 8009F33C 0009C27C 40 81 01 28 */ ble lbl_8009F464 /* 8009F340 0009C280 C0 01 00 A0 */ lfs f0, 0xa0(r1) @@ -286,12 +286,12 @@ lbl_8009F44C: /* 8009F44C 0009C38C C0 01 00 A4 */ lfs f0, 0xa4(r1) /* 8009F450 0009C390 FC 20 00 50 */ fneg f1, f0 /* 8009F454 0009C394 FC 40 10 50 */ fneg f2, f2 -/* 8009F458 0009C398 48 1C 82 1D */ bl cM_atan2s +/* 8009F458 0009C398 48 1C 82 1D */ bl cM_atan2s__Fff /* 8009F45C 0009C39C B0 7F 30 60 */ sth r3, 0x3060(r31) /* 8009F460 0009C3A0 48 00 00 10 */ b lbl_8009F470 lbl_8009F464: /* 8009F464 0009C3A4 38 61 00 A0 */ addi r3, r1, 0xa0 -/* 8009F468 0009C3A8 48 1C 7C E9 */ bl cXyz_NS_atan2sY_XZ +/* 8009F468 0009C3A8 48 1C 7C E9 */ bl atan2sY_XZ__4cXyzCFv /* 8009F46C 0009C3AC B0 7F 30 60 */ sth r3, 0x3060(r31) lbl_8009F470: /* 8009F470 0009C3B0 C0 01 00 A0 */ lfs f0, 0xa0(r1) @@ -424,7 +424,7 @@ lbl_8009F634: /* 8009F634 0009C574 38 61 00 64 */ addi r3, r1, 0x64 /* 8009F638 0009C578 38 9F 34 C8 */ addi r4, r31, 0x34c8 /* 8009F63C 0009C57C 38 A1 00 C4 */ addi r5, r1, 0xc4 -/* 8009F640 0009C580 48 1C 74 F5 */ bl cXyz_NS___mi +/* 8009F640 0009C580 48 1C 74 F5 */ bl __mi__4cXyzCFRC3Vec /* 8009F644 0009C584 C0 01 00 64 */ lfs f0, 0x64(r1) /* 8009F648 0009C588 D0 01 00 B8 */ stfs f0, 0xb8(r1) /* 8009F64C 0009C58C C0 01 00 68 */ lfs f0, 0x68(r1) @@ -438,7 +438,7 @@ lbl_8009F65C: /* 8009F668 0009C5A8 38 61 00 58 */ addi r3, r1, 0x58 /* 8009F66C 0009C5AC 38 81 00 D0 */ addi r4, r1, 0xd0 /* 8009F670 0009C5B0 FC 20 D8 90 */ fmr f1, f27 -/* 8009F674 0009C5B4 48 1C 75 11 */ bl cXyz_NS___ml +/* 8009F674 0009C5B4 48 1C 75 11 */ bl __ml__4cXyzCFf /* 8009F678 0009C5B8 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8009F67C 0009C5BC 38 81 00 58 */ addi r4, r1, 0x58 /* 8009F680 0009C5C0 7C 65 1B 78 */ mr r5, r3 @@ -659,12 +659,12 @@ lbl_8009F98C: /* 8009F98C 0009C8CC C0 01 00 98 */ lfs f0, 0x98(r1) /* 8009F990 0009C8D0 FC 20 00 50 */ fneg f1, f0 /* 8009F994 0009C8D4 FC 40 10 50 */ fneg f2, f2 -/* 8009F998 0009C8D8 48 1C 7C DD */ bl cM_atan2s +/* 8009F998 0009C8D8 48 1C 7C DD */ bl cM_atan2s__Fff /* 8009F99C 0009C8DC 7C 7B 07 34 */ extsh r27, r3 /* 8009F9A0 0009C8E0 48 00 00 10 */ b lbl_8009F9B0 lbl_8009F9A4: /* 8009F9A4 0009C8E4 38 61 00 94 */ addi r3, r1, 0x94 -/* 8009F9A8 0009C8E8 48 1C 77 A9 */ bl cXyz_NS_atan2sY_XZ +/* 8009F9A8 0009C8E8 48 1C 77 A9 */ bl atan2sY_XZ__4cXyzCFv /* 8009F9AC 0009C8EC 7C 7B 07 34 */ extsh r27, r3 lbl_8009F9B0: /* 8009F9B0 0009C8F0 3B 5F 30 3A */ addi r26, r31, 0x303a @@ -684,7 +684,7 @@ lbl_8009F9B0: /* 8009F9E8 0009C928 EF C1 00 2A */ fadds f30, f1, f0 /* 8009F9EC 0009C92C C0 21 00 BC */ lfs f1, 0xbc(r1) /* 8009F9F0 0009C930 FC 40 F0 50 */ fneg f2, f30 -/* 8009F9F4 0009C934 48 1C 7C 81 */ bl cM_atan2s +/* 8009F9F4 0009C934 48 1C 7C 81 */ bl cM_atan2s__Fff /* 8009F9F8 0009C938 A8 9F 30 60 */ lha r4, 0x3060(r31) /* 8009F9FC 0009C93C 7C 60 07 34 */ extsh r0, r3 /* 8009FA00 0009C940 7C 04 00 50 */ subf r0, r4, r0 @@ -717,7 +717,7 @@ lbl_8009FA58: /* 8009FA5C 0009C99C 7C 84 07 34 */ extsh r4, r4 /* 8009FA60 0009C9A0 38 A0 00 05 */ li r5, 5 /* 8009FA64 0009C9A4 38 C0 04 00 */ li r6, 0x400 -/* 8009FA68 0009C9A8 48 1D 0B A1 */ bl cLib_addCalcAngleS2 +/* 8009FA68 0009C9A8 48 1D 0B A1 */ bl cLib_addCalcAngleS2__FPssss lbl_8009FA6C: /* 8009FA6C 0009C9AC A8 7A 00 00 */ lha r3, 0(r26) /* 8009FA70 0009C9B0 A8 1F 30 54 */ lha r0, 0x3054(r31) @@ -750,7 +750,7 @@ lbl_8009FAC4: /* 8009FAD0 0009CA10 EC 00 07 72 */ fmuls f0, f0, f29 /* 8009FAD4 0009CA14 EC 01 00 28 */ fsubs f0, f1, f0 /* 8009FAD8 0009CA18 FC 20 00 50 */ fneg f1, f0 -/* 8009FADC 0009CA1C 48 1C 7B 99 */ bl cM_atan2s +/* 8009FADC 0009CA1C 48 1C 7B 99 */ bl cM_atan2s__Fff /* 8009FAE0 0009CA20 7C 60 07 34 */ extsh r0, r3 /* 8009FAE4 0009CA24 2C 00 D8 00 */ cmpwi r0, -10240 /* 8009FAE8 0009CA28 40 80 00 0C */ bge lbl_8009FAF4 @@ -772,7 +772,7 @@ lbl_8009FB1C: /* 8009FB1C 0009CA5C 7F 23 CB 78 */ mr r3, r25 /* 8009FB20 0009CA60 38 A0 00 05 */ li r5, 5 /* 8009FB24 0009CA64 38 C0 04 00 */ li r6, 0x400 -/* 8009FB28 0009CA68 48 1D 0A E1 */ bl cLib_addCalcAngleS2 +/* 8009FB28 0009CA68 48 1D 0A E1 */ bl cLib_addCalcAngleS2__FPssss lbl_8009FB2C: /* 8009FB2C 0009CA6C A8 79 00 00 */ lha r3, 0(r25) /* 8009FB30 0009CA70 A8 1F 30 5A */ lha r0, 0x305a(r31) @@ -855,12 +855,12 @@ lbl_8009FC50: /* 8009FC54 0009CB94 38 80 00 00 */ li r4, 0 /* 8009FC58 0009CB98 38 A0 00 05 */ li r5, 5 /* 8009FC5C 0009CB9C 38 C0 04 00 */ li r6, 0x400 -/* 8009FC60 0009CBA0 48 1D 09 A9 */ bl cLib_addCalcAngleS2 +/* 8009FC60 0009CBA0 48 1D 09 A9 */ bl cLib_addCalcAngleS2__FPssss /* 8009FC64 0009CBA4 7F 23 CB 78 */ mr r3, r25 /* 8009FC68 0009CBA8 38 80 00 00 */ li r4, 0 /* 8009FC6C 0009CBAC 38 A0 00 05 */ li r5, 5 /* 8009FC70 0009CBB0 38 C0 04 00 */ li r6, 0x400 -/* 8009FC74 0009CBB4 48 1D 09 95 */ bl cLib_addCalcAngleS2 +/* 8009FC74 0009CBB4 48 1D 09 95 */ bl cLib_addCalcAngleS2__FPssss lbl_8009FC78: /* 8009FC78 0009CBB8 A8 7A 00 00 */ lha r3, 0(r26) /* 8009FC7C 0009CBBC A8 16 00 00 */ lha r0, 0(r22) diff --git a/include/d/d_a/d_a_alink/asm/func_8009FFF8.s b/include/d/d_a/d_a_alink/asm/func_8009FFF8.s index 85b94d534b..eee9440814 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009FFF8.s +++ b/include/d/d_a/d_a_alink/asm/func_8009FFF8.s @@ -6,7 +6,7 @@ /* 800A000C 0009CF4C 38 A0 00 05 */ li r5, 5 /* 800A0010 0009CF50 38 C0 01 90 */ li r6, 0x190 /* 800A0014 0009CF54 38 E0 00 32 */ li r7, 0x32 -/* 800A0018 0009CF58 48 1D 05 29 */ bl cLib_addCalcAngleS +/* 800A0018 0009CF58 48 1D 05 29 */ bl cLib_addCalcAngleS__FPsssss /* 800A001C 0009CF5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A0020 0009CF60 7C 08 03 A6 */ mtlr r0 /* 800A0024 0009CF64 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800A002C.s b/include/d/d_a/d_a_alink/asm/func_800A002C.s index 208a5356a4..11e0bd0678 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A002C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A002C.s @@ -219,12 +219,12 @@ lbl_800A0330: /* 800A0338 0009D278 EC 00 00 B2 */ fmuls f0, f0, f2 /* 800A033C 0009D27C EF E1 00 2A */ fadds f31, f1, f0 /* 800A0340 0009D280 C0 22 93 B8 */ lfs f1, lbl_80452DB8-_SDA2_BASE_(r2) -/* 800A0344 0009D284 48 1C 76 11 */ bl cM_rndF +/* 800A0344 0009D284 48 1C 76 11 */ bl cM_rndF__Ff /* 800A0348 0009D288 C0 02 95 08 */ lfs f0, lbl_80452F08-_SDA2_BASE_(r2) /* 800A034C 0009D28C EC 00 08 2A */ fadds f0, f0, f1 /* 800A0350 0009D290 EF 7F 00 32 */ fmuls f27, f31, f0 /* 800A0354 0009D294 C0 22 93 18 */ lfs f1, lbl_80452D18-_SDA2_BASE_(r2) -/* 800A0358 0009D298 48 1C 75 FD */ bl cM_rndF +/* 800A0358 0009D298 48 1C 75 FD */ bl cM_rndF__Ff /* 800A035C 0009D29C C0 42 93 B8 */ lfs f2, lbl_80452DB8-_SDA2_BASE_(r2) /* 800A0360 0009D2A0 EC 02 08 2A */ fadds f0, f2, f1 /* 800A0364 0009D2A4 EC 00 D8 2A */ fadds f0, f0, f27 @@ -235,12 +235,12 @@ lbl_800A0330: /* 800A0378 0009D2B8 7C 00 1A 14 */ add r0, r0, r3 /* 800A037C 0009D2BC B0 1E 30 70 */ sth r0, 0x3070(r30) /* 800A0380 0009D2C0 FC 20 10 90 */ fmr f1, f2 -/* 800A0384 0009D2C4 48 1C 75 D1 */ bl cM_rndF +/* 800A0384 0009D2C4 48 1C 75 D1 */ bl cM_rndF__Ff /* 800A0388 0009D2C8 C0 02 95 08 */ lfs f0, lbl_80452F08-_SDA2_BASE_(r2) /* 800A038C 0009D2CC EC 00 08 2A */ fadds f0, f0, f1 /* 800A0390 0009D2D0 EF 7F 00 32 */ fmuls f27, f31, f0 /* 800A0394 0009D2D4 C0 22 93 18 */ lfs f1, lbl_80452D18-_SDA2_BASE_(r2) -/* 800A0398 0009D2D8 48 1C 75 BD */ bl cM_rndF +/* 800A0398 0009D2D8 48 1C 75 BD */ bl cM_rndF__Ff /* 800A039C 0009D2DC C0 02 93 B8 */ lfs f0, lbl_80452DB8-_SDA2_BASE_(r2) /* 800A03A0 0009D2E0 EC 00 08 2A */ fadds f0, f0, f1 /* 800A03A4 0009D2E4 EC 00 D8 2A */ fadds f0, f0, f27 @@ -251,12 +251,12 @@ lbl_800A0330: /* 800A03B8 0009D2F8 7C 00 1A 14 */ add r0, r0, r3 /* 800A03BC 0009D2FC B0 1E 30 72 */ sth r0, 0x3072(r30) /* 800A03C0 0009D300 C0 22 95 0C */ lfs f1, lbl_80452F0C-_SDA2_BASE_(r2) -/* 800A03C4 0009D304 48 1C 75 91 */ bl cM_rndF +/* 800A03C4 0009D304 48 1C 75 91 */ bl cM_rndF__Ff /* 800A03C8 0009D308 C0 02 94 60 */ lfs f0, lbl_80452E60-_SDA2_BASE_(r2) /* 800A03CC 0009D30C EC 00 08 2A */ fadds f0, f0, f1 /* 800A03D0 0009D310 EF 7F 00 32 */ fmuls f27, f31, f0 /* 800A03D4 0009D314 C0 22 93 18 */ lfs f1, lbl_80452D18-_SDA2_BASE_(r2) -/* 800A03D8 0009D318 48 1C 75 7D */ bl cM_rndF +/* 800A03D8 0009D318 48 1C 75 7D */ bl cM_rndF__Ff /* 800A03DC 0009D31C C0 02 93 B8 */ lfs f0, lbl_80452DB8-_SDA2_BASE_(r2) /* 800A03E0 0009D320 EC 00 08 2A */ fadds f0, f0, f1 /* 800A03E4 0009D324 EC 00 D8 2A */ fadds f0, f0, f27 @@ -267,12 +267,12 @@ lbl_800A0330: /* 800A03F8 0009D338 7C 00 1A 14 */ add r0, r0, r3 /* 800A03FC 0009D33C B0 1E 30 74 */ sth r0, 0x3074(r30) /* 800A0400 0009D340 C0 22 95 0C */ lfs f1, lbl_80452F0C-_SDA2_BASE_(r2) -/* 800A0404 0009D344 48 1C 75 51 */ bl cM_rndF +/* 800A0404 0009D344 48 1C 75 51 */ bl cM_rndF__Ff /* 800A0408 0009D348 C0 02 94 60 */ lfs f0, lbl_80452E60-_SDA2_BASE_(r2) /* 800A040C 0009D34C EC 00 08 2A */ fadds f0, f0, f1 /* 800A0410 0009D350 EF 7F 00 32 */ fmuls f27, f31, f0 /* 800A0414 0009D354 C0 22 93 18 */ lfs f1, lbl_80452D18-_SDA2_BASE_(r2) -/* 800A0418 0009D358 48 1C 75 3D */ bl cM_rndF +/* 800A0418 0009D358 48 1C 75 3D */ bl cM_rndF__Ff /* 800A041C 0009D35C C0 02 93 B8 */ lfs f0, lbl_80452DB8-_SDA2_BASE_(r2) /* 800A0420 0009D360 EC 00 08 2A */ fadds f0, f0, f1 /* 800A0424 0009D364 EC 00 D8 2A */ fadds f0, f0, f27 diff --git a/include/d/d_a/d_a_alink/asm/func_800A07D8.s b/include/d/d_a/d_a_alink/asm/func_800A07D8.s index ec79a7fc1c..0d5ad8cf3b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A07D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800A07D8.s @@ -25,9 +25,9 @@ lbl_800A082C: /* 800A082C 0009D76C 3B E0 60 00 */ li r31, 0x6000 lbl_800A0830: /* 800A0830 0009D770 38 7E 34 E0 */ addi r3, r30, 0x34e0 -/* 800A0834 0009D774 48 1D 03 D1 */ bl cLib_targetAngleY +/* 800A0834 0009D774 48 1D 03 D1 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800A0838 0009D778 A8 9E 2F E6 */ lha r4, 0x2fe6(r30) -/* 800A083C 0009D77C 48 1D 05 E9 */ bl cLib_distanceAngleS +/* 800A083C 0009D77C 48 1D 05 E9 */ bl cLib_distanceAngleS__Fss /* 800A0840 0009D780 7F E5 FE 70 */ srawi r5, r31, 0x1f /* 800A0844 0009D784 54 64 0F FE */ srwi r4, r3, 0x1f /* 800A0848 0009D788 7C 03 F8 10 */ subfc r0, r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800A093C.s b/include/d/d_a/d_a_alink/asm/func_800A093C.s index 962e99b80d..4d957f7451 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A093C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A093C.s @@ -166,12 +166,12 @@ lbl_800A0B84: /* 800A0B94 0009DAD4 A8 7F 30 F8 */ lha r3, 0x30f8(r31) /* 800A0B98 0009DAD8 2C 03 FF E2 */ cmpwi r3, -30 /* 800A0B9C 0009DADC 40 82 00 54 */ bne lbl_800A0BF0 -/* 800A0BA0 0009DAE0 48 1C 6C CD */ bl cM_rnd +/* 800A0BA0 0009DAE0 48 1C 6C CD */ bl cM_rnd__Fv /* 800A0BA4 0009DAE4 C0 02 94 44 */ lfs f0, lbl_80452E44-_SDA2_BASE_(r2) /* 800A0BA8 0009DAE8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800A0BAC 0009DAEC 40 80 00 60 */ bge lbl_800A0C0C /* 800A0BB0 0009DAF0 C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) -/* 800A0BB4 0009DAF4 48 1C 6D A1 */ bl cM_rndF +/* 800A0BB4 0009DAF4 48 1C 6D A1 */ bl cM_rndF__Ff /* 800A0BB8 0009DAF8 C0 02 92 E0 */ lfs f0, lbl_80452CE0-_SDA2_BASE_(r2) /* 800A0BBC 0009DAFC EC 00 08 2A */ fadds f0, f0, f1 /* 800A0BC0 0009DB00 FC 00 00 1E */ fctiwz f0, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800A142C.s b/include/d/d_a/d_a_alink/asm/func_800A142C.s index 4604a1b9f5..b44430b577 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A142C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A142C.s @@ -32,7 +32,7 @@ lbl_800A149C: /* 800A149C 0009E3DC 38 61 00 24 */ addi r3, r1, 0x24 /* 800A14A0 0009E3E0 38 9F 05 38 */ addi r4, r31, 0x538 /* 800A14A4 0009E3E4 38 BF 34 E0 */ addi r5, r31, 0x34e0 -/* 800A14A8 0009E3E8 48 1C 56 8D */ bl cXyz_NS___mi +/* 800A14A8 0009E3E8 48 1C 56 8D */ bl __mi__4cXyzCFRC3Vec /* 800A14AC 0009E3EC C0 01 00 24 */ lfs f0, 0x24(r1) /* 800A14B0 0009E3F0 D0 01 00 3C */ stfs f0, 0x3c(r1) /* 800A14B4 0009E3F4 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -43,10 +43,10 @@ lbl_800A149C: /* 800A14C8 0009E408 38 81 00 3C */ addi r4, r1, 0x3c /* 800A14CC 0009E40C 48 04 0F B1 */ bl daAlink_c_NS_multVecMagneBootInvMtx /* 800A14D0 0009E410 38 61 00 3C */ addi r3, r1, 0x3c -/* 800A14D4 0009E414 48 1C 5C 7D */ bl cXyz_NS_atan2sY_XZ +/* 800A14D4 0009E414 48 1C 5C 7D */ bl atan2sY_XZ__4cXyzCFv /* 800A14D8 0009E418 7C 74 1B 78 */ mr r20, r3 /* 800A14DC 0009E41C 38 61 00 3C */ addi r3, r1, 0x3c -/* 800A14E0 0009E420 48 1C 5C 49 */ bl cXyz_NS_atan2sX_Z +/* 800A14E0 0009E420 48 1C 5C 49 */ bl atan2sX_Z__4cXyzCFv /* 800A14E4 0009E424 A8 1F 31 24 */ lha r0, 0x3124(r31) /* 800A14E8 0009E428 7E 96 07 34 */ extsh r22, r20 /* 800A14EC 0009E42C 7C 00 B0 50 */ subf r0, r0, r22 @@ -73,7 +73,7 @@ lbl_800A149C: /* 800A1540 0009E480 38 61 00 18 */ addi r3, r1, 0x18 /* 800A1544 0009E484 7F 24 CB 78 */ mr r4, r25 /* 800A1548 0009E488 38 BF 34 E0 */ addi r5, r31, 0x34e0 -/* 800A154C 0009E48C 48 1C 55 E9 */ bl cXyz_NS___mi +/* 800A154C 0009E48C 48 1C 55 E9 */ bl __mi__4cXyzCFRC3Vec /* 800A1550 0009E490 C0 01 00 18 */ lfs f0, 0x18(r1) /* 800A1554 0009E494 D0 01 00 30 */ stfs f0, 0x30(r1) /* 800A1558 0009E498 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -84,10 +84,10 @@ lbl_800A149C: /* 800A156C 0009E4AC 38 81 00 30 */ addi r4, r1, 0x30 /* 800A1570 0009E4B0 48 04 0F 0D */ bl daAlink_c_NS_multVecMagneBootInvMtx /* 800A1574 0009E4B4 38 61 00 30 */ addi r3, r1, 0x30 -/* 800A1578 0009E4B8 48 1C 5B D9 */ bl cXyz_NS_atan2sY_XZ +/* 800A1578 0009E4B8 48 1C 5B D9 */ bl atan2sY_XZ__4cXyzCFv /* 800A157C 0009E4BC 7C 79 1B 78 */ mr r25, r3 /* 800A1580 0009E4C0 38 61 00 30 */ addi r3, r1, 0x30 -/* 800A1584 0009E4C4 48 1C 5B A5 */ bl cXyz_NS_atan2sX_Z +/* 800A1584 0009E4C4 48 1C 5B A5 */ bl atan2sX_Z__4cXyzCFv /* 800A1588 0009E4C8 7C 15 18 50 */ subf r0, r21, r3 /* 800A158C 0009E4CC 7C 1A 07 34 */ extsh r26, r0 /* 800A1590 0009E4D0 2C 1A 70 00 */ cmpwi r26, 0x7000 diff --git a/include/d/d_a/d_a_alink/asm/func_800A1AEC.s b/include/d/d_a/d_a_alink/asm/func_800A1AEC.s index f83d6c0b67..79db1a2334 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A1AEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800A1AEC.s @@ -15,7 +15,7 @@ /* 800A1B24 0009EA64 C3 E3 34 18 */ lfs f31, 0x3418(r3) /* 800A1B28 0009EA68 C3 C3 34 1C */ lfs f30, 0x341c(r3) /* 800A1B2C 0009EA6C C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) -/* 800A1B30 0009EA70 48 1C 5E 25 */ bl cM_rndF +/* 800A1B30 0009EA70 48 1C 5E 25 */ bl cM_rndF__Ff /* 800A1B34 0009EA74 C0 02 94 80 */ lfs f0, lbl_80452E80-_SDA2_BASE_(r2) /* 800A1B38 0009EA78 EC 00 08 2A */ fadds f0, f0, f1 /* 800A1B3C 0009EA7C FC 00 00 1E */ fctiwz f0, f0 @@ -153,7 +153,7 @@ lbl_800A1D18: /* 800A1D18 0009EC58 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) /* 800A1D1C 0009EC5C 28 00 00 60 */ cmplwi r0, 0x60 /* 800A1D20 0009EC60 41 82 00 14 */ beq lbl_800A1D34 -/* 800A1D24 0009EC64 48 1C 5B 49 */ bl cM_rnd +/* 800A1D24 0009EC64 48 1C 5B 49 */ bl cM_rnd__Fv /* 800A1D28 0009EC68 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) /* 800A1D2C 0009EC6C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800A1D30 0009EC70 40 80 00 14 */ bge lbl_800A1D44 @@ -165,10 +165,10 @@ lbl_800A1D34: lbl_800A1D44: /* 800A1D44 0009EC84 C0 3F 34 18 */ lfs f1, 0x3418(r31) /* 800A1D48 0009EC88 C0 5F 34 1C */ lfs f2, 0x341c(r31) -/* 800A1D4C 0009EC8C 48 1C 59 29 */ bl cM_atan2s +/* 800A1D4C 0009EC8C 48 1C 59 29 */ bl cM_atan2s__Fff /* 800A1D50 0009EC90 7C 7E 1B 78 */ mr r30, r3 /* 800A1D54 0009EC94 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800A1D58 0009EC98 48 1C 5B FD */ bl cM_rndF +/* 800A1D58 0009EC98 48 1C 5B FD */ bl cM_rndF__Ff /* 800A1D5C 0009EC9C FC 00 08 1E */ fctiwz f0, f1 /* 800A1D60 0009ECA0 D8 01 00 10 */ stfd f0, 0x10(r1) /* 800A1D64 0009ECA4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -197,7 +197,7 @@ lbl_800A1D9C: /* 800A1DBC 0009ECFC 48 00 00 38 */ b lbl_800A1DF4 lbl_800A1DC0: /* 800A1DC0 0009ED00 C0 22 93 8C */ lfs f1, lbl_80452D8C-_SDA2_BASE_(r2) -/* 800A1DC4 0009ED04 48 1C 5B 91 */ bl cM_rndF +/* 800A1DC4 0009ED04 48 1C 5B 91 */ bl cM_rndF__Ff /* 800A1DC8 0009ED08 FC 00 08 1E */ fctiwz f0, f1 /* 800A1DCC 0009ED0C D8 01 00 10 */ stfd f0, 0x10(r1) /* 800A1DD0 0009ED10 80 01 00 14 */ lwz r0, 0x14(r1) @@ -297,21 +297,21 @@ lbl_800A1F00: /* 800A1F10 0009EE50 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800A1F14 0009EE54 C0 62 93 A0 */ lfs f3, lbl_80452DA0-_SDA2_BASE_(r2) /* 800A1F18 0009EE58 C0 82 98 1C */ lfs f4, lbl_8045321C-_SDA2_BASE_(r2) -/* 800A1F1C 0009EE5C 48 1C DA 61 */ bl cLib_addCalc +/* 800A1F1C 0009EE5C 48 1C DA 61 */ bl cLib_addCalc__FPfffff /* 800A1F20 0009EE60 80 7F 21 84 */ lwz r3, 0x2184(r31) /* 800A1F24 0009EE64 38 63 00 FC */ addi r3, r3, 0xfc /* 800A1F28 0009EE68 FC 20 F0 90 */ fmr f1, f30 /* 800A1F2C 0009EE6C C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800A1F30 0009EE70 C0 62 93 A0 */ lfs f3, lbl_80452DA0-_SDA2_BASE_(r2) /* 800A1F34 0009EE74 C0 82 98 1C */ lfs f4, lbl_8045321C-_SDA2_BASE_(r2) -/* 800A1F38 0009EE78 48 1C DA 45 */ bl cLib_addCalc +/* 800A1F38 0009EE78 48 1C DA 45 */ bl cLib_addCalc__FPfffff /* 800A1F3C 0009EE7C 80 7F 21 80 */ lwz r3, 0x2180(r31) /* 800A1F40 0009EE80 38 63 01 00 */ addi r3, r3, 0x100 /* 800A1F44 0009EE84 FC 20 F8 90 */ fmr f1, f31 /* 800A1F48 0009EE88 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800A1F4C 0009EE8C C0 62 98 20 */ lfs f3, lbl_80453220-_SDA2_BASE_(r2) /* 800A1F50 0009EE90 C0 82 94 44 */ lfs f4, lbl_80452E44-_SDA2_BASE_(r2) -/* 800A1F54 0009EE94 48 1C DA 29 */ bl cLib_addCalc +/* 800A1F54 0009EE94 48 1C DA 29 */ bl cLib_addCalc__FPfffff /* 800A1F58 0009EE98 80 7F 21 80 */ lwz r3, 0x2180(r31) /* 800A1F5C 0009EE9C C0 03 01 00 */ lfs f0, 0x100(r3) /* 800A1F60 0009EEA0 80 7F 21 84 */ lwz r3, 0x2184(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800A22E8.s b/include/d/d_a/d_a_alink/asm/func_800A22E8.s index adffa6df48..28f614fe24 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A22E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800A22E8.s @@ -209,7 +209,7 @@ lbl_800A25CC: /* 800A25D4 0009F514 38 A0 00 04 */ li r5, 4 /* 800A25D8 0009F518 38 C0 04 B0 */ li r6, 0x4b0 /* 800A25DC 0009F51C 38 E0 00 C8 */ li r7, 0xc8 -/* 800A25E0 0009F520 48 1C DF 61 */ bl cLib_addCalcAngleS +/* 800A25E0 0009F520 48 1C DF 61 */ bl cLib_addCalcAngleS__FPsssss /* 800A25E4 0009F524 80 1E 05 74 */ lwz r0, 0x574(r30) /* 800A25E8 0009F528 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800A25EC 0009F52C 41 82 00 4C */ beq lbl_800A2638 @@ -222,7 +222,7 @@ lbl_800A25CC: /* 800A2608 0009F548 38 A0 00 02 */ li r5, 2 /* 800A260C 0009F54C 38 C0 0F A0 */ li r6, 0xfa0 /* 800A2610 0009F550 38 E0 03 E8 */ li r7, 0x3e8 -/* 800A2614 0009F554 48 1C DF 2D */ bl cLib_addCalcAngleS +/* 800A2614 0009F554 48 1C DF 2D */ bl cLib_addCalcAngleS__FPsssss /* 800A2618 0009F558 48 00 00 D8 */ b lbl_800A26F0 lbl_800A261C: /* 800A261C 0009F55C 38 7E 2F EC */ addi r3, r30, 0x2fec @@ -230,7 +230,7 @@ lbl_800A261C: /* 800A2624 0009F564 38 A0 00 04 */ li r5, 4 /* 800A2628 0009F568 38 C0 04 B0 */ li r6, 0x4b0 /* 800A262C 0009F56C 38 E0 00 C8 */ li r7, 0xc8 -/* 800A2630 0009F570 48 1C DF 11 */ bl cLib_addCalcAngleS +/* 800A2630 0009F570 48 1C DF 11 */ bl cLib_addCalcAngleS__FPsssss /* 800A2634 0009F574 48 00 00 BC */ b lbl_800A26F0 lbl_800A2638: /* 800A2638 0009F578 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) @@ -276,14 +276,14 @@ lbl_800A26B8: /* 800A26C8 0009F608 38 A0 00 02 */ li r5, 2 /* 800A26CC 0009F60C 38 C0 0F A0 */ li r6, 0xfa0 /* 800A26D0 0009F610 38 E0 03 E8 */ li r7, 0x3e8 -/* 800A26D4 0009F614 48 1C DE 6D */ bl cLib_addCalcAngleS +/* 800A26D4 0009F614 48 1C DE 6D */ bl cLib_addCalcAngleS__FPsssss /* 800A26D8 0009F618 48 00 00 18 */ b lbl_800A26F0 lbl_800A26DC: /* 800A26DC 0009F61C 38 7E 30 A2 */ addi r3, r30, 0x30a2 /* 800A26E0 0009F620 38 A0 00 04 */ li r5, 4 /* 800A26E4 0009F624 38 C0 04 B0 */ li r6, 0x4b0 /* 800A26E8 0009F628 38 E0 00 C8 */ li r7, 0xc8 -/* 800A26EC 0009F62C 48 1C DE 55 */ bl cLib_addCalcAngleS +/* 800A26EC 0009F62C 48 1C DE 55 */ bl cLib_addCalcAngleS__FPsssss lbl_800A26F0: /* 800A26F0 0009F630 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* 800A26F4 0009F634 CB E1 00 40 */ lfd f31, 0x40(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800A2C24.s b/include/d/d_a/d_a_alink/asm/func_800A2C24.s index 44dd710853..6058d67bc3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A2C24.s +++ b/include/d/d_a/d_a_alink/asm/func_800A2C24.s @@ -12,7 +12,7 @@ /* 800A2C50 0009FB90 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800A2C54 0009FB94 C0 62 97 B4 */ lfs f3, lbl_804531B4-_SDA2_BASE_(r2) /* 800A2C58 0009FB98 C0 82 93 D8 */ lfs f4, lbl_80452DD8-_SDA2_BASE_(r2) -/* 800A2C5C 0009FB9C 48 1C CD 21 */ bl cLib_addCalc +/* 800A2C5C 0009FB9C 48 1C CD 21 */ bl cLib_addCalc__FPfffff /* 800A2C60 0009FBA0 48 00 00 10 */ b lbl_800A2C70 lbl_800A2C64: /* 800A2C64 0009FBA4 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800A2CE0.s b/include/d/d_a/d_a_alink/asm/func_800A2CE0.s index 8296047454..9fae32c040 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A2CE0.s +++ b/include/d/d_a/d_a_alink/asm/func_800A2CE0.s @@ -129,7 +129,7 @@ lbl_800A2ECC: /* 800A2ECC 0009FE0C 38 61 00 6C */ addi r3, r1, 0x6c /* 800A2ED0 0009FE10 38 81 00 F0 */ addi r4, r1, 0xf0 /* 800A2ED4 0009FE14 38 A1 00 FC */ addi r5, r1, 0xfc -/* 800A2ED8 0009FE18 48 1C 3C 5D */ bl cXyz_NS___mi +/* 800A2ED8 0009FE18 48 1C 3C 5D */ bl __mi__4cXyzCFRC3Vec /* 800A2EDC 0009FE1C C0 01 00 6C */ lfs f0, 0x6c(r1) /* 800A2EE0 0009FE20 D0 01 00 CC */ stfs f0, 0xcc(r1) /* 800A2EE4 0009FE24 C0 01 00 70 */ lfs f0, 0x70(r1) @@ -139,7 +139,7 @@ lbl_800A2ECC: /* 800A2EF4 0009FE34 38 61 00 60 */ addi r3, r1, 0x60 /* 800A2EF8 0009FE38 38 81 00 E4 */ addi r4, r1, 0xe4 /* 800A2EFC 0009FE3C 38 A1 00 F0 */ addi r5, r1, 0xf0 -/* 800A2F00 0009FE40 48 1C 3C 35 */ bl cXyz_NS___mi +/* 800A2F00 0009FE40 48 1C 3C 35 */ bl __mi__4cXyzCFRC3Vec /* 800A2F04 0009FE44 C0 01 00 60 */ lfs f0, 0x60(r1) /* 800A2F08 0009FE48 D0 01 00 C0 */ stfs f0, 0xc0(r1) /* 800A2F0C 0009FE4C C0 01 00 64 */ lfs f0, 0x64(r1) @@ -177,7 +177,7 @@ lbl_800A2F84: /* 800A2F84 0009FEC4 38 61 00 54 */ addi r3, r1, 0x54 /* 800A2F88 0009FEC8 38 81 00 B4 */ addi r4, r1, 0xb4 /* 800A2F8C 0009FECC 38 A1 00 FC */ addi r5, r1, 0xfc -/* 800A2F90 0009FED0 48 1C 3B A5 */ bl cXyz_NS___mi +/* 800A2F90 0009FED0 48 1C 3B A5 */ bl __mi__4cXyzCFRC3Vec /* 800A2F94 0009FED4 C0 01 00 54 */ lfs f0, 0x54(r1) /* 800A2F98 0009FED8 D0 01 00 A8 */ stfs f0, 0xa8(r1) /* 800A2F9C 0009FEDC C0 01 00 58 */ lfs f0, 0x58(r1) @@ -242,11 +242,11 @@ lbl_800A3054: /* 800A3068 0009FFA8 38 61 00 48 */ addi r3, r1, 0x48 /* 800A306C 0009FFAC 38 81 00 A8 */ addi r4, r1, 0xa8 /* 800A3070 0009FFB0 FC 20 E8 90 */ fmr f1, f29 -/* 800A3074 0009FFB4 48 1C 3B 11 */ bl cXyz_NS___ml +/* 800A3074 0009FFB4 48 1C 3B 11 */ bl __ml__4cXyzCFf /* 800A3078 0009FFB8 38 61 00 3C */ addi r3, r1, 0x3c /* 800A307C 0009FFBC 38 81 00 FC */ addi r4, r1, 0xfc /* 800A3080 0009FFC0 38 A1 00 48 */ addi r5, r1, 0x48 -/* 800A3084 0009FFC4 48 1C 3A 61 */ bl cXyz_NS___pl +/* 800A3084 0009FFC4 48 1C 3A 61 */ bl __pl__4cXyzCFRC3Vec /* 800A3088 0009FFC8 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 800A308C 0009FFCC D0 01 00 9C */ stfs f0, 0x9c(r1) /* 800A3090 0009FFD0 C0 01 00 40 */ lfs f0, 0x40(r1) @@ -392,11 +392,11 @@ lbl_800A327C: /* 800A327C 000A01BC 38 61 00 30 */ addi r3, r1, 0x30 /* 800A3280 000A01C0 38 81 00 D8 */ addi r4, r1, 0xd8 /* 800A3284 000A01C4 EC 3F 08 24 */ fdivs f1, f31, f1 -/* 800A3288 000A01C8 48 1C 38 FD */ bl cXyz_NS___ml +/* 800A3288 000A01C8 48 1C 38 FD */ bl __ml__4cXyzCFf /* 800A328C 000A01CC 38 61 00 24 */ addi r3, r1, 0x24 /* 800A3290 000A01D0 38 81 00 9C */ addi r4, r1, 0x9c /* 800A3294 000A01D4 38 A1 00 30 */ addi r5, r1, 0x30 -/* 800A3298 000A01D8 48 1C 38 4D */ bl cXyz_NS___pl +/* 800A3298 000A01D8 48 1C 38 4D */ bl __pl__4cXyzCFRC3Vec /* 800A329C 000A01DC C0 01 00 24 */ lfs f0, 0x24(r1) /* 800A32A0 000A01E0 D0 01 00 90 */ stfs f0, 0x90(r1) /* 800A32A4 000A01E4 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -406,7 +406,7 @@ lbl_800A327C: /* 800A32B4 000A01F4 38 61 00 18 */ addi r3, r1, 0x18 /* 800A32B8 000A01F8 38 81 00 90 */ addi r4, r1, 0x90 /* 800A32BC 000A01FC 38 A1 00 FC */ addi r5, r1, 0xfc -/* 800A32C0 000A0200 48 1C 38 75 */ bl cXyz_NS___mi +/* 800A32C0 000A0200 48 1C 38 75 */ bl __mi__4cXyzCFRC3Vec /* 800A32C4 000A0204 C0 01 00 18 */ lfs f0, 0x18(r1) /* 800A32C8 000A0208 D0 01 00 84 */ stfs f0, 0x84(r1) /* 800A32CC 000A020C C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -416,7 +416,7 @@ lbl_800A327C: /* 800A32DC 000A021C 38 61 00 0C */ addi r3, r1, 0xc /* 800A32E0 000A0220 38 81 00 B4 */ addi r4, r1, 0xb4 /* 800A32E4 000A0224 38 A1 00 90 */ addi r5, r1, 0x90 -/* 800A32E8 000A0228 48 1C 38 4D */ bl cXyz_NS___mi +/* 800A32E8 000A0228 48 1C 38 4D */ bl __mi__4cXyzCFRC3Vec /* 800A32EC 000A022C C0 01 00 0C */ lfs f0, 0xc(r1) /* 800A32F0 000A0230 D0 01 00 78 */ stfs f0, 0x78(r1) /* 800A32F4 000A0234 C0 01 00 10 */ lfs f0, 0x10(r1) @@ -427,11 +427,11 @@ lbl_800A327C: /* 800A3308 000A0248 41 82 00 AC */ beq lbl_800A33B4 /* 800A330C 000A024C C0 21 00 88 */ lfs f1, 0x88(r1) /* 800A3310 000A0250 C0 41 00 8C */ lfs f2, 0x8c(r1) -/* 800A3314 000A0254 48 1C 43 61 */ bl cM_atan2s +/* 800A3314 000A0254 48 1C 43 61 */ bl cM_atan2s__Fff /* 800A3318 000A0258 7C 7C 1B 78 */ mr r28, r3 /* 800A331C 000A025C C0 21 00 7C */ lfs f1, 0x7c(r1) /* 800A3320 000A0260 C0 41 00 80 */ lfs f2, 0x80(r1) -/* 800A3324 000A0264 48 1C 43 51 */ bl cM_atan2s +/* 800A3324 000A0264 48 1C 43 51 */ bl cM_atan2s__Fff /* 800A3328 000A0268 7C 7F 1B 78 */ mr r31, r3 /* 800A332C 000A026C 7F 9A 07 34 */ extsh r26, r28 /* 800A3330 000A0270 7C 1A F8 50 */ subf r0, r26, r31 @@ -462,32 +462,32 @@ lbl_800A3378: lbl_800A3388: /* 800A3388 000A02C8 C0 21 00 D0 */ lfs f1, 0xd0(r1) /* 800A338C 000A02CC C0 41 00 D4 */ lfs f2, 0xd4(r1) -/* 800A3390 000A02D0 48 1C 42 E5 */ bl cM_atan2s +/* 800A3390 000A02D0 48 1C 42 E5 */ bl cM_atan2s__Fff /* 800A3394 000A02D4 7C 1A 18 50 */ subf r0, r26, r3 /* 800A3398 000A02D8 B0 1D 00 00 */ sth r0, 0(r29) /* 800A339C 000A02DC C0 21 00 C4 */ lfs f1, 0xc4(r1) /* 800A33A0 000A02E0 C0 41 00 C8 */ lfs f2, 0xc8(r1) -/* 800A33A4 000A02E4 48 1C 42 D1 */ bl cM_atan2s +/* 800A33A4 000A02E4 48 1C 42 D1 */ bl cM_atan2s__Fff /* 800A33A8 000A02E8 7C 1F 18 50 */ subf r0, r31, r3 /* 800A33AC 000A02EC B0 1E 00 00 */ sth r0, 0(r30) /* 800A33B0 000A02F0 48 00 00 4C */ b lbl_800A33FC lbl_800A33B4: /* 800A33B4 000A02F4 C0 21 00 84 */ lfs f1, 0x84(r1) /* 800A33B8 000A02F8 C0 41 00 88 */ lfs f2, 0x88(r1) -/* 800A33BC 000A02FC 48 1C 42 B9 */ bl cM_atan2s +/* 800A33BC 000A02FC 48 1C 42 B9 */ bl cM_atan2s__Fff /* 800A33C0 000A0300 7C 7C 1B 78 */ mr r28, r3 /* 800A33C4 000A0304 C0 21 00 78 */ lfs f1, 0x78(r1) /* 800A33C8 000A0308 C0 41 00 7C */ lfs f2, 0x7c(r1) -/* 800A33CC 000A030C 48 1C 42 A9 */ bl cM_atan2s +/* 800A33CC 000A030C 48 1C 42 A9 */ bl cM_atan2s__Fff /* 800A33D0 000A0310 7C 7B 1B 78 */ mr r27, r3 /* 800A33D4 000A0314 C0 21 00 CC */ lfs f1, 0xcc(r1) /* 800A33D8 000A0318 C0 41 00 D0 */ lfs f2, 0xd0(r1) -/* 800A33DC 000A031C 48 1C 42 99 */ bl cM_atan2s +/* 800A33DC 000A031C 48 1C 42 99 */ bl cM_atan2s__Fff /* 800A33E0 000A0320 7C 1C 18 50 */ subf r0, r28, r3 /* 800A33E4 000A0324 B0 1D 00 00 */ sth r0, 0(r29) /* 800A33E8 000A0328 C0 21 00 C0 */ lfs f1, 0xc0(r1) /* 800A33EC 000A032C C0 41 00 C4 */ lfs f2, 0xc4(r1) -/* 800A33F0 000A0330 48 1C 42 85 */ bl cM_atan2s +/* 800A33F0 000A0330 48 1C 42 85 */ bl cM_atan2s__Fff /* 800A33F4 000A0334 7C 1B 18 50 */ subf r0, r27, r3 /* 800A33F8 000A0338 B0 1E 00 00 */ sth r0, 0(r30) lbl_800A33FC: diff --git a/include/d/d_a/d_a_alink/asm/func_800A3430.s b/include/d/d_a/d_a_alink/asm/func_800A3430.s index 2ad1060757..f7496f43a5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A3430.s +++ b/include/d/d_a/d_a_alink/asm/func_800A3430.s @@ -88,11 +88,11 @@ lbl_800A3574: /* 800A357C 000A04BC 7C 84 FA 14 */ add r4, r4, r31 /* 800A3580 000A04C0 38 A1 00 6C */ addi r5, r1, 0x6c /* 800A3584 000A04C4 7C A5 FA 14 */ add r5, r5, r31 -/* 800A3588 000A04C8 48 1C 35 5D */ bl cXyz_NS___pl +/* 800A3588 000A04C8 48 1C 35 5D */ bl __pl__4cXyzCFRC3Vec /* 800A358C 000A04CC 38 61 00 30 */ addi r3, r1, 0x30 /* 800A3590 000A04D0 38 81 00 3C */ addi r4, r1, 0x3c /* 800A3594 000A04D4 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800A3598 000A04D8 48 1C 35 ED */ bl cXyz_NS___ml +/* 800A3598 000A04D8 48 1C 35 ED */ bl __ml__4cXyzCFf /* 800A359C 000A04DC C0 01 00 30 */ lfs f0, 0x30(r1) /* 800A35A0 000A04E0 D0 01 00 60 */ stfs f0, 0x60(r1) /* 800A35A4 000A04E4 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -108,7 +108,7 @@ lbl_800A35C8: /* 800A35C8 000A0508 38 61 00 24 */ addi r3, r1, 0x24 /* 800A35CC 000A050C 38 81 00 60 */ addi r4, r1, 0x60 /* 800A35D0 000A0510 38 BB 00 08 */ addi r5, r27, 8 -/* 800A35D4 000A0514 48 1C 35 61 */ bl cXyz_NS___mi +/* 800A35D4 000A0514 48 1C 35 61 */ bl __mi__4cXyzCFRC3Vec /* 800A35D8 000A0518 C0 41 00 24 */ lfs f2, 0x24(r1) /* 800A35DC 000A051C D0 41 00 54 */ stfs f2, 0x54(r1) /* 800A35E0 000A0520 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -160,7 +160,7 @@ lbl_800A3658: /* 800A368C 000A05CC D0 01 00 50 */ stfs f0, 0x50(r1) /* 800A3690 000A05D0 38 79 1D 08 */ addi r3, r25, 0x1d08 /* 800A3694 000A05D4 38 81 00 48 */ addi r4, r1, 0x48 -/* 800A3698 000A05D8 48 1C 46 91 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800A3698 000A05D8 48 1C 46 91 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800A369C 000A05DC 7E E3 BB 78 */ mr r3, r23 /* 800A36A0 000A05E0 38 99 1D 08 */ addi r4, r25, 0x1d08 /* 800A36A4 000A05E4 4B FD 0D FD */ bl cBgS_NS_GroundCross @@ -333,13 +333,13 @@ lbl_800A38EC: /* 800A38F4 000A0834 38 A0 00 02 */ li r5, 2 /* 800A38F8 000A0838 38 C0 18 00 */ li r6, 0x1800 /* 800A38FC 000A083C 38 E0 00 10 */ li r7, 0x10 -/* 800A3900 000A0840 48 1C CC 41 */ bl cLib_addCalcAngleS +/* 800A3900 000A0840 48 1C CC 41 */ bl cLib_addCalcAngleS__FPsssss /* 800A3904 000A0844 38 7F 00 04 */ addi r3, r31, 4 /* 800A3908 000A0848 A8 81 00 08 */ lha r4, 8(r1) /* 800A390C 000A084C 38 A0 00 02 */ li r5, 2 /* 800A3910 000A0850 38 C0 18 00 */ li r6, 0x1800 /* 800A3914 000A0854 38 E0 00 10 */ li r7, 0x10 -/* 800A3918 000A0858 48 1C CC 29 */ bl cLib_addCalcAngleS +/* 800A3918 000A0858 48 1C CC 29 */ bl cLib_addCalcAngleS__FPsssss /* 800A391C 000A085C 38 80 00 00 */ li r4, 0 /* 800A3920 000A0860 2C 1C 00 02 */ cmpwi r28, 2 /* 800A3924 000A0864 41 82 00 2C */ beq lbl_800A3950 @@ -358,7 +358,7 @@ lbl_800A3950: /* 800A3954 000A0894 38 A0 00 02 */ li r5, 2 /* 800A3958 000A0898 38 C0 18 00 */ li r6, 0x1800 /* 800A395C 000A089C 38 E0 00 10 */ li r7, 0x10 -/* 800A3960 000A08A0 48 1C CB E1 */ bl cLib_addCalcAngleS +/* 800A3960 000A08A0 48 1C CB E1 */ bl cLib_addCalcAngleS__FPsssss /* 800A3964 000A08A4 3B BD 00 01 */ addi r29, r29, 1 /* 800A3968 000A08A8 2C 1D 00 02 */ cmpwi r29, 2 /* 800A396C 000A08AC 3B 7B 00 02 */ addi r27, r27, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_800A39B8.s b/include/d/d_a/d_a_alink/asm/func_800A39B8.s index c9c72faf7e..a2065b5bd2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A39B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800A39B8.s @@ -62,7 +62,7 @@ lbl_800A3A74: /* 800A3AA0 000A09E0 D0 41 00 20 */ stfs f2, 0x20(r1) /* 800A3AA4 000A09E4 38 7C 1D 08 */ addi r3, r28, 0x1d08 /* 800A3AA8 000A09E8 38 81 00 18 */ addi r4, r1, 0x18 -/* 800A3AAC 000A09EC 48 1C 42 7D */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800A3AAC 000A09EC 48 1C 42 7D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800A3AB0 000A09F0 7F 03 C3 78 */ mr r3, r24 /* 800A3AB4 000A09F4 38 9C 1D 08 */ addi r4, r28, 0x1d08 /* 800A3AB8 000A09F8 4B FD 09 E9 */ bl cBgS_NS_GroundCross @@ -164,19 +164,19 @@ lbl_800A3C0C: /* 800A3C14 000A0B54 38 A0 00 02 */ li r5, 2 /* 800A3C18 000A0B58 38 C0 18 00 */ li r6, 0x1800 /* 800A3C1C 000A0B5C 38 E0 00 10 */ li r7, 0x10 -/* 800A3C20 000A0B60 48 1C C9 21 */ bl cLib_addCalcAngleS +/* 800A3C20 000A0B60 48 1C C9 21 */ bl cLib_addCalcAngleS__FPsssss /* 800A3C24 000A0B64 38 78 00 04 */ addi r3, r24, 4 /* 800A3C28 000A0B68 A8 81 00 08 */ lha r4, 8(r1) /* 800A3C2C 000A0B6C 38 A0 00 02 */ li r5, 2 /* 800A3C30 000A0B70 38 C0 18 00 */ li r6, 0x1800 /* 800A3C34 000A0B74 38 E0 00 10 */ li r7, 0x10 -/* 800A3C38 000A0B78 48 1C C9 09 */ bl cLib_addCalcAngleS +/* 800A3C38 000A0B78 48 1C C9 09 */ bl cLib_addCalcAngleS__FPsssss /* 800A3C3C 000A0B7C 38 78 00 02 */ addi r3, r24, 2 /* 800A3C40 000A0B80 A8 99 00 00 */ lha r4, 0(r25) /* 800A3C44 000A0B84 38 A0 00 02 */ li r5, 2 /* 800A3C48 000A0B88 38 C0 18 00 */ li r6, 0x1800 /* 800A3C4C 000A0B8C 38 E0 00 10 */ li r7, 0x10 -/* 800A3C50 000A0B90 48 1C C8 F1 */ bl cLib_addCalcAngleS +/* 800A3C50 000A0B90 48 1C C8 F1 */ bl cLib_addCalcAngleS__FPsssss /* 800A3C54 000A0B94 3B 5A 00 01 */ addi r26, r26, 1 /* 800A3C58 000A0B98 2C 1A 00 02 */ cmpwi r26, 2 /* 800A3C5C 000A0B9C 3B BD 00 04 */ addi r29, r29, 4 diff --git a/include/d/d_a/d_a_alink/asm/func_800A4CB4.s b/include/d/d_a/d_a_alink/asm/func_800A4CB4.s index be8461a65f..36e98d5840 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A4CB4.s +++ b/include/d/d_a/d_a_alink/asm/func_800A4CB4.s @@ -78,10 +78,10 @@ lbl_800A4DC4: /* 800A4DCC 000A1D0C 41 80 FF 84 */ blt lbl_800A4D50 /* 800A4DD0 000A1D10 38 77 0B EC */ addi r3, r23, 0xbec /* 800A4DD4 000A1D14 C0 22 94 68 */ lfs f1, lbl_80452E68-_SDA2_BASE_(r2) -/* 800A4DD8 000A1D18 48 1C A4 21 */ bl cM3dGCyl_NS_SetH +/* 800A4DD8 000A1D18 48 1C A4 21 */ bl SetH__8cM3dGCylFf /* 800A4DDC 000A1D1C 38 77 0A B0 */ addi r3, r23, 0xab0 /* 800A4DE0 000A1D20 C0 22 94 68 */ lfs f1, lbl_80452E68-_SDA2_BASE_(r2) -/* 800A4DE4 000A1D24 48 1C A4 15 */ bl cM3dGCyl_NS_SetH +/* 800A4DE4 000A1D24 48 1C A4 15 */ bl SetH__8cM3dGCylFf /* 800A4DE8 000A1D28 38 77 0F B8 */ addi r3, r23, 0xfb8 /* 800A4DEC 000A1D2C 38 9B 2E 08 */ addi r4, r27, 0x2e08 /* 800A4DF0 000A1D30 4B FD FC 45 */ bl dCcD_Sph_NS_Set diff --git a/include/d/d_a/d_a_alink/asm/func_800A5CC8.s b/include/d/d_a/d_a_alink/asm/func_800A5CC8.s index 42ecc3e0d7..e44876027a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A5CC8.s +++ b/include/d/d_a/d_a_alink/asm/func_800A5CC8.s @@ -485,7 +485,7 @@ lbl_800A638C: /* 800A6398 000A32D8 48 00 B1 B5 */ bl daAlink_c_NS_setHangWaterY /* 800A639C 000A32DC 38 7F 09 74 */ addi r3, r31, 0x974 /* 800A63A0 000A32E0 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 800A63A4 000A32E4 48 1C 8E 39 */ bl cM3dGCyl_NS_SetC +/* 800A63A4 000A32E4 48 1C 8E 39 */ bl SetC__8cM3dGCylFRC4cXyz /* 800A63A8 000A32E8 C0 1F 38 38 */ lfs f0, 0x3838(r31) /* 800A63AC 000A32EC D0 1F 34 54 */ stfs f0, 0x3454(r31) /* 800A63B0 000A32F0 7F E3 FB 78 */ mr r3, r31 @@ -583,7 +583,7 @@ lbl_800A64FC: /* 800A6500 000A3440 38 80 FF FF */ li r4, -1 /* 800A6504 000A3444 38 A0 FF FF */ li r5, -1 /* 800A6508 000A3448 38 C0 0B BE */ li r6, 0xbbe -/* 800A650C 000A344C 48 1C 0E E9 */ bl csXyz_X1_ +/* 800A650C 000A344C 48 1C 0E E9 */ bl __ct__5csXyzFsss /* 800A6510 000A3450 38 00 00 00 */ li r0, 0 /* 800A6514 000A3454 90 01 00 08 */ stw r0, 8(r1) /* 800A6518 000A3458 38 60 02 C1 */ li r3, 0x2c1 diff --git a/include/d/d_a/d_a_alink/asm/func_800A67E0.s b/include/d/d_a/d_a_alink/asm/func_800A67E0.s index 4d95ee3d44..76bf63e899 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A67E0.s +++ b/include/d/d_a/d_a_alink/asm/func_800A67E0.s @@ -48,7 +48,7 @@ lbl_800A6830: /* 800A6890 000A37D0 48 2A 04 DD */ bl PSMTXMultVec /* 800A6894 000A37D4 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800A6898 000A37D8 38 81 00 2C */ addi r4, r1, 0x2c -/* 800A689C 000A37DC 48 1C 14 8D */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800A689C 000A37DC 48 1C 14 8D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800A68A0 000A37E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800A68A4 000A37E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A68A8 000A37E8 3B C3 0F 38 */ addi r30, r3, 0xf38 @@ -77,7 +77,7 @@ lbl_800A68F4: lbl_800A68F8: /* 800A68F8 000A3838 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800A68FC 000A383C 38 81 00 20 */ addi r4, r1, 0x20 -/* 800A6900 000A3840 48 1C 14 29 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800A6900 000A3840 48 1C 14 29 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800A6904 000A3844 7F C3 F3 78 */ mr r3, r30 /* 800A6908 000A3848 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 800A690C 000A384C 4B FC DB 95 */ bl cBgS_NS_GroundCross @@ -104,7 +104,7 @@ lbl_800A6950: /* 800A6950 000A3890 38 61 00 08 */ addi r3, r1, 8 /* 800A6954 000A3894 38 81 00 2C */ addi r4, r1, 0x2c /* 800A6958 000A3898 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800A695C 000A389C 48 1C 01 D9 */ bl cXyz_NS___mi +/* 800A695C 000A389C 48 1C 01 D9 */ bl __mi__4cXyzCFRC3Vec /* 800A6960 000A38A0 C0 01 00 08 */ lfs f0, 8(r1) /* 800A6964 000A38A4 D0 01 00 14 */ stfs f0, 0x14(r1) /* 800A6968 000A38A8 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -112,10 +112,10 @@ lbl_800A6950: /* 800A6970 000A38B0 C0 01 00 10 */ lfs f0, 0x10(r1) /* 800A6974 000A38B4 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 800A6978 000A38B8 38 61 00 14 */ addi r3, r1, 0x14 -/* 800A697C 000A38BC 48 1C 07 D5 */ bl cXyz_NS_atan2sY_XZ +/* 800A697C 000A38BC 48 1C 07 D5 */ bl atan2sY_XZ__4cXyzCFv /* 800A6980 000A38C0 7C 7E 1B 78 */ mr r30, r3 /* 800A6984 000A38C4 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 800A6988 000A38C8 48 1C A4 9D */ bl cLib_distanceAngleS +/* 800A6988 000A38C8 48 1C A4 9D */ bl cLib_distanceAngleS__Fss /* 800A698C 000A38CC 2C 03 10 00 */ cmpwi r3, 0x1000 /* 800A6990 000A38D0 40 80 00 6C */ bge lbl_800A69FC /* 800A6994 000A38D4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800A6B0C.s b/include/d/d_a/d_a_alink/asm/func_800A6B0C.s index 8651678312..62cef0c6d5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A6B0C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A6B0C.s @@ -11,7 +11,7 @@ /* 800A6B34 000A3A74 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800A6B38 000A3A78 C0 62 92 9C */ lfs f3, lbl_80452C9C-_SDA2_BASE_(r2) /* 800A6B3C 000A3A7C C0 82 93 3C */ lfs f4, lbl_80452D3C-_SDA2_BASE_(r2) -/* 800A6B40 000A3A80 48 1C 8E 3D */ bl cLib_addCalc +/* 800A6B40 000A3A80 48 1C 8E 3D */ bl cLib_addCalc__FPfffff /* 800A6B44 000A3A84 C0 1F 05 2C */ lfs f0, 0x52c(r31) /* 800A6B48 000A3A88 FC 00 02 10 */ fabs f0, f0 /* 800A6B4C 000A3A8C FC 20 00 18 */ frsp f1, f0 @@ -48,7 +48,7 @@ /* 800A6BC8 000A3B08 D0 61 00 2C */ stfs f3, 0x2c(r1) /* 800A6BCC 000A3B0C 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800A6BD0 000A3B10 38 81 00 24 */ addi r4, r1, 0x24 -/* 800A6BD4 000A3B14 48 1C 11 55 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800A6BD4 000A3B14 48 1C 11 55 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800A6BD8 000A3B18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800A6BDC 000A3B1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A6BE0 000A3B20 38 63 0F 38 */ addi r3, r3, 0xf38 @@ -74,7 +74,7 @@ lbl_800A6C2C: /* 800A6C2C 000A3B6C 38 61 00 18 */ addi r3, r1, 0x18 /* 800A6C30 000A3B70 38 9F 37 98 */ addi r4, r31, 0x3798 /* 800A6C34 000A3B74 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 800A6C38 000A3B78 48 1B FE FD */ bl cXyz_NS___mi +/* 800A6C38 000A3B78 48 1B FE FD */ bl __mi__4cXyzCFRC3Vec /* 800A6C3C 000A3B7C C0 41 00 18 */ lfs f2, 0x18(r1) /* 800A6C40 000A3B80 D0 41 00 24 */ stfs f2, 0x24(r1) /* 800A6C44 000A3B84 C0 01 00 1C */ lfs f0, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800A6DCC.s b/include/d/d_a/d_a_alink/asm/func_800A6DCC.s index 584a53e003..8a78299e71 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A6DCC.s +++ b/include/d/d_a/d_a_alink/asm/func_800A6DCC.s @@ -113,7 +113,7 @@ lbl_800A6F14: /* 800A6F64 000A3EA4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800A6F68 000A3EA8 41 82 00 40 */ beq lbl_800A6FA8 /* 800A6F6C 000A3EAC 38 7F 35 C4 */ addi r3, r31, 0x35c4 -/* 800A6F70 000A3EB0 48 1C 01 B9 */ bl cXyz_NS_atan2sX_Z +/* 800A6F70 000A3EB0 48 1C 01 B9 */ bl atan2sX_Z__4cXyzCFv /* 800A6F74 000A3EB4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800A6F78 000A3EB8 7C 00 18 50 */ subf r0, r0, r3 /* 800A6F7C 000A3EBC C0 02 94 68 */ lfs f0, lbl_80452E68-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800A7050.s b/include/d/d_a/d_a_alink/asm/func_800A7050.s index 85b1ff5e64..ac05199e49 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A7050.s +++ b/include/d/d_a/d_a_alink/asm/func_800A7050.s @@ -54,17 +54,17 @@ lbl_800A7114: /* 800A711C 000A405C FC 40 F0 90 */ fmr f2, f30 /* 800A7120 000A4060 C0 62 93 50 */ lfs f3, lbl_80452D50-_SDA2_BASE_(r2) /* 800A7124 000A4064 FC 80 E8 90 */ fmr f4, f29 -/* 800A7128 000A4068 48 1C 88 55 */ bl cLib_addCalc +/* 800A7128 000A4068 48 1C 88 55 */ bl cLib_addCalc__FPfffff /* 800A712C 000A406C 38 7F 35 CC */ addi r3, r31, 0x35cc /* 800A7130 000A4070 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800A7134 000A4074 FC 40 F0 90 */ fmr f2, f30 /* 800A7138 000A4078 C0 62 93 50 */ lfs f3, lbl_80452D50-_SDA2_BASE_(r2) /* 800A713C 000A407C FC 80 E8 90 */ fmr f4, f29 -/* 800A7140 000A4080 48 1C 88 3D */ bl cLib_addCalc +/* 800A7140 000A4080 48 1C 88 3D */ bl cLib_addCalc__FPfffff /* 800A7144 000A4084 38 61 00 48 */ addi r3, r1, 0x48 /* 800A7148 000A4088 38 9F 35 28 */ addi r4, r31, 0x3528 /* 800A714C 000A408C 38 BF 04 F8 */ addi r5, r31, 0x4f8 -/* 800A7150 000A4090 48 1B F9 E5 */ bl cXyz_NS___mi +/* 800A7150 000A4090 48 1B F9 E5 */ bl __mi__4cXyzCFRC3Vec /* 800A7154 000A4094 C0 41 00 48 */ lfs f2, 0x48(r1) /* 800A7158 000A4098 D0 41 00 54 */ stfs f2, 0x54(r1) /* 800A715C 000A409C C0 01 00 4C */ lfs f0, 0x4c(r1) @@ -154,7 +154,7 @@ lbl_800A7284: /* 800A7284 000A41C4 38 61 00 3C */ addi r3, r1, 0x3c /* 800A7288 000A41C8 38 81 00 54 */ addi r4, r1, 0x54 /* 800A728C 000A41CC FC 20 F8 90 */ fmr f1, f31 -/* 800A7290 000A41D0 48 1B F8 F5 */ bl cXyz_NS___ml +/* 800A7290 000A41D0 48 1B F8 F5 */ bl __ml__4cXyzCFf /* 800A7294 000A41D4 38 7F 35 C4 */ addi r3, r31, 0x35c4 /* 800A7298 000A41D8 38 81 00 3C */ addi r4, r1, 0x3c /* 800A729C 000A41DC 7C 65 1B 78 */ mr r5, r3 @@ -163,7 +163,7 @@ lbl_800A7284: /* 800A72A8 000A41E8 38 81 00 54 */ addi r4, r1, 0x54 /* 800A72AC 000A41EC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800A72B0 000A41F0 EC 20 F8 28 */ fsubs f1, f0, f31 -/* 800A72B4 000A41F4 48 1B F8 D1 */ bl cXyz_NS___ml +/* 800A72B4 000A41F4 48 1B F8 D1 */ bl __ml__4cXyzCFf /* 800A72B8 000A41F8 38 7F 04 F8 */ addi r3, r31, 0x4f8 /* 800A72BC 000A41FC 38 81 00 30 */ addi r4, r1, 0x30 /* 800A72C0 000A4200 7C 65 1B 78 */ mr r5, r3 @@ -179,11 +179,11 @@ lbl_800A7284: lbl_800A72E8: /* 800A72E8 000A4228 38 61 00 24 */ addi r3, r1, 0x24 /* 800A72EC 000A422C 38 81 00 54 */ addi r4, r1, 0x54 -/* 800A72F0 000A4230 48 1B FC 59 */ bl cXyz_NS_normalizeZP +/* 800A72F0 000A4230 48 1B FC 59 */ bl normalizeZP__4cXyzFv /* 800A72F4 000A4234 38 61 00 18 */ addi r3, r1, 0x18 /* 800A72F8 000A4238 38 81 00 54 */ addi r4, r1, 0x54 /* 800A72FC 000A423C C0 22 93 78 */ lfs f1, lbl_80452D78-_SDA2_BASE_(r2) -/* 800A7300 000A4240 48 1B F8 85 */ bl cXyz_NS___ml +/* 800A7300 000A4240 48 1B F8 85 */ bl __ml__4cXyzCFf /* 800A7304 000A4244 38 7F 35 C4 */ addi r3, r31, 0x35c4 /* 800A7308 000A4248 38 81 00 18 */ addi r4, r1, 0x18 /* 800A730C 000A424C 7C 65 1B 78 */ mr r5, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800A7358.s b/include/d/d_a/d_a_alink/asm/func_800A7358.s index cbe9206f9e..70ee646616 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A7358.s +++ b/include/d/d_a/d_a_alink/asm/func_800A7358.s @@ -115,7 +115,7 @@ lbl_800A74C8: /* 800A7508 000A4448 FF E0 00 90 */ fmr f31, f0 lbl_800A750C: /* 800A750C 000A444C 38 61 00 28 */ addi r3, r1, 0x28 -/* 800A7510 000A4450 48 1B FC 19 */ bl cXyz_NS_atan2sX_Z +/* 800A7510 000A4450 48 1B FC 19 */ bl atan2sX_Z__4cXyzCFv /* 800A7514 000A4454 A8 1E 04 DE */ lha r0, 0x4de(r30) /* 800A7518 000A4458 7C 60 18 50 */ subf r3, r0, r3 /* 800A751C 000A445C 3C 63 00 01 */ addis r3, r3, 1 @@ -192,7 +192,7 @@ lbl_800A761C: /* 800A7620 000A4560 38 81 00 28 */ addi r4, r1, 0x28 /* 800A7624 000A4564 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) /* 800A7628 000A4568 FC 60 08 90 */ fmr f3, f1 -/* 800A762C 000A456C 48 1C 84 8D */ bl cLib_addCalcPos +/* 800A762C 000A456C 48 1C 84 8D */ bl cLib_addCalcPos__FP4cXyzRC4cXyzfff /* 800A7630 000A4570 48 00 02 CC */ b lbl_800A78FC lbl_800A7634: /* 800A7634 000A4574 88 1E 2F BD */ lbz r0, 0x2fbd(r30) @@ -297,7 +297,7 @@ lbl_800A7794: /* 800A77A0 000A46E0 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) lbl_800A77A4: /* 800A77A4 000A46E4 C0 41 00 38 */ lfs f2, 0x38(r1) -/* 800A77A8 000A46E8 48 1B FE CD */ bl cM_atan2s +/* 800A77A8 000A46E8 48 1B FE CD */ bl cM_atan2s__Fff /* 800A77AC 000A46EC 7C 60 07 34 */ extsh r0, r3 /* 800A77B0 000A46F0 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) /* 800A77B4 000A46F4 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -314,7 +314,7 @@ lbl_800A77A4: /* 800A77E0 000A4720 D0 01 00 38 */ stfs f0, 0x38(r1) /* 800A77E4 000A4724 38 61 00 1C */ addi r3, r1, 0x1c /* 800A77E8 000A4728 38 81 00 34 */ addi r4, r1, 0x34 -/* 800A77EC 000A472C 48 1B F7 5D */ bl cXyz_NS_normalizeZP +/* 800A77EC 000A472C 48 1B F7 5D */ bl normalizeZP__4cXyzFv /* 800A77F0 000A4730 C0 42 94 D4 */ lfs f2, lbl_80452ED4-_SDA2_BASE_(r2) /* 800A77F4 000A4734 A8 1E 31 22 */ lha r0, 0x3122(r30) /* 800A77F8 000A4738 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) @@ -378,7 +378,7 @@ lbl_800A78AC: /* 800A78CC 000A480C C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) /* 800A78D0 000A4810 C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) /* 800A78D4 000A4814 C0 62 93 F8 */ lfs f3, lbl_80452DF8-_SDA2_BASE_(r2) -/* 800A78D8 000A4818 48 1C 81 E1 */ bl cLib_addCalcPos +/* 800A78D8 000A4818 48 1C 81 E1 */ bl cLib_addCalcPos__FP4cXyzRC4cXyzfff /* 800A78DC 000A481C 48 00 00 20 */ b lbl_800A78FC lbl_800A78E0: /* 800A78E0 000A4820 3C 60 80 43 */ lis r3, lbl_80430CF4@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800A7950.s b/include/d/d_a/d_a_alink/asm/func_800A7950.s index 65228cabfd..f104add13a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A7950.s +++ b/include/d/d_a/d_a_alink/asm/func_800A7950.s @@ -20,7 +20,7 @@ lbl_800A799C: /* 800A799C 000A48DC A8 7E 30 CC */ lha r3, 0x30cc(r30) /* 800A79A0 000A48E0 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800A79A4 000A48E4 48 1C 94 81 */ bl cLib_distanceAngleS +/* 800A79A4 000A48E4 48 1C 94 81 */ bl cLib_distanceAngleS__Fss /* 800A79A8 000A48E8 3B E0 00 00 */ li r31, 0 /* 800A79AC 000A48EC 2C 03 60 00 */ cmpwi r3, 0x6000 /* 800A79B0 000A48F0 40 80 00 1C */ bge lbl_800A79CC diff --git a/include/d/d_a/d_a_alink/asm/func_800A7ABC.s b/include/d/d_a/d_a_alink/asm/func_800A7ABC.s index 50a9466b17..c2fde1f4bf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A7ABC.s +++ b/include/d/d_a/d_a_alink/asm/func_800A7ABC.s @@ -18,11 +18,11 @@ /* 800A7B00 000A4A40 3C A0 80 39 */ lis r5, lbl_8038D664@ha /* 800A7B04 000A4A44 3B E5 D6 64 */ addi r31, r5, lbl_8038D664@l /* 800A7B08 000A4A48 C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 800A7B0C 000A4A4C 48 1B F0 79 */ bl cXyz_NS___ml +/* 800A7B0C 000A4A4C 48 1B F0 79 */ bl __ml__4cXyzCFf /* 800A7B10 000A4A50 38 61 00 0C */ addi r3, r1, 0xc /* 800A7B14 000A4A54 38 81 00 30 */ addi r4, r1, 0x30 /* 800A7B18 000A4A58 38 A1 00 18 */ addi r5, r1, 0x18 -/* 800A7B1C 000A4A5C 48 1B F0 19 */ bl cXyz_NS___mi +/* 800A7B1C 000A4A5C 48 1B F0 19 */ bl __mi__4cXyzCFRC3Vec /* 800A7B20 000A4A60 C0 01 00 0C */ lfs f0, 0xc(r1) /* 800A7B24 000A4A64 D0 01 00 24 */ stfs f0, 0x24(r1) /* 800A7B28 000A4A68 C0 01 00 10 */ lfs f0, 0x10(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800A7CB0.s b/include/d/d_a/d_a_alink/asm/func_800A7CB0.s index f24935a850..2b40c2bf5f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A7CB0.s +++ b/include/d/d_a/d_a_alink/asm/func_800A7CB0.s @@ -140,7 +140,7 @@ lbl_800A7E70: /* 800A7EA8 000A4DE8 38 61 00 48 */ addi r3, r1, 0x48 /* 800A7EAC 000A4DEC 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800A7EB0 000A4DF0 38 A5 04 D0 */ addi r5, r5, 0x4d0 -/* 800A7EB4 000A4DF4 48 1B EC 81 */ bl cXyz_NS___mi +/* 800A7EB4 000A4DF4 48 1B EC 81 */ bl __mi__4cXyzCFRC3Vec /* 800A7EB8 000A4DF8 C0 01 00 48 */ lfs f0, 0x48(r1) /* 800A7EBC 000A4DFC D0 01 00 54 */ stfs f0, 0x54(r1) /* 800A7EC0 000A4E00 C0 01 00 4C */ lfs f0, 0x4c(r1) @@ -152,7 +152,7 @@ lbl_800A7ED4: /* 800A7ED4 000A4E14 38 61 00 3C */ addi r3, r1, 0x3c /* 800A7ED8 000A4E18 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800A7EDC 000A4E1C 38 BE 00 38 */ addi r5, r30, 0x38 -/* 800A7EE0 000A4E20 48 1B EC 55 */ bl cXyz_NS___mi +/* 800A7EE0 000A4E20 48 1B EC 55 */ bl __mi__4cXyzCFRC3Vec /* 800A7EE4 000A4E24 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 800A7EE8 000A4E28 D0 01 00 54 */ stfs f0, 0x54(r1) /* 800A7EEC 000A4E2C C0 01 00 40 */ lfs f0, 0x40(r1) @@ -164,7 +164,7 @@ lbl_800A7EFC: /* 800A7F00 000A4E40 D0 01 00 58 */ stfs f0, 0x58(r1) /* 800A7F04 000A4E44 38 61 00 30 */ addi r3, r1, 0x30 /* 800A7F08 000A4E48 38 81 00 54 */ addi r4, r1, 0x54 -/* 800A7F0C 000A4E4C 48 1B F0 3D */ bl cXyz_NS_normalizeZP +/* 800A7F0C 000A4E4C 48 1B F0 3D */ bl normalizeZP__4cXyzFv /* 800A7F10 000A4E50 7F A3 EB 78 */ mr r3, r29 /* 800A7F14 000A4E54 48 29 F2 25 */ bl PSVECSquareMag /* 800A7F18 000A4E58 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -312,7 +312,7 @@ lbl_800A80F4: /* 800A8104 000A5044 40 82 00 34 */ bne lbl_800A8138 /* 800A8108 000A5048 38 61 00 24 */ addi r3, r1, 0x24 /* 800A810C 000A504C 38 81 00 54 */ addi r4, r1, 0x54 -/* 800A8110 000A5050 48 1B EE 39 */ bl cXyz_NS_normalizeZP +/* 800A8110 000A5050 48 1B EE 39 */ bl normalizeZP__4cXyzFv /* 800A8114 000A5054 7F E3 FB 78 */ mr r3, r31 /* 800A8118 000A5058 38 81 00 54 */ addi r4, r1, 0x54 /* 800A811C 000A505C 4B FF F9 A1 */ bl daAlink_c_NS_checkWindWallRate @@ -389,9 +389,9 @@ lbl_800A8210: /* 800A8218 000A5158 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) /* 800A821C 000A515C FC 40 F8 90 */ fmr f2, f31 /* 800A8220 000A5160 FC 60 08 90 */ fmr f3, f1 -/* 800A8224 000A5164 48 1C 78 95 */ bl cLib_addCalcPos +/* 800A8224 000A5164 48 1C 78 95 */ bl cLib_addCalcPos__FP4cXyzRC4cXyzfff /* 800A8228 000A5168 38 7F 35 B8 */ addi r3, r31, 0x35b8 -/* 800A822C 000A516C 48 1B EE FD */ bl cXyz_NS_atan2sX_Z +/* 800A822C 000A516C 48 1B EE FD */ bl atan2sX_Z__4cXyzCFv /* 800A8230 000A5170 B0 7F 30 CC */ sth r3, 0x30cc(r31) /* 800A8234 000A5174 7F E3 FB 78 */ mr r3, r31 /* 800A8238 000A5178 38 80 00 01 */ li r4, 1 @@ -415,7 +415,7 @@ lbl_800A8210: /* 800A8280 000A51C0 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) /* 800A8284 000A51C4 FC 40 F8 90 */ fmr f2, f31 /* 800A8288 000A51C8 FC 60 08 90 */ fmr f3, f1 -/* 800A828C 000A51CC 48 1C 78 2D */ bl cLib_addCalcPos +/* 800A828C 000A51CC 48 1C 78 2D */ bl cLib_addCalcPos__FP4cXyzRC4cXyzfff /* 800A8290 000A51D0 48 00 00 60 */ b lbl_800A82F0 lbl_800A8294: /* 800A8294 000A51D4 3C 60 80 43 */ lis r3, lbl_80430CF4@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800A8CE4.s b/include/d/d_a/d_a_alink/asm/func_800A8CE4.s index f3525d8362..83fb12c194 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A8CE4.s +++ b/include/d/d_a/d_a_alink/asm/func_800A8CE4.s @@ -23,7 +23,7 @@ lbl_800A8D30: /* 800A8D34 000A5C74 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800A8D38 000A5C78 C0 62 93 1C */ lfs f3, lbl_80452D1C-_SDA2_BASE_(r2) /* 800A8D3C 000A5C7C C0 82 92 C4 */ lfs f4, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800A8D40 000A5C80 48 1C 6C 3D */ bl cLib_addCalc +/* 800A8D40 000A5C80 48 1C 6C 3D */ bl cLib_addCalc__FPfffff /* 800A8D44 000A5C84 7F E3 FB 78 */ mr r3, r31 /* 800A8D48 000A5C88 81 9F 06 28 */ lwz r12, 0x628(r31) /* 800A8D4C 000A5C8C 81 8C 01 94 */ lwz r12, 0x194(r12) diff --git a/include/d/d_a/d_a_alink/asm/func_800AA2E0.s b/include/d/d_a/d_a_alink/asm/func_800AA2E0.s index 2dcc48f938..71ef165327 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AA2E0.s +++ b/include/d/d_a/d_a_alink/asm/func_800AA2E0.s @@ -59,7 +59,7 @@ lbl_800AA350: /* 800AA3C0 000A7300 FC 20 00 90 */ fmr f1, f0 lbl_800AA3C4: /* 800AA3C4 000A7304 38 7F 12 14 */ addi r3, r31, 0x1214 -/* 800AA3C8 000A7308 48 1C 4E 31 */ bl cM3dGCyl_NS_SetH +/* 800AA3C8 000A7308 48 1C 4E 31 */ bl SetH__8cM3dGCylFf /* 800AA3CC 000A730C 2C 1A 00 00 */ cmpwi r26, 0 /* 800AA3D0 000A7310 41 82 00 14 */ beq lbl_800AA3E4 /* 800AA3D4 000A7314 38 7F 10 F0 */ addi r3, r31, 0x10f0 @@ -75,7 +75,7 @@ lbl_800AA3F0: /* 800AA3F4 000A7334 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA3F8 000A7338 38 63 23 3C */ addi r3, r3, 0x233c /* 800AA3FC 000A733C 38 9F 10 F0 */ addi r4, r31, 0x10f0 -/* 800AA400 000A7340 48 1B A7 A9 */ bl cCcS_NS_Set +/* 800AA400 000A7340 48 1B A7 A9 */ bl Set__4cCcSFP8cCcD_Obj /* 800AA404 000A7344 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AA408 000A7348 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA40C 000A734C 38 63 4B 88 */ addi r3, r3, 0x4b88 @@ -87,15 +87,15 @@ lbl_800AA420: /* 800AA420 000A7360 38 61 00 50 */ addi r3, r1, 0x50 /* 800AA424 000A7364 38 9F 05 BC */ addi r4, r31, 0x5bc /* 800AA428 000A7368 38 BF 34 98 */ addi r5, r31, 0x3498 -/* 800AA42C 000A736C 48 1B C7 09 */ bl cXyz_NS___mi +/* 800AA42C 000A736C 48 1B C7 09 */ bl __mi__4cXyzCFRC3Vec /* 800AA430 000A7370 38 61 00 44 */ addi r3, r1, 0x44 /* 800AA434 000A7374 38 81 00 50 */ addi r4, r1, 0x50 /* 800AA438 000A7378 C0 3F 33 D0 */ lfs f1, 0x33d0(r31) -/* 800AA43C 000A737C 48 1B C7 49 */ bl cXyz_NS___ml +/* 800AA43C 000A737C 48 1B C7 49 */ bl __ml__4cXyzCFf /* 800AA440 000A7380 38 61 00 38 */ addi r3, r1, 0x38 /* 800AA444 000A7384 38 81 00 44 */ addi r4, r1, 0x44 /* 800AA448 000A7388 38 BF 34 98 */ addi r5, r31, 0x3498 -/* 800AA44C 000A738C 48 1B C6 99 */ bl cXyz_NS___pl +/* 800AA44C 000A738C 48 1B C6 99 */ bl __pl__4cXyzCFRC3Vec /* 800AA450 000A7390 C0 01 00 38 */ lfs f0, 0x38(r1) /* 800AA454 000A7394 D0 01 00 74 */ stfs f0, 0x74(r1) /* 800AA458 000A7398 C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -105,15 +105,15 @@ lbl_800AA420: /* 800AA468 000A73A8 38 61 00 2C */ addi r3, r1, 0x2c /* 800AA46C 000A73AC 38 9F 34 B0 */ addi r4, r31, 0x34b0 /* 800AA470 000A73B0 38 BF 34 BC */ addi r5, r31, 0x34bc -/* 800AA474 000A73B4 48 1B C6 C1 */ bl cXyz_NS___mi +/* 800AA474 000A73B4 48 1B C6 C1 */ bl __mi__4cXyzCFRC3Vec /* 800AA478 000A73B8 38 61 00 20 */ addi r3, r1, 0x20 /* 800AA47C 000A73BC 38 81 00 2C */ addi r4, r1, 0x2c /* 800AA480 000A73C0 C0 3F 33 D0 */ lfs f1, 0x33d0(r31) -/* 800AA484 000A73C4 48 1B C7 01 */ bl cXyz_NS___ml +/* 800AA484 000A73C4 48 1B C7 01 */ bl __ml__4cXyzCFf /* 800AA488 000A73C8 38 61 00 14 */ addi r3, r1, 0x14 /* 800AA48C 000A73CC 38 81 00 20 */ addi r4, r1, 0x20 /* 800AA490 000A73D0 38 BF 34 BC */ addi r5, r31, 0x34bc -/* 800AA494 000A73D4 48 1B C6 51 */ bl cXyz_NS___pl +/* 800AA494 000A73D4 48 1B C6 51 */ bl __pl__4cXyzCFRC3Vec /* 800AA498 000A73D8 C0 01 00 14 */ lfs f0, 0x14(r1) /* 800AA49C 000A73DC D0 01 00 68 */ stfs f0, 0x68(r1) /* 800AA4A0 000A73E0 C0 01 00 18 */ lfs f0, 0x18(r1) @@ -123,15 +123,15 @@ lbl_800AA420: /* 800AA4B0 000A73F0 38 7F 13 50 */ addi r3, r31, 0x1350 /* 800AA4B4 000A73F4 38 9F 34 98 */ addi r4, r31, 0x3498 /* 800AA4B8 000A73F8 38 A1 00 74 */ addi r5, r1, 0x74 -/* 800AA4BC 000A73FC 48 1C 4E 2D */ bl cM3dGLin_NS_SetStartEnd +/* 800AA4BC 000A73FC 48 1C 4E 2D */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz /* 800AA4C0 000A7400 38 7F 14 94 */ addi r3, r31, 0x1494 /* 800AA4C4 000A7404 38 81 00 68 */ addi r4, r1, 0x68 /* 800AA4C8 000A7408 38 A1 00 74 */ addi r5, r1, 0x74 -/* 800AA4CC 000A740C 48 1C 4E 1D */ bl cM3dGLin_NS_SetStartEnd +/* 800AA4CC 000A740C 48 1C 4E 1D */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz /* 800AA4D0 000A7410 38 7F 15 D8 */ addi r3, r31, 0x15d8 /* 800AA4D4 000A7414 38 9F 34 98 */ addi r4, r31, 0x3498 /* 800AA4D8 000A7418 38 A1 00 68 */ addi r5, r1, 0x68 -/* 800AA4DC 000A741C 48 1C 4E 0D */ bl cM3dGLin_NS_SetStartEnd +/* 800AA4DC 000A741C 48 1C 4E 0D */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz /* 800AA4E0 000A7420 80 1F 12 2C */ lwz r0, 0x122c(r31) /* 800AA4E4 000A7424 60 00 00 01 */ ori r0, r0, 1 /* 800AA4E8 000A7428 90 1F 12 2C */ stw r0, 0x122c(r31) @@ -149,7 +149,7 @@ lbl_800AA514: /* 800AA514 000A7454 38 61 00 08 */ addi r3, r1, 8 /* 800AA518 000A7458 38 9F 05 BC */ addi r4, r31, 0x5bc /* 800AA51C 000A745C 38 BF 34 B0 */ addi r5, r31, 0x34b0 -/* 800AA520 000A7460 48 1B C6 15 */ bl cXyz_NS___mi +/* 800AA520 000A7460 48 1B C6 15 */ bl __mi__4cXyzCFRC3Vec /* 800AA524 000A7464 C0 01 00 08 */ lfs f0, 8(r1) /* 800AA528 000A7468 D0 01 00 5C */ stfs f0, 0x5c(r1) /* 800AA52C 000A746C C0 01 00 0C */ lfs f0, 0xc(r1) @@ -186,7 +186,7 @@ lbl_800AA59C: /* 800AA5A0 000A74E0 3B 7E 12 2C */ addi r27, r30, 0x122c /* 800AA5A4 000A74E4 7F 7F DA 14 */ add r27, r31, r27 /* 800AA5A8 000A74E8 7F 64 DB 78 */ mr r4, r27 -/* 800AA5AC 000A74EC 48 1B A5 FD */ bl cCcS_NS_Set +/* 800AA5AC 000A74EC 48 1B A5 FD */ bl Set__4cCcSFP8cCcD_Obj /* 800AA5B0 000A74F0 7F 83 E3 78 */ mr r3, r28 /* 800AA5B4 000A74F4 7F 64 DB 78 */ mr r4, r27 /* 800AA5B8 000A74F8 38 A0 00 01 */ li r5, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800AA7EC.s b/include/d/d_a/d_a_alink/asm/func_800AA7EC.s index ac8ac12615..9a173abc60 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AA7EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800AA7EC.s @@ -29,12 +29,12 @@ lbl_800AA850: /* 800AA858 000A7798 40 82 00 40 */ bne lbl_800AA898 /* 800AA85C 000A779C 38 7F 12 14 */ addi r3, r31, 0x1214 /* 800AA860 000A77A0 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 800AA864 000A77A4 48 1C 49 79 */ bl cM3dGCyl_NS_SetC +/* 800AA864 000A77A4 48 1C 49 79 */ bl SetC__8cM3dGCylFRC4cXyz /* 800AA868 000A77A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AA86C 000A77AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA870 000A77B0 38 63 23 3C */ addi r3, r3, 0x233c /* 800AA874 000A77B4 38 9F 10 F0 */ addi r4, r31, 0x10f0 -/* 800AA878 000A77B8 48 1B A3 31 */ bl cCcS_NS_Set +/* 800AA878 000A77B8 48 1B A3 31 */ bl Set__4cCcSFP8cCcD_Obj /* 800AA87C 000A77BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AA880 000A77C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA884 000A77C4 38 63 4B 88 */ addi r3, r3, 0x4b88 @@ -114,7 +114,7 @@ lbl_800AA988: /* 800AA98C 000A78CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA990 000A78D0 38 63 23 3C */ addi r3, r3, 0x233c /* 800AA994 000A78D4 38 9F 10 F0 */ addi r4, r31, 0x10f0 -/* 800AA998 000A78D8 48 1B A2 11 */ bl cCcS_NS_Set +/* 800AA998 000A78D8 48 1B A2 11 */ bl Set__4cCcSFP8cCcD_Obj /* 800AA99C 000A78DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AA9A0 000A78E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA9A4 000A78E4 38 63 4B 88 */ addi r3, r3, 0x4b88 diff --git a/include/d/d_a/d_a_alink/asm/func_800AAABC.s b/include/d/d_a/d_a_alink/asm/func_800AAABC.s index 6eb7076a6f..16a2501231 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AAABC.s +++ b/include/d/d_a/d_a_alink/asm/func_800AAABC.s @@ -36,7 +36,7 @@ lbl_800AAB10: /* 800AAB44 000A7A84 38 7E 13 50 */ addi r3, r30, 0x1350 /* 800AAB48 000A7A88 38 81 00 CC */ addi r4, r1, 0xcc /* 800AAB4C 000A7A8C 38 BE 37 20 */ addi r5, r30, 0x3720 -/* 800AAB50 000A7A90 48 1C 47 99 */ bl cM3dGLin_NS_SetStartEnd +/* 800AAB50 000A7A90 48 1C 47 99 */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz /* 800AAB54 000A7A94 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800AAB58 000A7A98 38 83 9A 20 */ addi r4, r3, lbl_80439A20@l /* 800AAB5C 000A7A9C A8 1E 04 E6 */ lha r0, 0x4e6(r30) @@ -60,7 +60,7 @@ lbl_800AAB10: /* 800AABA4 000A7AE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AABA8 000A7AE8 38 63 23 3C */ addi r3, r3, 0x233c /* 800AABAC 000A7AEC 38 9E 12 2C */ addi r4, r30, 0x122c -/* 800AABB0 000A7AF0 48 1B 9F F9 */ bl cCcS_NS_Set +/* 800AABB0 000A7AF0 48 1B 9F F9 */ bl Set__4cCcSFP8cCcD_Obj /* 800AABB4 000A7AF4 48 00 08 B0 */ b lbl_800AB464 lbl_800AABB8: /* 800AABB8 000A7AF8 38 7E 12 2C */ addi r3, r30, 0x122c @@ -109,7 +109,7 @@ lbl_800AABC4: /* 800AAC60 000A7BA0 38 61 00 9C */ addi r3, r1, 0x9c /* 800AAC64 000A7BA4 38 81 00 CC */ addi r4, r1, 0xcc /* 800AAC68 000A7BA8 38 A1 00 B4 */ addi r5, r1, 0xb4 -/* 800AAC6C 000A7BAC 48 1B BE 79 */ bl cXyz_NS___pl +/* 800AAC6C 000A7BAC 48 1B BE 79 */ bl __pl__4cXyzCFRC3Vec /* 800AAC70 000A7BB0 C0 01 00 9C */ lfs f0, 0x9c(r1) /* 800AAC74 000A7BB4 D0 01 00 C0 */ stfs f0, 0xc0(r1) /* 800AAC78 000A7BB8 C0 01 00 A0 */ lfs f0, 0xa0(r1) @@ -119,7 +119,7 @@ lbl_800AABC4: /* 800AAC88 000A7BC8 38 7E 13 50 */ addi r3, r30, 0x1350 /* 800AAC8C 000A7BCC 38 81 00 CC */ addi r4, r1, 0xcc /* 800AAC90 000A7BD0 38 A1 00 C0 */ addi r5, r1, 0xc0 -/* 800AAC94 000A7BD4 48 1C 46 55 */ bl cM3dGLin_NS_SetStartEnd +/* 800AAC94 000A7BD4 48 1C 46 55 */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz /* 800AAC98 000A7BD8 C0 01 00 B4 */ lfs f0, 0xb4(r1) /* 800AAC9C 000A7BDC D0 1E 12 B0 */ stfs f0, 0x12b0(r30) /* 800AACA0 000A7BE0 C0 01 00 B8 */ lfs f0, 0xb8(r1) @@ -130,7 +130,7 @@ lbl_800AABC4: /* 800AACB4 000A7BF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AACB8 000A7BF8 38 63 23 3C */ addi r3, r3, 0x233c /* 800AACBC 000A7BFC 38 9E 12 2C */ addi r4, r30, 0x122c -/* 800AACC0 000A7C00 48 1B 9E E9 */ bl cCcS_NS_Set +/* 800AACC0 000A7C00 48 1B 9E E9 */ bl Set__4cCcSFP8cCcD_Obj /* 800AACC4 000A7C04 48 00 07 A0 */ b lbl_800AB464 lbl_800AACC8: /* 800AACC8 000A7C08 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) @@ -153,17 +153,17 @@ lbl_800AACC8: /* 800AAD0C 000A7C4C 40 80 07 58 */ bge lbl_800AB464 /* 800AAD10 000A7C50 38 7E 12 14 */ addi r3, r30, 0x1214 /* 800AAD14 000A7C54 EC 21 00 28 */ fsubs f1, f1, f0 -/* 800AAD18 000A7C58 48 1C 44 E1 */ bl cM3dGCyl_NS_SetH +/* 800AAD18 000A7C58 48 1C 44 E1 */ bl SetH__8cM3dGCylFf /* 800AAD1C 000A7C5C C0 1E 27 D0 */ lfs f0, 0x27d0(r30) /* 800AAD20 000A7C60 D0 01 00 DC */ stfs f0, 0xdc(r1) /* 800AAD24 000A7C64 38 7E 12 14 */ addi r3, r30, 0x1214 /* 800AAD28 000A7C68 38 81 00 D8 */ addi r4, r1, 0xd8 -/* 800AAD2C 000A7C6C 48 1C 44 B1 */ bl cM3dGCyl_NS_SetC +/* 800AAD2C 000A7C6C 48 1C 44 B1 */ bl SetC__8cM3dGCylFRC4cXyz /* 800AAD30 000A7C70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AAD34 000A7C74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AAD38 000A7C78 38 63 23 3C */ addi r3, r3, 0x233c /* 800AAD3C 000A7C7C 38 9E 10 F0 */ addi r4, r30, 0x10f0 -/* 800AAD40 000A7C80 48 1B 9E 69 */ bl cCcS_NS_Set +/* 800AAD40 000A7C80 48 1B 9E 69 */ bl Set__4cCcSFP8cCcD_Obj /* 800AAD44 000A7C84 48 00 07 20 */ b lbl_800AB464 lbl_800AAD48: /* 800AAD48 000A7C88 38 7E 10 F0 */ addi r3, r30, 0x10f0 @@ -203,11 +203,11 @@ lbl_800AADA8: /* 800AADC4 000A7D04 38 81 00 B4 */ addi r4, r1, 0xb4 /* 800AADC8 000A7D08 38 BF 09 44 */ addi r5, r31, 0x944 /* 800AADCC 000A7D0C C0 25 00 70 */ lfs f1, 0x70(r5) -/* 800AADD0 000A7D10 48 1B BD B5 */ bl cXyz_NS___ml +/* 800AADD0 000A7D10 48 1B BD B5 */ bl __ml__4cXyzCFf /* 800AADD4 000A7D14 38 61 00 84 */ addi r3, r1, 0x84 /* 800AADD8 000A7D18 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 800AADDC 000A7D1C 38 A1 00 90 */ addi r5, r1, 0x90 -/* 800AADE0 000A7D20 48 1B BD 05 */ bl cXyz_NS___pl +/* 800AADE0 000A7D20 48 1B BD 05 */ bl __pl__4cXyzCFRC3Vec /* 800AADE4 000A7D24 C0 01 00 84 */ lfs f0, 0x84(r1) /* 800AADE8 000A7D28 D0 01 00 CC */ stfs f0, 0xcc(r1) /* 800AADEC 000A7D2C C0 01 00 88 */ lfs f0, 0x88(r1) @@ -223,11 +223,11 @@ lbl_800AADA8: /* 800AAE14 000A7D54 38 61 00 78 */ addi r3, r1, 0x78 /* 800AAE18 000A7D58 38 81 00 D8 */ addi r4, r1, 0xd8 /* 800AAE1C 000A7D5C C0 22 93 04 */ lfs f1, lbl_80452D04-_SDA2_BASE_(r2) -/* 800AAE20 000A7D60 48 1B BD 65 */ bl cXyz_NS___ml +/* 800AAE20 000A7D60 48 1B BD 65 */ bl __ml__4cXyzCFf /* 800AAE24 000A7D64 38 61 00 6C */ addi r3, r1, 0x6c /* 800AAE28 000A7D68 38 81 00 CC */ addi r4, r1, 0xcc /* 800AAE2C 000A7D6C 38 A1 00 78 */ addi r5, r1, 0x78 -/* 800AAE30 000A7D70 48 1B BC B5 */ bl cXyz_NS___pl +/* 800AAE30 000A7D70 48 1B BC B5 */ bl __pl__4cXyzCFRC3Vec /* 800AAE34 000A7D74 C0 01 00 6C */ lfs f0, 0x6c(r1) /* 800AAE38 000A7D78 D0 01 00 C0 */ stfs f0, 0xc0(r1) /* 800AAE3C 000A7D7C C0 01 00 70 */ lfs f0, 0x70(r1) @@ -237,7 +237,7 @@ lbl_800AADA8: /* 800AAE4C 000A7D8C 38 7E 17 1C */ addi r3, r30, 0x171c /* 800AAE50 000A7D90 38 81 00 CC */ addi r4, r1, 0xcc /* 800AAE54 000A7D94 38 A1 00 C0 */ addi r5, r1, 0xc0 -/* 800AAE58 000A7D98 48 1C 44 91 */ bl cM3dGLin_NS_SetStartEnd +/* 800AAE58 000A7D98 48 1C 44 91 */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz /* 800AAE5C 000A7D9C 38 61 00 B4 */ addi r3, r1, 0xb4 /* 800AAE60 000A7DA0 7C 64 1B 78 */ mr r4, r3 /* 800AAE64 000A7DA4 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) @@ -252,7 +252,7 @@ lbl_800AADA8: /* 800AAE88 000A7DC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AAE8C 000A7DCC 38 63 23 3C */ addi r3, r3, 0x233c /* 800AAE90 000A7DD0 38 9E 15 F8 */ addi r4, r30, 0x15f8 -/* 800AAE94 000A7DD4 48 1B 9D 15 */ bl cCcS_NS_Set +/* 800AAE94 000A7DD4 48 1B 9D 15 */ bl Set__4cCcSFP8cCcD_Obj /* 800AAE98 000A7DD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AAE9C 000A7DDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AAEA0 000A7DE0 38 63 4B 88 */ addi r3, r3, 0x4b88 @@ -282,11 +282,11 @@ lbl_800AAEC0: /* 800AAEF8 000A7E38 38 61 00 60 */ addi r3, r1, 0x60 /* 800AAEFC 000A7E3C 38 9E 05 E0 */ addi r4, r30, 0x5e0 /* 800AAF00 000A7E40 38 BE 05 EC */ addi r5, r30, 0x5ec -/* 800AAF04 000A7E44 48 1B BB E1 */ bl cXyz_NS___pl +/* 800AAF04 000A7E44 48 1B BB E1 */ bl __pl__4cXyzCFRC3Vec /* 800AAF08 000A7E48 38 61 00 54 */ addi r3, r1, 0x54 /* 800AAF0C 000A7E4C 38 81 00 60 */ addi r4, r1, 0x60 /* 800AAF10 000A7E50 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800AAF14 000A7E54 48 1B BC 71 */ bl cXyz_NS___ml +/* 800AAF14 000A7E54 48 1B BC 71 */ bl __ml__4cXyzCFf /* 800AAF18 000A7E58 C0 01 00 54 */ lfs f0, 0x54(r1) /* 800AAF1C 000A7E5C D0 01 00 A8 */ stfs f0, 0xa8(r1) /* 800AAF20 000A7E60 C0 01 00 58 */ lfs f0, 0x58(r1) @@ -295,7 +295,7 @@ lbl_800AAEC0: /* 800AAF2C 000A7E6C D0 01 00 B0 */ stfs f0, 0xb0(r1) /* 800AAF30 000A7E70 38 7E 10 DC */ addi r3, r30, 0x10dc /* 800AAF34 000A7E74 38 81 00 A8 */ addi r4, r1, 0xa8 -/* 800AAF38 000A7E78 48 1C 47 11 */ bl cM3dGSph_NS_SetC +/* 800AAF38 000A7E78 48 1C 47 11 */ bl SetC__8cM3dGSphFRC4cXyz /* 800AAF3C 000A7E7C 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800AAF40 000A7E80 38 83 9A 20 */ addi r4, r3, lbl_80439A20@l /* 800AAF44 000A7E84 A8 1E 04 E6 */ lha r0, 0x4e6(r30) @@ -319,7 +319,7 @@ lbl_800AAEC0: /* 800AAF8C 000A7ECC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AAF90 000A7ED0 38 63 23 3C */ addi r3, r3, 0x233c /* 800AAF94 000A7ED4 38 9E 0F B8 */ addi r4, r30, 0xfb8 -/* 800AAF98 000A7ED8 48 1B 9C 11 */ bl cCcS_NS_Set +/* 800AAF98 000A7ED8 48 1B 9C 11 */ bl Set__4cCcSFP8cCcD_Obj /* 800AAF9C 000A7EDC 48 00 04 C8 */ b lbl_800AB464 lbl_800AAFA0: /* 800AAFA0 000A7EE0 38 7E 0F B8 */ addi r3, r30, 0xfb8 @@ -355,7 +355,7 @@ lbl_800AAFFC: /* 800AB008 000A7F48 38 61 00 48 */ addi r3, r1, 0x48 /* 800AB00C 000A7F4C 38 9E 37 EC */ addi r4, r30, 0x37ec /* 800AB010 000A7F50 38 BE 37 E0 */ addi r5, r30, 0x37e0 -/* 800AB014 000A7F54 48 1B BB 21 */ bl cXyz_NS___mi +/* 800AB014 000A7F54 48 1B BB 21 */ bl __mi__4cXyzCFRC3Vec /* 800AB018 000A7F58 C0 01 00 48 */ lfs f0, 0x48(r1) /* 800AB01C 000A7F5C D0 01 00 D8 */ stfs f0, 0xd8(r1) /* 800AB020 000A7F60 C0 01 00 4C */ lfs f0, 0x4c(r1) @@ -438,9 +438,9 @@ lbl_800AB11C: /* 800AB130 000A8070 EF DF 08 28 */ fsubs f30, f31, f1 lbl_800AB134: /* 800AB134 000A8074 38 61 00 D8 */ addi r3, r1, 0xd8 -/* 800AB138 000A8078 48 1B BF F1 */ bl cXyz_NS_atan2sX_Z +/* 800AB138 000A8078 48 1B BF F1 */ bl atan2sX_Z__4cXyzCFv /* 800AB13C 000A807C A8 9E 30 1E */ lha r4, 0x301e(r30) -/* 800AB140 000A8080 48 1C 5C E5 */ bl cLib_distanceAngleS +/* 800AB140 000A8080 48 1C 5C E5 */ bl cLib_distanceAngleS__Fss /* 800AB144 000A8084 2C 03 40 00 */ cmpwi r3, 0x4000 /* 800AB148 000A8088 40 81 00 48 */ ble lbl_800AB190 /* 800AB14C 000A808C C3 C2 92 BC */ lfs f30, lbl_80452CBC-_SDA2_BASE_(r2) @@ -475,11 +475,11 @@ lbl_800AB190: /* 800AB1B4 000A80F4 38 61 00 3C */ addi r3, r1, 0x3c /* 800AB1B8 000A80F8 38 9E 37 F8 */ addi r4, r30, 0x37f8 /* 800AB1BC 000A80FC FC 20 F0 90 */ fmr f1, f30 -/* 800AB1C0 000A8100 48 1B B9 C5 */ bl cXyz_NS___ml +/* 800AB1C0 000A8100 48 1B B9 C5 */ bl __ml__4cXyzCFf /* 800AB1C4 000A8104 38 61 00 30 */ addi r3, r1, 0x30 /* 800AB1C8 000A8108 38 9E 37 EC */ addi r4, r30, 0x37ec /* 800AB1CC 000A810C 38 A1 00 3C */ addi r5, r1, 0x3c -/* 800AB1D0 000A8110 48 1B B9 15 */ bl cXyz_NS___pl +/* 800AB1D0 000A8110 48 1B B9 15 */ bl __pl__4cXyzCFRC3Vec /* 800AB1D4 000A8114 C0 01 00 30 */ lfs f0, 0x30(r1) /* 800AB1D8 000A8118 D0 01 00 C0 */ stfs f0, 0xc0(r1) /* 800AB1DC 000A811C C0 01 00 34 */ lfs f0, 0x34(r1) @@ -508,11 +508,11 @@ lbl_800AB234: /* 800AB234 000A8174 38 7E 13 50 */ addi r3, r30, 0x1350 /* 800AB238 000A8178 38 81 00 CC */ addi r4, r1, 0xcc /* 800AB23C 000A817C 38 A1 00 C0 */ addi r5, r1, 0xc0 -/* 800AB240 000A8180 48 1C 40 A9 */ bl cM3dGLin_NS_SetStartEnd +/* 800AB240 000A8180 48 1C 40 A9 */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz /* 800AB244 000A8184 38 61 00 24 */ addi r3, r1, 0x24 /* 800AB248 000A8188 38 81 00 C0 */ addi r4, r1, 0xc0 /* 800AB24C 000A818C 38 A1 00 CC */ addi r5, r1, 0xcc -/* 800AB250 000A8190 48 1B B8 E5 */ bl cXyz_NS___mi +/* 800AB250 000A8190 48 1B B8 E5 */ bl __mi__4cXyzCFRC3Vec /* 800AB254 000A8194 C0 21 00 24 */ lfs f1, 0x24(r1) /* 800AB258 000A8198 D0 21 00 B4 */ stfs f1, 0xb4(r1) /* 800AB25C 000A819C C0 01 00 28 */ lfs f0, 0x28(r1) @@ -528,7 +528,7 @@ lbl_800AB234: /* 800AB284 000A81C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB288 000A81C8 38 63 23 3C */ addi r3, r3, 0x233c /* 800AB28C 000A81CC 38 9E 12 2C */ addi r4, r30, 0x122c -/* 800AB290 000A81D0 48 1B 99 19 */ bl cCcS_NS_Set +/* 800AB290 000A81D0 48 1B 99 19 */ bl Set__4cCcSFP8cCcD_Obj /* 800AB294 000A81D4 48 00 01 D0 */ b lbl_800AB464 lbl_800AB298: /* 800AB298 000A81D8 38 7E 12 2C */ addi r3, r30, 0x122c @@ -580,7 +580,7 @@ lbl_800AB33C: /* 800AB340 000A8280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB344 000A8284 38 63 23 3C */ addi r3, r3, 0x233c /* 800AB348 000A8288 38 9E 0F B8 */ addi r4, r30, 0xfb8 -/* 800AB34C 000A828C 48 1B 98 5D */ bl cCcS_NS_Set +/* 800AB34C 000A828C 48 1B 98 5D */ bl Set__4cCcSFP8cCcD_Obj /* 800AB350 000A8290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AB354 000A8294 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB358 000A8298 38 63 4B 88 */ addi r3, r3, 0x4b88 @@ -630,7 +630,7 @@ lbl_800AB3EC: /* 800AB3F4 000A8334 3B A3 23 3C */ addi r29, r3, 0x233c /* 800AB3F8 000A8338 7F A3 EB 78 */ mr r3, r29 /* 800AB3FC 000A833C 38 9E 0F B8 */ addi r4, r30, 0xfb8 -/* 800AB400 000A8340 48 1B 97 A9 */ bl cCcS_NS_Set +/* 800AB400 000A8340 48 1B 97 A9 */ bl Set__4cCcSFP8cCcD_Obj /* 800AB404 000A8344 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AB408 000A8348 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB40C 000A834C 38 63 4B 88 */ addi r3, r3, 0x4b88 @@ -647,10 +647,10 @@ lbl_800AB3EC: lbl_800AB438: /* 800AB438 000A8378 38 7E 18 9C */ addi r3, r30, 0x189c /* 800AB43C 000A837C 38 9E 37 F8 */ addi r4, r30, 0x37f8 -/* 800AB440 000A8380 48 1C 42 09 */ bl cM3dGSph_NS_SetC +/* 800AB440 000A8380 48 1C 42 09 */ bl SetC__8cM3dGSphFRC4cXyz /* 800AB444 000A8384 7F A3 EB 78 */ mr r3, r29 /* 800AB448 000A8388 38 9E 17 78 */ addi r4, r30, 0x1778 -/* 800AB44C 000A838C 48 1B 97 5D */ bl cCcS_NS_Set +/* 800AB44C 000A838C 48 1B 97 5D */ bl Set__4cCcSFP8cCcD_Obj /* 800AB450 000A8390 48 00 00 14 */ b lbl_800AB464 lbl_800AB454: /* 800AB454 000A8394 38 7E 0F B8 */ addi r3, r30, 0xfb8 @@ -758,11 +758,11 @@ lbl_800AB5D0: /* 800AB5D0 000A8510 38 61 00 18 */ addi r3, r1, 0x18 /* 800AB5D4 000A8514 38 9E 36 A8 */ addi r4, r30, 0x36a8 /* 800AB5D8 000A8518 C0 22 93 00 */ lfs f1, lbl_80452D00-_SDA2_BASE_(r2) -/* 800AB5DC 000A851C 48 1B B5 A9 */ bl cXyz_NS___ml +/* 800AB5DC 000A851C 48 1B B5 A9 */ bl __ml__4cXyzCFf /* 800AB5E0 000A8520 38 61 00 0C */ addi r3, r1, 0xc /* 800AB5E4 000A8524 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 800AB5E8 000A8528 38 A1 00 18 */ addi r5, r1, 0x18 -/* 800AB5EC 000A852C 48 1B B4 F9 */ bl cXyz_NS___pl +/* 800AB5EC 000A852C 48 1B B4 F9 */ bl __pl__4cXyzCFRC3Vec /* 800AB5F0 000A8530 C0 01 00 0C */ lfs f0, 0xc(r1) /* 800AB5F4 000A8534 D0 01 00 D8 */ stfs f0, 0xd8(r1) /* 800AB5F8 000A8538 C0 01 00 10 */ lfs f0, 0x10(r1) @@ -771,7 +771,7 @@ lbl_800AB5D0: /* 800AB604 000A8544 D0 01 00 E0 */ stfs f0, 0xe0(r1) /* 800AB608 000A8548 38 7E 10 DC */ addi r3, r30, 0x10dc /* 800AB60C 000A854C 38 81 00 D8 */ addi r4, r1, 0xd8 -/* 800AB610 000A8550 48 1C 40 39 */ bl cM3dGSph_NS_SetC +/* 800AB610 000A8550 48 1C 40 39 */ bl SetC__8cM3dGSphFRC4cXyz /* 800AB614 000A8554 3C 60 80 43 */ lis r3, lbl_80430CF4@ha /* 800AB618 000A8558 C4 23 0C F4 */ lfsu f1, lbl_80430CF4@l(r3) /* 800AB61C 000A855C D0 21 00 D8 */ stfs f1, 0xd8(r1) @@ -788,7 +788,7 @@ lbl_800AB5D0: /* 800AB648 000A8588 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB64C 000A858C 38 63 23 3C */ addi r3, r3, 0x233c /* 800AB650 000A8590 38 9E 0F B8 */ addi r4, r30, 0xfb8 -/* 800AB654 000A8594 48 1B 95 55 */ bl cCcS_NS_Set +/* 800AB654 000A8594 48 1B 95 55 */ bl Set__4cCcSFP8cCcD_Obj /* 800AB658 000A8598 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AB65C 000A859C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB660 000A85A0 38 63 4B 88 */ addi r3, r3, 0x4b88 @@ -806,7 +806,7 @@ lbl_800AB5D0: /* 800AB690 000A85D0 C0 5E 05 F4 */ lfs f2, 0x5f4(r30) /* 800AB694 000A85D4 C0 1E 05 E8 */ lfs f0, 0x5e8(r30) /* 800AB698 000A85D8 EC 42 00 28 */ fsubs f2, f2, f0 -/* 800AB69C 000A85DC 48 1B BF D9 */ bl cM_atan2s +/* 800AB69C 000A85DC 48 1B BF D9 */ bl cM_atan2s__Fff /* 800AB6A0 000A85E0 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800AB6A4 000A85E4 7C 00 18 50 */ subf r0, r0, r3 /* 800AB6A8 000A85E8 B0 1E 30 12 */ sth r0, 0x3012(r30) @@ -831,12 +831,12 @@ lbl_800AB6D0: /* 800AB6EC 000A862C D0 41 00 E0 */ stfs f2, 0xe0(r1) /* 800AB6F0 000A8630 38 7E 12 14 */ addi r3, r30, 0x1214 /* 800AB6F4 000A8634 38 81 00 D8 */ addi r4, r1, 0xd8 -/* 800AB6F8 000A8638 48 1C 3A E5 */ bl cM3dGCyl_NS_SetC +/* 800AB6F8 000A8638 48 1C 3A E5 */ bl SetC__8cM3dGCylFRC4cXyz /* 800AB6FC 000A863C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AB700 000A8640 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB704 000A8644 38 63 23 3C */ addi r3, r3, 0x233c /* 800AB708 000A8648 38 9E 10 F0 */ addi r4, r30, 0x10f0 -/* 800AB70C 000A864C 48 1B 94 9D */ bl cCcS_NS_Set +/* 800AB70C 000A864C 48 1B 94 9D */ bl Set__4cCcSFP8cCcD_Obj /* 800AB710 000A8650 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AB714 000A8654 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB718 000A8658 38 63 4B 88 */ addi r3, r3, 0x4b88 @@ -867,7 +867,7 @@ lbl_800AB734: /* 800AB778 000A86B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB77C 000A86BC 38 63 23 3C */ addi r3, r3, 0x233c /* 800AB780 000A86C0 38 9E 10 F0 */ addi r4, r30, 0x10f0 -/* 800AB784 000A86C4 48 1B 94 25 */ bl cCcS_NS_Set +/* 800AB784 000A86C4 48 1B 94 25 */ bl Set__4cCcSFP8cCcD_Obj lbl_800AB788: /* 800AB788 000A86C8 7F C3 F3 78 */ mr r3, r30 /* 800AB78C 000A86CC 48 02 5C 21 */ bl daAlink_c_NS_checkCutTypeNoBlur @@ -900,7 +900,7 @@ lbl_800AB7C4: /* 800AB7F0 000A8730 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB7F4 000A8734 38 63 23 3C */ addi r3, r3, 0x233c /* 800AB7F8 000A8738 38 9E 10 F0 */ addi r4, r30, 0x10f0 -/* 800AB7FC 000A873C 48 1B 93 AD */ bl cCcS_NS_Set +/* 800AB7FC 000A873C 48 1B 93 AD */ bl Set__4cCcSFP8cCcD_Obj lbl_800AB800: /* 800AB800 000A8740 7F C3 F3 78 */ mr r3, r30 /* 800AB804 000A8744 48 02 5B A9 */ bl daAlink_c_NS_checkCutTypeNoBlur diff --git a/include/d/d_a/d_a_alink/asm/func_800AB878.s b/include/d/d_a/d_a_alink/asm/func_800AB878.s index 55d42d88e9..4148362731 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AB878.s +++ b/include/d/d_a/d_a_alink/asm/func_800AB878.s @@ -59,7 +59,7 @@ lbl_800AB93C: lbl_800AB958: /* 800AB958 000A8898 38 7F 09 74 */ addi r3, r31, 0x974 /* 800AB95C 000A889C 38 81 00 44 */ addi r4, r1, 0x44 -/* 800AB960 000A88A0 48 1C 38 7D */ bl cM3dGCyl_NS_SetC +/* 800AB960 000A88A0 48 1C 38 7D */ bl SetC__8cM3dGCylFRC4cXyz /* 800AB964 000A88A4 80 7F 06 50 */ lwz r3, 0x650(r31) /* 800AB968 000A88A8 80 63 00 84 */ lwz r3, 0x84(r3) /* 800AB96C 000A88AC 80 63 00 0C */ lwz r3, 0xc(r3) @@ -103,15 +103,15 @@ lbl_800AB9E0: lbl_800AB9FC: /* 800AB9FC 000A893C 38 7F 0B EC */ addi r3, r31, 0xbec /* 800ABA00 000A8940 38 81 00 44 */ addi r4, r1, 0x44 -/* 800ABA04 000A8944 48 1C 37 D9 */ bl cM3dGCyl_NS_SetC +/* 800ABA04 000A8944 48 1C 37 D9 */ bl SetC__8cM3dGCylFRC4cXyz /* 800ABA08 000A8948 38 61 00 14 */ addi r3, r1, 0x14 /* 800ABA0C 000A894C 38 9F 09 74 */ addi r4, r31, 0x974 /* 800ABA10 000A8950 38 BF 0B EC */ addi r5, r31, 0xbec -/* 800ABA14 000A8954 48 1B B0 D1 */ bl cXyz_NS___pl +/* 800ABA14 000A8954 48 1B B0 D1 */ bl __pl__4cXyzCFRC3Vec /* 800ABA18 000A8958 38 61 00 08 */ addi r3, r1, 8 /* 800ABA1C 000A895C 38 81 00 14 */ addi r4, r1, 0x14 /* 800ABA20 000A8960 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800ABA24 000A8964 48 1B B1 61 */ bl cXyz_NS___ml +/* 800ABA24 000A8964 48 1B B1 61 */ bl __ml__4cXyzCFf /* 800ABA28 000A8968 C0 01 00 08 */ lfs f0, 8(r1) /* 800ABA2C 000A896C D0 01 00 44 */ stfs f0, 0x44(r1) /* 800ABA30 000A8970 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -126,7 +126,7 @@ lbl_800AB9FC: /* 800ABA54 000A8994 D0 01 00 24 */ stfs f0, 0x24(r1) /* 800ABA58 000A8998 38 7F 0A B0 */ addi r3, r31, 0xab0 /* 800ABA5C 000A899C 38 81 00 44 */ addi r4, r1, 0x44 -/* 800ABA60 000A89A0 48 1C 37 7D */ bl cM3dGCyl_NS_SetC +/* 800ABA60 000A89A0 48 1C 37 7D */ bl SetC__8cM3dGCylFRC4cXyz /* 800ABA64 000A89A4 3B 60 00 00 */ li r27, 0 /* 800ABA68 000A89A8 3B C0 00 00 */ li r30, 0 /* 800ABA6C 000A89AC 3B A0 00 00 */ li r29, 0 @@ -139,7 +139,7 @@ lbl_800ABA78: /* 800ABA84 000A89C4 C0 04 09 78 */ lfs f0, 0x978(r4) /* 800ABA88 000A89C8 EC 01 00 28 */ fsubs f0, f1, f0 /* 800ABA8C 000A89CC EC 3F 00 2A */ fadds f1, f31, f0 -/* 800ABA90 000A89D0 48 1C 37 69 */ bl cM3dGCyl_NS_SetH +/* 800ABA90 000A89D0 48 1C 37 69 */ bl SetH__8cM3dGCylFf /* 800ABA94 000A89D4 3B 7B 00 01 */ addi r27, r27, 1 /* 800ABA98 000A89D8 2C 1B 00 03 */ cmpwi r27, 3 /* 800ABA9C 000A89DC 3B DE 00 04 */ addi r30, r30, 4 diff --git a/include/d/d_a/d_a_alink/asm/func_800ABB84.s b/include/d/d_a/d_a_alink/asm/func_800ABB84.s index a18455ca7e..2740142b1a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ABB84.s +++ b/include/d/d_a/d_a_alink/asm/func_800ABB84.s @@ -17,11 +17,11 @@ /* 800ABBC4 000A8B04 38 61 00 5C */ addi r3, r1, 0x5c /* 800ABBC8 000A8B08 38 81 00 74 */ addi r4, r1, 0x74 /* 800ABBCC 000A8B0C 38 BF 05 A4 */ addi r5, r31, 0x5a4 -/* 800ABBD0 000A8B10 48 1B AF 15 */ bl cXyz_NS___pl +/* 800ABBD0 000A8B10 48 1B AF 15 */ bl __pl__4cXyzCFRC3Vec /* 800ABBD4 000A8B14 38 61 00 50 */ addi r3, r1, 0x50 /* 800ABBD8 000A8B18 38 81 00 5C */ addi r4, r1, 0x5c /* 800ABBDC 000A8B1C C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800ABBE0 000A8B20 48 1B AF A5 */ bl cXyz_NS___ml +/* 800ABBE0 000A8B20 48 1B AF A5 */ bl __ml__4cXyzCFf /* 800ABBE4 000A8B24 C0 01 00 50 */ lfs f0, 0x50(r1) /* 800ABBE8 000A8B28 D0 01 00 68 */ stfs f0, 0x68(r1) /* 800ABBEC 000A8B2C C0 01 00 54 */ lfs f0, 0x54(r1) @@ -52,26 +52,26 @@ lbl_800ABC20: lbl_800ABC48: /* 800ABC48 000A8B88 38 7F 0B EC */ addi r3, r31, 0xbec /* 800ABC4C 000A8B8C 38 81 00 68 */ addi r4, r1, 0x68 -/* 800ABC50 000A8B90 48 1C 35 8D */ bl cM3dGCyl_NS_SetC +/* 800ABC50 000A8B90 48 1C 35 8D */ bl SetC__8cM3dGCylFRC4cXyz /* 800ABC54 000A8B94 38 7F 0B EC */ addi r3, r31, 0xbec /* 800ABC58 000A8B98 FC 20 F8 90 */ fmr f1, f31 -/* 800ABC5C 000A8B9C 48 1C 35 9D */ bl cM3dGCyl_NS_SetH +/* 800ABC5C 000A8B9C 48 1C 35 9D */ bl SetH__8cM3dGCylFf /* 800ABC60 000A8BA0 38 61 00 44 */ addi r3, r1, 0x44 /* 800ABC64 000A8BA4 38 9F 05 E0 */ addi r4, r31, 0x5e0 /* 800ABC68 000A8BA8 38 BF 05 EC */ addi r5, r31, 0x5ec -/* 800ABC6C 000A8BAC 48 1B AE 79 */ bl cXyz_NS___pl +/* 800ABC6C 000A8BAC 48 1B AE 79 */ bl __pl__4cXyzCFRC3Vec /* 800ABC70 000A8BB0 38 61 00 38 */ addi r3, r1, 0x38 /* 800ABC74 000A8BB4 38 81 00 44 */ addi r4, r1, 0x44 /* 800ABC78 000A8BB8 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800ABC7C 000A8BBC 48 1B AF 09 */ bl cXyz_NS___ml +/* 800ABC7C 000A8BBC 48 1B AF 09 */ bl __ml__4cXyzCFf /* 800ABC80 000A8BC0 38 61 00 2C */ addi r3, r1, 0x2c /* 800ABC84 000A8BC4 38 81 00 38 */ addi r4, r1, 0x38 /* 800ABC88 000A8BC8 38 A1 00 74 */ addi r5, r1, 0x74 -/* 800ABC8C 000A8BCC 48 1B AE 59 */ bl cXyz_NS___pl +/* 800ABC8C 000A8BCC 48 1B AE 59 */ bl __pl__4cXyzCFRC3Vec /* 800ABC90 000A8BD0 38 61 00 20 */ addi r3, r1, 0x20 /* 800ABC94 000A8BD4 38 81 00 2C */ addi r4, r1, 0x2c /* 800ABC98 000A8BD8 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800ABC9C 000A8BDC 48 1B AE E9 */ bl cXyz_NS___ml +/* 800ABC9C 000A8BDC 48 1B AE E9 */ bl __ml__4cXyzCFf /* 800ABCA0 000A8BE0 C0 01 00 20 */ lfs f0, 0x20(r1) /* 800ABCA4 000A8BE4 D0 01 00 68 */ stfs f0, 0x68(r1) /* 800ABCA8 000A8BE8 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -109,18 +109,18 @@ lbl_800ABCF0: lbl_800ABD18: /* 800ABD18 000A8C58 38 7F 09 74 */ addi r3, r31, 0x974 /* 800ABD1C 000A8C5C 38 81 00 68 */ addi r4, r1, 0x68 -/* 800ABD20 000A8C60 48 1C 34 BD */ bl cM3dGCyl_NS_SetC +/* 800ABD20 000A8C60 48 1C 34 BD */ bl SetC__8cM3dGCylFRC4cXyz /* 800ABD24 000A8C64 38 7F 09 74 */ addi r3, r31, 0x974 /* 800ABD28 000A8C68 FC 20 F8 90 */ fmr f1, f31 -/* 800ABD2C 000A8C6C 48 1C 34 CD */ bl cM3dGCyl_NS_SetH +/* 800ABD2C 000A8C6C 48 1C 34 CD */ bl SetH__8cM3dGCylFf /* 800ABD30 000A8C70 38 61 00 14 */ addi r3, r1, 0x14 /* 800ABD34 000A8C74 38 9F 09 74 */ addi r4, r31, 0x974 /* 800ABD38 000A8C78 38 BF 0B EC */ addi r5, r31, 0xbec -/* 800ABD3C 000A8C7C 48 1B AD A9 */ bl cXyz_NS___pl +/* 800ABD3C 000A8C7C 48 1B AD A9 */ bl __pl__4cXyzCFRC3Vec /* 800ABD40 000A8C80 38 61 00 08 */ addi r3, r1, 8 /* 800ABD44 000A8C84 38 81 00 14 */ addi r4, r1, 0x14 /* 800ABD48 000A8C88 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800ABD4C 000A8C8C 48 1B AE 39 */ bl cXyz_NS___ml +/* 800ABD4C 000A8C8C 48 1B AE 39 */ bl __ml__4cXyzCFf /* 800ABD50 000A8C90 C0 01 00 08 */ lfs f0, 8(r1) /* 800ABD54 000A8C94 D0 01 00 68 */ stfs f0, 0x68(r1) /* 800ABD58 000A8C98 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -134,10 +134,10 @@ lbl_800ABD18: /* 800ABD78 000A8CB8 EF E2 00 32 */ fmuls f31, f2, f0 /* 800ABD7C 000A8CBC 38 7F 0A B0 */ addi r3, r31, 0xab0 /* 800ABD80 000A8CC0 38 81 00 68 */ addi r4, r1, 0x68 -/* 800ABD84 000A8CC4 48 1C 34 59 */ bl cM3dGCyl_NS_SetC +/* 800ABD84 000A8CC4 48 1C 34 59 */ bl SetC__8cM3dGCylFRC4cXyz /* 800ABD88 000A8CC8 38 7F 0A B0 */ addi r3, r31, 0xab0 /* 800ABD8C 000A8CCC FC 20 F8 90 */ fmr f1, f31 -/* 800ABD90 000A8CD0 48 1C 34 69 */ bl cM3dGCyl_NS_SetH +/* 800ABD90 000A8CD0 48 1C 34 69 */ bl SetH__8cM3dGCylFf /* 800ABD94 000A8CD4 C0 1F 38 38 */ lfs f0, 0x3838(r31) /* 800ABD98 000A8CD8 D0 1F 34 54 */ stfs f0, 0x3454(r31) /* 800ABD9C 000A8CDC E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800ABDB8.s b/include/d/d_a/d_a_alink/asm/func_800ABDB8.s index 17be8542a1..6a041bcb61 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ABDB8.s +++ b/include/d/d_a/d_a_alink/asm/func_800ABDB8.s @@ -277,7 +277,7 @@ lbl_800AC17C: /* 800AC180 000A90C0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800AC184 000A90C4 40 81 00 14 */ ble lbl_800AC198 /* 800AC188 000A90C8 38 7E 35 1C */ addi r3, r30, 0x351c -/* 800AC18C 000A90CC 48 1B AF 9D */ bl cXyz_NS_atan2sX_Z +/* 800AC18C 000A90CC 48 1B AF 9D */ bl atan2sX_Z__4cXyzCFv /* 800AC190 000A90D0 B0 7E 30 6C */ sth r3, 0x306c(r30) /* 800AC194 000A90D4 48 00 00 14 */ b lbl_800AC1A8 lbl_800AC198: @@ -291,7 +291,7 @@ lbl_800AC1A8: /* 800AC1B0 000A90F0 3B A3 23 3C */ addi r29, r3, 0x233c /* 800AC1B4 000A90F4 7F A3 EB 78 */ mr r3, r29 /* 800AC1B8 000A90F8 38 9E 08 50 */ addi r4, r30, 0x850 -/* 800AC1BC 000A90FC 48 1B 89 ED */ bl cCcS_NS_Set +/* 800AC1BC 000A90FC 48 1B 89 ED */ bl Set__4cCcSFP8cCcD_Obj /* 800AC1C0 000A9100 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AC1C4 000A9104 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AC1C8 000A9108 3B 83 4B 88 */ addi r28, r3, 0x4b88 @@ -311,7 +311,7 @@ lbl_800AC1F8: /* 800AC1FC 000A913C 3B 7F 08 50 */ addi r27, r31, 0x850 /* 800AC200 000A9140 7F 7E DA 14 */ add r27, r30, r27 /* 800AC204 000A9144 7F 64 DB 78 */ mr r4, r27 -/* 800AC208 000A9148 48 1B 89 A1 */ bl cCcS_NS_Set +/* 800AC208 000A9148 48 1B 89 A1 */ bl Set__4cCcSFP8cCcD_Obj /* 800AC20C 000A914C 7F 83 E3 78 */ mr r3, r28 /* 800AC210 000A9150 7F 64 DB 78 */ mr r4, r27 /* 800AC214 000A9154 38 A0 00 01 */ li r5, 1 @@ -336,7 +336,7 @@ lbl_800AC250: lbl_800AC25C: /* 800AC25C 000A919C 7F A3 EB 78 */ mr r3, r29 /* 800AC260 000A91A0 38 9E 0F B8 */ addi r4, r30, 0xfb8 -/* 800AC264 000A91A4 48 1B 89 45 */ bl cCcS_NS_Set +/* 800AC264 000A91A4 48 1B 89 45 */ bl Set__4cCcSFP8cCcD_Obj /* 800AC268 000A91A8 7F 83 E3 78 */ mr r3, r28 /* 800AC26C 000A91AC 38 9E 0F B8 */ addi r4, r30, 0xfb8 /* 800AC270 000A91B0 38 A0 00 01 */ li r5, 1 @@ -350,7 +350,7 @@ lbl_800AC284: /* 800AC288 000A91C8 3B 7F 08 50 */ addi r27, r31, 0x850 /* 800AC28C 000A91CC 7F 7E DA 14 */ add r27, r30, r27 /* 800AC290 000A91D0 7F 64 DB 78 */ mr r4, r27 -/* 800AC294 000A91D4 48 1B 89 15 */ bl cCcS_NS_Set +/* 800AC294 000A91D4 48 1B 89 15 */ bl Set__4cCcSFP8cCcD_Obj /* 800AC298 000A91D8 7F 83 E3 78 */ mr r3, r28 /* 800AC29C 000A91DC 7F 64 DB 78 */ mr r4, r27 /* 800AC2A0 000A91E0 38 A0 00 01 */ li r5, 1 @@ -368,16 +368,16 @@ lbl_800AC2C0: lbl_800AC2CC: /* 800AC2CC 000A920C 38 7A 01 24 */ addi r3, r26, 0x124 /* 800AC2D0 000A9210 38 9B 01 24 */ addi r4, r27, 0x124 -/* 800AC2D4 000A9214 48 1C 2F 09 */ bl cM3dGCyl_NS_SetC +/* 800AC2D4 000A9214 48 1C 2F 09 */ bl SetC__8cM3dGCylFRC4cXyz /* 800AC2D8 000A9218 38 7A 01 24 */ addi r3, r26, 0x124 /* 800AC2DC 000A921C C0 3B 01 30 */ lfs f1, 0x130(r27) -/* 800AC2E0 000A9220 48 1C 2F 21 */ bl cM3dGCyl_NS_SetR +/* 800AC2E0 000A9220 48 1C 2F 21 */ bl SetR__8cM3dGCylFf /* 800AC2E4 000A9224 38 7A 01 24 */ addi r3, r26, 0x124 /* 800AC2E8 000A9228 C0 3B 01 34 */ lfs f1, 0x134(r27) -/* 800AC2EC 000A922C 48 1C 2F 0D */ bl cM3dGCyl_NS_SetH +/* 800AC2EC 000A922C 48 1C 2F 0D */ bl SetH__8cM3dGCylFf /* 800AC2F0 000A9230 7F A3 EB 78 */ mr r3, r29 /* 800AC2F4 000A9234 7F 44 D3 78 */ mr r4, r26 -/* 800AC2F8 000A9238 48 1B 88 B1 */ bl cCcS_NS_Set +/* 800AC2F8 000A9238 48 1B 88 B1 */ bl Set__4cCcSFP8cCcD_Obj /* 800AC2FC 000A923C 3B 9C 00 01 */ addi r28, r28, 1 /* 800AC300 000A9240 2C 1C 00 03 */ cmpwi r28, 3 /* 800AC304 000A9244 3B 7B 01 3C */ addi r27, r27, 0x13c diff --git a/include/d/d_a/d_a_alink/asm/func_800AFCF0.s b/include/d/d_a/d_a_alink/asm/func_800AFCF0.s index 6b2c577f5f..ca0eb589d1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AFCF0.s +++ b/include/d/d_a/d_a_alink/asm/func_800AFCF0.s @@ -79,7 +79,7 @@ lbl_800AFDE8: /* 800AFE10 000ACD50 B0 1E 2F EA */ sth r0, 0x2fea(r30) /* 800AFE14 000ACD54 48 00 00 20 */ b lbl_800AFE34 lbl_800AFE18: -/* 800AFE18 000ACD58 48 1B 7A 55 */ bl cM_rnd +/* 800AFE18 000ACD58 48 1B 7A 55 */ bl cM_rnd__Fv /* 800AFE1C 000ACD5C C0 1E 34 40 */ lfs f0, 0x3440(r30) /* 800AFE20 000ACD60 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800AFE24 000ACD64 40 80 00 10 */ bge lbl_800AFE34 diff --git a/include/d/d_a/d_a_alink/asm/func_800B01FC.s b/include/d/d_a/d_a_alink/asm/func_800B01FC.s index c3f79cdaf2..2175ab9f95 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B01FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B01FC.s @@ -16,7 +16,7 @@ /* 800B0238 000AD178 D0 21 00 1C */ stfs f1, 0x1c(r1) /* 800B023C 000AD17C 38 61 00 08 */ addi r3, r1, 8 /* 800B0240 000AD180 38 81 00 14 */ addi r4, r1, 0x14 -/* 800B0244 000AD184 48 1B 6D 05 */ bl cXyz_NS_normalizeZP +/* 800B0244 000AD184 48 1B 6D 05 */ bl normalizeZP__4cXyzFv /* 800B0248 000AD188 38 61 00 20 */ addi r3, r1, 0x20 /* 800B024C 000AD18C 38 81 00 14 */ addi r4, r1, 0x14 /* 800B0250 000AD190 C0 21 00 1C */ lfs f1, 0x1c(r1) @@ -31,12 +31,12 @@ /* 800B0274 000AD1B4 EC 02 00 2A */ fadds f0, f2, f0 /* 800B0278 000AD1B8 EC 03 00 2A */ fadds f0, f3, f0 /* 800B027C 000AD1BC FC 20 00 50 */ fneg f1, f0 -/* 800B0280 000AD1C0 48 1B F1 5D */ bl cM3dGPla_X1_ +/* 800B0280 000AD1C0 48 1B F1 5D */ bl __ct__8cM3dGPlaFPC4cXyzf /* 800B0284 000AD1C4 7F A3 EB 78 */ mr r3, r29 /* 800B0288 000AD1C8 7F C4 F3 78 */ mr r4, r30 /* 800B028C 000AD1CC 38 A1 00 20 */ addi r5, r1, 0x20 /* 800B0290 000AD1D0 7F E6 FB 78 */ mr r6, r31 -/* 800B0294 000AD1D4 48 1B E6 0D */ bl cM3d_3PlaneCrossPos +/* 800B0294 000AD1D4 48 1B E6 0D */ bl cM3d_3PlaneCrossPos__FRC8cM3dGPlaRC8cM3dGPlaRC8cM3dGPlaP3Vec /* 800B0298 000AD1D8 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 800B029C 000AD1DC 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800B02A0 000AD1E0 90 01 00 30 */ stw r0, 0x30(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B02BC.s b/include/d/d_a/d_a_alink/asm/func_800B02BC.s index 69deeefe35..a1c66cd19b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B02BC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B02BC.s @@ -92,7 +92,7 @@ lbl_800B0364: /* 800B0418 000AD358 D0 01 00 A4 */ stfs f0, 0xa4(r1) /* 800B041C 000AD35C 38 61 00 14 */ addi r3, r1, 0x14 /* 800B0420 000AD360 38 81 00 A0 */ addi r4, r1, 0xa0 -/* 800B0424 000AD364 48 1B 6B 25 */ bl cXyz_NS_normalizeZP +/* 800B0424 000AD364 48 1B 6B 25 */ bl normalizeZP__4cXyzFv /* 800B0428 000AD368 C0 01 00 A0 */ lfs f0, 0xa0(r1) /* 800B042C 000AD36C FF 80 00 50 */ fneg f28, f0 /* 800B0430 000AD370 C0 01 00 A8 */ lfs f0, 0xa8(r1) @@ -279,7 +279,7 @@ lbl_800B0680: /* 800B06C0 000AD600 48 00 0D 4C */ b lbl_800B140C lbl_800B06C4: /* 800B06C4 000AD604 38 61 00 8C */ addi r3, r1, 0x8c -/* 800B06C8 000AD608 48 1B 6A 61 */ bl cXyz_NS_atan2sX_Z +/* 800B06C8 000AD608 48 1B 6A 61 */ bl atan2sX_Z__4cXyzCFv /* 800B06CC 000AD60C B0 78 30 6E */ sth r3, 0x306e(r24) /* 800B06D0 000AD610 3B 60 00 00 */ li r27, 0 /* 800B06D4 000AD614 A0 78 2F E8 */ lhz r3, 0x2fe8(r24) @@ -310,7 +310,7 @@ lbl_800B071C: /* 800B0724 000AD664 3C 84 00 01 */ addis r4, r4, 1 /* 800B0728 000AD668 38 04 80 00 */ addi r0, r4, -32768 /* 800B072C 000AD66C 7C 04 07 34 */ extsh r4, r0 -/* 800B0730 000AD670 48 1C 06 F5 */ bl cLib_distanceAngleS +/* 800B0730 000AD670 48 1C 06 F5 */ bl cLib_distanceAngleS__Fss /* 800B0734 000AD674 7C 7F 1B 78 */ mr r31, r3 /* 800B0738 000AD678 7E E0 07 34 */ extsh r0, r23 /* 800B073C 000AD67C 7C 1F 00 00 */ cmpw r31, r0 @@ -333,7 +333,7 @@ lbl_800B0754: lbl_800B077C: /* 800B077C 000AD6BC 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0780 000AD6C0 38 98 04 D0 */ addi r4, r24, 0x4d0 -/* 800B0784 000AD6C4 48 1B 80 91 */ bl cM3d_SignedLenPlaAndPos +/* 800B0784 000AD6C4 48 1B 80 91 */ bl cM3d_SignedLenPlaAndPos__FPC8cM3dGPlaPC3Vec /* 800B0788 000AD6C8 FE E0 08 90 */ fmr f23, f1 /* 800B078C 000AD6CC FF E0 B8 90 */ fmr f31, f23 /* 800B0790 000AD6D0 C0 38 04 D8 */ lfs f1, 0x4d8(r24) @@ -400,7 +400,7 @@ lbl_800B0848: /* 800B0878 000AD7B8 38 61 00 08 */ addi r3, r1, 8 /* 800B087C 000AD7BC 38 81 00 8C */ addi r4, r1, 0x8c /* 800B0880 000AD7C0 38 A1 00 78 */ addi r5, r1, 0x78 -/* 800B0884 000AD7C4 48 1B 62 B1 */ bl cXyz_NS___mi +/* 800B0884 000AD7C4 48 1B 62 B1 */ bl __mi__4cXyzCFRC3Vec /* 800B0888 000AD7C8 38 61 00 2C */ addi r3, r1, 0x2c /* 800B088C 000AD7CC 38 81 00 08 */ addi r4, r1, 8 /* 800B0890 000AD7D0 4B FE 6F 65 */ bl cXyz_X1_ @@ -583,7 +583,7 @@ lbl_800B0AF4: /* 800B0B18 000ADA58 90 18 05 80 */ stw r0, 0x580(r24) /* 800B0B1C 000ADA5C 38 78 1E 1C */ addi r3, r24, 0x1e1c /* 800B0B20 000ADA60 38 98 1B 5C */ addi r4, r24, 0x1b5c -/* 800B0B24 000ADA64 48 1B 76 25 */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 800B0B24 000ADA64 48 1B 76 25 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 800B0B28 000ADA68 80 18 31 A0 */ lwz r0, 0x31a0(r24) /* 800B0B2C 000ADA6C 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa /* 800B0B30 000ADA70 41 82 00 20 */ beq lbl_800B0B50 @@ -654,7 +654,7 @@ lbl_800B0BEC: /* 800B0C20 000ADB60 D0 61 00 4C */ stfs f3, 0x4c(r1) /* 800B0C24 000ADB64 38 78 1D 08 */ addi r3, r24, 0x1d08 /* 800B0C28 000ADB68 38 81 00 44 */ addi r4, r1, 0x44 -/* 800B0C2C 000ADB6C 48 1B 70 FD */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800B0C2C 000ADB6C 48 1B 70 FD */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800B0C30 000ADB70 7F A3 EB 78 */ mr r3, r29 /* 800B0C34 000ADB74 38 98 1D 08 */ addi r4, r24, 0x1d08 /* 800B0C38 000ADB78 4B FC 38 69 */ bl cBgS_NS_GroundCross @@ -735,7 +735,7 @@ lbl_800B0D4C: lbl_800B0D58: /* 800B0D58 000ADC98 38 78 1E 1C */ addi r3, r24, 0x1e1c /* 800B0D5C 000ADC9C 38 98 1B 5C */ addi r4, r24, 0x1b5c -/* 800B0D60 000ADCA0 48 1B 73 E9 */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 800B0D60 000ADCA0 48 1B 73 E9 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 800B0D64 000ADCA4 38 00 00 03 */ li r0, 3 /* 800B0D68 000ADCA8 98 18 2F 91 */ stb r0, 0x2f91(r24) /* 800B0D6C 000ADCAC 38 61 00 78 */ addi r3, r1, 0x78 @@ -871,7 +871,7 @@ lbl_800B0E98: /* 800B0F44 000ADE84 D0 01 00 4C */ stfs f0, 0x4c(r1) /* 800B0F48 000ADE88 38 78 1D 08 */ addi r3, r24, 0x1d08 /* 800B0F4C 000ADE8C 38 81 00 44 */ addi r4, r1, 0x44 -/* 800B0F50 000ADE90 48 1B 6D D9 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800B0F50 000ADE90 48 1B 6D D9 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800B0F54 000ADE94 7F A3 EB 78 */ mr r3, r29 /* 800B0F58 000ADE98 38 98 1D 08 */ addi r4, r24, 0x1d08 /* 800B0F5C 000ADE9C 4B FC 35 45 */ bl cBgS_NS_GroundCross @@ -938,7 +938,7 @@ lbl_800B1000: /* 800B103C 000ADF7C D0 61 00 4C */ stfs f3, 0x4c(r1) /* 800B1040 000ADF80 38 78 1D 08 */ addi r3, r24, 0x1d08 /* 800B1044 000ADF84 38 81 00 44 */ addi r4, r1, 0x44 -/* 800B1048 000ADF88 48 1B 6C E1 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800B1048 000ADF88 48 1B 6C E1 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800B104C 000ADF8C 7F A3 EB 78 */ mr r3, r29 /* 800B1050 000ADF90 38 98 1D 08 */ addi r4, r24, 0x1d08 /* 800B1054 000ADF94 4B FC 34 4D */ bl cBgS_NS_GroundCross @@ -957,7 +957,7 @@ lbl_800B1000: /* 800B1088 000ADFC8 D0 61 00 4C */ stfs f3, 0x4c(r1) /* 800B108C 000ADFCC 38 78 1D 08 */ addi r3, r24, 0x1d08 /* 800B1090 000ADFD0 38 81 00 44 */ addi r4, r1, 0x44 -/* 800B1094 000ADFD4 48 1B 6C 95 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800B1094 000ADFD4 48 1B 6C 95 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800B1098 000ADFD8 7F A3 EB 78 */ mr r3, r29 /* 800B109C 000ADFDC 38 98 1D 08 */ addi r4, r24, 0x1d08 /* 800B10A0 000ADFE0 4B FC 34 01 */ bl cBgS_NS_GroundCross diff --git a/include/d/d_a/d_a_alink/asm/func_800B1BAC.s b/include/d/d_a/d_a_alink/asm/func_800B1BAC.s index 444783a897..121d98833c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B1BAC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B1BAC.s @@ -166,7 +166,7 @@ lbl_800B1DEC: /* 800B1DF8 000AED38 38 7E 2B A8 */ addi r3, r30, 0x2ba8 /* 800B1DFC 000AED3C FC 20 F0 90 */ fmr f1, f30 /* 800B1E00 000AED40 FC 40 E8 90 */ fmr f2, f29 -/* 800B1E04 000AED44 48 1B E9 3D */ bl cLib_chaseF +/* 800B1E04 000AED44 48 1B E9 3D */ bl cLib_chaseF__FPfff lbl_800B1E08: /* 800B1E08 000AED48 C0 1E 2B A8 */ lfs f0, 0x2ba8(r30) /* 800B1E0C 000AED4C C0 62 94 34 */ lfs f3, lbl_80452E34-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800B221C.s b/include/d/d_a/d_a_alink/asm/func_800B221C.s index b86cf96d24..dc3304667c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B221C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B221C.s @@ -118,7 +118,7 @@ lbl_800B238C: /* 800B23D8 000AF318 D0 03 04 FC */ stfs f0, 0x4fc(r3) lbl_800B23DC: /* 800B23DC 000AF31C 38 7F 08 14 */ addi r3, r31, 0x814 -/* 800B23E0 000AF320 48 1B 15 7D */ bl cCcD_Stts_NS_ClrCcMove +/* 800B23E0 000AF320 48 1B 15 7D */ bl ClrCcMove__9cCcD_SttsFv lbl_800B23E4: /* 800B23E4 000AF324 39 61 00 20 */ addi r11, r1, 0x20 /* 800B23E8 000AF328 48 2A FE 3D */ bl _restgpr_28 diff --git a/include/d/d_a/d_a_alink/asm/func_800B23FC.s b/include/d/d_a/d_a_alink/asm/func_800B23FC.s index 14bb759246..803fbbf18a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B23FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B23FC.s @@ -56,7 +56,7 @@ lbl_800B24A4: /* 800B24D0 000AF410 B0 1D 2F E6 */ sth r0, 0x2fe6(r29) lbl_800B24D4: /* 800B24D4 000AF414 38 7D 08 14 */ addi r3, r29, 0x814 -/* 800B24D8 000AF418 48 1B 14 85 */ bl cCcD_Stts_NS_ClrCcMove +/* 800B24D8 000AF418 48 1B 14 85 */ bl ClrCcMove__9cCcD_SttsFv lbl_800B24DC: /* 800B24DC 000AF41C 39 61 00 20 */ addi r11, r1, 0x20 /* 800B24E0 000AF420 48 2A FD 49 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800B24F4.s b/include/d/d_a/d_a_alink/asm/func_800B24F4.s index 1436da6bb0..8236375913 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B24F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B24F4.s @@ -46,7 +46,7 @@ lbl_800B2528: /* 800B25A4 000AF4E4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800B25A8 000AF4E8 D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 800B25AC 000AF4EC 38 7E 08 14 */ addi r3, r30, 0x814 -/* 800B25B0 000AF4F0 48 1B 13 AD */ bl cCcD_Stts_NS_ClrCcMove +/* 800B25B0 000AF4F0 48 1B 13 AD */ bl ClrCcMove__9cCcD_SttsFv lbl_800B25B4: /* 800B25B4 000AF4F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B25B8 000AF4F8 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B271C.s b/include/d/d_a/d_a_alink/asm/func_800B271C.s index 5dbfdc6215..87042a73e0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B271C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B271C.s @@ -183,7 +183,7 @@ lbl_800B29B0: /* 800B29B4 000AF8F4 C0 03 14 C8 */ lfs f0, 0x14c8(r3) /* 800B29B8 000AF8F8 FC 20 00 50 */ fneg f1, f0 /* 800B29BC 000AF8FC C0 43 14 CC */ lfs f2, 0x14cc(r3) -/* 800B29C0 000AF900 48 1B 4C B5 */ bl cM_atan2s +/* 800B29C0 000AF900 48 1B 4C B5 */ bl cM_atan2s__Fff /* 800B29C4 000AF904 B0 7E 2F E0 */ sth r3, 0x2fe0(r30) /* 800B29C8 000AF908 48 00 00 24 */ b lbl_800B29EC lbl_800B29CC: diff --git a/include/d/d_a/d_a_alink/asm/func_800B3630.s b/include/d/d_a/d_a_alink/asm/func_800B3630.s index e436517042..78aa7f2043 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3630.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3630.s @@ -30,14 +30,14 @@ lbl_800B3680: /* 800B36A0 000B05E0 38 61 00 20 */ addi r3, r1, 0x20 /* 800B36A4 000B05E4 80 9E 27 EC */ lwz r4, 0x27ec(r30) /* 800B36A8 000B05E8 38 84 05 38 */ addi r4, r4, 0x538 -/* 800B36AC 000B05EC 48 1B D5 59 */ bl cLib_targetAngleY +/* 800B36AC 000B05EC 48 1B D5 59 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800B36B0 000B05F0 7C 7F 1B 78 */ mr r31, r3 /* 800B36B4 000B05F4 48 00 00 44 */ b lbl_800B36F8 lbl_800B36B8: /* 800B36B8 000B05F8 38 61 00 08 */ addi r3, r1, 8 /* 800B36BC 000B05FC 38 84 05 38 */ addi r4, r4, 0x538 /* 800B36C0 000B0600 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 800B36C4 000B0604 48 1B 34 71 */ bl cXyz_NS___mi +/* 800B36C4 000B0604 48 1B 34 71 */ bl __mi__4cXyzCFRC3Vec /* 800B36C8 000B0608 C0 01 00 08 */ lfs f0, 8(r1) /* 800B36CC 000B060C D0 01 00 14 */ stfs f0, 0x14(r1) /* 800B36D0 000B0610 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -48,7 +48,7 @@ lbl_800B36B8: /* 800B36E4 000B0624 38 81 00 14 */ addi r4, r1, 0x14 /* 800B36E8 000B0628 48 02 ED 95 */ bl daAlink_c_NS_multVecMagneBootInvMtx /* 800B36EC 000B062C 38 61 00 14 */ addi r3, r1, 0x14 -/* 800B36F0 000B0630 48 1B 3A 39 */ bl cXyz_NS_atan2sX_Z +/* 800B36F0 000B0630 48 1B 3A 39 */ bl atan2sX_Z__4cXyzCFv /* 800B36F4 000B0634 7C 7F 1B 78 */ mr r31, r3 lbl_800B36F8: /* 800B36F8 000B0638 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800B3734.s b/include/d/d_a/d_a_alink/asm/func_800B3734.s index 2742cdd0e3..77eb4842a5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3734.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3734.s @@ -61,7 +61,7 @@ lbl_800B3808: /* 800B3810 000B0750 38 A0 00 02 */ li r5, 2 /* 800B3814 000B0754 38 C0 20 00 */ li r6, 0x2000 /* 800B3818 000B0758 38 E0 08 00 */ li r7, 0x800 -/* 800B381C 000B075C 48 1B CD 25 */ bl cLib_addCalcAngleS +/* 800B381C 000B075C 48 1B CD 25 */ bl cLib_addCalcAngleS__FPsssss /* 800B3820 000B0760 38 60 00 01 */ li r3, 1 /* 800B3824 000B0764 48 00 00 08 */ b lbl_800B382C lbl_800B3828: diff --git a/include/d/d_a/d_a_alink/asm/func_800B3844.s b/include/d/d_a/d_a_alink/asm/func_800B3844.s index 596ceb91b5..4e20fc9d7d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3844.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3844.s @@ -4,7 +4,7 @@ /* 800B3850 000B0790 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800B3854 000B0794 7C 7F 1B 78 */ mr r31, r3 /* 800B3858 000B0798 C0 22 93 E0 */ lfs f1, lbl_80452DE0-_SDA2_BASE_(r2) -/* 800B385C 000B079C 48 1B 40 F9 */ bl cM_rndF +/* 800B385C 000B079C 48 1B 40 F9 */ bl cM_rndF__Ff /* 800B3860 000B07A0 C0 02 92 D0 */ lfs f0, lbl_80452CD0-_SDA2_BASE_(r2) /* 800B3864 000B07A4 EC 00 08 2A */ fadds f0, f0, f1 /* 800B3868 000B07A8 FC 00 00 1E */ fctiwz f0, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B3924.s b/include/d/d_a/d_a_alink/asm/func_800B3924.s index ab1030d20f..6d8fcbe858 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3924.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3924.s @@ -269,7 +269,7 @@ lbl_800B3CE8: /* 800B3CEC 000B0C2C B0 1E 30 FC */ sth r0, 0x30fc(r30) /* 800B3CF0 000B0C30 C0 3E 34 2C */ lfs f1, 0x342c(r30) /* 800B3CF4 000B0C34 C0 5E 34 30 */ lfs f2, 0x3430(r30) -/* 800B3CF8 000B0C38 48 1B 39 7D */ bl cM_atan2s +/* 800B3CF8 000B0C38 48 1B 39 7D */ bl cM_atan2s__Fff /* 800B3CFC 000B0C3C B0 7E 30 FA */ sth r3, 0x30fa(r30) /* 800B3D00 000B0C40 A8 9E 30 FA */ lha r4, 0x30fa(r30) /* 800B3D04 000B0C44 A8 7E 04 DE */ lha r3, 0x4de(r30) @@ -408,7 +408,7 @@ lbl_800B3EB4: /* 800B3EE4 000B0E24 48 00 00 0C */ b lbl_800B3EF0 lbl_800B3EE8: /* 800B3EE8 000B0E28 38 7E 33 98 */ addi r3, r30, 0x3398 -/* 800B3EEC 000B0E2C 48 1B C8 55 */ bl cLib_chaseF +/* 800B3EEC 000B0E2C 48 1B C8 55 */ bl cLib_chaseF__FPfff lbl_800B3EF0: /* 800B3EF0 000B0E30 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800B3EF4 000B0E34 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l diff --git a/include/d/d_a/d_a_alink/asm/func_800B3FD4.s b/include/d/d_a/d_a_alink/asm/func_800B3FD4.s index 2cc6e28374..77f2038d02 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3FD4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3FD4.s @@ -73,7 +73,7 @@ lbl_800B40D8: /* 800B40DC 000B101C 40 82 00 F0 */ bne lbl_800B41CC /* 800B40E0 000B1020 A8 7E 2F E2 */ lha r3, 0x2fe2(r30) /* 800B40E4 000B1024 A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 800B40E8 000B1028 48 1B CD 3D */ bl cLib_distanceAngleS +/* 800B40E8 000B1028 48 1B CD 3D */ bl cLib_distanceAngleS__Fss /* 800B40EC 000B102C 2C 03 78 00 */ cmpwi r3, 0x7800 /* 800B40F0 000B1030 40 81 00 DC */ ble lbl_800B41CC /* 800B40F4 000B1034 A0 7E 2F E8 */ lhz r3, 0x2fe8(r30) @@ -119,7 +119,7 @@ lbl_800B4160: /* 800B418C 000B10CC A8 A7 00 18 */ lha r5, 0x18(r7) /* 800B4190 000B10D0 A8 C7 00 14 */ lha r6, 0x14(r7) /* 800B4194 000B10D4 A8 E7 00 16 */ lha r7, 0x16(r7) -/* 800B4198 000B10D8 48 1B C3 A9 */ bl cLib_addCalcAngleS +/* 800B4198 000B10D8 48 1B C3 A9 */ bl cLib_addCalcAngleS__FPsssss /* 800B419C 000B10DC 48 00 02 80 */ b lbl_800B441C lbl_800B41A0: /* 800B41A0 000B10E0 3B E0 00 01 */ li r31, 1 @@ -132,7 +132,7 @@ lbl_800B41A8: /* 800B41B8 000B10F8 A8 A7 00 18 */ lha r5, 0x18(r7) /* 800B41BC 000B10FC A8 C7 00 14 */ lha r6, 0x14(r7) /* 800B41C0 000B1100 A8 E7 00 16 */ lha r7, 0x16(r7) -/* 800B41C4 000B1104 48 1B C3 7D */ bl cLib_addCalcAngleS +/* 800B41C4 000B1104 48 1B C3 7D */ bl cLib_addCalcAngleS__FPsssss /* 800B41C8 000B1108 48 00 00 D0 */ b lbl_800B4298 lbl_800B41CC: /* 800B41CC 000B110C 7F C3 F3 78 */ mr r3, r30 @@ -188,7 +188,7 @@ lbl_800B4280: /* 800B4288 000B11C8 3C A0 80 39 */ lis r5, lbl_8038D6BC@ha /* 800B428C 000B11CC 38 A5 D6 BC */ addi r5, r5, lbl_8038D6BC@l /* 800B4290 000B11D0 A8 A5 00 18 */ lha r5, 0x18(r5) -/* 800B4294 000B11D4 48 1B C2 AD */ bl cLib_addCalcAngleS +/* 800B4294 000B11D4 48 1B C2 AD */ bl cLib_addCalcAngleS__FPsssss lbl_800B4298: /* 800B4298 000B11D8 2C 1F 00 00 */ cmpwi r31, 0 /* 800B429C 000B11DC 40 82 00 AC */ bne lbl_800B4348 @@ -275,7 +275,7 @@ lbl_800B437C: /* 800B43C4 000B1304 A8 07 00 16 */ lha r0, 0x16(r7) /* 800B43C8 000B1308 54 00 08 3C */ slwi r0, r0, 1 /* 800B43CC 000B130C 7C 07 07 34 */ extsh r7, r0 -/* 800B43D0 000B1310 48 1B C1 71 */ bl cLib_addCalcAngleS +/* 800B43D0 000B1310 48 1B C1 71 */ bl cLib_addCalcAngleS__FPsssss /* 800B43D4 000B1314 A8 9E 04 DE */ lha r4, 0x4de(r30) /* 800B43D8 000B1318 7C 04 E0 50 */ subf r0, r4, r28 /* 800B43DC 000B131C 7C 03 07 34 */ extsh r3, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B444C.s b/include/d/d_a/d_a_alink/asm/func_800B444C.s index de0bc22457..6be7151f8f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B444C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B444C.s @@ -170,7 +170,7 @@ lbl_800B46A0: /* 800B46AC 000B15EC 7F A5 EB 78 */ mr r5, r29 /* 800B46B0 000B15F0 7F 86 E3 78 */ mr r6, r28 /* 800B46B4 000B15F4 7F 67 DB 78 */ mr r7, r27 -/* 800B46B8 000B15F8 48 1B BE 89 */ bl cLib_addCalcAngleS +/* 800B46B8 000B15F8 48 1B BE 89 */ bl cLib_addCalcAngleS__FPsssss /* 800B46BC 000B15FC C0 3F 33 98 */ lfs f1, 0x3398(r31) /* 800B46C0 000B1600 C0 1F 05 94 */ lfs f0, 0x594(r31) /* 800B46C4 000B1604 EC 01 00 24 */ fdivs f0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B5F6C.s b/include/d/d_a/d_a_alink/asm/func_800B5F6C.s index 96376f6989..0835e6c1bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B5F6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B5F6C.s @@ -12,7 +12,7 @@ /* 800B5F98 000B2ED8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B5F9C 000B2EDC 41 82 00 B0 */ beq lbl_800B604C /* 800B5FA0 000B2EE0 38 61 00 08 */ addi r3, r1, 8 -/* 800B5FA4 000B2EE4 48 1B 11 85 */ bl cXyz_NS_atan2sX_Z +/* 800B5FA4 000B2EE4 48 1B 11 85 */ bl atan2sX_Z__4cXyzCFv /* 800B5FA8 000B2EE8 7C 7F 1B 78 */ mr r31, r3 /* 800B5FAC 000B2EEC 88 1E 2F 8C */ lbz r0, 0x2f8c(r30) /* 800B5FB0 000B2EF0 28 00 00 00 */ cmplwi r0, 0 @@ -20,7 +20,7 @@ /* 800B5FB8 000B2EF8 38 7E 33 98 */ addi r3, r30, 0x3398 /* 800B5FBC 000B2EFC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800B5FC0 000B2F00 C0 5E 34 24 */ lfs f2, 0x3424(r30) -/* 800B5FC4 000B2F04 48 1B A7 7D */ bl cLib_chaseF +/* 800B5FC4 000B2F04 48 1B A7 7D */ bl cLib_chaseF__FPfff /* 800B5FC8 000B2F08 A8 7E 30 90 */ lha r3, 0x3090(r30) /* 800B5FCC 000B2F0C 38 03 FF FF */ addi r0, r3, -1 /* 800B5FD0 000B2F10 B0 1E 30 90 */ sth r0, 0x3090(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800B607C.s b/include/d/d_a/d_a_alink/asm/func_800B607C.s index 75b5723a0e..e5f18c4fb5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B607C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B607C.s @@ -160,7 +160,7 @@ lbl_800B62C0: /* 800B62C4 000B3204 41 82 05 D8 */ beq lbl_800B689C /* 800B62C8 000B3208 FC 20 F0 90 */ fmr f1, f30 /* 800B62CC 000B320C FC 40 E8 90 */ fmr f2, f29 -/* 800B62D0 000B3210 48 1B 13 A5 */ bl cM_atan2s +/* 800B62D0 000B3210 48 1B 13 A5 */ bl cM_atan2s__Fff /* 800B62D4 000B3214 7C 7C 1B 78 */ mr r28, r3 /* 800B62D8 000B3218 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800B62DC 000B321C EC 00 D8 24 */ fdivs f0, f0, f27 @@ -185,7 +185,7 @@ lbl_800B62C0: /* 800B6328 000B3268 D0 61 00 1C */ stfs f3, 0x1c(r1) /* 800B632C 000B326C 38 7A 1D 08 */ addi r3, r26, 0x1d08 /* 800B6330 000B3270 38 81 00 14 */ addi r4, r1, 0x14 -/* 800B6334 000B3274 48 1B 19 F5 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800B6334 000B3274 48 1B 19 F5 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800B6338 000B3278 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800B633C 000B327C 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800B6340 000B3280 90 01 00 44 */ stw r0, 0x44(r1) @@ -361,7 +361,7 @@ lbl_800B6590: lbl_800B65A8: /* 800B65A8 000B34E8 7F 83 E3 78 */ mr r3, r28 /* 800B65AC 000B34EC A8 9A 04 E6 */ lha r4, 0x4e6(r26) -/* 800B65B0 000B34F0 48 1B A8 75 */ bl cLib_distanceAngleS +/* 800B65B0 000B34F0 48 1B A8 75 */ bl cLib_distanceAngleS__Fss /* 800B65B4 000B34F4 2C 03 08 00 */ cmpwi r3, 0x800 /* 800B65B8 000B34F8 40 80 00 A0 */ bge lbl_800B6658 /* 800B65BC 000B34FC 57 60 06 3F */ clrlwi. r0, r27, 0x18 @@ -465,9 +465,9 @@ lbl_800B6704: /* 800B6730 000B3670 41 82 00 38 */ beq lbl_800B6768 /* 800B6734 000B3674 38 7A 1E 1C */ addi r3, r26, 0x1e1c /* 800B6738 000B3678 38 9A 1B 5C */ addi r4, r26, 0x1b5c -/* 800B673C 000B367C 48 1B 1A 0D */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 800B673C 000B367C 48 1B 1A 0D */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 800B6740 000B3680 38 61 00 20 */ addi r3, r1, 0x20 -/* 800B6744 000B3684 48 1B 09 E5 */ bl cXyz_NS_atan2sX_Z +/* 800B6744 000B3684 48 1B 09 E5 */ bl atan2sX_Z__4cXyzCFv /* 800B6748 000B3688 7C 64 1B 78 */ mr r4, r3 /* 800B674C 000B368C 7F 43 D3 78 */ mr r3, r26 /* 800B6750 000B3690 48 04 90 C9 */ bl daAlink_c_NS_procClimbDownStartInit @@ -533,9 +533,9 @@ lbl_800B67F8: /* 800B6820 000B3760 80 1A 05 74 */ lwz r0, 0x574(r26) /* 800B6824 000B3764 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B6828 000B3768 41 82 00 60 */ beq lbl_800B6888 -/* 800B682C 000B376C 48 1B 0E 49 */ bl cM_atan2s +/* 800B682C 000B376C 48 1B 0E 49 */ bl cM_atan2s__Fff /* 800B6830 000B3770 A8 9A 04 E6 */ lha r4, 0x4e6(r26) -/* 800B6834 000B3774 48 1B A5 F1 */ bl cLib_distanceAngleS +/* 800B6834 000B3774 48 1B A5 F1 */ bl cLib_distanceAngleS__Fss /* 800B6838 000B3778 2C 03 40 00 */ cmpwi r3, 0x4000 /* 800B683C 000B377C 41 80 00 4C */ blt lbl_800B6888 /* 800B6840 000B3780 A8 1A 04 E6 */ lha r0, 0x4e6(r26) diff --git a/include/d/d_a/d_a_alink/asm/func_800B7390.s b/include/d/d_a/d_a_alink/asm/func_800B7390.s index a3d90f3e9b..59f04dd91b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B7390.s +++ b/include/d/d_a/d_a_alink/asm/func_800B7390.s @@ -49,7 +49,7 @@ lbl_800B7414: /* 800B7440 000B4380 48 00 1E 15 */ bl daAlink_c_NS_checkNoUpperAnime /* 800B7444 000B4384 2C 03 00 00 */ cmpwi r3, 0 /* 800B7448 000B4388 41 82 00 50 */ beq lbl_800B7498 -/* 800B744C 000B438C 48 1B 04 21 */ bl cM_rnd +/* 800B744C 000B438C 48 1B 04 21 */ bl cM_rnd__Fv /* 800B7450 000B4390 C0 02 98 8C */ lfs f0, lbl_8045328C-_SDA2_BASE_(r2) /* 800B7454 000B4394 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800B7458 000B4398 40 80 00 40 */ bge lbl_800B7498 diff --git a/include/d/d_a/d_a_alink/asm/func_800BA0D0.s b/include/d/d_a/d_a_alink/asm/func_800BA0D0.s index a6585622ce..81b8504725 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BA0D0.s +++ b/include/d/d_a/d_a_alink/asm/func_800BA0D0.s @@ -302,7 +302,7 @@ lbl_800BA4E8: /* 800BA4FC 000B743C 41 82 00 68 */ beq lbl_800BA564 /* 800BA500 000B7440 A8 7C 2F E2 */ lha r3, 0x2fe2(r28) /* 800BA504 000B7444 A8 9C 04 DE */ lha r4, 0x4de(r28) -/* 800BA508 000B7448 48 1B 69 1D */ bl cLib_distanceAngleS +/* 800BA508 000B7448 48 1B 69 1D */ bl cLib_distanceAngleS__Fss /* 800BA50C 000B744C 2C 03 78 00 */ cmpwi r3, 0x7800 /* 800BA510 000B7450 40 81 00 44 */ ble lbl_800BA554 /* 800BA514 000B7454 C0 3C 33 AC */ lfs f1, 0x33ac(r28) @@ -346,7 +346,7 @@ lbl_800BA594: /* 800BA5A0 000B74E0 40 81 00 90 */ ble lbl_800BA630 /* 800BA5A4 000B74E4 A8 7C 2F E2 */ lha r3, 0x2fe2(r28) /* 800BA5A8 000B74E8 A8 9C 04 DE */ lha r4, 0x4de(r28) -/* 800BA5AC 000B74EC 48 1B 68 79 */ bl cLib_distanceAngleS +/* 800BA5AC 000B74EC 48 1B 68 79 */ bl cLib_distanceAngleS__Fss /* 800BA5B0 000B74F0 2C 03 78 00 */ cmpwi r3, 0x7800 /* 800BA5B4 000B74F4 40 81 00 7C */ ble lbl_800BA630 /* 800BA5B8 000B74F8 C0 3C 05 2C */ lfs f1, 0x52c(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_800BA914.s b/include/d/d_a/d_a_alink/asm/func_800BA914.s index a212bcbcb5..ee27e486d3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BA914.s +++ b/include/d/d_a/d_a_alink/asm/func_800BA914.s @@ -263,7 +263,7 @@ lbl_800BAC98: /* 800BACD0 000B7C10 EC 00 10 28 */ fsubs f0, f0, f2 /* 800BACD4 000B7C14 EC 00 20 28 */ fsubs f0, f0, f4 /* 800BACD8 000B7C18 EC 43 00 24 */ fdivs f2, f3, f0 -/* 800BACDC 000B7C1C 48 1B 5A 65 */ bl cLib_chaseF +/* 800BACDC 000B7C1C 48 1B 5A 65 */ bl cLib_chaseF__FPfff /* 800BACE0 000B7C20 C0 01 00 08 */ lfs f0, 8(r1) /* 800BACE4 000B7C24 D0 1D 1F 50 */ stfs f0, 0x1f50(r29) lbl_800BACE8: diff --git a/include/d/d_a/d_a_alink/asm/func_800BB084.s b/include/d/d_a/d_a_alink/asm/func_800BB084.s index 91939142c6..a94f4bf588 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BB084.s +++ b/include/d/d_a/d_a_alink/asm/func_800BB084.s @@ -14,7 +14,7 @@ /* 800BB0B8 000B7FF8 80 9F 27 EC */ lwz r4, 0x27ec(r31) /* 800BB0BC 000B7FFC 38 84 05 38 */ addi r4, r4, 0x538 /* 800BB0C0 000B8000 38 A1 00 24 */ addi r5, r1, 0x24 -/* 800BB0C4 000B8004 48 1A BA 71 */ bl cXyz_NS___mi +/* 800BB0C4 000B8004 48 1A BA 71 */ bl __mi__4cXyzCFRC3Vec /* 800BB0C8 000B8008 C0 01 00 0C */ lfs f0, 0xc(r1) /* 800BB0CC 000B800C D0 01 00 18 */ stfs f0, 0x18(r1) /* 800BB0D0 000B8010 C0 01 00 10 */ lfs f0, 0x10(r1) @@ -103,7 +103,7 @@ lbl_800BB1E8: /* 800BB1F8 000B8138 48 00 00 80 */ b lbl_800BB278 lbl_800BB1FC: /* 800BB1FC 000B813C 38 61 00 18 */ addi r3, r1, 0x18 -/* 800BB200 000B8140 48 1A BF 51 */ bl cXyz_NS_atan2sY_XZ +/* 800BB200 000B8140 48 1A BF 51 */ bl atan2sY_XZ__4cXyzCFv /* 800BB204 000B8144 2C 1E 00 00 */ cmpwi r30, 0 /* 800BB208 000B8148 41 82 00 40 */ beq lbl_800BB248 /* 800BB20C 000B814C 3C 80 80 39 */ lis r4, lbl_8038DE8C@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800BB2B0.s b/include/d/d_a/d_a_alink/asm/func_800BB2B0.s index 27980c685f..01e07f65e1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BB2B0.s +++ b/include/d/d_a/d_a_alink/asm/func_800BB2B0.s @@ -19,7 +19,7 @@ lbl_800BB2EC: /* 800BB2F4 000B8234 38 A0 00 04 */ li r5, 4 /* 800BB2F8 000B8238 38 C0 0C 00 */ li r6, 0xc00 /* 800BB2FC 000B823C 38 E0 01 80 */ li r7, 0x180 -/* 800BB300 000B8240 48 1B 52 41 */ bl cLib_addCalcAngleS +/* 800BB300 000B8240 48 1B 52 41 */ bl cLib_addCalcAngleS__FPsssss /* 800BB304 000B8244 A8 1E 05 9C */ lha r0, 0x59c(r30) /* 800BB308 000B8248 B0 1E 31 0A */ sth r0, 0x310a(r30) /* 800BB30C 000B824C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800BB7A0.s b/include/d/d_a/d_a_alink/asm/func_800BB7A0.s index fcea216f21..ca802dc717 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BB7A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800BB7A0.s @@ -75,7 +75,7 @@ lbl_800BB89C: /* 800BB8C0 000B8800 38 61 00 08 */ addi r3, r1, 8 /* 800BB8C4 000B8804 38 9D 04 D0 */ addi r4, r29, 0x4d0 /* 800BB8C8 000B8808 38 BD 37 98 */ addi r5, r29, 0x3798 -/* 800BB8CC 000B880C 48 1A B2 69 */ bl cXyz_NS___mi +/* 800BB8CC 000B880C 48 1A B2 69 */ bl __mi__4cXyzCFRC3Vec /* 800BB8D0 000B8810 C0 01 00 08 */ lfs f0, 8(r1) /* 800BB8D4 000B8814 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 800BB8D8 000B8818 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -266,7 +266,7 @@ lbl_800BBB6C: /* 800BBB94 000B8AD4 D0 41 00 1C */ stfs f2, 0x1c(r1) /* 800BBB98 000B8AD8 38 7D 1D 08 */ addi r3, r29, 0x1d08 /* 800BBB9C 000B8ADC 38 81 00 14 */ addi r4, r1, 0x14 -/* 800BBBA0 000B8AE0 48 1A C1 89 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800BBBA0 000B8AE0 48 1A C1 89 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800BBBA4 000B8AE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800BBBA8 000B8AE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BBBAC 000B8AEC 38 63 0F 38 */ addi r3, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_800BBD40.s b/include/d/d_a/d_a_alink/asm/func_800BBD40.s index 0e69d776e9..b6c0f1a8a5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BBD40.s +++ b/include/d/d_a/d_a_alink/asm/func_800BBD40.s @@ -55,7 +55,7 @@ lbl_800BBE04: /* 800BBE10 000B8D50 7C 84 2A 14 */ add r4, r4, r5 /* 800BBE14 000B8D54 38 A5 37 B0 */ addi r5, r5, 0x37b0 /* 800BBE18 000B8D58 7C BF 2A 14 */ add r5, r31, r5 -/* 800BBE1C 000B8D5C 48 1A AD 19 */ bl cXyz_NS___mi +/* 800BBE1C 000B8D5C 48 1A AD 19 */ bl __mi__4cXyzCFRC3Vec /* 800BBE20 000B8D60 C0 41 00 08 */ lfs f2, 8(r1) /* 800BBE24 000B8D64 D0 41 00 14 */ stfs f2, 0x14(r1) /* 800BBE28 000B8D68 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800BBF68.s b/include/d/d_a/d_a_alink/asm/func_800BBF68.s index e6736df61d..1390934470 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BBF68.s +++ b/include/d/d_a/d_a_alink/asm/func_800BBF68.s @@ -298,7 +298,7 @@ lbl_800BC3A4: /* 800BC3B0 000B92F0 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) lbl_800BC3B4: /* 800BC3B4 000B92F4 C0 41 01 2C */ lfs f2, 0x12c(r1) -/* 800BC3B8 000B92F8 48 1A B2 BD */ bl cM_atan2s +/* 800BC3B8 000B92F8 48 1A B2 BD */ bl cM_atan2s__Fff /* 800BC3BC 000B92FC 7C 60 07 34 */ extsh r0, r3 /* 800BC3C0 000B9300 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) /* 800BC3C4 000B9304 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -327,7 +327,7 @@ lbl_800BC3B4: /* 800BC420 000B9360 D0 01 01 2C */ stfs f0, 0x12c(r1) /* 800BC424 000B9364 38 61 00 90 */ addi r3, r1, 0x90 /* 800BC428 000B9368 38 81 01 28 */ addi r4, r1, 0x128 -/* 800BC42C 000B936C 48 1A AB 1D */ bl cXyz_NS_normalizeZP +/* 800BC42C 000B936C 48 1A AB 1D */ bl normalizeZP__4cXyzFv /* 800BC430 000B9370 C0 3F 04 F8 */ lfs f1, 0x4f8(r31) /* 800BC434 000B9374 C0 01 01 28 */ lfs f0, 0x128(r1) /* 800BC438 000B9378 EC 1C 00 32 */ fmuls f0, f28, f0 @@ -351,7 +351,7 @@ lbl_800BC464: /* 800BC478 000B93B8 38 84 0C F4 */ addi r4, r4, lbl_80430CF4@l /* 800BC47C 000B93BC 38 BD 0E 68 */ addi r5, r29, 0xe68 /* 800BC480 000B93C0 C0 25 00 84 */ lfs f1, 0x84(r5) -/* 800BC484 000B93C4 48 1B 43 29 */ bl cLib_chasePos +/* 800BC484 000B93C4 48 1B 43 29 */ bl cLib_chasePos__FP4cXyzRC4cXyzf /* 800BC488 000B93C8 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800BC48C 000B93CC 38 9F 37 50 */ addi r4, r31, 0x3750 /* 800BC490 000B93D0 7C 65 1B 78 */ mr r5, r3 @@ -1072,7 +1072,7 @@ lbl_800BCEC0: /* 800BCEC8 000B9E08 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 800BCECC 000B9E0C 40 81 00 60 */ ble lbl_800BCF2C /* 800BCED0 000B9E10 38 7F 08 14 */ addi r3, r31, 0x814 -/* 800BCED4 000B9E14 48 1A A2 55 */ bl cXyz_NS_atan2sX_Z +/* 800BCED4 000B9E14 48 1A A2 55 */ bl atan2sX_Z__4cXyzCFv /* 800BCED8 000B9E18 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800BCEDC 000B9E1C 7C 00 18 50 */ subf r0, r0, r3 /* 800BCEE0 000B9E20 7C 00 07 35 */ extsh. r0, r0 @@ -1105,7 +1105,7 @@ lbl_800BCF2C: /* 800BCF44 000B9E84 38 61 00 84 */ addi r3, r1, 0x84 /* 800BCF48 000B9E88 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800BCF4C 000B9E8C 38 BF 37 98 */ addi r5, r31, 0x3798 -/* 800BCF50 000B9E90 48 1A 9B E5 */ bl cXyz_NS___mi +/* 800BCF50 000B9E90 48 1A 9B E5 */ bl __mi__4cXyzCFRC3Vec /* 800BCF54 000B9E94 C0 41 00 84 */ lfs f2, 0x84(r1) /* 800BCF58 000B9E98 D0 41 00 F0 */ stfs f2, 0xf0(r1) /* 800BCF5C 000B9E9C C0 01 00 88 */ lfs f0, 0x88(r1) @@ -1188,7 +1188,7 @@ lbl_800BD06C: /* 800BD06C 000B9FAC FF E0 08 90 */ fmr f31, f1 lbl_800BD070: /* 800BD070 000B9FB0 38 61 00 F0 */ addi r3, r1, 0xf0 -/* 800BD074 000B9FB4 48 1A A0 B5 */ bl cXyz_NS_atan2sX_Z +/* 800BD074 000B9FB4 48 1A A0 B5 */ bl atan2sX_Z__4cXyzCFv /* 800BD078 000B9FB8 7C 65 1B 78 */ mr r5, r3 /* 800BD07C 000B9FBC 7F E3 FB 78 */ mr r3, r31 /* 800BD080 000B9FC0 38 9F 1A F0 */ addi r4, r31, 0x1af0 @@ -1219,7 +1219,7 @@ lbl_800BD0D8: /* 800BD0DC 000BA01C D0 1F 34 00 */ stfs f0, 0x3400(r31) /* 800BD0E0 000BA020 D0 1F 34 04 */ stfs f0, 0x3404(r31) /* 800BD0E4 000BA024 38 7F 08 14 */ addi r3, r31, 0x814 -/* 800BD0E8 000BA028 48 1A 68 75 */ bl cCcD_Stts_NS_ClrCcMove +/* 800BD0E8 000BA028 48 1A 68 75 */ bl ClrCcMove__9cCcD_SttsFv /* 800BD0EC 000BA02C 80 1F 05 7C */ lwz r0, 0x57c(r31) /* 800BD0F0 000BA030 54 00 00 C2 */ rlwinm r0, r0, 0, 3, 1 /* 800BD0F4 000BA034 90 1F 05 7C */ stw r0, 0x57c(r31) @@ -1232,7 +1232,7 @@ lbl_800BD0D8: /* 800BD110 000BA050 38 61 00 78 */ addi r3, r1, 0x78 /* 800BD114 000BA054 38 9F 34 D4 */ addi r4, r31, 0x34d4 /* 800BD118 000BA058 38 A1 01 08 */ addi r5, r1, 0x108 -/* 800BD11C 000BA05C 48 1A 9A 19 */ bl cXyz_NS___mi +/* 800BD11C 000BA05C 48 1A 9A 19 */ bl __mi__4cXyzCFRC3Vec /* 800BD120 000BA060 C0 01 00 78 */ lfs f0, 0x78(r1) /* 800BD124 000BA064 D0 01 00 E4 */ stfs f0, 0xe4(r1) /* 800BD128 000BA068 C0 01 00 7C */ lfs f0, 0x7c(r1) @@ -1344,11 +1344,11 @@ lbl_800BD2A4: /* 800BD2B0 000BA1F0 38 61 00 6C */ addi r3, r1, 0x6c /* 800BD2B4 000BA1F4 38 9F 36 A8 */ addi r4, r31, 0x36a8 /* 800BD2B8 000BA1F8 C0 2D 81 10 */ lfs f1, lbl_80450690-_SDA_BASE_(r13) -/* 800BD2BC 000BA1FC 48 1A 98 C9 */ bl cXyz_NS___ml +/* 800BD2BC 000BA1FC 48 1A 98 C9 */ bl __ml__4cXyzCFf /* 800BD2C0 000BA200 38 61 00 60 */ addi r3, r1, 0x60 /* 800BD2C4 000BA204 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800BD2C8 000BA208 38 A1 00 6C */ addi r5, r1, 0x6c -/* 800BD2CC 000BA20C 48 1A 98 19 */ bl cXyz_NS___pl +/* 800BD2CC 000BA20C 48 1A 98 19 */ bl __pl__4cXyzCFRC3Vec /* 800BD2D0 000BA210 C0 01 00 60 */ lfs f0, 0x60(r1) /* 800BD2D4 000BA214 D0 01 00 C0 */ stfs f0, 0xc0(r1) /* 800BD2D8 000BA218 C0 01 00 64 */ lfs f0, 0x64(r1) @@ -1389,7 +1389,7 @@ lbl_800BD32C: /* 800BD360 000BA2A0 38 61 00 54 */ addi r3, r1, 0x54 /* 800BD364 000BA2A4 38 81 00 C0 */ addi r4, r1, 0xc0 /* 800BD368 000BA2A8 38 A1 00 CC */ addi r5, r1, 0xcc -/* 800BD36C 000BA2AC 48 1A 97 79 */ bl cXyz_NS___pl +/* 800BD36C 000BA2AC 48 1A 97 79 */ bl __pl__4cXyzCFRC3Vec /* 800BD370 000BA2B0 C0 01 00 54 */ lfs f0, 0x54(r1) /* 800BD374 000BA2B4 D0 01 00 B4 */ stfs f0, 0xb4(r1) /* 800BD378 000BA2B8 C0 01 00 58 */ lfs f0, 0x58(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800BD6FC.s b/include/d/d_a/d_a_alink/asm/func_800BD6FC.s index 11b69116ef..8b575dfb45 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BD6FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800BD6FC.s @@ -26,11 +26,11 @@ /* 800BD760 000BA6A0 38 61 00 54 */ addi r3, r1, 0x54 /* 800BD764 000BA6A4 38 81 00 6C */ addi r4, r1, 0x6c /* 800BD768 000BA6A8 C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) -/* 800BD76C 000BA6AC 48 1A 94 19 */ bl cXyz_NS___ml +/* 800BD76C 000BA6AC 48 1A 94 19 */ bl __ml__4cXyzCFf /* 800BD770 000BA6B0 38 61 00 48 */ addi r3, r1, 0x48 /* 800BD774 000BA6B4 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800BD778 000BA6B8 38 A1 00 54 */ addi r5, r1, 0x54 -/* 800BD77C 000BA6BC 48 1A 93 69 */ bl cXyz_NS___pl +/* 800BD77C 000BA6BC 48 1A 93 69 */ bl __pl__4cXyzCFRC3Vec /* 800BD780 000BA6C0 C0 01 00 48 */ lfs f0, 0x48(r1) /* 800BD784 000BA6C4 D0 01 00 84 */ stfs f0, 0x84(r1) /* 800BD788 000BA6C8 C0 01 00 4C */ lfs f0, 0x4c(r1) @@ -40,11 +40,11 @@ /* 800BD798 000BA6D8 38 61 00 3C */ addi r3, r1, 0x3c /* 800BD79C 000BA6DC 38 81 00 6C */ addi r4, r1, 0x6c /* 800BD7A0 000BA6E0 C0 22 93 50 */ lfs f1, lbl_80452D50-_SDA2_BASE_(r2) -/* 800BD7A4 000BA6E4 48 1A 93 E1 */ bl cXyz_NS___ml +/* 800BD7A4 000BA6E4 48 1A 93 E1 */ bl __ml__4cXyzCFf /* 800BD7A8 000BA6E8 38 61 00 30 */ addi r3, r1, 0x30 /* 800BD7AC 000BA6EC 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800BD7B0 000BA6F0 38 A1 00 3C */ addi r5, r1, 0x3c -/* 800BD7B4 000BA6F4 48 1A 93 81 */ bl cXyz_NS___mi +/* 800BD7B4 000BA6F4 48 1A 93 81 */ bl __mi__4cXyzCFRC3Vec /* 800BD7B8 000BA6F8 C0 01 00 30 */ lfs f0, 0x30(r1) /* 800BD7BC 000BA6FC D0 01 00 78 */ stfs f0, 0x78(r1) /* 800BD7C0 000BA700 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -118,7 +118,7 @@ lbl_800BD8B8: /* 800BD8C8 000BA808 38 61 00 24 */ addi r3, r1, 0x24 /* 800BD8CC 000BA80C 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800BD8D0 000BA810 38 BF 37 98 */ addi r5, r31, 0x3798 -/* 800BD8D4 000BA814 48 1A 92 61 */ bl cXyz_NS___mi +/* 800BD8D4 000BA814 48 1A 92 61 */ bl __mi__4cXyzCFRC3Vec /* 800BD8D8 000BA818 C0 01 00 24 */ lfs f0, 0x24(r1) /* 800BD8DC 000BA81C D0 01 00 6C */ stfs f0, 0x6c(r1) /* 800BD8E0 000BA820 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -206,7 +206,7 @@ lbl_800BDA18: /* 800BDA18 000BA958 38 61 00 18 */ addi r3, r1, 0x18 /* 800BDA1C 000BA95C 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800BDA20 000BA960 38 BF 37 98 */ addi r5, r31, 0x3798 -/* 800BDA24 000BA964 48 1A 91 11 */ bl cXyz_NS___mi +/* 800BDA24 000BA964 48 1A 91 11 */ bl __mi__4cXyzCFRC3Vec /* 800BDA28 000BA968 C0 41 00 18 */ lfs f2, 0x18(r1) /* 800BDA2C 000BA96C D0 41 00 60 */ stfs f2, 0x60(r1) /* 800BDA30 000BA970 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -292,7 +292,7 @@ lbl_800BDB44: /* 800BDB48 000BAA88 FC 1E 00 40 */ fcmpo cr0, f30, f0 /* 800BDB4C 000BAA8C 40 81 00 20 */ ble lbl_800BDB6C /* 800BDB50 000BAA90 38 61 00 60 */ addi r3, r1, 0x60 -/* 800BDB54 000BAA94 48 1A 95 D5 */ bl cXyz_NS_atan2sX_Z +/* 800BDB54 000BAA94 48 1A 95 D5 */ bl atan2sX_Z__4cXyzCFv /* 800BDB58 000BAA98 7C 65 1B 78 */ mr r5, r3 /* 800BDB5C 000BAA9C 7F E3 FB 78 */ mr r3, r31 /* 800BDB60 000BAAA0 38 9F 1A 60 */ addi r4, r31, 0x1a60 diff --git a/include/d/d_a/d_a_alink/asm/func_800BE9D4.s b/include/d/d_a/d_a_alink/asm/func_800BE9D4.s index 6c4a74e869..ee2315ff43 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BE9D4.s +++ b/include/d/d_a/d_a_alink/asm/func_800BE9D4.s @@ -66,7 +66,7 @@ lbl_800BEAAC: lbl_800BEAC4: /* 800BEAC4 000BBA04 FC 20 F8 90 */ fmr f1, f31 /* 800BEAC8 000BBA08 FC 40 F0 90 */ fmr f2, f30 -/* 800BEACC 000BBA0C 48 1A 8B A9 */ bl cM_atan2s +/* 800BEACC 000BBA0C 48 1A 8B A9 */ bl cM_atan2s__Fff lbl_800BEAD0: /* 800BEAD0 000BBA10 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 800BEAD4 000BBA14 CB E1 00 20 */ lfd f31, 0x20(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800BF204.s b/include/d/d_a/d_a_alink/asm/func_800BF204.s index 4c07462fe3..9856ec9503 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BF204.s +++ b/include/d/d_a/d_a_alink/asm/func_800BF204.s @@ -79,7 +79,7 @@ lbl_800BF320: /* 800BF328 000BC268 7C 86 2A 14 */ add r4, r6, r5 /* 800BF32C 000BC26C 80 06 00 08 */ lwz r0, 8(r6) /* 800BF330 000BC270 7C A5 00 50 */ subf r5, r5, r0 -/* 800BF334 000BC274 48 1B 06 09 */ bl cLib_memCpy +/* 800BF334 000BC274 48 1B 06 09 */ bl cLib_memCpy__FPvPCvUl /* 800BF338 000BC278 93 DD 2D 7C */ stw r30, 0x2d7c(r29) /* 800BF33C 000BC27C A0 1F 00 00 */ lhz r0, 0(r31) /* 800BF340 000BC280 B0 1D 30 84 */ sth r0, 0x3084(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800BF500.s b/include/d/d_a/d_a_alink/asm/func_800BF500.s index 2c8f0c6745..0cef60c1f7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BF500.s +++ b/include/d/d_a/d_a_alink/asm/func_800BF500.s @@ -71,11 +71,11 @@ lbl_800BF608: /* 800BF608 000BC548 38 61 00 20 */ addi r3, r1, 0x20 /* 800BF60C 000BC54C 38 81 00 38 */ addi r4, r1, 0x38 /* 800BF610 000BC550 FC 20 F8 90 */ fmr f1, f31 -/* 800BF614 000BC554 48 1A 75 71 */ bl cXyz_NS___ml +/* 800BF614 000BC554 48 1A 75 71 */ bl __ml__4cXyzCFf /* 800BF618 000BC558 38 61 00 14 */ addi r3, r1, 0x14 /* 800BF61C 000BC55C 38 81 00 20 */ addi r4, r1, 0x20 /* 800BF620 000BC560 7F E5 FB 78 */ mr r5, r31 -/* 800BF624 000BC564 48 1A 74 C1 */ bl cXyz_NS___pl +/* 800BF624 000BC564 48 1A 74 C1 */ bl __pl__4cXyzCFRC3Vec /* 800BF628 000BC568 C0 01 00 14 */ lfs f0, 0x14(r1) /* 800BF62C 000BC56C D0 1E 00 00 */ stfs f0, 0(r30) /* 800BF630 000BC570 C0 01 00 18 */ lfs f0, 0x18(r1) @@ -113,7 +113,7 @@ lbl_800BF6AC: /* 800BF6AC 000BC5EC 38 61 00 08 */ addi r3, r1, 8 /* 800BF6B0 000BC5F0 38 81 00 38 */ addi r4, r1, 0x38 /* 800BF6B4 000BC5F4 C0 22 93 50 */ lfs f1, lbl_80452D50-_SDA2_BASE_(r2) -/* 800BF6B8 000BC5F8 48 1A 74 CD */ bl cXyz_NS___ml +/* 800BF6B8 000BC5F8 48 1A 74 CD */ bl __ml__4cXyzCFf /* 800BF6BC 000BC5FC 38 61 00 2C */ addi r3, r1, 0x2c /* 800BF6C0 000BC600 38 81 00 08 */ addi r4, r1, 8 /* 800BF6C4 000BC604 7C 65 1B 78 */ mr r5, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800BF9F0.s b/include/d/d_a/d_a_alink/asm/func_800BF9F0.s index 34e8d1792c..74183bea17 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BF9F0.s +++ b/include/d/d_a/d_a_alink/asm/func_800BF9F0.s @@ -165,11 +165,11 @@ lbl_800BFC4C: /* 800BFC4C 000BCB8C 38 61 00 1C */ addi r3, r1, 0x1c /* 800BFC50 000BCB90 38 9F 05 C8 */ addi r4, r31, 0x5c8 /* 800BFC54 000BCB94 38 BF 05 D4 */ addi r5, r31, 0x5d4 -/* 800BFC58 000BCB98 48 1A 6E 8D */ bl cXyz_NS___pl +/* 800BFC58 000BCB98 48 1A 6E 8D */ bl __pl__4cXyzCFRC3Vec /* 800BFC5C 000BCB9C 38 61 00 10 */ addi r3, r1, 0x10 /* 800BFC60 000BCBA0 38 81 00 1C */ addi r4, r1, 0x1c /* 800BFC64 000BCBA4 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800BFC68 000BCBA8 48 1A 6F 1D */ bl cXyz_NS___ml +/* 800BFC68 000BCBA8 48 1A 6F 1D */ bl __ml__4cXyzCFf /* 800BFC6C 000BCBAC C0 01 00 10 */ lfs f0, 0x10(r1) /* 800BFC70 000BCBB0 D0 01 00 28 */ stfs f0, 0x28(r1) /* 800BFC74 000BCBB4 C0 01 00 14 */ lfs f0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C12DC.s b/include/d/d_a/d_a_alink/asm/func_800C12DC.s index 14f2fe7a61..2c29350747 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C12DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C12DC.s @@ -106,13 +106,13 @@ lbl_800C1404: /* 800C1460 000BE3A0 38 61 00 14 */ addi r3, r1, 0x14 /* 800C1464 000BE3A4 38 81 00 20 */ addi r4, r1, 0x20 /* 800C1468 000BE3A8 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 800C146C 000BE3AC 48 1A 57 19 */ bl cXyz_NS___ml +/* 800C146C 000BE3AC 48 1A 57 19 */ bl __ml__4cXyzCFf /* 800C1470 000BE3B0 38 61 00 08 */ addi r3, r1, 8 /* 800C1474 000BE3B4 3C 80 80 3F */ lis r4, lbl_803F1C48@ha /* 800C1478 000BE3B8 38 84 1C 48 */ addi r4, r4, lbl_803F1C48@l /* 800C147C 000BE3BC 38 84 00 30 */ addi r4, r4, 0x30 /* 800C1480 000BE3C0 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800C1484 000BE3C4 48 1A 56 61 */ bl cXyz_NS___pl +/* 800C1484 000BE3C4 48 1A 56 61 */ bl __pl__4cXyzCFRC3Vec /* 800C1488 000BE3C8 C0 01 00 08 */ lfs f0, 8(r1) /* 800C148C 000BE3CC D0 1E 04 D0 */ stfs f0, 0x4d0(r30) /* 800C1490 000BE3D0 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C1704.s b/include/d/d_a/d_a_alink/asm/func_800C1704.s index 5dacfc52f7..a7ccf92cad 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C1704.s +++ b/include/d/d_a/d_a_alink/asm/func_800C1704.s @@ -162,7 +162,7 @@ lbl_800C1954: /* 800C1958 000BE898 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800C195C 000BE89C C0 62 94 A8 */ lfs f3, lbl_80452EA8-_SDA2_BASE_(r2) /* 800C1960 000BE8A0 C0 82 93 A0 */ lfs f4, lbl_80452DA0-_SDA2_BASE_(r2) -/* 800C1964 000BE8A4 48 1A E0 19 */ bl cLib_addCalc +/* 800C1964 000BE8A4 48 1A E0 19 */ bl cLib_addCalc__FPfffff /* 800C1968 000BE8A8 80 7F 4A 00 */ lwz r3, 0x4a00(r31) /* 800C196C 000BE8AC 80 1F 4A 04 */ lwz r0, 0x4a04(r31) /* 800C1970 000BE8B0 90 61 00 74 */ stw r3, 0x74(r1) @@ -238,7 +238,7 @@ lbl_800C1A60: /* 800C1A60 000BE9A0 38 7C 33 FC */ addi r3, r28, 0x33fc /* 800C1A64 000BE9A4 C0 1E 00 0C */ lfs f0, 0xc(r30) /* 800C1A68 000BE9A8 EC 40 00 B2 */ fmuls f2, f0, f2 -/* 800C1A6C 000BE9AC 48 1A EC D5 */ bl cLib_chaseF +/* 800C1A6C 000BE9AC 48 1A EC D5 */ bl cLib_chaseF__FPfff /* 800C1A70 000BE9B0 C0 3C 33 FC */ lfs f1, 0x33fc(r28) /* 800C1A74 000BE9B4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C1A78 000BE9B8 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -267,7 +267,7 @@ lbl_800C1A60: /* 800C1AD4 000BEA14 38 61 00 44 */ addi r3, r1, 0x44 /* 800C1AD8 000BEA18 38 9C 05 38 */ addi r4, r28, 0x538 /* 800C1ADC 000BEA1C 38 BC 34 E0 */ addi r5, r28, 0x34e0 -/* 800C1AE0 000BEA20 48 1A 50 55 */ bl cXyz_NS___mi +/* 800C1AE0 000BEA20 48 1A 50 55 */ bl __mi__4cXyzCFRC3Vec /* 800C1AE4 000BEA24 C0 01 00 44 */ lfs f0, 0x44(r1) /* 800C1AE8 000BEA28 D0 01 00 50 */ stfs f0, 0x50(r1) /* 800C1AEC 000BEA2C C0 01 00 48 */ lfs f0, 0x48(r1) @@ -275,10 +275,10 @@ lbl_800C1A60: /* 800C1AF4 000BEA34 C0 01 00 4C */ lfs f0, 0x4c(r1) /* 800C1AF8 000BEA38 D0 01 00 58 */ stfs f0, 0x58(r1) /* 800C1AFC 000BEA3C 38 61 00 50 */ addi r3, r1, 0x50 -/* 800C1B00 000BEA40 48 1A 56 51 */ bl cXyz_NS_atan2sY_XZ +/* 800C1B00 000BEA40 48 1A 56 51 */ bl atan2sY_XZ__4cXyzCFv /* 800C1B04 000BEA44 7C 7A 1B 78 */ mr r26, r3 /* 800C1B08 000BEA48 38 61 00 50 */ addi r3, r1, 0x50 -/* 800C1B0C 000BEA4C 48 1A 56 1D */ bl cXyz_NS_atan2sX_Z +/* 800C1B0C 000BEA4C 48 1A 56 1D */ bl atan2sX_Z__4cXyzCFv /* 800C1B10 000BEA50 7C 7B 1B 78 */ mr r27, r3 /* 800C1B14 000BEA54 38 7C 05 38 */ addi r3, r28, 0x538 /* 800C1B18 000BEA58 4B F4 B2 4D */ bl mDoMtx_stack_c_NS_transS @@ -323,11 +323,11 @@ lbl_800C1BA8: /* 800C1BB0 000BEAF0 38 61 00 38 */ addi r3, r1, 0x38 /* 800C1BB4 000BEAF4 38 9C 05 BC */ addi r4, r28, 0x5bc /* 800C1BB8 000BEAF8 38 BC 34 98 */ addi r5, r28, 0x3498 -/* 800C1BBC 000BEAFC 48 1A 4F 29 */ bl cXyz_NS___pl +/* 800C1BBC 000BEAFC 48 1A 4F 29 */ bl __pl__4cXyzCFRC3Vec /* 800C1BC0 000BEB00 38 61 00 2C */ addi r3, r1, 0x2c /* 800C1BC4 000BEB04 38 81 00 38 */ addi r4, r1, 0x38 /* 800C1BC8 000BEB08 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800C1BCC 000BEB0C 48 1A 4F B9 */ bl cXyz_NS___ml +/* 800C1BCC 000BEB0C 48 1A 4F B9 */ bl __ml__4cXyzCFf /* 800C1BD0 000BEB10 C0 01 00 2C */ lfs f0, 0x2c(r1) /* 800C1BD4 000BEB14 D0 01 00 68 */ stfs f0, 0x68(r1) /* 800C1BD8 000BEB18 C0 01 00 30 */ lfs f0, 0x30(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C3B1C.s b/include/d/d_a/d_a_alink/asm/func_800C3B1C.s index d36446e41d..c716b1a8e0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3B1C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3B1C.s @@ -9,7 +9,7 @@ /* 800C3B3C 000C0A7C 3C 80 80 39 */ lis r4, lbl_8038D6BC@ha /* 800C3B40 000C0A80 38 84 D6 BC */ addi r4, r4, lbl_8038D6BC@l /* 800C3B44 000C0A84 C0 44 00 38 */ lfs f2, 0x38(r4) -/* 800C3B48 000C0A88 48 1A CB F9 */ bl cLib_chaseF +/* 800C3B48 000C0A88 48 1A CB F9 */ bl cLib_chaseF__FPfff /* 800C3B4C 000C0A8C 7F C3 F3 78 */ mr r3, r30 /* 800C3B50 000C0A90 4B FF 64 01 */ bl daAlink_c_NS_checkGroundSpecialMode /* 800C3B54 000C0A94 2C 03 00 00 */ cmpwi r3, 0 @@ -29,7 +29,7 @@ lbl_800C3B7C: /* 800C3B84 000C0AC4 38 A0 00 1E */ li r5, 0x1e /* 800C3B88 000C0AC8 38 C0 3C DF */ li r6, 0x3cdf /* 800C3B8C 000C0ACC 38 E0 1F 40 */ li r7, 0x1f40 -/* 800C3B90 000C0AD0 48 1A C9 B1 */ bl cLib_addCalcAngleS +/* 800C3B90 000C0AD0 48 1A C9 B1 */ bl cLib_addCalcAngleS__FPsssss /* 800C3B94 000C0AD4 7C 7F 1B 78 */ mr r31, r3 /* 800C3B98 000C0AD8 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800C3B9C 000C0ADC B0 1E 04 DE */ sth r0, 0x4de(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800C3D38.s b/include/d/d_a/d_a_alink/asm/func_800C3D38.s index 2a83c722c5..3d225b283c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3D38.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3D38.s @@ -9,7 +9,7 @@ /* 800C3D58 000C0C98 A8 BF 30 0A */ lha r5, 0x300a(r31) /* 800C3D5C 000C0C9C A8 DF 30 0E */ lha r6, 0x300e(r31) /* 800C3D60 000C0CA0 A8 FF 30 10 */ lha r7, 0x3010(r31) -/* 800C3D64 000C0CA4 48 1A C7 DD */ bl cLib_addCalcAngleS +/* 800C3D64 000C0CA4 48 1A C7 DD */ bl cLib_addCalcAngleS__FPsssss /* 800C3D68 000C0CA8 7F E3 FB 78 */ mr r3, r31 /* 800C3D6C 000C0CAC 38 80 00 00 */ li r4, 0 /* 800C3D70 000C0CB0 4B FF 63 61 */ bl daAlink_c_NS_checkNextAction diff --git a/include/d/d_a/d_a_alink/asm/func_800C3F60.s b/include/d/d_a/d_a_alink/asm/func_800C3F60.s index 7c74c46972..aba560ace2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3F60.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3F60.s @@ -15,7 +15,7 @@ /* 800C3F98 000C0ED8 38 A0 00 05 */ li r5, 5 /* 800C3F9C 000C0EDC 38 C0 05 E8 */ li r6, 0x5e8 /* 800C3FA0 000C0EE0 38 E0 01 3C */ li r7, 0x13c -/* 800C3FA4 000C0EE4 48 1A C5 9D */ bl cLib_addCalcAngleS +/* 800C3FA4 000C0EE4 48 1A C5 9D */ bl cLib_addCalcAngleS__FPsssss /* 800C3FA8 000C0EE8 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 800C3FAC 000C0EEC 28 00 00 02 */ cmplwi r0, 2 /* 800C3FB0 000C0EF0 40 82 00 14 */ bne lbl_800C3FC4 diff --git a/include/d/d_a/d_a_alink/asm/func_800C4378.s b/include/d/d_a/d_a_alink/asm/func_800C4378.s index 46d38fd26e..53cf4d166b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C4378.s +++ b/include/d/d_a/d_a_alink/asm/func_800C4378.s @@ -27,7 +27,7 @@ lbl_800C43D4: lbl_800C43DC: /* 800C43DC 000C131C 7F C3 F3 78 */ mr r3, r30 /* 800C43E0 000C1320 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800C43E4 000C1324 48 1A CA 41 */ bl cLib_distanceAngleS +/* 800C43E4 000C1324 48 1A CA 41 */ bl cLib_distanceAngleS__Fss /* 800C43E8 000C1328 2C 03 38 00 */ cmpwi r3, 0x3800 /* 800C43EC 000C132C 41 80 00 10 */ blt lbl_800C43FC /* 800C43F0 000C1330 A8 1F 30 0E */ lha r0, 0x300e(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800C4514.s b/include/d/d_a/d_a_alink/asm/func_800C4514.s index 6dbe7546c2..957512b7bc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C4514.s +++ b/include/d/d_a/d_a_alink/asm/func_800C4514.s @@ -14,7 +14,7 @@ /* 800C4548 000C1488 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C454C 000C148C 41 82 02 24 */ beq lbl_800C4770 /* 800C4550 000C1490 38 61 00 08 */ addi r3, r1, 8 -/* 800C4554 000C1494 48 1A 2B D5 */ bl cXyz_NS_atan2sX_Z +/* 800C4554 000C1494 48 1A 2B D5 */ bl atan2sX_Z__4cXyzCFv /* 800C4558 000C1498 7C 7F 1B 78 */ mr r31, r3 /* 800C455C 000C149C 80 1E 31 98 */ lwz r0, 0x3198(r30) /* 800C4560 000C14A0 2C 00 00 00 */ cmpwi r0, 0 @@ -63,7 +63,7 @@ lbl_800C4600: /* 800C4600 000C1540 38 7E 30 0C */ addi r3, r30, 0x300c /* 800C4604 000C1544 38 80 00 00 */ li r4, 0 /* 800C4608 000C1548 38 A0 00 40 */ li r5, 0x40 -/* 800C460C 000C154C 48 1A C0 C5 */ bl cLib_chaseS +/* 800C460C 000C154C 48 1A C0 C5 */ bl cLib_chaseS__FPsss lbl_800C4610: /* 800C4610 000C1550 A8 1E 30 0C */ lha r0, 0x300c(r30) /* 800C4614 000C1554 7F FF 02 14 */ add r31, r31, r0 @@ -76,14 +76,14 @@ lbl_800C4610: /* 800C4630 000C1570 38 A0 00 03 */ li r5, 3 /* 800C4634 000C1574 38 C0 01 2C */ li r6, 0x12c /* 800C4638 000C1578 38 E0 00 32 */ li r7, 0x32 -/* 800C463C 000C157C 48 1A BF 05 */ bl cLib_addCalcAngleS +/* 800C463C 000C157C 48 1A BF 05 */ bl cLib_addCalcAngleS__FPsssss lbl_800C4640: /* 800C4640 000C1580 38 7E 04 DE */ addi r3, r30, 0x4de /* 800C4644 000C1584 7F E4 FB 78 */ mr r4, r31 /* 800C4648 000C1588 38 A0 00 04 */ li r5, 4 /* 800C464C 000C158C 38 C0 10 00 */ li r6, 0x1000 /* 800C4650 000C1590 38 E0 04 00 */ li r7, 0x400 -/* 800C4654 000C1594 48 1A BE ED */ bl cLib_addCalcAngleS +/* 800C4654 000C1594 48 1A BE ED */ bl cLib_addCalcAngleS__FPsssss /* 800C4658 000C1598 80 1E 31 98 */ lwz r0, 0x3198(r30) /* 800C465C 000C159C 2C 00 00 00 */ cmpwi r0, 0 /* 800C4660 000C15A0 41 82 00 14 */ beq lbl_800C4674 @@ -103,7 +103,7 @@ lbl_800C468C: /* 800C4690 000C15D0 38 A0 00 04 */ li r5, 4 /* 800C4694 000C15D4 38 C0 10 00 */ li r6, 0x1000 /* 800C4698 000C15D8 38 E0 04 00 */ li r7, 0x400 -/* 800C469C 000C15DC 48 1A BE A5 */ bl cLib_addCalcAngleS +/* 800C469C 000C15DC 48 1A BE A5 */ bl cLib_addCalcAngleS__FPsssss /* 800C46A0 000C15E0 80 1E 31 98 */ lwz r0, 0x3198(r30) /* 800C46A4 000C15E4 2C 00 00 00 */ cmpwi r0, 0 /* 800C46A8 000C15E8 41 82 00 14 */ beq lbl_800C46BC diff --git a/include/d/d_a/d_a_alink/asm/func_800C4894.s b/include/d/d_a/d_a_alink/asm/func_800C4894.s index cb9b20c30e..1bb8bf584f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C4894.s +++ b/include/d/d_a/d_a_alink/asm/func_800C4894.s @@ -8,7 +8,7 @@ /* 800C48B0 000C17F0 38 7E 33 98 */ addi r3, r30, 0x3398 /* 800C48B4 000C17F4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C48B8 000C17F8 C0 42 93 24 */ lfs f2, lbl_80452D24-_SDA2_BASE_(r2) -/* 800C48BC 000C17FC 48 1A BE 85 */ bl cLib_chaseF +/* 800C48BC 000C17FC 48 1A BE 85 */ bl cLib_chaseF__FPfff /* 800C48C0 000C1800 80 1E 31 98 */ lwz r0, 0x3198(r30) /* 800C48C4 000C1804 2C 00 00 00 */ cmpwi r0, 0 /* 800C48C8 000C1808 41 82 00 0C */ beq lbl_800C48D4 diff --git a/include/d/d_a/d_a_alink/asm/func_800C494C.s b/include/d/d_a/d_a_alink/asm/func_800C494C.s index db77bc0aed..6c788724a5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C494C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C494C.s @@ -120,7 +120,7 @@ lbl_800C4ACC: /* 800C4B08 000C1A48 38 7E 10 DC */ addi r3, r30, 0x10dc /* 800C4B0C 000C1A4C 38 9F 01 64 */ addi r4, r31, 0x164 /* 800C4B10 000C1A50 C0 24 00 6C */ lfs f1, 0x6c(r4) -/* 800C4B14 000C1A54 48 1A AB F5 */ bl cM3dGSph_NS_SetR +/* 800C4B14 000C1A54 48 1A AB F5 */ bl SetR__8cM3dGSphFf /* 800C4B18 000C1A58 80 1E 0F B8 */ lwz r0, 0xfb8(r30) /* 800C4B1C 000C1A5C 60 00 00 01 */ ori r0, r0, 1 /* 800C4B20 000C1A60 90 1E 0F B8 */ stw r0, 0xfb8(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800C4B40.s b/include/d/d_a/d_a_alink/asm/func_800C4B40.s index 4d778dbea1..8f3a32ba21 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C4B40.s +++ b/include/d/d_a/d_a_alink/asm/func_800C4B40.s @@ -18,7 +18,7 @@ /* 800C4B84 000C1AC4 38 7E 33 98 */ addi r3, r30, 0x3398 /* 800C4B88 000C1AC8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C4B8C 000C1ACC C0 42 93 D8 */ lfs f2, lbl_80452DD8-_SDA2_BASE_(r2) -/* 800C4B90 000C1AD0 48 1A BB B1 */ bl cLib_chaseF +/* 800C4B90 000C1AD0 48 1A BB B1 */ bl cLib_chaseF__FPfff lbl_800C4B94: /* 800C4B94 000C1AD4 C0 3E 33 AC */ lfs f1, 0x33ac(r30) /* 800C4B98 000C1AD8 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) @@ -31,7 +31,7 @@ lbl_800C4B94: /* 800C4BB4 000C1AF4 A8 A7 00 3E */ lha r5, 0x3e(r7) /* 800C4BB8 000C1AF8 A8 C7 00 40 */ lha r6, 0x40(r7) /* 800C4BBC 000C1AFC A8 E7 00 42 */ lha r7, 0x42(r7) -/* 800C4BC0 000C1B00 48 1A B9 81 */ bl cLib_addCalcAngleS +/* 800C4BC0 000C1B00 48 1A B9 81 */ bl cLib_addCalcAngleS__FPsssss /* 800C4BC4 000C1B04 A8 1E 04 DE */ lha r0, 0x4de(r30) /* 800C4BC8 000C1B08 B0 1E 04 E6 */ sth r0, 0x4e6(r30) lbl_800C4BCC: @@ -89,7 +89,7 @@ lbl_800C4C64: /* 800C4C88 000C1BC8 38 7E 33 98 */ addi r3, r30, 0x3398 /* 800C4C8C 000C1BCC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C4C90 000C1BD0 C0 42 93 D8 */ lfs f2, lbl_80452DD8-_SDA2_BASE_(r2) -/* 800C4C94 000C1BD4 48 1A BA AD */ bl cLib_chaseF +/* 800C4C94 000C1BD4 48 1A BA AD */ bl cLib_chaseF__FPfff /* 800C4C98 000C1BD8 7F C3 F3 78 */ mr r3, r30 /* 800C4C9C 000C1BDC 4B FE EC 69 */ bl daAlink_c_NS_checkZeroSpeedF /* 800C4CA0 000C1BE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -114,7 +114,7 @@ lbl_800C4CD0: /* 800C4CE4 000C1C24 38 7E 33 98 */ addi r3, r30, 0x3398 /* 800C4CE8 000C1C28 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C4CEC 000C1C2C C0 42 93 D8 */ lfs f2, lbl_80452DD8-_SDA2_BASE_(r2) -/* 800C4CF0 000C1C30 48 1A BA 51 */ bl cLib_chaseF +/* 800C4CF0 000C1C30 48 1A BA 51 */ bl cLib_chaseF__FPfff /* 800C4CF4 000C1C34 48 00 01 F8 */ b lbl_800C4EEC lbl_800C4CF8: /* 800C4CF8 000C1C38 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -149,7 +149,7 @@ lbl_800C4CF8: /* 800C4D6C 000C1CAC 38 03 80 00 */ addi r0, r3, -32768 /* 800C4D70 000C1CB0 7C 03 07 34 */ extsh r3, r0 /* 800C4D74 000C1CB4 A8 9E 18 EC */ lha r4, 0x18ec(r30) -/* 800C4D78 000C1CB8 48 1A C0 AD */ bl cLib_distanceAngleS +/* 800C4D78 000C1CB8 48 1A C0 AD */ bl cLib_distanceAngleS__Fss /* 800C4D7C 000C1CBC 3C 80 80 39 */ lis r4, lbl_8038D7BC@ha /* 800C4D80 000C1CC0 38 84 D7 BC */ addi r4, r4, lbl_8038D7BC@l /* 800C4D84 000C1CC4 A8 04 00 3C */ lha r0, 0x3c(r4) @@ -243,7 +243,7 @@ lbl_800C4EC4: /* 800C4EC4 000C1E04 38 7E 33 98 */ addi r3, r30, 0x3398 /* 800C4EC8 000C1E08 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C4ECC 000C1E0C C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800C4ED0 000C1E10 48 1A B8 71 */ bl cLib_chaseF +/* 800C4ED0 000C1E10 48 1A B8 71 */ bl cLib_chaseF__FPfff /* 800C4ED4 000C1E14 48 00 00 18 */ b lbl_800C4EEC lbl_800C4ED8: /* 800C4ED8 000C1E18 C0 02 93 44 */ lfs f0, lbl_80452D44-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800C5484.s b/include/d/d_a/d_a_alink/asm/func_800C5484.s index da1b5f5e2c..0a1339550a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5484.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5484.s @@ -16,7 +16,7 @@ /* 800C54C0 000C2400 38 A0 00 05 */ li r5, 5 /* 800C54C4 000C2404 38 C0 05 E8 */ li r6, 0x5e8 /* 800C54C8 000C2408 38 E0 01 3C */ li r7, 0x13c -/* 800C54CC 000C240C 48 1A B0 75 */ bl cLib_addCalcAngleS +/* 800C54CC 000C240C 48 1A B0 75 */ bl cLib_addCalcAngleS__FPsssss /* 800C54D0 000C2410 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 800C54D4 000C2414 28 00 00 02 */ cmplwi r0, 2 /* 800C54D8 000C2418 40 82 00 14 */ bne lbl_800C54EC @@ -47,7 +47,7 @@ lbl_800C54F8: /* 800C5534 000C2474 38 7F 33 98 */ addi r3, r31, 0x3398 /* 800C5538 000C2478 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C553C 000C247C C0 42 93 D8 */ lfs f2, lbl_80452DD8-_SDA2_BASE_(r2) -/* 800C5540 000C2480 48 1A B2 01 */ bl cLib_chaseF +/* 800C5540 000C2480 48 1A B2 01 */ bl cLib_chaseF__FPfff lbl_800C5544: /* 800C5544 000C2484 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800C5548 000C2488 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e @@ -126,7 +126,7 @@ lbl_800C561C: /* 800C5654 000C2594 38 7F 33 98 */ addi r3, r31, 0x3398 /* 800C5658 000C2598 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C565C 000C259C C0 42 97 B4 */ lfs f2, lbl_804531B4-_SDA2_BASE_(r2) -/* 800C5660 000C25A0 48 1A B0 E1 */ bl cLib_chaseF +/* 800C5660 000C25A0 48 1A B0 E1 */ bl cLib_chaseF__FPfff /* 800C5664 000C25A4 48 00 00 74 */ b lbl_800C56D8 lbl_800C5668: /* 800C5668 000C25A8 7F A3 EB 78 */ mr r3, r29 @@ -158,7 +158,7 @@ lbl_800C56C8: /* 800C56C8 000C2608 38 7F 33 98 */ addi r3, r31, 0x3398 /* 800C56CC 000C260C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C56D0 000C2610 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) -/* 800C56D4 000C2614 48 1A B0 6D */ bl cLib_chaseF +/* 800C56D4 000C2614 48 1A B0 6D */ bl cLib_chaseF__FPfff lbl_800C56D8: /* 800C56D8 000C2618 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800C56DC 000C261C 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l diff --git a/include/d/d_a/d_a_alink/asm/func_800C5CA4.s b/include/d/d_a/d_a_alink/asm/func_800C5CA4.s index fe40a842df..8fec432458 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5CA4.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5CA4.s @@ -8,7 +8,7 @@ /* 800C5CC0 000C2C00 3C 80 80 39 */ lis r4, lbl_8038D6BC@ha /* 800C5CC4 000C2C04 38 84 D6 BC */ addi r4, r4, lbl_8038D6BC@l /* 800C5CC8 000C2C08 C0 44 00 44 */ lfs f2, 0x44(r4) -/* 800C5CCC 000C2C0C 48 1A AA 75 */ bl cLib_chaseF +/* 800C5CCC 000C2C0C 48 1A AA 75 */ bl cLib_chaseF__FPfff /* 800C5CD0 000C2C10 7F E3 FB 78 */ mr r3, r31 /* 800C5CD4 000C2C14 4B FE DC 31 */ bl daAlink_c_NS_checkZeroSpeedF /* 800C5CD8 000C2C18 54 60 06 3F */ clrlwi. r0, r3, 0x18 diff --git a/include/d/d_a/d_a_alink/asm/func_800C61EC.s b/include/d/d_a/d_a_alink/asm/func_800C61EC.s index fe07f4b6b0..2d759bea37 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C61EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C61EC.s @@ -21,7 +21,7 @@ /* 800C623C 000C317C C0 42 93 F8 */ lfs f2, lbl_80452DF8-_SDA2_BASE_(r2) /* 800C6240 000C3180 C0 1E 33 A8 */ lfs f0, 0x33a8(r30) /* 800C6244 000C3184 EC 42 00 32 */ fmuls f2, f2, f0 -/* 800C6248 000C3188 48 1A A4 F9 */ bl cLib_chaseF +/* 800C6248 000C3188 48 1A A4 F9 */ bl cLib_chaseF__FPfff /* 800C624C 000C318C 48 00 00 48 */ b lbl_800C6294 lbl_800C6250: /* 800C6250 000C3190 7F C3 F3 78 */ mr r3, r30 @@ -31,7 +31,7 @@ lbl_800C6250: /* 800C6260 000C31A0 38 7E 33 98 */ addi r3, r30, 0x3398 /* 800C6264 000C31A4 C0 3E 05 94 */ lfs f1, 0x594(r30) /* 800C6268 000C31A8 C0 42 93 A0 */ lfs f2, lbl_80452DA0-_SDA2_BASE_(r2) -/* 800C626C 000C31AC 48 1A A4 D5 */ bl cLib_chaseF +/* 800C626C 000C31AC 48 1A A4 D5 */ bl cLib_chaseF__FPfff /* 800C6270 000C31B0 48 00 00 24 */ b lbl_800C6294 lbl_800C6274: /* 800C6274 000C31B4 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -41,7 +41,7 @@ lbl_800C6274: /* 800C6284 000C31C4 38 7E 33 98 */ addi r3, r30, 0x3398 /* 800C6288 000C31C8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C628C 000C31CC C0 42 93 A0 */ lfs f2, lbl_80452DA0-_SDA2_BASE_(r2) -/* 800C6290 000C31D0 48 1A A4 B1 */ bl cLib_chaseF +/* 800C6290 000C31D0 48 1A A4 B1 */ bl cLib_chaseF__FPfff lbl_800C6294: /* 800C6294 000C31D4 A8 7E 30 08 */ lha r3, 0x3008(r30) /* 800C6298 000C31D8 2C 03 00 00 */ cmpwi r3, 0 @@ -210,7 +210,7 @@ lbl_800C64C8: /* 800C64E8 000C3428 38 A0 00 05 */ li r5, 5 /* 800C64EC 000C342C 38 C0 00 C8 */ li r6, 0xc8 /* 800C64F0 000C3430 38 E0 00 32 */ li r7, 0x32 -/* 800C64F4 000C3434 48 1A A0 4D */ bl cLib_addCalcAngleS +/* 800C64F4 000C3434 48 1A A0 4D */ bl cLib_addCalcAngleS__FPsssss /* 800C64F8 000C3438 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800C64FC 000C343C A8 7E 04 DE */ lha r3, 0x4de(r30) /* 800C6500 000C3440 7C 00 18 50 */ subf r0, r0, r3 @@ -228,14 +228,14 @@ lbl_800C6514: /* 800C6528 000C3468 38 A0 00 0A */ li r5, 0xa /* 800C652C 000C346C 38 C0 03 E8 */ li r6, 0x3e8 /* 800C6530 000C3470 38 E0 00 32 */ li r7, 0x32 -/* 800C6534 000C3474 48 1A A0 0D */ bl cLib_addCalcAngleS +/* 800C6534 000C3474 48 1A A0 0D */ bl cLib_addCalcAngleS__FPsssss /* 800C6538 000C3478 38 7E 30 8A */ addi r3, r30, 0x308a /* 800C653C 000C347C 1C 1D 00 0C */ mulli r0, r29, 0xc /* 800C6540 000C3480 7C 04 07 34 */ extsh r4, r0 /* 800C6544 000C3484 38 A0 00 0A */ li r5, 0xa /* 800C6548 000C3488 38 C0 03 E8 */ li r6, 0x3e8 /* 800C654C 000C348C 38 E0 00 32 */ li r7, 0x32 -/* 800C6550 000C3490 48 1A 9F F1 */ bl cLib_addCalcAngleS +/* 800C6550 000C3490 48 1A 9F F1 */ bl cLib_addCalcAngleS__FPsssss lbl_800C6554: /* 800C6554 000C3494 7F C3 F3 78 */ mr r3, r30 /* 800C6558 000C3498 4B FE F6 69 */ bl daAlink_c_NS_setFallVoice diff --git a/include/d/d_a/d_a_alink/asm/func_800C6798.s b/include/d/d_a/d_a_alink/asm/func_800C6798.s index d002ca1da0..86ab8b91c0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C6798.s +++ b/include/d/d_a/d_a_alink/asm/func_800C6798.s @@ -39,7 +39,7 @@ lbl_800C680C: /* 800C6828 000C3768 38 7F 33 98 */ addi r3, r31, 0x3398 /* 800C682C 000C376C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C6830 000C3770 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) -/* 800C6834 000C3774 48 1A 9F 0D */ bl cLib_chaseF +/* 800C6834 000C3774 48 1A 9F 0D */ bl cLib_chaseF__FPfff lbl_800C6838: /* 800C6838 000C3778 38 60 00 01 */ li r3, 1 lbl_800C683C: diff --git a/include/d/d_a/d_a_alink/asm/func_800C692C.s b/include/d/d_a/d_a_alink/asm/func_800C692C.s index 4c716677f3..e1855b0d8c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C692C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C692C.s @@ -62,7 +62,7 @@ lbl_800C69DC: /* 800C6A10 000C3950 EC 00 00 B2 */ fmuls f0, f0, f2 /* 800C6A14 000C3954 EC 21 00 32 */ fmuls f1, f1, f0 /* 800C6A18 000C3958 C0 44 00 8C */ lfs f2, 0x8c(r4) -/* 800C6A1C 000C395C 48 1A 9D 25 */ bl cLib_chaseF +/* 800C6A1C 000C395C 48 1A 9D 25 */ bl cLib_chaseF__FPfff /* 800C6A20 000C3960 C0 3F 34 78 */ lfs f1, 0x3478(r31) /* 800C6A24 000C3964 C0 1F 34 7C */ lfs f0, 0x347c(r31) /* 800C6A28 000C3968 EC 01 00 2A */ fadds f0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800C6D20.s b/include/d/d_a/d_a_alink/asm/func_800C6D20.s index 338cf06f16..ad90e9d9b5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C6D20.s +++ b/include/d/d_a/d_a_alink/asm/func_800C6D20.s @@ -10,7 +10,7 @@ /* 800C6D44 000C3C84 38 7F 33 98 */ addi r3, r31, 0x3398 /* 800C6D48 000C3C88 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C6D4C 000C3C8C C0 42 93 A0 */ lfs f2, lbl_80452DA0-_SDA2_BASE_(r2) -/* 800C6D50 000C3C90 48 1A 99 F1 */ bl cLib_chaseF +/* 800C6D50 000C3C90 48 1A 99 F1 */ bl cLib_chaseF__FPfff /* 800C6D54 000C3C94 48 00 00 1C */ b lbl_800C6D70 lbl_800C6D58: /* 800C6D58 000C3C98 7C 60 07 35 */ extsh. r0, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800C70F8.s b/include/d/d_a/d_a_alink/asm/func_800C70F8.s index c9ec57d58f..3b73a4db99 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C70F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800C70F8.s @@ -89,7 +89,7 @@ lbl_800C71F0: lbl_800C7250: /* 800C7250 000C4190 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800C7254 000C4194 38 81 00 08 */ addi r4, r1, 8 -/* 800C7258 000C4198 48 1A 99 AD */ bl cLib_targetAngleY +/* 800C7258 000C4198 48 1A 99 AD */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800C725C 000C419C B0 7F 30 0C */ sth r3, 0x300c(r31) /* 800C7260 000C41A0 38 00 00 01 */ li r0, 1 /* 800C7264 000C41A4 B0 1F 30 0E */ sth r0, 0x300e(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800C72D4.s b/include/d/d_a/d_a_alink/asm/func_800C72D4.s index 9488354e27..815ab94f0e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C72D4.s +++ b/include/d/d_a/d_a_alink/asm/func_800C72D4.s @@ -126,7 +126,7 @@ lbl_800C7490: /* 800C74A4 000C43E4 38 A0 00 03 */ li r5, 3 /* 800C74A8 000C43E8 38 C0 10 00 */ li r6, 0x1000 /* 800C74AC 000C43EC 38 E0 04 00 */ li r7, 0x400 -/* 800C74B0 000C43F0 48 1A 90 91 */ bl cLib_addCalcAngleS +/* 800C74B0 000C43F0 48 1A 90 91 */ bl cLib_addCalcAngleS__FPsssss /* 800C74B4 000C43F4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800C74B8 000C43F8 B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_800C74BC: diff --git a/include/d/d_a/d_a_alink/asm/func_800C76F8.s b/include/d/d_a/d_a_alink/asm/func_800C76F8.s index 94c5a22cc7..5224943d61 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C76F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800C76F8.s @@ -9,7 +9,7 @@ /* 800C7718 000C4658 3C 80 80 39 */ lis r4, lbl_8038D6BC@ha /* 800C771C 000C465C 38 84 D6 BC */ addi r4, r4, lbl_8038D6BC@l /* 800C7720 000C4660 C0 44 00 38 */ lfs f2, 0x38(r4) -/* 800C7724 000C4664 48 1A 90 1D */ bl cLib_chaseF +/* 800C7724 000C4664 48 1A 90 1D */ bl cLib_chaseF__FPfff /* 800C7728 000C4668 7F A3 EB 78 */ mr r3, r29 /* 800C772C 000C466C 4B FE BD D5 */ bl daAlink_c_NS_checkAttentionState /* 800C7730 000C4670 54 60 06 3F */ clrlwi. r0, r3, 0x18 diff --git a/include/d/d_a/d_a_alink/asm/func_800C77F4.s b/include/d/d_a/d_a_alink/asm/func_800C77F4.s index 41ed5c1bb9..e12a6a20c6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C77F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800C77F4.s @@ -200,7 +200,7 @@ lbl_800C7A50: /* 800C7AE0 000C4A20 D0 81 00 28 */ stfs f4, 0x28(r1) /* 800C7AE4 000C4A24 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 800C7AE8 000C4A28 38 81 00 20 */ addi r4, r1, 0x20 -/* 800C7AEC 000C4A2C 48 1A 02 3D */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800C7AEC 000C4A2C 48 1A 02 3D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800C7AF0 000C4A30 7F E3 FB 78 */ mr r3, r31 /* 800C7AF4 000C4A34 38 9E 1D 08 */ addi r4, r30, 0x1d08 /* 800C7AF8 000C4A38 4B FA C9 A9 */ bl cBgS_NS_GroundCross @@ -273,7 +273,7 @@ lbl_800C7BE4: /* 800C7BEC 000C4B2C 7C 65 1B 78 */ mr r5, r3 /* 800C7BF0 000C4B30 48 27 F4 C5 */ bl PSVECSubtract /* 800C7BF4 000C4B34 38 61 00 20 */ addi r3, r1, 0x20 -/* 800C7BF8 000C4B38 48 19 F5 59 */ bl cXyz_NS_atan2sY_XZ +/* 800C7BF8 000C4B38 48 19 F5 59 */ bl atan2sY_XZ__4cXyzCFv /* 800C7BFC 000C4B3C B0 7E 30 0C */ sth r3, 0x300c(r30) /* 800C7C00 000C4B40 A8 7E 30 0C */ lha r3, 0x300c(r30) /* 800C7C04 000C4B44 48 29 D4 CD */ bl func_803650D0 diff --git a/include/d/d_a/d_a_alink/asm/func_800C85D8.s b/include/d/d_a/d_a_alink/asm/func_800C85D8.s index 256bdedc5f..543f1e1031 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C85D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800C85D8.s @@ -21,7 +21,7 @@ lbl_800C860C: /* 800C8624 000C5564 38 A0 00 02 */ li r5, 2 /* 800C8628 000C5568 38 C0 01 F4 */ li r6, 0x1f4 /* 800C862C 000C556C 38 E0 00 64 */ li r7, 0x64 -/* 800C8630 000C5570 48 1A 7F 11 */ bl cLib_addCalcAngleS +/* 800C8630 000C5570 48 1A 7F 11 */ bl cLib_addCalcAngleS__FPsssss lbl_800C8634: /* 800C8634 000C5574 A8 7E 04 DE */ lha r3, 0x4de(r30) /* 800C8638 000C5578 A8 1E 04 E6 */ lha r0, 0x4e6(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800C8700.s b/include/d/d_a/d_a_alink/asm/func_800C8700.s index f3642bd021..33610aef4a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C8700.s +++ b/include/d/d_a/d_a_alink/asm/func_800C8700.s @@ -32,7 +32,7 @@ lbl_800C8750: /* 800C8778 000C56B8 C8 01 00 80 */ lfd f0, 0x80(r1) /* 800C877C 000C56BC EC 00 08 28 */ fsubs f0, f0, f1 /* 800C8780 000C56C0 EC 22 00 24 */ fdivs f1, f2, f0 -/* 800C8784 000C56C4 48 19 E4 01 */ bl cXyz_NS___ml +/* 800C8784 000C56C4 48 19 E4 01 */ bl __ml__4cXyzCFf /* 800C8788 000C56C8 38 7F 08 14 */ addi r3, r31, 0x814 /* 800C878C 000C56CC 38 81 00 0C */ addi r4, r1, 0xc /* 800C8790 000C56D0 4B FC F0 49 */ bl cXyz_NS___as @@ -1709,7 +1709,7 @@ lbl_800C9F78: /* 800C9F90 000C6ED0 38 A0 00 04 */ li r5, 4 /* 800C9F94 000C6ED4 38 C0 0C 00 */ li r6, 0xc00 /* 800C9F98 000C6ED8 38 E0 01 80 */ li r7, 0x180 -/* 800C9F9C 000C6EDC 48 1A 65 A5 */ bl cLib_addCalcAngleS +/* 800C9F9C 000C6EDC 48 1A 65 A5 */ bl cLib_addCalcAngleS__FPsssss lbl_800C9FA0: /* 800C9FA0 000C6EE0 7F E3 FB 78 */ mr r3, r31 /* 800C9FA4 000C6EE4 3C 80 40 00 */ lis r4, 0x4000 @@ -1721,7 +1721,7 @@ lbl_800C9FA0: /* 800C9FBC 000C6EFC 38 A0 00 04 */ li r5, 4 /* 800C9FC0 000C6F00 38 C0 0C 00 */ li r6, 0xc00 /* 800C9FC4 000C6F04 38 E0 01 80 */ li r7, 0x180 -/* 800C9FC8 000C6F08 48 1A 65 79 */ bl cLib_addCalcAngleS +/* 800C9FC8 000C6F08 48 1A 65 79 */ bl cLib_addCalcAngleS__FPsssss lbl_800C9FCC: /* 800C9FCC 000C6F0C 7F E3 FB 78 */ mr r3, r31 /* 800C9FD0 000C6F10 4B FD ED 15 */ bl daAlink_c_NS_setMatrix diff --git a/include/d/d_a/d_a_alink/asm/func_800CB694.s b/include/d/d_a/d_a_alink/asm/func_800CB694.s index 7f64e7b54d..6632dc0b7f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CB694.s +++ b/include/d/d_a/d_a_alink/asm/func_800CB694.s @@ -23,7 +23,7 @@ /* 800CB6EC 000C862C D0 41 00 34 */ stfs f2, 0x34(r1) /* 800CB6F0 000C8630 D0 61 00 38 */ stfs f3, 0x38(r1) /* 800CB6F4 000C8634 38 61 00 30 */ addi r3, r1, 0x30 -/* 800CB6F8 000C8638 48 19 BA 31 */ bl cXyz_NS_atan2sX_Z +/* 800CB6F8 000C8638 48 19 BA 31 */ bl atan2sX_Z__4cXyzCFv /* 800CB6FC 000C863C B0 7E 2F F6 */ sth r3, 0x2ff6(r30) /* 800CB700 000C8640 7F C3 F3 78 */ mr r3, r30 /* 800CB704 000C8644 4B F5 04 11 */ bl fopAcM_getTalkEventPartner @@ -54,7 +54,7 @@ lbl_800CB748: lbl_800CB75C: /* 800CB75C 000C869C 38 63 05 38 */ addi r3, r3, 0x538 /* 800CB760 000C86A0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 800CB764 000C86A4 48 1A 54 A1 */ bl cLib_targetAngleY +/* 800CB764 000C86A4 48 1A 54 A1 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800CB768 000C86A8 B0 7E 2F F8 */ sth r3, 0x2ff8(r30) /* 800CB76C 000C86AC 3B E0 00 01 */ li r31, 1 /* 800CB770 000C86B0 48 00 00 AC */ b lbl_800CB81C @@ -187,7 +187,7 @@ lbl_800CB934: /* 800CB934 000C8874 FC 40 08 90 */ fmr f2, f1 lbl_800CB938: /* 800CB938 000C8878 C0 21 00 34 */ lfs f1, 0x34(r1) -/* 800CB93C 000C887C 48 19 BD 39 */ bl cM_atan2s +/* 800CB93C 000C887C 48 19 BD 39 */ bl cM_atan2s__Fff /* 800CB940 000C8880 B0 7E 2F F4 */ sth r3, 0x2ff4(r30) /* 800CB944 000C8884 80 1E 05 78 */ lwz r0, 0x578(r30) /* 800CB948 000C8888 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 diff --git a/include/d/d_a/d_a_alink/asm/func_800CBA38.s b/include/d/d_a/d_a_alink/asm/func_800CBA38.s index a77ffc7b44..1c86e2eaea 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CBA38.s +++ b/include/d/d_a/d_a_alink/asm/func_800CBA38.s @@ -29,7 +29,7 @@ lbl_800CBA98: lbl_800CBAA4: /* 800CBAA4 000C89E4 A8 7E 2F F8 */ lha r3, 0x2ff8(r30) /* 800CBAA8 000C89E8 A8 9E 2F FA */ lha r4, 0x2ffa(r30) -/* 800CBAAC 000C89EC 48 1A 53 79 */ bl cLib_distanceAngleS +/* 800CBAAC 000C89EC 48 1A 53 79 */ bl cLib_distanceAngleS__Fss /* 800CBAB0 000C89F0 2C 03 01 00 */ cmpwi r3, 0x100 /* 800CBAB4 000C89F4 40 80 00 2C */ bge lbl_800CBAE0 /* 800CBAB8 000C89F8 A8 1E 2F FA */ lha r0, 0x2ffa(r30) @@ -37,7 +37,7 @@ lbl_800CBAA4: /* 800CBAC0 000C8A00 48 00 00 20 */ b lbl_800CBAE0 lbl_800CBAC4: /* 800CBAC4 000C8A04 A8 9E 2F F6 */ lha r4, 0x2ff6(r30) -/* 800CBAC8 000C8A08 48 1A 53 5D */ bl cLib_distanceAngleS +/* 800CBAC8 000C8A08 48 1A 53 5D */ bl cLib_distanceAngleS__Fss /* 800CBACC 000C8A0C 2C 03 16 00 */ cmpwi r3, 0x1600 /* 800CBAD0 000C8A10 40 80 00 10 */ bge lbl_800CBAE0 /* 800CBAD4 000C8A14 80 1E 05 78 */ lwz r0, 0x578(r30) @@ -49,13 +49,13 @@ lbl_800CBAE0: /* 800CBAE8 000C8A28 38 A0 00 04 */ li r5, 4 /* 800CBAEC 000C8A2C 38 C0 18 00 */ li r6, 0x1800 /* 800CBAF0 000C8A30 38 E0 02 00 */ li r7, 0x200 -/* 800CBAF4 000C8A34 48 1A 4A 4D */ bl cLib_addCalcAngleS +/* 800CBAF4 000C8A34 48 1A 4A 4D */ bl cLib_addCalcAngleS__FPsssss /* 800CBAF8 000C8A38 7C 60 07 35 */ extsh. r0, r3 /* 800CBAFC 000C8A3C 40 82 00 4C */ bne lbl_800CBB48 /* 800CBB00 000C8A40 38 7E 2F F4 */ addi r3, r30, 0x2ff4 /* 800CBB04 000C8A44 38 80 40 00 */ li r4, 0x4000 /* 800CBB08 000C8A48 38 A0 06 50 */ li r5, 0x650 -/* 800CBB0C 000C8A4C 48 1A 4B C5 */ bl cLib_chaseS +/* 800CBB0C 000C8A4C 48 1A 4B C5 */ bl cLib_chaseS__FPsss /* 800CBB10 000C8A50 2C 03 00 00 */ cmpwi r3, 0 /* 800CBB14 000C8A54 41 82 00 18 */ beq lbl_800CBB2C /* 800CBB18 000C8A58 38 60 00 04 */ li r3, 4 @@ -79,22 +79,22 @@ lbl_800CBB48: /* 800CBB54 000C8A94 38 7E 2F F4 */ addi r3, r30, 0x2ff4 /* 800CBB58 000C8A98 38 80 26 00 */ li r4, 0x2600 /* 800CBB5C 000C8A9C 38 A0 08 00 */ li r5, 0x800 -/* 800CBB60 000C8AA0 48 1A 4B 71 */ bl cLib_chaseS +/* 800CBB60 000C8AA0 48 1A 4B 71 */ bl cLib_chaseS__FPsss /* 800CBB64 000C8AA4 48 00 00 24 */ b lbl_800CBB88 lbl_800CBB68: /* 800CBB68 000C8AA8 38 7E 2F FC */ addi r3, r30, 0x2ffc /* 800CBB6C 000C8AAC 38 80 08 00 */ li r4, 0x800 /* 800CBB70 000C8AB0 38 A0 01 00 */ li r5, 0x100 -/* 800CBB74 000C8AB4 48 1A 4B 5D */ bl cLib_chaseS +/* 800CBB74 000C8AB4 48 1A 4B 5D */ bl cLib_chaseS__FPsss /* 800CBB78 000C8AB8 38 7E 2F F4 */ addi r3, r30, 0x2ff4 /* 800CBB7C 000C8ABC 38 80 00 00 */ li r4, 0 /* 800CBB80 000C8AC0 A8 BE 2F FC */ lha r5, 0x2ffc(r30) -/* 800CBB84 000C8AC4 48 1A 4B 4D */ bl cLib_chaseS +/* 800CBB84 000C8AC4 48 1A 4B 4D */ bl cLib_chaseS__FPsss lbl_800CBB88: /* 800CBB88 000C8AC8 38 7E 04 50 */ addi r3, r30, 0x450 /* 800CBB8C 000C8ACC C0 22 93 14 */ lfs f1, lbl_80452D14-_SDA2_BASE_(r2) /* 800CBB90 000C8AD0 C0 42 93 A0 */ lfs f2, lbl_80452DA0-_SDA2_BASE_(r2) -/* 800CBB94 000C8AD4 48 1A 4B AD */ bl cLib_chaseF +/* 800CBB94 000C8AD4 48 1A 4B AD */ bl cLib_chaseF__FPfff lbl_800CBB98: /* 800CBB98 000C8AD8 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800CBB9C 000C8ADC 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l diff --git a/include/d/d_a/d_a_alink/asm/func_800CD7AC.s b/include/d/d_a/d_a_alink/asm/func_800CD7AC.s index ac5cbf3b79..cba3ab9ea2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CD7AC.s +++ b/include/d/d_a/d_a_alink/asm/func_800CD7AC.s @@ -397,16 +397,16 @@ lbl_800CDD34: /* 800CDD3C 000CAC7C 4B FA A2 7D */ bl dBgS_ObjLinChk_NS_dtor /* 800CDD40 000CAC80 38 7F 1E 4C */ addi r3, r31, 0x1e4c /* 800CDD44 000CAC84 38 80 FF FF */ li r4, -1 -/* 800CDD48 000CAC88 48 19 A3 69 */ bl cBgS_PolyInfo_NS_dtor +/* 800CDD48 000CAC88 48 19 A3 69 */ bl __dt__13cBgS_PolyInfoFv /* 800CDD4C 000CAC8C 38 7F 1E 3C */ addi r3, r31, 0x1e3c /* 800CDD50 000CAC90 38 80 FF FF */ li r4, -1 -/* 800CDD54 000CAC94 48 19 A3 5D */ bl cBgS_PolyInfo_NS_dtor +/* 800CDD54 000CAC94 48 19 A3 5D */ bl __dt__13cBgS_PolyInfoFv /* 800CDD58 000CAC98 38 7F 1E 2C */ addi r3, r31, 0x1e2c /* 800CDD5C 000CAC9C 38 80 FF FF */ li r4, -1 -/* 800CDD60 000CACA0 48 19 A3 51 */ bl cBgS_PolyInfo_NS_dtor +/* 800CDD60 000CACA0 48 19 A3 51 */ bl __dt__13cBgS_PolyInfoFv /* 800CDD64 000CACA4 38 7F 1E 1C */ addi r3, r31, 0x1e1c /* 800CDD68 000CACA8 38 80 FF FF */ li r4, -1 -/* 800CDD6C 000CACAC 48 19 A3 45 */ bl cBgS_PolyInfo_NS_dtor +/* 800CDD6C 000CACAC 48 19 A3 45 */ bl __dt__13cBgS_PolyInfoFv /* 800CDD70 000CACB0 38 7F 1D AC */ addi r3, r31, 0x1dac /* 800CDD74 000CACB4 38 80 FF FF */ li r4, -1 /* 800CDD78 000CACB8 4B FA A3 15 */ bl dBgS_LinkLinChk_NS_dtor @@ -552,7 +552,7 @@ lbl_800CDF44: /* 800CDF80 000CAEC0 90 1F 17 34 */ stw r0, 0x1734(r31) /* 800CDF84 000CAEC4 38 7F 17 1C */ addi r3, r31, 0x171c /* 800CDF88 000CAEC8 38 80 00 00 */ li r4, 0 -/* 800CDF8C 000CAECC 48 1A 10 19 */ bl cM3dGCps_NS_dtor +/* 800CDF8C 000CAECC 48 1A 10 19 */ bl __dt__8cM3dGCpsFv /* 800CDF90 000CAED0 34 1F 16 FC */ addic. r0, r31, 0x16fc /* 800CDF94 000CAED4 41 82 00 24 */ beq lbl_800CDFB8 /* 800CDF98 000CAED8 3C 60 80 3C */ lis r3, lbl_803C36D0@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800CE728.s b/include/d/d_a/d_a_alink/asm/func_800CE728.s index 231a52dd4f..07bdd3b17e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CE728.s +++ b/include/d/d_a/d_a_alink/asm/func_800CE728.s @@ -71,7 +71,7 @@ lbl_800CE7DC: /* 800CE830 000CB770 38 61 00 08 */ addi r3, r1, 8 /* 800CE834 000CB774 38 81 00 20 */ addi r4, r1, 0x20 /* 800CE838 000CB778 38 BE 1B 78 */ addi r5, r30, 0x1b78 -/* 800CE83C 000CB77C 48 19 82 F9 */ bl cXyz_NS___mi +/* 800CE83C 000CB77C 48 19 82 F9 */ bl __mi__4cXyzCFRC3Vec /* 800CE840 000CB780 C0 01 00 08 */ lfs f0, 8(r1) /* 800CE844 000CB784 D0 01 00 14 */ stfs f0, 0x14(r1) /* 800CE848 000CB788 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800CE8A0.s b/include/d/d_a/d_a_alink/asm/func_800CE8A0.s index abad07b1a7..87d16c2733 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CE8A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800CE8A0.s @@ -105,7 +105,7 @@ lbl_800CEA0C: /* 800CEA30 000CB970 38 A0 00 05 */ li r5, 5 /* 800CEA34 000CB974 38 C0 10 00 */ li r6, 0x1000 /* 800CEA38 000CB978 38 E0 04 00 */ li r7, 0x400 -/* 800CEA3C 000CB97C 48 1A 1B 05 */ bl cLib_addCalcAngleS +/* 800CEA3C 000CB97C 48 1A 1B 05 */ bl cLib_addCalcAngleS__FPsssss lbl_800CEA40: /* 800CEA40 000CB980 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800CEA44 000CB984 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_a/d_a_alink/asm/func_800CF380.s b/include/d/d_a/d_a_alink/asm/func_800CF380.s index 450111caca..1ea1c7577b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CF380.s +++ b/include/d/d_a/d_a_alink/asm/func_800CF380.s @@ -248,13 +248,13 @@ /* 800CF71C 000CC65C 38 7F 1D AC */ addi r3, r31, 0x1dac /* 800CF720 000CC660 4B FA 89 11 */ bl dBgS_LinkLinChk /* 800CF724 000CC664 38 7F 1E 1C */ addi r3, r31, 0x1e1c -/* 800CF728 000CC668 48 19 89 4D */ bl cBgS_PolyInfo_NS_ctor +/* 800CF728 000CC668 48 19 89 4D */ bl __ct__13cBgS_PolyInfoFv /* 800CF72C 000CC66C 38 7F 1E 2C */ addi r3, r31, 0x1e2c -/* 800CF730 000CC670 48 19 89 45 */ bl cBgS_PolyInfo_NS_ctor +/* 800CF730 000CC670 48 19 89 45 */ bl __ct__13cBgS_PolyInfoFv /* 800CF734 000CC674 38 7F 1E 3C */ addi r3, r31, 0x1e3c -/* 800CF738 000CC678 48 19 89 3D */ bl cBgS_PolyInfo_NS_ctor +/* 800CF738 000CC678 48 19 89 3D */ bl __ct__13cBgS_PolyInfoFv /* 800CF73C 000CC67C 38 7F 1E 4C */ addi r3, r31, 0x1e4c -/* 800CF740 000CC680 48 19 89 35 */ bl cBgS_PolyInfo_NS_ctor +/* 800CF740 000CC680 48 19 89 35 */ bl __ct__13cBgS_PolyInfoFv /* 800CF744 000CC684 38 7F 1E 5C */ addi r3, r31, 0x1e5c /* 800CF748 000CC688 4B FA 88 15 */ bl dBgS_ObjLinChk /* 800CF74C 000CC68C 3B 5F 1E CC */ addi r26, r31, 0x1ecc diff --git a/include/d/d_a/d_a_alink/asm/func_800D0F90.s b/include/d/d_a/d_a_alink/asm/func_800D0F90.s index 793b73e7cb..c8eb81ce15 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D0F90.s +++ b/include/d/d_a/d_a_alink/asm/func_800D0F90.s @@ -27,7 +27,7 @@ /* 800D0FF8 000CDF38 98 1E 10 2D */ stb r0, 0x102d(r30) /* 800D0FFC 000CDF3C 38 7E 10 DC */ addi r3, r30, 0x10dc /* 800D1000 000CDF40 FC 20 F8 90 */ fmr f1, f31 -/* 800D1004 000CDF44 48 19 E7 05 */ bl cM3dGSph_NS_SetR +/* 800D1004 000CDF44 48 19 E7 05 */ bl SetR__8cM3dGSphFf /* 800D1008 000CDF48 38 00 00 01 */ li r0, 1 /* 800D100C 000CDF4C 98 1E 2F D0 */ stb r0, 0x2fd0(r30) /* 800D1010 000CDF50 CB E1 00 18 */ lfd f31, 0x18(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D1540.s b/include/d/d_a/d_a_alink/asm/func_800D1540.s index d7f7b426b5..f41e9ed700 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D1540.s +++ b/include/d/d_a/d_a_alink/asm/func_800D1540.s @@ -51,10 +51,10 @@ lbl_800D15E4: /* 800D15F0 000CE530 9B DA 11 64 */ stb r30, 0x1164(r26) /* 800D15F4 000CE534 9B FA 11 04 */ stb r31, 0x1104(r26) /* 800D15F8 000CE538 38 7A 12 14 */ addi r3, r26, 0x1214 -/* 800D15FC 000CE53C 48 19 DC 05 */ bl cM3dGCyl_NS_SetR +/* 800D15FC 000CE53C 48 19 DC 05 */ bl SetR__8cM3dGCylFf /* 800D1600 000CE540 38 7A 12 14 */ addi r3, r26, 0x1214 /* 800D1604 000CE544 FC 20 F8 90 */ fmr f1, f31 -/* 800D1608 000CE548 48 19 DB F1 */ bl cM3dGCyl_NS_SetH +/* 800D1608 000CE548 48 19 DB F1 */ bl SetH__8cM3dGCylFf /* 800D160C 000CE54C 9B 3A 11 65 */ stb r25, 0x1165(r26) /* 800D1610 000CE550 A0 1A 2F E8 */ lhz r0, 0x2fe8(r26) /* 800D1614 000CE554 28 00 00 1E */ cmplwi r0, 0x1e diff --git a/include/d/d_a/d_a_alink/asm/func_800D19C8.s b/include/d/d_a/d_a_alink/asm/func_800D19C8.s index 973085a335..720d6d9dce 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D19C8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D19C8.s @@ -209,16 +209,16 @@ lbl_800D1CBC: /* 800D1CC0 000CEC00 FC 20 00 50 */ fneg f1, f0 /* 800D1CC4 000CEC04 C0 01 00 64 */ lfs f0, 0x64(r1) /* 800D1CC8 000CEC08 FC 40 00 50 */ fneg f2, f0 -/* 800D1CCC 000CEC0C 48 19 59 A9 */ bl cM_atan2s +/* 800D1CCC 000CEC0C 48 19 59 A9 */ bl cM_atan2s__Fff /* 800D1CD0 000CEC10 7C 7D 1B 78 */ mr r29, r3 /* 800D1CD4 000CEC14 C0 21 00 60 */ lfs f1, 0x60(r1) /* 800D1CD8 000CEC18 FC 40 F8 90 */ fmr f2, f31 -/* 800D1CDC 000CEC1C 48 19 59 99 */ bl cM_atan2s +/* 800D1CDC 000CEC1C 48 19 59 99 */ bl cM_atan2s__Fff /* 800D1CE0 000CEC20 7C 64 1B 78 */ mr r4, r3 /* 800D1CE4 000CEC24 38 61 00 24 */ addi r3, r1, 0x24 /* 800D1CE8 000CEC28 7F A5 EB 78 */ mr r5, r29 /* 800D1CEC 000CEC2C 38 C0 00 00 */ li r6, 0 -/* 800D1CF0 000CEC30 48 19 57 05 */ bl csXyz_X1_ +/* 800D1CF0 000CEC30 48 19 57 05 */ bl __ct__5csXyzFsss /* 800D1CF4 000CEC34 2C 1C 00 05 */ cmpwi r28, 5 /* 800D1CF8 000CEC38 41 82 00 0C */ beq lbl_800D1D04 /* 800D1CFC 000CEC3C 2C 1C 00 0E */ cmpwi r28, 0xe diff --git a/include/d/d_a/d_a_alink/asm/func_800D2BFC.s b/include/d/d_a/d_a_alink/asm/func_800D2BFC.s index cf80b455a8..eaad183623 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2BFC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2BFC.s @@ -5,7 +5,7 @@ /* 800D2C0C 000CFB4C 7C 7F 1B 78 */ mr r31, r3 /* 800D2C10 000CFB50 4B FE 0A 21 */ bl daAlink_c_NS_getShapeAngleYAtnActor /* 800D2C14 000CFB54 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800D2C18 000CFB58 48 19 E2 0D */ bl cLib_distanceAngleS +/* 800D2C18 000CFB58 48 19 E2 0D */ bl cLib_distanceAngleS__Fss /* 800D2C1C 000CFB5C 2C 03 08 00 */ cmpwi r3, 0x800 /* 800D2C20 000CFB60 40 80 00 10 */ bge lbl_800D2C30 /* 800D2C24 000CFB64 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D2C78.s b/include/d/d_a/d_a_alink/asm/func_800D2C78.s index 63a89b1af4..d73955e686 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2C78.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2C78.s @@ -39,7 +39,7 @@ lbl_800D2CF8: /* 800D2D08 000CFC48 40 82 02 30 */ bne lbl_800D2F38 /* 800D2D0C 000CFC4C 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800D2D10 000CFC50 38 84 05 38 */ addi r4, r4, 0x538 -/* 800D2D14 000CFC54 48 19 DE F1 */ bl cLib_targetAngleY +/* 800D2D14 000CFC54 48 19 DE F1 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800D2D18 000CFC58 B0 7F 04 E6 */ sth r3, 0x4e6(r31) /* 800D2D1C 000CFC5C 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800D2D20 000CFC60 38 83 9A 20 */ addi r4, r3, lbl_80439A20@l diff --git a/include/d/d_a/d_a_alink/asm/func_800D31B8.s b/include/d/d_a/d_a_alink/asm/func_800D31B8.s index 7acb5213d6..05c37544e7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D31B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D31B8.s @@ -25,7 +25,7 @@ lbl_800D31E4: /* 800D3214 000D0154 3C 80 80 39 */ lis r4, lbl_8038D6BC@ha /* 800D3218 000D0158 38 84 D6 BC */ addi r4, r4, lbl_8038D6BC@l /* 800D321C 000D015C C0 44 00 38 */ lfs f2, 0x38(r4) -/* 800D3220 000D0160 48 19 D5 21 */ bl cLib_chaseF +/* 800D3220 000D0160 48 19 D5 21 */ bl cLib_chaseF__FPfff /* 800D3224 000D0164 80 1E 05 88 */ lwz r0, 0x588(r30) /* 800D3228 000D0168 64 00 08 00 */ oris r0, r0, 0x800 /* 800D322C 000D016C 90 1E 05 88 */ stw r0, 0x588(r30) @@ -126,7 +126,7 @@ lbl_800D3364: /* 800D3380 000D02C0 7F C3 F3 78 */ mr r3, r30 /* 800D3384 000D02C4 4B FE 02 AD */ bl daAlink_c_NS_getShapeAngleYAtnActor /* 800D3388 000D02C8 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800D338C 000D02CC 48 19 DA 99 */ bl cLib_distanceAngleS +/* 800D338C 000D02CC 48 19 DA 99 */ bl cLib_distanceAngleS__Fss /* 800D3390 000D02D0 2C 03 08 00 */ cmpwi r3, 0x800 /* 800D3394 000D02D4 40 80 00 28 */ bge lbl_800D33BC /* 800D3398 000D02D8 38 00 00 01 */ li r0, 1 @@ -138,7 +138,7 @@ lbl_800D33A4: /* 800D33AC 000D02EC 38 A0 00 02 */ li r5, 2 /* 800D33B0 000D02F0 38 C0 20 00 */ li r6, 0x2000 /* 800D33B4 000D02F4 38 E0 08 00 */ li r7, 0x800 -/* 800D33B8 000D02F8 48 19 D1 89 */ bl cLib_addCalcAngleS +/* 800D33B8 000D02F8 48 19 D1 89 */ bl cLib_addCalcAngleS__FPsssss lbl_800D33BC: /* 800D33BC 000D02FC A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800D33C0 000D0300 B0 1E 04 DE */ sth r0, 0x4de(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800D382C.s b/include/d/d_a/d_a_alink/asm/func_800D382C.s index 892f2f892c..c7b76db440 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D382C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D382C.s @@ -19,7 +19,7 @@ lbl_800D3858: /* 800D3870 000D07B0 3C 80 80 39 */ lis r4, lbl_8038D6BC@ha /* 800D3874 000D07B4 38 84 D6 BC */ addi r4, r4, lbl_8038D6BC@l /* 800D3878 000D07B8 C0 44 00 38 */ lfs f2, 0x38(r4) -/* 800D387C 000D07BC 48 19 CE C5 */ bl cLib_chaseF +/* 800D387C 000D07BC 48 19 CE C5 */ bl cLib_chaseF__FPfff /* 800D3880 000D07C0 80 1E 05 88 */ lwz r0, 0x588(r30) /* 800D3884 000D07C4 64 00 08 00 */ oris r0, r0, 0x800 /* 800D3888 000D07C8 90 1E 05 88 */ stw r0, 0x588(r30) @@ -151,7 +151,7 @@ lbl_800D3A40: /* 800D3A4C 000D098C 7F C3 F3 78 */ mr r3, r30 /* 800D3A50 000D0990 4B FD FB E1 */ bl daAlink_c_NS_getShapeAngleYAtnActor /* 800D3A54 000D0994 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800D3A58 000D0998 48 19 D3 CD */ bl cLib_distanceAngleS +/* 800D3A58 000D0998 48 19 D3 CD */ bl cLib_distanceAngleS__Fss /* 800D3A5C 000D099C 2C 03 08 00 */ cmpwi r3, 0x800 /* 800D3A60 000D09A0 40 80 00 0C */ bge lbl_800D3A6C /* 800D3A64 000D09A4 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D3ECC.s b/include/d/d_a/d_a_alink/asm/func_800D3ECC.s index 32337b83a9..9e480b0824 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D3ECC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D3ECC.s @@ -87,7 +87,7 @@ lbl_800D3FFC: /* 800D4008 000D0F48 7F C3 F3 78 */ mr r3, r30 /* 800D400C 000D0F4C 4B FD F6 25 */ bl daAlink_c_NS_getShapeAngleYAtnActor /* 800D4010 000D0F50 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800D4014 000D0F54 48 19 CE 11 */ bl cLib_distanceAngleS +/* 800D4014 000D0F54 48 19 CE 11 */ bl cLib_distanceAngleS__Fss /* 800D4018 000D0F58 2C 03 08 00 */ cmpwi r3, 0x800 /* 800D401C 000D0F5C 40 80 00 0C */ bge lbl_800D4028 /* 800D4020 000D0F60 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D41FC.s b/include/d/d_a/d_a_alink/asm/func_800D41FC.s index 03fc117893..b85bde3be1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D41FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D41FC.s @@ -16,7 +16,7 @@ lbl_800D4228: /* 800D4234 000D1174 3C 80 80 39 */ lis r4, lbl_8038DE8C@ha /* 800D4238 000D1178 38 84 DE 8C */ addi r4, r4, lbl_8038DE8C@l /* 800D423C 000D117C C0 44 00 68 */ lfs f2, 0x68(r4) -/* 800D4240 000D1180 48 19 C5 01 */ bl cLib_chaseF +/* 800D4240 000D1180 48 19 C5 01 */ bl cLib_chaseF__FPfff /* 800D4244 000D1184 A8 1E 30 0C */ lha r0, 0x300c(r30) /* 800D4248 000D1188 2C 00 00 00 */ cmpwi r0, 0 /* 800D424C 000D118C 40 82 00 18 */ bne lbl_800D4264 diff --git a/include/d/d_a/d_a_alink/asm/func_800D43F8.s b/include/d/d_a/d_a_alink/asm/func_800D43F8.s index 64b495f173..4b3d1d494c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D43F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D43F8.s @@ -38,7 +38,7 @@ lbl_800D4478: /* 800D4488 000D13C8 38 7F 33 98 */ addi r3, r31, 0x3398 /* 800D448C 000D13CC C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) /* 800D4490 000D13D0 C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800D4494 000D13D4 48 19 C2 AD */ bl cLib_chaseF +/* 800D4494 000D13D4 48 19 C2 AD */ bl cLib_chaseF__FPfff lbl_800D4498: /* 800D4498 000D13D8 7F E3 FB 78 */ mr r3, r31 /* 800D449C 000D13DC 4B FF CF 49 */ bl daAlink_c_NS_checkCutTurnInput diff --git a/include/d/d_a/d_a_alink/asm/func_800D4A74.s b/include/d/d_a/d_a_alink/asm/func_800D4A74.s index 4957947db6..fbc1afbd17 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D4A74.s +++ b/include/d/d_a/d_a_alink/asm/func_800D4A74.s @@ -19,7 +19,7 @@ lbl_800D4AA8: /* 800D4AB8 000D19F8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D4ABC 000D19FC 38 9E 00 64 */ addi r4, r30, 0x64 /* 800D4AC0 000D1A00 C0 44 00 38 */ lfs f2, 0x38(r4) -/* 800D4AC4 000D1A04 48 19 BC 7D */ bl cLib_chaseF +/* 800D4AC4 000D1A04 48 19 BC 7D */ bl cLib_chaseF__FPfff /* 800D4AC8 000D1A08 80 1F 05 88 */ lwz r0, 0x588(r31) /* 800D4ACC 000D1A0C 64 00 08 00 */ oris r0, r0, 0x800 /* 800D4AD0 000D1A10 90 1F 05 88 */ stw r0, 0x588(r31) @@ -121,10 +121,10 @@ lbl_800D4C24: /* 800D4C30 000D1B70 38 7F 34 7C */ addi r3, r31, 0x347c /* 800D4C34 000D1B74 C0 3F 34 78 */ lfs f1, 0x3478(r31) /* 800D4C38 000D1B78 C0 5F 34 8C */ lfs f2, 0x348c(r31) -/* 800D4C3C 000D1B7C 48 19 BB 05 */ bl cLib_chaseF +/* 800D4C3C 000D1B7C 48 19 BB 05 */ bl cLib_chaseF__FPfff /* 800D4C40 000D1B80 38 7F 10 DC */ addi r3, r31, 0x10dc /* 800D4C44 000D1B84 C0 3F 34 7C */ lfs f1, 0x347c(r31) -/* 800D4C48 000D1B88 48 19 AA C1 */ bl cM3dGSph_NS_SetR +/* 800D4C48 000D1B88 48 19 AA C1 */ bl SetR__8cM3dGSphFf lbl_800D4C4C: /* 800D4C4C 000D1B8C 38 60 00 01 */ li r3, 1 lbl_800D4C50: diff --git a/include/d/d_a/d_a_alink/asm/func_800D4EFC.s b/include/d/d_a/d_a_alink/asm/func_800D4EFC.s index a0da32c5ea..8811349541 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D4EFC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D4EFC.s @@ -156,7 +156,7 @@ lbl_800D50F4: /* 800D5138 000D2078 38 A0 00 04 */ li r5, 4 /* 800D513C 000D207C 38 C0 2E E0 */ li r6, 0x2ee0 /* 800D5140 000D2080 38 E0 20 00 */ li r7, 0x2000 -/* 800D5144 000D2084 48 19 B3 FD */ bl cLib_addCalcAngleS +/* 800D5144 000D2084 48 19 B3 FD */ bl cLib_addCalcAngleS__FPsssss /* 800D5148 000D2088 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 800D514C 000D208C 28 00 00 00 */ cmplwi r0, 0 /* 800D5150 000D2090 41 82 00 0C */ beq lbl_800D515C diff --git a/include/d/d_a/d_a_alink/asm/func_800D53C8.s b/include/d/d_a/d_a_alink/asm/func_800D53C8.s index 9c596dfd17..ecf3ef9a11 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D53C8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D53C8.s @@ -100,7 +100,7 @@ lbl_800D552C: lbl_800D553C: /* 800D553C 000D247C 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800D5540 000D2480 38 81 00 24 */ addi r4, r1, 0x24 -/* 800D5544 000D2484 48 19 B6 C1 */ bl cLib_targetAngleY +/* 800D5544 000D2484 48 19 B6 C1 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800D5548 000D2488 B0 7F 04 E6 */ sth r3, 0x4e6(r31) /* 800D554C 000D248C A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800D5550 000D2490 B0 1F 04 DE */ sth r0, 0x4de(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D58A0.s b/include/d/d_a/d_a_alink/asm/func_800D58A0.s index 6fd2705484..562a8d4abb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D58A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D58A0.s @@ -60,7 +60,7 @@ lbl_800D5968: /* 800D5988 000D28C8 38 80 40 00 */ li r4, 0x4000 /* 800D598C 000D28CC A8 BF 04 E6 */ lha r5, 0x4e6(r31) /* 800D5990 000D28D0 38 C0 00 00 */ li r6, 0 -/* 800D5994 000D28D4 48 19 1A 61 */ bl csXyz_X1_ +/* 800D5994 000D28D4 48 19 1A 61 */ bl __ct__5csXyzFsss /* 800D5998 000D28D8 38 DE 05 68 */ addi r6, r30, 0x568 /* 800D599C 000D28DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800D59A0 000D28E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_a/d_a_alink/asm/func_800D5C88.s b/include/d/d_a/d_a_alink/asm/func_800D5C88.s index 7a636f26b2..a6bec27dc5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D5C88.s +++ b/include/d/d_a/d_a_alink/asm/func_800D5C88.s @@ -42,7 +42,7 @@ lbl_800D5CD4: /* 800D5D24 000D2C64 38 61 00 18 */ addi r3, r1, 0x18 /* 800D5D28 000D2C68 38 9E 05 74 */ addi r4, r30, 0x574 /* 800D5D2C 000D2C6C 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 800D5D30 000D2C70 48 19 0E 05 */ bl cXyz_NS___mi +/* 800D5D30 000D2C70 48 19 0E 05 */ bl __mi__4cXyzCFRC3Vec /* 800D5D34 000D2C74 C0 01 00 18 */ lfs f0, 0x18(r1) /* 800D5D38 000D2C78 D0 01 00 24 */ stfs f0, 0x24(r1) /* 800D5D3C 000D2C7C C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -194,7 +194,7 @@ lbl_800D5F18: /* 800D5F44 000D2E84 38 00 00 00 */ li r0, 0 /* 800D5F48 000D2E88 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800D5F4C 000D2E8C 38 61 00 24 */ addi r3, r1, 0x24 -/* 800D5F50 000D2E90 48 19 11 D9 */ bl cXyz_NS_atan2sX_Z +/* 800D5F50 000D2E90 48 19 11 D9 */ bl atan2sX_Z__4cXyzCFv /* 800D5F54 000D2E94 B0 7F 04 DE */ sth r3, 0x4de(r31) /* 800D5F58 000D2E98 A8 1F 04 DE */ lha r0, 0x4de(r31) /* 800D5F5C 000D2E9C B0 1F 04 E6 */ sth r0, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D5FC8.s b/include/d/d_a/d_a_alink/asm/func_800D5FC8.s index f399ae5861..600d578336 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D5FC8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D5FC8.s @@ -10,7 +10,7 @@ /* 800D5FEC 000D2F2C 38 7E 33 98 */ addi r3, r30, 0x3398 /* 800D5FF0 000D2F30 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D5FF4 000D2F34 C0 5E 34 78 */ lfs f2, 0x3478(r30) -/* 800D5FF8 000D2F38 48 19 A7 49 */ bl cLib_chaseF +/* 800D5FF8 000D2F38 48 19 A7 49 */ bl cLib_chaseF__FPfff /* 800D5FFC 000D2F3C C0 3E 04 FC */ lfs f1, 0x4fc(r30) /* 800D6000 000D2F40 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D6004 000D2F44 FC 01 00 40 */ fcmpo cr0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D67FC.s b/include/d/d_a/d_a_alink/asm/func_800D67FC.s index 6bc5db11d9..791543de76 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D67FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D67FC.s @@ -93,10 +93,10 @@ lbl_800D6954: /* 800D6954 000D3894 38 7F 34 7C */ addi r3, r31, 0x347c /* 800D6958 000D3898 C0 3F 34 78 */ lfs f1, 0x3478(r31) /* 800D695C 000D389C C0 42 93 78 */ lfs f2, lbl_80452D78-_SDA2_BASE_(r2) -/* 800D6960 000D38A0 48 19 9D E1 */ bl cLib_chaseF +/* 800D6960 000D38A0 48 19 9D E1 */ bl cLib_chaseF__FPfff /* 800D6964 000D38A4 38 7F 10 DC */ addi r3, r31, 0x10dc /* 800D6968 000D38A8 C0 3F 34 7C */ lfs f1, 0x347c(r31) -/* 800D696C 000D38AC 48 19 8D 9D */ bl cM3dGSph_NS_SetR +/* 800D696C 000D38AC 48 19 8D 9D */ bl SetR__8cM3dGSphFf lbl_800D6970: /* 800D6970 000D38B0 38 60 00 01 */ li r3, 1 /* 800D6974 000D38B4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D74F4.s b/include/d/d_a/d_a_alink/asm/func_800D74F4.s index c5610ea594..1253f33e33 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D74F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800D74F4.s @@ -51,7 +51,7 @@ lbl_800D7590: /* 800D75B8 000D44F8 38 61 00 20 */ addi r3, r1, 0x20 /* 800D75BC 000D44FC 38 9D 04 D0 */ addi r4, r29, 0x4d0 /* 800D75C0 000D4500 38 A5 04 D0 */ addi r5, r5, 0x4d0 -/* 800D75C4 000D4504 48 18 F5 71 */ bl cXyz_NS___mi +/* 800D75C4 000D4504 48 18 F5 71 */ bl __mi__4cXyzCFRC3Vec /* 800D75C8 000D4508 C0 01 00 20 */ lfs f0, 0x20(r1) /* 800D75CC 000D450C D0 01 00 2C */ stfs f0, 0x2c(r1) /* 800D75D0 000D4510 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -63,7 +63,7 @@ lbl_800D75E4: /* 800D75E4 000D4524 38 61 00 14 */ addi r3, r1, 0x14 /* 800D75E8 000D4528 38 9D 04 D0 */ addi r4, r29, 0x4d0 /* 800D75EC 000D452C 38 BE 00 D4 */ addi r5, r30, 0xd4 -/* 800D75F0 000D4530 48 18 F5 45 */ bl cXyz_NS___mi +/* 800D75F0 000D4530 48 18 F5 45 */ bl __mi__4cXyzCFRC3Vec /* 800D75F4 000D4534 C0 01 00 14 */ lfs f0, 0x14(r1) /* 800D75F8 000D4538 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 800D75FC 000D453C C0 01 00 18 */ lfs f0, 0x18(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D7820.s b/include/d/d_a/d_a_alink/asm/func_800D7820.s index 5364d85d87..50119ed526 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D7820.s +++ b/include/d/d_a/d_a_alink/asm/func_800D7820.s @@ -53,7 +53,7 @@ lbl_800D78D0: /* 800D78E4 000D4824 38 A1 00 08 */ addi r5, r1, 8 /* 800D78E8 000D4828 4B F9 CE 5D */ bl cBgS_NS_GetTriPla /* 800D78EC 000D482C 38 61 00 08 */ addi r3, r1, 8 -/* 800D78F0 000D4830 48 18 F8 39 */ bl cXyz_NS_atan2sX_Z +/* 800D78F0 000D4830 48 18 F8 39 */ bl atan2sX_Z__4cXyzCFv /* 800D78F4 000D4834 B0 7F 31 1E */ sth r3, 0x311e(r31) /* 800D78F8 000D4838 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800D78FC 000D483C 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l diff --git a/include/d/d_a/d_a_alink/asm/func_800D7C40.s b/include/d/d_a/d_a_alink/asm/func_800D7C40.s index cfb7ee333a..54fd820486 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D7C40.s +++ b/include/d/d_a/d_a_alink/asm/func_800D7C40.s @@ -1172,7 +1172,7 @@ lbl_800D8D08: /* 800D8D08 000D5C48 7F E3 FB 78 */ mr r3, r31 /* 800D8D0C 000D5C4C 7F 44 D3 78 */ mr r4, r26 /* 800D8D10 000D5C50 4B FF E7 E5 */ bl daAlink_c_NS_getDamageVec -/* 800D8D14 000D5C54 48 18 E4 15 */ bl cXyz_NS_atan2sX_Z +/* 800D8D14 000D5C54 48 18 E4 15 */ bl atan2sX_Z__4cXyzCFv /* 800D8D18 000D5C58 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800D8D1C 000D5C5C 7C 00 18 50 */ subf r0, r0, r3 /* 800D8D20 000D5C60 7C 00 07 35 */ extsh. r0, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D8F3C.s b/include/d/d_a/d_a_alink/asm/func_800D8F3C.s index 77c40b284e..a5d374ba73 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D8F3C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D8F3C.s @@ -133,7 +133,7 @@ lbl_800D90F8: /* 800D9130 000D6070 AB 43 00 50 */ lha r26, 0x50(r3) /* 800D9134 000D6074 7C 1A 00 D0 */ neg r0, r26 /* 800D9138 000D6078 7C 1B 07 34 */ extsh r27, r0 -/* 800D913C 000D607C 48 18 E5 39 */ bl cM_atan2s +/* 800D913C 000D607C 48 18 E5 39 */ bl cM_atan2s__Fff /* 800D9140 000D6080 7C 64 07 34 */ extsh r4, r3 /* 800D9144 000D6084 7C 04 D8 00 */ cmpw r4, r27 /* 800D9148 000D6088 40 80 00 08 */ bge lbl_800D9150 @@ -164,7 +164,7 @@ lbl_800D9164: lbl_800D91A0: /* 800D91A0 000D60E0 C0 21 00 18 */ lfs f1, 0x18(r1) /* 800D91A4 000D60E4 FC 40 10 50 */ fneg f2, f2 -/* 800D91A8 000D60E8 48 18 E4 CD */ bl cM_atan2s +/* 800D91A8 000D60E8 48 18 E4 CD */ bl cM_atan2s__Fff /* 800D91AC 000D60EC 7C 64 07 34 */ extsh r4, r3 /* 800D91B0 000D60F0 7C 04 D8 00 */ cmpw r4, r27 /* 800D91B4 000D60F4 40 80 00 08 */ bge lbl_800D91BC @@ -224,7 +224,7 @@ lbl_800D9268: /* 800D926C 000D61AC FC 20 00 50 */ fneg f1, f0 /* 800D9270 000D61B0 C0 01 00 20 */ lfs f0, 0x20(r1) /* 800D9274 000D61B4 FC 40 00 50 */ fneg f2, f0 -/* 800D9278 000D61B8 48 18 E3 FD */ bl cM_atan2s +/* 800D9278 000D61B8 48 18 E3 FD */ bl cM_atan2s__Fff /* 800D927C 000D61BC 4B FD A2 19 */ bl daAlink_c_NS_getDirectionFromAngle /* 800D9280 000D61C0 2C 03 00 00 */ cmpwi r3, 0 /* 800D9284 000D61C4 40 82 00 24 */ bne lbl_800D92A8 @@ -271,7 +271,7 @@ lbl_800D9300: /* 800D931C 000D625C D0 1C 34 78 */ stfs f0, 0x3478(r28) lbl_800D9320: /* 800D9320 000D6260 7F A3 EB 78 */ mr r3, r29 -/* 800D9324 000D6264 48 18 DE 05 */ bl cXyz_NS_atan2sX_Z +/* 800D9324 000D6264 48 18 DE 05 */ bl atan2sX_Z__4cXyzCFv /* 800D9328 000D6268 B0 7C 04 DE */ sth r3, 0x4de(r28) /* 800D932C 000D626C A8 1C 04 DE */ lha r0, 0x4de(r28) /* 800D9330 000D6270 B0 1C 30 10 */ sth r0, 0x3010(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_800D9514.s b/include/d/d_a/d_a_alink/asm/func_800D9514.s index 7941500aa5..ef3f3381ca 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D9514.s +++ b/include/d/d_a/d_a_alink/asm/func_800D9514.s @@ -17,7 +17,7 @@ /* 800D9554 000D6494 EC 00 08 28 */ fsubs f0, f0, f1 /* 800D9558 000D6498 EC 02 00 28 */ fsubs f0, f2, f0 /* 800D955C 000D649C EC 23 00 32 */ fmuls f1, f3, f0 -/* 800D9560 000D64A0 48 18 E0 85 */ bl cM_rad2s +/* 800D9560 000D64A0 48 18 E0 85 */ bl cM_rad2s__Ff /* 800D9564 000D64A4 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 800D9568 000D64A8 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800D956C 000D64AC 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l @@ -54,7 +54,7 @@ /* 800D95E8 000D6528 3C 80 80 39 */ lis r4, lbl_8038E24C@ha /* 800D95EC 000D652C 38 84 E2 4C */ addi r4, r4, lbl_8038E24C@l /* 800D95F0 000D6530 C0 44 00 5C */ lfs f2, 0x5c(r4) -/* 800D95F4 000D6534 48 19 71 4D */ bl cLib_chaseF +/* 800D95F4 000D6534 48 19 71 4D */ bl cLib_chaseF__FPfff /* 800D95F8 000D6538 80 1E 05 74 */ lwz r0, 0x574(r30) /* 800D95FC 000D653C 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 /* 800D9600 000D6540 41 82 00 0C */ beq lbl_800D960C diff --git a/include/d/d_a/d_a_alink/asm/func_800D96DC.s b/include/d/d_a/d_a_alink/asm/func_800D96DC.s index 03718d4189..c033c2d323 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D96DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D96DC.s @@ -134,7 +134,7 @@ lbl_800D98B0: /* 800D98C0 000D6800 7E A3 AB 78 */ mr r3, r21 /* 800D98C4 000D6804 7F A4 EB 78 */ mr r4, r29 /* 800D98C8 000D6808 4B FF DC 2D */ bl daAlink_c_NS_getDamageVec -/* 800D98CC 000D680C 48 18 D8 5D */ bl cXyz_NS_atan2sX_Z +/* 800D98CC 000D680C 48 18 D8 5D */ bl atan2sX_Z__4cXyzCFv /* 800D98D0 000D6810 B0 75 04 DE */ sth r3, 0x4de(r21) /* 800D98D4 000D6814 7F A3 EB 78 */ mr r3, r29 /* 800D98D8 000D6818 4B FA AC 71 */ bl dCcD_GObjInf_NS_GetTgHitGObj diff --git a/include/d/d_a/d_a_alink/asm/func_800D9E88.s b/include/d/d_a/d_a_alink/asm/func_800D9E88.s index b5cfd8abee..72f02d3ede 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D9E88.s +++ b/include/d/d_a/d_a_alink/asm/func_800D9E88.s @@ -34,12 +34,12 @@ lbl_800D9EF8: lbl_800D9EFC: /* 800D9EFC 000D6E3C A8 9F 30 0C */ lha r4, 0x300c(r31) /* 800D9F00 000D6E40 A8 BF 30 10 */ lha r5, 0x3010(r31) -/* 800D9F04 000D6E44 48 19 6C 8D */ bl cLib_chaseAngleS +/* 800D9F04 000D6E44 48 19 6C 8D */ bl cLib_chaseAngleS__FPsss lbl_800D9F08: /* 800D9F08 000D6E48 38 7F 33 98 */ addi r3, r31, 0x3398 /* 800D9F0C 000D6E4C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D9F10 000D6E50 C0 5F 34 7C */ lfs f2, 0x347c(r31) -/* 800D9F14 000D6E54 48 19 68 2D */ bl cLib_chaseF +/* 800D9F14 000D6E54 48 19 68 2D */ bl cLib_chaseF__FPfff /* 800D9F18 000D6E58 A8 1F 30 08 */ lha r0, 0x3008(r31) /* 800D9F1C 000D6E5C 2C 00 00 00 */ cmpwi r0, 0 /* 800D9F20 000D6E60 40 82 00 14 */ bne lbl_800D9F34 diff --git a/include/d/d_a/d_a_alink/asm/func_800DA82C.s b/include/d/d_a/d_a_alink/asm/func_800DA82C.s index 13f89834d5..5f85c7fbf6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DA82C.s +++ b/include/d/d_a/d_a_alink/asm/func_800DA82C.s @@ -25,7 +25,7 @@ lbl_800DA868: /* 800DA888 000D77C8 38 A1 00 24 */ addi r5, r1, 0x24 /* 800DA88C 000D77CC 4B F9 9E B9 */ bl cBgS_NS_GetTriPla /* 800DA890 000D77D0 38 61 00 24 */ addi r3, r1, 0x24 -/* 800DA894 000D77D4 48 18 C8 95 */ bl cXyz_NS_atan2sX_Z +/* 800DA894 000D77D4 48 18 C8 95 */ bl atan2sX_Z__4cXyzCFv /* 800DA898 000D77D8 7C 7D 1B 78 */ mr r29, r3 /* 800DA89C 000D77DC 2C 19 00 00 */ cmpwi r25, 0 /* 800DA8A0 000D77E0 41 80 00 30 */ blt lbl_800DA8D0 @@ -37,7 +37,7 @@ lbl_800DA868: /* 800DA8B8 000D77F8 A8 98 04 DE */ lha r4, 0x4de(r24) /* 800DA8BC 000D77FC 38 04 80 00 */ addi r0, r4, -32768 /* 800DA8C0 000D7800 7C 04 07 34 */ extsh r4, r0 -/* 800DA8C4 000D7804 48 19 65 61 */ bl cLib_distanceAngleS +/* 800DA8C4 000D7804 48 19 65 61 */ bl cLib_distanceAngleS__Fss /* 800DA8C8 000D7808 2C 03 15 55 */ cmpwi r3, 0x1555 /* 800DA8CC 000D780C 40 81 00 18 */ ble lbl_800DA8E4 lbl_800DA8D0: @@ -128,7 +128,7 @@ lbl_800DA9F8: /* 800DA9F8 000D7938 FC 40 08 90 */ fmr f2, f1 lbl_800DA9FC: /* 800DA9FC 000D793C C0 21 00 28 */ lfs f1, 0x28(r1) -/* 800DAA00 000D7940 48 18 CC 75 */ bl cM_atan2s +/* 800DAA00 000D7940 48 18 CC 75 */ bl cM_atan2s__Fff /* 800DAA04 000D7944 7C 7F 1B 78 */ mr r31, r3 /* 800DAA08 000D7948 B3 B8 04 DE */ sth r29, 0x4de(r24) /* 800DAA0C 000D794C C0 18 1B 78 */ lfs f0, 0x1b78(r24) diff --git a/include/d/d_a/d_a_alink/asm/func_800DB140.s b/include/d/d_a/d_a_alink/asm/func_800DB140.s index d7aa23cfda..bfe95a8f3d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DB140.s +++ b/include/d/d_a/d_a_alink/asm/func_800DB140.s @@ -173,7 +173,7 @@ lbl_800DB380: /* 800DB3C0 000D8300 7F 63 DB 78 */ mr r3, r27 /* 800DB3C4 000D8304 7F 84 E3 78 */ mr r4, r28 /* 800DB3C8 000D8308 4B FF C1 2D */ bl daAlink_c_NS_getDamageVec -/* 800DB3CC 000D830C 48 18 BD 5D */ bl cXyz_NS_atan2sX_Z +/* 800DB3CC 000D830C 48 18 BD 5D */ bl atan2sX_Z__4cXyzCFv /* 800DB3D0 000D8310 B0 7B 30 10 */ sth r3, 0x3010(r27) /* 800DB3D4 000D8314 48 00 00 14 */ b lbl_800DB3E8 lbl_800DB3D8: diff --git a/include/d/d_a/d_a_alink/asm/func_800DB860.s b/include/d/d_a/d_a_alink/asm/func_800DB860.s index a1b04597e0..f311ff5e39 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DB860.s +++ b/include/d/d_a/d_a_alink/asm/func_800DB860.s @@ -41,7 +41,7 @@ lbl_800DB8EC: /* 800DB8EC 000D882C 38 61 00 40 */ addi r3, r1, 0x40 /* 800DB8F0 000D8830 38 9E 04 A8 */ addi r4, r30, 0x4a8 /* 800DB8F4 000D8834 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 800DB8F8 000D8838 48 18 B2 3D */ bl cXyz_NS___mi +/* 800DB8F8 000D8838 48 18 B2 3D */ bl __mi__4cXyzCFRC3Vec /* 800DB8FC 000D883C C0 01 00 40 */ lfs f0, 0x40(r1) /* 800DB900 000D8840 D0 01 00 58 */ stfs f0, 0x58(r1) /* 800DB904 000D8844 C0 01 00 44 */ lfs f0, 0x44(r1) @@ -52,17 +52,17 @@ lbl_800DB8EC: /* 800DB918 000D8858 38 81 00 58 */ addi r4, r1, 0x58 /* 800DB91C 000D885C 48 00 6B 61 */ bl daAlink_c_NS_multVecMagneBootInvMtx /* 800DB920 000D8860 38 61 00 58 */ addi r3, r1, 0x58 -/* 800DB924 000D8864 48 18 B8 05 */ bl cXyz_NS_atan2sX_Z +/* 800DB924 000D8864 48 18 B8 05 */ bl atan2sX_Z__4cXyzCFv /* 800DB928 000D8868 7C 64 1B 78 */ mr r4, r3 /* 800DB92C 000D886C 38 7F 04 E6 */ addi r3, r31, 0x4e6 /* 800DB930 000D8870 38 A0 00 02 */ li r5, 2 /* 800DB934 000D8874 38 C0 20 00 */ li r6, 0x2000 /* 800DB938 000D8878 38 E0 08 00 */ li r7, 0x800 -/* 800DB93C 000D887C 48 19 4C 05 */ bl cLib_addCalcAngleS +/* 800DB93C 000D887C 48 19 4C 05 */ bl cLib_addCalcAngleS__FPsssss /* 800DB940 000D8880 38 61 00 34 */ addi r3, r1, 0x34 /* 800DB944 000D8884 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800DB948 000D8888 38 BE 04 A8 */ addi r5, r30, 0x4a8 -/* 800DB94C 000D888C 48 18 B1 E9 */ bl cXyz_NS___mi +/* 800DB94C 000D888C 48 18 B1 E9 */ bl __mi__4cXyzCFRC3Vec /* 800DB950 000D8890 C0 01 00 34 */ lfs f0, 0x34(r1) /* 800DB954 000D8894 D0 01 00 4C */ stfs f0, 0x4c(r1) /* 800DB958 000D8898 C0 01 00 38 */ lfs f0, 0x38(r1) @@ -145,15 +145,15 @@ lbl_800DBA5C: /* 800DBA64 000D89A4 40 81 00 48 */ ble lbl_800DBAAC /* 800DBA68 000D89A8 38 61 00 28 */ addi r3, r1, 0x28 /* 800DBA6C 000D89AC 38 81 00 4C */ addi r4, r1, 0x4c -/* 800DBA70 000D89B0 48 18 B1 15 */ bl cXyz_NS___ml +/* 800DBA70 000D89B0 48 18 B1 15 */ bl __ml__4cXyzCFf /* 800DBA74 000D89B4 38 61 00 1C */ addi r3, r1, 0x1c /* 800DBA78 000D89B8 38 81 00 28 */ addi r4, r1, 0x28 /* 800DBA7C 000D89BC FC 20 F8 90 */ fmr f1, f31 -/* 800DBA80 000D89C0 48 18 B1 99 */ bl cXyz_NS___dv +/* 800DBA80 000D89C0 48 18 B1 99 */ bl __dv__4cXyzCFf /* 800DBA84 000D89C4 38 61 00 10 */ addi r3, r1, 0x10 /* 800DBA88 000D89C8 38 9E 04 A8 */ addi r4, r30, 0x4a8 /* 800DBA8C 000D89CC 38 A1 00 1C */ addi r5, r1, 0x1c -/* 800DBA90 000D89D0 48 18 B0 55 */ bl cXyz_NS___pl +/* 800DBA90 000D89D0 48 18 B0 55 */ bl __pl__4cXyzCFRC3Vec /* 800DBA94 000D89D4 C0 01 00 10 */ lfs f0, 0x10(r1) /* 800DBA98 000D89D8 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) /* 800DBA9C 000D89DC C0 01 00 14 */ lfs f0, 0x14(r1) @@ -196,7 +196,7 @@ lbl_800DBB10: /* 800DBB24 000D8A64 A8 A7 00 04 */ lha r5, 4(r7) /* 800DBB28 000D8A68 A8 C7 00 00 */ lha r6, 0(r7) /* 800DBB2C 000D8A6C A8 E7 00 02 */ lha r7, 2(r7) -/* 800DBB30 000D8A70 48 19 4A 11 */ bl cLib_addCalcAngleS +/* 800DBB30 000D8A70 48 19 4A 11 */ bl cLib_addCalcAngleS__FPsssss /* 800DBB34 000D8A74 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800DBB38 000D8A78 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l /* 800DBB3C 000D8A7C A8 1F 04 DE */ lha r0, 0x4de(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800DC214.s b/include/d/d_a/d_a_alink/asm/func_800DC214.s index d2c7665e90..2cf900373a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DC214.s +++ b/include/d/d_a/d_a_alink/asm/func_800DC214.s @@ -6,7 +6,7 @@ /* 800DC228 000D9168 38 7F 2B A8 */ addi r3, r31, 0x2ba8 /* 800DC22C 000D916C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DC230 000D9170 C0 42 93 44 */ lfs f2, lbl_80452D44-_SDA2_BASE_(r2) -/* 800DC234 000D9174 48 19 45 0D */ bl cLib_chaseF +/* 800DC234 000D9174 48 19 45 0D */ bl cLib_chaseF__FPfff /* 800DC238 000D9178 38 7F 1F D0 */ addi r3, r31, 0x1fd0 /* 800DC23C 000D917C 48 08 22 91 */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 800DC240 000D9180 54 60 06 3F */ clrlwi. r0, r3, 0x18 diff --git a/include/d/d_a/d_a_alink/asm/func_800DCA80.s b/include/d/d_a/d_a_alink/asm/func_800DCA80.s index f5b9a61dfe..cd766a401e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DCA80.s +++ b/include/d/d_a/d_a_alink/asm/func_800DCA80.s @@ -9,7 +9,7 @@ /* 800DCAA0 000D99E0 7C DE 33 78 */ mr r30, r6 /* 800DCAA4 000D99E4 7C FF 3B 78 */ mr r31, r7 /* 800DCAA8 000D99E8 C0 22 93 D0 */ lfs f1, lbl_80452DD0-_SDA2_BASE_(r2) -/* 800DCAAC 000D99EC 48 18 AE E1 */ bl cM_rndFX +/* 800DCAAC 000D99EC 48 18 AE E1 */ bl cM_rndFX__Ff /* 800DCAB0 000D99F0 A8 1A 00 02 */ lha r0, 2(r26) /* 800DCAB4 000D99F4 C8 42 92 B0 */ lfd f2, lbl_80452CB0-_SDA2_BASE_(r2) /* 800DCAB8 000D99F8 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -23,7 +23,7 @@ /* 800DCAD8 000D9A18 D8 01 00 80 */ stfd f0, 0x80(r1) /* 800DCADC 000D9A1C 83 61 00 84 */ lwz r27, 0x84(r1) /* 800DCAE0 000D9A20 C0 22 93 D0 */ lfs f1, lbl_80452DD0-_SDA2_BASE_(r2) -/* 800DCAE4 000D9A24 48 18 AE A9 */ bl cM_rndFX +/* 800DCAE4 000D9A24 48 18 AE A9 */ bl cM_rndFX__Ff /* 800DCAE8 000D9A28 A8 1A 00 00 */ lha r0, 0(r26) /* 800DCAEC 000D9A2C C8 42 92 B0 */ lfd f2, lbl_80452CB0-_SDA2_BASE_(r2) /* 800DCAF0 000D9A30 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -73,11 +73,11 @@ /* 800DCBA0 000D9AE0 38 61 00 60 */ addi r3, r1, 0x60 /* 800DCBA4 000D9AE4 38 9C 35 1C */ addi r4, r28, 0x351c /* 800DCBA8 000D9AE8 FC 20 08 50 */ fneg f1, f1 -/* 800DCBAC 000D9AEC 48 19 28 31 */ bl cM3dGPla_X1_ +/* 800DCBAC 000D9AEC 48 19 28 31 */ bl __ct__8cM3dGPlaFPC4cXyzf /* 800DCBB0 000D9AF0 38 61 00 24 */ addi r3, r1, 0x24 /* 800DCBB4 000D9AF4 7F A4 EB 78 */ mr r4, r29 /* 800DCBB8 000D9AF8 38 A1 00 54 */ addi r5, r1, 0x54 -/* 800DCBBC 000D9AFC 48 18 9F 29 */ bl cXyz_NS___pl +/* 800DCBBC 000D9AFC 48 18 9F 29 */ bl __pl__4cXyzCFRC3Vec /* 800DCBC0 000D9B00 C0 01 00 24 */ lfs f0, 0x24(r1) /* 800DCBC4 000D9B04 D0 01 00 30 */ stfs f0, 0x30(r1) /* 800DCBC8 000D9B08 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -88,7 +88,7 @@ /* 800DCBDC 000D9B1C 7F A4 EB 78 */ mr r4, r29 /* 800DCBE0 000D9B20 38 A1 00 30 */ addi r5, r1, 0x30 /* 800DCBE4 000D9B24 38 C1 00 3C */ addi r6, r1, 0x3c -/* 800DCBE8 000D9B28 48 19 28 21 */ bl cM3dGPla_NS_crossInfLin +/* 800DCBE8 000D9B28 48 19 28 21 */ bl crossInfLin__8cM3dGPlaCFRC4cXyzRC4cXyzR4cXyz /* 800DCBEC 000D9B2C 38 61 00 3C */ addi r3, r1, 0x3c /* 800DCBF0 000D9B30 38 81 00 48 */ addi r4, r1, 0x48 /* 800DCBF4 000D9B34 48 26 A7 A9 */ bl PSVECSquareDistance @@ -164,7 +164,7 @@ lbl_800DCCDC: /* 800DCCE8 000D9C28 38 61 00 18 */ addi r3, r1, 0x18 /* 800DCCEC 000D9C2C 38 81 00 3C */ addi r4, r1, 0x3c /* 800DCCF0 000D9C30 38 A1 00 48 */ addi r5, r1, 0x48 -/* 800DCCF4 000D9C34 48 18 9E 41 */ bl cXyz_NS___mi +/* 800DCCF4 000D9C34 48 18 9E 41 */ bl __mi__4cXyzCFRC3Vec /* 800DCCF8 000D9C38 C0 01 00 18 */ lfs f0, 0x18(r1) /* 800DCCFC 000D9C3C D0 01 00 3C */ stfs f0, 0x3c(r1) /* 800DCD00 000D9C40 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -173,7 +173,7 @@ lbl_800DCCDC: /* 800DCD0C 000D9C4C D0 01 00 44 */ stfs f0, 0x44(r1) /* 800DCD10 000D9C50 38 61 00 0C */ addi r3, r1, 0xc /* 800DCD14 000D9C54 38 81 00 3C */ addi r4, r1, 0x3c -/* 800DCD18 000D9C58 48 18 A1 DD */ bl cXyz_NS_normalize +/* 800DCD18 000D9C58 48 18 A1 DD */ bl normalize__4cXyzFv /* 800DCD1C 000D9C5C 38 61 00 3C */ addi r3, r1, 0x3c /* 800DCD20 000D9C60 7C 64 1B 78 */ mr r4, r3 /* 800DCD24 000D9C64 C0 22 93 78 */ lfs f1, lbl_80452D78-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800DCD74.s b/include/d/d_a/d_a_alink/asm/func_800DCD74.s index 607cf4bb1e..5b18acebba 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DCD74.s +++ b/include/d/d_a/d_a_alink/asm/func_800DCD74.s @@ -13,10 +13,10 @@ /* 800DCDA4 000D9CE4 38 A1 00 08 */ addi r5, r1, 8 /* 800DCDA8 000D9CE8 48 26 A0 A5 */ bl PSMTXMultVecSR /* 800DCDAC 000D9CEC 38 61 00 08 */ addi r3, r1, 8 -/* 800DCDB0 000D9CF0 48 18 A3 A1 */ bl cXyz_NS_atan2sY_XZ +/* 800DCDB0 000D9CF0 48 18 A3 A1 */ bl atan2sY_XZ__4cXyzCFv /* 800DCDB4 000D9CF4 B0 7E 00 00 */ sth r3, 0(r30) /* 800DCDB8 000D9CF8 38 61 00 08 */ addi r3, r1, 8 -/* 800DCDBC 000D9CFC 48 18 A3 6D */ bl cXyz_NS_atan2sX_Z +/* 800DCDBC 000D9CFC 48 18 A3 6D */ bl atan2sX_Z__4cXyzCFv /* 800DCDC0 000D9D00 B0 7E 00 02 */ sth r3, 2(r30) /* 800DCDC4 000D9D04 80 7C 06 78 */ lwz r3, 0x678(r28) /* 800DCDC8 000D9D08 38 63 00 24 */ addi r3, r3, 0x24 diff --git a/include/d/d_a/d_a_alink/asm/func_800DD1D4.s b/include/d/d_a/d_a_alink/asm/func_800DD1D4.s index 602bbba81f..5db53fd36b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DD1D4.s +++ b/include/d/d_a/d_a_alink/asm/func_800DD1D4.s @@ -11,7 +11,7 @@ /* 800DD1FC 000DA13C 7F 84 E3 78 */ mr r4, r28 /* 800DD200 000DA140 4B FF A2 F5 */ bl daAlink_c_NS_getDamageVec /* 800DD204 000DA144 7C 7F 1B 78 */ mr r31, r3 -/* 800DD208 000DA148 48 18 9F 21 */ bl cXyz_NS_atan2sX_Z +/* 800DD208 000DA148 48 18 9F 21 */ bl atan2sX_Z__4cXyzCFv /* 800DD20C 000DA14C 3C 63 00 01 */ addis r3, r3, 1 /* 800DD210 000DA150 38 63 80 00 */ addi r3, r3, -32768 /* 800DD214 000DA154 A8 1D 04 E6 */ lha r0, 0x4e6(r29) @@ -128,7 +128,7 @@ lbl_800DD398: /* 800DD398 000DA2D8 FC 40 08 90 */ fmr f2, f1 lbl_800DD39C: /* 800DD39C 000DA2DC C0 3F 00 04 */ lfs f1, 4(r31) -/* 800DD3A0 000DA2E0 48 18 A2 D5 */ bl cM_atan2s +/* 800DD3A0 000DA2E0 48 18 A2 D5 */ bl cM_atan2s__Fff /* 800DD3A4 000DA2E4 7C 64 07 34 */ extsh r4, r3 /* 800DD3A8 000DA2E8 7C 04 E0 00 */ cmpw r4, r28 /* 800DD3AC 000DA2EC 40 80 00 08 */ bge lbl_800DD3B4 diff --git a/include/d/d_a/d_a_alink/asm/func_800DD3E4.s b/include/d/d_a/d_a_alink/asm/func_800DD3E4.s index 1a0238fe9d..5f0ae0c6cf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DD3E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800DD3E4.s @@ -31,7 +31,7 @@ lbl_800DD440: /* 800DD454 000DA394 7F 84 E3 78 */ mr r4, r28 /* 800DD458 000DA398 4B FF A0 9D */ bl daAlink_c_NS_getDamageVec /* 800DD45C 000DA39C 7C 7F 1B 78 */ mr r31, r3 -/* 800DD460 000DA3A0 48 18 9C C9 */ bl cXyz_NS_atan2sX_Z +/* 800DD460 000DA3A0 48 18 9C C9 */ bl atan2sX_Z__4cXyzCFv /* 800DD464 000DA3A4 B0 7A 04 DE */ sth r3, 0x4de(r26) /* 800DD468 000DA3A8 A0 1A 2F DC */ lhz r0, 0x2fdc(r26) /* 800DD46C 000DA3AC 28 00 00 42 */ cmplwi r0, 0x42 @@ -180,7 +180,7 @@ lbl_800DD668: /* 800DD668 000DA5A8 FC 40 08 90 */ fmr f2, f1 lbl_800DD66C: /* 800DD66C 000DA5AC C0 3F 00 04 */ lfs f1, 4(r31) -/* 800DD670 000DA5B0 48 18 A0 05 */ bl cM_atan2s +/* 800DD670 000DA5B0 48 18 A0 05 */ bl cM_atan2s__Fff /* 800DD674 000DA5B4 7C 64 07 34 */ extsh r4, r3 /* 800DD678 000DA5B8 7C 04 F0 00 */ cmpw r4, r30 /* 800DD67C 000DA5BC 40 80 00 08 */ bge lbl_800DD684 diff --git a/include/d/d_a/d_a_alink/asm/func_800DD894.s b/include/d/d_a/d_a_alink/asm/func_800DD894.s index 13c6083ec0..8584ca18f0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DD894.s +++ b/include/d/d_a/d_a_alink/asm/func_800DD894.s @@ -67,7 +67,7 @@ lbl_800DD984: /* 800DD984 000DA8C4 38 7F 33 98 */ addi r3, r31, 0x3398 /* 800DD988 000DA8C8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DD98C 000DA8CC FC 40 F8 90 */ fmr f2, f31 -/* 800DD990 000DA8D0 48 19 2D B1 */ bl cLib_chaseF +/* 800DD990 000DA8D0 48 19 2D B1 */ bl cLib_chaseF__FPfff /* 800DD994 000DA8D4 2C 03 00 00 */ cmpwi r3, 0 /* 800DD998 000DA8D8 41 82 00 58 */ beq lbl_800DD9F0 /* 800DD99C 000DA8DC 38 7F 1F D0 */ addi r3, r31, 0x1fd0 diff --git a/include/d/d_a/d_a_alink/asm/func_800DDBA8.s b/include/d/d_a/d_a_alink/asm/func_800DDBA8.s index f0f0c141ab..defb844095 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DDBA8.s +++ b/include/d/d_a/d_a_alink/asm/func_800DDBA8.s @@ -14,7 +14,7 @@ /* 800DDBDC 000DAB1C 3C 80 80 39 */ lis r4, lbl_8038D6BC@ha /* 800DDBE0 000DAB20 38 84 D6 BC */ addi r4, r4, lbl_8038D6BC@l /* 800DDBE4 000DAB24 C0 44 00 38 */ lfs f2, 0x38(r4) -/* 800DDBE8 000DAB28 48 19 2B 59 */ bl cLib_chaseF +/* 800DDBE8 000DAB28 48 19 2B 59 */ bl cLib_chaseF__FPfff /* 800DDBEC 000DAB2C 7F C3 F3 78 */ mr r3, r30 /* 800DDBF0 000DAB30 38 80 00 01 */ li r4, 1 /* 800DDBF4 000DAB34 4B FD 5B 41 */ bl daAlink_c_NS_setShapeAngleToAtnActor diff --git a/include/d/d_a/d_a_alink/asm/func_800DE008.s b/include/d/d_a/d_a_alink/asm/func_800DE008.s index 5bc816874e..e1b1d836b3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DE008.s +++ b/include/d/d_a/d_a_alink/asm/func_800DE008.s @@ -91,7 +91,7 @@ lbl_800DE148: /* 800DE150 000DB090 38 61 00 18 */ addi r3, r1, 0x18 /* 800DE154 000DB094 38 9C 04 D0 */ addi r4, r28, 0x4d0 /* 800DE158 000DB098 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 800DE15C 000DB09C 48 18 89 D9 */ bl cXyz_NS___mi +/* 800DE15C 000DB09C 48 18 89 D9 */ bl __mi__4cXyzCFRC3Vec /* 800DE160 000DB0A0 C0 01 00 18 */ lfs f0, 0x18(r1) /* 800DE164 000DB0A4 D0 01 00 24 */ stfs f0, 0x24(r1) /* 800DE168 000DB0A8 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -178,7 +178,7 @@ lbl_800DE27C: lbl_800DE28C: /* 800DE28C 000DB1CC D0 3C 34 78 */ stfs f1, 0x3478(r28) /* 800DE290 000DB1D0 38 61 00 24 */ addi r3, r1, 0x24 -/* 800DE294 000DB1D4 48 18 8E 95 */ bl cXyz_NS_atan2sX_Z +/* 800DE294 000DB1D4 48 18 8E 95 */ bl atan2sX_Z__4cXyzCFv /* 800DE298 000DB1D8 B0 7C 30 0E */ sth r3, 0x300e(r28) /* 800DE29C 000DB1DC 48 00 00 1C */ b lbl_800DE2B8 lbl_800DE2A0: diff --git a/include/d/d_a/d_a_alink/asm/func_800DE380.s b/include/d/d_a/d_a_alink/asm/func_800DE380.s index 3a8311ad54..6f2c9f6640 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DE380.s +++ b/include/d/d_a/d_a_alink/asm/func_800DE380.s @@ -15,7 +15,7 @@ /* 800DE3B8 000DB2F8 A8 A7 00 14 */ lha r5, 0x14(r7) /* 800DE3BC 000DB2FC A8 DE 30 0A */ lha r6, 0x300a(r30) /* 800DE3C0 000DB300 A8 E7 00 18 */ lha r7, 0x18(r7) -/* 800DE3C4 000DB304 48 19 21 7D */ bl cLib_addCalcAngleS +/* 800DE3C4 000DB304 48 19 21 7D */ bl cLib_addCalcAngleS__FPsssss /* 800DE3C8 000DB308 A8 1E 30 0C */ lha r0, 0x300c(r30) /* 800DE3CC 000DB30C 7C 00 E8 50 */ subf r0, r0, r29 /* 800DE3D0 000DB310 7C 1F 07 34 */ extsh r31, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E15FC.s b/include/d/d_a/d_a_alink/asm/func_800E15FC.s index 69bc62e763..c495fadff4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E15FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E15FC.s @@ -64,7 +64,7 @@ lbl_800E16E0: /* 800E16E0 000DE620 38 7D 33 E8 */ addi r3, r29, 0x33e8 /* 800E16E4 000DE624 FC 20 F8 90 */ fmr f1, f31 /* 800E16E8 000DE628 C0 42 93 EC */ lfs f2, lbl_80452DEC-_SDA2_BASE_(r2) -/* 800E16EC 000DE62C 48 18 F0 55 */ bl cLib_chaseF +/* 800E16EC 000DE62C 48 18 F0 55 */ bl cLib_chaseF__FPfff /* 800E16F0 000DE630 C0 5D 33 E8 */ lfs f2, 0x33e8(r29) /* 800E16F4 000DE634 A8 1D 20 50 */ lha r0, 0x2050(r29) /* 800E16F8 000DE638 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800E2738.s b/include/d/d_a/d_a_alink/asm/func_800E2738.s index 139837436d..488fc40b40 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E2738.s +++ b/include/d/d_a/d_a_alink/asm/func_800E2738.s @@ -46,7 +46,7 @@ lbl_800E2778: /* 800E27E4 000DF724 7C 85 23 78 */ mr r5, r4 /* 800E27E8 000DF728 48 26 45 85 */ bl PSMTXMultVec /* 800E27EC 000DF72C 38 61 00 08 */ addi r3, r1, 8 -/* 800E27F0 000DF730 48 18 49 39 */ bl cXyz_NS_atan2sX_Z +/* 800E27F0 000DF730 48 18 49 39 */ bl atan2sX_Z__4cXyzCFv lbl_800E27F4: /* 800E27F4 000DF734 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800E27F8 000DF738 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E2808.s b/include/d/d_a/d_a_alink/asm/func_800E2808.s index f1cd8e07d0..1660422b5b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E2808.s +++ b/include/d/d_a/d_a_alink/asm/func_800E2808.s @@ -91,7 +91,7 @@ lbl_800E2944: /* 800E2950 000DF890 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) lbl_800E2954: /* 800E2954 000DF894 C0 41 00 5C */ lfs f2, 0x5c(r1) -/* 800E2958 000DF898 48 18 4D 1D */ bl cM_atan2s +/* 800E2958 000DF898 48 18 4D 1D */ bl cM_atan2s__Fff /* 800E295C 000DF89C 7C 7C 1B 78 */ mr r28, r3 /* 800E2960 000DF8A0 7F 83 07 34 */ extsh r3, r28 /* 800E2964 000DF8A4 48 28 27 6D */ bl func_803650D0 @@ -110,7 +110,7 @@ lbl_800E2984: /* 800E2990 000DF8D0 2C 00 80 00 */ cmpwi r0, -32768 /* 800E2994 000DF8D4 41 82 00 14 */ beq lbl_800E29A8 /* 800E2998 000DF8D8 38 61 00 58 */ addi r3, r1, 0x58 -/* 800E299C 000DF8DC 48 18 47 8D */ bl cXyz_NS_atan2sX_Z +/* 800E299C 000DF8DC 48 18 47 8D */ bl atan2sX_Z__4cXyzCFv /* 800E29A0 000DF8E0 B0 7D 31 16 */ sth r3, 0x3116(r29) /* 800E29A4 000DF8E4 48 00 00 14 */ b lbl_800E29B8 lbl_800E29A8: @@ -129,7 +129,7 @@ lbl_800E29B8: /* 800E29D4 000DF914 38 A0 00 05 */ li r5, 5 /* 800E29D8 000DF918 38 C0 10 00 */ li r6, 0x1000 /* 800E29DC 000DF91C 38 E0 01 00 */ li r7, 0x100 -/* 800E29E0 000DF920 48 18 DB 61 */ bl cLib_addCalcAngleS +/* 800E29E0 000DF920 48 18 DB 61 */ bl cLib_addCalcAngleS__FPsssss /* 800E29E4 000DF924 48 00 03 68 */ b lbl_800E2D4C lbl_800E29E8: /* 800E29E8 000DF928 B3 9D 31 14 */ sth r28, 0x3114(r29) @@ -167,7 +167,7 @@ lbl_800E2A38: /* 800E2A60 000DF9A0 38 61 00 34 */ addi r3, r1, 0x34 /* 800E2A64 000DF9A4 38 9D 36 A8 */ addi r4, r29, 0x36a8 /* 800E2A68 000DF9A8 38 A1 00 58 */ addi r5, r1, 0x58 -/* 800E2A6C 000DF9AC 48 18 42 51 */ bl cXyz_NS_outprod +/* 800E2A6C 000DF9AC 48 18 42 51 */ bl outprod__4cXyzCFRC3Vec /* 800E2A70 000DF9B0 C0 01 00 34 */ lfs f0, 0x34(r1) /* 800E2A74 000DF9B4 D0 01 00 4C */ stfs f0, 0x4c(r1) /* 800E2A78 000DF9B8 C0 01 00 38 */ lfs f0, 0x38(r1) @@ -176,7 +176,7 @@ lbl_800E2A38: /* 800E2A84 000DF9C4 D0 01 00 54 */ stfs f0, 0x54(r1) /* 800E2A88 000DF9C8 38 61 00 28 */ addi r3, r1, 0x28 /* 800E2A8C 000DF9CC 38 81 00 4C */ addi r4, r1, 0x4c -/* 800E2A90 000DF9D0 48 18 44 B9 */ bl cXyz_NS_normalizeZP +/* 800E2A90 000DF9D0 48 18 44 B9 */ bl normalizeZP__4cXyzFv /* 800E2A94 000DF9D4 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E2A98 000DF9D8 EC 1F 07 F2 */ fmuls f0, f31, f31 /* 800E2A9C 000DF9DC EC 21 00 28 */ fsubs f1, f1, f0 @@ -187,7 +187,7 @@ lbl_800E2A38: /* 800E2AB0 000DF9F0 EC 20 00 72 */ fmuls f1, f0, f1 lbl_800E2AB4: /* 800E2AB4 000DF9F4 FC 40 F8 90 */ fmr f2, f31 -/* 800E2AB8 000DF9F8 48 18 4D 5D */ bl cM_atan2f +/* 800E2AB8 000DF9F8 48 18 4D 5D */ bl cM_atan2f__Fff /* 800E2ABC 000DF9FC C0 02 93 F8 */ lfs f0, lbl_80452DF8-_SDA2_BASE_(r2) /* 800E2AC0 000DFA00 EC 40 00 72 */ fmuls f2, f0, f1 /* 800E2AC4 000DFA04 C0 02 93 FC */ lfs f0, lbl_80452DFC-_SDA2_BASE_(r2) @@ -298,7 +298,7 @@ lbl_800E2C34: /* 800E2C40 000DFB80 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) lbl_800E2C44: /* 800E2C44 000DFB84 C0 41 00 44 */ lfs f2, 0x44(r1) -/* 800E2C48 000DFB88 48 18 4A 2D */ bl cM_atan2s +/* 800E2C48 000DFB88 48 18 4A 2D */ bl cM_atan2s__Fff /* 800E2C4C 000DFB8C B0 7D 31 14 */ sth r3, 0x3114(r29) /* 800E2C50 000DFB90 A8 7D 31 14 */ lha r3, 0x3114(r29) /* 800E2C54 000DFB94 48 28 24 7D */ bl func_803650D0 @@ -319,7 +319,7 @@ lbl_800E2C7C: /* 800E2C88 000DFBC8 2C 03 80 00 */ cmpwi r3, -32768 /* 800E2C8C 000DFBCC 41 82 00 14 */ beq lbl_800E2CA0 /* 800E2C90 000DFBD0 38 61 00 40 */ addi r3, r1, 0x40 -/* 800E2C94 000DFBD4 48 18 44 95 */ bl cXyz_NS_atan2sX_Z +/* 800E2C94 000DFBD4 48 18 44 95 */ bl atan2sX_Z__4cXyzCFv /* 800E2C98 000DFBD8 B0 7D 31 16 */ sth r3, 0x3116(r29) /* 800E2C9C 000DFBDC 48 00 00 0C */ b lbl_800E2CA8 lbl_800E2CA0: @@ -354,7 +354,7 @@ lbl_800E2CA8: /* 800E2D0C 000DFC4C 38 A1 00 40 */ addi r5, r1, 0x40 /* 800E2D10 000DFC50 48 26 41 3D */ bl PSMTXMultVecSR /* 800E2D14 000DFC54 38 61 00 40 */ addi r3, r1, 0x40 -/* 800E2D18 000DFC58 48 18 44 11 */ bl cXyz_NS_atan2sX_Z +/* 800E2D18 000DFC58 48 18 44 11 */ bl atan2sX_Z__4cXyzCFv /* 800E2D1C 000DFC5C A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 800E2D20 000DFC60 7C 00 1A 14 */ add r0, r0, r3 /* 800E2D24 000DFC64 B0 1D 04 E6 */ sth r0, 0x4e6(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800E2DC4.s b/include/d/d_a/d_a_alink/asm/func_800E2DC4.s index 15f9483665..6d906c2b30 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E2DC4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E2DC4.s @@ -49,14 +49,14 @@ lbl_800E2E64: /* 800E2E7C 000DFDBC 38 61 00 08 */ addi r3, r1, 8 /* 800E2E80 000DFDC0 38 9E 36 A8 */ addi r4, r30, 0x36a8 /* 800E2E84 000DFDC4 C0 22 93 50 */ lfs f1, lbl_80452D50-_SDA2_BASE_(r2) -/* 800E2E88 000DFDC8 48 18 3C FD */ bl cXyz_NS___ml +/* 800E2E88 000DFDC8 48 18 3C FD */ bl __ml__4cXyzCFf /* 800E2E8C 000DFDCC 38 7E 04 D0 */ addi r3, r30, 0x4d0 /* 800E2E90 000DFDD0 38 81 00 08 */ addi r4, r1, 8 /* 800E2E94 000DFDD4 7C 65 1B 78 */ mr r5, r3 /* 800E2E98 000DFDD8 48 26 41 F9 */ bl PSVECAdd /* 800E2E9C 000DFDDC 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 800E2EA0 000DFDE0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 800E2EA4 000DFDE4 48 18 4E 85 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800E2EA4 000DFDE4 48 18 4E 85 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800E2EA8 000DFDE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E2EAC 000DFDEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E2EB0 000DFDF0 38 63 0F 38 */ addi r3, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_800E2F88.s b/include/d/d_a/d_a_alink/asm/func_800E2F88.s index 6834481deb..708726da1d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E2F88.s +++ b/include/d/d_a/d_a_alink/asm/func_800E2F88.s @@ -27,7 +27,7 @@ /* 800E2FF0 000DFF30 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 800E2FF4 000DFF34 38 61 00 08 */ addi r3, r1, 8 /* 800E2FF8 000DFF38 38 81 00 14 */ addi r4, r1, 0x14 -/* 800E2FFC 000DFF3C 48 18 3F 4D */ bl cXyz_NS_normalizeZP +/* 800E2FFC 000DFF3C 48 18 3F 4D */ bl normalizeZP__4cXyzFv /* 800E3000 000DFF40 38 7F 36 A8 */ addi r3, r31, 0x36a8 /* 800E3004 000DFF44 38 81 00 14 */ addi r4, r1, 0x14 /* 800E3008 000DFF48 48 26 41 8D */ bl PSVECDotProduct diff --git a/include/d/d_a/d_a_alink/asm/func_800E3218.s b/include/d/d_a/d_a_alink/asm/func_800E3218.s index 04f9e2c71d..f7a7644020 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3218.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3218.s @@ -5,7 +5,7 @@ /* 800E3228 000E0168 7C 7F 1B 78 */ mr r31, r3 /* 800E322C 000E016C 38 61 00 2C */ addi r3, r1, 0x2c /* 800E3230 000E0170 38 9F 36 9C */ addi r4, r31, 0x369c -/* 800E3234 000E0174 48 18 3A FD */ bl cXyz_NS_normZP +/* 800E3234 000E0174 48 18 3A FD */ bl normZP__4cXyzCFv /* 800E3238 000E0178 C0 01 00 2C */ lfs f0, 0x2c(r1) /* 800E323C 000E017C D0 01 00 44 */ stfs f0, 0x44(r1) /* 800E3240 000E0180 C0 01 00 30 */ lfs f0, 0x30(r1) @@ -18,11 +18,11 @@ /* 800E325C 000E019C 38 61 00 50 */ addi r3, r1, 0x50 /* 800E3260 000E01A0 38 81 00 44 */ addi r4, r1, 0x44 /* 800E3264 000E01A4 FC 20 08 50 */ fneg f1, f1 -/* 800E3268 000E01A8 48 18 C1 75 */ bl cM3dGPla_X1_ +/* 800E3268 000E01A8 48 18 C1 75 */ bl __ct__8cM3dGPlaFPC4cXyzf /* 800E326C 000E01AC 38 61 00 20 */ addi r3, r1, 0x20 /* 800E3270 000E01B0 38 9F 36 B4 */ addi r4, r31, 0x36b4 /* 800E3274 000E01B4 38 BF 36 9C */ addi r5, r31, 0x369c -/* 800E3278 000E01B8 48 18 38 6D */ bl cXyz_NS___pl +/* 800E3278 000E01B8 48 18 38 6D */ bl __pl__4cXyzCFRC3Vec /* 800E327C 000E01BC C0 01 00 20 */ lfs f0, 0x20(r1) /* 800E3280 000E01C0 D0 01 00 44 */ stfs f0, 0x44(r1) /* 800E3284 000E01C4 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -33,7 +33,7 @@ /* 800E3298 000E01D8 38 9F 36 B4 */ addi r4, r31, 0x36b4 /* 800E329C 000E01DC 38 A1 00 44 */ addi r5, r1, 0x44 /* 800E32A0 000E01E0 38 C1 00 38 */ addi r6, r1, 0x38 -/* 800E32A4 000E01E4 48 18 C1 65 */ bl cM3dGPla_NS_crossInfLin +/* 800E32A4 000E01E4 48 18 C1 65 */ bl crossInfLin__8cM3dGPlaCFRC4cXyzRC4cXyzR4cXyz /* 800E32A8 000E01E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E32AC 000E01EC 40 82 00 18 */ bne lbl_800E32C4 /* 800E32B0 000E01F0 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -45,11 +45,11 @@ lbl_800E32C4: /* 800E32C4 000E0204 38 61 00 14 */ addi r3, r1, 0x14 /* 800E32C8 000E0208 38 9F 36 9C */ addi r4, r31, 0x369c /* 800E32CC 000E020C C0 22 93 14 */ lfs f1, lbl_80452D14-_SDA2_BASE_(r2) -/* 800E32D0 000E0210 48 18 38 B5 */ bl cXyz_NS___ml +/* 800E32D0 000E0210 48 18 38 B5 */ bl __ml__4cXyzCFf /* 800E32D4 000E0214 38 61 00 08 */ addi r3, r1, 8 /* 800E32D8 000E0218 38 81 00 38 */ addi r4, r1, 0x38 /* 800E32DC 000E021C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800E32E0 000E0220 48 18 38 05 */ bl cXyz_NS___pl +/* 800E32E0 000E0220 48 18 38 05 */ bl __pl__4cXyzCFRC3Vec /* 800E32E4 000E0224 C0 01 00 08 */ lfs f0, 8(r1) /* 800E32E8 000E0228 D0 01 00 44 */ stfs f0, 0x44(r1) /* 800E32EC 000E022C C0 01 00 0C */ lfs f0, 0xc(r1) @@ -89,7 +89,7 @@ lbl_800E334C: /* 800E336C 000E02AC 4B F9 13 D9 */ bl cBgS_NS_GetTriPla /* 800E3370 000E02B0 38 7F 1E 2C */ addi r3, r31, 0x1e2c /* 800E3374 000E02B4 38 9F 1D C0 */ addi r4, r31, 0x1dc0 -/* 800E3378 000E02B8 48 18 4D D1 */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 800E3378 000E02B8 48 18 4D D1 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 800E337C 000E02BC C0 1F 1D DC */ lfs f0, 0x1ddc(r31) /* 800E3380 000E02C0 D0 1F 37 C8 */ stfs f0, 0x37c8(r31) /* 800E3384 000E02C4 C0 1F 1D E0 */ lfs f0, 0x1de0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E3454.s b/include/d/d_a/d_a_alink/asm/func_800E3454.s index 25f518b289..e9aac4579f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3454.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3454.s @@ -48,7 +48,7 @@ lbl_800E3498: /* 800E350C 000E044C 38 61 00 18 */ addi r3, r1, 0x18 /* 800E3510 000E0450 38 9F 37 C8 */ addi r4, r31, 0x37c8 /* 800E3514 000E0454 38 A1 00 30 */ addi r5, r1, 0x30 -/* 800E3518 000E0458 48 18 36 1D */ bl cXyz_NS___mi +/* 800E3518 000E0458 48 18 36 1D */ bl __mi__4cXyzCFRC3Vec /* 800E351C 000E045C 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800E3520 000E0460 38 81 00 18 */ addi r4, r1, 0x18 /* 800E3524 000E0464 7C 65 1B 78 */ mr r5, r3 @@ -71,7 +71,7 @@ lbl_800E355C: /* 800E355C 000E049C 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800E3560 000E04A0 38 9F 37 C8 */ addi r4, r31, 0x37c8 /* 800E3564 000E04A4 C0 3F 34 78 */ lfs f1, 0x3478(r31) -/* 800E3568 000E04A8 48 18 D2 45 */ bl cLib_chasePos +/* 800E3568 000E04A8 48 18 D2 45 */ bl cLib_chasePos__FP4cXyzRC4cXyzf /* 800E356C 000E04AC 38 7F 37 C8 */ addi r3, r31, 0x37c8 /* 800E3570 000E04B0 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800E3574 000E04B4 48 26 3E 29 */ bl PSVECSquareDistance @@ -173,7 +173,7 @@ lbl_800E36A8: /* 800E36CC 000E060C 38 61 00 0C */ addi r3, r1, 0xc /* 800E36D0 000E0610 38 9F 37 C8 */ addi r4, r31, 0x37c8 /* 800E36D4 000E0614 38 A1 00 24 */ addi r5, r1, 0x24 -/* 800E36D8 000E0618 48 18 34 5D */ bl cXyz_NS___mi +/* 800E36D8 000E0618 48 18 34 5D */ bl __mi__4cXyzCFRC3Vec /* 800E36DC 000E061C C0 01 00 0C */ lfs f0, 0xc(r1) /* 800E36E0 000E0620 D0 01 00 24 */ stfs f0, 0x24(r1) /* 800E36E4 000E0624 C0 01 00 10 */ lfs f0, 0x10(r1) @@ -181,22 +181,22 @@ lbl_800E36A8: /* 800E36EC 000E062C C0 01 00 14 */ lfs f0, 0x14(r1) /* 800E36F0 000E0630 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 800E36F4 000E0634 38 61 00 24 */ addi r3, r1, 0x24 -/* 800E36F8 000E0638 48 18 3A 59 */ bl cXyz_NS_atan2sY_XZ +/* 800E36F8 000E0638 48 18 3A 59 */ bl atan2sY_XZ__4cXyzCFv /* 800E36FC 000E063C 38 03 C0 00 */ addi r0, r3, -16384 /* 800E3700 000E0640 7C 04 07 34 */ extsh r4, r0 /* 800E3704 000E0644 38 7F 04 E4 */ addi r3, r31, 0x4e4 /* 800E3708 000E0648 38 A0 00 05 */ li r5, 5 /* 800E370C 000E064C 38 C0 10 00 */ li r6, 0x1000 /* 800E3710 000E0650 38 E0 01 00 */ li r7, 0x100 -/* 800E3714 000E0654 48 18 CE 2D */ bl cLib_addCalcAngleS +/* 800E3714 000E0654 48 18 CE 2D */ bl cLib_addCalcAngleS__FPsssss /* 800E3718 000E0658 38 61 00 24 */ addi r3, r1, 0x24 -/* 800E371C 000E065C 48 18 3A 0D */ bl cXyz_NS_atan2sX_Z +/* 800E371C 000E065C 48 18 3A 0D */ bl atan2sX_Z__4cXyzCFv /* 800E3720 000E0660 7C 64 1B 78 */ mr r4, r3 /* 800E3724 000E0664 38 7F 04 E6 */ addi r3, r31, 0x4e6 /* 800E3728 000E0668 38 A0 00 05 */ li r5, 5 /* 800E372C 000E066C 38 C0 10 00 */ li r6, 0x1000 /* 800E3730 000E0670 38 E0 01 00 */ li r7, 0x100 -/* 800E3734 000E0674 48 18 CE 0D */ bl cLib_addCalcAngleS +/* 800E3734 000E0674 48 18 CE 0D */ bl cLib_addCalcAngleS__FPsssss /* 800E3738 000E0678 A8 7F 30 0C */ lha r3, 0x300c(r31) /* 800E373C 000E067C 38 03 1C 00 */ addi r0, r3, 0x1c00 /* 800E3740 000E0680 B0 1F 30 0C */ sth r0, 0x300c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E3994.s b/include/d/d_a/d_a_alink/asm/func_800E3994.s index 92782bec7b..8363337ab9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3994.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3994.s @@ -12,11 +12,11 @@ /* 800E39C0 000E0900 28 04 00 00 */ cmplwi r4, 0 /* 800E39C4 000E0904 41 82 00 10 */ beq lbl_800E39D4 /* 800E39C8 000E0908 38 7F 1E 4C */ addi r3, r31, 0x1e4c -/* 800E39CC 000E090C 48 18 47 7D */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 800E39CC 000E090C 48 18 47 7D */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 800E39D0 000E0910 48 00 00 0C */ b lbl_800E39DC lbl_800E39D4: /* 800E39D4 000E0914 38 7F 1E 4C */ addi r3, r31, 0x1e4c -/* 800E39D8 000E0918 48 18 47 49 */ bl cBgS_PolyInfo_NS_ClearPi +/* 800E39D8 000E0918 48 18 47 49 */ bl ClearPi__13cBgS_PolyInfoFv lbl_800E39DC: /* 800E39DC 000E091C C0 22 94 08 */ lfs f1, lbl_80452E08-_SDA2_BASE_(r2) /* 800E39E0 000E0920 EC 01 07 B2 */ fmuls f0, f1, f30 diff --git a/include/d/d_a/d_a_alink/asm/func_800E3F50.s b/include/d/d_a/d_a_alink/asm/func_800E3F50.s index 59e5080ed9..823d72c390 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3F50.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3F50.s @@ -165,7 +165,7 @@ lbl_800E416C: /* 800E41B8 000E10F8 38 7E 04 E6 */ addi r3, r30, 0x4e6 /* 800E41BC 000E10FC 7F 64 DB 78 */ mr r4, r27 /* 800E41C0 000E1100 38 A0 10 00 */ li r5, 0x1000 -/* 800E41C4 000E1104 48 18 C9 CD */ bl cLib_chaseAngleS +/* 800E41C4 000E1104 48 18 C9 CD */ bl cLib_chaseAngleS__FPsss /* 800E41C8 000E1108 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800E41CC 000E110C B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800E41D0 000E1110 48 00 09 E4 */ b lbl_800E4BB4 @@ -235,7 +235,7 @@ lbl_800E42A0: /* 800E42B8 000E11F8 38 7E 04 E6 */ addi r3, r30, 0x4e6 /* 800E42BC 000E11FC 7F 64 DB 78 */ mr r4, r27 /* 800E42C0 000E1200 38 A0 10 00 */ li r5, 0x1000 -/* 800E42C4 000E1204 48 18 C8 CD */ bl cLib_chaseAngleS +/* 800E42C4 000E1204 48 18 C8 CD */ bl cLib_chaseAngleS__FPsss /* 800E42C8 000E1208 48 00 00 14 */ b lbl_800E42DC lbl_800E42CC: /* 800E42CC 000E120C B3 7E 04 E6 */ sth r27, 0x4e6(r30) @@ -285,11 +285,11 @@ lbl_800E4300: /* 800E4374 000E12B4 38 61 00 E8 */ addi r3, r1, 0xe8 /* 800E4378 000E12B8 38 81 01 24 */ addi r4, r1, 0x124 /* 800E437C 000E12BC 38 A1 01 18 */ addi r5, r1, 0x118 -/* 800E4380 000E12C0 48 18 27 65 */ bl cXyz_NS___pl +/* 800E4380 000E12C0 48 18 27 65 */ bl __pl__4cXyzCFRC3Vec /* 800E4384 000E12C4 38 61 00 DC */ addi r3, r1, 0xdc /* 800E4388 000E12C8 38 81 00 E8 */ addi r4, r1, 0xe8 /* 800E438C 000E12CC C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800E4390 000E12D0 48 18 27 F5 */ bl cXyz_NS___ml +/* 800E4390 000E12D0 48 18 27 F5 */ bl __ml__4cXyzCFf /* 800E4394 000E12D4 C0 01 00 DC */ lfs f0, 0xdc(r1) /* 800E4398 000E12D8 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) /* 800E439C 000E12DC C0 01 00 E0 */ lfs f0, 0xe0(r1) @@ -320,15 +320,15 @@ lbl_800E43D8: /* 800E43FC 000E133C 38 9C 01 44 */ addi r4, r28, 0x144 /* 800E4400 000E1340 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E4404 000E1344 EC 20 F8 28 */ fsubs f1, f0, f31 -/* 800E4408 000E1348 48 18 27 7D */ bl cXyz_NS___ml +/* 800E4408 000E1348 48 18 27 7D */ bl __ml__4cXyzCFf /* 800E440C 000E134C 38 61 00 C4 */ addi r3, r1, 0xc4 /* 800E4410 000E1350 38 9C 01 5C */ addi r4, r28, 0x15c /* 800E4414 000E1354 FC 20 F8 90 */ fmr f1, f31 -/* 800E4418 000E1358 48 18 27 6D */ bl cXyz_NS___ml +/* 800E4418 000E1358 48 18 27 6D */ bl __ml__4cXyzCFf /* 800E441C 000E135C 38 61 00 B8 */ addi r3, r1, 0xb8 /* 800E4420 000E1360 38 81 00 D0 */ addi r4, r1, 0xd0 /* 800E4424 000E1364 38 A1 00 C4 */ addi r5, r1, 0xc4 -/* 800E4428 000E1368 48 18 26 BD */ bl cXyz_NS___pl +/* 800E4428 000E1368 48 18 26 BD */ bl __pl__4cXyzCFRC3Vec /* 800E442C 000E136C C0 01 00 B8 */ lfs f0, 0xb8(r1) /* 800E4430 000E1370 D0 01 01 3C */ stfs f0, 0x13c(r1) /* 800E4434 000E1374 C0 01 00 BC */ lfs f0, 0xbc(r1) @@ -357,15 +357,15 @@ lbl_800E445C: /* 800E448C 000E13CC 38 9C 01 5C */ addi r4, r28, 0x15c /* 800E4490 000E13D0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E4494 000E13D4 EC 20 F8 28 */ fsubs f1, f0, f31 -/* 800E4498 000E13D8 48 18 26 ED */ bl cXyz_NS___ml +/* 800E4498 000E13D8 48 18 26 ED */ bl __ml__4cXyzCFf /* 800E449C 000E13DC 38 61 00 A0 */ addi r3, r1, 0xa0 /* 800E44A0 000E13E0 38 9C 01 74 */ addi r4, r28, 0x174 /* 800E44A4 000E13E4 FC 20 F8 90 */ fmr f1, f31 -/* 800E44A8 000E13E8 48 18 26 DD */ bl cXyz_NS___ml +/* 800E44A8 000E13E8 48 18 26 DD */ bl __ml__4cXyzCFf /* 800E44AC 000E13EC 38 61 00 94 */ addi r3, r1, 0x94 /* 800E44B0 000E13F0 38 81 00 AC */ addi r4, r1, 0xac /* 800E44B4 000E13F4 38 A1 00 A0 */ addi r5, r1, 0xa0 -/* 800E44B8 000E13F8 48 18 26 2D */ bl cXyz_NS___pl +/* 800E44B8 000E13F8 48 18 26 2D */ bl __pl__4cXyzCFRC3Vec /* 800E44BC 000E13FC C0 01 00 94 */ lfs f0, 0x94(r1) /* 800E44C0 000E1400 D0 01 01 3C */ stfs f0, 0x13c(r1) /* 800E44C4 000E1404 C0 01 00 98 */ lfs f0, 0x98(r1) @@ -384,15 +384,15 @@ lbl_800E44EC: /* 800E44F4 000E1434 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E44F8 000E1438 C0 1F 33 E8 */ lfs f0, 0x33e8(r31) /* 800E44FC 000E143C EC 21 00 28 */ fsubs f1, f1, f0 -/* 800E4500 000E1440 48 18 26 85 */ bl cXyz_NS___ml +/* 800E4500 000E1440 48 18 26 85 */ bl __ml__4cXyzCFf /* 800E4504 000E1444 38 61 00 7C */ addi r3, r1, 0x7c /* 800E4508 000E1448 38 9C 01 8C */ addi r4, r28, 0x18c /* 800E450C 000E144C C0 3F 33 E8 */ lfs f1, 0x33e8(r31) -/* 800E4510 000E1450 48 18 26 75 */ bl cXyz_NS___ml +/* 800E4510 000E1450 48 18 26 75 */ bl __ml__4cXyzCFf /* 800E4514 000E1454 38 61 00 70 */ addi r3, r1, 0x70 /* 800E4518 000E1458 38 81 00 88 */ addi r4, r1, 0x88 /* 800E451C 000E145C 38 A1 00 7C */ addi r5, r1, 0x7c -/* 800E4520 000E1460 48 18 25 C5 */ bl cXyz_NS___pl +/* 800E4520 000E1460 48 18 25 C5 */ bl __pl__4cXyzCFRC3Vec /* 800E4524 000E1464 C0 01 00 70 */ lfs f0, 0x70(r1) /* 800E4528 000E1468 D0 01 01 3C */ stfs f0, 0x13c(r1) /* 800E452C 000E146C C0 01 00 74 */ lfs f0, 0x74(r1) @@ -422,11 +422,11 @@ lbl_800E4584: /* 800E4584 000E14C4 38 61 00 64 */ addi r3, r1, 0x64 /* 800E4588 000E14C8 38 9F 05 C8 */ addi r4, r31, 0x5c8 /* 800E458C 000E14CC 38 BF 05 D4 */ addi r5, r31, 0x5d4 -/* 800E4590 000E14D0 48 18 25 55 */ bl cXyz_NS___pl +/* 800E4590 000E14D0 48 18 25 55 */ bl __pl__4cXyzCFRC3Vec /* 800E4594 000E14D4 38 61 00 58 */ addi r3, r1, 0x58 /* 800E4598 000E14D8 38 81 00 64 */ addi r4, r1, 0x64 /* 800E459C 000E14DC C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800E45A0 000E14E0 48 18 25 E5 */ bl cXyz_NS___ml +/* 800E45A0 000E14E0 48 18 25 E5 */ bl __ml__4cXyzCFf /* 800E45A4 000E14E4 C0 01 00 58 */ lfs f0, 0x58(r1) /* 800E45A8 000E14E8 D0 01 01 3C */ stfs f0, 0x13c(r1) /* 800E45AC 000E14EC C0 01 00 5C */ lfs f0, 0x5c(r1) @@ -476,15 +476,15 @@ lbl_800E4610: /* 800E4658 000E1598 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E465C 000E159C C0 1F 33 E8 */ lfs f0, 0x33e8(r31) /* 800E4660 000E15A0 EC 21 00 28 */ fsubs f1, f1, f0 -/* 800E4664 000E15A4 48 18 25 21 */ bl cXyz_NS___ml +/* 800E4664 000E15A4 48 18 25 21 */ bl __ml__4cXyzCFf /* 800E4668 000E15A8 38 61 00 40 */ addi r3, r1, 0x40 /* 800E466C 000E15AC 38 81 01 3C */ addi r4, r1, 0x13c /* 800E4670 000E15B0 C0 3F 33 E8 */ lfs f1, 0x33e8(r31) -/* 800E4674 000E15B4 48 18 25 11 */ bl cXyz_NS___ml +/* 800E4674 000E15B4 48 18 25 11 */ bl __ml__4cXyzCFf /* 800E4678 000E15B8 38 61 00 34 */ addi r3, r1, 0x34 /* 800E467C 000E15BC 38 81 00 4C */ addi r4, r1, 0x4c /* 800E4680 000E15C0 38 A1 00 40 */ addi r5, r1, 0x40 -/* 800E4684 000E15C4 48 18 24 61 */ bl cXyz_NS___pl +/* 800E4684 000E15C4 48 18 24 61 */ bl __pl__4cXyzCFRC3Vec /* 800E4688 000E15C8 C0 01 00 34 */ lfs f0, 0x34(r1) /* 800E468C 000E15CC D0 1E 04 D0 */ stfs f0, 0x4d0(r30) /* 800E4690 000E15D0 C0 01 00 38 */ lfs f0, 0x38(r1) @@ -562,7 +562,7 @@ lbl_800E4780: /* 800E4798 000E16D8 38 61 00 28 */ addi r3, r1, 0x28 /* 800E479C 000E16DC 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 800E47A0 000E16E0 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 800E47A4 000E16E4 48 18 23 91 */ bl cXyz_NS___mi +/* 800E47A4 000E16E4 48 18 23 91 */ bl __mi__4cXyzCFRC3Vec /* 800E47A8 000E16E8 C0 01 00 28 */ lfs f0, 0x28(r1) /* 800E47AC 000E16EC D0 01 01 0C */ stfs f0, 0x10c(r1) /* 800E47B0 000E16F0 C0 01 00 2C */ lfs f0, 0x2c(r1) @@ -591,11 +591,11 @@ lbl_800E4780: /* 800E480C 000E174C 38 61 00 1C */ addi r3, r1, 0x1c /* 800E4810 000E1750 38 81 01 00 */ addi r4, r1, 0x100 /* 800E4814 000E1754 C0 3F 05 98 */ lfs f1, 0x598(r31) -/* 800E4818 000E1758 48 18 23 6D */ bl cXyz_NS___ml +/* 800E4818 000E1758 48 18 23 6D */ bl __ml__4cXyzCFf /* 800E481C 000E175C 38 61 00 10 */ addi r3, r1, 0x10 /* 800E4820 000E1760 38 81 01 0C */ addi r4, r1, 0x10c /* 800E4824 000E1764 38 A1 00 1C */ addi r5, r1, 0x1c -/* 800E4828 000E1768 48 18 23 0D */ bl cXyz_NS___mi +/* 800E4828 000E1768 48 18 23 0D */ bl __mi__4cXyzCFRC3Vec /* 800E482C 000E176C C0 01 00 10 */ lfs f0, 0x10(r1) /* 800E4830 000E1770 D0 01 01 00 */ stfs f0, 0x100(r1) /* 800E4834 000E1774 C0 01 00 14 */ lfs f0, 0x14(r1) @@ -774,7 +774,7 @@ lbl_800E4A7C: /* 800E4A98 000E19D8 D0 41 00 FC */ stfs f2, 0xfc(r1) /* 800E4A9C 000E19DC 38 7F 1E CC */ addi r3, r31, 0x1ecc /* 800E4AA0 000E19E0 38 81 00 F4 */ addi r4, r1, 0xf4 -/* 800E4AA4 000E19E4 48 18 32 85 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800E4AA4 000E19E4 48 18 32 85 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800E4AA8 000E19E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E4AAC 000E19EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E4AB0 000E19F0 38 63 0F 38 */ addi r3, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_800E4BD4.s b/include/d/d_a/d_a_alink/asm/func_800E4BD4.s index e98736ac53..a6f2ea5402 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E4BD4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E4BD4.s @@ -84,7 +84,7 @@ lbl_800E4C98: /* 800E4D0C 000E1C4C 38 61 00 08 */ addi r3, r1, 8 /* 800E4D10 000E1C50 38 81 00 20 */ addi r4, r1, 0x20 /* 800E4D14 000E1C54 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 800E4D18 000E1C58 48 18 1E 6D */ bl cXyz_NS___ml +/* 800E4D18 000E1C58 48 18 1E 6D */ bl __ml__4cXyzCFf /* 800E4D1C 000E1C5C 38 7E 04 D0 */ addi r3, r30, 0x4d0 /* 800E4D20 000E1C60 38 81 00 08 */ addi r4, r1, 8 /* 800E4D24 000E1C64 7C 65 1B 78 */ mr r5, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800E4DEC.s b/include/d/d_a/d_a_alink/asm/func_800E4DEC.s index db69c393c9..8a664d51bd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E4DEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E4DEC.s @@ -94,7 +94,7 @@ lbl_800E4F40: /* 800E4F40 000E1E80 38 7D 33 E8 */ addi r3, r29, 0x33e8 /* 800E4F44 000E1E84 FC 20 F8 90 */ fmr f1, f31 /* 800E4F48 000E1E88 C0 42 93 EC */ lfs f2, lbl_80452DEC-_SDA2_BASE_(r2) -/* 800E4F4C 000E1E8C 48 18 B7 F5 */ bl cLib_chaseF +/* 800E4F4C 000E1E8C 48 18 B7 F5 */ bl cLib_chaseF__FPfff /* 800E4F50 000E1E90 C0 5D 33 E8 */ lfs f2, 0x33e8(r29) /* 800E4F54 000E1E94 A8 1D 20 50 */ lha r0, 0x2050(r29) /* 800E4F58 000E1E98 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800E53F8.s b/include/d/d_a/d_a_alink/asm/func_800E53F8.s index 3da009a2d8..1d43bc6c72 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E53F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E53F8.s @@ -131,7 +131,7 @@ lbl_800E55CC: /* 800E55D0 000E2510 C0 01 00 28 */ lfs f0, 0x28(r1) /* 800E55D4 000E2514 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 800E55D8 000E2518 38 61 00 24 */ addi r3, r1, 0x24 -/* 800E55DC 000E251C 48 18 1B 4D */ bl cXyz_NS_atan2sX_Z +/* 800E55DC 000E251C 48 18 1B 4D */ bl atan2sX_Z__4cXyzCFv /* 800E55E0 000E2520 B0 7F 04 DE */ sth r3, 0x4de(r31) /* 800E55E4 000E2524 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E55E8 000E2528 D0 01 00 24 */ stfs f0, 0x24(r1) @@ -197,7 +197,7 @@ lbl_800E56C0: /* 800E56C8 000E2608 38 61 00 18 */ addi r3, r1, 0x18 /* 800E56CC 000E260C 38 84 05 38 */ addi r4, r4, 0x538 /* 800E56D0 000E2610 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 800E56D4 000E2614 48 18 14 61 */ bl cXyz_NS___mi +/* 800E56D4 000E2614 48 18 14 61 */ bl __mi__4cXyzCFRC3Vec /* 800E56D8 000E2618 C0 01 00 18 */ lfs f0, 0x18(r1) /* 800E56DC 000E261C D0 01 00 24 */ stfs f0, 0x24(r1) /* 800E56E0 000E2620 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -208,7 +208,7 @@ lbl_800E56C0: /* 800E56F4 000E2634 38 81 00 24 */ addi r4, r1, 0x24 /* 800E56F8 000E2638 4B FF CD 85 */ bl daAlink_c_NS_multVecMagneBootInvMtx /* 800E56FC 000E263C 38 61 00 24 */ addi r3, r1, 0x24 -/* 800E5700 000E2640 48 18 1A 29 */ bl cXyz_NS_atan2sX_Z +/* 800E5700 000E2640 48 18 1A 29 */ bl atan2sX_Z__4cXyzCFv /* 800E5704 000E2644 B0 7F 04 DE */ sth r3, 0x4de(r31) /* 800E5708 000E2648 A8 1F 04 DE */ lha r0, 0x4de(r31) /* 800E570C 000E264C B0 1F 04 E6 */ sth r0, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E5830.s b/include/d/d_a/d_a_alink/asm/func_800E5830.s index ab6171bb73..4aa388dfde 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5830.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5830.s @@ -31,7 +31,7 @@ /* 800E58A8 000E27E8 38 61 00 1C */ addi r3, r1, 0x1c /* 800E58AC 000E27EC 7F A4 EB 78 */ mr r4, r29 /* 800E58B0 000E27F0 38 BC 00 30 */ addi r5, r28, 0x30 -/* 800E58B4 000E27F4 48 18 12 81 */ bl cXyz_NS___mi +/* 800E58B4 000E27F4 48 18 12 81 */ bl __mi__4cXyzCFRC3Vec /* 800E58B8 000E27F8 C0 01 00 1C */ lfs f0, 0x1c(r1) /* 800E58BC 000E27FC D0 01 00 28 */ stfs f0, 0x28(r1) /* 800E58C0 000E2800 C0 01 00 20 */ lfs f0, 0x20(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E5CBC.s b/include/d/d_a/d_a_alink/asm/func_800E5CBC.s index 50d0ab99ba..c2f9b320df 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5CBC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5CBC.s @@ -42,7 +42,7 @@ lbl_800E5D40: /* 800E5D54 000E2C94 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 800E5D58 000E2C98 38 84 04 D0 */ addi r4, r4, 0x4d0 /* 800E5D5C 000E2C9C 38 BF 35 10 */ addi r5, r31, 0x3510 -/* 800E5D60 000E2CA0 48 18 0D D5 */ bl cXyz_NS___mi +/* 800E5D60 000E2CA0 48 18 0D D5 */ bl __mi__4cXyzCFRC3Vec /* 800E5D64 000E2CA4 C0 01 00 08 */ lfs f0, 8(r1) /* 800E5D68 000E2CA8 D0 1F 37 C8 */ stfs f0, 0x37c8(r31) /* 800E5D6C 000E2CAC C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E5FD0.s b/include/d/d_a/d_a_alink/asm/func_800E5FD0.s index f1ab82617d..d3c3049d71 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5FD0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5FD0.s @@ -45,7 +45,7 @@ lbl_800E6078: /* 800E6078 000E2FB8 38 61 00 18 */ addi r3, r1, 0x18 /* 800E607C 000E2FBC 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800E6080 000E2FC0 38 BE 35 10 */ addi r5, r30, 0x3510 -/* 800E6084 000E2FC4 48 18 0A B1 */ bl cXyz_NS___mi +/* 800E6084 000E2FC4 48 18 0A B1 */ bl __mi__4cXyzCFRC3Vec /* 800E6088 000E2FC8 C0 41 00 18 */ lfs f2, 0x18(r1) /* 800E608C 000E2FCC D0 41 00 24 */ stfs f2, 0x24(r1) /* 800E6090 000E2FD0 C0 01 00 1C */ lfs f0, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E65F8.s b/include/d/d_a/d_a_alink/asm/func_800E65F8.s index e6da70f5c5..58fd91ff9c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E65F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E65F8.s @@ -25,7 +25,7 @@ lbl_800E6644: /* 800E664C 000E358C 3C 80 80 39 */ lis r4, lbl_8038D6BC@ha /* 800E6650 000E3590 38 84 D6 BC */ addi r4, r4, lbl_8038D6BC@l /* 800E6654 000E3594 C0 44 00 38 */ lfs f2, 0x38(r4) -/* 800E6658 000E3598 48 18 A0 E9 */ bl cLib_chaseF +/* 800E6658 000E3598 48 18 A0 E9 */ bl cLib_chaseF__FPfff /* 800E665C 000E359C 7F E3 FB 78 */ mr r3, r31 /* 800E6660 000E35A0 C0 3E 34 3C */ lfs f1, 0x343c(r30) /* 800E6664 000E35A4 48 24 1D C9 */ bl J3DFrameCtrl_NS_checkPass diff --git a/include/d/d_a/d_a_alink/asm/func_800E672C.s b/include/d/d_a/d_a_alink/asm/func_800E672C.s index 35b344d286..2478739e7a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E672C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E672C.s @@ -111,7 +111,7 @@ lbl_800E68C4: /* 800E68CC 000E380C 41 82 00 18 */ beq lbl_800E68E4 /* 800E68D0 000E3810 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800E68D4 000E3814 38 9F 37 74 */ addi r4, r31, 0x3774 -/* 800E68D8 000E3818 48 18 A3 2D */ bl cLib_targetAngleY +/* 800E68D8 000E3818 48 18 A3 2D */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800E68DC 000E381C B0 7F 30 10 */ sth r3, 0x3010(r31) /* 800E68E0 000E3820 48 00 00 0C */ b lbl_800E68EC lbl_800E68E4: diff --git a/include/d/d_a/d_a_alink/asm/func_800E6914.s b/include/d/d_a/d_a_alink/asm/func_800E6914.s index bc198d7f75..48ed6c7a8d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E6914.s +++ b/include/d/d_a/d_a_alink/asm/func_800E6914.s @@ -10,7 +10,7 @@ /* 800E6938 000E3878 38 A0 00 02 */ li r5, 2 /* 800E693C 000E387C 38 C0 20 00 */ li r6, 0x2000 /* 800E6940 000E3880 38 E0 08 00 */ li r7, 0x800 -/* 800E6944 000E3884 48 18 9B FD */ bl cLib_addCalcAngleS +/* 800E6944 000E3884 48 18 9B FD */ bl cLib_addCalcAngleS__FPsssss /* 800E6948 000E3888 A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 800E694C 000E388C B0 1D 04 DE */ sth r0, 0x4de(r29) /* 800E6950 000E3890 28 1F 00 00 */ cmplwi r31, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E7254.s b/include/d/d_a/d_a_alink/asm/func_800E7254.s index 1439c24082..2daa733b27 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E7254.s +++ b/include/d/d_a/d_a_alink/asm/func_800E7254.s @@ -60,7 +60,7 @@ lbl_800E731C: /* 800E7330 000E4270 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 800E7334 000E4274 38 84 04 D0 */ addi r4, r4, 0x4d0 /* 800E7338 000E4278 38 BF 35 10 */ addi r5, r31, 0x3510 -/* 800E733C 000E427C 48 17 F7 F9 */ bl cXyz_NS___mi +/* 800E733C 000E427C 48 17 F7 F9 */ bl __mi__4cXyzCFRC3Vec /* 800E7340 000E4280 C0 01 00 08 */ lfs f0, 8(r1) /* 800E7344 000E4284 D0 1F 37 C8 */ stfs f0, 0x37c8(r31) /* 800E7348 000E4288 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E8148.s b/include/d/d_a/d_a_alink/asm/func_800E8148.s index 5f3a5449aa..6c3edd0cc7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E8148.s +++ b/include/d/d_a/d_a_alink/asm/func_800E8148.s @@ -63,7 +63,7 @@ lbl_800E8218: /* 800E8238 000E5178 D0 01 00 10 */ stfs f0, 0x10(r1) /* 800E823C 000E517C 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800E8240 000E5180 38 81 00 08 */ addi r4, r1, 8 -/* 800E8244 000E5184 48 17 FA E5 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800E8244 000E5184 48 17 FA E5 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800E8248 000E5188 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E824C 000E518C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E8250 000E5190 38 63 0F 38 */ addi r3, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_800E857C.s b/include/d/d_a/d_a_alink/asm/func_800E857C.s index 4f6bcf8fcc..ee8cf9a876 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E857C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E857C.s @@ -34,7 +34,7 @@ lbl_800E85E4: /* 800E85F8 000E5538 38 A0 00 03 */ li r5, 3 /* 800E85FC 000E553C 38 C0 08 00 */ li r6, 0x800 /* 800E8600 000E5540 38 E0 01 00 */ li r7, 0x100 -/* 800E8604 000E5544 48 18 7F 3D */ bl cLib_addCalcAngleS +/* 800E8604 000E5544 48 18 7F 3D */ bl cLib_addCalcAngleS__FPsssss /* 800E8608 000E5548 7C 7E 1B 78 */ mr r30, r3 /* 800E860C 000E554C A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800E8610 000E5550 B0 1F 04 DE */ sth r0, 0x4de(r31) @@ -43,14 +43,14 @@ lbl_800E85E4: /* 800E861C 000E555C C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800E8620 000E5560 C0 62 93 30 */ lfs f3, lbl_80452D30-_SDA2_BASE_(r2) /* 800E8624 000E5564 C0 82 92 B8 */ lfs f4, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800E8628 000E5568 48 18 73 55 */ bl cLib_addCalc +/* 800E8628 000E5568 48 18 73 55 */ bl cLib_addCalc__FPfffff /* 800E862C 000E556C FF E0 08 90 */ fmr f31, f1 /* 800E8630 000E5570 38 7F 04 D8 */ addi r3, r31, 0x4d8 /* 800E8634 000E5574 C0 3F 37 D0 */ lfs f1, 0x37d0(r31) /* 800E8638 000E5578 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800E863C 000E557C C0 62 93 30 */ lfs f3, lbl_80452D30-_SDA2_BASE_(r2) /* 800E8640 000E5580 C0 82 92 B8 */ lfs f4, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800E8644 000E5584 48 18 73 39 */ bl cLib_addCalc +/* 800E8644 000E5584 48 18 73 39 */ bl cLib_addCalc__FPfffff /* 800E8648 000E5588 EC 3F 08 2A */ fadds f1, f31, f1 /* 800E864C 000E558C 7F C0 07 35 */ extsh. r0, r30 /* 800E8650 000E5590 40 82 00 38 */ bne lbl_800E8688 diff --git a/include/d/d_a/d_a_alink/asm/func_800E9434.s b/include/d/d_a/d_a_alink/asm/func_800E9434.s index ac06db2d82..bb29f57958 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E9434.s +++ b/include/d/d_a/d_a_alink/asm/func_800E9434.s @@ -31,7 +31,7 @@ lbl_800E94A0: /* 800E94A0 000E63E0 38 61 00 14 */ addi r3, r1, 0x14 /* 800E94A4 000E63E4 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800E94A8 000E63E8 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 800E94AC 000E63EC 48 17 D6 89 */ bl cXyz_NS___mi +/* 800E94AC 000E63EC 48 17 D6 89 */ bl __mi__4cXyzCFRC3Vec /* 800E94B0 000E63F0 C0 01 00 14 */ lfs f0, 0x14(r1) /* 800E94B4 000E63F4 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 800E94B8 000E63F8 C0 01 00 18 */ lfs f0, 0x18(r1) @@ -102,7 +102,7 @@ lbl_800E95A8: /* 800E95A8 000E64E8 38 61 00 08 */ addi r3, r1, 8 /* 800E95AC 000E64EC 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 800E95B0 000E64F0 38 BE 37 C8 */ addi r5, r30, 0x37c8 -/* 800E95B4 000E64F4 48 17 D5 81 */ bl cXyz_NS___mi +/* 800E95B4 000E64F4 48 17 D5 81 */ bl __mi__4cXyzCFRC3Vec /* 800E95B8 000E64F8 C0 01 00 08 */ lfs f0, 8(r1) /* 800E95BC 000E64FC D0 01 00 20 */ stfs f0, 0x20(r1) /* 800E95C0 000E6500 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E9894.s b/include/d/d_a/d_a_alink/asm/func_800E9894.s index 710b35f99c..17fde796c3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E9894.s +++ b/include/d/d_a/d_a_alink/asm/func_800E9894.s @@ -10,7 +10,7 @@ /* 800E98B8 000E67F8 FF E0 08 90 */ fmr f31, f1 /* 800E98BC 000E67FC 38 7E 04 D0 */ addi r3, r30, 0x4d0 /* 800E98C0 000E6800 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 800E98C4 000E6804 48 18 73 41 */ bl cLib_targetAngleY +/* 800E98C4 000E6804 48 18 73 41 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800E98C8 000E6808 7C 7D 1B 78 */ mr r29, r3 /* 800E98CC 000E680C 88 1E 05 6A */ lbz r0, 0x56a(r30) /* 800E98D0 000E6810 28 00 00 2A */ cmplwi r0, 0x2a diff --git a/include/d/d_a/d_a_alink/asm/func_800E9BD0.s b/include/d/d_a/d_a_alink/asm/func_800E9BD0.s index 186eee003d..70383b7264 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E9BD0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E9BD0.s @@ -31,7 +31,7 @@ lbl_800E9C38: /* 800E9C3C 000E6B7C 38 A0 00 05 */ li r5, 5 /* 800E9C40 000E6B80 38 C0 20 00 */ li r6, 0x2000 /* 800E9C44 000E6B84 38 E0 04 00 */ li r7, 0x400 -/* 800E9C48 000E6B88 48 18 68 F9 */ bl cLib_addCalcAngleS +/* 800E9C48 000E6B88 48 18 68 F9 */ bl cLib_addCalcAngleS__FPsssss /* 800E9C4C 000E6B8C 28 1F 00 00 */ cmplwi r31, 0 /* 800E9C50 000E6B90 40 82 00 44 */ bne lbl_800E9C94 /* 800E9C54 000E6B94 88 1C 05 6A */ lbz r0, 0x56a(r28) @@ -279,7 +279,7 @@ lbl_800E9FAC: /* 800E9FC8 000E6F08 38 7C 33 98 */ addi r3, r28, 0x3398 /* 800E9FCC 000E6F0C C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) /* 800E9FD0 000E6F10 C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800E9FD4 000E6F14 48 18 67 6D */ bl cLib_chaseF +/* 800E9FD4 000E6F14 48 18 67 6D */ bl cLib_chaseF__FPfff /* 800E9FD8 000E6F18 48 00 00 AC */ b lbl_800EA084 lbl_800E9FDC: /* 800E9FDC 000E6F1C C3 C2 92 B8 */ lfs f30, lbl_80452CB8-_SDA2_BASE_(r2) @@ -322,7 +322,7 @@ lbl_800EA060: /* 800EA060 000E6FA0 38 7C 33 98 */ addi r3, r28, 0x3398 /* 800EA064 000E6FA4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800EA068 000E6FA8 FC 40 F0 90 */ fmr f2, f30 -/* 800EA06C 000E6FAC 48 18 66 D5 */ bl cLib_chaseF +/* 800EA06C 000E6FAC 48 18 66 D5 */ bl cLib_chaseF__FPfff /* 800EA070 000E6FB0 C0 3C 33 98 */ lfs f1, 0x3398(r28) /* 800EA074 000E6FB4 C0 02 93 A0 */ lfs f0, lbl_80452DA0-_SDA2_BASE_(r2) /* 800EA078 000E6FB8 FC 01 00 40 */ fcmpo cr0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800EA4CC.s b/include/d/d_a/d_a_alink/asm/func_800EA4CC.s index 77d108cfac..12f9824ab1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EA4CC.s +++ b/include/d/d_a/d_a_alink/asm/func_800EA4CC.s @@ -52,7 +52,7 @@ lbl_800EA564: lbl_800EA584: /* 800EA584 000E74C4 A8 7F 2F E2 */ lha r3, 0x2fe2(r31) /* 800EA588 000E74C8 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800EA58C 000E74CC 48 18 68 99 */ bl cLib_distanceAngleS +/* 800EA58C 000E74CC 48 18 68 99 */ bl cLib_distanceAngleS__Fss /* 800EA590 000E74D0 7C 7E 1B 78 */ mr r30, r3 /* 800EA594 000E74D4 80 7F 27 E0 */ lwz r3, 0x27e0(r31) /* 800EA598 000E74D8 4B F8 62 E9 */ bl dAttention_c_NS_getActionBtnB diff --git a/include/d/d_a/d_a_alink/asm/func_800EAA28.s b/include/d/d_a/d_a_alink/asm/func_800EAA28.s index 40758ca9b8..9e0ed0878b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EAA28.s +++ b/include/d/d_a/d_a_alink/asm/func_800EAA28.s @@ -93,7 +93,7 @@ lbl_800EAB48: /* 800EAB80 000E7AC0 7C 7E 1B 78 */ mr r30, r3 /* 800EAB84 000E7AC4 A8 7F 2F E2 */ lha r3, 0x2fe2(r31) /* 800EAB88 000E7AC8 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800EAB8C 000E7ACC 48 18 62 99 */ bl cLib_distanceAngleS +/* 800EAB8C 000E7ACC 48 18 62 99 */ bl cLib_distanceAngleS__Fss /* 800EAB90 000E7AD0 2C 1E 08 00 */ cmpwi r30, 0x800 /* 800EAB94 000E7AD4 40 81 00 30 */ ble lbl_800EABC4 /* 800EAB98 000E7AD8 2C 1E 78 00 */ cmpwi r30, 0x7800 diff --git a/include/d/d_a/d_a_alink/asm/func_800EAD84.s b/include/d/d_a/d_a_alink/asm/func_800EAD84.s index 8fd30773e7..395e4c1c3d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EAD84.s +++ b/include/d/d_a/d_a_alink/asm/func_800EAD84.s @@ -62,7 +62,7 @@ lbl_800EAE5C: lbl_800EAE60: /* 800EAE60 000E7DA0 38 61 00 08 */ addi r3, r1, 8 /* 800EAE64 000E7DA4 C0 42 94 A8 */ lfs f2, lbl_80452EA8-_SDA2_BASE_(r2) -/* 800EAE68 000E7DA8 48 18 58 D9 */ bl cLib_chaseF +/* 800EAE68 000E7DA8 48 18 58 D9 */ bl cLib_chaseF__FPfff /* 800EAE6C 000E7DAC C0 01 00 08 */ lfs f0, 8(r1) /* 800EAE70 000E7DB0 D0 1E 00 0C */ stfs f0, 0xc(r30) /* 800EAE74 000E7DB4 48 00 03 10 */ b lbl_800EB184 @@ -73,7 +73,7 @@ lbl_800EAE78: /* 800EAE84 000E7DC4 38 61 00 08 */ addi r3, r1, 8 /* 800EAE88 000E7DC8 C0 22 93 2C */ lfs f1, lbl_80452D2C-_SDA2_BASE_(r2) /* 800EAE8C 000E7DCC C0 42 94 A8 */ lfs f2, lbl_80452EA8-_SDA2_BASE_(r2) -/* 800EAE90 000E7DD0 48 18 58 B1 */ bl cLib_chaseF +/* 800EAE90 000E7DD0 48 18 58 B1 */ bl cLib_chaseF__FPfff /* 800EAE94 000E7DD4 48 00 02 F0 */ b lbl_800EB184 lbl_800EAE98: /* 800EAE98 000E7DD8 7F A3 EB 78 */ mr r3, r29 @@ -119,7 +119,7 @@ lbl_800EAF00: /* 800EAF30 000E7E70 38 61 00 08 */ addi r3, r1, 8 /* 800EAF34 000E7E74 C0 22 93 2C */ lfs f1, lbl_80452D2C-_SDA2_BASE_(r2) /* 800EAF38 000E7E78 C0 42 93 A0 */ lfs f2, lbl_80452DA0-_SDA2_BASE_(r2) -/* 800EAF3C 000E7E7C 48 18 58 05 */ bl cLib_chaseF +/* 800EAF3C 000E7E7C 48 18 58 05 */ bl cLib_chaseF__FPfff /* 800EAF40 000E7E80 48 00 00 1C */ b lbl_800EAF5C lbl_800EAF44: /* 800EAF44 000E7E84 38 61 00 08 */ addi r3, r1, 8 @@ -127,7 +127,7 @@ lbl_800EAF44: /* 800EAF4C 000E7E8C C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800EAF50 000E7E90 C0 62 92 A4 */ lfs f3, lbl_80452CA4-_SDA2_BASE_(r2) /* 800EAF54 000E7E94 C0 82 94 44 */ lfs f4, lbl_80452E44-_SDA2_BASE_(r2) -/* 800EAF58 000E7E98 48 18 4A 25 */ bl cLib_addCalc +/* 800EAF58 000E7E98 48 18 4A 25 */ bl cLib_addCalc__FPfffff lbl_800EAF5C: /* 800EAF5C 000E7E9C C0 01 00 08 */ lfs f0, 8(r1) /* 800EAF60 000E7EA0 D0 1E 00 0C */ stfs f0, 0xc(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800EB2BC.s b/include/d/d_a/d_a_alink/asm/func_800EB2BC.s index d8f447bb54..3666054d1c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EB2BC.s +++ b/include/d/d_a/d_a_alink/asm/func_800EB2BC.s @@ -21,13 +21,13 @@ lbl_800EB304: /* 800EB304 000E8244 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800EB308 000E8248 80 9F 28 58 */ lwz r4, 0x2858(r31) /* 800EB30C 000E824C 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 800EB310 000E8250 48 18 58 F5 */ bl cLib_targetAngleY +/* 800EB310 000E8250 48 18 58 F5 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800EB314 000E8254 7C 64 1B 78 */ mr r4, r3 /* 800EB318 000E8258 38 7F 04 E6 */ addi r3, r31, 0x4e6 /* 800EB31C 000E825C 38 A0 00 02 */ li r5, 2 /* 800EB320 000E8260 38 C0 20 00 */ li r6, 0x2000 /* 800EB324 000E8264 38 E0 08 00 */ li r7, 0x800 -/* 800EB328 000E8268 48 18 52 19 */ bl cLib_addCalcAngleS +/* 800EB328 000E8268 48 18 52 19 */ bl cLib_addCalcAngleS__FPsssss /* 800EB32C 000E826C 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 800EB330 000E8270 28 00 00 03 */ cmplwi r0, 3 /* 800EB334 000E8274 40 82 00 14 */ bne lbl_800EB348 @@ -42,7 +42,7 @@ lbl_800EB348: lbl_800EB354: /* 800EB354 000E8294 A8 7F 2F E2 */ lha r3, 0x2fe2(r31) /* 800EB358 000E8298 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800EB35C 000E829C 48 18 5A C9 */ bl cLib_distanceAngleS +/* 800EB35C 000E829C 48 18 5A C9 */ bl cLib_distanceAngleS__Fss /* 800EB360 000E82A0 7C 7E 1B 78 */ mr r30, r3 /* 800EB364 000E82A4 88 1F 05 6A */ lbz r0, 0x56a(r31) /* 800EB368 000E82A8 28 00 00 1C */ cmplwi r0, 0x1c diff --git a/include/d/d_a/d_a_alink/asm/func_800EB624.s b/include/d/d_a/d_a_alink/asm/func_800EB624.s index 053baec46e..7f57b41654 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EB624.s +++ b/include/d/d_a/d_a_alink/asm/func_800EB624.s @@ -294,13 +294,13 @@ lbl_800EBA1C: /* 800EBA34 000E8974 38 7B 04 D0 */ addi r3, r27, 0x4d0 /* 800EBA38 000E8978 80 9B 28 58 */ lwz r4, 0x2858(r27) /* 800EBA3C 000E897C 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 800EBA40 000E8980 48 18 51 C5 */ bl cLib_targetAngleY +/* 800EBA40 000E8980 48 18 51 C5 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800EBA44 000E8984 7C 64 1B 78 */ mr r4, r3 /* 800EBA48 000E8988 38 7B 04 E6 */ addi r3, r27, 0x4e6 /* 800EBA4C 000E898C 38 A0 00 02 */ li r5, 2 /* 800EBA50 000E8990 38 C0 20 00 */ li r6, 0x2000 /* 800EBA54 000E8994 38 E0 08 00 */ li r7, 0x800 -/* 800EBA58 000E8998 48 18 4A E9 */ bl cLib_addCalcAngleS +/* 800EBA58 000E8998 48 18 4A E9 */ bl cLib_addCalcAngleS__FPsssss /* 800EBA5C 000E899C A8 1B 04 E6 */ lha r0, 0x4e6(r27) /* 800EBA60 000E89A0 B0 1B 04 DE */ sth r0, 0x4de(r27) /* 800EBA64 000E89A4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800EBCE0.s b/include/d/d_a/d_a_alink/asm/func_800EBCE0.s index af2397e051..2327f487fd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EBCE0.s +++ b/include/d/d_a/d_a_alink/asm/func_800EBCE0.s @@ -54,7 +54,7 @@ lbl_800EBD94: /* 800EBD9C 000E8CDC 38 A0 00 02 */ li r5, 2 /* 800EBDA0 000E8CE0 38 C0 04 00 */ li r6, 0x400 /* 800EBDA4 000E8CE4 38 E0 00 40 */ li r7, 0x40 -/* 800EBDA8 000E8CE8 48 18 47 99 */ bl cLib_addCalcAngleS +/* 800EBDA8 000E8CE8 48 18 47 99 */ bl cLib_addCalcAngleS__FPsssss /* 800EBDAC 000E8CEC A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800EBDB0 000E8CF0 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 800EBDB4 000E8CF4 3C 60 80 44 */ lis r3, lbl_80439A20@ha @@ -92,13 +92,13 @@ lbl_800EBE24: /* 800EBE2C 000E8D6C 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800EBE30 000E8D70 80 9F 28 58 */ lwz r4, 0x2858(r31) /* 800EBE34 000E8D74 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 800EBE38 000E8D78 48 18 4D CD */ bl cLib_targetAngleY +/* 800EBE38 000E8D78 48 18 4D CD */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800EBE3C 000E8D7C 7C 64 1B 78 */ mr r4, r3 /* 800EBE40 000E8D80 38 7F 04 E6 */ addi r3, r31, 0x4e6 /* 800EBE44 000E8D84 38 A0 00 02 */ li r5, 2 /* 800EBE48 000E8D88 38 C0 20 00 */ li r6, 0x2000 /* 800EBE4C 000E8D8C 38 E0 08 00 */ li r7, 0x800 -/* 800EBE50 000E8D90 48 18 46 F1 */ bl cLib_addCalcAngleS +/* 800EBE50 000E8D90 48 18 46 F1 */ bl cLib_addCalcAngleS__FPsssss /* 800EBE54 000E8D94 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800EBE58 000E8D98 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 800EBE5C 000E8D9C 48 00 00 C4 */ b lbl_800EBF20 @@ -113,7 +113,7 @@ lbl_800EBE60: /* 800EBE7C 000E8DBC 38 A0 00 02 */ li r5, 2 /* 800EBE80 000E8DC0 38 C0 04 00 */ li r6, 0x400 /* 800EBE84 000E8DC4 38 E0 00 40 */ li r7, 0x40 -/* 800EBE88 000E8DC8 48 18 46 B9 */ bl cLib_addCalcAngleS +/* 800EBE88 000E8DC8 48 18 46 B9 */ bl cLib_addCalcAngleS__FPsssss /* 800EBE8C 000E8DCC A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800EBE90 000E8DD0 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 800EBE94 000E8DD4 3C 60 80 44 */ lis r3, lbl_80439A20@ha @@ -144,13 +144,13 @@ lbl_800EBEF0: /* 800EBEF0 000E8E30 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800EBEF4 000E8E34 80 9F 28 58 */ lwz r4, 0x2858(r31) /* 800EBEF8 000E8E38 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 800EBEFC 000E8E3C 48 18 4D 09 */ bl cLib_targetAngleY +/* 800EBEFC 000E8E3C 48 18 4D 09 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800EBF00 000E8E40 7C 64 1B 78 */ mr r4, r3 /* 800EBF04 000E8E44 38 7F 04 E6 */ addi r3, r31, 0x4e6 /* 800EBF08 000E8E48 38 A0 00 02 */ li r5, 2 /* 800EBF0C 000E8E4C 38 C0 06 00 */ li r6, 0x600 /* 800EBF10 000E8E50 38 E0 00 40 */ li r7, 0x40 -/* 800EBF14 000E8E54 48 18 46 2D */ bl cLib_addCalcAngleS +/* 800EBF14 000E8E54 48 18 46 2D */ bl cLib_addCalcAngleS__FPsssss /* 800EBF18 000E8E58 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800EBF1C 000E8E5C B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_800EBF20: diff --git a/include/d/d_a/d_a_alink/asm/func_800EE918.s b/include/d/d_a/d_a_alink/asm/func_800EE918.s index e311aff14c..36b0670afe 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EE918.s +++ b/include/d/d_a/d_a_alink/asm/func_800EE918.s @@ -80,7 +80,7 @@ lbl_800EE994: /* 800EEA48 000EB988 B0 1E 30 CA */ sth r0, 0x30ca(r30) /* 800EEA4C 000EB98C 48 00 00 4C */ b lbl_800EEA98 lbl_800EEA50: -/* 800EEA50 000EB990 48 17 8E 1D */ bl cM_rnd +/* 800EEA50 000EB990 48 17 8E 1D */ bl cM_rnd__Fv /* 800EEA54 000EB994 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) /* 800EEA58 000EB998 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800EEA5C 000EB99C 40 80 00 18 */ bge lbl_800EEA74 diff --git a/include/d/d_a/d_a_alink/asm/func_800EF050.s b/include/d/d_a/d_a_alink/asm/func_800EF050.s index 4d1a108556..5ebff0aa01 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF050.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF050.s @@ -10,7 +10,7 @@ /* 800EF074 000EBFB4 41 82 00 48 */ beq lbl_800EF0BC /* 800EF078 000EBFB8 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800EF07C 000EBFBC 38 84 05 38 */ addi r4, r4, 0x538 -/* 800EF080 000EBFC0 48 18 1B 85 */ bl cLib_targetAngleY +/* 800EF080 000EBFC0 48 18 1B 85 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800EF084 000EBFC4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800EF088 000EBFC8 7C 00 18 50 */ subf r0, r0, r3 /* 800EF08C 000EBFCC 7C 03 07 34 */ extsh r3, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800EF95C.s b/include/d/d_a/d_a_alink/asm/func_800EF95C.s index 2567258d20..ec548ed153 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF95C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF95C.s @@ -206,12 +206,12 @@ lbl_800EFBA4: /* 800EFC60 000ECBA0 38 61 00 14 */ addi r3, r1, 0x14 /* 800EFC64 000ECBA4 38 81 00 2C */ addi r4, r1, 0x2c /* 800EFC68 000ECBA8 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800EFC6C 000ECBAC 48 17 6E C9 */ bl cXyz_NS___mi +/* 800EFC6C 000ECBAC 48 17 6E C9 */ bl __mi__4cXyzCFRC3Vec /* 800EFC70 000ECBB0 38 61 00 08 */ addi r3, r1, 8 /* 800EFC74 000ECBB4 80 9A 27 F4 */ lwz r4, 0x27f4(r26) /* 800EFC78 000ECBB8 38 84 04 D0 */ addi r4, r4, 0x4d0 /* 800EFC7C 000ECBBC 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800EFC80 000ECBC0 48 17 6E 65 */ bl cXyz_NS___pl +/* 800EFC80 000ECBC0 48 17 6E 65 */ bl __pl__4cXyzCFRC3Vec /* 800EFC84 000ECBC4 C0 01 00 08 */ lfs f0, 8(r1) /* 800EFC88 000ECBC8 D0 1A 04 D0 */ stfs f0, 0x4d0(r26) /* 800EFC8C 000ECBCC C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800EFDC4.s b/include/d/d_a/d_a_alink/asm/func_800EFDC4.s index bb1560fc39..ed520fbc8c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EFDC4.s +++ b/include/d/d_a/d_a_alink/asm/func_800EFDC4.s @@ -18,7 +18,7 @@ lbl_800EFDF8: /* 800EFE04 000ECD44 38 61 00 10 */ addi r3, r1, 0x10 /* 800EFE08 000ECD48 38 9D 04 D0 */ addi r4, r29, 0x4d0 /* 800EFE0C 000ECD4C 38 BC 37 C8 */ addi r5, r28, 0x37c8 -/* 800EFE10 000ECD50 48 17 6D 25 */ bl cXyz_NS___mi +/* 800EFE10 000ECD50 48 17 6D 25 */ bl __mi__4cXyzCFRC3Vec /* 800EFE14 000ECD54 38 7C 04 D0 */ addi r3, r28, 0x4d0 /* 800EFE18 000ECD58 38 81 00 10 */ addi r4, r1, 0x10 /* 800EFE1C 000ECD5C 7C 65 1B 78 */ mr r5, r3 @@ -153,7 +153,7 @@ lbl_800EFFB4: /* 800EFFFC 000ECF3C 38 A0 00 04 */ li r5, 4 /* 800F0000 000ECF40 38 C0 07 D0 */ li r6, 0x7d0 /* 800F0004 000ECF44 38 E0 01 90 */ li r7, 0x190 -/* 800F0008 000ECF48 48 18 05 39 */ bl cLib_addCalcAngleS +/* 800F0008 000ECF48 48 18 05 39 */ bl cLib_addCalcAngleS__FPsssss /* 800F000C 000ECF4C 48 00 00 D4 */ b lbl_800F00E0 lbl_800F0010: /* 800F0010 000ECF50 38 7C 04 E4 */ addi r3, r28, 0x4e4 @@ -161,7 +161,7 @@ lbl_800F0010: /* 800F0018 000ECF58 38 A0 00 04 */ li r5, 4 /* 800F001C 000ECF5C 38 C0 07 D0 */ li r6, 0x7d0 /* 800F0020 000ECF60 38 E0 01 90 */ li r7, 0x190 -/* 800F0024 000ECF64 48 18 05 1D */ bl cLib_addCalcAngleS +/* 800F0024 000ECF64 48 18 05 1D */ bl cLib_addCalcAngleS__FPsssss /* 800F0028 000ECF68 48 00 00 B8 */ b lbl_800F00E0 lbl_800F002C: /* 800F002C 000ECF6C C0 02 94 94 */ lfs f0, lbl_80452E94-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800F038C.s b/include/d/d_a/d_a_alink/asm/func_800F038C.s index e2bf44c55f..d98ece3773 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F038C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F038C.s @@ -100,7 +100,7 @@ lbl_800F04F0: /* 800F04FC 000ED43C 4B FB CA B5 */ bl daAlink_c_NS_setSingleAnimeBaseMorf /* 800F0500 000ED440 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 800F0504 000ED444 38 81 00 08 */ addi r4, r1, 8 -/* 800F0508 000ED448 48 17 78 21 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800F0508 000ED448 48 17 78 21 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800F050C 000ED44C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F0510 000ED450 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F0514 000ED454 38 63 0F 38 */ addi r3, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_800F0620.s b/include/d/d_a/d_a_alink/asm/func_800F0620.s index f7a870175e..329ad5d56a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F0620.s +++ b/include/d/d_a/d_a_alink/asm/func_800F0620.s @@ -11,7 +11,7 @@ /* 800F0648 000ED588 38 61 00 14 */ addi r3, r1, 0x14 /* 800F064C 000ED58C 38 9D 04 D0 */ addi r4, r29, 0x4d0 /* 800F0650 000ED590 38 BE 37 D4 */ addi r5, r30, 0x37d4 -/* 800F0654 000ED594 48 17 64 E1 */ bl cXyz_NS___mi +/* 800F0654 000ED594 48 17 64 E1 */ bl __mi__4cXyzCFRC3Vec /* 800F0658 000ED598 38 7E 04 D0 */ addi r3, r30, 0x4d0 /* 800F065C 000ED59C 38 81 00 14 */ addi r4, r1, 0x14 /* 800F0660 000ED5A0 7C 65 1B 78 */ mr r5, r3 @@ -37,7 +37,7 @@ lbl_800F06A4: /* 800F06AC 000ED5EC 38 A0 00 04 */ li r5, 4 /* 800F06B0 000ED5F0 38 C0 07 D0 */ li r6, 0x7d0 /* 800F06B4 000ED5F4 38 E0 01 90 */ li r7, 0x190 -/* 800F06B8 000ED5F8 48 17 FE 89 */ bl cLib_addCalcAngleS +/* 800F06B8 000ED5F8 48 17 FE 89 */ bl cLib_addCalcAngleS__FPsssss /* 800F06BC 000ED5FC C0 3F 00 10 */ lfs f1, 0x10(r31) /* 800F06C0 000ED600 C0 02 93 BC */ lfs f0, lbl_80452DBC-_SDA2_BASE_(r2) /* 800F06C4 000ED604 FC 01 00 40 */ fcmpo cr0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F0AA4.s b/include/d/d_a/d_a_alink/asm/func_800F0AA4.s index 28f50cb9fc..909bfc33ca 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F0AA4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F0AA4.s @@ -66,7 +66,7 @@ lbl_800F0B70: /* 800F0B90 000EDAD0 41 82 00 C0 */ beq lbl_800F0C50 /* 800F0B94 000EDAD4 38 7D 04 D0 */ addi r3, r29, 0x4d0 /* 800F0B98 000EDAD8 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 800F0B9C 000EDADC 48 18 00 69 */ bl cLib_targetAngleY +/* 800F0B9C 000EDADC 48 18 00 69 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800F0BA0 000EDAE0 A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 800F0BA4 000EDAE4 7C 00 18 50 */ subf r0, r0, r3 /* 800F0BA8 000EDAE8 7C 03 07 34 */ extsh r3, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F13D8.s b/include/d/d_a/d_a_alink/asm/func_800F13D8.s index c4e7488a34..e7d9da6459 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F13D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F13D8.s @@ -34,7 +34,7 @@ lbl_800F144C: /* 800F1450 000EE390 41 82 00 38 */ beq lbl_800F1488 /* 800F1454 000EE394 38 7E 04 D0 */ addi r3, r30, 0x4d0 /* 800F1458 000EE398 38 84 05 38 */ addi r4, r4, 0x538 -/* 800F145C 000EE39C 48 17 F7 A9 */ bl cLib_targetAngleY +/* 800F145C 000EE39C 48 17 F7 A9 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800F1460 000EE3A0 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800F1464 000EE3A4 7C 00 18 50 */ subf r0, r0, r3 /* 800F1468 000EE3A8 7C 00 07 34 */ extsh r0, r0 @@ -60,7 +60,7 @@ lbl_800F14A4: lbl_800F14AC: /* 800F14AC 000EE3EC 2C 1D 00 03 */ cmpwi r29, 3 /* 800F14B0 000EE3F0 40 82 00 24 */ bne lbl_800F14D4 -/* 800F14B4 000EE3F4 48 17 63 B9 */ bl cM_rnd +/* 800F14B4 000EE3F4 48 17 63 B9 */ bl cM_rnd__Fv /* 800F14B8 000EE3F8 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) /* 800F14BC 000EE3FC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800F14C0 000EE400 40 80 00 0C */ bge lbl_800F14CC @@ -72,7 +72,7 @@ lbl_800F14CC: lbl_800F14D4: /* 800F14D4 000EE414 2C 1D 00 02 */ cmpwi r29, 2 /* 800F14D8 000EE418 40 82 00 24 */ bne lbl_800F14FC -/* 800F14DC 000EE41C 48 17 63 91 */ bl cM_rnd +/* 800F14DC 000EE41C 48 17 63 91 */ bl cM_rnd__Fv /* 800F14E0 000EE420 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) /* 800F14E4 000EE424 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800F14E8 000EE428 40 80 00 0C */ bge lbl_800F14F4 @@ -83,7 +83,7 @@ lbl_800F14F4: /* 800F14F8 000EE438 48 00 00 2C */ b lbl_800F1524 lbl_800F14FC: /* 800F14FC 000EE43C C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800F1500 000EE440 48 17 64 55 */ bl cM_rndF +/* 800F1500 000EE440 48 17 64 55 */ bl cM_rndF__Ff /* 800F1504 000EE444 FC 00 08 1E */ fctiwz f0, f1 /* 800F1508 000EE448 D8 01 00 08 */ stfd f0, 8(r1) /* 800F150C 000EE44C 80 61 00 0C */ lwz r3, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F1BA4.s b/include/d/d_a/d_a_alink/asm/func_800F1BA4.s index a9f3578805..20d2399e8a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F1BA4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F1BA4.s @@ -89,7 +89,7 @@ lbl_800F1CE0: /* 800F1CEC 000EEC2C 38 7E 12 20 */ addi r3, r30, 0x1220 /* 800F1CF0 000EEC30 C0 3E 34 78 */ lfs f1, 0x3478(r30) /* 800F1CF4 000EEC34 C0 42 93 78 */ lfs f2, lbl_80452D78-_SDA2_BASE_(r2) -/* 800F1CF8 000EEC38 48 17 EA 49 */ bl cLib_chaseF +/* 800F1CF8 000EEC38 48 17 EA 49 */ bl cLib_chaseF__FPfff lbl_800F1CFC: /* 800F1CFC 000EEC3C 38 60 00 01 */ li r3, 1 lbl_800F1D00: diff --git a/include/d/d_a/d_a_alink/asm/func_800F1D18.s b/include/d/d_a/d_a_alink/asm/func_800F1D18.s index e35c2f4a7b..3a9b1f5635 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F1D18.s +++ b/include/d/d_a/d_a_alink/asm/func_800F1D18.s @@ -94,7 +94,7 @@ lbl_800F1E1C: /* 800F1E80 000EEDC0 AB A3 00 28 */ lha r29, 0x28(r3) /* 800F1E84 000EEDC4 7C 1D 00 D0 */ neg r0, r29 /* 800F1E88 000EEDC8 7C 1E 07 34 */ extsh r30, r0 -/* 800F1E8C 000EEDCC 48 17 57 E9 */ bl cM_atan2s +/* 800F1E8C 000EEDCC 48 17 57 E9 */ bl cM_atan2s__Fff /* 800F1E90 000EEDD0 7C 64 07 34 */ extsh r4, r3 /* 800F1E94 000EEDD4 7C 04 F0 00 */ cmpw r4, r30 /* 800F1E98 000EEDD8 40 80 00 08 */ bge lbl_800F1EA0 @@ -126,7 +126,7 @@ lbl_800F1EB4: lbl_800F1EF4: /* 800F1EF4 000EEE34 C0 21 00 08 */ lfs f1, 8(r1) /* 800F1EF8 000EEE38 FC 40 10 50 */ fneg f2, f2 -/* 800F1EFC 000EEE3C 48 17 57 79 */ bl cM_atan2s +/* 800F1EFC 000EEE3C 48 17 57 79 */ bl cM_atan2s__Fff /* 800F1F00 000EEE40 7C 64 07 34 */ extsh r4, r3 /* 800F1F04 000EEE44 7C 04 F0 00 */ cmpw r4, r30 /* 800F1F08 000EEE48 40 80 00 08 */ bge lbl_800F1F10 @@ -144,7 +144,7 @@ lbl_800F1F24: /* 800F1F2C 000EEE6C FC 20 00 50 */ fneg f1, f0 /* 800F1F30 000EEE70 C0 01 00 10 */ lfs f0, 0x10(r1) /* 800F1F34 000EEE74 FC 40 00 50 */ fneg f2, f0 -/* 800F1F38 000EEE78 48 17 57 3D */ bl cM_atan2s +/* 800F1F38 000EEE78 48 17 57 3D */ bl cM_atan2s__Fff /* 800F1F3C 000EEE7C 4B FC 15 59 */ bl daAlink_c_NS_getDirectionFromAngle /* 800F1F40 000EEE80 7C 60 1B 78 */ mr r0, r3 /* 800F1F44 000EEE84 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800F2028.s b/include/d/d_a/d_a_alink/asm/func_800F2028.s index 25814b1a65..e356f60614 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2028.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2028.s @@ -24,7 +24,7 @@ lbl_800F2058: /* 800F2080 000EEFC0 EC 00 08 28 */ fsubs f0, f0, f1 /* 800F2084 000EEFC4 EC 02 00 28 */ fsubs f0, f2, f0 /* 800F2088 000EEFC8 EC 23 00 32 */ fmuls f1, f3, f0 -/* 800F208C 000EEFCC 48 17 55 59 */ bl cM_rad2s +/* 800F208C 000EEFCC 48 17 55 59 */ bl cM_rad2s__Ff /* 800F2090 000EEFD0 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 800F2094 000EEFD4 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800F2098 000EEFD8 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l diff --git a/include/d/d_a/d_a_alink/asm/func_800F2EE0.s b/include/d/d_a/d_a_alink/asm/func_800F2EE0.s index 7c1a0e87ba..3c9569d1ed 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2EE0.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2EE0.s @@ -22,7 +22,7 @@ /* 800F2F34 000EFE74 B0 1F 30 10 */ sth r0, 0x3010(r31) /* 800F2F38 000EFE78 B0 1F 30 12 */ sth r0, 0x3012(r31) /* 800F2F3C 000EFE7C C0 22 93 18 */ lfs f1, lbl_80452D18-_SDA2_BASE_(r2) -/* 800F2F40 000EFE80 48 17 4A 15 */ bl cM_rndF +/* 800F2F40 000EFE80 48 17 4A 15 */ bl cM_rndF__Ff /* 800F2F44 000EFE84 C0 02 93 B8 */ lfs f0, lbl_80452DB8-_SDA2_BASE_(r2) /* 800F2F48 000EFE88 EC 00 08 28 */ fsubs f0, f0, f1 /* 800F2F4C 000EFE8C D0 1F 34 78 */ stfs f0, 0x3478(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F2F98.s b/include/d/d_a/d_a_alink/asm/func_800F2F98.s index 8e1d19e978..157d35d006 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2F98.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2F98.s @@ -183,7 +183,7 @@ lbl_800F31E8: /* 800F3240 000F0180 C0 02 93 A8 */ lfs f0, lbl_80452DA8-_SDA2_BASE_(r2) /* 800F3244 000F0184 EC 1F 00 28 */ fsubs f0, f31, f0 /* 800F3248 000F0188 EC 21 00 32 */ fmuls f1, f1, f0 -/* 800F324C 000F018C 48 17 43 99 */ bl cM_rad2s +/* 800F324C 000F018C 48 17 43 99 */ bl cM_rad2s__Ff /* 800F3250 000F0190 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 800F3254 000F0194 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800F3258 000F0198 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l @@ -203,7 +203,7 @@ lbl_800F31E8: /* 800F3290 000F01D0 C0 22 95 04 */ lfs f1, lbl_80452F04-_SDA2_BASE_(r2) /* 800F3294 000F01D4 EC 1F 18 28 */ fsubs f0, f31, f3 /* 800F3298 000F01D8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 800F329C 000F01DC 48 17 43 49 */ bl cM_rad2s +/* 800F329C 000F01DC 48 17 43 49 */ bl cM_rad2s__Ff /* 800F32A0 000F01E0 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 800F32A4 000F01E4 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800F32A8 000F01E8 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l @@ -222,7 +222,7 @@ lbl_800F31E8: /* 800F32DC 000F021C 2C 03 00 00 */ cmpwi r3, 0 /* 800F32E0 000F0220 41 82 00 18 */ beq lbl_800F32F8 /* 800F32E4 000F0224 C0 22 93 18 */ lfs f1, lbl_80452D18-_SDA2_BASE_(r2) -/* 800F32E8 000F0228 48 17 46 6D */ bl cM_rndF +/* 800F32E8 000F0228 48 17 46 6D */ bl cM_rndF__Ff /* 800F32EC 000F022C C0 02 93 B8 */ lfs f0, lbl_80452DB8-_SDA2_BASE_(r2) /* 800F32F0 000F0230 EC 00 08 28 */ fsubs f0, f0, f1 /* 800F32F4 000F0234 D0 1E 34 78 */ stfs f0, 0x3478(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800F3430.s b/include/d/d_a/d_a_alink/asm/func_800F3430.s index fa2e0108ee..08c286caa9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F3430.s +++ b/include/d/d_a/d_a_alink/asm/func_800F3430.s @@ -23,7 +23,7 @@ lbl_800F3478: /* 800F3484 000F03C4 7F A3 EB 78 */ mr r3, r29 /* 800F3488 000F03C8 7F C4 F3 78 */ mr r4, r30 /* 800F348C 000F03CC 4B FE 40 69 */ bl daAlink_c_NS_getDamageVec -/* 800F3490 000F03D0 48 17 3C 99 */ bl cXyz_NS_atan2sX_Z +/* 800F3490 000F03D0 48 17 3C 99 */ bl atan2sX_Z__4cXyzCFv /* 800F3494 000F03D4 A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 800F3498 000F03D8 7C 00 18 50 */ subf r0, r0, r3 /* 800F349C 000F03DC 7C 00 07 35 */ extsh. r0, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F38E8.s b/include/d/d_a/d_a_alink/asm/func_800F38E8.s index b219ea20e9..07dccdbf6c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F38E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F38E8.s @@ -17,7 +17,7 @@ /* 800F3928 000F0868 B0 1F 30 10 */ sth r0, 0x3010(r31) /* 800F392C 000F086C B0 1F 30 12 */ sth r0, 0x3012(r31) /* 800F3930 000F0870 C0 22 95 0C */ lfs f1, lbl_80452F0C-_SDA2_BASE_(r2) -/* 800F3934 000F0874 48 17 40 21 */ bl cM_rndF +/* 800F3934 000F0874 48 17 40 21 */ bl cM_rndF__Ff /* 800F3938 000F0878 C0 02 95 08 */ lfs f0, lbl_80452F08-_SDA2_BASE_(r2) /* 800F393C 000F087C EC 00 08 28 */ fsubs f0, f0, f1 /* 800F3940 000F0880 D0 1F 34 78 */ stfs f0, 0x3478(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F3998.s b/include/d/d_a/d_a_alink/asm/func_800F3998.s index 8ff2e05ee3..0deda4d267 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F3998.s +++ b/include/d/d_a/d_a_alink/asm/func_800F3998.s @@ -61,7 +61,7 @@ lbl_800F3A2C: /* 800F3A78 000F09B8 C0 02 93 F8 */ lfs f0, lbl_80452DF8-_SDA2_BASE_(r2) /* 800F3A7C 000F09BC EC 01 00 28 */ fsubs f0, f1, f0 /* 800F3A80 000F09C0 EC 22 00 32 */ fmuls f1, f2, f0 -/* 800F3A84 000F09C4 48 17 3B 61 */ bl cM_rad2s +/* 800F3A84 000F09C4 48 17 3B 61 */ bl cM_rad2s__Ff /* 800F3A88 000F09C8 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 800F3A8C 000F09CC 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800F3A90 000F09D0 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l @@ -91,7 +91,7 @@ lbl_800F3A2C: /* 800F3AF0 000F0A30 C0 02 93 FC */ lfs f0, lbl_80452DFC-_SDA2_BASE_(r2) /* 800F3AF4 000F0A34 EC 01 00 28 */ fsubs f0, f1, f0 /* 800F3AF8 000F0A38 EC 22 00 32 */ fmuls f1, f2, f0 -/* 800F3AFC 000F0A3C 48 17 3A E9 */ bl cM_rad2s +/* 800F3AFC 000F0A3C 48 17 3A E9 */ bl cM_rad2s__Ff /* 800F3B00 000F0A40 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 800F3B04 000F0A44 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800F3B08 000F0A48 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l @@ -111,7 +111,7 @@ lbl_800F3A2C: /* 800F3B40 000F0A80 2C 03 00 00 */ cmpwi r3, 0 /* 800F3B44 000F0A84 41 82 00 50 */ beq lbl_800F3B94 /* 800F3B48 000F0A88 C0 22 95 0C */ lfs f1, lbl_80452F0C-_SDA2_BASE_(r2) -/* 800F3B4C 000F0A8C 48 17 3E 09 */ bl cM_rndF +/* 800F3B4C 000F0A8C 48 17 3E 09 */ bl cM_rndF__Ff /* 800F3B50 000F0A90 C0 02 95 08 */ lfs f0, lbl_80452F08-_SDA2_BASE_(r2) /* 800F3B54 000F0A94 EC 00 08 28 */ fsubs f0, f0, f1 /* 800F3B58 000F0A98 D0 1E 34 78 */ stfs f0, 0x3478(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800F4140.s b/include/d/d_a/d_a_alink/asm/func_800F4140.s index 8594f4c47e..3621735f13 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4140.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4140.s @@ -53,7 +53,7 @@ lbl_800F41E0: lbl_800F4200: /* 800F4200 000F1140 FC 20 E8 50 */ fneg f1, f29 /* 800F4204 000F1144 FC 40 E0 90 */ fmr f2, f28 -/* 800F4208 000F1148 48 17 34 6D */ bl cM_atan2s +/* 800F4208 000F1148 48 17 34 6D */ bl cM_atan2s__Fff /* 800F420C 000F114C 7C 63 07 34 */ extsh r3, r3 /* 800F4210 000F1150 48 27 0E C1 */ bl func_803650D0 /* 800F4214 000F1154 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) @@ -186,13 +186,13 @@ lbl_800F43F8: /* 800F43FC 000F133C C0 42 94 A8 */ lfs f2, lbl_80452EA8-_SDA2_BASE_(r2) /* 800F4400 000F1340 C0 62 94 08 */ lfs f3, lbl_80452E08-_SDA2_BASE_(r2) /* 800F4404 000F1344 C0 82 93 88 */ lfs f4, lbl_80452D88-_SDA2_BASE_(r2) -/* 800F4408 000F1348 48 17 B5 75 */ bl cLib_addCalc +/* 800F4408 000F1348 48 17 B5 75 */ bl cLib_addCalc__FPfffff /* 800F440C 000F134C 38 61 00 0C */ addi r3, r1, 0xc /* 800F4410 000F1350 FC 20 E0 90 */ fmr f1, f28 /* 800F4414 000F1354 C0 42 94 A8 */ lfs f2, lbl_80452EA8-_SDA2_BASE_(r2) /* 800F4418 000F1358 C0 62 94 08 */ lfs f3, lbl_80452E08-_SDA2_BASE_(r2) /* 800F441C 000F135C C0 82 93 88 */ lfs f4, lbl_80452D88-_SDA2_BASE_(r2) -/* 800F4420 000F1360 48 17 B5 5D */ bl cLib_addCalc +/* 800F4420 000F1360 48 17 B5 5D */ bl cLib_addCalc__FPfffff /* 800F4424 000F1364 C0 01 00 10 */ lfs f0, 0x10(r1) /* 800F4428 000F1368 D0 1F 1F E0 */ stfs f0, 0x1fe0(r31) /* 800F442C 000F136C C0 01 00 0C */ lfs f0, 0xc(r1) @@ -200,7 +200,7 @@ lbl_800F43F8: /* 800F4434 000F1374 38 61 00 08 */ addi r3, r1, 8 /* 800F4438 000F1378 FC 20 F0 90 */ fmr f1, f30 /* 800F443C 000F137C C0 42 93 A0 */ lfs f2, lbl_80452DA0-_SDA2_BASE_(r2) -/* 800F4440 000F1380 48 17 C3 01 */ bl cLib_chaseF +/* 800F4440 000F1380 48 17 C3 01 */ bl cLib_chaseF__FPfff /* 800F4444 000F1384 7F E3 FB 78 */ mr r3, r31 /* 800F4448 000F1388 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 800F444C 000F138C C0 01 00 08 */ lfs f0, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F459C.s b/include/d/d_a/d_a_alink/asm/func_800F459C.s index 6492bf7d7c..fd9e65b13f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F459C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F459C.s @@ -56,13 +56,13 @@ lbl_800F4658: /* 800F466C 000F15AC 38 A0 00 05 */ li r5, 5 /* 800F4670 000F15B0 38 C0 10 00 */ li r6, 0x1000 /* 800F4674 000F15B4 38 E0 02 00 */ li r7, 0x200 -/* 800F4678 000F15B8 48 17 BE C9 */ bl cLib_addCalcAngleS +/* 800F4678 000F15B8 48 17 BE C9 */ bl cLib_addCalcAngleS__FPsssss /* 800F467C 000F15BC 38 7E 04 E8 */ addi r3, r30, 0x4e8 /* 800F4680 000F15C0 38 80 00 00 */ li r4, 0 /* 800F4684 000F15C4 38 A0 00 05 */ li r5, 5 /* 800F4688 000F15C8 38 C0 10 00 */ li r6, 0x1000 /* 800F468C 000F15CC 38 E0 02 00 */ li r7, 0x200 -/* 800F4690 000F15D0 48 17 BE B1 */ bl cLib_addCalcAngleS +/* 800F4690 000F15D0 48 17 BE B1 */ bl cLib_addCalcAngleS__FPsssss /* 800F4694 000F15D4 48 00 00 2C */ b lbl_800F46C0 lbl_800F4698: /* 800F4698 000F15D8 A8 1E 04 E8 */ lha r0, 0x4e8(r30) @@ -83,7 +83,7 @@ lbl_800F46C0: /* 800F46D0 000F1610 38 A0 00 05 */ li r5, 5 /* 800F46D4 000F1614 38 C0 00 40 */ li r6, 0x40 /* 800F46D8 000F1618 38 E0 00 10 */ li r7, 0x10 -/* 800F46DC 000F161C 48 17 BE 65 */ bl cLib_addCalcAngleS +/* 800F46DC 000F161C 48 17 BE 65 */ bl cLib_addCalcAngleS__FPsssss /* 800F46E0 000F1620 C0 3F 05 2C */ lfs f1, 0x52c(r31) /* 800F46E4 000F1624 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F46E8 000F1628 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -143,7 +143,7 @@ lbl_800F478C: /* 800F47A8 000F16E8 38 7E 33 F0 */ addi r3, r30, 0x33f0 /* 800F47AC 000F16EC FC 20 F8 90 */ fmr f1, f31 /* 800F47B0 000F16F0 C0 42 93 F8 */ lfs f2, lbl_80452DF8-_SDA2_BASE_(r2) -/* 800F47B4 000F16F4 48 17 BF 8D */ bl cLib_chaseF +/* 800F47B4 000F16F4 48 17 BF 8D */ bl cLib_chaseF__FPfff /* 800F47B8 000F16F8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 800F47BC 000F16FC CB E1 00 20 */ lfd f31, 0x20(r1) /* 800F47C0 000F1700 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_800F4DF8.s b/include/d/d_a/d_a_alink/asm/func_800F4DF8.s index 0d6b24a5b6..2d4758615a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4DF8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4DF8.s @@ -82,7 +82,7 @@ lbl_800F4EEC: lbl_800F4F38: /* 800F4F38 000F1E78 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 800F4F3C 000F1E7C 38 81 00 14 */ addi r4, r1, 0x14 -/* 800F4F40 000F1E80 48 17 2D E9 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800F4F40 000F1E80 48 17 2D E9 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800F4F44 000F1E84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F4F48 000F1E88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F4F4C 000F1E8C 38 63 0F 38 */ addi r3, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_800F5A1C.s b/include/d/d_a/d_a_alink/asm/func_800F5A1C.s index fcc9ded65b..0929ce6d6d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F5A1C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F5A1C.s @@ -81,7 +81,7 @@ lbl_800F5B38: /* 800F5B40 000F2A80 38 61 00 08 */ addi r3, r1, 8 /* 800F5B44 000F2A84 FC 20 F8 90 */ fmr f1, f31 /* 800F5B48 000F2A88 C0 42 93 A0 */ lfs f2, lbl_80452DA0-_SDA2_BASE_(r2) -/* 800F5B4C 000F2A8C 48 17 AB F5 */ bl cLib_chaseF +/* 800F5B4C 000F2A8C 48 17 AB F5 */ bl cLib_chaseF__FPfff /* 800F5B50 000F2A90 C0 01 00 08 */ lfs f0, 8(r1) /* 800F5B54 000F2A94 D0 1E 00 0C */ stfs f0, 0xc(r30) /* 800F5B58 000F2A98 A8 1D 30 08 */ lha r0, 0x3008(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800F6874.s b/include/d/d_a/d_a_alink/asm/func_800F6874.s index 3c8288efca..529e36f678 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6874.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6874.s @@ -68,7 +68,7 @@ lbl_800F6958: /* 800F6968 000F38A8 41 82 00 54 */ beq lbl_800F69BC /* 800F696C 000F38AC 38 7F 38 34 */ addi r3, r31, 0x3834 /* 800F6970 000F38B0 38 84 05 38 */ addi r4, r4, 0x538 -/* 800F6974 000F38B4 48 17 A2 91 */ bl cLib_targetAngleY +/* 800F6974 000F38B4 48 17 A2 91 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 800F6978 000F38B8 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800F697C 000F38BC 7C 00 18 50 */ subf r0, r0, r3 /* 800F6980 000F38C0 7C 03 07 34 */ extsh r3, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F7814.s b/include/d/d_a/d_a_alink/asm/func_800F7814.s index 3b1be16e2d..08dbfd5e38 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7814.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7814.s @@ -64,7 +64,7 @@ lbl_800F78DC: /* 800F78FC 000F483C A8 A7 00 18 */ lha r5, 0x18(r7) /* 800F7900 000F4840 A8 C7 00 14 */ lha r6, 0x14(r7) /* 800F7904 000F4844 A8 E7 00 16 */ lha r7, 0x16(r7) -/* 800F7908 000F4848 48 17 8C 39 */ bl cLib_addCalcAngleS +/* 800F7908 000F4848 48 17 8C 39 */ bl cLib_addCalcAngleS__FPsssss /* 800F790C 000F484C A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800F7910 000F4850 B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_800F7914: diff --git a/include/d/d_a/d_a_alink/asm/func_800F7C74.s b/include/d/d_a/d_a_alink/asm/func_800F7C74.s index 71ffa968f8..f0edb12906 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7C74.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7C74.s @@ -12,7 +12,7 @@ lbl_800F7CA0: /* 800F7CA0 000F4BE0 C0 02 95 34 */ lfs f0, lbl_80452F34-_SDA2_BASE_(r2) /* 800F7CA4 000F4BE4 EC 20 00 72 */ fmuls f1, f0, f1 -/* 800F7CA8 000F4BE8 48 16 F9 3D */ bl cM_rad2s +/* 800F7CA8 000F4BE8 48 16 F9 3D */ bl cM_rad2s__Ff /* 800F7CAC 000F4BEC 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 800F7CB0 000F4BF0 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800F7CB4 000F4BF4 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l diff --git a/include/d/d_a/d_a_alink/asm/func_800F7CE8.s b/include/d/d_a/d_a_alink/asm/func_800F7CE8.s index ca26d2f205..968049934f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7CE8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7CE8.s @@ -13,7 +13,7 @@ /* 800F7D18 000F4C58 80 63 5D 74 */ lwz r3, 0x5d74(r3) /* 800F7D1C 000F4C5C A8 63 02 32 */ lha r3, 0x232(r3) /* 800F7D20 000F4C60 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800F7D24 000F4C64 48 17 91 01 */ bl cLib_distanceAngleS +/* 800F7D24 000F4C64 48 17 91 01 */ bl cLib_distanceAngleS__Fss /* 800F7D28 000F4C68 38 00 40 00 */ li r0, 0x4000 /* 800F7D2C 000F4C6C 7C 60 02 78 */ xor r0, r3, r0 /* 800F7D30 000F4C70 7C 04 0E 70 */ srawi r4, r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800F7E48.s b/include/d/d_a/d_a_alink/asm/func_800F7E48.s index 9c40d96ad1..7dc8fb0135 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7E48.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7E48.s @@ -96,11 +96,11 @@ lbl_800F7F8C: /* 800F7FB8 000F4EF8 38 61 00 1C */ addi r3, r1, 0x1c /* 800F7FBC 000F4EFC 7F A4 EB 78 */ mr r4, r29 /* 800F7FC0 000F4F00 C0 22 93 14 */ lfs f1, lbl_80452D14-_SDA2_BASE_(r2) -/* 800F7FC4 000F4F04 48 16 EB C1 */ bl cXyz_NS___ml +/* 800F7FC4 000F4F04 48 16 EB C1 */ bl __ml__4cXyzCFf /* 800F7FC8 000F4F08 38 61 00 10 */ addi r3, r1, 0x10 /* 800F7FCC 000F4F0C 38 81 00 1C */ addi r4, r1, 0x1c /* 800F7FD0 000F4F10 38 A1 00 4C */ addi r5, r1, 0x4c -/* 800F7FD4 000F4F14 48 16 EB 61 */ bl cXyz_NS___mi +/* 800F7FD4 000F4F14 48 16 EB 61 */ bl __mi__4cXyzCFRC3Vec /* 800F7FD8 000F4F18 C0 01 00 10 */ lfs f0, 0x10(r1) /* 800F7FDC 000F4F1C D0 01 00 40 */ stfs f0, 0x40(r1) /* 800F7FE0 000F4F20 C0 01 00 14 */ lfs f0, 0x14(r1) @@ -189,7 +189,7 @@ lbl_800F80E4: /* 800F8120 000F5060 38 61 00 64 */ addi r3, r1, 0x64 /* 800F8124 000F5064 38 81 00 6C */ addi r4, r1, 0x6c /* 800F8128 000F5068 38 A1 00 0C */ addi r5, r1, 0xc -/* 800F812C 000F506C 48 17 05 01 */ bl cM3d_Len2dSqPntAndSegLine +/* 800F812C 000F506C 48 17 05 01 */ bl cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf /* 800F8130 000F5070 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F8134 000F5074 41 82 00 40 */ beq lbl_800F8174 /* 800F8138 000F5078 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F81C0.s b/include/d/d_a/d_a_alink/asm/func_800F81C0.s index 68cc19238e..eee19f1b01 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F81C0.s +++ b/include/d/d_a/d_a_alink/asm/func_800F81C0.s @@ -70,7 +70,7 @@ lbl_800F82C4: /* 800F82C4 000F5204 38 61 00 24 */ addi r3, r1, 0x24 /* 800F82C8 000F5208 7F A4 EB 78 */ mr r4, r29 /* 800F82CC 000F520C 38 B9 1B 78 */ addi r5, r25, 0x1b78 -/* 800F82D0 000F5210 48 16 E8 65 */ bl cXyz_NS___mi +/* 800F82D0 000F5210 48 16 E8 65 */ bl __mi__4cXyzCFRC3Vec /* 800F82D4 000F5214 C0 01 00 24 */ lfs f0, 0x24(r1) /* 800F82D8 000F5218 D0 01 00 30 */ stfs f0, 0x30(r1) /* 800F82DC 000F521C C0 01 00 28 */ lfs f0, 0x28(r1) @@ -78,10 +78,10 @@ lbl_800F82C4: /* 800F82E4 000F5224 C0 01 00 2C */ lfs f0, 0x2c(r1) /* 800F82E8 000F5228 D0 01 00 38 */ stfs f0, 0x38(r1) /* 800F82EC 000F522C 38 61 00 50 */ addi r3, r1, 0x50 -/* 800F82F0 000F5230 48 16 EE 39 */ bl cXyz_NS_atan2sX_Z +/* 800F82F0 000F5230 48 16 EE 39 */ bl atan2sX_Z__4cXyzCFv /* 800F82F4 000F5234 7C 7D 1B 78 */ mr r29, r3 /* 800F82F8 000F5238 38 61 00 30 */ addi r3, r1, 0x30 -/* 800F82FC 000F523C 48 16 EE 2D */ bl cXyz_NS_atan2sX_Z +/* 800F82FC 000F523C 48 16 EE 2D */ bl atan2sX_Z__4cXyzCFv /* 800F8300 000F5240 7F BE 07 34 */ extsh r30, r29 /* 800F8304 000F5244 7C 7D 07 34 */ extsh r29, r3 /* 800F8308 000F5248 3C 7D 00 01 */ addis r3, r29, 1 @@ -211,7 +211,7 @@ lbl_800F8488: /* 800F84C8 000F5408 38 A1 00 3C */ addi r5, r1, 0x3c /* 800F84CC 000F540C 4B F7 C2 79 */ bl cBgS_NS_GetTriPla /* 800F84D0 000F5410 38 61 00 3C */ addi r3, r1, 0x3c -/* 800F84D4 000F5414 48 16 EC 55 */ bl cXyz_NS_atan2sX_Z +/* 800F84D4 000F5414 48 16 EC 55 */ bl atan2sX_Z__4cXyzCFv /* 800F84D8 000F5418 B0 79 31 1E */ sth r3, 0x311e(r25) /* 800F84DC 000F541C 38 79 1B 5C */ addi r3, r25, 0x1b5c /* 800F84E0 000F5420 4B FD F2 89 */ bl daAlink_c_NS_checkIcePolygonDamage @@ -253,7 +253,7 @@ lbl_800F855C: /* 800F855C 000F549C 38 61 00 18 */ addi r3, r1, 0x18 /* 800F8560 000F54A0 7F A4 EB 78 */ mr r4, r29 /* 800F8564 000F54A4 38 B9 1B 78 */ addi r5, r25, 0x1b78 -/* 800F8568 000F54A8 48 16 E5 CD */ bl cXyz_NS___mi +/* 800F8568 000F54A8 48 16 E5 CD */ bl __mi__4cXyzCFRC3Vec /* 800F856C 000F54AC C0 01 00 18 */ lfs f0, 0x18(r1) /* 800F8570 000F54B0 D0 1A 00 00 */ stfs f0, 0(r26) /* 800F8574 000F54B4 C0 01 00 1C */ lfs f0, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F8700.s b/include/d/d_a/d_a_alink/asm/func_800F8700.s index 25891e93f1..fe63d1c08f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F8700.s +++ b/include/d/d_a/d_a_alink/asm/func_800F8700.s @@ -30,16 +30,16 @@ /* 800F8774 000F56B4 38 A1 00 74 */ addi r5, r1, 0x74 /* 800F8778 000F56B8 4B F7 BF CD */ bl cBgS_NS_GetTriPla /* 800F877C 000F56BC 38 61 00 74 */ addi r3, r1, 0x74 -/* 800F8780 000F56C0 48 16 E9 A9 */ bl cXyz_NS_atan2sX_Z +/* 800F8780 000F56C0 48 16 E9 A9 */ bl atan2sX_Z__4cXyzCFv /* 800F8784 000F56C4 B0 7D 00 00 */ sth r3, 0(r29) /* 800F8788 000F56C8 38 61 00 44 */ addi r3, r1, 0x44 /* 800F878C 000F56CC 38 81 00 74 */ addi r4, r1, 0x74 /* 800F8790 000F56D0 C0 22 93 54 */ lfs f1, lbl_80452D54-_SDA2_BASE_(r2) -/* 800F8794 000F56D4 48 16 E3 F1 */ bl cXyz_NS___ml +/* 800F8794 000F56D4 48 16 E3 F1 */ bl __ml__4cXyzCFf /* 800F8798 000F56D8 38 61 00 38 */ addi r3, r1, 0x38 /* 800F879C 000F56DC 7F 64 DB 78 */ mr r4, r27 /* 800F87A0 000F56E0 38 A1 00 44 */ addi r5, r1, 0x44 -/* 800F87A4 000F56E4 48 16 E3 41 */ bl cXyz_NS___pl +/* 800F87A4 000F56E4 48 16 E3 41 */ bl __pl__4cXyzCFRC3Vec /* 800F87A8 000F56E8 C0 01 00 38 */ lfs f0, 0x38(r1) /* 800F87AC 000F56EC D0 01 00 5C */ stfs f0, 0x5c(r1) /* 800F87B0 000F56F0 C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -49,11 +49,11 @@ /* 800F87C0 000F5700 38 61 00 2C */ addi r3, r1, 0x2c /* 800F87C4 000F5704 38 81 00 5C */ addi r4, r1, 0x5c /* 800F87C8 000F5708 7F 65 DB 78 */ mr r5, r27 -/* 800F87CC 000F570C 48 16 E3 19 */ bl cXyz_NS___pl +/* 800F87CC 000F570C 48 16 E3 19 */ bl __pl__4cXyzCFRC3Vec /* 800F87D0 000F5710 38 61 00 20 */ addi r3, r1, 0x20 /* 800F87D4 000F5714 38 81 00 2C */ addi r4, r1, 0x2c /* 800F87D8 000F5718 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800F87DC 000F571C 48 16 E3 A9 */ bl cXyz_NS___ml +/* 800F87DC 000F571C 48 16 E3 A9 */ bl __ml__4cXyzCFf /* 800F87E0 000F5720 C0 01 00 20 */ lfs f0, 0x20(r1) /* 800F87E4 000F5724 D0 01 00 68 */ stfs f0, 0x68(r1) /* 800F87E8 000F5728 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -77,12 +77,12 @@ /* 800F8830 000F5770 38 A1 00 74 */ addi r5, r1, 0x74 /* 800F8834 000F5774 4B F7 BF 11 */ bl cBgS_NS_GetTriPla /* 800F8838 000F5778 38 61 00 74 */ addi r3, r1, 0x74 -/* 800F883C 000F577C 48 16 E8 ED */ bl cXyz_NS_atan2sX_Z +/* 800F883C 000F577C 48 16 E8 ED */ bl atan2sX_Z__4cXyzCFv /* 800F8840 000F5780 B0 7E 00 00 */ sth r3, 0(r30) /* 800F8844 000F5784 38 61 00 14 */ addi r3, r1, 0x14 /* 800F8848 000F5788 7F 64 DB 78 */ mr r4, r27 /* 800F884C 000F578C 7F 85 E3 78 */ mr r5, r28 -/* 800F8850 000F5790 48 16 E2 E5 */ bl cXyz_NS___mi +/* 800F8850 000F5790 48 16 E2 E5 */ bl __mi__4cXyzCFRC3Vec /* 800F8854 000F5794 C0 41 00 14 */ lfs f2, 0x14(r1) /* 800F8858 000F5798 D0 41 00 50 */ stfs f2, 0x50(r1) /* 800F885C 000F579C C0 01 00 18 */ lfs f0, 0x18(r1) @@ -98,7 +98,7 @@ /* 800F8884 000F57C4 FF E0 08 90 */ fmr f31, f1 /* 800F8888 000F57C8 A8 7D 00 00 */ lha r3, 0(r29) /* 800F888C 000F57CC A8 9E 00 00 */ lha r4, 0(r30) -/* 800F8890 000F57D0 48 17 85 95 */ bl cLib_distanceAngleS +/* 800F8890 000F57D0 48 17 85 95 */ bl cLib_distanceAngleS__Fss /* 800F8894 000F57D4 2C 03 7F 00 */ cmpwi r3, 0x7f00 /* 800F8898 000F57D8 40 81 00 30 */ ble lbl_800F88C8 /* 800F889C 000F57DC C0 02 95 3C */ lfs f0, lbl_80452F3C-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800F8A50.s b/include/d/d_a/d_a_alink/asm/func_800F8A50.s index bbf4e661ed..e395cd7be6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F8A50.s +++ b/include/d/d_a/d_a_alink/asm/func_800F8A50.s @@ -7,7 +7,7 @@ /* 800F8A68 000F59A8 7C 9E 23 78 */ mr r30, r4 /* 800F8A6C 000F59AC 7C BF 2B 78 */ mr r31, r5 /* 800F8A70 000F59B0 38 61 00 14 */ addi r3, r1, 0x14 -/* 800F8A74 000F59B4 48 16 E0 71 */ bl cXyz_NS___pl +/* 800F8A74 000F59B4 48 16 E0 71 */ bl __pl__4cXyzCFRC3Vec /* 800F8A78 000F59B8 C0 01 00 14 */ lfs f0, 0x14(r1) /* 800F8A7C 000F59BC D0 01 00 20 */ stfs f0, 0x20(r1) /* 800F8A80 000F59C0 C0 01 00 18 */ lfs f0, 0x18(r1) @@ -25,7 +25,7 @@ lbl_800F8AAC: /* 800F8AAC 000F59EC 38 61 00 08 */ addi r3, r1, 8 /* 800F8AB0 000F59F0 7F C4 F3 78 */ mr r4, r30 /* 800F8AB4 000F59F4 7F E5 FB 78 */ mr r5, r31 -/* 800F8AB8 000F59F8 48 16 E0 7D */ bl cXyz_NS___mi +/* 800F8AB8 000F59F8 48 16 E0 7D */ bl __mi__4cXyzCFRC3Vec /* 800F8ABC 000F59FC C0 01 00 08 */ lfs f0, 8(r1) /* 800F8AC0 000F5A00 D0 01 00 20 */ stfs f0, 0x20(r1) /* 800F8AC4 000F5A04 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F8B00.s b/include/d/d_a/d_a_alink/asm/func_800F8B00.s index bb5fd8e77b..71836e1f67 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F8B00.s +++ b/include/d/d_a/d_a_alink/asm/func_800F8B00.s @@ -25,11 +25,11 @@ /* 800F8B60 000F5AA0 38 61 00 6C */ addi r3, r1, 0x6c /* 800F8B64 000F5AA4 7F A4 EB 78 */ mr r4, r29 /* 800F8B68 000F5AA8 7F E5 FB 78 */ mr r5, r31 -/* 800F8B6C 000F5AAC 48 16 DF C9 */ bl cXyz_NS___mi +/* 800F8B6C 000F5AAC 48 16 DF C9 */ bl __mi__4cXyzCFRC3Vec /* 800F8B70 000F5AB0 38 61 00 60 */ addi r3, r1, 0x60 /* 800F8B74 000F5AB4 38 81 00 6C */ addi r4, r1, 0x6c /* 800F8B78 000F5AB8 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800F8B7C 000F5ABC 48 16 E0 09 */ bl cXyz_NS___ml +/* 800F8B7C 000F5ABC 48 16 E0 09 */ bl __ml__4cXyzCFf /* 800F8B80 000F5AC0 C0 01 00 60 */ lfs f0, 0x60(r1) /* 800F8B84 000F5AC4 D0 01 00 78 */ stfs f0, 0x78(r1) /* 800F8B88 000F5AC8 C0 01 00 64 */ lfs f0, 0x64(r1) @@ -43,11 +43,11 @@ lbl_800F8B9C: /* 800F8BA4 000F5AE4 38 61 00 54 */ addi r3, r1, 0x54 /* 800F8BA8 000F5AE8 7F C4 F3 78 */ mr r4, r30 /* 800F8BAC 000F5AEC 7F E5 FB 78 */ mr r5, r31 -/* 800F8BB0 000F5AF0 48 16 DF 85 */ bl cXyz_NS___mi +/* 800F8BB0 000F5AF0 48 16 DF 85 */ bl __mi__4cXyzCFRC3Vec /* 800F8BB4 000F5AF4 38 61 00 48 */ addi r3, r1, 0x48 /* 800F8BB8 000F5AF8 38 81 00 54 */ addi r4, r1, 0x54 /* 800F8BBC 000F5AFC C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800F8BC0 000F5B00 48 16 DF C5 */ bl cXyz_NS___ml +/* 800F8BC0 000F5B00 48 16 DF C5 */ bl __ml__4cXyzCFf /* 800F8BC4 000F5B04 C0 01 00 48 */ lfs f0, 0x48(r1) /* 800F8BC8 000F5B08 D0 01 00 78 */ stfs f0, 0x78(r1) /* 800F8BCC 000F5B0C C0 01 00 4C */ lfs f0, 0x4c(r1) @@ -66,11 +66,11 @@ lbl_800F8BDC: /* 800F8BFC 000F5B3C 38 61 00 3C */ addi r3, r1, 0x3c /* 800F8C00 000F5B40 7F E4 FB 78 */ mr r4, r31 /* 800F8C04 000F5B44 C0 22 93 14 */ lfs f1, lbl_80452D14-_SDA2_BASE_(r2) -/* 800F8C08 000F5B48 48 16 DF 7D */ bl cXyz_NS___ml +/* 800F8C08 000F5B48 48 16 DF 7D */ bl __ml__4cXyzCFf /* 800F8C0C 000F5B4C 38 61 00 30 */ addi r3, r1, 0x30 /* 800F8C10 000F5B50 38 81 00 3C */ addi r4, r1, 0x3c /* 800F8C14 000F5B54 38 A1 00 A8 */ addi r5, r1, 0xa8 -/* 800F8C18 000F5B58 48 16 DF 1D */ bl cXyz_NS___mi +/* 800F8C18 000F5B58 48 16 DF 1D */ bl __mi__4cXyzCFRC3Vec /* 800F8C1C 000F5B5C C0 01 00 30 */ lfs f0, 0x30(r1) /* 800F8C20 000F5B60 D0 01 00 9C */ stfs f0, 0x9c(r1) /* 800F8C24 000F5B64 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -103,15 +103,15 @@ lbl_800F8C84: /* 800F8C8C 000F5BCC 38 61 00 24 */ addi r3, r1, 0x24 /* 800F8C90 000F5BD0 38 81 00 90 */ addi r4, r1, 0x90 /* 800F8C94 000F5BD4 38 A1 00 84 */ addi r5, r1, 0x84 -/* 800F8C98 000F5BD8 48 16 DE 4D */ bl cXyz_NS___pl +/* 800F8C98 000F5BD8 48 16 DE 4D */ bl __pl__4cXyzCFRC3Vec /* 800F8C9C 000F5BDC 38 61 00 18 */ addi r3, r1, 0x18 /* 800F8CA0 000F5BE0 38 81 00 24 */ addi r4, r1, 0x24 /* 800F8CA4 000F5BE4 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 800F8CA8 000F5BE8 48 16 DE DD */ bl cXyz_NS___ml +/* 800F8CA8 000F5BE8 48 16 DE DD */ bl __ml__4cXyzCFf /* 800F8CAC 000F5BEC 38 61 00 0C */ addi r3, r1, 0xc /* 800F8CB0 000F5BF0 38 81 00 18 */ addi r4, r1, 0x18 /* 800F8CB4 000F5BF4 38 A1 00 78 */ addi r5, r1, 0x78 -/* 800F8CB8 000F5BF8 48 16 DE 7D */ bl cXyz_NS___mi +/* 800F8CB8 000F5BF8 48 16 DE 7D */ bl __mi__4cXyzCFRC3Vec /* 800F8CBC 000F5BFC C0 01 00 0C */ lfs f0, 0xc(r1) /* 800F8CC0 000F5C00 D0 1C 37 C8 */ stfs f0, 0x37c8(r28) /* 800F8CC4 000F5C04 C0 01 00 10 */ lfs f0, 0x10(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F8D04.s b/include/d/d_a/d_a_alink/asm/func_800F8D04.s index 0647b67c91..6afd2dd562 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F8D04.s +++ b/include/d/d_a/d_a_alink/asm/func_800F8D04.s @@ -12,7 +12,7 @@ /* 800F8D30 000F5C70 38 A0 00 05 */ li r5, 5 /* 800F8D34 000F5C74 38 C0 10 00 */ li r6, 0x1000 /* 800F8D38 000F5C78 38 E0 08 00 */ li r7, 0x800 -/* 800F8D3C 000F5C7C 48 17 78 05 */ bl cLib_addCalcAngleS +/* 800F8D3C 000F5C7C 48 17 78 05 */ bl cLib_addCalcAngleS__FPsssss /* 800F8D40 000F5C80 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800F8D44 000F5C84 B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_800F8D48: @@ -27,7 +27,7 @@ lbl_800F8D48: /* 800F8D68 000F5CA8 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800F8D6C 000F5CAC C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800F8D70 000F5CB0 C0 62 93 30 */ lfs f3, lbl_80452D30-_SDA2_BASE_(r2) -/* 800F8D74 000F5CB4 48 17 6C 09 */ bl cLib_addCalc +/* 800F8D74 000F5CB4 48 17 6C 09 */ bl cLib_addCalc__FPfffff lbl_800F8D78: /* 800F8D78 000F5CB8 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) /* 800F8D7C 000F5CBC C0 3F 37 D0 */ lfs f1, 0x37d0(r31) @@ -40,7 +40,7 @@ lbl_800F8D78: /* 800F8D98 000F5CD8 38 7F 04 D8 */ addi r3, r31, 0x4d8 /* 800F8D9C 000F5CDC C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800F8DA0 000F5CE0 C0 62 93 30 */ lfs f3, lbl_80452D30-_SDA2_BASE_(r2) -/* 800F8DA4 000F5CE4 48 17 6B D9 */ bl cLib_addCalc +/* 800F8DA4 000F5CE4 48 17 6B D9 */ bl cLib_addCalc__FPfffff lbl_800F8DA8: /* 800F8DA8 000F5CE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F8DAC 000F5CEC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F8DBC.s b/include/d/d_a/d_a_alink/asm/func_800F8DBC.s index f3c498a6e0..cc362e5af0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F8DBC.s +++ b/include/d/d_a/d_a_alink/asm/func_800F8DBC.s @@ -14,7 +14,7 @@ /* 800F8DF0 000F5D30 A8 A7 00 28 */ lha r5, 0x28(r7) /* 800F8DF4 000F5D34 A8 C7 00 2A */ lha r6, 0x2a(r7) /* 800F8DF8 000F5D38 A8 E7 00 2C */ lha r7, 0x2c(r7) -/* 800F8DFC 000F5D3C 48 17 77 45 */ bl cLib_addCalcAngleS +/* 800F8DFC 000F5D3C 48 17 77 45 */ bl cLib_addCalcAngleS__FPsssss /* 800F8E00 000F5D40 A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 800F8E04 000F5D44 A8 1F 04 DE */ lha r0, 0x4de(r31) /* 800F8E08 000F5D48 7C 03 00 00 */ cmpw r3, r0 @@ -47,7 +47,7 @@ lbl_800F8E48: lbl_800F8E70: /* 800F8E70 000F5DB0 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800F8E74 000F5DB4 38 81 00 20 */ addi r4, r1, 0x20 -/* 800F8E78 000F5DB8 48 16 EE B1 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800F8E78 000F5DB8 48 16 EE B1 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800F8E7C 000F5DBC C0 21 00 28 */ lfs f1, 0x28(r1) /* 800F8E80 000F5DC0 C0 01 00 10 */ lfs f0, 0x10(r1) /* 800F8E84 000F5DC4 EF E1 00 28 */ fsubs f31, f1, f0 @@ -65,9 +65,9 @@ lbl_800F8E70: /* 800F8EB4 000F5DF4 D0 41 00 18 */ stfs f2, 0x18(r1) /* 800F8EB8 000F5DF8 D3 E1 00 1C */ stfs f31, 0x1c(r1) /* 800F8EBC 000F5DFC 38 61 00 14 */ addi r3, r1, 0x14 -/* 800F8EC0 000F5E00 48 16 E2 91 */ bl cXyz_NS_atan2sY_XZ +/* 800F8EC0 000F5E00 48 16 E2 91 */ bl atan2sY_XZ__4cXyzCFv /* 800F8EC4 000F5E04 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 800F8EC8 000F5E08 48 17 7F 5D */ bl cLib_distanceAngleS +/* 800F8EC8 000F5E08 48 17 7F 5D */ bl cLib_distanceAngleS__Fss /* 800F8ECC 000F5E0C 2C 03 08 00 */ cmpwi r3, 0x800 /* 800F8ED0 000F5E10 40 81 00 10 */ ble lbl_800F8EE0 /* 800F8ED4 000F5E14 A8 1F 04 DE */ lha r0, 0x4de(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F9ABC.s b/include/d/d_a/d_a_alink/asm/func_800F9ABC.s index 19f27a5824..dd20a75223 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F9ABC.s +++ b/include/d/d_a/d_a_alink/asm/func_800F9ABC.s @@ -108,7 +108,7 @@ lbl_800F9C30: /* 800F9C44 000F6B84 38 A0 00 05 */ li r5, 5 /* 800F9C48 000F6B88 38 C0 04 80 */ li r6, 0x480 /* 800F9C4C 000F6B8C 38 E0 00 80 */ li r7, 0x80 -/* 800F9C50 000F6B90 48 17 68 F1 */ bl cLib_addCalcAngleS +/* 800F9C50 000F6B90 48 17 68 F1 */ bl cLib_addCalcAngleS__FPsssss /* 800F9C54 000F6B94 7C 60 07 35 */ extsh. r0, r3 /* 800F9C58 000F6B98 41 82 00 08 */ beq lbl_800F9C60 /* 800F9C5C 000F6B9C 3B 80 00 00 */ li r28, 0 @@ -130,18 +130,18 @@ lbl_800F9C88: /* 800F9C90 000F6BD0 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800F9C94 000F6BD4 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) /* 800F9C98 000F6BD8 C0 82 92 B8 */ lfs f4, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800F9C9C 000F6BDC 48 17 5C E1 */ bl cLib_addCalc +/* 800F9C9C 000F6BDC 48 17 5C E1 */ bl cLib_addCalc__FPfffff /* 800F9CA0 000F6BE0 38 7F 04 D8 */ addi r3, r31, 0x4d8 /* 800F9CA4 000F6BE4 C0 3F 37 D0 */ lfs f1, 0x37d0(r31) /* 800F9CA8 000F6BE8 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800F9CAC 000F6BEC C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) /* 800F9CB0 000F6BF0 C0 82 92 B8 */ lfs f4, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800F9CB4 000F6BF4 48 17 5C C9 */ bl cLib_addCalc +/* 800F9CB4 000F6BF4 48 17 5C C9 */ bl cLib_addCalc__FPfffff lbl_800F9CB8: /* 800F9CB8 000F6BF8 38 61 00 08 */ addi r3, r1, 8 /* 800F9CBC 000F6BFC 38 9F 37 C8 */ addi r4, r31, 0x37c8 /* 800F9CC0 000F6C00 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 800F9CC4 000F6C04 48 16 CE 71 */ bl cXyz_NS___mi +/* 800F9CC4 000F6C04 48 16 CE 71 */ bl __mi__4cXyzCFRC3Vec /* 800F9CC8 000F6C08 C0 01 00 08 */ lfs f0, 8(r1) /* 800F9CCC 000F6C0C D0 01 00 14 */ stfs f0, 0x14(r1) /* 800F9CD0 000F6C10 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -149,9 +149,9 @@ lbl_800F9CB8: /* 800F9CD8 000F6C18 C0 01 00 10 */ lfs f0, 0x10(r1) /* 800F9CDC 000F6C1C D0 01 00 1C */ stfs f0, 0x1c(r1) /* 800F9CE0 000F6C20 38 61 00 14 */ addi r3, r1, 0x14 -/* 800F9CE4 000F6C24 48 16 D4 45 */ bl cXyz_NS_atan2sX_Z +/* 800F9CE4 000F6C24 48 16 D4 45 */ bl atan2sX_Z__4cXyzCFv /* 800F9CE8 000F6C28 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 800F9CEC 000F6C2C 48 17 71 39 */ bl cLib_distanceAngleS +/* 800F9CEC 000F6C2C 48 17 71 39 */ bl cLib_distanceAngleS__Fss /* 800F9CF0 000F6C30 2C 03 60 00 */ cmpwi r3, 0x6000 /* 800F9CF4 000F6C34 40 80 00 08 */ bge lbl_800F9CFC /* 800F9CF8 000F6C38 3B 80 00 00 */ li r28, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FA070.s b/include/d/d_a/d_a_alink/asm/func_800FA070.s index 3d047551e6..a7425dc327 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FA070.s +++ b/include/d/d_a/d_a_alink/asm/func_800FA070.s @@ -117,9 +117,9 @@ lbl_800FA1EC: /* 800FA22C 000F716C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FA230 000F7170 41 82 00 C0 */ beq lbl_800FA2F0 /* 800FA234 000F7174 38 61 00 50 */ addi r3, r1, 0x50 -/* 800FA238 000F7178 48 16 CE F1 */ bl cXyz_NS_atan2sX_Z +/* 800FA238 000F7178 48 16 CE F1 */ bl atan2sX_Z__4cXyzCFv /* 800FA23C 000F717C A8 9D 04 E6 */ lha r4, 0x4e6(r29) -/* 800FA240 000F7180 48 17 6B E5 */ bl cLib_distanceAngleS +/* 800FA240 000F7180 48 17 6B E5 */ bl cLib_distanceAngleS__Fss /* 800FA244 000F7184 2C 03 54 9F */ cmpwi r3, 0x549f /* 800FA248 000F7188 40 80 00 A8 */ bge lbl_800FA2F0 /* 800FA24C 000F718C 28 1E 00 00 */ cmplwi r30, 0 @@ -133,7 +133,7 @@ lbl_800FA268: /* 800FA268 000F71A8 38 61 00 20 */ addi r3, r1, 0x20 /* 800FA26C 000F71AC 7F 24 CB 78 */ mr r4, r25 /* 800FA270 000F71B0 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800FA274 000F71B4 48 16 C8 C1 */ bl cXyz_NS___mi +/* 800FA274 000F71B4 48 16 C8 C1 */ bl __mi__4cXyzCFRC3Vec /* 800FA278 000F71B8 C0 41 00 20 */ lfs f2, 0x20(r1) /* 800FA27C 000F71BC D0 41 00 2C */ stfs f2, 0x2c(r1) /* 800FA280 000F71C0 C0 01 00 24 */ lfs f0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FA338.s b/include/d/d_a/d_a_alink/asm/func_800FA338.s index 0b8e9828ca..8fa6208167 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FA338.s +++ b/include/d/d_a/d_a_alink/asm/func_800FA338.s @@ -99,7 +99,7 @@ lbl_800FA434: lbl_800FA4A0: /* 800FA4A0 000F73E0 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 800FA4A4 000F73E4 38 81 00 20 */ addi r4, r1, 0x20 -/* 800FA4A8 000F73E8 48 16 D8 81 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800FA4A8 000F73E8 48 16 D8 81 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FA4AC 000F73EC 7F E3 FB 78 */ mr r3, r31 /* 800FA4B0 000F73F0 38 9E 1D 08 */ addi r4, r30, 0x1d08 /* 800FA4B4 000F73F4 4B F7 9F ED */ bl cBgS_NS_GroundCross @@ -147,9 +147,9 @@ lbl_800FA550: /* 800FA558 000F7498 38 A1 00 38 */ addi r5, r1, 0x38 /* 800FA55C 000F749C 4B F7 A1 E9 */ bl cBgS_NS_GetTriPla /* 800FA560 000F74A0 38 61 00 38 */ addi r3, r1, 0x38 -/* 800FA564 000F74A4 48 16 CB C5 */ bl cXyz_NS_atan2sX_Z +/* 800FA564 000F74A4 48 16 CB C5 */ bl atan2sX_Z__4cXyzCFv /* 800FA568 000F74A8 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800FA56C 000F74AC 48 17 68 B9 */ bl cLib_distanceAngleS +/* 800FA56C 000F74AC 48 17 68 B9 */ bl cLib_distanceAngleS__Fss /* 800FA570 000F74B0 2C 03 54 9F */ cmpwi r3, 0x549f /* 800FA574 000F74B4 40 80 00 18 */ bge lbl_800FA58C /* 800FA578 000F74B8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800FA6E4.s b/include/d/d_a/d_a_alink/asm/func_800FA6E4.s index 1d8f0a5a1c..bd0e9de910 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FA6E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800FA6E4.s @@ -28,7 +28,7 @@ /* 800FA750 000F7690 D0 01 00 10 */ stfs f0, 0x10(r1) /* 800FA754 000F7694 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FA758 000F7698 38 81 00 08 */ addi r4, r1, 8 -/* 800FA75C 000F769C 48 16 D5 CD */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800FA75C 000F769C 48 16 D5 CD */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FA760 000F76A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800FA764 000F76A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FA768 000F76A8 38 63 0F 38 */ addi r3, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_800FA85C.s b/include/d/d_a/d_a_alink/asm/func_800FA85C.s index 5db0f44f6b..763ce391a8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FA85C.s +++ b/include/d/d_a/d_a_alink/asm/func_800FA85C.s @@ -80,9 +80,9 @@ lbl_800FA96C: /* 800FA98C 000F78CC 38 A1 00 20 */ addi r5, r1, 0x20 /* 800FA990 000F78D0 4B F7 9D B5 */ bl cBgS_NS_GetTriPla /* 800FA994 000F78D4 38 61 00 20 */ addi r3, r1, 0x20 -/* 800FA998 000F78D8 48 16 C7 91 */ bl cXyz_NS_atan2sX_Z +/* 800FA998 000F78D8 48 16 C7 91 */ bl atan2sX_Z__4cXyzCFv /* 800FA99C 000F78DC 7F A4 EB 78 */ mr r4, r29 -/* 800FA9A0 000F78E0 48 17 64 85 */ bl cLib_distanceAngleS +/* 800FA9A0 000F78E0 48 17 64 85 */ bl cLib_distanceAngleS__Fss /* 800FA9A4 000F78E4 2C 03 54 9F */ cmpwi r3, 0x549f /* 800FA9A8 000F78E8 40 80 00 20 */ bge lbl_800FA9C8 /* 800FA9AC 000F78EC C0 1F 04 D0 */ lfs f0, 0x4d0(r31) @@ -104,9 +104,9 @@ lbl_800FA9C8: /* 800FA9E8 000F7928 38 A1 00 20 */ addi r5, r1, 0x20 /* 800FA9EC 000F792C 4B F7 9D 59 */ bl cBgS_NS_GetTriPla /* 800FA9F0 000F7930 38 61 00 20 */ addi r3, r1, 0x20 -/* 800FA9F4 000F7934 48 16 C7 35 */ bl cXyz_NS_atan2sX_Z +/* 800FA9F4 000F7934 48 16 C7 35 */ bl atan2sX_Z__4cXyzCFv /* 800FA9F8 000F7938 7F A4 EB 78 */ mr r4, r29 -/* 800FA9FC 000F793C 48 17 64 29 */ bl cLib_distanceAngleS +/* 800FA9FC 000F793C 48 17 64 29 */ bl cLib_distanceAngleS__Fss /* 800FAA00 000F7940 2C 03 54 9F */ cmpwi r3, 0x549f /* 800FAA04 000F7944 40 80 00 20 */ bge lbl_800FAA24 /* 800FAA08 000F7948 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800FAA7C.s b/include/d/d_a/d_a_alink/asm/func_800FAA7C.s index 98e7becbf8..4756d8a009 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FAA7C.s +++ b/include/d/d_a/d_a_alink/asm/func_800FAA7C.s @@ -7,7 +7,7 @@ /* 800FAA94 000F79D4 38 61 00 18 */ addi r3, r1, 0x18 /* 800FAA98 000F79D8 38 9F 34 EC */ addi r4, r31, 0x34ec /* 800FAA9C 000F79DC 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 800FAAA0 000F79E0 48 16 C0 95 */ bl cXyz_NS___mi +/* 800FAAA0 000F79E0 48 16 C0 95 */ bl __mi__4cXyzCFRC3Vec /* 800FAAA4 000F79E4 C0 41 00 18 */ lfs f2, 0x18(r1) /* 800FAAA8 000F79E8 D0 41 00 30 */ stfs f2, 0x30(r1) /* 800FAAAC 000F79EC C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -116,7 +116,7 @@ lbl_800FABD4: /* 800FAC20 000F7B60 D0 81 00 2C */ stfs f4, 0x2c(r1) /* 800FAC24 000F7B64 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FAC28 000F7B68 38 81 00 24 */ addi r4, r1, 0x24 -/* 800FAC2C 000F7B6C 48 16 D0 FD */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800FAC2C 000F7B6C 48 16 D0 FD */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FAC30 000F7B70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800FAC34 000F7B74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FAC38 000F7B78 38 63 0F 38 */ addi r3, r3, 0xf38 @@ -156,7 +156,7 @@ lbl_800FAC70: /* 800FACBC 000F7BFC 41 82 00 B4 */ beq lbl_800FAD70 /* 800FACC0 000F7C00 2C 1E 00 00 */ cmpwi r30, 0 /* 800FACC4 000F7C04 40 82 00 5C */ bne lbl_800FAD20 -/* 800FACC8 000F7C08 48 16 CB A5 */ bl cM_rnd +/* 800FACC8 000F7C08 48 16 CB A5 */ bl cM_rnd__Fv /* 800FACCC 000F7C0C C0 02 93 A8 */ lfs f0, lbl_80452DA8-_SDA2_BASE_(r2) /* 800FACD0 000F7C10 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800FACD4 000F7C14 40 80 00 4C */ bge lbl_800FAD20 diff --git a/include/d/d_a/d_a_alink/asm/func_800FAECC.s b/include/d/d_a/d_a_alink/asm/func_800FAECC.s index 0c65f2b62b..4795af8e7a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FAECC.s +++ b/include/d/d_a/d_a_alink/asm/func_800FAECC.s @@ -10,7 +10,7 @@ /* 800FAEF0 000F7E30 7C 7F 1B 78 */ mr r31, r3 /* 800FAEF4 000F7E34 7C 9E 23 78 */ mr r30, r4 /* 800FAEF8 000F7E38 7F C3 F3 78 */ mr r3, r30 -/* 800FAEFC 000F7E3C 48 16 C2 2D */ bl cXyz_NS_atan2sX_Z +/* 800FAEFC 000F7E3C 48 16 C2 2D */ bl atan2sX_Z__4cXyzCFv /* 800FAF00 000F7E40 7C 7D 1B 78 */ mr r29, r3 /* 800FAF04 000F7E44 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) /* 800FAF08 000F7E48 C0 42 93 2C */ lfs f2, lbl_80452D2C-_SDA2_BASE_(r2) @@ -36,7 +36,7 @@ /* 800FAF58 000F7E98 D0 41 00 10 */ stfs f2, 0x10(r1) /* 800FAF5C 000F7E9C 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FAF60 000F7EA0 38 81 00 08 */ addi r4, r1, 8 -/* 800FAF64 000F7EA4 48 16 CD C5 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800FAF64 000F7EA4 48 16 CD C5 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FAF68 000F7EA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800FAF6C 000F7EAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FAF70 000F7EB0 3B C3 0F 38 */ addi r30, r3, 0xf38 @@ -81,7 +81,7 @@ lbl_800FAFB4: /* 800FB004 000F7F44 D0 01 00 10 */ stfs f0, 0x10(r1) /* 800FB008 000F7F48 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FB00C 000F7F4C 38 81 00 08 */ addi r4, r1, 8 -/* 800FB010 000F7F50 48 16 CD 19 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800FB010 000F7F50 48 16 CD 19 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FB014 000F7F54 7F C3 F3 78 */ mr r3, r30 /* 800FB018 000F7F58 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 800FB01C 000F7F5C 4B F7 94 85 */ bl cBgS_NS_GroundCross @@ -98,7 +98,7 @@ lbl_800FAFB4: /* 800FB048 000F7F88 D0 01 00 10 */ stfs f0, 0x10(r1) /* 800FB04C 000F7F8C 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FB050 000F7F90 38 81 00 08 */ addi r4, r1, 8 -/* 800FB054 000F7F94 48 16 CC D5 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800FB054 000F7F94 48 16 CC D5 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FB058 000F7F98 7F C3 F3 78 */ mr r3, r30 /* 800FB05C 000F7F9C 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 800FB060 000F7FA0 4B F7 94 41 */ bl cBgS_NS_GroundCross diff --git a/include/d/d_a/d_a_alink/asm/func_800FB790.s b/include/d/d_a/d_a_alink/asm/func_800FB790.s index 7605c1d366..b53fc85ec6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FB790.s +++ b/include/d/d_a/d_a_alink/asm/func_800FB790.s @@ -187,7 +187,7 @@ lbl_800FB98C: /* 800FBA58 000F8998 38 A1 00 2C */ addi r5, r1, 0x2c /* 800FBA5C 000F899C 4B F7 8C E9 */ bl cBgS_NS_GetTriPla /* 800FBA60 000F89A0 38 61 00 2C */ addi r3, r1, 0x2c -/* 800FBA64 000F89A4 48 16 B6 C5 */ bl cXyz_NS_atan2sX_Z +/* 800FBA64 000F89A4 48 16 B6 C5 */ bl atan2sX_Z__4cXyzCFv /* 800FBA68 000F89A8 3C 63 00 01 */ addis r3, r3, 1 /* 800FBA6C 000F89AC 38 03 80 00 */ addi r0, r3, -32768 /* 800FBA70 000F89B0 7C 04 07 34 */ extsh r4, r0 @@ -239,7 +239,7 @@ lbl_800FBAD8: /* 800FBB1C 000F8A5C D0 01 00 10 */ stfs f0, 0x10(r1) /* 800FBB20 000F8A60 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 800FBB24 000F8A64 38 81 00 08 */ addi r4, r1, 8 -/* 800FBB28 000F8A68 48 16 C2 01 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800FBB28 000F8A68 48 16 C2 01 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FBB2C 000F8A6C 7F A3 EB 78 */ mr r3, r29 /* 800FBB30 000F8A70 38 9E 1D 08 */ addi r4, r30, 0x1d08 /* 800FBB34 000F8A74 4B F7 89 6D */ bl cBgS_NS_GroundCross diff --git a/include/d/d_a/d_a_alink/asm/func_800FBE04.s b/include/d/d_a/d_a_alink/asm/func_800FBE04.s index 9fa5d295d4..1b62fb1ce5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FBE04.s +++ b/include/d/d_a/d_a_alink/asm/func_800FBE04.s @@ -7,7 +7,7 @@ /* 800FBE1C 000F8D5C 38 61 00 18 */ addi r3, r1, 0x18 /* 800FBE20 000F8D60 38 9F 34 EC */ addi r4, r31, 0x34ec /* 800FBE24 000F8D64 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 800FBE28 000F8D68 48 16 AD 0D */ bl cXyz_NS___mi +/* 800FBE28 000F8D68 48 16 AD 0D */ bl __mi__4cXyzCFRC3Vec /* 800FBE2C 000F8D6C C0 41 00 18 */ lfs f2, 0x18(r1) /* 800FBE30 000F8D70 D0 41 00 30 */ stfs f2, 0x30(r1) /* 800FBE34 000F8D74 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -116,7 +116,7 @@ lbl_800FBF5C: /* 800FBFA8 000F8EE8 D0 81 00 2C */ stfs f4, 0x2c(r1) /* 800FBFAC 000F8EEC 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FBFB0 000F8EF0 38 81 00 24 */ addi r4, r1, 0x24 -/* 800FBFB4 000F8EF4 48 16 BD 75 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800FBFB4 000F8EF4 48 16 BD 75 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FBFB8 000F8EF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800FBFBC 000F8EFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FBFC0 000F8F00 3B C3 0F 38 */ addi r30, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_800FC240.s b/include/d/d_a/d_a_alink/asm/func_800FC240.s index c6355ec187..07d0686f63 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC240.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC240.s @@ -8,7 +8,7 @@ /* 800FC25C 000F919C 38 A0 00 02 */ li r5, 2 /* 800FC260 000F91A0 38 C0 10 00 */ li r6, 0x1000 /* 800FC264 000F91A4 38 E0 04 00 */ li r7, 0x400 -/* 800FC268 000F91A8 48 17 42 D9 */ bl cLib_addCalcAngleS +/* 800FC268 000F91A8 48 17 42 D9 */ bl cLib_addCalcAngleS__FPsssss /* 800FC26C 000F91AC A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800FC270 000F91B0 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 800FC274 000F91B4 38 7F 1F D0 */ addi r3, r31, 0x1fd0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FC390.s b/include/d/d_a/d_a_alink/asm/func_800FC390.s index 22085101a0..bc8ab522d8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC390.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC390.s @@ -71,7 +71,7 @@ lbl_800FC498: /* 800FC4A0 000F93E0 38 A0 00 02 */ li r5, 2 /* 800FC4A4 000F93E4 38 C0 10 00 */ li r6, 0x1000 /* 800FC4A8 000F93E8 38 E0 04 00 */ li r7, 0x400 -/* 800FC4AC 000F93EC 48 17 40 95 */ bl cLib_addCalcAngleS +/* 800FC4AC 000F93EC 48 17 40 95 */ bl cLib_addCalcAngleS__FPsssss /* 800FC4B0 000F93F0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800FC4B4 000F93F4 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 800FC4B8 000F93F8 48 00 00 94 */ b lbl_800FC54C diff --git a/include/d/d_a/d_a_alink/asm/func_800FC870.s b/include/d/d_a/d_a_alink/asm/func_800FC870.s index 2f01af8612..175c2dda7a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC870.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC870.s @@ -292,7 +292,7 @@ lbl_800FCC70: /* 800FCC84 000F9BC4 38 61 00 20 */ addi r3, r1, 0x20 /* 800FCC88 000F9BC8 38 9D 05 BC */ addi r4, r29, 0x5bc /* 800FCC8C 000F9BCC 38 BD 34 98 */ addi r5, r29, 0x3498 -/* 800FCC90 000F9BD0 48 16 9E A5 */ bl cXyz_NS___mi +/* 800FCC90 000F9BD0 48 16 9E A5 */ bl __mi__4cXyzCFRC3Vec /* 800FCC94 000F9BD4 C0 41 00 20 */ lfs f2, 0x20(r1) /* 800FCC98 000F9BD8 D0 41 00 2C */ stfs f2, 0x2c(r1) /* 800FCC9C 000F9BDC C0 01 00 24 */ lfs f0, 0x24(r1) @@ -378,16 +378,16 @@ lbl_800FCDB0: /* 800FCDB4 000F9CF4 FC 20 00 50 */ fneg f1, f0 /* 800FCDB8 000F9CF8 C0 01 00 34 */ lfs f0, 0x34(r1) /* 800FCDBC 000F9CFC FC 40 00 50 */ fneg f2, f0 -/* 800FCDC0 000F9D00 48 16 A8 B5 */ bl cM_atan2s +/* 800FCDC0 000F9D00 48 16 A8 B5 */ bl cM_atan2s__Fff /* 800FCDC4 000F9D04 7C 7E 1B 78 */ mr r30, r3 /* 800FCDC8 000F9D08 C0 21 00 30 */ lfs f1, 0x30(r1) /* 800FCDCC 000F9D0C FC 40 F8 90 */ fmr f2, f31 -/* 800FCDD0 000F9D10 48 16 A8 A5 */ bl cM_atan2s +/* 800FCDD0 000F9D10 48 16 A8 A5 */ bl cM_atan2s__Fff /* 800FCDD4 000F9D14 7C 64 1B 78 */ mr r4, r3 /* 800FCDD8 000F9D18 38 61 00 0C */ addi r3, r1, 0xc /* 800FCDDC 000F9D1C 7F C5 F3 78 */ mr r5, r30 /* 800FCDE0 000F9D20 38 C0 00 00 */ li r6, 0 -/* 800FCDE4 000F9D24 48 16 A6 11 */ bl csXyz_X1_ +/* 800FCDE4 000F9D24 48 16 A6 11 */ bl __ct__5csXyzFsss /* 800FCDE8 000F9D28 A0 1F 05 8E */ lhz r0, 0x58e(r31) /* 800FCDEC 000F9D2C 60 00 00 02 */ ori r0, r0, 2 /* 800FCDF0 000F9D30 B0 1F 05 8E */ sth r0, 0x58e(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800FD048.s b/include/d/d_a/d_a_alink/asm/func_800FD048.s index 762eeb263f..e5681c27f9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD048.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD048.s @@ -13,7 +13,7 @@ /* 800FD078 000F9FB8 4B F7 77 79 */ bl cBgS_NS_GetTriPnt /* 800FD07C 000F9FBC 38 7F 1E 1C */ addi r3, r31, 0x1e1c /* 800FD080 000F9FC0 38 9F 1B 5C */ addi r4, r31, 0x1b5c -/* 800FD084 000F9FC4 48 16 B0 C5 */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 800FD084 000F9FC4 48 16 B0 C5 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 800FD088 000F9FC8 C0 41 00 24 */ lfs f2, 0x24(r1) /* 800FD08C 000F9FCC C0 01 00 18 */ lfs f0, 0x18(r1) /* 800FD090 000F9FD0 EC 02 00 28 */ fsubs f0, f2, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FD2AC.s b/include/d/d_a/d_a_alink/asm/func_800FD2AC.s index 3bccb4227c..fefb5aa04e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD2AC.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD2AC.s @@ -10,19 +10,19 @@ /* 800FD2D0 000FA210 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800FD2D4 000FA214 FC 60 10 90 */ fmr f3, f2 /* 800FD2D8 000FA218 C0 82 92 A4 */ lfs f4, lbl_80452CA4-_SDA2_BASE_(r2) -/* 800FD2DC 000FA21C 48 17 26 A1 */ bl cLib_addCalc +/* 800FD2DC 000FA21C 48 17 26 A1 */ bl cLib_addCalc__FPfffff /* 800FD2E0 000FA220 38 7C 04 D4 */ addi r3, r28, 0x4d4 /* 800FD2E4 000FA224 C0 3C 37 CC */ lfs f1, 0x37cc(r28) /* 800FD2E8 000FA228 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800FD2EC 000FA22C FC 60 10 90 */ fmr f3, f2 /* 800FD2F0 000FA230 C0 82 92 A4 */ lfs f4, lbl_80452CA4-_SDA2_BASE_(r2) -/* 800FD2F4 000FA234 48 17 26 89 */ bl cLib_addCalc +/* 800FD2F4 000FA234 48 17 26 89 */ bl cLib_addCalc__FPfffff /* 800FD2F8 000FA238 38 7C 04 D8 */ addi r3, r28, 0x4d8 /* 800FD2FC 000FA23C C0 3C 37 D0 */ lfs f1, 0x37d0(r28) /* 800FD300 000FA240 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800FD304 000FA244 FC 60 10 90 */ fmr f3, f2 /* 800FD308 000FA248 C0 82 92 A4 */ lfs f4, lbl_80452CA4-_SDA2_BASE_(r2) -/* 800FD30C 000FA24C 48 17 26 71 */ bl cLib_addCalc +/* 800FD30C 000FA24C 48 17 26 71 */ bl cLib_addCalc__FPfffff /* 800FD310 000FA250 7F 83 E3 78 */ mr r3, r28 /* 800FD314 000FA254 4B FB C0 2D */ bl daAlink_c_NS_checkEquipAnime /* 800FD318 000FA258 2C 03 00 00 */ cmpwi r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FD4A8.s b/include/d/d_a/d_a_alink/asm/func_800FD4A8.s index 19a2397724..dc47a42f6c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD4A8.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD4A8.s @@ -72,7 +72,7 @@ lbl_800FD5A0: lbl_800FD5BC: /* 800FD5BC 000FA4FC 38 7E 1E 1C */ addi r3, r30, 0x1e1c /* 800FD5C0 000FA500 38 9E 1B 5C */ addi r4, r30, 0x1b5c -/* 800FD5C4 000FA504 48 16 AB 85 */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 800FD5C4 000FA504 48 16 AB 85 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 800FD5C8 000FA508 38 60 00 00 */ li r3, 0 lbl_800FD5CC: /* 800FD5CC 000FA50C 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FE174.s b/include/d/d_a/d_a_alink/asm/func_800FE174.s index f933f808f2..7841662ece 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FE174.s +++ b/include/d/d_a/d_a_alink/asm/func_800FE174.s @@ -133,7 +133,7 @@ lbl_800FE360: /* 800FE368 000FB2A8 7C 65 1B 78 */ mr r5, r3 /* 800FE36C 000FB2AC 48 24 8D 49 */ bl PSVECSubtract /* 800FE370 000FB2B0 38 61 00 08 */ addi r3, r1, 8 -/* 800FE374 000FB2B4 48 16 8D B5 */ bl cXyz_NS_atan2sX_Z +/* 800FE374 000FB2B4 48 16 8D B5 */ bl atan2sX_Z__4cXyzCFv /* 800FE378 000FB2B8 38 63 C0 00 */ addi r3, r3, -16384 /* 800FE37C 000FB2BC A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800FE380 000FB2C0 7C 00 18 50 */ subf r0, r0, r3 @@ -142,7 +142,7 @@ lbl_800FE360: /* 800FE38C 000FB2CC 38 A0 00 05 */ li r5, 5 /* 800FE390 000FB2D0 38 C0 07 D0 */ li r6, 0x7d0 /* 800FE394 000FB2D4 38 E0 01 90 */ li r7, 0x190 -/* 800FE398 000FB2D8 48 17 21 A9 */ bl cLib_addCalcAngleS +/* 800FE398 000FB2D8 48 17 21 A9 */ bl cLib_addCalcAngleS__FPsssss lbl_800FE39C: /* 800FE39C 000FB2DC E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* 800FE3A0 000FB2E0 CB E1 00 50 */ lfd f31, 0x50(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FE868.s b/include/d/d_a/d_a_alink/asm/func_800FE868.s index b4ea6f6ee3..a384053ea5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FE868.s +++ b/include/d/d_a/d_a_alink/asm/func_800FE868.s @@ -81,7 +81,7 @@ lbl_800FE91C: /* 800FE99C 000FB8DC D0 E1 00 10 */ stfs f7, 0x10(r1) /* 800FE9A0 000FB8E0 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FE9A4 000FB8E4 38 81 00 08 */ addi r4, r1, 8 -/* 800FE9A8 000FB8E8 48 16 93 81 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800FE9A8 000FB8E8 48 16 93 81 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FE9AC 000FB8EC A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800FE9B0 000FB8F0 28 00 00 82 */ cmplwi r0, 0x82 /* 800FE9B4 000FB8F4 40 82 00 7C */ bne lbl_800FEA30 @@ -160,10 +160,10 @@ lbl_800FEAAC: /* 800FEAC0 000FBA00 38 A1 00 2C */ addi r5, r1, 0x2c /* 800FEAC4 000FBA04 4B F7 5C 81 */ bl cBgS_NS_GetTriPla /* 800FEAC8 000FBA08 38 61 00 2C */ addi r3, r1, 0x2c -/* 800FEACC 000FBA0C 48 16 86 5D */ bl cXyz_NS_atan2sX_Z +/* 800FEACC 000FBA0C 48 16 86 5D */ bl atan2sX_Z__4cXyzCFv /* 800FEAD0 000FBA10 7C 7E 1B 78 */ mr r30, r3 /* 800FEAD4 000FBA14 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800FEAD8 000FBA18 48 17 23 4D */ bl cLib_distanceAngleS +/* 800FEAD8 000FBA18 48 17 23 4D */ bl cLib_distanceAngleS__Fss /* 800FEADC 000FBA1C 2C 03 54 9F */ cmpwi r3, 0x549f /* 800FEAE0 000FBA20 41 81 00 2C */ bgt lbl_800FEB0C /* 800FEAE4 000FBA24 7F E3 FB 78 */ mr r3, r31 @@ -199,7 +199,7 @@ lbl_800FEB0C: /* 800FEB58 000FBA98 B0 1F 30 8C */ sth r0, 0x308c(r31) /* 800FEB5C 000FBA9C 38 7F 1E 1C */ addi r3, r31, 0x1e1c /* 800FEB60 000FBAA0 38 9F 1B 5C */ addi r4, r31, 0x1b5c -/* 800FEB64 000FBAA4 48 16 95 E5 */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 800FEB64 000FBAA4 48 16 95 E5 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 800FEB68 000FBAA8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800FEB6C 000FBAAC 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800FEB70 000FBAB0 90 01 00 3C */ stw r0, 0x3c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FEB90.s b/include/d/d_a/d_a_alink/asm/func_800FEB90.s index b0bfe8786b..9d4113022f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FEB90.s +++ b/include/d/d_a/d_a_alink/asm/func_800FEB90.s @@ -18,9 +18,9 @@ /* 800FEBD4 000FBB14 38 A1 00 14 */ addi r5, r1, 0x14 /* 800FEBD8 000FBB18 4B F7 5B 6D */ bl cBgS_NS_GetTriPla /* 800FEBDC 000FBB1C 38 61 00 14 */ addi r3, r1, 0x14 -/* 800FEBE0 000FBB20 48 16 85 49 */ bl cXyz_NS_atan2sX_Z +/* 800FEBE0 000FBB20 48 16 85 49 */ bl atan2sX_Z__4cXyzCFv /* 800FEBE4 000FBB24 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800FEBE8 000FBB28 48 17 22 3D */ bl cLib_distanceAngleS +/* 800FEBE8 000FBB28 48 17 22 3D */ bl cLib_distanceAngleS__Fss /* 800FEBEC 000FBB2C 2C 03 54 9F */ cmpwi r3, 0x549f /* 800FEBF0 000FBB30 41 80 00 24 */ blt lbl_800FEC14 /* 800FEBF4 000FBB34 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -35,7 +35,7 @@ lbl_800FEC14: /* 800FEC14 000FBB54 38 61 00 08 */ addi r3, r1, 8 /* 800FEC18 000FBB58 38 9E 1B 78 */ addi r4, r30, 0x1b78 /* 800FEC1C 000FBB5C 7F E5 FB 78 */ mr r5, r31 -/* 800FEC20 000FBB60 48 16 7F 15 */ bl cXyz_NS___mi +/* 800FEC20 000FBB60 48 16 7F 15 */ bl __mi__4cXyzCFRC3Vec /* 800FEC24 000FBB64 38 7E 04 D0 */ addi r3, r30, 0x4d0 /* 800FEC28 000FBB68 38 81 00 08 */ addi r4, r1, 8 /* 800FEC2C 000FBB6C 7C 65 1B 78 */ mr r5, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800FED50.s b/include/d/d_a/d_a_alink/asm/func_800FED50.s index 7c632acd25..da2241fcde 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FED50.s +++ b/include/d/d_a/d_a_alink/asm/func_800FED50.s @@ -46,7 +46,7 @@ lbl_800FEE04: /* 800FEE04 000FBD44 38 7C 1D 08 */ addi r3, r28, 0x1d08 /* 800FEE08 000FBD48 7F A4 EB 78 */ mr r4, r29 -/* 800FEE0C 000FBD4C 48 16 8F 1D */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800FEE0C 000FBD4C 48 16 8F 1D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FEE10 000FBD50 7F E3 FB 78 */ mr r3, r31 /* 800FEE14 000FBD54 38 9C 1D 08 */ addi r4, r28, 0x1d08 /* 800FEE18 000FBD58 4B F7 56 89 */ bl cBgS_NS_GroundCross diff --git a/include/d/d_a/d_a_alink/asm/func_800FF28C.s b/include/d/d_a/d_a_alink/asm/func_800FF28C.s index bf33c4b036..385a77245d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FF28C.s +++ b/include/d/d_a/d_a_alink/asm/func_800FF28C.s @@ -16,7 +16,7 @@ /* 800FF2C8 000FC208 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) /* 800FF2CC 000FC20C 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FF2D0 000FC210 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 800FF2D4 000FC214 48 16 8A 55 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 800FF2D4 000FC214 48 16 8A 55 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FF2D8 000FC218 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800FF2DC 000FC21C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FF2E0 000FC220 38 63 0F 38 */ addi r3, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_800FF450.s b/include/d/d_a/d_a_alink/asm/func_800FF450.s index 77f468aa03..7df8bb0d31 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FF450.s +++ b/include/d/d_a/d_a_alink/asm/func_800FF450.s @@ -29,7 +29,7 @@ lbl_800FF484: /* 800FF4BC 000FC3FC 40 82 00 1C */ bne lbl_800FF4D8 /* 800FF4C0 000FC400 28 1D 00 00 */ cmplwi r29, 0 /* 800FF4C4 000FC404 40 82 00 14 */ bne lbl_800FF4D8 -/* 800FF4C8 000FC408 48 16 83 A5 */ bl cM_rnd +/* 800FF4C8 000FC408 48 16 83 A5 */ bl cM_rnd__Fv /* 800FF4CC 000FC40C C0 02 94 A8 */ lfs f0, lbl_80452EA8-_SDA2_BASE_(r2) /* 800FF4D0 000FC410 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800FF4D4 000FC414 40 80 00 48 */ bge lbl_800FF51C @@ -133,18 +133,18 @@ lbl_800FF59C: /* 800FF64C 000FC58C C0 23 00 0C */ lfs f1, 0xc(r3) /* 800FF650 000FC590 38 61 00 20 */ addi r3, r1, 0x20 /* 800FF654 000FC594 38 9E 35 88 */ addi r4, r30, 0x3588 -/* 800FF658 000FC598 48 16 75 2D */ bl cXyz_NS___ml +/* 800FF658 000FC598 48 16 75 2D */ bl __ml__4cXyzCFf /* 800FF65C 000FC59C 80 7E 20 60 */ lwz r3, 0x2060(r30) /* 800FF660 000FC5A0 C0 23 00 0C */ lfs f1, 0xc(r3) /* 800FF664 000FC5A4 38 61 00 14 */ addi r3, r1, 0x14 /* 800FF668 000FC5A8 38 9E 37 C8 */ addi r4, r30, 0x37c8 /* 800FF66C 000FC5AC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800FF670 000FC5B0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 800FF674 000FC5B4 48 16 75 11 */ bl cXyz_NS___ml +/* 800FF674 000FC5B4 48 16 75 11 */ bl __ml__4cXyzCFf /* 800FF678 000FC5B8 38 61 00 08 */ addi r3, r1, 8 /* 800FF67C 000FC5BC 38 81 00 20 */ addi r4, r1, 0x20 /* 800FF680 000FC5C0 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FF684 000FC5C4 48 16 74 61 */ bl cXyz_NS___pl +/* 800FF684 000FC5C4 48 16 74 61 */ bl __pl__4cXyzCFRC3Vec /* 800FF688 000FC5C8 C0 01 00 08 */ lfs f0, 8(r1) /* 800FF68C 000FC5CC D0 1E 35 88 */ stfs f0, 0x3588(r30) /* 800FF690 000FC5D0 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FF704.s b/include/d/d_a/d_a_alink/asm/func_800FF704.s index 77caba053f..0396ef24e3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FF704.s +++ b/include/d/d_a/d_a_alink/asm/func_800FF704.s @@ -19,18 +19,18 @@ lbl_800FF730: /* 800FF748 000FC688 C0 23 00 0C */ lfs f1, 0xc(r3) /* 800FF74C 000FC68C 38 61 00 20 */ addi r3, r1, 0x20 /* 800FF750 000FC690 38 9E 35 88 */ addi r4, r30, 0x3588 -/* 800FF754 000FC694 48 16 74 31 */ bl cXyz_NS___ml +/* 800FF754 000FC694 48 16 74 31 */ bl __ml__4cXyzCFf /* 800FF758 000FC698 80 7E 20 60 */ lwz r3, 0x2060(r30) /* 800FF75C 000FC69C C0 23 00 0C */ lfs f1, 0xc(r3) /* 800FF760 000FC6A0 38 61 00 14 */ addi r3, r1, 0x14 /* 800FF764 000FC6A4 38 9E 37 C8 */ addi r4, r30, 0x37c8 /* 800FF768 000FC6A8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800FF76C 000FC6AC EC 20 08 28 */ fsubs f1, f0, f1 -/* 800FF770 000FC6B0 48 16 74 15 */ bl cXyz_NS___ml +/* 800FF770 000FC6B0 48 16 74 15 */ bl __ml__4cXyzCFf /* 800FF774 000FC6B4 38 61 00 08 */ addi r3, r1, 8 /* 800FF778 000FC6B8 38 81 00 20 */ addi r4, r1, 0x20 /* 800FF77C 000FC6BC 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FF780 000FC6C0 48 16 73 65 */ bl cXyz_NS___pl +/* 800FF780 000FC6C0 48 16 73 65 */ bl __pl__4cXyzCFRC3Vec /* 800FF784 000FC6C4 C0 01 00 08 */ lfs f0, 8(r1) /* 800FF788 000FC6C8 D0 1E 35 88 */ stfs f0, 0x3588(r30) /* 800FF78C 000FC6CC C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FF818.s b/include/d/d_a/d_a_alink/asm/func_800FF818.s index 413c2460b8..e80fda2793 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FF818.s +++ b/include/d/d_a/d_a_alink/asm/func_800FF818.s @@ -23,7 +23,7 @@ /* 800FF870 000FC7B0 38 80 00 01 */ li r4, 1 /* 800FF874 000FC7B4 38 A0 00 00 */ li r5, 0 /* 800FF878 000FC7B8 4B FC 1A 65 */ bl daAlink_c_NS_deleteEquipItem -/* 800FF87C 000FC7BC 48 16 7F F1 */ bl cM_rnd +/* 800FF87C 000FC7BC 48 16 7F F1 */ bl cM_rnd__Fv /* 800FF880 000FC7C0 C0 02 93 A8 */ lfs f0, lbl_80452DA8-_SDA2_BASE_(r2) /* 800FF884 000FC7C4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800FF888 000FC7C8 40 80 00 34 */ bge lbl_800FF8BC diff --git a/include/d/d_a/d_a_alink/asm/func_80100770.s b/include/d/d_a/d_a_alink/asm/func_80100770.s index fb31f9abc4..a543c7ce69 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100770.s +++ b/include/d/d_a/d_a_alink/asm/func_80100770.s @@ -77,7 +77,7 @@ lbl_80100814: /* 80100898 000FD7D8 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) /* 8010089C 000FD7DC 38 7E 1E 2C */ addi r3, r30, 0x1e2c /* 801008A0 000FD7E0 38 9E 1D 5C */ addi r4, r30, 0x1d5c -/* 801008A4 000FD7E4 48 16 78 A5 */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 801008A4 000FD7E4 48 16 78 A5 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 801008A8 000FD7E8 48 00 00 20 */ b lbl_801008C8 lbl_801008AC: /* 801008AC 000FD7EC 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_80100A10.s b/include/d/d_a/d_a_alink/asm/func_80100A10.s index da85c9e582..47e39cef47 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100A10.s +++ b/include/d/d_a/d_a_alink/asm/func_80100A10.s @@ -16,7 +16,7 @@ /* 80100A4C 000FD98C 4B FA C6 A9 */ bl daAlink_c_NS_setSingleAnimeParam /* 80100A50 000FD990 38 7C 1E 2C */ addi r3, r28, 0x1e2c /* 80100A54 000FD994 7F A4 EB 78 */ mr r4, r29 -/* 80100A58 000FD998 48 16 76 F1 */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 80100A58 000FD998 48 16 76 F1 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 80100A5C 000FD99C C0 1E 00 00 */ lfs f0, 0(r30) /* 80100A60 000FD9A0 D0 1C 04 D0 */ stfs f0, 0x4d0(r28) /* 80100A64 000FD9A4 C0 1E 00 04 */ lfs f0, 4(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80100EEC.s b/include/d/d_a/d_a_alink/asm/func_80100EEC.s index e85bcb79b5..c9a5f0ec5c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100EEC.s +++ b/include/d/d_a/d_a_alink/asm/func_80100EEC.s @@ -48,7 +48,7 @@ lbl_80100F80: /* 80100F98 000FDED8 A8 A7 00 14 */ lha r5, 0x14(r7) /* 80100F9C 000FDEDC A8 C7 00 16 */ lha r6, 0x16(r7) /* 80100FA0 000FDEE0 A8 E7 00 18 */ lha r7, 0x18(r7) -/* 80100FA4 000FDEE4 48 16 F5 9D */ bl cLib_addCalcAngleS +/* 80100FA4 000FDEE4 48 16 F5 9D */ bl cLib_addCalcAngleS__FPsssss /* 80100FA8 000FDEE8 88 1E 2F 98 */ lbz r0, 0x2f98(r30) /* 80100FAC 000FDEEC 28 00 00 00 */ cmplwi r0, 0 /* 80100FB0 000FDEF0 40 82 00 10 */ bne lbl_80100FC0 @@ -75,7 +75,7 @@ lbl_80100FF0: /* 80100FF4 000FDF34 C0 02 93 AC */ lfs f0, lbl_80452DAC-_SDA2_BASE_(r2) /* 80100FF8 000FDF38 EC 00 00 B2 */ fmuls f0, f0, f2 /* 80100FFC 000FDF3C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80101000 000FDF40 48 16 65 E5 */ bl cM_rad2s +/* 80101000 000FDF40 48 16 65 E5 */ bl cM_rad2s__Ff /* 80101004 000FDF44 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 80101008 000FDF48 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 8010100C 000FDF4C 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l @@ -164,9 +164,9 @@ lbl_80101074: /* 80101150 000FE090 38 A1 00 20 */ addi r5, r1, 0x20 /* 80101154 000FE094 4B F7 35 F1 */ bl cBgS_NS_GetTriPla /* 80101158 000FE098 38 61 00 20 */ addi r3, r1, 0x20 -/* 8010115C 000FE09C 48 16 5F CD */ bl cXyz_NS_atan2sX_Z +/* 8010115C 000FE09C 48 16 5F CD */ bl atan2sX_Z__4cXyzCFv /* 80101160 000FE0A0 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80101164 000FE0A4 48 16 FC C1 */ bl cLib_distanceAngleS +/* 80101164 000FE0A4 48 16 FC C1 */ bl cLib_distanceAngleS__Fss /* 80101168 000FE0A8 2C 03 60 00 */ cmpwi r3, 0x6000 /* 8010116C 000FE0AC 40 81 00 58 */ ble lbl_801011C4 /* 80101170 000FE0B0 C0 42 94 64 */ lfs f2, lbl_80452E64-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_80101534.s b/include/d/d_a/d_a_alink/asm/func_80101534.s index 7a4ca10ca2..9a0c6b4cb6 100644 --- a/include/d/d_a/d_a_alink/asm/func_80101534.s +++ b/include/d/d_a/d_a_alink/asm/func_80101534.s @@ -54,7 +54,7 @@ lbl_801015D0: /* 801015FC 000FE53C 38 A0 00 03 */ li r5, 3 /* 80101600 000FE540 38 C0 02 00 */ li r6, 0x200 /* 80101604 000FE544 38 E0 01 00 */ li r7, 0x100 -/* 80101608 000FE548 48 16 EF 39 */ bl cLib_addCalcAngleS +/* 80101608 000FE548 48 16 EF 39 */ bl cLib_addCalcAngleS__FPsssss /* 8010160C 000FE54C A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 80101610 000FE550 B0 1E 04 DE */ sth r0, 0x4de(r30) lbl_80101614: diff --git a/include/d/d_a/d_a_alink/asm/func_801016AC.s b/include/d/d_a/d_a_alink/asm/func_801016AC.s index 38b7ec9bd2..7815147e1d 100644 --- a/include/d/d_a/d_a_alink/asm/func_801016AC.s +++ b/include/d/d_a/d_a_alink/asm/func_801016AC.s @@ -31,7 +31,7 @@ /* 80101724 000FE664 4B FF FF 19 */ bl daAlink_c_NS_setRoofHangSwitch /* 80101728 000FE668 A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 8010172C 000FE66C A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80101730 000FE670 48 16 F6 F5 */ bl cLib_distanceAngleS +/* 80101730 000FE670 48 16 F6 F5 */ bl cLib_distanceAngleS__Fss /* 80101734 000FE674 2C 03 40 00 */ cmpwi r3, 0x4000 /* 80101738 000FE678 40 81 00 18 */ ble lbl_80101750 /* 8010173C 000FE67C A8 7F 04 E6 */ lha r3, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80101D70.s b/include/d/d_a/d_a_alink/asm/func_80101D70.s index 088e92928e..0aed5ebb78 100644 --- a/include/d/d_a/d_a_alink/asm/func_80101D70.s +++ b/include/d/d_a/d_a_alink/asm/func_80101D70.s @@ -98,7 +98,7 @@ lbl_80101EE0: /* 80101EE4 000FEE24 38 81 00 5C */ addi r4, r1, 0x5c /* 80101EE8 000FEE28 3B BC 1B 78 */ addi r29, r28, 0x1b78 /* 80101EEC 000FEE2C 7F A5 EB 78 */ mr r5, r29 -/* 80101EF0 000FEE30 48 16 4C 45 */ bl cXyz_NS___mi +/* 80101EF0 000FEE30 48 16 4C 45 */ bl __mi__4cXyzCFRC3Vec /* 80101EF4 000FEE34 C0 41 00 44 */ lfs f2, 0x44(r1) /* 80101EF8 000FEE38 D0 41 00 50 */ stfs f2, 0x50(r1) /* 80101EFC 000FEE3C C0 01 00 48 */ lfs f0, 0x48(r1) @@ -181,13 +181,13 @@ lbl_8010200C: /* 8010200C 000FEF4C FF C0 08 90 */ fmr f30, f1 lbl_80102010: /* 80102010 000FEF50 38 61 00 50 */ addi r3, r1, 0x50 -/* 80102014 000FEF54 48 16 51 15 */ bl cXyz_NS_atan2sX_Z +/* 80102014 000FEF54 48 16 51 15 */ bl atan2sX_Z__4cXyzCFv /* 80102018 000FEF58 7C 7B 1B 78 */ mr r27, r3 /* 8010201C 000FEF5C C0 01 00 74 */ lfs f0, 0x74(r1) /* 80102020 000FEF60 FC 20 00 50 */ fneg f1, f0 /* 80102024 000FEF64 C0 01 00 7C */ lfs f0, 0x7c(r1) /* 80102028 000FEF68 FC 40 00 50 */ fneg f2, f0 -/* 8010202C 000FEF6C 48 16 56 49 */ bl cM_atan2s +/* 8010202C 000FEF6C 48 16 56 49 */ bl cM_atan2s__Fff /* 80102030 000FEF70 7C 03 D8 50 */ subf r0, r3, r27 /* 80102034 000FEF74 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c /* 80102038 000FEF78 7C 3F 04 2E */ lfsx f1, r31, r0 @@ -282,9 +282,9 @@ lbl_80102178: /* 80102178 000FF0B8 FC 40 08 90 */ fmr f2, f1 lbl_8010217C: /* 8010217C 000FF0BC C0 21 00 78 */ lfs f1, 0x78(r1) -/* 80102180 000FF0C0 48 16 54 F5 */ bl cM_atan2s +/* 80102180 000FF0C0 48 16 54 F5 */ bl cM_atan2s__Fff /* 80102184 000FF0C4 A8 9C 30 80 */ lha r4, 0x3080(r28) -/* 80102188 000FF0C8 48 16 EC 9D */ bl cLib_distanceAngleS +/* 80102188 000FF0C8 48 16 EC 9D */ bl cLib_distanceAngleS__Fss /* 8010218C 000FF0CC 2C 03 10 00 */ cmpwi r3, 0x1000 /* 80102190 000FF0D0 40 80 00 10 */ bge lbl_801021A0 lbl_80102194: @@ -321,7 +321,7 @@ lbl_801021A0: /* 80102208 000FF148 38 61 00 38 */ addi r3, r1, 0x38 /* 8010220C 000FF14C 38 81 00 5C */ addi r4, r1, 0x5c /* 80102210 000FF150 7F A5 EB 78 */ mr r5, r29 -/* 80102214 000FF154 48 16 49 21 */ bl cXyz_NS___mi +/* 80102214 000FF154 48 16 49 21 */ bl __mi__4cXyzCFRC3Vec /* 80102218 000FF158 C0 41 00 38 */ lfs f2, 0x38(r1) /* 8010221C 000FF15C D0 41 00 50 */ stfs f2, 0x50(r1) /* 80102220 000FF160 C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -404,13 +404,13 @@ lbl_80102330: /* 80102330 000FF270 FF A0 08 90 */ fmr f29, f1 lbl_80102334: /* 80102334 000FF274 38 61 00 50 */ addi r3, r1, 0x50 -/* 80102338 000FF278 48 16 4D F1 */ bl cXyz_NS_atan2sX_Z +/* 80102338 000FF278 48 16 4D F1 */ bl atan2sX_Z__4cXyzCFv /* 8010233C 000FF27C 7C 7D 1B 78 */ mr r29, r3 /* 80102340 000FF280 C0 01 00 74 */ lfs f0, 0x74(r1) /* 80102344 000FF284 FC 20 00 50 */ fneg f1, f0 /* 80102348 000FF288 C0 01 00 7C */ lfs f0, 0x7c(r1) /* 8010234C 000FF28C FC 40 00 50 */ fneg f2, f0 -/* 80102350 000FF290 48 16 53 25 */ bl cM_atan2s +/* 80102350 000FF290 48 16 53 25 */ bl cM_atan2s__Fff /* 80102354 000FF294 7C 03 E8 50 */ subf r0, r3, r29 /* 80102358 000FF298 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c /* 8010235C 000FF29C 7C 3F 04 2E */ lfsx f1, r31, r0 @@ -431,7 +431,7 @@ lbl_80102380: /* 80102394 000FF2D4 D0 1C 04 D8 */ stfs f0, 0x4d8(r28) /* 80102398 000FF2D8 FC 20 F8 50 */ fneg f1, f31 /* 8010239C 000FF2DC FC 40 F0 50 */ fneg f2, f30 -/* 801023A0 000FF2E0 48 16 52 D5 */ bl cM_atan2s +/* 801023A0 000FF2E0 48 16 52 D5 */ bl cM_atan2s__Fff /* 801023A4 000FF2E4 B0 7C 30 92 */ sth r3, 0x3092(r28) lbl_801023A8: /* 801023A8 000FF2E8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha diff --git a/include/d/d_a/d_a_alink/asm/func_801023E4.s b/include/d/d_a/d_a_alink/asm/func_801023E4.s index 3d278f0cdb..564a3e7c88 100644 --- a/include/d/d_a/d_a_alink/asm/func_801023E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801023E4.s @@ -162,7 +162,7 @@ lbl_80102630: /* 8010263C 000FF57C A8 A7 00 56 */ lha r5, 0x56(r7) /* 80102640 000FF580 A8 C7 00 5A */ lha r6, 0x5a(r7) /* 80102644 000FF584 A8 E7 00 58 */ lha r7, 0x58(r7) -/* 80102648 000FF588 48 16 DE F9 */ bl cLib_addCalcAngleS +/* 80102648 000FF588 48 16 DE F9 */ bl cLib_addCalcAngleS__FPsssss lbl_8010264C: /* 8010264C 000FF58C A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80102650 000FF590 B0 1F 04 DE */ sth r0, 0x4de(r31) @@ -205,7 +205,7 @@ lbl_801026A4: /* 801026DC 000FF61C A8 A7 00 50 */ lha r5, 0x50(r7) /* 801026E0 000FF620 A8 C7 00 54 */ lha r6, 0x54(r7) /* 801026E4 000FF624 A8 E7 00 52 */ lha r7, 0x52(r7) -/* 801026E8 000FF628 48 16 DE 59 */ bl cLib_addCalcAngleS +/* 801026E8 000FF628 48 16 DE 59 */ bl cLib_addCalcAngleS__FPsssss /* 801026EC 000FF62C 48 00 00 24 */ b lbl_80102710 lbl_801026F0: /* 801026F0 000FF630 38 7F 04 E6 */ addi r3, r31, 0x4e6 @@ -215,7 +215,7 @@ lbl_801026F0: /* 80102700 000FF640 A8 A7 00 56 */ lha r5, 0x56(r7) /* 80102704 000FF644 A8 C7 00 5A */ lha r6, 0x5a(r7) /* 80102708 000FF648 A8 E7 00 58 */ lha r7, 0x58(r7) -/* 8010270C 000FF64C 48 16 DE 35 */ bl cLib_addCalcAngleS +/* 8010270C 000FF64C 48 16 DE 35 */ bl cLib_addCalcAngleS__FPsssss lbl_80102710: /* 80102710 000FF650 7F E3 FB 78 */ mr r3, r31 /* 80102714 000FF654 38 80 00 C6 */ li r4, 0xc6 @@ -241,7 +241,7 @@ lbl_80102730: /* 8010275C 000FF69C 38 A0 00 02 */ li r5, 2 /* 80102760 000FF6A0 38 C0 20 00 */ li r6, 0x2000 /* 80102764 000FF6A4 38 E0 10 00 */ li r7, 0x1000 -/* 80102768 000FF6A8 48 16 DD D9 */ bl cLib_addCalcAngleS +/* 80102768 000FF6A8 48 16 DD D9 */ bl cLib_addCalcAngleS__FPsssss /* 8010276C 000FF6AC 48 00 00 08 */ b lbl_80102774 lbl_80102770: /* 80102770 000FF6B0 C3 E2 92 C0 */ lfs f31, lbl_80452CC0-_SDA2_BASE_(r2) @@ -295,7 +295,7 @@ lbl_80102800: /* 80102820 000FF760 A8 A7 00 50 */ lha r5, 0x50(r7) /* 80102824 000FF764 A8 C7 00 54 */ lha r6, 0x54(r7) /* 80102828 000FF768 A8 E7 00 52 */ lha r7, 0x52(r7) -/* 8010282C 000FF76C 48 16 DD 15 */ bl cLib_addCalcAngleS +/* 8010282C 000FF76C 48 16 DD 15 */ bl cLib_addCalcAngleS__FPsssss /* 80102830 000FF770 48 00 00 24 */ b lbl_80102854 lbl_80102834: /* 80102834 000FF774 38 7F 04 DE */ addi r3, r31, 0x4de @@ -305,7 +305,7 @@ lbl_80102834: /* 80102844 000FF784 A8 A7 00 56 */ lha r5, 0x56(r7) /* 80102848 000FF788 A8 C7 00 5A */ lha r6, 0x5a(r7) /* 8010284C 000FF78C A8 E7 00 58 */ lha r7, 0x58(r7) -/* 80102850 000FF790 48 16 DC F1 */ bl cLib_addCalcAngleS +/* 80102850 000FF790 48 16 DC F1 */ bl cLib_addCalcAngleS__FPsssss lbl_80102854: /* 80102854 000FF794 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 80102858 000FF798 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l @@ -397,7 +397,7 @@ lbl_80102988: /* 8010298C 000FF8CC 38 A0 00 05 */ li r5, 5 /* 80102990 000FF8D0 38 C0 10 00 */ li r6, 0x1000 /* 80102994 000FF8D4 38 E0 04 00 */ li r7, 0x400 -/* 80102998 000FF8D8 48 16 DB A9 */ bl cLib_addCalcAngleS +/* 80102998 000FF8D8 48 16 DB A9 */ bl cLib_addCalcAngleS__FPsssss /* 8010299C 000FF8DC 48 00 00 0C */ b lbl_801029A8 lbl_801029A0: /* 801029A0 000FF8E0 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80102B1C.s b/include/d/d_a/d_a_alink/asm/func_80102B1C.s index 659ffd3e92..18b04756d4 100644 --- a/include/d/d_a/d_a_alink/asm/func_80102B1C.s +++ b/include/d/d_a/d_a_alink/asm/func_80102B1C.s @@ -212,7 +212,7 @@ lbl_80102E0C: /* 80102E18 000FFD58 80 1E 05 78 */ lwz r0, 0x578(r30) /* 80102E1C 000FFD5C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 80102E20 000FFD60 41 82 00 44 */ beq lbl_80102E64 -/* 80102E24 000FFD64 48 16 4A 49 */ bl cM_rnd +/* 80102E24 000FFD64 48 16 4A 49 */ bl cM_rnd__Fv /* 80102E28 000FFD68 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) /* 80102E2C 000FFD6C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80102E30 000FFD70 40 80 00 18 */ bge lbl_80102E48 diff --git a/include/d/d_a/d_a_alink/asm/func_80103058.s b/include/d/d_a/d_a_alink/asm/func_80103058.s index 4815a4f60a..6ab4bcd154 100644 --- a/include/d/d_a/d_a_alink/asm/func_80103058.s +++ b/include/d/d_a/d_a_alink/asm/func_80103058.s @@ -46,7 +46,7 @@ lbl_801030E8: /* 801030F8 00100038 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 801030FC 0010003C C0 62 94 64 */ lfs f3, lbl_80452E64-_SDA2_BASE_(r2) /* 80103100 00100040 C0 82 92 B8 */ lfs f4, lbl_80452CB8-_SDA2_BASE_(r2) -/* 80103104 00100044 48 16 C8 79 */ bl cLib_addCalc +/* 80103104 00100044 48 16 C8 79 */ bl cLib_addCalc__FPfffff /* 80103108 00100048 48 00 00 0C */ b lbl_80103114 lbl_8010310C: /* 8010310C 0010004C C0 02 94 BC */ lfs f0, lbl_80452EBC-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_801033CC.s b/include/d/d_a/d_a_alink/asm/func_801033CC.s index cf8d39a08c..389e72835f 100644 --- a/include/d/d_a/d_a_alink/asm/func_801033CC.s +++ b/include/d/d_a/d_a_alink/asm/func_801033CC.s @@ -116,7 +116,7 @@ lbl_80103560: lbl_80103570: /* 80103570 001004B0 D0 3E 33 98 */ stfs f1, 0x3398(r30) /* 80103574 001004B4 38 61 00 18 */ addi r3, r1, 0x18 -/* 80103578 001004B8 48 16 3B B1 */ bl cXyz_NS_atan2sX_Z +/* 80103578 001004B8 48 16 3B B1 */ bl atan2sX_Z__4cXyzCFv /* 8010357C 001004BC B0 7E 04 DE */ sth r3, 0x4de(r30) /* 80103580 001004C0 80 1E 05 74 */ lwz r0, 0x574(r30) /* 80103584 001004C4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 diff --git a/include/d/d_a/d_a_alink/asm/func_80103698.s b/include/d/d_a/d_a_alink/asm/func_80103698.s index e724c7d330..74a16427eb 100644 --- a/include/d/d_a/d_a_alink/asm/func_80103698.s +++ b/include/d/d_a/d_a_alink/asm/func_80103698.s @@ -170,7 +170,7 @@ lbl_801038EC: /* 801038F4 00100834 41 82 00 10 */ beq lbl_80103904 /* 801038F8 00100838 38 7A 05 94 */ addi r3, r26, 0x594 /* 801038FC 0010083C C0 42 93 FC */ lfs f2, lbl_80452DFC-_SDA2_BASE_(r2) -/* 80103900 00100840 48 16 CE 41 */ bl cLib_chaseF +/* 80103900 00100840 48 16 CE 41 */ bl cLib_chaseF__FPfff lbl_80103904: /* 80103904 00100844 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 80103908 00100848 C0 1D 00 74 */ lfs f0, 0x74(r29) @@ -521,7 +521,7 @@ lbl_80103DC0: /* 80103DD4 00100D14 38 A0 00 05 */ li r5, 5 /* 80103DD8 00100D18 38 C0 10 00 */ li r6, 0x1000 /* 80103DDC 00100D1C 38 E0 01 00 */ li r7, 0x100 -/* 80103DE0 00100D20 48 16 C7 61 */ bl cLib_addCalcAngleS +/* 80103DE0 00100D20 48 16 C7 61 */ bl cLib_addCalcAngleS__FPsssss /* 80103DE4 00100D24 48 00 00 DC */ b lbl_80103EC0 lbl_80103DE8: /* 80103DE8 00100D28 2C 00 00 02 */ cmpwi r0, 2 @@ -531,7 +531,7 @@ lbl_80103DE8: /* 80103DF8 00100D38 38 A0 00 05 */ li r5, 5 /* 80103DFC 00100D3C 38 C0 10 00 */ li r6, 0x1000 /* 80103E00 00100D40 38 E0 01 00 */ li r7, 0x100 -/* 80103E04 00100D44 48 16 C7 3D */ bl cLib_addCalcAngleS +/* 80103E04 00100D44 48 16 C7 3D */ bl cLib_addCalcAngleS__FPsssss /* 80103E08 00100D48 38 00 00 00 */ li r0, 0 /* 80103E0C 00100D4C B0 1A 30 10 */ sth r0, 0x3010(r26) /* 80103E10 00100D50 48 00 00 B0 */ b lbl_80103EC0 @@ -563,7 +563,7 @@ lbl_80103E68: /* 80103E6C 00100DAC 38 A0 00 05 */ li r5, 5 /* 80103E70 00100DB0 38 C0 02 00 */ li r6, 0x200 /* 80103E74 00100DB4 38 E0 00 80 */ li r7, 0x80 -/* 80103E78 00100DB8 48 16 C6 C9 */ bl cLib_addCalcAngleS +/* 80103E78 00100DB8 48 16 C6 C9 */ bl cLib_addCalcAngleS__FPsssss /* 80103E7C 00100DBC 48 00 00 44 */ b lbl_80103EC0 lbl_80103E80: /* 80103E80 00100DC0 A8 9A 30 80 */ lha r4, 0x3080(r26) diff --git a/include/d/d_a/d_a_alink/asm/func_80104034.s b/include/d/d_a/d_a_alink/asm/func_80104034.s index b4c480bf8c..80953dbd05 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104034.s +++ b/include/d/d_a/d_a_alink/asm/func_80104034.s @@ -4,7 +4,7 @@ /* 80104040 00100F80 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80104044 00100F84 7C 7F 1B 78 */ mr r31, r3 /* 80104048 00100F88 C0 22 94 A8 */ lfs f1, lbl_80452EA8-_SDA2_BASE_(r2) -/* 8010404C 00100F8C 48 16 39 09 */ bl cM_rndF +/* 8010404C 00100F8C 48 16 39 09 */ bl cM_rndF__Ff /* 80104050 00100F90 C0 02 95 DC */ lfs f0, lbl_80452FDC-_SDA2_BASE_(r2) /* 80104054 00100F94 EC 20 08 2A */ fadds f1, f0, f1 /* 80104058 00100F98 C0 02 95 D8 */ lfs f0, lbl_80452FD8-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_8010519C.s b/include/d/d_a/d_a_alink/asm/func_8010519C.s index 9ad6d66c6b..58ee87b1ef 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010519C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010519C.s @@ -169,7 +169,7 @@ lbl_801053D8: lbl_80105400: /* 80105400 00102340 38 61 00 0C */ addi r3, r1, 0xc /* 80105404 00102344 7F C4 F3 78 */ mr r4, r30 -/* 80105408 00102348 48 16 19 29 */ bl cXyz_NS_normZP +/* 80105408 00102348 48 16 19 29 */ bl normZP__4cXyzCFv /* 8010540C 0010234C C0 01 00 0C */ lfs f0, 0xc(r1) /* 80105410 00102350 D0 1D 37 50 */ stfs f0, 0x3750(r29) /* 80105414 00102354 C0 01 00 10 */ lfs f0, 0x10(r1) @@ -231,7 +231,7 @@ lbl_8010548C: /* 801054F0 00102430 AB 83 00 78 */ lha r28, 0x78(r3) /* 801054F4 00102434 7C 1C 00 D0 */ neg r0, r28 /* 801054F8 00102438 7C 1E 07 34 */ extsh r30, r0 -/* 801054FC 0010243C 48 16 21 79 */ bl cM_atan2s +/* 801054FC 0010243C 48 16 21 79 */ bl cM_atan2s__Fff /* 80105500 00102440 7C 64 07 34 */ extsh r4, r3 /* 80105504 00102444 7C 04 F0 00 */ cmpw r4, r30 /* 80105508 00102448 40 80 00 08 */ bge lbl_80105510 @@ -263,7 +263,7 @@ lbl_80105524: lbl_80105564: /* 80105564 001024A4 C0 21 00 24 */ lfs f1, 0x24(r1) /* 80105568 001024A8 FC 40 10 50 */ fneg f2, f2 -/* 8010556C 001024AC 48 16 21 09 */ bl cM_atan2s +/* 8010556C 001024AC 48 16 21 09 */ bl cM_atan2s__Fff /* 80105570 001024B0 7C 64 07 34 */ extsh r4, r3 /* 80105574 001024B4 7C 04 F0 00 */ cmpw r4, r30 /* 80105578 001024B8 40 80 00 08 */ bge lbl_80105580 @@ -281,7 +281,7 @@ lbl_80105594: /* 8010559C 001024DC FC 20 00 50 */ fneg f1, f0 /* 801055A0 001024E0 C0 01 00 2C */ lfs f0, 0x2c(r1) /* 801055A4 001024E4 FC 40 00 50 */ fneg f2, f0 -/* 801055A8 001024E8 48 16 20 CD */ bl cM_atan2s +/* 801055A8 001024E8 48 16 20 CD */ bl cM_atan2s__Fff /* 801055AC 001024EC 4B FA DE E9 */ bl daAlink_c_NS_getDirectionFromAngle /* 801055B0 001024F0 2C 1F 00 00 */ cmpwi r31, 0 /* 801055B4 001024F4 41 82 00 3C */ beq lbl_801055F0 diff --git a/include/d/d_a/d_a_alink/asm/func_80105728.s b/include/d/d_a/d_a_alink/asm/func_80105728.s index 679567f1de..eed048cbc8 100644 --- a/include/d/d_a/d_a_alink/asm/func_80105728.s +++ b/include/d/d_a/d_a_alink/asm/func_80105728.s @@ -17,7 +17,7 @@ /* 80105768 001026A8 EC 00 08 28 */ fsubs f0, f0, f1 /* 8010576C 001026AC EC 02 00 28 */ fsubs f0, f2, f0 /* 80105770 001026B0 EC 23 00 32 */ fmuls f1, f3, f0 -/* 80105774 001026B4 48 16 1E 71 */ bl cM_rad2s +/* 80105774 001026B4 48 16 1E 71 */ bl cM_rad2s__Ff /* 80105778 001026B8 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 8010577C 001026BC 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 80105780 001026C0 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l diff --git a/include/d/d_a/d_a_alink/asm/func_80105A00.s b/include/d/d_a/d_a_alink/asm/func_80105A00.s index b3e3ce29bb..0b09312278 100644 --- a/include/d/d_a/d_a_alink/asm/func_80105A00.s +++ b/include/d/d_a/d_a_alink/asm/func_80105A00.s @@ -16,7 +16,7 @@ lbl_80105A30: /* 80105A38 00102978 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 80105A3C 0010297C C0 7F 34 78 */ lfs f3, 0x3478(r31) /* 80105A40 00102980 C0 82 93 A0 */ lfs f4, lbl_80452DA0-_SDA2_BASE_(r2) -/* 80105A44 00102984 48 16 9F 39 */ bl cLib_addCalc +/* 80105A44 00102984 48 16 9F 39 */ bl cLib_addCalc__FPfffff /* 80105A48 00102988 38 00 00 07 */ li r0, 7 /* 80105A4C 0010298C 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 80105A50 00102990 38 7F 1F D0 */ addi r3, r31, 0x1fd0 diff --git a/include/d/d_a/d_a_alink/asm/func_80105B58.s b/include/d/d_a/d_a_alink/asm/func_80105B58.s index 1059b43b1b..d6178558bd 100644 --- a/include/d/d_a/d_a_alink/asm/func_80105B58.s +++ b/include/d/d_a/d_a_alink/asm/func_80105B58.s @@ -57,7 +57,7 @@ lbl_80105C20: /* 80105C2C 00102B6C 41 82 00 50 */ beq lbl_80105C7C /* 80105C30 00102B70 7F C3 F3 78 */ mr r3, r30 /* 80105C34 00102B74 A8 84 18 EC */ lha r4, 0x18ec(r4) -/* 80105C38 00102B78 48 16 B1 ED */ bl cLib_distanceAngleS +/* 80105C38 00102B78 48 16 B1 ED */ bl cLib_distanceAngleS__Fss /* 80105C3C 00102B7C 2C 03 20 00 */ cmpwi r3, 0x2000 /* 80105C40 00102B80 41 81 00 3C */ bgt lbl_80105C7C /* 80105C44 00102B84 C0 1B 33 98 */ lfs f0, 0x3398(r27) @@ -199,7 +199,7 @@ lbl_80105E28: /* 80105E34 00102D74 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) lbl_80105E38: /* 80105E38 00102D78 C0 41 00 20 */ lfs f2, 0x20(r1) -/* 80105E3C 00102D7C 48 16 18 39 */ bl cM_atan2s +/* 80105E3C 00102D7C 48 16 18 39 */ bl cM_atan2s__Fff /* 80105E40 00102D80 B0 7B 30 0E */ sth r3, 0x300e(r27) /* 80105E44 00102D84 A8 1B 30 0E */ lha r0, 0x300e(r27) /* 80105E48 00102D88 2C 00 00 00 */ cmpwi r0, 0 @@ -208,7 +208,7 @@ lbl_80105E38: /* 80105E54 00102D94 48 00 00 0C */ b lbl_80105E60 lbl_80105E58: /* 80105E58 00102D98 38 61 00 1C */ addi r3, r1, 0x1c -/* 80105E5C 00102D9C 48 16 12 CD */ bl cXyz_NS_atan2sX_Z +/* 80105E5C 00102D9C 48 16 12 CD */ bl atan2sX_Z__4cXyzCFv lbl_80105E60: /* 80105E60 00102DA0 7C 7E 1B 78 */ mr r30, r3 /* 80105E64 00102DA4 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -275,7 +275,7 @@ lbl_80105F44: /* 80105F48 00102E88 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80105F4C 00102E8C C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 80105F50 00102E90 C0 82 93 A0 */ lfs f4, lbl_80452DA0-_SDA2_BASE_(r2) -/* 80105F54 00102E94 48 16 9A 29 */ bl cLib_addCalc +/* 80105F54 00102E94 48 16 9A 29 */ bl cLib_addCalc__FPfffff /* 80105F58 00102E98 C0 1B 33 98 */ lfs f0, 0x3398(r27) /* 80105F5C 00102E9C C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) /* 80105F60 00102EA0 FC 00 08 40 */ fcmpo cr0, f0, f1 @@ -375,7 +375,7 @@ lbl_8010609C: /* 801060C0 00103000 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 801060C4 00103004 C0 62 95 F0 */ lfs f3, lbl_80452FF0-_SDA2_BASE_(r2) /* 801060C8 00103008 C0 82 93 A0 */ lfs f4, lbl_80452DA0-_SDA2_BASE_(r2) -/* 801060CC 0010300C 48 16 98 B1 */ bl cLib_addCalc +/* 801060CC 0010300C 48 16 98 B1 */ bl cLib_addCalc__FPfffff /* 801060D0 00103010 7F 63 DB 78 */ mr r3, r27 /* 801060D4 00103014 C0 21 00 0C */ lfs f1, 0xc(r1) /* 801060D8 00103018 4B FA 66 61 */ bl daAlink_c_NS_setDoubleAnimeBlendRatio @@ -408,7 +408,7 @@ lbl_80106130: /* 80106138 00103078 38 A0 00 1E */ li r5, 0x1e /* 8010613C 0010307C 38 C0 08 00 */ li r6, 0x800 /* 80106140 00103080 38 E0 00 10 */ li r7, 0x10 -/* 80106144 00103084 48 16 A3 FD */ bl cLib_addCalcAngleS +/* 80106144 00103084 48 16 A3 FD */ bl cLib_addCalcAngleS__FPsssss /* 80106148 00103088 80 1B 31 A0 */ lwz r0, 0x31a0(r27) /* 8010614C 0010308C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80106150 00103090 40 82 00 14 */ bne lbl_80106164 @@ -427,7 +427,7 @@ lbl_8010616C: /* 8010617C 001030BC 38 A0 00 0A */ li r5, 0xa /* 80106180 001030C0 38 C0 08 00 */ li r6, 0x800 /* 80106184 001030C4 38 E0 00 40 */ li r7, 0x40 -/* 80106188 001030C8 48 16 A3 B9 */ bl cLib_addCalcAngleS +/* 80106188 001030C8 48 16 A3 B9 */ bl cLib_addCalcAngleS__FPsssss /* 8010618C 001030CC A8 1B 2F EE */ lha r0, 0x2fee(r27) /* 80106190 001030D0 7C 00 0E 70 */ srawi r0, r0, 1 /* 80106194 001030D4 B0 1B 04 E8 */ sth r0, 0x4e8(r27) @@ -523,7 +523,7 @@ lbl_801062C8: lbl_801062EC: /* 801062EC 0010322C C0 02 95 F4 */ lfs f0, lbl_80452FF4-_SDA2_BASE_(r2) /* 801062F0 00103230 EC 20 07 B2 */ fmuls f1, f0, f30 -/* 801062F4 00103234 48 16 12 F1 */ bl cM_rad2s +/* 801062F4 00103234 48 16 12 F1 */ bl cM_rad2s__Ff /* 801062F8 00103238 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 801062FC 0010323C 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 80106300 00103240 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l @@ -567,13 +567,13 @@ lbl_8010638C: /* 80106390 001032D0 C0 02 93 A0 */ lfs f0, lbl_80452DA0-_SDA2_BASE_(r2) /* 80106394 001032D4 FC 03 00 40 */ fcmpo cr0, f3, f0 /* 80106398 001032D8 40 81 00 50 */ ble lbl_801063E8 -/* 8010639C 001032DC 48 16 12 D9 */ bl cM_atan2s +/* 8010639C 001032DC 48 16 12 D9 */ bl cM_atan2s__Fff /* 801063A0 001032E0 7C 64 1B 78 */ mr r4, r3 /* 801063A4 001032E4 38 7B 04 E6 */ addi r3, r27, 0x4e6 /* 801063A8 001032E8 38 A0 00 02 */ li r5, 2 /* 801063AC 001032EC 38 C0 20 00 */ li r6, 0x2000 /* 801063B0 001032F0 38 E0 08 00 */ li r7, 0x800 -/* 801063B4 001032F4 48 16 A1 8D */ bl cLib_addCalcAngleS +/* 801063B4 001032F4 48 16 A1 8D */ bl cLib_addCalcAngleS__FPsssss /* 801063B8 001032F8 A8 1B 04 E6 */ lha r0, 0x4e6(r27) /* 801063BC 001032FC B0 1B 04 DE */ sth r0, 0x4de(r27) /* 801063C0 00103300 48 00 00 28 */ b lbl_801063E8 @@ -581,13 +581,13 @@ lbl_801063C4: /* 801063C4 00103304 38 7B 33 98 */ addi r3, r27, 0x3398 /* 801063C8 00103308 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801063CC 0010330C C0 42 93 88 */ lfs f2, lbl_80452D88-_SDA2_BASE_(r2) -/* 801063D0 00103310 48 16 A3 71 */ bl cLib_chaseF +/* 801063D0 00103310 48 16 A3 71 */ bl cLib_chaseF__FPfff /* 801063D4 00103314 48 00 00 14 */ b lbl_801063E8 lbl_801063D8: /* 801063D8 00103318 38 7B 33 98 */ addi r3, r27, 0x3398 /* 801063DC 0010331C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801063E0 00103320 C0 42 93 88 */ lfs f2, lbl_80452D88-_SDA2_BASE_(r2) -/* 801063E4 00103324 48 16 A3 5D */ bl cLib_chaseF +/* 801063E4 00103324 48 16 A3 5D */ bl cLib_chaseF__FPfff lbl_801063E8: /* 801063E8 00103328 C0 3B 33 AC */ lfs f1, 0x33ac(r27) /* 801063EC 0010332C C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) @@ -624,14 +624,14 @@ lbl_8010644C: /* 80106460 001033A0 40 81 00 10 */ ble lbl_80106470 /* 80106464 001033A4 38 7B 33 98 */ addi r3, r27, 0x3398 /* 80106468 001033A8 C0 42 93 2C */ lfs f2, lbl_80452D2C-_SDA2_BASE_(r2) -/* 8010646C 001033AC 48 16 A2 D5 */ bl cLib_chaseF +/* 8010646C 001033AC 48 16 A2 D5 */ bl cLib_chaseF__FPfff lbl_80106470: /* 80106470 001033B0 38 7B 04 E4 */ addi r3, r27, 0x4e4 /* 80106474 001033B4 A8 9B 2F F0 */ lha r4, 0x2ff0(r27) /* 80106478 001033B8 38 A0 00 04 */ li r5, 4 /* 8010647C 001033BC 38 C0 10 00 */ li r6, 0x1000 /* 80106480 001033C0 38 E0 01 00 */ li r7, 0x100 -/* 80106484 001033C4 48 16 A0 BD */ bl cLib_addCalcAngleS +/* 80106484 001033C4 48 16 A0 BD */ bl cLib_addCalcAngleS__FPsssss /* 80106488 001033C8 C0 3B 33 98 */ lfs f1, 0x3398(r27) /* 8010648C 001033CC C0 02 93 3C */ lfs f0, lbl_80452D3C-_SDA2_BASE_(r2) /* 80106490 001033D0 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -666,7 +666,7 @@ lbl_801064F0: /* 801064F8 00103438 38 A0 00 04 */ li r5, 4 /* 801064FC 0010343C 38 C0 00 64 */ li r6, 0x64 /* 80106500 00103440 38 E0 00 0A */ li r7, 0xa -/* 80106504 00103444 48 16 A0 3D */ bl cLib_addCalcAngleS +/* 80106504 00103444 48 16 A0 3D */ bl cLib_addCalcAngleS__FPsssss lbl_80106508: /* 80106508 00103448 38 60 00 00 */ li r3, 0 lbl_8010650C: diff --git a/include/d/d_a/d_a_alink/asm/func_80106774.s b/include/d/d_a/d_a_alink/asm/func_80106774.s index a31a950007..f3244042ac 100644 --- a/include/d/d_a/d_a_alink/asm/func_80106774.s +++ b/include/d/d_a/d_a_alink/asm/func_80106774.s @@ -42,7 +42,7 @@ lbl_801067E8: /* 80106810 00103750 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 80106814 00103754 38 84 04 D0 */ addi r4, r4, 0x4d0 /* 80106818 00103758 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 8010681C 0010375C 48 16 03 19 */ bl cXyz_NS___mi +/* 8010681C 0010375C 48 16 03 19 */ bl __mi__4cXyzCFRC3Vec /* 80106820 00103760 C0 01 00 18 */ lfs f0, 0x18(r1) /* 80106824 00103764 D0 01 00 24 */ stfs f0, 0x24(r1) /* 80106828 00103768 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -52,7 +52,7 @@ lbl_801067E8: /* 80106838 00103778 C0 02 93 20 */ lfs f0, lbl_80452D20-_SDA2_BASE_(r2) /* 8010683C 0010377C D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 80106840 00103780 38 61 00 24 */ addi r3, r1, 0x24 -/* 80106844 00103784 48 16 08 E5 */ bl cXyz_NS_atan2sX_Z +/* 80106844 00103784 48 16 08 E5 */ bl atan2sX_Z__4cXyzCFv /* 80106848 00103788 B0 7F 04 E6 */ sth r3, 0x4e6(r31) /* 8010684C 0010378C C0 01 00 24 */ lfs f0, 0x24(r1) /* 80106850 00103790 D0 01 00 0C */ stfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801070DC.s b/include/d/d_a/d_a_alink/asm/func_801070DC.s index fcb41af91e..2a8e6f22f3 100644 --- a/include/d/d_a/d_a_alink/asm/func_801070DC.s +++ b/include/d/d_a/d_a_alink/asm/func_801070DC.s @@ -60,7 +60,7 @@ lbl_801071B4: /* 801071BC 001040FC 38 A0 00 05 */ li r5, 5 /* 801071C0 00104100 38 C0 1B 58 */ li r6, 0x1b58 /* 801071C4 00104104 38 E0 07 D0 */ li r7, 0x7d0 -/* 801071C8 00104108 48 16 93 79 */ bl cLib_addCalcAngleS +/* 801071C8 00104108 48 16 93 79 */ bl cLib_addCalcAngleS__FPsssss /* 801071CC 0010410C A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 801071D0 00104110 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 801071D4 00104114 80 1F 31 A0 */ lwz r0, 0x31a0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80107744.s b/include/d/d_a/d_a_alink/asm/func_80107744.s index 472fd933cb..ff2a33f5f8 100644 --- a/include/d/d_a/d_a_alink/asm/func_80107744.s +++ b/include/d/d_a/d_a_alink/asm/func_80107744.s @@ -34,10 +34,10 @@ lbl_801077B4: /* 801077C0 00104700 38 7F 34 7C */ addi r3, r31, 0x347c /* 801077C4 00104704 C0 3F 34 78 */ lfs f1, 0x3478(r31) /* 801077C8 00104708 C0 42 93 78 */ lfs f2, lbl_80452D78-_SDA2_BASE_(r2) -/* 801077CC 0010470C 48 16 8F 75 */ bl cLib_chaseF +/* 801077CC 0010470C 48 16 8F 75 */ bl cLib_chaseF__FPfff /* 801077D0 00104710 38 7F 10 DC */ addi r3, r31, 0x10dc /* 801077D4 00104714 C0 3F 34 7C */ lfs f1, 0x347c(r31) -/* 801077D8 00104718 48 16 7F 31 */ bl cM3dGSph_NS_SetR +/* 801077D8 00104718 48 16 7F 31 */ bl SetR__8cM3dGSphFf /* 801077DC 0010471C 80 1F 05 84 */ lwz r0, 0x584(r31) /* 801077E0 00104720 60 00 00 40 */ ori r0, r0, 0x40 /* 801077E4 00104724 90 1F 05 84 */ stw r0, 0x584(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80107900.s b/include/d/d_a/d_a_alink/asm/func_80107900.s index 247ac3cf5a..3b20fa58a5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80107900.s +++ b/include/d/d_a/d_a_alink/asm/func_80107900.s @@ -117,7 +117,7 @@ lbl_80107AB0: /* 80107AC8 00104A08 38 61 00 70 */ addi r3, r1, 0x70 /* 80107ACC 00104A0C 38 9D 37 EC */ addi r4, r29, 0x37ec /* 80107AD0 00104A10 7F 85 E3 78 */ mr r5, r28 -/* 80107AD4 00104A14 48 15 F0 61 */ bl cXyz_NS___mi +/* 80107AD4 00104A14 48 15 F0 61 */ bl __mi__4cXyzCFRC3Vec /* 80107AD8 00104A18 C0 01 00 70 */ lfs f0, 0x70(r1) /* 80107ADC 00104A1C D0 01 00 AC */ stfs f0, 0xac(r1) /* 80107AE0 00104A20 C0 01 00 74 */ lfs f0, 0x74(r1) @@ -313,17 +313,17 @@ lbl_80107D7C: /* 80107D84 00104CC4 4C 41 13 82 */ cror 2, 1, 2 /* 80107D88 00104CC8 40 82 00 10 */ bne lbl_80107D98 /* 80107D8C 00104CCC 38 61 00 AC */ addi r3, r1, 0xac -/* 80107D90 00104CD0 48 15 F3 99 */ bl cXyz_NS_atan2sX_Z +/* 80107D90 00104CD0 48 15 F3 99 */ bl atan2sX_Z__4cXyzCFv /* 80107D94 00104CD4 7C 7A 1B 78 */ mr r26, r3 lbl_80107D98: /* 80107D98 00104CD8 38 61 00 AC */ addi r3, r1, 0xac -/* 80107D9C 00104CDC 48 15 F3 B5 */ bl cXyz_NS_atan2sY_XZ +/* 80107D9C 00104CDC 48 15 F3 B5 */ bl atan2sY_XZ__4cXyzCFv /* 80107DA0 00104CE0 7C 75 1B 78 */ mr r21, r3 /* 80107DA4 00104CE4 38 61 00 64 */ addi r3, r1, 0x64 /* 80107DA8 00104CE8 38 81 00 AC */ addi r4, r1, 0xac /* 80107DAC 00104CEC C0 02 93 30 */ lfs f0, lbl_80452D30-_SDA2_BASE_(r2) /* 80107DB0 00104CF0 EC 20 E8 24 */ fdivs f1, f0, f29 -/* 80107DB4 00104CF4 48 15 ED D1 */ bl cXyz_NS___ml +/* 80107DB4 00104CF4 48 15 ED D1 */ bl __ml__4cXyzCFf /* 80107DB8 00104CF8 C0 01 00 64 */ lfs f0, 0x64(r1) /* 80107DBC 00104CFC D0 01 00 94 */ stfs f0, 0x94(r1) /* 80107DC0 00104D00 C0 01 00 68 */ lfs f0, 0x68(r1) @@ -384,7 +384,7 @@ lbl_80107E88: /* 80107E8C 00104DCC 3A FD 37 EC */ addi r23, r29, 0x37ec /* 80107E90 00104DD0 38 61 00 58 */ addi r3, r1, 0x58 /* 80107E94 00104DD4 7E E5 BB 78 */ mr r5, r23 -/* 80107E98 00104DD8 48 15 EC 9D */ bl cXyz_NS___mi +/* 80107E98 00104DD8 48 15 EC 9D */ bl __mi__4cXyzCFRC3Vec /* 80107E9C 00104DDC C0 01 00 58 */ lfs f0, 0x58(r1) /* 80107EA0 00104DE0 D0 01 00 88 */ stfs f0, 0x88(r1) /* 80107EA4 00104DE4 C0 01 00 5C */ lfs f0, 0x5c(r1) @@ -477,10 +477,10 @@ lbl_80107FA8: /* 80107FD8 00104F18 C0 17 00 08 */ lfs f0, 8(r23) /* 80107FDC 00104F1C D0 01 00 84 */ stfs f0, 0x84(r1) /* 80107FE0 00104F20 38 61 00 88 */ addi r3, r1, 0x88 -/* 80107FE4 00104F24 48 15 F1 45 */ bl cXyz_NS_atan2sX_Z +/* 80107FE4 00104F24 48 15 F1 45 */ bl atan2sX_Z__4cXyzCFv /* 80107FE8 00104F28 7C 76 1B 78 */ mr r22, r3 /* 80107FEC 00104F2C 38 61 00 88 */ addi r3, r1, 0x88 -/* 80107FF0 00104F30 48 15 F1 61 */ bl cXyz_NS_atan2sY_XZ +/* 80107FF0 00104F30 48 15 F1 61 */ bl atan2sY_XZ__4cXyzCFv /* 80107FF4 00104F34 B0 61 00 2C */ sth r3, 0x2c(r1) /* 80107FF8 00104F38 B2 C1 00 2E */ sth r22, 0x2e(r1) /* 80107FFC 00104F3C 38 60 00 00 */ li r3, 0 @@ -527,13 +527,13 @@ lbl_8010806C: /* 8010809C 00104FDC 48 00 00 BC */ b lbl_80108158 lbl_801080A0: /* 801080A0 00104FE0 EC 3C 07 72 */ fmuls f1, f28, f29 -/* 801080A4 00104FE4 48 15 F5 41 */ bl cM_rad2s +/* 801080A4 00104FE4 48 15 F5 41 */ bl cM_rad2s__Ff /* 801080A8 00104FE8 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 801080AC 00104FEC 7C 1F 04 2E */ lfsx f0, r31, r0 /* 801080B0 00104FF0 EF F9 00 32 */ fmuls f31, f25, f0 /* 801080B4 00104FF4 EC 3F D0 28 */ fsubs f1, f31, f26 /* 801080B8 00104FF8 C0 42 93 3C */ lfs f2, lbl_80452D3C-_SDA2_BASE_(r2) -/* 801080BC 00104FFC 48 15 F5 B9 */ bl cM_atan2s +/* 801080BC 00104FFC 48 15 F5 B9 */ bl cM_atan2s__Fff /* 801080C0 00105000 7C 76 1B 78 */ mr r22, r3 /* 801080C4 00105004 A8 01 00 2C */ lha r0, 0x2c(r1) /* 801080C8 00105008 7C 00 B2 14 */ add r0, r0, r22 @@ -580,7 +580,7 @@ lbl_80108160: /* 80108164 001050A4 3A DD 38 04 */ addi r22, r29, 0x3804 /* 80108168 001050A8 38 61 00 4C */ addi r3, r1, 0x4c /* 8010816C 001050AC 7E C5 B3 78 */ mr r5, r22 -/* 80108170 001050B0 48 15 E9 C5 */ bl cXyz_NS___mi +/* 80108170 001050B0 48 15 E9 C5 */ bl __mi__4cXyzCFRC3Vec /* 80108174 001050B4 C0 01 00 4C */ lfs f0, 0x4c(r1) /* 80108178 001050B8 D0 01 00 88 */ stfs f0, 0x88(r1) /* 8010817C 001050BC C0 01 00 50 */ lfs f0, 0x50(r1) @@ -673,10 +673,10 @@ lbl_80108280: /* 801082B0 001051F0 C0 16 00 08 */ lfs f0, 8(r22) /* 801082B4 001051F4 D0 01 00 84 */ stfs f0, 0x84(r1) /* 801082B8 001051F8 38 61 00 88 */ addi r3, r1, 0x88 -/* 801082BC 001051FC 48 15 EE 6D */ bl cXyz_NS_atan2sX_Z +/* 801082BC 001051FC 48 15 EE 6D */ bl atan2sX_Z__4cXyzCFv /* 801082C0 00105200 7C 79 1B 78 */ mr r25, r3 /* 801082C4 00105204 38 61 00 88 */ addi r3, r1, 0x88 -/* 801082C8 00105208 48 15 EE 89 */ bl cXyz_NS_atan2sY_XZ +/* 801082C8 00105208 48 15 EE 89 */ bl atan2sY_XZ__4cXyzCFv /* 801082CC 0010520C B0 61 00 2C */ sth r3, 0x2c(r1) /* 801082D0 00105210 B3 21 00 2E */ sth r25, 0x2e(r1) /* 801082D4 00105214 38 00 00 00 */ li r0, 0 @@ -710,7 +710,7 @@ lbl_801082F8: /* 80108340 00105280 38 61 00 40 */ addi r3, r1, 0x40 /* 80108344 00105284 38 81 00 88 */ addi r4, r1, 0x88 /* 80108348 00105288 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 8010834C 0010528C 48 15 E8 39 */ bl cXyz_NS___ml +/* 8010834C 0010528C 48 15 E8 39 */ bl __ml__4cXyzCFf /* 80108350 00105290 38 61 00 7C */ addi r3, r1, 0x7c /* 80108354 00105294 38 81 00 40 */ addi r4, r1, 0x40 /* 80108358 00105298 7C 65 1B 78 */ mr r5, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_80109890.s b/include/d/d_a/d_a_alink/asm/func_80109890.s index 4386c10dfd..33c1b4b333 100644 --- a/include/d/d_a/d_a_alink/asm/func_80109890.s +++ b/include/d/d_a/d_a_alink/asm/func_80109890.s @@ -35,7 +35,7 @@ lbl_801098C8: /* 80109910 00106850 38 61 00 1C */ addi r3, r1, 0x1c /* 80109914 00106854 38 9F 38 04 */ addi r4, r31, 0x3804 /* 80109918 00106858 38 A1 00 28 */ addi r5, r1, 0x28 -/* 8010991C 0010685C 48 15 D2 19 */ bl cXyz_NS___mi +/* 8010991C 0010685C 48 15 D2 19 */ bl __mi__4cXyzCFRC3Vec /* 80109920 00106860 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 80109924 00106864 38 81 00 1C */ addi r4, r1, 0x1c /* 80109928 00106868 7C 65 1B 78 */ mr r5, r3 @@ -85,7 +85,7 @@ lbl_8010999C: /* 801099D0 00106910 38 80 00 00 */ li r4, 0 /* 801099D4 00106914 A8 BF 30 22 */ lha r5, 0x3022(r31) /* 801099D8 00106918 38 C0 00 00 */ li r6, 0 -/* 801099DC 0010691C 48 15 DA 19 */ bl csXyz_X1_ +/* 801099DC 0010691C 48 15 DA 19 */ bl __ct__5csXyzFsss /* 801099E0 00106920 7F C3 F3 78 */ mr r3, r30 /* 801099E4 00106924 7F A4 EB 78 */ mr r4, r29 /* 801099E8 00106928 38 A0 00 01 */ li r5, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_80109AAC.s b/include/d/d_a/d_a_alink/asm/func_80109AAC.s index 5087c2c61f..0a9f9790fa 100644 --- a/include/d/d_a/d_a_alink/asm/func_80109AAC.s +++ b/include/d/d_a/d_a_alink/asm/func_80109AAC.s @@ -60,7 +60,7 @@ lbl_80109B70: /* 80109B88 00106AC8 A8 9F 30 1C */ lha r4, 0x301c(r31) /* 80109B8C 00106ACC A8 BF 30 1E */ lha r5, 0x301e(r31) /* 80109B90 00106AD0 38 C0 00 00 */ li r6, 0 -/* 80109B94 00106AD4 48 15 D8 61 */ bl csXyz_X1_ +/* 80109B94 00106AD4 48 15 D8 61 */ bl __ct__5csXyzFsss /* 80109B98 00106AD8 7F A3 EB 78 */ mr r3, r29 /* 80109B9C 00106ADC 38 9F 1E 2C */ addi r4, r31, 0x1e2c /* 80109BA0 00106AE0 38 A0 00 01 */ li r5, 1 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 3a6ec40fca..7db8169eb8 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 @@ -383,7 +383,7 @@ lbl_8010A148: /* 8010A148 00107088 38 7F 37 EC */ addi r3, r31, 0x37ec /* 8010A14C 0010708C 38 9F 37 E0 */ addi r4, r31, 0x37e0 /* 8010A150 00107090 FC 20 F8 90 */ fmr f1, f31 -/* 8010A154 00107094 48 16 66 59 */ bl cLib_chasePos +/* 8010A154 00107094 48 16 66 59 */ bl cLib_chasePos__FP4cXyzRC4cXyzf /* 8010A158 00107098 2C 03 00 00 */ cmpwi r3, 0 /* 8010A15C 0010709C 41 82 00 10 */ beq lbl_8010A16C /* 8010A160 001070A0 7F E3 FB 78 */ mr r3, r31 @@ -393,7 +393,7 @@ lbl_8010A16C: /* 8010A16C 001070AC 38 61 01 4C */ addi r3, r1, 0x14c /* 8010A170 001070B0 38 9F 37 EC */ addi r4, r31, 0x37ec /* 8010A174 001070B4 38 BF 37 E0 */ addi r5, r31, 0x37e0 -/* 8010A178 001070B8 48 15 C9 BD */ bl cXyz_NS___mi +/* 8010A178 001070B8 48 15 C9 BD */ bl __mi__4cXyzCFRC3Vec /* 8010A17C 001070BC C0 01 01 4C */ lfs f0, 0x14c(r1) /* 8010A180 001070C0 D0 01 01 AC */ stfs f0, 0x1ac(r1) /* 8010A184 001070C4 C0 01 01 50 */ lfs f0, 0x150(r1) @@ -401,10 +401,10 @@ lbl_8010A16C: /* 8010A18C 001070CC C0 01 01 54 */ lfs f0, 0x154(r1) /* 8010A190 001070D0 D0 01 01 B4 */ stfs f0, 0x1b4(r1) /* 8010A194 001070D4 38 61 01 AC */ addi r3, r1, 0x1ac -/* 8010A198 001070D8 48 15 CF B9 */ bl cXyz_NS_atan2sY_XZ +/* 8010A198 001070D8 48 15 CF B9 */ bl atan2sY_XZ__4cXyzCFv /* 8010A19C 001070DC B0 7F 30 1C */ sth r3, 0x301c(r31) /* 8010A1A0 001070E0 38 61 01 AC */ addi r3, r1, 0x1ac -/* 8010A1A4 001070E4 48 15 CF 85 */ bl cXyz_NS_atan2sX_Z +/* 8010A1A4 001070E4 48 15 CF 85 */ bl atan2sX_Z__4cXyzCFv /* 8010A1A8 001070E8 B0 7F 30 1E */ sth r3, 0x301e(r31) /* 8010A1AC 001070EC 7F E3 FB 78 */ mr r3, r31 /* 8010A1B0 001070F0 3C 80 00 02 */ lis r4, 0x0002004A@ha @@ -422,7 +422,7 @@ lbl_8010A1C8: /* 8010A1DC 0010711C 38 61 01 40 */ addi r3, r1, 0x140 /* 8010A1E0 00107120 38 9F 37 EC */ addi r4, r31, 0x37ec /* 8010A1E4 00107124 38 BF 37 F8 */ addi r5, r31, 0x37f8 -/* 8010A1E8 00107128 48 15 C9 4D */ bl cXyz_NS___mi +/* 8010A1E8 00107128 48 15 C9 4D */ bl __mi__4cXyzCFRC3Vec /* 8010A1EC 0010712C C0 01 01 40 */ lfs f0, 0x140(r1) /* 8010A1F0 00107130 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) /* 8010A1F4 00107134 C0 01 01 44 */ lfs f0, 0x144(r1) @@ -480,7 +480,7 @@ lbl_8010A284: /* 8010A2A4 001071E4 4B FB 0D E1 */ bl daAlink_c_NS_getBodyAngleXAtnActor /* 8010A2A8 001071E8 7C 79 1B 78 */ mr r25, r3 /* 8010A2AC 001071EC A8 9D 00 00 */ lha r4, 0(r29) -/* 8010A2B0 001071F0 48 16 6B 75 */ bl cLib_distanceAngleS +/* 8010A2B0 001071F0 48 16 6B 75 */ bl cLib_distanceAngleS__Fss /* 8010A2B4 001071F4 2C 03 30 00 */ cmpwi r3, 0x3000 /* 8010A2B8 001071F8 40 80 00 94 */ bge lbl_8010A34C /* 8010A2BC 001071FC 7F E3 FB 78 */ mr r3, r31 @@ -641,7 +641,7 @@ lbl_8010A4C4: /* 8010A508 00107448 38 61 01 28 */ addi r3, r1, 0x128 /* 8010A50C 0010744C 38 9F 37 EC */ addi r4, r31, 0x37ec /* 8010A510 00107450 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 8010A514 00107454 48 15 C6 21 */ bl cXyz_NS___mi +/* 8010A514 00107454 48 15 C6 21 */ bl __mi__4cXyzCFRC3Vec /* 8010A518 00107458 C0 01 01 28 */ lfs f0, 0x128(r1) /* 8010A51C 0010745C D0 1F 37 F8 */ stfs f0, 0x37f8(r31) /* 8010A520 00107460 C0 01 01 2C */ lfs f0, 0x12c(r1) @@ -736,7 +736,7 @@ lbl_8010A65C: /* 8010A670 001075B0 80 9F 27 EC */ lwz r4, 0x27ec(r31) /* 8010A674 001075B4 38 84 05 38 */ addi r4, r4, 0x538 /* 8010A678 001075B8 38 BF 37 EC */ addi r5, r31, 0x37ec -/* 8010A67C 001075BC 48 15 C4 B9 */ bl cXyz_NS___mi +/* 8010A67C 001075BC 48 15 C4 B9 */ bl __mi__4cXyzCFRC3Vec /* 8010A680 001075C0 C0 01 01 04 */ lfs f0, 0x104(r1) /* 8010A684 001075C4 D0 01 01 88 */ stfs f0, 0x188(r1) /* 8010A688 001075C8 C0 01 01 08 */ lfs f0, 0x108(r1) @@ -758,18 +758,18 @@ lbl_8010A65C: /* 8010A6C8 00107608 D0 1F 38 00 */ stfs f0, 0x3800(r31) /* 8010A6CC 0010760C 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8010A6D0 00107610 38 9F 37 F8 */ addi r4, r31, 0x37f8 -/* 8010A6D4 00107614 48 15 C8 75 */ bl cXyz_NS_normalizeZP +/* 8010A6D4 00107614 48 15 C8 75 */ bl normalizeZP__4cXyzFv /* 8010A6D8 00107618 38 7F 37 F8 */ addi r3, r31, 0x37f8 -/* 8010A6DC 0010761C 48 15 CA 75 */ bl cXyz_NS_atan2sY_XZ +/* 8010A6DC 0010761C 48 15 CA 75 */ bl atan2sY_XZ__4cXyzCFv /* 8010A6E0 00107620 B0 7F 30 1C */ sth r3, 0x301c(r31) /* 8010A6E4 00107624 38 7F 37 F8 */ addi r3, r31, 0x37f8 -/* 8010A6E8 00107628 48 15 CA 41 */ bl cXyz_NS_atan2sX_Z +/* 8010A6E8 00107628 48 15 CA 41 */ bl atan2sX_Z__4cXyzCFv /* 8010A6EC 0010762C B0 7F 30 1E */ sth r3, 0x301e(r31) lbl_8010A6F0: /* 8010A6F0 00107630 38 61 00 EC */ addi r3, r1, 0xec /* 8010A6F4 00107634 38 9F 37 F8 */ addi r4, r31, 0x37f8 /* 8010A6F8 00107638 FC 20 F0 90 */ fmr f1, f30 -/* 8010A6FC 0010763C 48 15 C4 89 */ bl cXyz_NS___ml +/* 8010A6FC 0010763C 48 15 C4 89 */ bl __ml__4cXyzCFf /* 8010A700 00107640 38 7F 37 EC */ addi r3, r31, 0x37ec /* 8010A704 00107644 38 81 00 EC */ addi r4, r1, 0xec /* 8010A708 00107648 7C 65 1B 78 */ mr r5, r3 @@ -780,7 +780,7 @@ lbl_8010A6F0: /* 8010A71C 0010765C 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8010A720 00107660 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 8010A724 00107664 38 BF 37 98 */ addi r5, r31, 0x3798 -/* 8010A728 00107668 48 15 C4 0D */ bl cXyz_NS___mi +/* 8010A728 00107668 48 15 C4 0D */ bl __mi__4cXyzCFRC3Vec /* 8010A72C 0010766C 38 7F 37 EC */ addi r3, r31, 0x37ec /* 8010A730 00107670 38 81 00 E0 */ addi r4, r1, 0xe0 /* 8010A734 00107674 7C 65 1B 78 */ mr r5, r3 @@ -789,7 +789,7 @@ lbl_8010A73C: /* 8010A73C 0010767C 38 61 00 D4 */ addi r3, r1, 0xd4 /* 8010A740 00107680 38 9F 37 EC */ addi r4, r31, 0x37ec /* 8010A744 00107684 38 BF 37 E0 */ addi r5, r31, 0x37e0 -/* 8010A748 00107688 48 15 C3 ED */ bl cXyz_NS___mi +/* 8010A748 00107688 48 15 C3 ED */ bl __mi__4cXyzCFRC3Vec /* 8010A74C 0010768C C0 01 00 D4 */ lfs f0, 0xd4(r1) /* 8010A750 00107690 D0 01 01 7C */ stfs f0, 0x17c(r1) /* 8010A754 00107694 C0 01 00 D8 */ lfs f0, 0xd8(r1) @@ -879,11 +879,11 @@ lbl_8010A858: /* 8010A87C 001077BC 40 82 00 40 */ bne lbl_8010A8BC /* 8010A880 001077C0 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8010A884 001077C4 38 81 01 7C */ addi r4, r1, 0x17c -/* 8010A888 001077C8 48 15 C2 FD */ bl cXyz_NS___ml +/* 8010A888 001077C8 48 15 C2 FD */ bl __ml__4cXyzCFf /* 8010A88C 001077CC 38 61 00 BC */ addi r3, r1, 0xbc /* 8010A890 001077D0 38 9F 37 E0 */ addi r4, r31, 0x37e0 /* 8010A894 001077D4 38 A1 00 C8 */ addi r5, r1, 0xc8 -/* 8010A898 001077D8 48 15 C2 4D */ bl cXyz_NS___pl +/* 8010A898 001077D8 48 15 C2 4D */ bl __pl__4cXyzCFRC3Vec /* 8010A89C 001077DC C0 01 00 BC */ lfs f0, 0xbc(r1) /* 8010A8A0 001077E0 D0 1F 37 EC */ stfs f0, 0x37ec(r31) /* 8010A8A4 001077E4 C0 01 00 C0 */ lfs f0, 0xc0(r1) @@ -934,7 +934,7 @@ lbl_8010A944: /* 8010A944 00107884 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8010A948 00107888 38 9F 37 F8 */ addi r4, r31, 0x37f8 /* 8010A94C 0010788C C0 22 93 50 */ lfs f1, lbl_80452D50-_SDA2_BASE_(r2) -/* 8010A950 00107890 48 15 C2 35 */ bl cXyz_NS___ml +/* 8010A950 00107890 48 15 C2 35 */ bl __ml__4cXyzCFf /* 8010A954 00107894 38 61 01 70 */ addi r3, r1, 0x170 /* 8010A958 00107898 38 81 00 B0 */ addi r4, r1, 0xb0 /* 8010A95C 0010789C 7C 65 1B 78 */ mr r5, r3 @@ -942,11 +942,11 @@ lbl_8010A944: /* 8010A964 001078A4 38 61 00 A4 */ addi r3, r1, 0xa4 /* 8010A968 001078A8 38 9F 37 F8 */ addi r4, r31, 0x37f8 /* 8010A96C 001078AC C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 8010A970 001078B0 48 15 C2 15 */ bl cXyz_NS___ml +/* 8010A970 001078B0 48 15 C2 15 */ bl __ml__4cXyzCFf /* 8010A974 001078B4 38 61 00 98 */ addi r3, r1, 0x98 /* 8010A978 001078B8 38 9F 37 EC */ addi r4, r31, 0x37ec /* 8010A97C 001078BC 38 A1 00 A4 */ addi r5, r1, 0xa4 -/* 8010A980 001078C0 48 15 C1 65 */ bl cXyz_NS___pl +/* 8010A980 001078C0 48 15 C1 65 */ bl __pl__4cXyzCFRC3Vec /* 8010A984 001078C4 C0 01 00 98 */ lfs f0, 0x98(r1) /* 8010A988 001078C8 D0 01 01 64 */ stfs f0, 0x164(r1) /* 8010A98C 001078CC C0 01 00 9C */ lfs f0, 0x9c(r1) @@ -987,15 +987,15 @@ lbl_8010A944: /* 8010AA18 00107958 40 82 00 14 */ bne lbl_8010AA2C /* 8010AA1C 0010795C 38 7F 1E 3C */ addi r3, r31, 0x1e3c /* 8010AA20 00107960 38 9F 1E 2C */ addi r4, r31, 0x1e2c -/* 8010AA24 00107964 48 15 D7 25 */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 8010AA24 00107964 48 15 D7 25 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 8010AA28 00107968 48 00 00 0C */ b lbl_8010AA34 lbl_8010AA2C: /* 8010AA2C 0010796C 38 7F 1E 3C */ addi r3, r31, 0x1e3c -/* 8010AA30 00107970 48 15 D6 F1 */ bl cBgS_PolyInfo_NS_ClearPi +/* 8010AA30 00107970 48 15 D6 F1 */ bl ClearPi__13cBgS_PolyInfoFv lbl_8010AA34: /* 8010AA34 00107974 38 7F 1E 2C */ addi r3, r31, 0x1e2c /* 8010AA38 00107978 38 9F 1B CC */ addi r4, r31, 0x1bcc -/* 8010AA3C 0010797C 48 15 D7 0D */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 8010AA3C 0010797C 48 15 D7 0D */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 8010AA40 00107980 7F A3 EB 78 */ mr r3, r29 /* 8010AA44 00107984 38 9F 1B CC */ addi r4, r31, 0x1bcc /* 8010AA48 00107988 4B F6 A0 F9 */ bl dBgS_NS_ChkMoveBG_NoDABg @@ -1051,7 +1051,7 @@ lbl_8010AAF4: /* 8010AB08 00107A48 7C 04 02 14 */ add r0, r4, r0 /* 8010AB0C 00107A4C 7C 1B 03 78 */ mr r27, r0 /* 8010AB10 00107A50 38 61 01 CC */ addi r3, r1, 0x1cc -/* 8010AB14 00107A54 48 15 C6 15 */ bl cXyz_NS_atan2sX_Z +/* 8010AB14 00107A54 48 15 C6 15 */ bl atan2sX_Z__4cXyzCFv /* 8010AB18 00107A58 7C 7A 1B 78 */ mr r26, r3 /* 8010AB1C 00107A5C C0 01 01 CC */ lfs f0, 0x1cc(r1) /* 8010AB20 00107A60 D0 01 00 50 */ stfs f0, 0x50(r1) @@ -1128,7 +1128,7 @@ lbl_8010AC10: /* 8010AC1C 00107B5C C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) lbl_8010AC20: /* 8010AC20 00107B60 C0 41 01 D0 */ lfs f2, 0x1d0(r1) -/* 8010AC24 00107B64 48 15 CA 51 */ bl cM_atan2s +/* 8010AC24 00107B64 48 15 CA 51 */ bl cM_atan2s__Fff /* 8010AC28 00107B68 B0 61 00 30 */ sth r3, 0x30(r1) /* 8010AC2C 00107B6C B3 41 00 32 */ sth r26, 0x32(r1) /* 8010AC30 00107B70 38 60 00 00 */ li r3, 0 @@ -1174,7 +1174,7 @@ lbl_8010ACC8: /* 8010ACCC 00107C0C FC 20 00 50 */ fneg f1, f0 /* 8010ACD0 00107C10 C0 01 01 D4 */ lfs f0, 0x1d4(r1) /* 8010ACD4 00107C14 FC 40 00 50 */ fneg f2, f0 -/* 8010ACD8 00107C18 48 15 C9 9D */ bl cM_atan2s +/* 8010ACD8 00107C18 48 15 C9 9D */ bl cM_atan2s__Fff /* 8010ACDC 00107C1C 7C 7B 1B 78 */ mr r27, r3 /* 8010ACE0 00107C20 C0 01 01 CC */ lfs f0, 0x1cc(r1) /* 8010ACE4 00107C24 D0 01 00 44 */ stfs f0, 0x44(r1) @@ -1254,7 +1254,7 @@ lbl_8010ADE8: /* 8010ADE8 00107D28 FC 40 08 90 */ fmr f2, f1 lbl_8010ADEC: /* 8010ADEC 00107D2C C0 21 01 D0 */ lfs f1, 0x1d0(r1) -/* 8010ADF0 00107D30 48 15 C8 85 */ bl cM_atan2s +/* 8010ADF0 00107D30 48 15 C8 85 */ bl cM_atan2s__Fff /* 8010ADF4 00107D34 B0 61 00 30 */ sth r3, 0x30(r1) /* 8010ADF8 00107D38 B3 61 00 32 */ sth r27, 0x32(r1) /* 8010ADFC 00107D3C 38 00 00 00 */ li r0, 0 @@ -1277,11 +1277,11 @@ lbl_8010AE38: /* 8010AE38 00107D78 38 61 00 80 */ addi r3, r1, 0x80 /* 8010AE3C 00107D7C 38 9F 37 F8 */ addi r4, r31, 0x37f8 /* 8010AE40 00107D80 C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 8010AE44 00107D84 48 15 BD 41 */ bl cXyz_NS___ml +/* 8010AE44 00107D84 48 15 BD 41 */ bl __ml__4cXyzCFf /* 8010AE48 00107D88 38 61 00 74 */ addi r3, r1, 0x74 /* 8010AE4C 00107D8C 38 9F 1B E8 */ addi r4, r31, 0x1be8 /* 8010AE50 00107D90 38 A1 00 80 */ addi r5, r1, 0x80 -/* 8010AE54 00107D94 48 15 BC E1 */ bl cXyz_NS___mi +/* 8010AE54 00107D94 48 15 BC E1 */ bl __mi__4cXyzCFRC3Vec /* 8010AE58 00107D98 C0 01 00 74 */ lfs f0, 0x74(r1) /* 8010AE5C 00107D9C D0 1F 37 EC */ stfs f0, 0x37ec(r31) /* 8010AE60 00107DA0 C0 01 00 78 */ lfs f0, 0x78(r1) @@ -1299,7 +1299,7 @@ lbl_8010AE38: /* 8010AE90 00107DD0 FC 20 00 50 */ fneg f1, f0 /* 8010AE94 00107DD4 C0 01 01 C0 */ lfs f0, 0x1c0(r1) /* 8010AE98 00107DD8 FC 40 00 50 */ fneg f2, f0 -/* 8010AE9C 00107DDC 48 15 C7 D9 */ bl cM_atan2s +/* 8010AE9C 00107DDC 48 15 C7 D9 */ bl cM_atan2s__Fff /* 8010AEA0 00107DE0 7C 7B 1B 78 */ mr r27, r3 /* 8010AEA4 00107DE4 C0 01 01 B8 */ lfs f0, 0x1b8(r1) /* 8010AEA8 00107DE8 D0 01 00 38 */ stfs f0, 0x38(r1) @@ -1379,7 +1379,7 @@ lbl_8010AFAC: /* 8010AFAC 00107EEC FC 40 08 90 */ fmr f2, f1 lbl_8010AFB0: /* 8010AFB0 00107EF0 C0 21 01 BC */ lfs f1, 0x1bc(r1) -/* 8010AFB4 00107EF4 48 15 C6 C1 */ bl cM_atan2s +/* 8010AFB4 00107EF4 48 15 C6 C1 */ bl cM_atan2s__Fff /* 8010AFB8 00107EF8 B0 7F 31 6C */ sth r3, 0x316c(r31) /* 8010AFBC 00107EFC B3 7F 31 6E */ sth r27, 0x316e(r31) /* 8010AFC0 00107F00 38 00 00 00 */ li r0, 0 @@ -1504,11 +1504,11 @@ lbl_8010B178: /* 8010B188 001080C8 38 9F 38 10 */ addi r4, r31, 0x3810 /* 8010B18C 001080CC C0 02 93 14 */ lfs f0, lbl_80452D14-_SDA2_BASE_(r2) /* 8010B190 001080D0 EC 20 07 F2 */ fmuls f1, f0, f31 -/* 8010B194 001080D4 48 16 56 19 */ bl cLib_chasePos +/* 8010B194 001080D4 48 16 56 19 */ bl cLib_chasePos__FP4cXyzRC4cXyzf /* 8010B198 001080D8 38 61 00 68 */ addi r3, r1, 0x68 /* 8010B19C 001080DC 38 9F 38 04 */ addi r4, r31, 0x3804 /* 8010B1A0 001080E0 38 BF 38 10 */ addi r5, r31, 0x3810 -/* 8010B1A4 001080E4 48 15 B9 91 */ bl cXyz_NS___mi +/* 8010B1A4 001080E4 48 15 B9 91 */ bl __mi__4cXyzCFRC3Vec /* 8010B1A8 001080E8 C0 01 00 68 */ lfs f0, 0x68(r1) /* 8010B1AC 001080EC D0 01 01 58 */ stfs f0, 0x158(r1) /* 8010B1B0 001080F0 C0 01 00 6C */ lfs f0, 0x6c(r1) @@ -1527,10 +1527,10 @@ lbl_8010B1E0: /* 8010B1E0 00108120 38 7F 38 04 */ addi r3, r31, 0x3804 /* 8010B1E4 00108124 4B F0 1B 81 */ bl mDoMtx_stack_c_NS_transS /* 8010B1E8 00108128 38 61 01 58 */ addi r3, r1, 0x158 -/* 8010B1EC 0010812C 48 15 BF 3D */ bl cXyz_NS_atan2sX_Z +/* 8010B1EC 0010812C 48 15 BF 3D */ bl atan2sX_Z__4cXyzCFv /* 8010B1F0 00108130 7C 7A 1B 78 */ mr r26, r3 /* 8010B1F4 00108134 38 61 01 58 */ addi r3, r1, 0x158 -/* 8010B1F8 00108138 48 15 BF 59 */ bl cXyz_NS_atan2sY_XZ +/* 8010B1F8 00108138 48 15 BF 59 */ bl atan2sY_XZ__4cXyzCFv /* 8010B1FC 0010813C 7C 64 1B 78 */ mr r4, r3 /* 8010B200 00108140 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010B204 00108144 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l diff --git a/include/d/d_a/d_a_alink/asm/func_8010B644.s b/include/d/d_a/d_a_alink/asm/func_8010B644.s index da897d347d..dbd1e39d25 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010B644.s +++ b/include/d/d_a/d_a_alink/asm/func_8010B644.s @@ -11,7 +11,7 @@ /* 8010B66C 001085AC 38 61 00 08 */ addi r3, r1, 8 /* 8010B670 001085B0 38 9E 38 04 */ addi r4, r30, 0x3804 /* 8010B674 001085B4 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 8010B678 001085B8 48 15 B4 BD */ bl cXyz_NS___mi +/* 8010B678 001085B8 48 15 B4 BD */ bl __mi__4cXyzCFRC3Vec /* 8010B67C 001085BC C0 01 00 08 */ lfs f0, 8(r1) /* 8010B680 001085C0 D0 1E 37 C8 */ stfs f0, 0x37c8(r30) /* 8010B684 001085C4 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8010B84C.s b/include/d/d_a/d_a_alink/asm/func_8010B84C.s index 5f32de64ed..06bc9803e0 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010B84C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010B84C.s @@ -7,7 +7,7 @@ /* 8010B864 001087A4 7C 7F 1B 78 */ mr r31, r3 /* 8010B868 001087A8 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 8010B86C 001087AC 38 9F 38 34 */ addi r4, r31, 0x3834 -/* 8010B870 001087B0 48 15 C4 B9 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8010B870 001087B0 48 15 C4 B9 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8010B874 001087B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010B878 001087B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010B87C 001087BC 38 63 0F 38 */ addi r3, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_8010B96C.s b/include/d/d_a/d_a_alink/asm/func_8010B96C.s index dd4e8a2c14..4a20d198f9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010B96C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010B96C.s @@ -30,11 +30,11 @@ lbl_8010B9D4: /* 8010B9D4 00108914 38 61 00 14 */ addi r3, r1, 0x14 /* 8010B9D8 00108918 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 8010B9DC 0010891C 38 BF 37 98 */ addi r5, r31, 0x3798 -/* 8010B9E0 00108920 48 15 B1 55 */ bl cXyz_NS___mi +/* 8010B9E0 00108920 48 15 B1 55 */ bl __mi__4cXyzCFRC3Vec /* 8010B9E4 00108924 38 61 00 08 */ addi r3, r1, 8 /* 8010B9E8 00108928 38 9F 38 10 */ addi r4, r31, 0x3810 /* 8010B9EC 0010892C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8010B9F0 00108930 48 15 B0 F5 */ bl cXyz_NS___pl +/* 8010B9F0 00108930 48 15 B0 F5 */ bl __pl__4cXyzCFRC3Vec /* 8010B9F4 00108934 C0 01 00 08 */ lfs f0, 8(r1) /* 8010B9F8 00108938 D0 01 00 20 */ stfs f0, 0x20(r1) /* 8010B9FC 0010893C C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8010BEF0.s b/include/d/d_a/d_a_alink/asm/func_8010BEF0.s index 0e3e4d15e4..aa2e7af529 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010BEF0.s +++ b/include/d/d_a/d_a_alink/asm/func_8010BEF0.s @@ -40,7 +40,7 @@ lbl_8010BF58: /* 8010BF7C 00108EBC 38 61 00 70 */ addi r3, r1, 0x70 /* 8010BF80 00108EC0 38 99 37 EC */ addi r4, r25, 0x37ec /* 8010BF84 00108EC4 38 B9 37 E0 */ addi r5, r25, 0x37e0 -/* 8010BF88 00108EC8 48 15 AB AD */ bl cXyz_NS___mi +/* 8010BF88 00108EC8 48 15 AB AD */ bl __mi__4cXyzCFRC3Vec /* 8010BF8C 00108ECC C0 01 00 70 */ lfs f0, 0x70(r1) /* 8010BF90 00108ED0 D0 19 37 D4 */ stfs f0, 0x37d4(r25) /* 8010BF94 00108ED4 C0 01 00 74 */ lfs f0, 0x74(r1) @@ -51,9 +51,9 @@ lbl_8010BF58: /* 8010BFA8 00108EE8 2C 00 00 00 */ cmpwi r0, 0 /* 8010BFAC 00108EEC 41 82 00 28 */ beq lbl_8010BFD4 /* 8010BFB0 00108EF0 38 79 37 D4 */ addi r3, r25, 0x37d4 -/* 8010BFB4 00108EF4 48 15 B1 75 */ bl cXyz_NS_atan2sX_Z +/* 8010BFB4 00108EF4 48 15 B1 75 */ bl atan2sX_Z__4cXyzCFv /* 8010BFB8 00108EF8 7F 04 C3 78 */ mr r4, r24 -/* 8010BFBC 00108EFC 48 16 4E 69 */ bl cLib_distanceAngleS +/* 8010BFBC 00108EFC 48 16 4E 69 */ bl cLib_distanceAngleS__Fss /* 8010BFC0 00108F00 2C 03 40 00 */ cmpwi r3, 0x4000 /* 8010BFC4 00108F04 40 81 00 10 */ ble lbl_8010BFD4 /* 8010BFC8 00108F08 7F 23 CB 78 */ mr r3, r25 @@ -372,7 +372,7 @@ lbl_8010C434: /* 8010C434 00109374 38 61 00 4C */ addi r3, r1, 0x4c /* 8010C438 00109378 38 99 04 D0 */ addi r4, r25, 0x4d0 /* 8010C43C 0010937C 38 B9 37 C8 */ addi r5, r25, 0x37c8 -/* 8010C440 00109380 48 15 A6 F5 */ bl cXyz_NS___mi +/* 8010C440 00109380 48 15 A6 F5 */ bl __mi__4cXyzCFRC3Vec /* 8010C444 00109384 C0 01 00 4C */ lfs f0, 0x4c(r1) /* 8010C448 00109388 D0 01 00 A0 */ stfs f0, 0xa0(r1) /* 8010C44C 0010938C C0 01 00 50 */ lfs f0, 0x50(r1) @@ -395,7 +395,7 @@ lbl_8010C434: /* 8010C490 001093D0 D0 01 00 A4 */ stfs f0, 0xa4(r1) /* 8010C494 001093D4 38 61 00 40 */ addi r3, r1, 0x40 /* 8010C498 001093D8 38 81 00 A0 */ addi r4, r1, 0xa0 -/* 8010C49C 001093DC 48 15 AA AD */ bl cXyz_NS_normalizeZP +/* 8010C49C 001093DC 48 15 AA AD */ bl normalizeZP__4cXyzFv /* 8010C4A0 001093E0 C0 39 04 D0 */ lfs f1, 0x4d0(r25) /* 8010C4A4 001093E4 C0 42 93 BC */ lfs f2, lbl_80452DBC-_SDA2_BASE_(r2) /* 8010C4A8 001093E8 C0 01 00 A0 */ lfs f0, 0xa0(r1) @@ -429,7 +429,7 @@ lbl_8010C4CC: /* 8010C514 00109454 D0 81 00 9C */ stfs f4, 0x9c(r1) /* 8010C518 00109458 38 79 1D 08 */ addi r3, r25, 0x1d08 /* 8010C51C 0010945C 38 81 00 94 */ addi r4, r1, 0x94 -/* 8010C520 00109460 48 15 B8 09 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8010C520 00109460 48 15 B8 09 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8010C524 00109464 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010C528 00109468 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010C52C 0010946C 38 63 0F 38 */ addi r3, r3, 0xf38 @@ -508,11 +508,11 @@ lbl_8010C5E4: /* 8010C638 00109578 38 61 00 34 */ addi r3, r1, 0x34 /* 8010C63C 0010957C 38 81 00 88 */ addi r4, r1, 0x88 /* 8010C640 00109580 C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 8010C644 00109584 48 15 A5 41 */ bl cXyz_NS___ml +/* 8010C644 00109584 48 15 A5 41 */ bl __ml__4cXyzCFf /* 8010C648 00109588 38 61 00 28 */ addi r3, r1, 0x28 /* 8010C64C 0010958C 38 99 37 EC */ addi r4, r25, 0x37ec /* 8010C650 00109590 38 A1 00 34 */ addi r5, r1, 0x34 -/* 8010C654 00109594 48 15 A4 91 */ bl cXyz_NS___pl +/* 8010C654 00109594 48 15 A4 91 */ bl __pl__4cXyzCFRC3Vec /* 8010C658 00109598 C0 01 00 28 */ lfs f0, 0x28(r1) /* 8010C65C 0010959C D0 01 00 88 */ stfs f0, 0x88(r1) /* 8010C660 001095A0 C0 01 00 2C */ lfs f0, 0x2c(r1) @@ -549,7 +549,7 @@ lbl_8010C6B0: /* 8010C6D4 00109614 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8010C6D8 00109618 40 80 00 24 */ bge lbl_8010C6FC /* 8010C6DC 0010961C 38 61 00 B8 */ addi r3, r1, 0xb8 -/* 8010C6E0 00109620 48 15 AA 49 */ bl cXyz_NS_atan2sX_Z +/* 8010C6E0 00109620 48 15 AA 49 */ bl atan2sX_Z__4cXyzCFv /* 8010C6E4 00109624 7C 65 1B 78 */ mr r5, r3 /* 8010C6E8 00109628 7F 23 CB 78 */ mr r3, r25 /* 8010C6EC 0010962C 38 80 00 01 */ li r4, 1 @@ -595,7 +595,7 @@ lbl_8010C77C: /* 8010C77C 001096BC 38 61 00 10 */ addi r3, r1, 0x10 /* 8010C780 001096C0 38 99 37 EC */ addi r4, r25, 0x37ec /* 8010C784 001096C4 38 B9 04 D0 */ addi r5, r25, 0x4d0 -/* 8010C788 001096C8 48 15 A3 AD */ bl cXyz_NS___mi +/* 8010C788 001096C8 48 15 A3 AD */ bl __mi__4cXyzCFRC3Vec /* 8010C78C 001096CC C0 01 00 10 */ lfs f0, 0x10(r1) /* 8010C790 001096D0 D0 01 00 7C */ stfs f0, 0x7c(r1) /* 8010C794 001096D4 C0 01 00 14 */ lfs f0, 0x14(r1) @@ -603,21 +603,21 @@ lbl_8010C77C: /* 8010C79C 001096DC C0 01 00 18 */ lfs f0, 0x18(r1) /* 8010C7A0 001096E0 D0 01 00 84 */ stfs f0, 0x84(r1) /* 8010C7A4 001096E4 38 61 00 7C */ addi r3, r1, 0x7c -/* 8010C7A8 001096E8 48 15 A9 A9 */ bl cXyz_NS_atan2sY_XZ +/* 8010C7A8 001096E8 48 15 A9 A9 */ bl atan2sY_XZ__4cXyzCFv /* 8010C7AC 001096EC 7C 64 1B 78 */ mr r4, r3 /* 8010C7B0 001096F0 38 79 04 E4 */ addi r3, r25, 0x4e4 /* 8010C7B4 001096F4 38 A0 00 02 */ li r5, 2 /* 8010C7B8 001096F8 38 C0 20 00 */ li r6, 0x2000 /* 8010C7BC 001096FC 38 E0 08 00 */ li r7, 0x800 -/* 8010C7C0 00109700 48 16 3D 81 */ bl cLib_addCalcAngleS +/* 8010C7C0 00109700 48 16 3D 81 */ bl cLib_addCalcAngleS__FPsssss /* 8010C7C4 00109704 38 61 00 7C */ addi r3, r1, 0x7c -/* 8010C7C8 00109708 48 15 A9 61 */ bl cXyz_NS_atan2sX_Z +/* 8010C7C8 00109708 48 15 A9 61 */ bl atan2sX_Z__4cXyzCFv /* 8010C7CC 0010970C 7C 64 1B 78 */ mr r4, r3 /* 8010C7D0 00109710 38 79 04 E6 */ addi r3, r25, 0x4e6 /* 8010C7D4 00109714 38 A0 00 02 */ li r5, 2 /* 8010C7D8 00109718 38 C0 20 00 */ li r6, 0x2000 /* 8010C7DC 0010971C 38 E0 08 00 */ li r7, 0x800 -/* 8010C7E0 00109720 48 16 3D 61 */ bl cLib_addCalcAngleS +/* 8010C7E0 00109720 48 16 3D 61 */ bl cLib_addCalcAngleS__FPsssss /* 8010C7E4 00109724 A8 19 04 E6 */ lha r0, 0x4e6(r25) /* 8010C7E8 00109728 B0 19 04 DE */ sth r0, 0x4de(r25) /* 8010C7EC 0010972C C0 19 37 98 */ lfs f0, 0x3798(r25) diff --git a/include/d/d_a/d_a_alink/asm/func_8010C830.s b/include/d/d_a/d_a_alink/asm/func_8010C830.s index 29d6ad49a7..87864d5d4f 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010C830.s +++ b/include/d/d_a/d_a_alink/asm/func_8010C830.s @@ -26,11 +26,11 @@ /* 8010C894 001097D4 38 61 00 14 */ addi r3, r1, 0x14 /* 8010C898 001097D8 38 81 00 20 */ addi r4, r1, 0x20 /* 8010C89C 001097DC C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 8010C8A0 001097E0 48 15 A2 E5 */ bl cXyz_NS___ml +/* 8010C8A0 001097E0 48 15 A2 E5 */ bl __ml__4cXyzCFf /* 8010C8A4 001097E4 38 61 00 08 */ addi r3, r1, 8 /* 8010C8A8 001097E8 38 9C 37 EC */ addi r4, r28, 0x37ec /* 8010C8AC 001097EC 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8010C8B0 001097F0 48 15 A2 35 */ bl cXyz_NS___pl +/* 8010C8B0 001097F0 48 15 A2 35 */ bl __pl__4cXyzCFRC3Vec /* 8010C8B4 001097F4 C0 01 00 08 */ lfs f0, 8(r1) /* 8010C8B8 001097F8 D0 1C 04 D0 */ stfs f0, 0x4d0(r28) /* 8010C8BC 001097FC C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8010D174.s b/include/d/d_a/d_a_alink/asm/func_8010D174.s index 838726c779..82a94ea337 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D174.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D174.s @@ -31,11 +31,11 @@ /* 8010D1EC 0010A12C 38 61 00 14 */ addi r3, r1, 0x14 /* 8010D1F0 0010A130 38 81 00 20 */ addi r4, r1, 0x20 /* 8010D1F4 0010A134 C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 8010D1F8 0010A138 48 15 99 8D */ bl cXyz_NS___ml +/* 8010D1F8 0010A138 48 15 99 8D */ bl __ml__4cXyzCFf /* 8010D1FC 0010A13C 38 61 00 08 */ addi r3, r1, 8 /* 8010D200 0010A140 38 9D 37 EC */ addi r4, r29, 0x37ec /* 8010D204 0010A144 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8010D208 0010A148 48 15 98 DD */ bl cXyz_NS___pl +/* 8010D208 0010A148 48 15 98 DD */ bl __pl__4cXyzCFRC3Vec /* 8010D20C 0010A14C C0 01 00 08 */ lfs f0, 8(r1) /* 8010D210 0010A150 D0 1D 04 D0 */ stfs f0, 0x4d0(r29) /* 8010D214 0010A154 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8010D6CC.s b/include/d/d_a/d_a_alink/asm/func_8010D6CC.s index 156c24283b..82e6dfc631 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D6CC.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D6CC.s @@ -127,7 +127,7 @@ lbl_8010D850: /* 8010D8A4 0010A7E4 38 A0 00 04 */ li r5, 4 /* 8010D8A8 0010A7E8 38 C0 0C 00 */ li r6, 0xc00 /* 8010D8AC 0010A7EC 38 E0 01 80 */ li r7, 0x180 -/* 8010D8B0 0010A7F0 48 16 2C 91 */ bl cLib_addCalcAngleS +/* 8010D8B0 0010A7F0 48 16 2C 91 */ bl cLib_addCalcAngleS__FPsssss lbl_8010D8B4: /* 8010D8B4 0010A7F4 38 00 00 00 */ li r0, 0 /* 8010D8B8 0010A7F8 B0 1D 30 0C */ sth r0, 0x300c(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_8010EAC4.s b/include/d/d_a/d_a_alink/asm/func_8010EAC4.s index 6b42c40aac..36b2c2279d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010EAC4.s +++ b/include/d/d_a/d_a_alink/asm/func_8010EAC4.s @@ -314,7 +314,7 @@ lbl_8010EF3C: /* 8010EF44 0010BE84 57 E0 04 3E */ clrlwi r0, r31, 0x10 /* 8010EF48 0010BE88 7C 00 18 40 */ cmplw r0, r3 /* 8010EF4C 0010BE8C 41 82 00 14 */ beq lbl_8010EF60 -/* 8010EF50 0010BE90 48 15 89 1D */ bl cM_rnd +/* 8010EF50 0010BE90 48 15 89 1D */ bl cM_rnd__Fv /* 8010EF54 0010BE94 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) /* 8010EF58 0010BE98 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8010EF5C 0010BE9C 40 80 00 10 */ bge lbl_8010EF6C @@ -330,7 +330,7 @@ lbl_8010EF78: /* 8010EF78 0010BEB8 28 00 00 7C */ cmplwi r0, 0x7c /* 8010EF7C 0010BEBC 40 82 00 7C */ bne lbl_8010EFF8 /* 8010EF80 0010BEC0 C0 22 93 44 */ lfs f1, lbl_80452D44-_SDA2_BASE_(r2) -/* 8010EF84 0010BEC4 48 15 89 D1 */ bl cM_rndF +/* 8010EF84 0010BEC4 48 15 89 D1 */ bl cM_rndF__Ff /* 8010EF88 0010BEC8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010EF8C 0010BECC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8010EF90 0010BED0 40 80 00 10 */ bge lbl_8010EFA0 diff --git a/include/d/d_a/d_a_alink/asm/func_8010FC38.s b/include/d/d_a/d_a_alink/asm/func_8010FC38.s index 681a55ef76..9a75bab3ce 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010FC38.s +++ b/include/d/d_a/d_a_alink/asm/func_8010FC38.s @@ -129,7 +129,7 @@ lbl_8010FDEC: /* 8010FE08 0010CD48 41 82 00 64 */ beq lbl_8010FE6C /* 8010FE0C 0010CD4C 38 7D 04 D0 */ addi r3, r29, 0x4d0 /* 8010FE10 0010CD50 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 8010FE14 0010CD54 48 16 0D F1 */ bl cLib_targetAngleY +/* 8010FE14 0010CD54 48 16 0D F1 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8010FE18 0010CD58 B0 7D 04 E6 */ sth r3, 0x4e6(r29) /* 8010FE1C 0010CD5C A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 8010FE20 0010CD60 B0 1D 04 DE */ sth r0, 0x4de(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_801108EC.s b/include/d/d_a/d_a_alink/asm/func_801108EC.s index a6f5e7c68d..19661f96e9 100644 --- a/include/d/d_a/d_a_alink/asm/func_801108EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801108EC.s @@ -29,11 +29,11 @@ /* 8011095C 0010D89C 38 61 00 2C */ addi r3, r1, 0x2c /* 80110960 0010D8A0 38 9F 36 0C */ addi r4, r31, 0x360c /* 80110964 0010D8A4 38 A1 00 50 */ addi r5, r1, 0x50 -/* 80110968 0010D8A8 48 15 61 CD */ bl cXyz_NS___mi +/* 80110968 0010D8A8 48 15 61 CD */ bl __mi__4cXyzCFRC3Vec /* 8011096C 0010D8AC 38 61 00 20 */ addi r3, r1, 0x20 /* 80110970 0010D8B0 38 81 00 2C */ addi r4, r1, 0x2c /* 80110974 0010D8B4 38 BF 36 18 */ addi r5, r31, 0x3618 -/* 80110978 0010D8B8 48 15 61 6D */ bl cXyz_NS___pl +/* 80110978 0010D8B8 48 15 61 6D */ bl __pl__4cXyzCFRC3Vec /* 8011097C 0010D8BC C0 01 00 20 */ lfs f0, 0x20(r1) /* 80110980 0010D8C0 D0 01 00 44 */ stfs f0, 0x44(r1) /* 80110984 0010D8C4 C0 21 00 24 */ lfs f1, 0x24(r1) @@ -50,7 +50,7 @@ /* 801109B0 0010D8F0 38 A1 00 38 */ addi r5, r1, 0x38 /* 801109B4 0010D8F4 48 23 63 B9 */ bl PSMTXMultVec /* 801109B8 0010D8F8 38 61 00 38 */ addi r3, r1, 0x38 -/* 801109BC 0010D8FC 48 15 67 6D */ bl cXyz_NS_atan2sX_Z +/* 801109BC 0010D8FC 48 15 67 6D */ bl atan2sX_Z__4cXyzCFv /* 801109C0 0010D900 7C 7D 1B 78 */ mr r29, r3 /* 801109C4 0010D904 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801109C8 0010D908 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -66,7 +66,7 @@ /* 801109F0 0010D930 FC 20 00 50 */ fneg f1, f0 /* 801109F4 0010D934 C0 01 00 48 */ lfs f0, 0x48(r1) /* 801109F8 0010D938 FC 40 00 50 */ fneg f2, f0 -/* 801109FC 0010D93C 48 15 6C 79 */ bl cM_atan2s +/* 801109FC 0010D93C 48 15 6C 79 */ bl cM_atan2s__Fff /* 80110A00 0010D940 7C 60 07 34 */ extsh r0, r3 /* 80110A04 0010D944 2C 00 E8 00 */ cmpwi r0, -6144 /* 80110A08 0010D948 40 80 00 0C */ bge lbl_80110A14 @@ -91,7 +91,7 @@ lbl_80110A24: /* 80110A4C 0010D98C EC 40 00 B2 */ fmuls f2, f0, f2 lbl_80110A50: /* 80110A50 0010D990 C0 21 00 44 */ lfs f1, 0x44(r1) -/* 80110A54 0010D994 48 15 6C 21 */ bl cM_atan2s +/* 80110A54 0010D994 48 15 6C 21 */ bl cM_atan2s__Fff /* 80110A58 0010D998 7C 60 07 34 */ extsh r0, r3 /* 80110A5C 0010D99C 2C 00 E8 00 */ cmpwi r0, -6144 /* 80110A60 0010D9A0 40 80 00 0C */ bge lbl_80110A6C @@ -131,11 +131,11 @@ lbl_80110AC0: /* 80110AD8 0010DA18 38 61 00 14 */ addi r3, r1, 0x14 /* 80110ADC 0010DA1C 38 9F 36 0C */ addi r4, r31, 0x360c /* 80110AE0 0010DA20 38 BF 36 24 */ addi r5, r31, 0x3624 -/* 80110AE4 0010DA24 48 15 60 51 */ bl cXyz_NS___mi +/* 80110AE4 0010DA24 48 15 60 51 */ bl __mi__4cXyzCFRC3Vec /* 80110AE8 0010DA28 38 61 00 08 */ addi r3, r1, 8 /* 80110AEC 0010DA2C 38 81 00 14 */ addi r4, r1, 0x14 /* 80110AF0 0010DA30 C0 22 94 D0 */ lfs f1, lbl_80452ED0-_SDA2_BASE_(r2) -/* 80110AF4 0010DA34 48 15 60 91 */ bl cXyz_NS___ml +/* 80110AF4 0010DA34 48 15 60 91 */ bl __ml__4cXyzCFf /* 80110AF8 0010DA38 C0 01 00 08 */ lfs f0, 8(r1) /* 80110AFC 0010DA3C D0 1F 36 18 */ stfs f0, 0x3618(r31) /* 80110B00 0010DA40 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011130C.s b/include/d/d_a/d_a_alink/asm/func_8011130C.s index 91d1c8a61b..e3245bb408 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011130C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011130C.s @@ -64,7 +64,7 @@ lbl_801113F4: /* 801113FC 0010E33C 90 1F 0F B8 */ stw r0, 0xfb8(r31) /* 80111400 0010E340 38 7F 10 DC */ addi r3, r31, 0x10dc /* 80111404 0010E344 C0 22 93 00 */ lfs f1, lbl_80452D00-_SDA2_BASE_(r2) -/* 80111408 0010E348 48 15 E3 01 */ bl cM3dGSph_NS_SetR +/* 80111408 0010E348 48 15 E3 01 */ bl SetR__8cM3dGSphFf /* 8011140C 0010E34C 38 00 02 00 */ li r0, 0x200 /* 80111410 0010E350 90 1F 0F C8 */ stw r0, 0xfc8(r31) /* 80111414 0010E354 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80111A9C.s b/include/d/d_a/d_a_alink/asm/func_80111A9C.s index 67a28a4e65..bae053813a 100644 --- a/include/d/d_a/d_a_alink/asm/func_80111A9C.s +++ b/include/d/d_a/d_a_alink/asm/func_80111A9C.s @@ -108,7 +108,7 @@ lbl_80111BE0: /* 80111C2C 0010EB6C 41 82 00 48 */ beq lbl_80111C74 /* 80111C30 0010EB70 38 79 1D 08 */ addi r3, r25, 0x1d08 /* 80111C34 0010EB74 7F C4 F3 78 */ mr r4, r30 -/* 80111C38 0010EB78 48 15 60 F1 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 80111C38 0010EB78 48 15 60 F1 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80111C3C 0010EB7C 7F E3 FB 78 */ mr r3, r31 /* 80111C40 0010EB80 38 99 1D 08 */ addi r4, r25, 0x1d08 /* 80111C44 0010EB84 4B F6 28 5D */ bl cBgS_NS_GroundCross diff --git a/include/d/d_a/d_a_alink/asm/func_801120C8.s b/include/d/d_a/d_a_alink/asm/func_801120C8.s index 6e909fb5ac..608ce68604 100644 --- a/include/d/d_a/d_a_alink/asm/func_801120C8.s +++ b/include/d/d_a/d_a_alink/asm/func_801120C8.s @@ -23,7 +23,7 @@ /* 80112120 0010F060 38 A0 00 02 */ li r5, 2 /* 80112124 0010F064 38 C0 20 00 */ li r6, 0x2000 /* 80112128 0010F068 38 E0 08 00 */ li r7, 0x800 -/* 8011212C 0010F06C 48 15 E4 15 */ bl cLib_addCalcAngleS +/* 8011212C 0010F06C 48 15 E4 15 */ bl cLib_addCalcAngleS__FPsssss /* 80112130 0010F070 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80112134 0010F074 B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_80112138: diff --git a/include/d/d_a/d_a_alink/asm/func_80112768.s b/include/d/d_a/d_a_alink/asm/func_80112768.s index 3ae3075f42..cdad20e7bf 100644 --- a/include/d/d_a/d_a_alink/asm/func_80112768.s +++ b/include/d/d_a/d_a_alink/asm/func_80112768.s @@ -26,7 +26,7 @@ /* 801127CC 0010F70C 38 7F 34 90 */ addi r3, r31, 0x3490 /* 801127D0 0010F710 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801127D4 0010F714 C0 42 93 14 */ lfs f2, lbl_80452D14-_SDA2_BASE_(r2) -/* 801127D8 0010F718 48 15 DF 69 */ bl cLib_chaseF +/* 801127D8 0010F718 48 15 DF 69 */ bl cLib_chaseF__FPfff /* 801127DC 0010F71C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801127E0 0010F720 80 01 00 24 */ lwz r0, 0x24(r1) /* 801127E4 0010F724 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_801127F0.s b/include/d/d_a/d_a_alink/asm/func_801127F0.s index 9c01664930..6a041087a7 100644 --- a/include/d/d_a/d_a_alink/asm/func_801127F0.s +++ b/include/d/d_a/d_a_alink/asm/func_801127F0.s @@ -153,7 +153,7 @@ lbl_801129C8: /* 80112A28 0010F968 3C 80 80 39 */ lis r4, lbl_8038EA70@ha /* 80112A2C 0010F96C 38 84 EA 70 */ addi r4, r4, lbl_8038EA70@l /* 80112A30 0010F970 C0 24 00 7C */ lfs f1, 0x7c(r4) -/* 80112A34 0010F974 48 15 CC D5 */ bl cM3dGSph_NS_SetR +/* 80112A34 0010F974 48 15 CC D5 */ bl SetR__8cM3dGSphFf /* 80112A38 0010F978 81 1F 38 44 */ lwz r8, 0x3844(r31) /* 80112A3C 0010F97C 39 20 00 00 */ li r9, 0 /* 80112A40 0010F980 38 60 00 00 */ li r3, 0 @@ -290,13 +290,13 @@ lbl_80112A94: /* 80112C40 0010FB80 90 1F 17 78 */ stw r0, 0x1778(r31) /* 80112C44 0010FB84 38 7F 18 9C */ addi r3, r31, 0x189c /* 80112C48 0010FB88 C0 22 93 D4 */ lfs f1, lbl_80452DD4-_SDA2_BASE_(r2) -/* 80112C4C 0010FB8C 48 15 CA BD */ bl cM3dGSph_NS_SetR +/* 80112C4C 0010FB8C 48 15 CA BD */ bl SetR__8cM3dGSphFf /* 80112C50 0010FB90 38 7F 17 A4 */ addi r3, r31, 0x17a4 /* 80112C54 0010FB94 38 80 00 08 */ li r4, 8 -/* 80112C58 0010FB98 48 15 1C A9 */ bl cCcD_ObjCo_NS_SetIGrp +/* 80112C58 0010FB98 48 15 1C A9 */ bl SetIGrp__10cCcD_ObjCoFUl /* 80112C5C 0010FB9C 38 7F 17 A4 */ addi r3, r31, 0x17a4 /* 80112C60 0010FBA0 38 80 00 60 */ li r4, 0x60 -/* 80112C64 0010FBA4 48 15 1C B9 */ bl cCcD_ObjCo_NS_SetVsGrp +/* 80112C64 0010FBA4 48 15 1C B9 */ bl SetVsGrp__10cCcD_ObjCoFUl /* 80112C68 0010FBA8 39 61 00 20 */ addi r11, r1, 0x20 /* 80112C6C 0010FBAC 48 24 F5 BD */ bl _restgpr_29 /* 80112C70 0010FBB0 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80112C84.s b/include/d/d_a/d_a_alink/asm/func_80112C84.s index b24e157be3..f2ed86fad6 100644 --- a/include/d/d_a/d_a_alink/asm/func_80112C84.s +++ b/include/d/d_a/d_a_alink/asm/func_80112C84.s @@ -123,7 +123,7 @@ lbl_80112E20: lbl_80112E44: /* 80112E44 0010FD84 38 61 00 18 */ addi r3, r1, 0x18 /* 80112E48 0010FD88 7F E4 FB 78 */ mr r4, r31 -/* 80112E4C 0010FD8C 48 15 40 FD */ bl cXyz_NS_normalizeZP +/* 80112E4C 0010FD8C 48 15 40 FD */ bl normalizeZP__4cXyzFv /* 80112E50 0010FD90 38 60 00 01 */ li r3, 1 /* 80112E54 0010FD94 48 00 00 08 */ b lbl_80112E5C lbl_80112E58: diff --git a/include/d/d_a/d_a_alink/asm/func_80112E7C.s b/include/d/d_a/d_a_alink/asm/func_80112E7C.s index b6a02aaf1e..4487e80cff 100644 --- a/include/d/d_a/d_a_alink/asm/func_80112E7C.s +++ b/include/d/d_a/d_a_alink/asm/func_80112E7C.s @@ -42,7 +42,7 @@ /* 80112F20 0010FE60 3B 63 00 0C */ addi r27, r3, 0xc /* 80112F24 0010FE64 38 61 02 34 */ addi r3, r1, 0x234 /* 80112F28 0010FE68 38 9F 37 EC */ addi r4, r31, 0x37ec -/* 80112F2C 0010FE6C 48 15 3C 09 */ bl cXyz_NS___mi +/* 80112F2C 0010FE6C 48 15 3C 09 */ bl __mi__4cXyzCFRC3Vec /* 80112F30 0010FE70 C0 01 02 34 */ lfs f0, 0x234(r1) /* 80112F34 0010FE74 D0 01 02 7C */ stfs f0, 0x27c(r1) /* 80112F38 0010FE78 C0 01 02 38 */ lfs f0, 0x238(r1) @@ -51,7 +51,7 @@ /* 80112F44 0010FE84 D0 01 02 84 */ stfs f0, 0x284(r1) /* 80112F48 0010FE88 38 61 02 28 */ addi r3, r1, 0x228 /* 80112F4C 0010FE8C 38 81 02 7C */ addi r4, r1, 0x27c -/* 80112F50 0010FE90 48 15 3F F9 */ bl cXyz_NS_normalizeZP +/* 80112F50 0010FE90 48 15 3F F9 */ bl normalizeZP__4cXyzFv /* 80112F54 0010FE94 3B 80 00 00 */ li r28, 0 /* 80112F58 0010FE98 3C 60 80 39 */ lis r3, lbl_8038EA70@ha /* 80112F5C 0010FE9C 3B 43 EA 70 */ addi r26, r3, lbl_8038EA70@l @@ -66,11 +66,11 @@ lbl_80112F64: /* 80112F7C 0010FEBC 38 61 02 1C */ addi r3, r1, 0x21c /* 80112F80 0010FEC0 38 81 02 7C */ addi r4, r1, 0x27c /* 80112F84 0010FEC4 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 80112F88 0010FEC8 48 15 3B FD */ bl cXyz_NS___ml +/* 80112F88 0010FEC8 48 15 3B FD */ bl __ml__4cXyzCFf /* 80112F8C 0010FECC 38 61 02 10 */ addi r3, r1, 0x210 /* 80112F90 0010FED0 7F 04 C3 78 */ mr r4, r24 /* 80112F94 0010FED4 38 A1 02 1C */ addi r5, r1, 0x21c -/* 80112F98 0010FED8 48 15 3B 4D */ bl cXyz_NS___pl +/* 80112F98 0010FED8 48 15 3B 4D */ bl __pl__4cXyzCFRC3Vec /* 80112F9C 0010FEDC C0 01 02 10 */ lfs f0, 0x210(r1) /* 80112FA0 0010FEE0 D0 19 00 00 */ stfs f0, 0(r25) /* 80112FA4 0010FEE4 C0 01 02 14 */ lfs f0, 0x214(r1) @@ -80,11 +80,11 @@ lbl_80112F64: /* 80112FB4 0010FEF4 38 61 02 04 */ addi r3, r1, 0x204 /* 80112FB8 0010FEF8 7F 24 CB 78 */ mr r4, r25 /* 80112FBC 0010FEFC 38 A1 02 64 */ addi r5, r1, 0x264 -/* 80112FC0 0010FF00 48 15 3B 75 */ bl cXyz_NS___mi +/* 80112FC0 0010FF00 48 15 3B 75 */ bl __mi__4cXyzCFRC3Vec /* 80112FC4 0010FF04 38 61 01 F8 */ addi r3, r1, 0x1f8 /* 80112FC8 0010FF08 38 81 02 04 */ addi r4, r1, 0x204 /* 80112FCC 0010FF0C C0 3A 00 44 */ lfs f1, 0x44(r26) -/* 80112FD0 0010FF10 48 15 3B B5 */ bl cXyz_NS___ml +/* 80112FD0 0010FF10 48 15 3B B5 */ bl __ml__4cXyzCFf /* 80112FD4 0010FF14 C0 01 01 F8 */ lfs f0, 0x1f8(r1) /* 80112FD8 0010FF18 D0 1B 00 00 */ stfs f0, 0(r27) /* 80112FDC 0010FF1C C0 01 01 FC */ lfs f0, 0x1fc(r1) @@ -130,11 +130,11 @@ lbl_80113070: /* 80113070 0010FFB0 38 61 01 EC */ addi r3, r1, 0x1ec /* 80113074 0010FFB4 7F 44 D3 78 */ mr r4, r26 /* 80113078 0010FFB8 7F 65 DB 78 */ mr r5, r27 -/* 8011307C 0010FFBC 48 15 3A B9 */ bl cXyz_NS___mi +/* 8011307C 0010FFBC 48 15 3A B9 */ bl __mi__4cXyzCFRC3Vec /* 80113080 0010FFC0 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 80113084 0010FFC4 38 81 01 EC */ addi r4, r1, 0x1ec /* 80113088 0010FFC8 7F 25 CB 78 */ mr r5, r25 -/* 8011308C 0010FFCC 48 15 3A 59 */ bl cXyz_NS___pl +/* 8011308C 0010FFCC 48 15 3A 59 */ bl __pl__4cXyzCFRC3Vec /* 80113090 0010FFD0 C0 01 01 E0 */ lfs f0, 0x1e0(r1) /* 80113094 0010FFD4 D0 01 02 7C */ stfs f0, 0x27c(r1) /* 80113098 0010FFD8 C0 21 01 E4 */ lfs f1, 0x1e4(r1) @@ -162,15 +162,15 @@ lbl_801130CC: lbl_801130E8: /* 801130E8 00110028 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 801130EC 0011002C 38 81 02 7C */ addi r4, r1, 0x27c -/* 801130F0 00110030 48 15 3E 59 */ bl cXyz_NS_normalizeZP +/* 801130F0 00110030 48 15 3E 59 */ bl normalizeZP__4cXyzFv /* 801130F4 00110034 38 61 01 C8 */ addi r3, r1, 0x1c8 /* 801130F8 00110038 38 81 02 7C */ addi r4, r1, 0x27c /* 801130FC 0011003C C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 80113100 00110040 48 15 3A 85 */ bl cXyz_NS___ml +/* 80113100 00110040 48 15 3A 85 */ bl __ml__4cXyzCFf /* 80113104 00110044 38 61 01 BC */ addi r3, r1, 0x1bc /* 80113108 00110048 7F 64 DB 78 */ mr r4, r27 /* 8011310C 0011004C 38 A1 01 C8 */ addi r5, r1, 0x1c8 -/* 80113110 00110050 48 15 39 D5 */ bl cXyz_NS___pl +/* 80113110 00110050 48 15 39 D5 */ bl __pl__4cXyzCFRC3Vec /* 80113114 00110054 C0 01 01 BC */ lfs f0, 0x1bc(r1) /* 80113118 00110058 D0 1A 00 00 */ stfs f0, 0(r26) /* 8011311C 0011005C C0 01 01 C0 */ lfs f0, 0x1c0(r1) @@ -204,7 +204,7 @@ lbl_8011313C: /* 80113188 001100C8 38 61 01 B0 */ addi r3, r1, 0x1b0 /* 8011318C 001100CC 38 9F 38 04 */ addi r4, r31, 0x3804 /* 80113190 001100D0 38 A1 02 4C */ addi r5, r1, 0x24c -/* 80113194 001100D4 48 15 39 A1 */ bl cXyz_NS___mi +/* 80113194 001100D4 48 15 39 A1 */ bl __mi__4cXyzCFRC3Vec /* 80113198 001100D8 80 7F 38 40 */ lwz r3, 0x3840(r31) /* 8011319C 001100DC 38 81 01 B0 */ addi r4, r1, 0x1b0 /* 801131A0 001100E0 7C 65 1B 78 */ mr r5, r3 @@ -235,11 +235,11 @@ lbl_801131E4: /* 801131FC 0011013C 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 80113200 00110140 7F 64 DB 78 */ mr r4, r27 /* 80113204 00110144 7F A5 EB 78 */ mr r5, r29 -/* 80113208 00110148 48 15 39 2D */ bl cXyz_NS___mi +/* 80113208 00110148 48 15 39 2D */ bl __mi__4cXyzCFRC3Vec /* 8011320C 0011014C 38 61 01 98 */ addi r3, r1, 0x198 /* 80113210 00110150 38 81 01 A4 */ addi r4, r1, 0x1a4 /* 80113214 00110154 7F 25 CB 78 */ mr r5, r25 -/* 80113218 00110158 48 15 38 CD */ bl cXyz_NS___pl +/* 80113218 00110158 48 15 38 CD */ bl __pl__4cXyzCFRC3Vec /* 8011321C 0011015C C0 01 01 98 */ lfs f0, 0x198(r1) /* 80113220 00110160 D0 01 02 7C */ stfs f0, 0x27c(r1) /* 80113224 00110164 C0 21 01 9C */ lfs f1, 0x19c(r1) @@ -264,15 +264,15 @@ lbl_80113258: /* 8011326C 001101AC D0 01 02 60 */ stfs f0, 0x260(r1) /* 80113270 001101B0 38 61 01 8C */ addi r3, r1, 0x18c /* 80113274 001101B4 38 81 02 7C */ addi r4, r1, 0x27c -/* 80113278 001101B8 48 15 3C D1 */ bl cXyz_NS_normalizeZP +/* 80113278 001101B8 48 15 3C D1 */ bl normalizeZP__4cXyzFv /* 8011327C 001101BC 38 61 01 80 */ addi r3, r1, 0x180 /* 80113280 001101C0 38 81 02 7C */ addi r4, r1, 0x27c /* 80113284 001101C4 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 80113288 001101C8 48 15 38 FD */ bl cXyz_NS___ml +/* 80113288 001101C8 48 15 38 FD */ bl __ml__4cXyzCFf /* 8011328C 001101CC 38 61 01 74 */ addi r3, r1, 0x174 /* 80113290 001101D0 7F A4 EB 78 */ mr r4, r29 /* 80113294 001101D4 38 A1 01 80 */ addi r5, r1, 0x180 -/* 80113298 001101D8 48 15 38 4D */ bl cXyz_NS___pl +/* 80113298 001101D8 48 15 38 4D */ bl __pl__4cXyzCFRC3Vec /* 8011329C 001101DC C0 01 01 74 */ lfs f0, 0x174(r1) /* 801132A0 001101E0 D0 1B 00 00 */ stfs f0, 0(r27) /* 801132A4 001101E4 C0 01 01 78 */ lfs f0, 0x178(r1) @@ -288,11 +288,11 @@ lbl_80113258: /* 801132CC 0011020C 38 61 01 68 */ addi r3, r1, 0x168 /* 801132D0 00110210 38 81 02 58 */ addi r4, r1, 0x258 /* 801132D4 00110214 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 801132D8 00110218 48 15 38 AD */ bl cXyz_NS___ml +/* 801132D8 00110218 48 15 38 AD */ bl __ml__4cXyzCFf /* 801132DC 0011021C 38 61 01 5C */ addi r3, r1, 0x15c /* 801132E0 00110220 7F A4 EB 78 */ mr r4, r29 /* 801132E4 00110224 38 A1 01 68 */ addi r5, r1, 0x168 -/* 801132E8 00110228 48 15 37 FD */ bl cXyz_NS___pl +/* 801132E8 00110228 48 15 37 FD */ bl __pl__4cXyzCFRC3Vec /* 801132EC 0011022C C0 01 01 5C */ lfs f0, 0x15c(r1) /* 801132F0 00110230 D0 1B 00 00 */ stfs f0, 0(r27) /* 801132F4 00110234 C0 01 01 60 */ lfs f0, 0x160(r1) @@ -304,11 +304,11 @@ lbl_80113304: /* 80113308 00110248 38 61 01 50 */ addi r3, r1, 0x150 /* 8011330C 0011024C 7F 64 DB 78 */ mr r4, r27 /* 80113310 00110250 38 A1 02 64 */ addi r5, r1, 0x264 -/* 80113314 00110254 48 15 38 21 */ bl cXyz_NS___mi +/* 80113314 00110254 48 15 38 21 */ bl __mi__4cXyzCFRC3Vec /* 80113318 00110258 38 61 01 44 */ addi r3, r1, 0x144 /* 8011331C 0011025C 38 81 01 50 */ addi r4, r1, 0x150 /* 80113320 00110260 C0 3A 00 44 */ lfs f1, 0x44(r26) -/* 80113324 00110264 48 15 38 61 */ bl cXyz_NS___ml +/* 80113324 00110264 48 15 38 61 */ bl __ml__4cXyzCFf /* 80113328 00110268 C0 01 01 44 */ lfs f0, 0x144(r1) /* 8011332C 0011026C D0 19 00 00 */ stfs f0, 0(r25) /* 80113330 00110270 C0 01 01 48 */ lfs f0, 0x148(r1) @@ -437,11 +437,11 @@ lbl_801134E8: /* 80113500 00110440 38 61 01 38 */ addi r3, r1, 0x138 /* 80113504 00110444 7F 64 DB 78 */ mr r4, r27 /* 80113508 00110448 7F 85 E3 78 */ mr r5, r28 -/* 8011350C 0011044C 48 15 36 29 */ bl cXyz_NS___mi +/* 8011350C 0011044C 48 15 36 29 */ bl __mi__4cXyzCFRC3Vec /* 80113510 00110450 38 61 01 2C */ addi r3, r1, 0x12c /* 80113514 00110454 38 81 01 38 */ addi r4, r1, 0x138 /* 80113518 00110458 7F A5 EB 78 */ mr r5, r29 -/* 8011351C 0011045C 48 15 35 C9 */ bl cXyz_NS___pl +/* 8011351C 0011045C 48 15 35 C9 */ bl __pl__4cXyzCFRC3Vec /* 80113520 00110460 C0 01 01 2C */ lfs f0, 0x12c(r1) /* 80113524 00110464 D0 01 02 7C */ stfs f0, 0x27c(r1) /* 80113528 00110468 C0 21 01 30 */ lfs f1, 0x130(r1) @@ -475,15 +475,15 @@ lbl_80113578: /* 8011358C 001104CC D0 01 02 60 */ stfs f0, 0x260(r1) /* 80113590 001104D0 38 61 01 20 */ addi r3, r1, 0x120 /* 80113594 001104D4 38 81 02 7C */ addi r4, r1, 0x27c -/* 80113598 001104D8 48 15 39 B1 */ bl cXyz_NS_normalizeZP +/* 80113598 001104D8 48 15 39 B1 */ bl normalizeZP__4cXyzFv /* 8011359C 001104DC 38 61 01 14 */ addi r3, r1, 0x114 /* 801135A0 001104E0 38 81 02 7C */ addi r4, r1, 0x27c /* 801135A4 001104E4 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 801135A8 001104E8 48 15 35 DD */ bl cXyz_NS___ml +/* 801135A8 001104E8 48 15 35 DD */ bl __ml__4cXyzCFf /* 801135AC 001104EC 38 61 01 08 */ addi r3, r1, 0x108 /* 801135B0 001104F0 7F 84 E3 78 */ mr r4, r28 /* 801135B4 001104F4 38 A1 01 14 */ addi r5, r1, 0x114 -/* 801135B8 001104F8 48 15 35 2D */ bl cXyz_NS___pl +/* 801135B8 001104F8 48 15 35 2D */ bl __pl__4cXyzCFRC3Vec /* 801135BC 001104FC C0 01 01 08 */ lfs f0, 0x108(r1) /* 801135C0 00110500 D0 1B 00 00 */ stfs f0, 0(r27) /* 801135C4 00110504 C0 01 01 0C */ lfs f0, 0x10c(r1) @@ -499,11 +499,11 @@ lbl_80113578: /* 801135EC 0011052C 38 61 00 FC */ addi r3, r1, 0xfc /* 801135F0 00110530 38 81 02 58 */ addi r4, r1, 0x258 /* 801135F4 00110534 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 801135F8 00110538 48 15 35 8D */ bl cXyz_NS___ml +/* 801135F8 00110538 48 15 35 8D */ bl __ml__4cXyzCFf /* 801135FC 0011053C 38 61 00 F0 */ addi r3, r1, 0xf0 /* 80113600 00110540 7F 84 E3 78 */ mr r4, r28 /* 80113604 00110544 38 A1 00 FC */ addi r5, r1, 0xfc -/* 80113608 00110548 48 15 34 DD */ bl cXyz_NS___pl +/* 80113608 00110548 48 15 34 DD */ bl __pl__4cXyzCFRC3Vec /* 8011360C 0011054C C0 01 00 F0 */ lfs f0, 0xf0(r1) /* 80113610 00110550 D0 1B 00 00 */ stfs f0, 0(r27) /* 80113614 00110554 C0 01 00 F4 */ lfs f0, 0xf4(r1) @@ -514,11 +514,11 @@ lbl_80113624: /* 80113624 00110564 38 61 00 E4 */ addi r3, r1, 0xe4 /* 80113628 00110568 7F 64 DB 78 */ mr r4, r27 /* 8011362C 0011056C 38 A1 02 64 */ addi r5, r1, 0x264 -/* 80113630 00110570 48 15 35 05 */ bl cXyz_NS___mi +/* 80113630 00110570 48 15 35 05 */ bl __mi__4cXyzCFRC3Vec /* 80113634 00110574 38 61 00 D8 */ addi r3, r1, 0xd8 /* 80113638 00110578 38 81 00 E4 */ addi r4, r1, 0xe4 /* 8011363C 0011057C C0 3A 00 44 */ lfs f1, 0x44(r26) -/* 80113640 00110580 48 15 35 45 */ bl cXyz_NS___ml +/* 80113640 00110580 48 15 35 45 */ bl __ml__4cXyzCFf /* 80113644 00110584 C0 01 00 D8 */ lfs f0, 0xd8(r1) /* 80113648 00110588 D0 1D 00 00 */ stfs f0, 0(r29) /* 8011364C 0011058C C0 01 00 DC */ lfs f0, 0xdc(r1) @@ -535,7 +535,7 @@ lbl_8011366C: /* 80113674 001105B4 38 61 00 CC */ addi r3, r1, 0xcc /* 80113678 001105B8 38 9F 37 F8 */ addi r4, r31, 0x37f8 /* 8011367C 001105BC 80 BF 38 40 */ lwz r5, 0x3840(r31) -/* 80113680 001105C0 48 15 34 B5 */ bl cXyz_NS___mi +/* 80113680 001105C0 48 15 34 B5 */ bl __mi__4cXyzCFRC3Vec /* 80113684 001105C4 C0 01 00 CC */ lfs f0, 0xcc(r1) /* 80113688 001105C8 D0 01 02 7C */ stfs f0, 0x27c(r1) /* 8011368C 001105CC C0 21 00 D0 */ lfs f1, 0xd0(r1) @@ -553,10 +553,10 @@ lbl_8011366C: /* 801136BC 001105FC 48 23 39 D5 */ bl PSVECAdd lbl_801136C0: /* 801136C0 00110600 38 61 02 7C */ addi r3, r1, 0x27c -/* 801136C4 00110604 48 15 3A 65 */ bl cXyz_NS_atan2sX_Z +/* 801136C4 00110604 48 15 3A 65 */ bl atan2sX_Z__4cXyzCFv /* 801136C8 00110608 7C 7A 1B 78 */ mr r26, r3 /* 801136CC 0011060C 38 61 02 7C */ addi r3, r1, 0x27c -/* 801136D0 00110610 48 15 3A 81 */ bl cXyz_NS_atan2sY_XZ +/* 801136D0 00110610 48 15 3A 81 */ bl atan2sY_XZ__4cXyzCFv /* 801136D4 00110614 80 9F 38 44 */ lwz r4, 0x3844(r31) /* 801136D8 00110618 B0 64 00 00 */ sth r3, 0(r4) /* 801136DC 0011061C B3 44 00 02 */ sth r26, 2(r4) @@ -588,11 +588,11 @@ lbl_80113730: /* 80113730 00110670 38 61 00 C0 */ addi r3, r1, 0xc0 /* 80113734 00110674 7F 44 D3 78 */ mr r4, r26 /* 80113738 00110678 7F 65 DB 78 */ mr r5, r27 -/* 8011373C 0011067C 48 15 33 F9 */ bl cXyz_NS___mi +/* 8011373C 0011067C 48 15 33 F9 */ bl __mi__4cXyzCFRC3Vec /* 80113740 00110680 38 61 00 B4 */ addi r3, r1, 0xb4 /* 80113744 00110684 38 81 00 C0 */ addi r4, r1, 0xc0 /* 80113748 00110688 7F 85 E3 78 */ mr r5, r28 -/* 8011374C 0011068C 48 15 33 99 */ bl cXyz_NS___pl +/* 8011374C 0011068C 48 15 33 99 */ bl __pl__4cXyzCFRC3Vec /* 80113750 00110690 C0 01 00 B4 */ lfs f0, 0xb4(r1) /* 80113754 00110694 D0 01 02 7C */ stfs f0, 0x27c(r1) /* 80113758 00110698 C0 21 00 B8 */ lfs f1, 0xb8(r1) @@ -603,15 +603,15 @@ lbl_80113730: /* 8011376C 001106AC D0 01 02 80 */ stfs f0, 0x280(r1) /* 80113770 001106B0 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80113774 001106B4 38 81 02 7C */ addi r4, r1, 0x27c -/* 80113778 001106B8 48 15 37 D1 */ bl cXyz_NS_normalizeZP +/* 80113778 001106B8 48 15 37 D1 */ bl normalizeZP__4cXyzFv /* 8011377C 001106BC 38 61 00 9C */ addi r3, r1, 0x9c /* 80113780 001106C0 38 81 02 7C */ addi r4, r1, 0x27c /* 80113784 001106C4 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 80113788 001106C8 48 15 33 FD */ bl cXyz_NS___ml +/* 80113788 001106C8 48 15 33 FD */ bl __ml__4cXyzCFf /* 8011378C 001106CC 38 61 00 90 */ addi r3, r1, 0x90 /* 80113790 001106D0 7F 64 DB 78 */ mr r4, r27 /* 80113794 001106D4 38 A1 00 9C */ addi r5, r1, 0x9c -/* 80113798 001106D8 48 15 33 4D */ bl cXyz_NS___pl +/* 80113798 001106D8 48 15 33 4D */ bl __pl__4cXyzCFRC3Vec /* 8011379C 001106DC C0 01 00 90 */ lfs f0, 0x90(r1) /* 801137A0 001106E0 D0 1A 00 00 */ stfs f0, 0(r26) /* 801137A4 001106E4 C0 01 00 94 */ lfs f0, 0x94(r1) @@ -698,11 +698,11 @@ lbl_801138D4: /* 801138D4 00110814 38 61 00 84 */ addi r3, r1, 0x84 /* 801138D8 00110818 7F 64 DB 78 */ mr r4, r27 /* 801138DC 0011081C 7F 85 E3 78 */ mr r5, r28 -/* 801138E0 00110820 48 15 32 55 */ bl cXyz_NS___mi +/* 801138E0 00110820 48 15 32 55 */ bl __mi__4cXyzCFRC3Vec /* 801138E4 00110824 38 61 00 78 */ addi r3, r1, 0x78 /* 801138E8 00110828 38 81 00 84 */ addi r4, r1, 0x84 /* 801138EC 0011082C 7F A5 EB 78 */ mr r5, r29 -/* 801138F0 00110830 48 15 31 F5 */ bl cXyz_NS___pl +/* 801138F0 00110830 48 15 31 F5 */ bl __pl__4cXyzCFRC3Vec /* 801138F4 00110834 C0 41 00 78 */ lfs f2, 0x78(r1) /* 801138F8 00110838 D0 41 02 7C */ stfs f2, 0x27c(r1) /* 801138FC 0011083C C0 01 00 7C */ lfs f0, 0x7c(r1) @@ -726,15 +726,15 @@ lbl_80113924: /* 80113940 00110880 D0 01 02 60 */ stfs f0, 0x260(r1) /* 80113944 00110884 38 61 00 6C */ addi r3, r1, 0x6c /* 80113948 00110888 38 81 02 7C */ addi r4, r1, 0x27c -/* 8011394C 0011088C 48 15 35 FD */ bl cXyz_NS_normalizeZP +/* 8011394C 0011088C 48 15 35 FD */ bl normalizeZP__4cXyzFv /* 80113950 00110890 38 61 00 60 */ addi r3, r1, 0x60 /* 80113954 00110894 38 81 02 7C */ addi r4, r1, 0x27c /* 80113958 00110898 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 8011395C 0011089C 48 15 32 29 */ bl cXyz_NS___ml +/* 8011395C 0011089C 48 15 32 29 */ bl __ml__4cXyzCFf /* 80113960 001108A0 38 61 00 54 */ addi r3, r1, 0x54 /* 80113964 001108A4 7F 84 E3 78 */ mr r4, r28 /* 80113968 001108A8 38 A1 00 60 */ addi r5, r1, 0x60 -/* 8011396C 001108AC 48 15 31 79 */ bl cXyz_NS___pl +/* 8011396C 001108AC 48 15 31 79 */ bl __pl__4cXyzCFRC3Vec /* 80113970 001108B0 C0 01 00 54 */ lfs f0, 0x54(r1) /* 80113974 001108B4 D0 1B 00 00 */ stfs f0, 0(r27) /* 80113978 001108B8 C0 01 00 58 */ lfs f0, 0x58(r1) @@ -750,11 +750,11 @@ lbl_80113924: /* 801139A0 001108E0 38 61 00 48 */ addi r3, r1, 0x48 /* 801139A4 001108E4 38 81 02 58 */ addi r4, r1, 0x258 /* 801139A8 001108E8 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 801139AC 001108EC 48 15 31 D9 */ bl cXyz_NS___ml +/* 801139AC 001108EC 48 15 31 D9 */ bl __ml__4cXyzCFf /* 801139B0 001108F0 38 61 00 3C */ addi r3, r1, 0x3c /* 801139B4 001108F4 7F 84 E3 78 */ mr r4, r28 /* 801139B8 001108F8 38 A1 00 48 */ addi r5, r1, 0x48 -/* 801139BC 001108FC 48 15 31 29 */ bl cXyz_NS___pl +/* 801139BC 001108FC 48 15 31 29 */ bl __pl__4cXyzCFRC3Vec /* 801139C0 00110900 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 801139C4 00110904 D0 1B 00 00 */ stfs f0, 0(r27) /* 801139C8 00110908 C0 01 00 40 */ lfs f0, 0x40(r1) @@ -766,11 +766,11 @@ lbl_801139D8: /* 801139DC 0011091C 38 61 00 30 */ addi r3, r1, 0x30 /* 801139E0 00110920 7F 64 DB 78 */ mr r4, r27 /* 801139E4 00110924 38 A1 02 64 */ addi r5, r1, 0x264 -/* 801139E8 00110928 48 15 31 4D */ bl cXyz_NS___mi +/* 801139E8 00110928 48 15 31 4D */ bl __mi__4cXyzCFRC3Vec /* 801139EC 0011092C 38 61 00 24 */ addi r3, r1, 0x24 /* 801139F0 00110930 38 81 00 30 */ addi r4, r1, 0x30 /* 801139F4 00110934 C0 3A 00 44 */ lfs f1, 0x44(r26) -/* 801139F8 00110938 48 15 31 8D */ bl cXyz_NS___ml +/* 801139F8 00110938 48 15 31 8D */ bl __ml__4cXyzCFf /* 801139FC 0011093C C0 01 00 24 */ lfs f0, 0x24(r1) /* 80113A00 00110940 D0 1D 00 00 */ stfs f0, 0(r29) /* 80113A04 00110944 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -799,7 +799,7 @@ lbl_80113A28: lbl_80113A58: /* 80113A58 00110998 38 61 00 18 */ addi r3, r1, 0x18 /* 80113A5C 0011099C 7F C5 F3 78 */ mr r5, r30 -/* 80113A60 001109A0 48 15 30 D5 */ bl cXyz_NS___mi +/* 80113A60 001109A0 48 15 30 D5 */ bl __mi__4cXyzCFRC3Vec /* 80113A64 001109A4 C0 21 00 18 */ lfs f1, 0x18(r1) /* 80113A68 001109A8 D0 21 02 7C */ stfs f1, 0x27c(r1) /* 80113A6C 001109AC C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -882,11 +882,11 @@ lbl_80113B70: /* 80113B7C 00110ABC 48 00 00 10 */ b lbl_80113B8C lbl_80113B80: /* 80113B80 00110AC0 38 61 02 7C */ addi r3, r1, 0x27c -/* 80113B84 00110AC4 48 15 35 A5 */ bl cXyz_NS_atan2sX_Z +/* 80113B84 00110AC4 48 15 35 A5 */ bl atan2sX_Z__4cXyzCFv /* 80113B88 00110AC8 7C 7A 1B 78 */ mr r26, r3 lbl_80113B8C: /* 80113B8C 00110ACC 38 61 02 7C */ addi r3, r1, 0x27c -/* 80113B90 00110AD0 48 15 35 C1 */ bl cXyz_NS_atan2sY_XZ +/* 80113B90 00110AD0 48 15 35 C1 */ bl atan2sY_XZ__4cXyzCFv /* 80113B94 00110AD4 B0 7C 00 00 */ sth r3, 0(r28) /* 80113B98 00110AD8 B3 5C 00 02 */ sth r26, 2(r28) /* 80113B9C 00110ADC B3 7C 00 04 */ sth r27, 4(r28) 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 218ab5e3cb..766c29a06b 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 @@ -81,11 +81,11 @@ lbl_80113E18: /* 80113E94 00110DD4 38 61 00 D0 */ addi r3, r1, 0xd0 /* 80113E98 00110DD8 38 81 01 24 */ addi r4, r1, 0x124 /* 80113E9C 00110DDC 38 A1 01 18 */ addi r5, r1, 0x118 -/* 80113EA0 00110DE0 48 15 2C 45 */ bl cXyz_NS___pl +/* 80113EA0 00110DE0 48 15 2C 45 */ bl __pl__4cXyzCFRC3Vec /* 80113EA4 00110DE4 38 61 00 C4 */ addi r3, r1, 0xc4 /* 80113EA8 00110DE8 38 81 00 D0 */ addi r4, r1, 0xd0 /* 80113EAC 00110DEC C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 80113EB0 00110DF0 48 15 2C D5 */ bl cXyz_NS___ml +/* 80113EB0 00110DF0 48 15 2C D5 */ bl __ml__4cXyzCFf /* 80113EB4 00110DF4 C0 01 00 C4 */ lfs f0, 0xc4(r1) /* 80113EB8 00110DF8 D0 01 01 00 */ stfs f0, 0x100(r1) /* 80113EBC 00110DFC C0 01 00 C8 */ lfs f0, 0xc8(r1) @@ -288,11 +288,11 @@ lbl_801141A0: /* 801141A0 001110E0 38 61 00 AC */ addi r3, r1, 0xac /* 801141A4 001110E4 80 9F 38 48 */ lwz r4, 0x3848(r31) /* 801141A8 001110E8 C0 22 93 DC */ lfs f1, lbl_80452DDC-_SDA2_BASE_(r2) -/* 801141AC 001110EC 48 15 29 D9 */ bl cXyz_NS___ml +/* 801141AC 001110EC 48 15 29 D9 */ bl __ml__4cXyzCFf /* 801141B0 001110F0 38 61 00 A0 */ addi r3, r1, 0xa0 /* 801141B4 001110F4 38 9F 37 F8 */ addi r4, r31, 0x37f8 /* 801141B8 001110F8 38 A1 00 AC */ addi r5, r1, 0xac -/* 801141BC 001110FC 48 15 29 29 */ bl cXyz_NS___pl +/* 801141BC 001110FC 48 15 29 29 */ bl __pl__4cXyzCFRC3Vec /* 801141C0 00111100 C0 01 00 A0 */ lfs f0, 0xa0(r1) /* 801141C4 00111104 D0 01 01 24 */ stfs f0, 0x124(r1) /* 801141C8 00111108 C0 01 00 A4 */ lfs f0, 0xa4(r1) @@ -412,7 +412,7 @@ lbl_80114350: /* 80114360 001112A0 38 61 00 94 */ addi r3, r1, 0x94 /* 80114364 001112A4 80 9F 38 40 */ lwz r4, 0x3840(r31) /* 80114368 001112A8 38 BF 37 EC */ addi r5, r31, 0x37ec -/* 8011436C 001112AC 48 15 27 C9 */ bl cXyz_NS___mi +/* 8011436C 001112AC 48 15 27 C9 */ bl __mi__4cXyzCFRC3Vec /* 80114370 001112B0 C0 01 00 94 */ lfs f0, 0x94(r1) /* 80114374 001112B4 D0 01 01 0C */ stfs f0, 0x10c(r1) /* 80114378 001112B8 C0 01 00 98 */ lfs f0, 0x98(r1) @@ -498,7 +498,7 @@ lbl_80114474: /* 80114494 001113D4 38 61 00 88 */ addi r3, r1, 0x88 /* 80114498 001113D8 38 9F 37 EC */ addi r4, r31, 0x37ec /* 8011449C 001113DC 38 A1 01 0C */ addi r5, r1, 0x10c -/* 801144A0 001113E0 48 15 26 45 */ bl cXyz_NS___pl +/* 801144A0 001113E0 48 15 26 45 */ bl __pl__4cXyzCFRC3Vec /* 801144A4 001113E4 80 7F 38 40 */ lwz r3, 0x3840(r31) /* 801144A8 001113E8 C0 01 00 88 */ lfs f0, 0x88(r1) /* 801144AC 001113EC D0 03 00 00 */ stfs f0, 0(r3) @@ -523,7 +523,7 @@ lbl_801144F0: /* 801144F0 00111430 38 61 00 7C */ addi r3, r1, 0x7c /* 801144F4 00111434 38 81 01 24 */ addi r4, r1, 0x124 /* 801144F8 00111438 80 BF 38 40 */ lwz r5, 0x3840(r31) -/* 801144FC 0011143C 48 15 26 39 */ bl cXyz_NS___mi +/* 801144FC 0011143C 48 15 26 39 */ bl __mi__4cXyzCFRC3Vec /* 80114500 00111440 C0 01 00 7C */ lfs f0, 0x7c(r1) /* 80114504 00111444 D0 01 01 0C */ stfs f0, 0x10c(r1) /* 80114508 00111448 C0 21 00 80 */ lfs f1, 0x80(r1) @@ -533,10 +533,10 @@ lbl_801144F0: /* 80114518 00111458 EC 01 F8 2A */ fadds f0, f1, f31 /* 8011451C 0011145C D0 01 01 10 */ stfs f0, 0x110(r1) /* 80114520 00111460 38 61 01 0C */ addi r3, r1, 0x10c -/* 80114524 00111464 48 15 2C 05 */ bl cXyz_NS_atan2sX_Z +/* 80114524 00111464 48 15 2C 05 */ bl atan2sX_Z__4cXyzCFv /* 80114528 00111468 7C 78 1B 78 */ mr r24, r3 /* 8011452C 0011146C 38 61 01 0C */ addi r3, r1, 0x10c -/* 80114530 00111470 48 15 2C 21 */ bl cXyz_NS_atan2sY_XZ +/* 80114530 00111470 48 15 2C 21 */ bl atan2sY_XZ__4cXyzCFv /* 80114534 00111474 80 9F 38 44 */ lwz r4, 0x3844(r31) /* 80114538 00111478 B0 64 00 00 */ sth r3, 0(r4) /* 8011453C 0011147C B3 04 00 02 */ sth r24, 2(r4) @@ -834,7 +834,7 @@ lbl_8011497C: /* 8011497C 001118BC 38 61 00 58 */ addi r3, r1, 0x58 /* 80114980 001118C0 38 9F 38 04 */ addi r4, r31, 0x3804 /* 80114984 001118C4 38 A1 01 24 */ addi r5, r1, 0x124 -/* 80114988 001118C8 48 15 21 AD */ bl cXyz_NS___mi +/* 80114988 001118C8 48 15 21 AD */ bl __mi__4cXyzCFRC3Vec /* 8011498C 001118CC 80 7F 38 40 */ lwz r3, 0x3840(r31) /* 80114990 001118D0 38 81 00 58 */ addi r4, r1, 0x58 /* 80114994 001118D4 7C 65 1B 78 */ mr r5, r3 @@ -1023,20 +1023,20 @@ lbl_80114BE8: /* 80114C3C 00111B7C C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) /* 80114C40 00111B80 C0 42 93 10 */ lfs f2, lbl_80452D10-_SDA2_BASE_(r2) /* 80114C44 00111B84 C0 62 93 30 */ lfs f3, lbl_80452D30-_SDA2_BASE_(r2) -/* 80114C48 00111B88 48 15 AE 71 */ bl cLib_addCalcPos +/* 80114C48 00111B88 48 15 AE 71 */ bl cLib_addCalcPos__FP4cXyzRC4cXyzfff /* 80114C4C 00111B8C 80 7F 38 44 */ lwz r3, 0x3844(r31) /* 80114C50 00111B90 38 80 C0 00 */ li r4, -16384 /* 80114C54 00111B94 38 A0 00 05 */ li r5, 5 /* 80114C58 00111B98 38 C0 10 00 */ li r6, 0x1000 /* 80114C5C 00111B9C 38 E0 04 00 */ li r7, 0x400 -/* 80114C60 00111BA0 48 15 B8 E1 */ bl cLib_addCalcAngleS +/* 80114C60 00111BA0 48 15 B8 E1 */ bl cLib_addCalcAngleS__FPsssss /* 80114C64 00111BA4 80 7F 38 44 */ lwz r3, 0x3844(r31) /* 80114C68 00111BA8 38 63 00 02 */ addi r3, r3, 2 /* 80114C6C 00111BAC A8 9F 04 E6 */ lha r4, 0x4e6(r31) /* 80114C70 00111BB0 38 A0 00 05 */ li r5, 5 /* 80114C74 00111BB4 38 C0 10 00 */ li r6, 0x1000 /* 80114C78 00111BB8 38 E0 04 00 */ li r7, 0x400 -/* 80114C7C 00111BBC 48 15 B8 C5 */ bl cLib_addCalcAngleS +/* 80114C7C 00111BBC 48 15 B8 C5 */ bl cLib_addCalcAngleS__FPsssss /* 80114C80 00111BC0 38 7F 37 F8 */ addi r3, r31, 0x37f8 /* 80114C84 00111BC4 4B EF 80 E1 */ bl mDoMtx_stack_c_NS_transS /* 80114C88 00111BC8 80 7F 38 44 */ lwz r3, 0x3844(r31) @@ -1124,7 +1124,7 @@ lbl_80114D98: /* 80114DC4 00111D04 4B F5 AC 61 */ bl dVibration_c_NS_StartShock lbl_80114DC8: /* 80114DC8 00111D08 38 7F 17 3C */ addi r3, r31, 0x173c -/* 80114DCC 00111D0C 48 14 EB 91 */ bl cCcD_Stts_NS_ClrCcMove +/* 80114DCC 00111D0C 48 14 EB 91 */ bl ClrCcMove__9cCcD_SttsFv /* 80114DD0 00111D10 80 7F 07 6C */ lwz r3, 0x76c(r31) /* 80114DD4 00111D14 38 80 00 00 */ li r4, 0 /* 80114DD8 00111D18 88 BF 2F 9A */ lbz r5, 0x2f9a(r31) @@ -1279,16 +1279,16 @@ lbl_80114FFC: /* 80115000 00111F40 FC 20 00 50 */ fneg f1, f0 /* 80115004 00111F44 C0 01 01 38 */ lfs f0, 0x138(r1) /* 80115008 00111F48 FC 40 00 50 */ fneg f2, f0 -/* 8011500C 00111F4C 48 15 26 69 */ bl cM_atan2s +/* 8011500C 00111F4C 48 15 26 69 */ bl cM_atan2s__Fff /* 80115010 00111F50 7C 78 1B 78 */ mr r24, r3 /* 80115014 00111F54 C0 21 01 34 */ lfs f1, 0x134(r1) /* 80115018 00111F58 FC 40 E8 90 */ fmr f2, f29 -/* 8011501C 00111F5C 48 15 26 59 */ bl cM_atan2s +/* 8011501C 00111F5C 48 15 26 59 */ bl cM_atan2s__Fff /* 80115020 00111F60 7C 64 1B 78 */ mr r4, r3 /* 80115024 00111F64 38 61 00 2C */ addi r3, r1, 0x2c /* 80115028 00111F68 7F 05 C3 78 */ mr r5, r24 /* 8011502C 00111F6C 38 C0 00 00 */ li r6, 0 -/* 80115030 00111F70 48 15 23 C5 */ bl csXyz_X1_ +/* 80115030 00111F70 48 15 23 C5 */ bl __ct__5csXyzFsss /* 80115034 00111F74 80 7F 07 80 */ lwz r3, 0x780(r31) /* 80115038 00111F78 38 C3 00 30 */ addi r6, r3, 0x30 /* 8011503C 00111F7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_a/d_a_alink/asm/func_80115C50.s b/include/d/d_a/d_a_alink/asm/func_80115C50.s index e48dfeffc3..1acc0e415d 100644 --- a/include/d/d_a/d_a_alink/asm/func_80115C50.s +++ b/include/d/d_a/d_a_alink/asm/func_80115C50.s @@ -29,7 +29,7 @@ /* 80115CC0 00112C00 38 05 80 00 */ addi r0, r5, -32768 /* 80115CC4 00112C04 7C 05 07 34 */ extsh r5, r0 /* 80115CC8 00112C08 38 C0 00 00 */ li r6, 0 -/* 80115CCC 00112C0C 48 15 17 29 */ bl csXyz_X1_ +/* 80115CCC 00112C0C 48 15 17 29 */ bl __ct__5csXyzFsss /* 80115CD0 00112C10 38 60 02 75 */ li r3, 0x275 /* 80115CD4 00112C14 7F E4 FB 78 */ mr r4, r31 /* 80115CD8 00112C18 38 A1 00 10 */ addi r5, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_80116E9C.s b/include/d/d_a/d_a_alink/asm/func_80116E9C.s index a9674cb668..995768094f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80116E9C.s +++ b/include/d/d_a/d_a_alink/asm/func_80116E9C.s @@ -18,7 +18,7 @@ /* 80116EE0 00113E20 38 61 00 14 */ addi r3, r1, 0x14 /* 80116EE4 00113E24 7C A4 2B 78 */ mr r4, r5 /* 80116EE8 00113E28 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80116EEC 00113E2C 48 14 FC 49 */ bl cXyz_NS___mi +/* 80116EEC 00113E2C 48 14 FC 49 */ bl __mi__4cXyzCFRC3Vec /* 80116EF0 00113E30 C0 01 00 14 */ lfs f0, 0x14(r1) /* 80116EF4 00113E34 D0 01 00 20 */ stfs f0, 0x20(r1) /* 80116EF8 00113E38 C0 01 00 18 */ lfs f0, 0x18(r1) @@ -103,7 +103,7 @@ lbl_80117004: /* 80117014 00113F54 D0 1E 06 18 */ stfs f0, 0x618(r30) lbl_80117018: /* 80117018 00113F58 38 61 00 20 */ addi r3, r1, 0x20 -/* 8011701C 00113F5C 48 15 01 0D */ bl cXyz_NS_atan2sX_Z +/* 8011701C 00113F5C 48 15 01 0D */ bl atan2sX_Z__4cXyzCFv /* 80117020 00113F60 B0 7E 06 06 */ sth r3, 0x606(r30) /* 80117024 00113F64 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* 80117028 00113F68 CB E1 00 80 */ lfd f31, 0x80(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801171F4.s b/include/d/d_a/d_a_alink/asm/func_801171F4.s index 50382a49ca..dd9a3ef697 100644 --- a/include/d/d_a/d_a_alink/asm/func_801171F4.s +++ b/include/d/d_a/d_a_alink/asm/func_801171F4.s @@ -428,7 +428,7 @@ lbl_801177D0: /* 80117800 00114740 38 61 00 28 */ addi r3, r1, 0x28 /* 80117804 00114744 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 80117808 00114748 38 BF 04 A8 */ addi r5, r31, 0x4a8 -/* 8011780C 0011474C 48 14 F3 29 */ bl cXyz_NS___mi +/* 8011780C 0011474C 48 14 F3 29 */ bl __mi__4cXyzCFRC3Vec /* 80117810 00114750 C0 41 00 28 */ lfs f2, 0x28(r1) /* 80117814 00114754 D0 41 00 34 */ stfs f2, 0x34(r1) /* 80117818 00114758 C0 01 00 2C */ lfs f0, 0x2c(r1) @@ -489,7 +489,7 @@ lbl_801178C8: /* 801178D8 00114818 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 801178DC 0011481C D0 1F 05 2C */ stfs f0, 0x52c(r31) /* 801178E0 00114820 38 7F 08 14 */ addi r3, r31, 0x814 -/* 801178E4 00114824 48 14 C0 79 */ bl cCcD_Stts_NS_ClrCcMove +/* 801178E4 00114824 48 14 C0 79 */ bl ClrCcMove__9cCcD_SttsFv /* 801178E8 00114828 7F E3 FB 78 */ mr r3, r31 /* 801178EC 0011482C 7F 44 D3 78 */ mr r4, r26 /* 801178F0 00114830 7F 25 CB 78 */ mr r5, r25 diff --git a/include/d/d_a/d_a_alink/asm/func_80118308.s b/include/d/d_a/d_a_alink/asm/func_80118308.s index ac43260914..918e9de564 100644 --- a/include/d/d_a/d_a_alink/asm/func_80118308.s +++ b/include/d/d_a/d_a_alink/asm/func_80118308.s @@ -26,7 +26,7 @@ lbl_80118364: /* 80118364 001152A4 38 61 00 18 */ addi r3, r1, 0x18 /* 80118368 001152A8 38 9D 04 D0 */ addi r4, r29, 0x4d0 /* 8011836C 001152AC 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80118370 001152B0 48 14 E7 C5 */ bl cXyz_NS___mi +/* 80118370 001152B0 48 14 E7 C5 */ bl __mi__4cXyzCFRC3Vec /* 80118374 001152B4 C0 41 00 18 */ lfs f2, 0x18(r1) /* 80118378 001152B8 D0 41 00 24 */ stfs f2, 0x24(r1) /* 8011837C 001152BC C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -128,7 +128,7 @@ lbl_80118488: /* 801184D8 00115418 D0 1E 00 08 */ stfs f0, 8(r30) /* 801184DC 0011541C 38 7D 1D 08 */ addi r3, r29, 0x1d08 /* 801184E0 00115420 7F C4 F3 78 */ mr r4, r30 -/* 801184E4 00115424 48 14 F8 45 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 801184E4 00115424 48 14 F8 45 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 801184E8 00115428 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801184EC 0011542C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801184F0 00115430 38 63 0F 38 */ addi r3, r3, 0xf38 @@ -141,7 +141,7 @@ lbl_80118488: /* 8011850C 0011544C 4C 41 13 82 */ cror 2, 1, 2 /* 80118510 00115450 40 82 00 40 */ bne lbl_80118550 /* 80118514 00115454 38 61 00 24 */ addi r3, r1, 0x24 -/* 80118518 00115458 48 14 EC 11 */ bl cXyz_NS_atan2sX_Z +/* 80118518 00115458 48 14 EC 11 */ bl atan2sX_Z__4cXyzCFv /* 8011851C 0011545C B0 7D 04 DE */ sth r3, 0x4de(r29) /* 80118520 00115460 C0 02 93 3C */ lfs f0, lbl_80452D3C-_SDA2_BASE_(r2) /* 80118524 00115464 D0 1D 33 98 */ stfs f0, 0x3398(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_8011856C.s b/include/d/d_a/d_a_alink/asm/func_8011856C.s index e924b7bcbb..1e4917fcc3 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011856C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011856C.s @@ -42,7 +42,7 @@ lbl_801185EC: lbl_80118604: /* 80118604 00115544 38 7D 04 D0 */ addi r3, r29, 0x4d0 /* 80118608 00115548 38 9E 05 38 */ addi r4, r30, 0x538 -/* 8011860C 0011554C 48 15 85 F9 */ bl cLib_targetAngleY +/* 8011860C 0011554C 48 15 85 F9 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 80118610 00115550 7C 64 1B 78 */ mr r4, r3 /* 80118614 00115554 48 00 00 14 */ b lbl_80118628 lbl_80118618: @@ -55,7 +55,7 @@ lbl_80118628: /* 8011862C 0011556C 38 A0 00 04 */ li r5, 4 /* 80118630 00115570 38 C0 10 00 */ li r6, 0x1000 /* 80118634 00115574 38 E0 02 00 */ li r7, 0x200 -/* 80118638 00115578 48 15 7F 09 */ bl cLib_addCalcAngleS +/* 80118638 00115578 48 15 7F 09 */ bl cLib_addCalcAngleS__FPsssss lbl_8011863C: /* 8011863C 0011557C 39 61 00 20 */ addi r11, r1, 0x20 /* 80118640 00115580 48 24 9B E9 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_80119F64.s b/include/d/d_a/d_a_alink/asm/func_80119F64.s index c7a2c3a81e..8aad544ec7 100644 --- a/include/d/d_a/d_a_alink/asm/func_80119F64.s +++ b/include/d/d_a/d_a_alink/asm/func_80119F64.s @@ -20,7 +20,7 @@ lbl_80119F98: /* 80119FAC 00116EEC 38 61 00 18 */ addi r3, r1, 0x18 /* 80119FB0 00116EF0 38 9F 37 C8 */ addi r4, r31, 0x37c8 /* 80119FB4 00116EF4 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80119FB8 00116EF8 48 14 CB 7D */ bl cXyz_NS___mi +/* 80119FB8 00116EF8 48 14 CB 7D */ bl __mi__4cXyzCFRC3Vec /* 80119FBC 00116EFC C0 01 00 18 */ lfs f0, 0x18(r1) /* 80119FC0 00116F00 D0 01 00 24 */ stfs f0, 0x24(r1) /* 80119FC4 00116F04 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -40,7 +40,7 @@ lbl_80119FF0: /* 80119FF8 00116F38 41 82 00 18 */ beq lbl_8011A010 /* 80119FFC 00116F3C A8 63 00 3C */ lha r3, 0x3c(r3) /* 8011A000 00116F40 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 8011A004 00116F44 48 15 6E 21 */ bl cLib_distanceAngleS +/* 8011A004 00116F44 48 15 6E 21 */ bl cLib_distanceAngleS__Fss /* 8011A008 00116F48 7C 7E 1B 78 */ mr r30, r3 /* 8011A00C 00116F4C 48 00 00 0C */ b lbl_8011A018 lbl_8011A010: @@ -125,9 +125,9 @@ lbl_8011A11C: /* 8011A120 00117060 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8011A124 00117064 41 80 00 24 */ blt lbl_8011A148 /* 8011A128 00117068 38 61 00 24 */ addi r3, r1, 0x24 -/* 8011A12C 0011706C 48 14 CF FD */ bl cXyz_NS_atan2sX_Z +/* 8011A12C 0011706C 48 14 CF FD */ bl atan2sX_Z__4cXyzCFv /* 8011A130 00117070 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 8011A134 00117074 48 15 6C F1 */ bl cLib_distanceAngleS +/* 8011A134 00117074 48 15 6C F1 */ bl cLib_distanceAngleS__Fss /* 8011A138 00117078 2C 03 40 00 */ cmpwi r3, 0x4000 /* 8011A13C 0011707C 41 81 00 0C */ bgt lbl_8011A148 /* 8011A140 00117080 2C 1E 40 00 */ cmpwi r30, 0x4000 diff --git a/include/d/d_a/d_a_alink/asm/func_8011BA20.s b/include/d/d_a/d_a_alink/asm/func_8011BA20.s index 97e6175319..f3ceeda954 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011BA20.s +++ b/include/d/d_a/d_a_alink/asm/func_8011BA20.s @@ -8,7 +8,7 @@ /* 8011BA3C 0011897C 41 82 00 54 */ beq lbl_8011BA90 /* 8011BA40 00118980 38 7F 34 E0 */ addi r3, r31, 0x34e0 /* 8011BA44 00118984 38 84 05 38 */ addi r4, r4, 0x538 -/* 8011BA48 00118988 48 15 51 BD */ bl cLib_targetAngleY +/* 8011BA48 00118988 48 15 51 BD */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8011BA4C 0011898C A8 9F 04 E6 */ lha r4, 0x4e6(r31) /* 8011BA50 00118990 7C 04 18 50 */ subf r0, r4, r3 /* 8011BA54 00118994 7C 00 07 34 */ extsh r0, r0 @@ -27,7 +27,7 @@ lbl_8011BA7C: /* 8011BA80 001189C0 38 A0 00 02 */ li r5, 2 /* 8011BA84 001189C4 38 C0 08 00 */ li r6, 0x800 /* 8011BA88 001189C8 38 E0 01 00 */ li r7, 0x100 -/* 8011BA8C 001189CC 48 15 4A B5 */ bl cLib_addCalcAngleS +/* 8011BA8C 001189CC 48 15 4A B5 */ bl cLib_addCalcAngleS__FPsssss lbl_8011BA90: /* 8011BA90 001189D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011BA94 001189D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_a/d_a_alink/asm/func_8011C1B4.s b/include/d/d_a/d_a_alink/asm/func_8011C1B4.s index 72ba713cb0..c5cdcb4788 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011C1B4.s +++ b/include/d/d_a/d_a_alink/asm/func_8011C1B4.s @@ -129,7 +129,7 @@ lbl_8011C380: /* 8011C380 001192C0 38 7D 34 78 */ addi r3, r29, 0x3478 /* 8011C384 001192C4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011C388 001192C8 C0 42 93 88 */ lfs f2, lbl_80452D88-_SDA2_BASE_(r2) -/* 8011C38C 001192CC 48 15 43 B5 */ bl cLib_chaseF +/* 8011C38C 001192CC 48 15 43 B5 */ bl cLib_chaseF__FPfff /* 8011C390 001192D0 C0 3D 34 78 */ lfs f1, 0x3478(r29) /* 8011C394 001192D4 C0 02 96 70 */ lfs f0, lbl_80453070-_SDA2_BASE_(r2) /* 8011C398 001192D8 FC 01 00 40 */ fcmpo cr0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_8011DB9C.s b/include/d/d_a/d_a_alink/asm/func_8011DB9C.s index dae60d2513..b38b2b84c8 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011DB9C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011DB9C.s @@ -137,12 +137,12 @@ lbl_8011DD94: /* 8011DD94 0011ACD4 C0 01 00 28 */ lfs f0, 0x28(r1) /* 8011DD98 0011ACD8 FC 20 00 50 */ fneg f1, f0 /* 8011DD9C 0011ACDC FC 40 10 50 */ fneg f2, f2 -/* 8011DDA0 0011ACE0 48 14 98 D5 */ bl cM_atan2s +/* 8011DDA0 0011ACE0 48 14 98 D5 */ bl cM_atan2s__Fff /* 8011DDA4 0011ACE4 B0 7E 04 E4 */ sth r3, 0x4e4(r30) /* 8011DDA8 0011ACE8 48 00 00 10 */ b lbl_8011DDB8 lbl_8011DDAC: /* 8011DDAC 0011ACEC 38 61 00 24 */ addi r3, r1, 0x24 -/* 8011DDB0 0011ACF0 48 14 93 A1 */ bl cXyz_NS_atan2sY_XZ +/* 8011DDB0 0011ACF0 48 14 93 A1 */ bl atan2sY_XZ__4cXyzCFv /* 8011DDB4 0011ACF4 B0 7E 04 E4 */ sth r3, 0x4e4(r30) lbl_8011DDB8: /* 8011DDB8 0011ACF8 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8011E060.s b/include/d/d_a/d_a_alink/asm/func_8011E060.s index 931e93e20d..8655e5f23c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011E060.s +++ b/include/d/d_a/d_a_alink/asm/func_8011E060.s @@ -11,7 +11,7 @@ /* 8011E088 0011AFC8 38 61 00 18 */ addi r3, r1, 0x18 /* 8011E08C 0011AFCC 38 9F 37 C8 */ addi r4, r31, 0x37c8 /* 8011E090 0011AFD0 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 8011E094 0011AFD4 48 14 8A A1 */ bl cXyz_NS___mi +/* 8011E094 0011AFD4 48 14 8A A1 */ bl __mi__4cXyzCFRC3Vec /* 8011E098 0011AFD8 C0 01 00 18 */ lfs f0, 0x18(r1) /* 8011E09C 0011AFDC D0 01 00 24 */ stfs f0, 0x24(r1) /* 8011E0A0 0011AFE0 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -31,7 +31,7 @@ lbl_8011E0CC: /* 8011E0D4 0011B014 41 82 00 18 */ beq lbl_8011E0EC /* 8011E0D8 0011B018 A8 63 00 3C */ lha r3, 0x3c(r3) /* 8011E0DC 0011B01C A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 8011E0E0 0011B020 48 15 2D 45 */ bl cLib_distanceAngleS +/* 8011E0E0 0011B020 48 15 2D 45 */ bl cLib_distanceAngleS__Fss /* 8011E0E4 0011B024 7C 7E 1B 78 */ mr r30, r3 /* 8011E0E8 0011B028 48 00 00 0C */ b lbl_8011E0F4 lbl_8011E0EC: @@ -116,9 +116,9 @@ lbl_8011E1F8: /* 8011E1FC 0011B13C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8011E200 0011B140 41 80 00 24 */ blt lbl_8011E224 /* 8011E204 0011B144 38 61 00 24 */ addi r3, r1, 0x24 -/* 8011E208 0011B148 48 14 8F 21 */ bl cXyz_NS_atan2sX_Z +/* 8011E208 0011B148 48 14 8F 21 */ bl atan2sX_Z__4cXyzCFv /* 8011E20C 0011B14C A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 8011E210 0011B150 48 15 2C 15 */ bl cLib_distanceAngleS +/* 8011E210 0011B150 48 15 2C 15 */ bl cLib_distanceAngleS__Fss /* 8011E214 0011B154 2C 03 40 00 */ cmpwi r3, 0x4000 /* 8011E218 0011B158 41 81 00 0C */ bgt lbl_8011E224 /* 8011E21C 0011B15C 2C 1E 40 00 */ cmpwi r30, 0x4000 diff --git a/include/d/d_a/d_a_alink/asm/func_8011F0F4.s b/include/d/d_a/d_a_alink/asm/func_8011F0F4.s index c9d3f2dca8..c0fa6a0eaa 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F0F4.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F0F4.s @@ -81,13 +81,13 @@ lbl_8011F21C: /* 8011F224 0011C164 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 8011F228 0011C168 C0 62 93 FC */ lfs f3, lbl_80452DFC-_SDA2_BASE_(r2) /* 8011F22C 0011C16C C0 82 94 78 */ lfs f4, lbl_80452E78-_SDA2_BASE_(r2) -/* 8011F230 0011C170 48 15 07 4D */ bl cLib_addCalc +/* 8011F230 0011C170 48 15 07 4D */ bl cLib_addCalc__FPfffff /* 8011F234 0011C174 38 7F 04 F0 */ addi r3, r31, 0x4f0 /* 8011F238 0011C178 C0 22 93 D8 */ lfs f1, lbl_80452DD8-_SDA2_BASE_(r2) /* 8011F23C 0011C17C C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 8011F240 0011C180 FC 60 10 90 */ fmr f3, f2 /* 8011F244 0011C184 C0 82 93 A0 */ lfs f4, lbl_80452DA0-_SDA2_BASE_(r2) -/* 8011F248 0011C188 48 15 07 35 */ bl cLib_addCalc +/* 8011F248 0011C188 48 15 07 35 */ bl cLib_addCalc__FPfffff /* 8011F24C 0011C18C C0 3F 04 EC */ lfs f1, 0x4ec(r31) /* 8011F250 0011C190 C0 02 93 88 */ lfs f0, lbl_80452D88-_SDA2_BASE_(r2) /* 8011F254 0011C194 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -145,7 +145,7 @@ lbl_8011F30C: /* 8011F314 0011C254 38 7F 04 EC */ addi r3, r31, 0x4ec /* 8011F318 0011C258 C0 22 94 08 */ lfs f1, lbl_80452E08-_SDA2_BASE_(r2) /* 8011F31C 0011C25C C0 42 93 88 */ lfs f2, lbl_80452D88-_SDA2_BASE_(r2) -/* 8011F320 0011C260 48 15 14 21 */ bl cLib_chaseF +/* 8011F320 0011C260 48 15 14 21 */ bl cLib_chaseF__FPfff lbl_8011F324: /* 8011F324 0011C264 C0 1F 04 EC */ lfs f0, 0x4ec(r31) /* 8011F328 0011C268 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011F460.s b/include/d/d_a/d_a_alink/asm/func_8011F460.s index 337a3d8b30..b226447b48 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F460.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F460.s @@ -25,14 +25,14 @@ lbl_8011F4B8: /* 8011F4B8 0011C3F8 38 7E 04 EC */ addi r3, r30, 0x4ec /* 8011F4BC 0011C3FC C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 8011F4C0 0011C400 C0 42 92 A4 */ lfs f2, lbl_80452CA4-_SDA2_BASE_(r2) -/* 8011F4C4 0011C404 48 15 12 7D */ bl cLib_chaseF +/* 8011F4C4 0011C404 48 15 12 7D */ bl cLib_chaseF__FPfff /* 8011F4C8 0011C408 7C 7F 1B 78 */ mr r31, r3 /* 8011F4CC 0011C40C C0 1E 04 EC */ lfs f0, 0x4ec(r30) /* 8011F4D0 0011C410 D0 1E 04 F4 */ stfs f0, 0x4f4(r30) /* 8011F4D4 0011C414 38 7E 04 F0 */ addi r3, r30, 0x4f0 /* 8011F4D8 0011C418 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 8011F4DC 0011C41C C0 42 94 00 */ lfs f2, lbl_80452E00-_SDA2_BASE_(r2) -/* 8011F4E0 0011C420 48 15 12 61 */ bl cLib_chaseF +/* 8011F4E0 0011C420 48 15 12 61 */ bl cLib_chaseF__FPfff /* 8011F4E4 0011C424 80 7E 06 50 */ lwz r3, 0x650(r30) /* 8011F4E8 0011C428 C0 1E 04 EC */ lfs f0, 0x4ec(r30) /* 8011F4EC 0011C42C D0 03 00 18 */ stfs f0, 0x18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8011FBC0.s b/include/d/d_a/d_a_alink/asm/func_8011FBC0.s index 55582f1afd..4af290473c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011FBC0.s +++ b/include/d/d_a/d_a_alink/asm/func_8011FBC0.s @@ -19,7 +19,7 @@ lbl_8011FC04: /* 8011FC04 0011CB44 38 7E 34 7C */ addi r3, r30, 0x347c /* 8011FC08 0011CB48 C0 3E 34 80 */ lfs f1, 0x3480(r30) /* 8011FC0C 0011CB4C C0 42 96 84 */ lfs f2, lbl_80453084-_SDA2_BASE_(r2) -/* 8011FC10 0011CB50 48 15 0B 31 */ bl cLib_chaseF +/* 8011FC10 0011CB50 48 15 0B 31 */ bl cLib_chaseF__FPfff /* 8011FC14 0011CB54 7C 7F 1B 78 */ mr r31, r3 /* 8011FC18 0011CB58 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) /* 8011FC1C 0011CB5C C0 1E 34 7C */ lfs f0, 0x347c(r30) 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 ecf7b556e1..5ee9b3f42d 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 @@ -16,7 +16,7 @@ /* 80121340 0011E280 38 A1 00 08 */ addi r5, r1, 8 /* 80121344 0011E284 48 22 5B 09 */ bl PSMTXMultVecSR /* 80121348 0011E288 38 61 00 08 */ addi r3, r1, 8 -/* 8012134C 0011E28C 48 14 5D DD */ bl cXyz_NS_atan2sX_Z +/* 8012134C 0011E28C 48 14 5D DD */ bl atan2sX_Z__4cXyzCFv /* 80121350 0011E290 7C 60 1B 78 */ mr r0, r3 /* 80121354 0011E294 38 60 03 03 */ li r3, 0x303 /* 80121358 0011E298 54 00 80 1E */ slwi r0, r0, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_80121388.s b/include/d/d_a/d_a_alink/asm/func_80121388.s index c536cff4fa..8e492168fc 100644 --- a/include/d/d_a/d_a_alink/asm/func_80121388.s +++ b/include/d/d_a/d_a_alink/asm/func_80121388.s @@ -387,7 +387,7 @@ lbl_801218D8: /* 8012191C 0011E85C D0 01 00 A4 */ stfs f0, 0xa4(r1) /* 80121920 0011E860 38 7B 1D 08 */ addi r3, r27, 0x1d08 /* 80121924 0011E864 38 81 00 9C */ addi r4, r1, 0x9c -/* 80121928 0011E868 48 14 64 01 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 80121928 0011E868 48 14 64 01 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8012192C 0011E86C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80121930 0011E870 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80121934 0011E874 38 63 0F 38 */ addi r3, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_8012277C.s b/include/d/d_a/d_a_alink/asm/func_8012277C.s index 3e083ab180..453b75c8bf 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012277C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012277C.s @@ -16,7 +16,7 @@ lbl_801227AC: /* 801227B4 0011F6F4 38 61 00 14 */ addi r3, r1, 0x14 /* 801227B8 0011F6F8 38 9B 05 E0 */ addi r4, r27, 0x5e0 /* 801227BC 0011F6FC 38 BB 04 D0 */ addi r5, r27, 0x4d0 -/* 801227C0 0011F700 48 14 43 75 */ bl cXyz_NS___mi +/* 801227C0 0011F700 48 14 43 75 */ bl __mi__4cXyzCFRC3Vec /* 801227C4 0011F704 C0 01 00 14 */ lfs f0, 0x14(r1) /* 801227C8 0011F708 D0 01 00 20 */ stfs f0, 0x20(r1) /* 801227CC 0011F70C C0 01 00 18 */ lfs f0, 0x18(r1) @@ -28,7 +28,7 @@ lbl_801227E0: /* 801227E0 0011F720 38 61 00 08 */ addi r3, r1, 8 /* 801227E4 0011F724 38 9B 05 EC */ addi r4, r27, 0x5ec /* 801227E8 0011F728 38 BB 04 D0 */ addi r5, r27, 0x4d0 -/* 801227EC 0011F72C 48 14 43 49 */ bl cXyz_NS___mi +/* 801227EC 0011F72C 48 14 43 49 */ bl __mi__4cXyzCFRC3Vec /* 801227F0 0011F730 C0 01 00 08 */ lfs f0, 8(r1) /* 801227F4 0011F734 D0 01 00 20 */ stfs f0, 0x20(r1) /* 801227F8 0011F738 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801228F4.s b/include/d/d_a/d_a_alink/asm/func_801228F4.s index dfaef78b85..785f38daaf 100644 --- a/include/d/d_a/d_a_alink/asm/func_801228F4.s +++ b/include/d/d_a/d_a_alink/asm/func_801228F4.s @@ -86,16 +86,16 @@ lbl_80122A34: /* 80122A38 0011F978 38 81 00 50 */ addi r4, r1, 0x50 /* 80122A3C 0011F97C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80122A40 0011F980 EC 20 F8 2A */ fadds f1, f0, f31 -/* 80122A44 0011F984 48 14 41 41 */ bl cXyz_NS___ml +/* 80122A44 0011F984 48 14 41 41 */ bl __ml__4cXyzCFf /* 80122A48 0011F988 38 61 00 14 */ addi r3, r1, 0x14 /* 80122A4C 0011F98C 38 81 00 20 */ addi r4, r1, 0x20 /* 80122A50 0011F990 C0 02 94 64 */ lfs f0, lbl_80452E64-_SDA2_BASE_(r2) /* 80122A54 0011F994 EC 3E 00 24 */ fdivs f1, f30, f0 -/* 80122A58 0011F998 48 14 41 2D */ bl cXyz_NS___ml +/* 80122A58 0011F998 48 14 41 2D */ bl __ml__4cXyzCFf /* 80122A5C 0011F99C 38 61 00 08 */ addi r3, r1, 8 /* 80122A60 0011F9A0 38 81 00 44 */ addi r4, r1, 0x44 /* 80122A64 0011F9A4 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80122A68 0011F9A8 48 14 40 7D */ bl cXyz_NS___pl +/* 80122A68 0011F9A8 48 14 40 7D */ bl __pl__4cXyzCFRC3Vec /* 80122A6C 0011F9AC C0 01 00 08 */ lfs f0, 8(r1) /* 80122A70 0011F9B0 D0 01 00 50 */ stfs f0, 0x50(r1) /* 80122A74 0011F9B4 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80122BBC.s b/include/d/d_a/d_a_alink/asm/func_80122BBC.s index 9384096b9e..8a7b176b6c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80122BBC.s +++ b/include/d/d_a/d_a_alink/asm/func_80122BBC.s @@ -110,11 +110,11 @@ lbl_80122CF4: /* 80122D58 0011FC98 38 61 00 2C */ addi r3, r1, 0x2c /* 80122D5C 0011FC9C 38 9E 37 E0 */ addi r4, r30, 0x37e0 /* 80122D60 0011FCA0 38 BE 37 EC */ addi r5, r30, 0x37ec -/* 80122D64 0011FCA4 48 14 3D 81 */ bl cXyz_NS___pl +/* 80122D64 0011FCA4 48 14 3D 81 */ bl __pl__4cXyzCFRC3Vec /* 80122D68 0011FCA8 38 61 00 20 */ addi r3, r1, 0x20 /* 80122D6C 0011FCAC 38 81 00 2C */ addi r4, r1, 0x2c /* 80122D70 0011FCB0 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) -/* 80122D74 0011FCB4 48 14 3E 11 */ bl cXyz_NS___ml +/* 80122D74 0011FCB4 48 14 3E 11 */ bl __ml__4cXyzCFf /* 80122D78 0011FCB8 C0 01 00 20 */ lfs f0, 0x20(r1) /* 80122D7C 0011FCBC D0 01 00 5C */ stfs f0, 0x5c(r1) /* 80122D80 0011FCC0 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -124,7 +124,7 @@ lbl_80122CF4: /* 80122D90 0011FCD0 38 61 00 14 */ addi r3, r1, 0x14 /* 80122D94 0011FCD4 38 9E 37 EC */ addi r4, r30, 0x37ec /* 80122D98 0011FCD8 38 BE 37 E0 */ addi r5, r30, 0x37e0 -/* 80122D9C 0011FCDC 48 14 3D 99 */ bl cXyz_NS___mi +/* 80122D9C 0011FCDC 48 14 3D 99 */ bl __mi__4cXyzCFRC3Vec /* 80122DA0 0011FCE0 C0 01 00 14 */ lfs f0, 0x14(r1) /* 80122DA4 0011FCE4 D0 01 00 50 */ stfs f0, 0x50(r1) /* 80122DA8 0011FCE8 C0 01 00 18 */ lfs f0, 0x18(r1) @@ -132,15 +132,15 @@ lbl_80122CF4: /* 80122DB0 0011FCF0 C0 01 00 1C */ lfs f0, 0x1c(r1) /* 80122DB4 0011FCF4 D0 01 00 58 */ stfs f0, 0x58(r1) /* 80122DB8 0011FCF8 38 61 00 50 */ addi r3, r1, 0x50 -/* 80122DBC 0011FCFC 48 14 43 6D */ bl cXyz_NS_atan2sX_Z +/* 80122DBC 0011FCFC 48 14 43 6D */ bl atan2sX_Z__4cXyzCFv /* 80122DC0 0011FD00 7C 7D 1B 78 */ mr r29, r3 /* 80122DC4 0011FD04 38 61 00 50 */ addi r3, r1, 0x50 -/* 80122DC8 0011FD08 48 14 43 89 */ bl cXyz_NS_atan2sY_XZ +/* 80122DC8 0011FD08 48 14 43 89 */ bl atan2sY_XZ__4cXyzCFv /* 80122DCC 0011FD0C 7C 64 1B 78 */ mr r4, r3 /* 80122DD0 0011FD10 38 61 00 0C */ addi r3, r1, 0xc /* 80122DD4 0011FD14 7F A5 EB 78 */ mr r5, r29 /* 80122DD8 0011FD18 38 C0 00 00 */ li r6, 0 -/* 80122DDC 0011FD1C 48 14 46 19 */ bl csXyz_X1_ +/* 80122DDC 0011FD1C 48 14 46 19 */ bl __ct__5csXyzFsss /* 80122DE0 0011FD20 7F C3 F3 78 */ mr r3, r30 /* 80122DE4 0011FD24 38 9E 31 E4 */ addi r4, r30, 0x31e4 /* 80122DE8 0011FD28 3C A0 00 01 */ lis r5, 0x00008682@ha diff --git a/include/d/d_a/d_a_alink/asm/func_801233A4.s b/include/d/d_a/d_a_alink/asm/func_801233A4.s index 2c53771858..60571d5a6b 100644 --- a/include/d/d_a/d_a_alink/asm/func_801233A4.s +++ b/include/d/d_a/d_a_alink/asm/func_801233A4.s @@ -7,7 +7,7 @@ /* 801233BC 001202FC 38 80 00 00 */ li r4, 0 /* 801233C0 00120300 A8 BF 04 E6 */ lha r5, 0x4e6(r31) /* 801233C4 00120304 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 801233C8 00120308 48 14 40 2D */ bl csXyz_X1_ +/* 801233C8 00120308 48 14 40 2D */ bl __ct__5csXyzFsss /* 801233CC 0012030C 80 7F 06 50 */ lwz r3, 0x650(r31) /* 801233D0 00120310 80 63 00 84 */ lwz r3, 0x84(r3) /* 801233D4 00120314 80 63 00 0C */ lwz r3, 0xc(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_80123434.s b/include/d/d_a/d_a_alink/asm/func_80123434.s index 9c48debcab..9b5968d167 100644 --- a/include/d/d_a/d_a_alink/asm/func_80123434.s +++ b/include/d/d_a/d_a_alink/asm/func_80123434.s @@ -29,7 +29,7 @@ /* 801234A4 001203E4 90 01 00 54 */ stw r0, 0x54(r1) /* 801234A8 001203E8 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 801234AC 001203EC 38 81 00 38 */ addi r4, r1, 0x38 -/* 801234B0 001203F0 48 14 48 79 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 801234B0 001203F0 48 14 48 79 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 801234B4 001203F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801234B8 001203F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801234BC 001203FC 3B 83 0F 38 */ addi r28, r3, 0xf38 @@ -129,10 +129,10 @@ lbl_80123600: /* 8012360C 0012054C C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) lbl_80123610: /* 80123610 00120550 C0 41 00 48 */ lfs f2, 0x48(r1) -/* 80123614 00120554 48 14 40 61 */ bl cM_atan2s +/* 80123614 00120554 48 14 40 61 */ bl cM_atan2s__Fff /* 80123618 00120558 B0 61 00 24 */ sth r3, 0x24(r1) /* 8012361C 0012055C 38 61 00 44 */ addi r3, r1, 0x44 -/* 80123620 00120560 48 14 3B 09 */ bl cXyz_NS_atan2sX_Z +/* 80123620 00120560 48 14 3B 09 */ bl atan2sX_Z__4cXyzCFv /* 80123624 00120564 B0 61 00 26 */ sth r3, 0x26(r1) /* 80123628 00120568 3B 80 00 00 */ li r28, 0 /* 8012362C 0012056C B3 81 00 28 */ sth r28, 0x28(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801238FC.s b/include/d/d_a/d_a_alink/asm/func_801238FC.s index cab156546c..c14e2848da 100644 --- a/include/d/d_a/d_a_alink/asm/func_801238FC.s +++ b/include/d/d_a/d_a_alink/asm/func_801238FC.s @@ -15,7 +15,7 @@ /* 80123934 00120874 A8 9F 04 E4 */ lha r4, 0x4e4(r31) /* 80123938 00120878 A8 BF 04 E6 */ lha r5, 0x4e6(r31) /* 8012393C 0012087C 38 C0 00 00 */ li r6, 0 -/* 80123940 00120880 48 14 3A B5 */ bl csXyz_X1_ +/* 80123940 00120880 48 14 3A B5 */ bl __ct__5csXyzFsss /* 80123944 00120884 A8 1F 30 0C */ lha r0, 0x300c(r31) /* 80123948 00120888 2C 00 00 00 */ cmpwi r0, 0 /* 8012394C 0012088C 40 82 00 14 */ bne lbl_80123960 diff --git a/include/d/d_a/d_a_alink/asm/func_801239B0.s b/include/d/d_a/d_a_alink/asm/func_801239B0.s index 5c87cf42fb..7c902e5f06 100644 --- a/include/d/d_a/d_a_alink/asm/func_801239B0.s +++ b/include/d/d_a/d_a_alink/asm/func_801239B0.s @@ -25,7 +25,7 @@ /* 80123A10 00120950 38 61 00 18 */ addi r3, r1, 0x18 /* 80123A14 00120954 7F C5 F3 78 */ mr r5, r30 /* 80123A18 00120958 38 C0 00 00 */ li r6, 0 -/* 80123A1C 0012095C 48 14 39 D9 */ bl csXyz_X1_ +/* 80123A1C 0012095C 48 14 39 D9 */ bl __ct__5csXyzFsss /* 80123A20 00120960 80 1F 31 98 */ lwz r0, 0x3198(r31) /* 80123A24 00120964 2C 00 00 03 */ cmpwi r0, 3 /* 80123A28 00120968 40 82 00 14 */ bne lbl_80123A3C diff --git a/include/d/d_a/d_a_alink/asm/func_80123ED0.s b/include/d/d_a/d_a_alink/asm/func_80123ED0.s index 1922395a0f..a87527b26c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80123ED0.s +++ b/include/d/d_a/d_a_alink/asm/func_80123ED0.s @@ -18,7 +18,7 @@ /* 80123F14 00120E54 FC 20 00 50 */ fneg f1, f0 /* 80123F18 00120E58 C0 01 00 44 */ lfs f0, 0x44(r1) /* 80123F1C 00120E5C FC 40 00 50 */ fneg f2, f0 -/* 80123F20 00120E60 48 14 37 55 */ bl cM_atan2s +/* 80123F20 00120E60 48 14 37 55 */ bl cM_atan2s__Fff /* 80123F24 00120E64 B0 7E 31 02 */ sth r3, 0x3102(r30) /* 80123F28 00120E68 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 80123F2C 00120E6C D0 01 00 30 */ stfs f0, 0x30(r1) @@ -98,12 +98,12 @@ lbl_80124030: /* 80124030 00120F70 FC 40 08 90 */ fmr f2, f1 lbl_80124034: /* 80124034 00120F74 C0 21 00 40 */ lfs f1, 0x40(r1) -/* 80124038 00120F78 48 14 36 3D */ bl cM_atan2s +/* 80124038 00120F78 48 14 36 3D */ bl cM_atan2s__Fff /* 8012403C 00120F7C 7C 64 1B 78 */ mr r4, r3 /* 80124040 00120F80 38 61 00 28 */ addi r3, r1, 0x28 /* 80124044 00120F84 A8 BE 31 02 */ lha r5, 0x3102(r30) /* 80124048 00120F88 38 C0 00 00 */ li r6, 0 -/* 8012404C 00120F8C 48 14 33 A9 */ bl csXyz_X1_ +/* 8012404C 00120F8C 48 14 33 A9 */ bl __ct__5csXyzFsss /* 80124050 00120F90 38 7F 00 14 */ addi r3, r31, 0x14 /* 80124054 00120F94 38 80 00 01 */ li r4, 1 /* 80124058 00120F98 4B F7 E1 89 */ bl daAlink_c_NS_getMoveBGActorName diff --git a/include/d/d_a/d_a_alink/asm/func_801244E4.s b/include/d/d_a/d_a_alink/asm/func_801244E4.s index b265e96e46..5c768d8901 100644 --- a/include/d/d_a/d_a_alink/asm/func_801244E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801244E4.s @@ -13,7 +13,7 @@ lbl_80124510: /* 80124510 00121450 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) lbl_80124514: /* 80124514 00121454 C0 42 93 A0 */ lfs f2, lbl_80452DA0-_SDA2_BASE_(r2) -/* 80124518 00121458 48 14 C2 29 */ bl cLib_chaseF +/* 80124518 00121458 48 14 C2 29 */ bl cLib_chaseF__FPfff /* 8012451C 0012145C 38 60 00 00 */ li r3, 0 /* 80124520 00121460 3C 80 80 39 */ lis r4, lbl_80391D44@ha /* 80124524 00121464 38 A4 1D 44 */ addi r5, r4, lbl_80391D44@l diff --git a/include/d/d_a/d_a_alink/asm/func_80124FA4.s b/include/d/d_a/d_a_alink/asm/func_80124FA4.s index 8c55949834..dc04e80ef1 100644 --- a/include/d/d_a/d_a_alink/asm/func_80124FA4.s +++ b/include/d/d_a/d_a_alink/asm/func_80124FA4.s @@ -23,15 +23,15 @@ lbl_80124FE8: /* 80124FF4 00121F34 7C A4 2B 78 */ mr r4, r5 /* 80124FF8 00121F38 4B FB 24 FD */ bl daAlink_c_NS_getDamageVec /* 80124FFC 00121F3C 7C 7C 1B 78 */ mr r28, r3 -/* 80125000 00121F40 48 14 21 29 */ bl cXyz_NS_atan2sX_Z +/* 80125000 00121F40 48 14 21 29 */ bl atan2sX_Z__4cXyzCFv /* 80125004 00121F44 7C 7D 1B 78 */ mr r29, r3 /* 80125008 00121F48 7F 83 E3 78 */ mr r3, r28 -/* 8012500C 00121F4C 48 14 21 45 */ bl cXyz_NS_atan2sY_XZ +/* 8012500C 00121F4C 48 14 21 45 */ bl atan2sY_XZ__4cXyzCFv /* 80125010 00121F50 7C 64 1B 78 */ mr r4, r3 /* 80125014 00121F54 38 61 00 10 */ addi r3, r1, 0x10 /* 80125018 00121F58 7F A5 EB 78 */ mr r5, r29 /* 8012501C 00121F5C 38 C0 00 00 */ li r6, 0 -/* 80125020 00121F60 48 14 23 D5 */ bl csXyz_X1_ +/* 80125020 00121F60 48 14 23 D5 */ bl __ct__5csXyzFsss /* 80125024 00121F64 38 7E 2E 44 */ addi r3, r30, 0x2e44 /* 80125028 00121F68 7F 64 DB 78 */ mr r4, r27 /* 8012502C 00121F6C 38 A1 00 10 */ addi r5, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_80125128.s b/include/d/d_a/d_a_alink/asm/func_80125128.s index 82649296dd..2dc42b5e12 100644 --- a/include/d/d_a/d_a_alink/asm/func_80125128.s +++ b/include/d/d_a/d_a_alink/asm/func_80125128.s @@ -47,11 +47,11 @@ lbl_801251D4: /* 801251D4 00122114 38 61 00 14 */ addi r3, r1, 0x14 /* 801251D8 00122118 38 81 00 20 */ addi r4, r1, 0x20 /* 801251DC 0012211C 38 BE 00 0C */ addi r5, r30, 0xc -/* 801251E0 00122120 48 14 19 55 */ bl cXyz_NS___mi +/* 801251E0 00122120 48 14 19 55 */ bl __mi__4cXyzCFRC3Vec /* 801251E4 00122124 38 61 00 08 */ addi r3, r1, 8 /* 801251E8 00122128 38 81 00 14 */ addi r4, r1, 0x14 /* 801251EC 0012212C C0 22 94 D0 */ lfs f1, lbl_80452ED0-_SDA2_BASE_(r2) -/* 801251F0 00122130 48 14 19 95 */ bl cXyz_NS___ml +/* 801251F0 00122130 48 14 19 95 */ bl __ml__4cXyzCFf /* 801251F4 00122134 C0 01 00 08 */ lfs f0, 8(r1) /* 801251F8 00122138 D0 1E 00 24 */ stfs f0, 0x24(r30) /* 801251FC 0012213C C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80125778.s b/include/d/d_a/d_a_alink/asm/func_80125778.s index 24c109f190..d40696d428 100644 --- a/include/d/d_a/d_a_alink/asm/func_80125778.s +++ b/include/d/d_a/d_a_alink/asm/func_80125778.s @@ -28,31 +28,31 @@ /* 801257E4 00122724 38 61 00 50 */ addi r3, r1, 0x50 /* 801257E8 00122728 7C 04 03 78 */ mr r4, r0 /* 801257EC 0012272C FC 20 20 90 */ fmr f1, f4 -/* 801257F0 00122730 48 14 13 95 */ bl cXyz_NS___ml +/* 801257F0 00122730 48 14 13 95 */ bl __ml__4cXyzCFf /* 801257F4 00122734 38 61 00 44 */ addi r3, r1, 0x44 /* 801257F8 00122738 7F A4 EB 78 */ mr r4, r29 /* 801257FC 0012273C FC 20 F8 90 */ fmr f1, f31 -/* 80125800 00122740 48 14 13 85 */ bl cXyz_NS___ml +/* 80125800 00122740 48 14 13 85 */ bl __ml__4cXyzCFf /* 80125804 00122744 38 61 00 38 */ addi r3, r1, 0x38 /* 80125808 00122748 38 81 00 50 */ addi r4, r1, 0x50 /* 8012580C 0012274C 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80125810 00122750 48 14 12 D5 */ bl cXyz_NS___pl +/* 80125810 00122750 48 14 12 D5 */ bl __pl__4cXyzCFRC3Vec /* 80125814 00122754 38 61 00 2C */ addi r3, r1, 0x2c /* 80125818 00122758 7F C4 F3 78 */ mr r4, r30 /* 8012581C 0012275C FC 20 F0 90 */ fmr f1, f30 -/* 80125820 00122760 48 14 13 65 */ bl cXyz_NS___ml +/* 80125820 00122760 48 14 13 65 */ bl __ml__4cXyzCFf /* 80125824 00122764 38 61 00 20 */ addi r3, r1, 0x20 /* 80125828 00122768 38 81 00 38 */ addi r4, r1, 0x38 /* 8012582C 0012276C 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80125830 00122770 48 14 12 B5 */ bl cXyz_NS___pl +/* 80125830 00122770 48 14 12 B5 */ bl __pl__4cXyzCFRC3Vec /* 80125834 00122774 38 61 00 14 */ addi r3, r1, 0x14 /* 80125838 00122778 7F 84 E3 78 */ mr r4, r28 /* 8012583C 0012277C FC 20 E8 90 */ fmr f1, f29 -/* 80125840 00122780 48 14 13 45 */ bl cXyz_NS___ml +/* 80125840 00122780 48 14 13 45 */ bl __ml__4cXyzCFf /* 80125844 00122784 38 61 00 08 */ addi r3, r1, 8 /* 80125848 00122788 38 81 00 20 */ addi r4, r1, 0x20 /* 8012584C 0012278C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80125850 00122790 48 14 12 95 */ bl cXyz_NS___pl +/* 80125850 00122790 48 14 12 95 */ bl __pl__4cXyzCFRC3Vec /* 80125854 00122794 C0 01 00 08 */ lfs f0, 8(r1) /* 80125858 00122798 D0 1F 00 00 */ stfs f0, 0(r31) /* 8012585C 0012279C C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012589C.s b/include/d/d_a/d_a_alink/asm/func_8012589C.s index a6cb604174..bd4cf5e1d4 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012589C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012589C.s @@ -39,12 +39,12 @@ lbl_801258E0: /* 80125930 00122870 38 61 00 74 */ addi r3, r1, 0x74 /* 80125934 00122874 38 9C 00 2C */ addi r4, r28, 0x2c /* 80125938 00122878 C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) -/* 8012593C 0012287C 48 14 12 49 */ bl cXyz_NS___ml +/* 8012593C 0012287C 48 14 12 49 */ bl __ml__4cXyzCFf /* 80125940 00122880 38 61 00 68 */ addi r3, r1, 0x68 /* 80125944 00122884 3B 5C 03 80 */ addi r26, r28, 0x380 /* 80125948 00122888 7F 44 D3 78 */ mr r4, r26 /* 8012594C 0012288C 38 A1 00 74 */ addi r5, r1, 0x74 -/* 80125950 00122890 48 14 11 95 */ bl cXyz_NS___pl +/* 80125950 00122890 48 14 11 95 */ bl __pl__4cXyzCFRC3Vec /* 80125954 00122894 C0 01 00 68 */ lfs f0, 0x68(r1) /* 80125958 00122898 D0 01 00 98 */ stfs f0, 0x98(r1) /* 8012595C 0012289C C0 01 00 6C */ lfs f0, 0x6c(r1) @@ -54,11 +54,11 @@ lbl_801258E0: /* 8012596C 001228AC 38 61 00 5C */ addi r3, r1, 0x5c /* 80125970 001228B0 7F E4 FB 78 */ mr r4, r31 /* 80125974 001228B4 C0 22 94 0C */ lfs f1, lbl_80452E0C-_SDA2_BASE_(r2) -/* 80125978 001228B8 48 14 12 0D */ bl cXyz_NS___ml +/* 80125978 001228B8 48 14 12 0D */ bl __ml__4cXyzCFf /* 8012597C 001228BC 38 61 00 50 */ addi r3, r1, 0x50 /* 80125980 001228C0 7F C4 F3 78 */ mr r4, r30 /* 80125984 001228C4 38 A1 00 5C */ addi r5, r1, 0x5c -/* 80125988 001228C8 48 14 11 5D */ bl cXyz_NS___pl +/* 80125988 001228C8 48 14 11 5D */ bl __pl__4cXyzCFRC3Vec /* 8012598C 001228CC C0 01 00 50 */ lfs f0, 0x50(r1) /* 80125990 001228D0 D0 01 00 A4 */ stfs f0, 0xa4(r1) /* 80125994 001228D4 C0 01 00 54 */ lfs f0, 0x54(r1) @@ -68,12 +68,12 @@ lbl_801258E0: /* 801259A4 001228E4 38 61 00 44 */ addi r3, r1, 0x44 /* 801259A8 001228E8 38 9C 00 2C */ addi r4, r28, 0x2c /* 801259AC 001228EC C0 22 93 B4 */ lfs f1, lbl_80452DB4-_SDA2_BASE_(r2) -/* 801259B0 001228F0 48 14 11 D5 */ bl cXyz_NS___ml +/* 801259B0 001228F0 48 14 11 D5 */ bl __ml__4cXyzCFf /* 801259B4 001228F4 38 61 00 38 */ addi r3, r1, 0x38 /* 801259B8 001228F8 3B 3C 00 B0 */ addi r25, r28, 0xb0 /* 801259BC 001228FC 7F 24 CB 78 */ mr r4, r25 /* 801259C0 00122900 38 A1 00 44 */ addi r5, r1, 0x44 -/* 801259C4 00122904 48 14 11 21 */ bl cXyz_NS___pl +/* 801259C4 00122904 48 14 11 21 */ bl __pl__4cXyzCFRC3Vec /* 801259C8 00122908 C0 01 00 38 */ lfs f0, 0x38(r1) /* 801259CC 0012290C D0 01 00 80 */ stfs f0, 0x80(r1) /* 801259D0 00122910 C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -83,11 +83,11 @@ lbl_801258E0: /* 801259E0 00122920 38 61 00 2C */ addi r3, r1, 0x2c /* 801259E4 00122924 7F E4 FB 78 */ mr r4, r31 /* 801259E8 00122928 C0 22 97 18 */ lfs f1, lbl_80453118-_SDA2_BASE_(r2) -/* 801259EC 0012292C 48 14 11 99 */ bl cXyz_NS___ml +/* 801259EC 0012292C 48 14 11 99 */ bl __ml__4cXyzCFf /* 801259F0 00122930 38 61 00 20 */ addi r3, r1, 0x20 /* 801259F4 00122934 7F A4 EB 78 */ mr r4, r29 /* 801259F8 00122938 38 A1 00 2C */ addi r5, r1, 0x2c -/* 801259FC 0012293C 48 14 10 E9 */ bl cXyz_NS___pl +/* 801259FC 0012293C 48 14 10 E9 */ bl __pl__4cXyzCFRC3Vec /* 80125A00 00122940 C0 01 00 20 */ lfs f0, 0x20(r1) /* 80125A04 00122944 D0 01 00 8C */ stfs f0, 0x8c(r1) /* 80125A08 00122948 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -118,11 +118,11 @@ lbl_80125A24: /* 80125A68 001229A8 38 61 00 14 */ addi r3, r1, 0x14 /* 80125A6C 001229AC 7F 04 C3 78 */ mr r4, r24 /* 80125A70 001229B0 7E E5 BB 78 */ mr r5, r23 -/* 80125A74 001229B4 48 14 10 C1 */ bl cXyz_NS___mi +/* 80125A74 001229B4 48 14 10 C1 */ bl __mi__4cXyzCFRC3Vec /* 80125A78 001229B8 38 61 00 08 */ addi r3, r1, 8 /* 80125A7C 001229BC 38 81 00 14 */ addi r4, r1, 0x14 /* 80125A80 001229C0 C0 3C 00 24 */ lfs f1, 0x24(r28) -/* 80125A84 001229C4 48 14 11 01 */ bl cXyz_NS___ml +/* 80125A84 001229C4 48 14 11 01 */ bl __ml__4cXyzCFf /* 80125A88 001229C8 7F 03 C3 78 */ mr r3, r24 /* 80125A8C 001229CC 38 81 00 08 */ addi r4, r1, 8 /* 80125A90 001229D0 7F 05 C3 78 */ mr r5, r24 diff --git a/include/d/d_a/d_a_alink/asm/func_80126358.s b/include/d/d_a/d_a_alink/asm/func_80126358.s index 5d732ef5ff..63ac5070e8 100644 --- a/include/d/d_a/d_a_alink/asm/func_80126358.s +++ b/include/d/d_a/d_a_alink/asm/func_80126358.s @@ -47,7 +47,7 @@ lbl_80126404: /* 80126404 00123344 38 63 00 04 */ addi r3, r3, 4 /* 80126408 00123348 38 80 00 80 */ li r4, 0x80 /* 8012640C 0012334C 38 A0 00 1E */ li r5, 0x1e -/* 80126410 00123350 48 14 A2 4D */ bl cLib_chaseUC +/* 80126410 00123350 48 14 A2 4D */ bl cLib_chaseUC__FPUcUcUc /* 80126414 00123354 80 01 00 14 */ lwz r0, 0x14(r1) /* 80126418 00123358 7C 08 03 A6 */ mtlr r0 /* 8012641C 0012335C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_80126424.s b/include/d/d_a/d_a_alink/asm/func_80126424.s index 5302e773a4..d14ca489e0 100644 --- a/include/d/d_a/d_a_alink/asm/func_80126424.s +++ b/include/d/d_a/d_a_alink/asm/func_80126424.s @@ -84,13 +84,13 @@ lbl_80126544: /* 80126560 001234A0 7D 89 03 A6 */ mtctr r12 /* 80126564 001234A4 4E 80 04 21 */ bctrl /* 80126568 001234A8 C0 22 97 28 */ lfs f1, lbl_80453128-_SDA2_BASE_(r2) -/* 8012656C 001234AC 48 14 10 79 */ bl cM_rad2s +/* 8012656C 001234AC 48 14 10 79 */ bl cM_rad2s__Ff /* 80126570 001234B0 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 80126574 001234B4 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 80126578 001234B8 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l /* 8012657C 001234BC 7F E3 04 2E */ lfsx f31, r3, r0 /* 80126580 001234C0 C0 22 97 28 */ lfs f1, lbl_80453128-_SDA2_BASE_(r2) -/* 80126584 001234C4 48 14 10 61 */ bl cM_rad2s +/* 80126584 001234C4 48 14 10 61 */ bl cM_rad2s__Ff /* 80126588 001234C8 3C 80 80 44 */ lis r4, lbl_80439A20@ha /* 8012658C 001234CC 38 84 9A 20 */ addi r4, r4, lbl_80439A20@l /* 80126590 001234D0 3B C4 00 04 */ addi r30, r4, 4 @@ -106,13 +106,13 @@ lbl_80126544: /* 801265B8 001234F8 7D 89 03 A6 */ mtctr r12 /* 801265BC 001234FC 4E 80 04 21 */ bctrl /* 801265C0 00123500 C0 22 97 2C */ lfs f1, lbl_8045312C-_SDA2_BASE_(r2) -/* 801265C4 00123504 48 14 10 21 */ bl cM_rad2s +/* 801265C4 00123504 48 14 10 21 */ bl cM_rad2s__Ff /* 801265C8 00123508 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 801265CC 0012350C 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 801265D0 00123510 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l /* 801265D4 00123514 7F E3 04 2E */ lfsx f31, r3, r0 /* 801265D8 00123518 C0 22 97 2C */ lfs f1, lbl_8045312C-_SDA2_BASE_(r2) -/* 801265DC 0012351C 48 14 10 09 */ bl cM_rad2s +/* 801265DC 0012351C 48 14 10 09 */ bl cM_rad2s__Ff /* 801265E0 00123520 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 801265E4 00123524 7C 1E 04 2E */ lfsx f0, r30, r0 /* 801265E8 00123528 80 7F 00 18 */ lwz r3, 0x18(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80126928.s b/include/d/d_a/d_a_alink/asm/func_80126928.s index af4e895b53..ead8c77d2b 100644 --- a/include/d/d_a/d_a_alink/asm/func_80126928.s +++ b/include/d/d_a/d_a_alink/asm/func_80126928.s @@ -368,7 +368,7 @@ lbl_80126E70: /* 80126ED4 00123E14 90 1F 0F E4 */ stw r0, 0xfe4(r31) /* 80126ED8 00123E18 38 7F 10 DC */ addi r3, r31, 0x10dc /* 80126EDC 00123E1C C0 22 93 D4 */ lfs f1, lbl_80452DD4-_SDA2_BASE_(r2) -/* 80126EE0 00123E20 48 14 88 29 */ bl cM3dGSph_NS_SetR +/* 80126EE0 00123E20 48 14 88 29 */ bl SetR__8cM3dGSphFf /* 80126EE4 00123E24 38 00 00 00 */ li r0, 0 /* 80126EE8 00123E28 90 1F 06 FC */ stw r0, 0x6fc(r31) /* 80126EEC 00123E2C 90 1F 06 58 */ stw r0, 0x658(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80127E08.s b/include/d/d_a/d_a_alink/asm/func_80127E08.s index 3f5c6583cf..ce85e1472c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80127E08.s +++ b/include/d/d_a/d_a_alink/asm/func_80127E08.s @@ -29,7 +29,7 @@ lbl_80127E58: /* 80127E70 00124DB0 38 A0 00 05 */ li r5, 5 /* 80127E74 00124DB4 38 C0 01 F4 */ li r6, 0x1f4 /* 80127E78 00124DB8 38 E0 00 32 */ li r7, 0x32 -/* 80127E7C 00124DBC 48 14 86 C5 */ bl cLib_addCalcAngleS +/* 80127E7C 00124DBC 48 14 86 C5 */ bl cLib_addCalcAngleS__FPsssss /* 80127E80 00124DC0 A8 7F 00 00 */ lha r3, 0(r31) /* 80127E84 00124DC4 A8 1E 00 00 */ lha r0, 0(r30) /* 80127E88 00124DC8 7C 03 02 14 */ add r0, r3, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80127F50.s b/include/d/d_a/d_a_alink/asm/func_80127F50.s index 5ecbf05b42..38a76db177 100644 --- a/include/d/d_a/d_a_alink/asm/func_80127F50.s +++ b/include/d/d_a/d_a_alink/asm/func_80127F50.s @@ -74,7 +74,7 @@ lbl_8012802C: /* 80128060 00124FA0 C0 19 05 94 */ lfs f0, 0x594(r25) /* 80128064 00124FA4 EF 61 00 24 */ fdivs f27, f1, f0 /* 80128068 00124FA8 A8 79 2F E2 */ lha r3, 0x2fe2(r25) -/* 8012806C 00124FAC 48 14 8D B9 */ bl cLib_distanceAngleS +/* 8012806C 00124FAC 48 14 8D B9 */ bl cLib_distanceAngleS__Fss /* 80128070 00124FB0 2C 03 70 00 */ cmpwi r3, 0x7000 /* 80128074 00124FB4 40 81 01 30 */ ble lbl_801281A4 /* 80128078 00124FB8 80 79 31 80 */ lwz r3, 0x3180(r25) @@ -114,7 +114,7 @@ lbl_801280E8: /* 801280F0 00125030 7F C5 F3 78 */ mr r5, r30 /* 801280F4 00125034 7F A6 EB 78 */ mr r6, r29 /* 801280F8 00125038 7F 87 E3 78 */ mr r7, r28 -/* 801280FC 0012503C 48 14 84 45 */ bl cLib_addCalcAngleS +/* 801280FC 0012503C 48 14 84 45 */ bl cLib_addCalcAngleS__FPsssss /* 80128100 00125040 A0 19 2F E8 */ lhz r0, 0x2fe8(r25) /* 80128104 00125044 28 00 00 F2 */ cmplwi r0, 0xf2 /* 80128108 00125048 40 82 01 40 */ bne lbl_80128248 @@ -150,7 +150,7 @@ lbl_8012816C: /* 80128174 001250B4 7F C5 F3 78 */ mr r5, r30 /* 80128178 001250B8 7F A6 EB 78 */ mr r6, r29 /* 8012817C 001250BC 7F 87 E3 78 */ mr r7, r28 -/* 80128180 001250C0 48 14 83 C1 */ bl cLib_addCalcAngleS +/* 80128180 001250C0 48 14 83 C1 */ bl cLib_addCalcAngleS__FPsssss /* 80128184 001250C4 A0 19 2F E8 */ lhz r0, 0x2fe8(r25) /* 80128188 001250C8 28 00 00 F2 */ cmplwi r0, 0xf2 /* 8012818C 001250CC 40 82 00 BC */ bne lbl_80128248 @@ -203,7 +203,7 @@ lbl_80128238: /* 80128238 00125178 38 79 04 DE */ addi r3, r25, 0x4de /* 8012823C 0012517C A8 99 2F E2 */ lha r4, 0x2fe2(r25) /* 80128240 00125180 7F C5 F3 78 */ mr r5, r30 -/* 80128244 00125184 48 14 82 FD */ bl cLib_addCalcAngleS +/* 80128244 00125184 48 14 82 FD */ bl cLib_addCalcAngleS__FPsssss lbl_80128248: /* 80128248 00125188 7F 23 CB 78 */ mr r3, r25 /* 8012824C 0012518C 7F 64 DB 78 */ mr r4, r27 @@ -216,7 +216,7 @@ lbl_80128248: /* 80128268 001251A8 90 19 05 8C */ stw r0, 0x58c(r25) /* 8012826C 001251AC A8 79 2F E2 */ lha r3, 0x2fe2(r25) /* 80128270 001251B0 A8 99 04 DE */ lha r4, 0x4de(r25) -/* 80128274 001251B4 48 14 8B B1 */ bl cLib_distanceAngleS +/* 80128274 001251B4 48 14 8B B1 */ bl cLib_distanceAngleS__Fss /* 80128278 001251B8 2C 03 70 00 */ cmpwi r3, 0x7000 /* 8012827C 001251BC 40 81 00 08 */ ble lbl_80128284 /* 80128280 001251C0 3B 40 00 01 */ li r26, 1 @@ -259,7 +259,7 @@ lbl_801282F4: /* 80128308 00125248 38 03 80 00 */ addi r0, r3, -32768 /* 8012830C 0012524C 7C 03 07 34 */ extsh r3, r0 /* 80128310 00125250 A8 99 30 92 */ lha r4, 0x3092(r25) -/* 80128314 00125254 48 14 8B 11 */ bl cLib_distanceAngleS +/* 80128314 00125254 48 14 8B 11 */ bl cLib_distanceAngleS__Fss /* 80128318 00125258 2C 03 0C 00 */ cmpwi r3, 0xc00 /* 8012831C 0012525C 41 80 00 18 */ blt lbl_80128334 lbl_80128320: @@ -298,7 +298,7 @@ lbl_8012837C: /* 80128390 001252D0 7F 80 07 34 */ extsh r0, r28 /* 80128394 001252D4 54 00 08 3C */ slwi r0, r0, 1 /* 80128398 001252D8 7C 07 07 34 */ extsh r7, r0 -/* 8012839C 001252DC 48 14 81 A5 */ bl cLib_addCalcAngleS +/* 8012839C 001252DC 48 14 81 A5 */ bl cLib_addCalcAngleS__FPsssss /* 801283A0 001252E0 A8 99 04 DE */ lha r4, 0x4de(r25) /* 801283A4 001252E4 7C 04 D0 50 */ subf r0, r4, r26 /* 801283A8 001252E8 7C 03 07 34 */ extsh r3, r0 @@ -329,7 +329,7 @@ lbl_801283D4: /* 80128408 00125348 38 A0 00 02 */ li r5, 2 /* 8012840C 0012534C 38 C0 20 00 */ li r6, 0x2000 /* 80128410 00125350 38 E0 08 00 */ li r7, 0x800 -/* 80128414 00125354 48 14 81 2D */ bl cLib_addCalcAngleS +/* 80128414 00125354 48 14 81 2D */ bl cLib_addCalcAngleS__FPsssss /* 80128418 00125358 A8 19 04 E6 */ lha r0, 0x4e6(r25) /* 8012841C 0012535C B0 19 04 DE */ sth r0, 0x4de(r25) lbl_80128420: diff --git a/include/d/d_a/d_a_alink/asm/func_80128478.s b/include/d/d_a/d_a_alink/asm/func_80128478.s index d1d01b9a9a..64fd3db131 100644 --- a/include/d/d_a/d_a_alink/asm/func_80128478.s +++ b/include/d/d_a/d_a_alink/asm/func_80128478.s @@ -100,7 +100,7 @@ lbl_801285C8: /* 801285DC 0012551C A8 A7 00 04 */ lha r5, 4(r7) /* 801285E0 00125520 7F E6 FB 78 */ mr r6, r31 /* 801285E4 00125524 A8 E7 00 02 */ lha r7, 2(r7) -/* 801285E8 00125528 48 14 7F 59 */ bl cLib_addCalcAngleS +/* 801285E8 00125528 48 14 7F 59 */ bl cLib_addCalcAngleS__FPsssss /* 801285EC 0012552C 7F C3 F3 78 */ mr r3, r30 /* 801285F0 00125530 7F 84 E3 78 */ mr r4, r28 /* 801285F4 00125534 48 00 1A 39 */ bl daAlink_c_NS_wolfSideBgCheck @@ -153,7 +153,7 @@ lbl_8012869C: /* 801286A4 001255E4 38 A0 00 02 */ li r5, 2 /* 801286A8 001255E8 38 C0 20 00 */ li r6, 0x2000 /* 801286AC 001255EC 38 E0 08 00 */ li r7, 0x800 -/* 801286B0 001255F0 48 14 7E 91 */ bl cLib_addCalcAngleS +/* 801286B0 001255F0 48 14 7E 91 */ bl cLib_addCalcAngleS__FPsssss lbl_801286B4: /* 801286B4 001255F4 88 1E 2F 98 */ lbz r0, 0x2f98(r30) /* 801286B8 001255F8 28 00 00 01 */ cmplwi r0, 1 @@ -181,7 +181,7 @@ lbl_801286E0: /* 80128704 00125644 41 82 00 2C */ beq lbl_80128730 /* 80128708 00125648 A8 7E 04 E6 */ lha r3, 0x4e6(r30) /* 8012870C 0012564C A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 80128710 00125650 48 14 87 15 */ bl cLib_distanceAngleS +/* 80128710 00125650 48 14 87 15 */ bl cLib_distanceAngleS__Fss /* 80128714 00125654 2C 03 40 00 */ cmpwi r3, 0x4000 /* 80128718 00125658 40 81 00 18 */ ble lbl_80128730 lbl_8012871C: @@ -203,7 +203,7 @@ lbl_80128734: /* 80128750 00125690 A8 07 00 02 */ lha r0, 2(r7) /* 80128754 00125694 54 00 08 3C */ slwi r0, r0, 1 /* 80128758 00125698 7C 07 07 34 */ extsh r7, r0 -/* 8012875C 0012569C 48 14 7D E5 */ bl cLib_addCalcAngleS +/* 8012875C 0012569C 48 14 7D E5 */ bl cLib_addCalcAngleS__FPsssss lbl_80128760: /* 80128760 001256A0 7F C3 F3 78 */ mr r3, r30 /* 80128764 001256A4 FC 20 F8 90 */ fmr f1, f31 diff --git a/include/d/d_a/d_a_alink/asm/func_80128F5C.s b/include/d/d_a/d_a_alink/asm/func_80128F5C.s index 360c28c54c..9967629a91 100644 --- a/include/d/d_a/d_a_alink/asm/func_80128F5C.s +++ b/include/d/d_a/d_a_alink/asm/func_80128F5C.s @@ -65,7 +65,7 @@ lbl_8012903C: /* 80129044 00125F84 41 82 00 14 */ beq lbl_80129058 /* 80129048 00125F88 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 8012904C 00125F8C 38 84 05 38 */ addi r4, r4, 0x538 -/* 80129050 00125F90 48 14 7B B5 */ bl cLib_targetAngleY +/* 80129050 00125F90 48 14 7B B5 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 80129054 00125F94 B0 7F 2F E4 */ sth r3, 0x2fe4(r31) lbl_80129058: /* 80129058 00125F98 A8 1F 2F E4 */ lha r0, 0x2fe4(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80129B44.s b/include/d/d_a/d_a_alink/asm/func_80129B44.s index 962c6e763a..e079391038 100644 --- a/include/d/d_a/d_a_alink/asm/func_80129B44.s +++ b/include/d/d_a/d_a_alink/asm/func_80129B44.s @@ -267,7 +267,7 @@ lbl_80129E9C: lbl_80129EF8: /* 80129EF8 00126E38 A8 7D 2F E2 */ lha r3, 0x2fe2(r29) /* 80129EFC 00126E3C A8 9D 04 DE */ lha r4, 0x4de(r29) -/* 80129F00 00126E40 48 14 6F 25 */ bl cLib_distanceAngleS +/* 80129F00 00126E40 48 14 6F 25 */ bl cLib_distanceAngleS__Fss /* 80129F04 00126E44 2C 03 70 00 */ cmpwi r3, 0x7000 /* 80129F08 00126E48 40 81 00 50 */ ble lbl_80129F58 /* 80129F0C 00126E4C 80 1D 05 8C */ lwz r0, 0x58c(r29) @@ -310,7 +310,7 @@ lbl_80129F68: /* 80129F90 00126ED0 40 80 00 74 */ bge lbl_8012A004 /* 80129F94 00126ED4 A8 7D 2F E2 */ lha r3, 0x2fe2(r29) /* 80129F98 00126ED8 A8 9D 04 DE */ lha r4, 0x4de(r29) -/* 80129F9C 00126EDC 48 14 6E 89 */ bl cLib_distanceAngleS +/* 80129F9C 00126EDC 48 14 6E 89 */ bl cLib_distanceAngleS__Fss /* 80129FA0 00126EE0 2C 03 70 00 */ cmpwi r3, 0x7000 /* 80129FA4 00126EE4 40 81 00 60 */ ble lbl_8012A004 /* 80129FA8 00126EE8 80 1D 05 74 */ lwz r0, 0x574(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_8012A228.s b/include/d/d_a/d_a_alink/asm/func_8012A228.s index 19123fed78..9a26711e85 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012A228.s +++ b/include/d/d_a/d_a_alink/asm/func_8012A228.s @@ -33,7 +33,7 @@ lbl_8012A284: /* 8012A2A0 001271E0 41 82 00 74 */ beq lbl_8012A314 /* 8012A2A4 001271E4 A8 7E 30 92 */ lha r3, 0x3092(r30) /* 8012A2A8 001271E8 A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 8012A2AC 001271EC 48 14 6B 79 */ bl cLib_distanceAngleS +/* 8012A2AC 001271EC 48 14 6B 79 */ bl cLib_distanceAngleS__Fss /* 8012A2B0 001271F0 2C 03 60 00 */ cmpwi r3, 0x6000 /* 8012A2B4 001271F4 40 81 00 60 */ ble lbl_8012A314 lbl_8012A2B8: diff --git a/include/d/d_a/d_a_alink/asm/func_8012A330.s b/include/d/d_a/d_a_alink/asm/func_8012A330.s index b3d5cbb9a7..63b5427f88 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012A330.s +++ b/include/d/d_a/d_a_alink/asm/func_8012A330.s @@ -27,7 +27,7 @@ lbl_8012A38C: /* 8012A394 001272D4 41 82 00 44 */ beq lbl_8012A3D8 /* 8012A398 001272D8 A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 8012A39C 001272DC A8 9F 31 02 */ lha r4, 0x3102(r31) -/* 8012A3A0 001272E0 48 14 6A 85 */ bl cLib_distanceAngleS +/* 8012A3A0 001272E0 48 14 6A 85 */ bl cLib_distanceAngleS__Fss /* 8012A3A4 001272E4 2C 03 40 00 */ cmpwi r3, 0x4000 /* 8012A3A8 001272E8 41 80 00 24 */ blt lbl_8012A3CC /* 8012A3AC 001272EC 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_8012A498.s b/include/d/d_a/d_a_alink/asm/func_8012A498.s index 53d853da73..b4aed2f3e9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012A498.s +++ b/include/d/d_a/d_a_alink/asm/func_8012A498.s @@ -331,7 +331,7 @@ lbl_8012A94C: /* 8012A960 001278A0 FC 20 00 50 */ fneg f1, f0 /* 8012A964 001278A4 C0 01 00 20 */ lfs f0, 0x20(r1) /* 8012A968 001278A8 FC 40 00 50 */ fneg f2, f0 -/* 8012A96C 001278AC 48 13 CD 09 */ bl cM_atan2s +/* 8012A96C 001278AC 48 13 CD 09 */ bl cM_atan2s__Fff /* 8012A970 001278B0 B0 7A 30 92 */ sth r3, 0x3092(r26) /* 8012A974 001278B4 80 1A 05 7C */ lwz r0, 0x57c(r26) /* 8012A978 001278B8 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 @@ -340,7 +340,7 @@ lbl_8012A94C: /* 8012A984 001278C4 FC 20 00 50 */ fneg f1, f0 /* 8012A988 001278C8 C0 01 00 5C */ lfs f0, 0x5c(r1) /* 8012A98C 001278CC FC 40 00 50 */ fneg f2, f0 -/* 8012A990 001278D0 48 13 CC E5 */ bl cM_atan2s +/* 8012A990 001278D0 48 13 CC E5 */ bl cM_atan2s__Fff /* 8012A994 001278D4 7C 7F 1B 78 */ mr r31, r3 /* 8012A998 001278D8 C0 01 00 54 */ lfs f0, 0x54(r1) /* 8012A99C 001278DC D0 01 00 0C */ stfs f0, 0xc(r1) @@ -420,7 +420,7 @@ lbl_8012AAA0: /* 8012AAA0 001279E0 FC 40 08 90 */ fmr f2, f1 lbl_8012AAA4: /* 8012AAA4 001279E4 C0 21 00 58 */ lfs f1, 0x58(r1) -/* 8012AAA8 001279E8 48 13 CB CD */ bl cM_atan2s +/* 8012AAA8 001279E8 48 13 CB CD */ bl cM_atan2s__Fff /* 8012AAAC 001279EC B0 7A 31 66 */ sth r3, 0x3166(r26) /* 8012AAB0 001279F0 B3 FA 31 68 */ sth r31, 0x3168(r26) /* 8012AAB4 001279F4 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8012B724.s b/include/d/d_a/d_a_alink/asm/func_8012B724.s index e73b2df4e6..549d02633c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012B724.s +++ b/include/d/d_a/d_a_alink/asm/func_8012B724.s @@ -137,7 +137,7 @@ lbl_8012B920: /* 8012B920 00128860 38 61 00 44 */ addi r3, r1, 0x44 /* 8012B924 00128864 7E E4 BB 78 */ mr r4, r23 /* 8012B928 00128868 38 B4 00 08 */ addi r5, r20, 8 -/* 8012B92C 0012886C 48 13 B2 09 */ bl cXyz_NS___mi +/* 8012B92C 0012886C 48 13 B2 09 */ bl __mi__4cXyzCFRC3Vec /* 8012B930 00128870 C0 41 00 44 */ lfs f2, 0x44(r1) /* 8012B934 00128874 D0 41 00 78 */ stfs f2, 0x78(r1) /* 8012B938 00128878 C0 01 00 48 */ lfs f0, 0x48(r1) @@ -194,7 +194,7 @@ lbl_8012B9BC: /* 8012B9F8 00128938 D0 41 00 8C */ stfs f2, 0x8c(r1) /* 8012B9FC 0012893C 38 6F 1D 08 */ addi r3, r15, 0x1d08 /* 8012BA00 00128940 38 81 00 84 */ addi r4, r1, 0x84 -/* 8012BA04 00128944 48 13 C3 25 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8012BA04 00128944 48 13 C3 25 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8012BA08 00128948 7E A3 AB 78 */ mr r3, r21 /* 8012BA0C 0012894C 38 8F 1D 08 */ addi r4, r15, 0x1d08 /* 8012BA10 00128950 4B F4 8A 91 */ bl cBgS_NS_GroundCross @@ -350,13 +350,13 @@ lbl_8012BC28: /* 8012BC30 00128B70 38 A0 00 02 */ li r5, 2 /* 8012BC34 00128B74 38 C0 18 00 */ li r6, 0x1800 /* 8012BC38 00128B78 38 E0 00 10 */ li r7, 0x10 -/* 8012BC3C 00128B7C 48 14 49 05 */ bl cLib_addCalcAngleS +/* 8012BC3C 00128B7C 48 14 49 05 */ bl cLib_addCalcAngleS__FPsssss /* 8012BC40 00128B80 38 73 00 04 */ addi r3, r19, 4 /* 8012BC44 00128B84 7C 99 E2 AE */ lhax r4, r25, r28 /* 8012BC48 00128B88 38 A0 00 02 */ li r5, 2 /* 8012BC4C 00128B8C 38 C0 18 00 */ li r6, 0x1800 /* 8012BC50 00128B90 38 E0 00 10 */ li r7, 0x10 -/* 8012BC54 00128B94 48 14 48 ED */ bl cLib_addCalcAngleS +/* 8012BC54 00128B94 48 14 48 ED */ bl cLib_addCalcAngleS__FPsssss /* 8012BC58 00128B98 A0 0F 2F E8 */ lhz r0, 0x2fe8(r15) /* 8012BC5C 00128B9C 28 00 01 0E */ cmplwi r0, 0x10e /* 8012BC60 00128BA0 40 82 00 0C */ bne lbl_8012BC6C @@ -384,7 +384,7 @@ lbl_8012BCA8: /* 8012BCAC 00128BEC 38 A0 00 02 */ li r5, 2 /* 8012BCB0 00128BF0 38 C0 18 00 */ li r6, 0x1800 /* 8012BCB4 00128BF4 38 E0 00 10 */ li r7, 0x10 -/* 8012BCB8 00128BF8 48 14 48 89 */ bl cLib_addCalcAngleS +/* 8012BCB8 00128BF8 48 14 48 89 */ bl cLib_addCalcAngleS__FPsssss /* 8012BCBC 00128BFC 3A 52 00 01 */ addi r18, r18, 1 /* 8012BCC0 00128C00 2C 12 00 02 */ cmpwi r18, 2 /* 8012BCC4 00128C04 3B BD 00 04 */ addi r29, r29, 4 @@ -417,11 +417,11 @@ lbl_8012BCA8: /* 8012BD30 00128C70 38 61 00 38 */ addi r3, r1, 0x38 /* 8012BD34 00128C74 38 8F 04 D0 */ addi r4, r15, 0x4d0 /* 8012BD38 00128C78 C0 22 93 14 */ lfs f1, lbl_80452D14-_SDA2_BASE_(r2) -/* 8012BD3C 00128C7C 48 13 AE 49 */ bl cXyz_NS___ml +/* 8012BD3C 00128C7C 48 13 AE 49 */ bl __ml__4cXyzCFf /* 8012BD40 00128C80 38 61 00 2C */ addi r3, r1, 0x2c /* 8012BD44 00128C84 38 81 00 38 */ addi r4, r1, 0x38 /* 8012BD48 00128C88 38 A1 00 5C */ addi r5, r1, 0x5c -/* 8012BD4C 00128C8C 48 13 AD E9 */ bl cXyz_NS___mi +/* 8012BD4C 00128C8C 48 13 AD E9 */ bl __mi__4cXyzCFRC3Vec /* 8012BD50 00128C90 C0 01 00 2C */ lfs f0, 0x2c(r1) /* 8012BD54 00128C94 D0 01 00 50 */ stfs f0, 0x50(r1) /* 8012BD58 00128C98 C0 41 00 30 */ lfs f2, 0x30(r1) @@ -436,7 +436,7 @@ lbl_8012BCA8: /* 8012BD7C 00128CBC D0 01 00 54 */ stfs f0, 0x54(r1) /* 8012BD80 00128CC0 38 6F 1D 08 */ addi r3, r15, 0x1d08 /* 8012BD84 00128CC4 38 81 00 5C */ addi r4, r1, 0x5c -/* 8012BD88 00128CC8 48 13 BF A1 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8012BD88 00128CC8 48 13 BF A1 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8012BD8C 00128CCC 7E A3 AB 78 */ mr r3, r21 /* 8012BD90 00128CD0 38 8F 1D 08 */ addi r4, r15, 0x1d08 /* 8012BD94 00128CD4 4B F4 87 0D */ bl cBgS_NS_GroundCross @@ -477,7 +477,7 @@ lbl_8012BE00: lbl_8012BE10: /* 8012BE10 00128D50 38 6F 1D 08 */ addi r3, r15, 0x1d08 /* 8012BE14 00128D54 38 81 00 50 */ addi r4, r1, 0x50 -/* 8012BE18 00128D58 48 13 BF 11 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8012BE18 00128D58 48 13 BF 11 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8012BE1C 00128D5C 7E A3 AB 78 */ mr r3, r21 /* 8012BE20 00128D60 38 8F 1D 08 */ addi r4, r15, 0x1d08 /* 8012BE24 00128D64 4B F4 86 7D */ bl cBgS_NS_GroundCross @@ -519,7 +519,7 @@ lbl_8012BE98: /* 8012BEA0 00128DE0 7C 65 1B 78 */ mr r5, r3 /* 8012BEA4 00128DE4 48 21 B2 11 */ bl PSVECSubtract /* 8012BEA8 00128DE8 38 61 00 5C */ addi r3, r1, 0x5c -/* 8012BEAC 00128DEC 48 13 B2 A5 */ bl cXyz_NS_atan2sY_XZ +/* 8012BEAC 00128DEC 48 13 B2 A5 */ bl atan2sY_XZ__4cXyzCFv /* 8012BEB0 00128DF0 7C 64 1B 78 */ mr r4, r3 /* 8012BEB4 00128DF4 48 00 00 58 */ b lbl_8012BF0C lbl_8012BEB8: @@ -556,7 +556,7 @@ lbl_8012BF0C: /* 8012BF1C 00128E5C 38 A0 00 03 */ li r5, 3 /* 8012BF20 00128E60 38 C0 10 00 */ li r6, 0x1000 /* 8012BF24 00128E64 38 E0 03 E8 */ li r7, 0x3e8 -/* 8012BF28 00128E68 48 14 46 19 */ bl cLib_addCalcAngleS +/* 8012BF28 00128E68 48 14 46 19 */ bl cLib_addCalcAngleS__FPsssss lbl_8012BF2C: /* 8012BF2C 00128E6C 38 6F 30 D6 */ addi r3, r15, 0x30d6 /* 8012BF30 00128E70 80 0F 31 A0 */ lwz r0, 0x31a0(r15) @@ -572,7 +572,7 @@ lbl_8012BF50: /* 8012BF50 00128E90 38 A0 00 03 */ li r5, 3 /* 8012BF54 00128E94 38 C0 10 00 */ li r6, 0x1000 /* 8012BF58 00128E98 38 E0 01 00 */ li r7, 0x100 -/* 8012BF5C 00128E9C 48 14 45 E5 */ bl cLib_addCalcAngleS +/* 8012BF5C 00128E9C 48 14 45 E5 */ bl cLib_addCalcAngleS__FPsssss lbl_8012BF60: /* 8012BF60 00128EA0 E3 E1 01 68 */ psq_l f31, 360(r1), 0, 0 /* 8012BF64 00128EA4 CB E1 01 60 */ lfd f31, 0x160(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012BFA8.s b/include/d/d_a/d_a_alink/asm/func_8012BFA8.s index e7aff79b4d..852e7d7ee9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012BFA8.s +++ b/include/d/d_a/d_a_alink/asm/func_8012BFA8.s @@ -142,7 +142,7 @@ lbl_8012C19C: /* 8012C1A8 001290E8 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) lbl_8012C1AC: /* 8012C1AC 001290EC C0 41 00 1C */ lfs f2, 0x1c(r1) -/* 8012C1B0 001290F0 48 13 B4 C5 */ bl cM_atan2s +/* 8012C1B0 001290F0 48 13 B4 C5 */ bl cM_atan2s__Fff /* 8012C1B4 001290F4 7C 64 07 34 */ extsh r4, r3 /* 8012C1B8 001290F8 A8 1F 31 22 */ lha r0, 0x3122(r31) /* 8012C1BC 001290FC 7C 80 02 78 */ xor r0, r4, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_8012C1F4.s b/include/d/d_a/d_a_alink/asm/func_8012C1F4.s index 4a8a3e79ff..1ae3b651a4 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012C1F4.s +++ b/include/d/d_a/d_a_alink/asm/func_8012C1F4.s @@ -15,7 +15,7 @@ /* 8012C22C 0012916C 38 A1 00 08 */ addi r5, r1, 8 /* 8012C230 00129170 4B F4 85 15 */ bl cBgS_NS_GetTriPla /* 8012C234 00129174 38 61 00 08 */ addi r3, r1, 8 -/* 8012C238 00129178 48 13 AE F1 */ bl cXyz_NS_atan2sX_Z +/* 8012C238 00129178 48 13 AE F1 */ bl atan2sX_Z__4cXyzCFv /* 8012C23C 0012917C B0 7F 04 DE */ sth r3, 0x4de(r31) /* 8012C240 00129180 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 8012C244 00129184 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012C30C.s b/include/d/d_a/d_a_alink/asm/func_8012C30C.s index 3eb59158bc..15998216e1 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012C30C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012C30C.s @@ -57,10 +57,10 @@ lbl_8012C3AC: /* 8012C3E4 00129324 38 A1 00 70 */ addi r5, r1, 0x70 /* 8012C3E8 00129328 48 21 AA 65 */ bl PSMTXMultVecSR /* 8012C3EC 0012932C 38 61 00 70 */ addi r3, r1, 0x70 -/* 8012C3F0 00129330 48 13 AD 39 */ bl cXyz_NS_atan2sX_Z +/* 8012C3F0 00129330 48 13 AD 39 */ bl atan2sX_Z__4cXyzCFv /* 8012C3F4 00129334 7C 70 1B 78 */ mr r16, r3 /* 8012C3F8 00129338 38 61 00 70 */ addi r3, r1, 0x70 -/* 8012C3FC 0012933C 48 13 AD 55 */ bl cXyz_NS_atan2sY_XZ +/* 8012C3FC 0012933C 48 13 AD 55 */ bl atan2sY_XZ__4cXyzCFv /* 8012C400 00129340 7C 6F 1B 78 */ mr r15, r3 /* 8012C404 00129344 80 7C 06 50 */ lwz r3, 0x650(r28) /* 8012C408 00129348 80 63 00 84 */ lwz r3, 0x84(r3) @@ -148,7 +148,7 @@ lbl_8012C52C: /* 8012C52C 0012946C FC 40 08 90 */ fmr f2, f1 lbl_8012C530: /* 8012C530 00129470 C0 21 00 74 */ lfs f1, 0x74(r1) -/* 8012C534 00129474 48 13 B1 41 */ bl cM_atan2s +/* 8012C534 00129474 48 13 B1 41 */ bl cM_atan2s__Fff /* 8012C538 00129478 38 03 40 00 */ addi r0, r3, 0x4000 /* 8012C53C 0012947C 7C 1B 07 34 */ extsh r27, r0 /* 8012C540 00129480 80 1C 05 74 */ lwz r0, 0x574(r28) @@ -263,11 +263,11 @@ lbl_8012C6E4: /* 8012C6E4 00129624 38 61 00 4C */ addi r3, r1, 0x4c /* 8012C6E8 00129628 7F C4 F3 78 */ mr r4, r30 /* 8012C6EC 0012962C 38 A1 00 7C */ addi r5, r1, 0x7c -/* 8012C6F0 00129630 48 13 A4 45 */ bl cXyz_NS___mi +/* 8012C6F0 00129630 48 13 A4 45 */ bl __mi__4cXyzCFRC3Vec /* 8012C6F4 00129634 38 61 00 40 */ addi r3, r1, 0x40 /* 8012C6F8 00129638 38 81 00 4C */ addi r4, r1, 0x4c /* 8012C6FC 0012963C 7F A5 EB 78 */ mr r5, r29 -/* 8012C700 00129640 48 13 A3 E5 */ bl cXyz_NS___pl +/* 8012C700 00129640 48 13 A3 E5 */ bl __pl__4cXyzCFRC3Vec /* 8012C704 00129644 C0 01 00 40 */ lfs f0, 0x40(r1) /* 8012C708 00129648 D0 01 00 70 */ stfs f0, 0x70(r1) /* 8012C70C 0012964C C0 01 00 44 */ lfs f0, 0x44(r1) @@ -355,7 +355,7 @@ lbl_8012C828: lbl_8012C82C: /* 8012C82C 0012976C C0 21 00 74 */ lfs f1, 0x74(r1) /* 8012C830 00129770 FC 40 D0 90 */ fmr f2, f26 -/* 8012C834 00129774 48 13 AE 41 */ bl cM_atan2s +/* 8012C834 00129774 48 13 AE 41 */ bl cM_atan2s__Fff /* 8012C838 00129778 7C 72 1B 78 */ mr r18, r3 /* 8012C83C 0012977C FC 1A D8 40 */ fcmpo cr0, f26, f27 /* 8012C840 00129780 40 80 00 0C */ bge lbl_8012C84C @@ -366,7 +366,7 @@ lbl_8012C84C: /* 8012C850 00129790 FC 20 00 50 */ fneg f1, f0 /* 8012C854 00129794 C0 01 00 78 */ lfs f0, 0x78(r1) /* 8012C858 00129798 FC 40 00 50 */ fneg f2, f0 -/* 8012C85C 0012979C 48 13 AE 19 */ bl cM_atan2s +/* 8012C85C 0012979C 48 13 AE 19 */ bl cM_atan2s__Fff lbl_8012C860: /* 8012C860 001297A0 2C 15 00 00 */ cmpwi r21, 0 /* 8012C864 001297A4 40 82 00 4C */ bne lbl_8012C8B0 @@ -412,7 +412,7 @@ lbl_8012C8B0: /* 8012C8F4 00129834 D0 41 00 60 */ stfs f2, 0x60(r1) /* 8012C8F8 00129838 38 7C 1D 08 */ addi r3, r28, 0x1d08 /* 8012C8FC 0012983C 38 81 00 58 */ addi r4, r1, 0x58 -/* 8012C900 00129840 48 13 B4 29 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8012C900 00129840 48 13 B4 29 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8012C904 00129844 7F 03 C3 78 */ mr r3, r24 /* 8012C908 00129848 38 9C 1D 08 */ addi r4, r28, 0x1d08 /* 8012C90C 0012984C 4B F4 7B 95 */ bl cBgS_NS_GroundCross @@ -424,7 +424,7 @@ lbl_8012C8B0: /* 8012C924 00129864 C0 01 00 74 */ lfs f0, 0x74(r1) /* 8012C928 00129868 EC 20 10 2A */ fadds f1, f0, f2 /* 8012C92C 0012986C EC 5A 10 2A */ fadds f2, f26, f2 -/* 8012C930 00129870 48 13 AD 45 */ bl cM_atan2s +/* 8012C930 00129870 48 13 AD 45 */ bl cM_atan2s__Fff /* 8012C934 00129874 B0 7F 00 00 */ sth r3, 0(r31) /* 8012C938 00129878 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 8012C93C 0012987C 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l @@ -476,11 +476,11 @@ lbl_8012C9E0: /* 8012C9E0 00129920 38 61 00 34 */ addi r3, r1, 0x34 /* 8012C9E4 00129924 7F C4 F3 78 */ mr r4, r30 /* 8012C9E8 00129928 38 A1 00 64 */ addi r5, r1, 0x64 -/* 8012C9EC 0012992C 48 13 A1 49 */ bl cXyz_NS___mi +/* 8012C9EC 0012992C 48 13 A1 49 */ bl __mi__4cXyzCFRC3Vec /* 8012C9F0 00129930 38 61 00 28 */ addi r3, r1, 0x28 /* 8012C9F4 00129934 38 81 00 34 */ addi r4, r1, 0x34 /* 8012C9F8 00129938 C0 22 94 08 */ lfs f1, lbl_80452E08-_SDA2_BASE_(r2) -/* 8012C9FC 0012993C 48 13 A1 89 */ bl cXyz_NS___ml +/* 8012C9FC 0012993C 48 13 A1 89 */ bl __ml__4cXyzCFf /* 8012CA00 00129940 C0 01 00 28 */ lfs f0, 0x28(r1) /* 8012CA04 00129944 D0 1D 00 00 */ stfs f0, 0(r29) /* 8012CA08 00129948 C0 01 00 2C */ lfs f0, 0x2c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012CBE4.s b/include/d/d_a/d_a_alink/asm/func_8012CBE4.s index 996a5d4b58..b119c9992f 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012CBE4.s +++ b/include/d/d_a/d_a_alink/asm/func_8012CBE4.s @@ -23,7 +23,7 @@ lbl_8012CC3C: /* 8012CC3C 00129B7C 2C 1F 00 01 */ cmpwi r31, 1 /* 8012CC40 00129B80 40 82 00 74 */ bne lbl_8012CCB4 -/* 8012CC44 00129B84 48 13 AC 29 */ bl cM_rnd +/* 8012CC44 00129B84 48 13 AC 29 */ bl cM_rnd__Fv /* 8012CC48 00129B88 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) /* 8012CC4C 00129B8C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8012CC50 00129B90 40 80 00 2C */ bge lbl_8012CC7C @@ -63,7 +63,7 @@ lbl_8012CCCC: /* 8012CCCC 00129C0C 38 00 00 00 */ li r0, 0 /* 8012CCD0 00129C10 B0 1E 30 10 */ sth r0, 0x3010(r30) /* 8012CCD4 00129C14 C0 22 93 E0 */ lfs f1, lbl_80452DE0-_SDA2_BASE_(r2) -/* 8012CCD8 00129C18 48 13 AC 7D */ bl cM_rndF +/* 8012CCD8 00129C18 48 13 AC 7D */ bl cM_rndF__Ff /* 8012CCDC 00129C1C C0 02 93 E0 */ lfs f0, lbl_80452DE0-_SDA2_BASE_(r2) /* 8012CCE0 00129C20 EC 00 08 2A */ fadds f0, f0, f1 /* 8012CCE4 00129C24 FC 00 00 1E */ fctiwz f0, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_8012D590.s b/include/d/d_a/d_a_alink/asm/func_8012D590.s index 88854a34de..6ec4eb1eeb 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012D590.s +++ b/include/d/d_a/d_a_alink/asm/func_8012D590.s @@ -43,7 +43,7 @@ lbl_8012D620: lbl_8012D62C: /* 8012D62C 0012A56C 38 7E 33 98 */ addi r3, r30, 0x3398 /* 8012D630 0012A570 C0 3E 05 94 */ lfs f1, 0x594(r30) -/* 8012D634 0012A574 48 14 31 0D */ bl cLib_chaseF +/* 8012D634 0012A574 48 14 31 0D */ bl cLib_chaseF__FPfff /* 8012D638 0012A578 C0 3E 33 AC */ lfs f1, 0x33ac(r30) /* 8012D63C 0012A57C C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) /* 8012D640 0012A580 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -55,7 +55,7 @@ lbl_8012D62C: /* 8012D658 0012A598 A8 A7 00 54 */ lha r5, 0x54(r7) /* 8012D65C 0012A59C A8 C7 00 50 */ lha r6, 0x50(r7) /* 8012D660 0012A5A0 A8 E7 00 52 */ lha r7, 0x52(r7) -/* 8012D664 0012A5A4 48 14 2E DD */ bl cLib_addCalcAngleS +/* 8012D664 0012A5A4 48 14 2E DD */ bl cLib_addCalcAngleS__FPsssss /* 8012D668 0012A5A8 A8 1E 04 DE */ lha r0, 0x4de(r30) /* 8012D66C 0012A5AC B0 1E 04 E6 */ sth r0, 0x4e6(r30) lbl_8012D670: diff --git a/include/d/d_a/d_a_alink/asm/func_8012D8C0.s b/include/d/d_a/d_a_alink/asm/func_8012D8C0.s index c9a40265cb..b3e108ea9e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012D8C0.s +++ b/include/d/d_a/d_a_alink/asm/func_8012D8C0.s @@ -24,7 +24,7 @@ /* 8012D91C 0012A85C B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8012D920 0012A860 A8 7F 04 DE */ lha r3, 0x4de(r31) /* 8012D924 0012A864 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 8012D928 0012A868 48 14 34 FD */ bl cLib_distanceAngleS +/* 8012D928 0012A868 48 14 34 FD */ bl cLib_distanceAngleS__Fss /* 8012D92C 0012A86C 2C 03 60 00 */ cmpwi r3, 0x6000 /* 8012D930 0012A870 40 81 00 14 */ ble lbl_8012D944 /* 8012D934 0012A874 C0 02 93 30 */ lfs f0, lbl_80452D30-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_8012DDB4.s b/include/d/d_a/d_a_alink/asm/func_8012DDB4.s index 93a1eb50a3..30efc06842 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012DDB4.s +++ b/include/d/d_a/d_a_alink/asm/func_8012DDB4.s @@ -18,7 +18,7 @@ lbl_8012DDF0: /* 8012DDF4 0012AD34 38 84 EF 28 */ addi r4, r4, lbl_8038EF28@l /* 8012DDF8 0012AD38 C0 44 00 10 */ lfs f2, 0x10(r4) lbl_8012DDFC: -/* 8012DDFC 0012AD3C 48 14 29 45 */ bl cLib_chaseF +/* 8012DDFC 0012AD3C 48 14 29 45 */ bl cLib_chaseF__FPfff /* 8012DE00 0012AD40 7F C3 F3 78 */ mr r3, r30 /* 8012DE04 0012AD44 4B FF BC 7D */ bl daAlink_c_NS_checkWolfGroundSpecialMode /* 8012DE08 0012AD48 2C 03 00 00 */ cmpwi r3, 0 @@ -31,7 +31,7 @@ lbl_8012DE18: /* 8012DE20 0012AD60 38 A0 00 1E */ li r5, 0x1e /* 8012DE24 0012AD64 38 C0 3C DF */ li r6, 0x3cdf /* 8012DE28 0012AD68 38 E0 1F 40 */ li r7, 0x1f40 -/* 8012DE2C 0012AD6C 48 14 27 15 */ bl cLib_addCalcAngleS +/* 8012DE2C 0012AD6C 48 14 27 15 */ bl cLib_addCalcAngleS__FPsssss /* 8012DE30 0012AD70 7C 7F 1B 78 */ mr r31, r3 /* 8012DE34 0012AD74 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 8012DE38 0012AD78 B0 1E 04 DE */ sth r0, 0x4de(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8012DEC8.s b/include/d/d_a/d_a_alink/asm/func_8012DEC8.s index 07a3e8a870..ec363c430f 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012DEC8.s +++ b/include/d/d_a/d_a_alink/asm/func_8012DEC8.s @@ -57,7 +57,7 @@ lbl_8012DF80: /* 8012DF94 0012AED4 41 82 00 18 */ beq lbl_8012DFAC /* 8012DF98 0012AED8 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 8012DF9C 0012AEDC 38 84 05 38 */ addi r4, r4, 0x538 -/* 8012DFA0 0012AEE0 48 14 2C 65 */ bl cLib_targetAngleY +/* 8012DFA0 0012AEE0 48 14 2C 65 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8012DFA4 0012AEE4 B0 7F 30 0C */ sth r3, 0x300c(r31) /* 8012DFA8 0012AEE8 48 00 00 0C */ b lbl_8012DFB4 lbl_8012DFAC: diff --git a/include/d/d_a/d_a_alink/asm/func_8012E0AC.s b/include/d/d_a/d_a_alink/asm/func_8012E0AC.s index a880e083c7..871cb44662 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E0AC.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E0AC.s @@ -13,7 +13,7 @@ /* 8012E0DC 0012B01C A8 A7 00 04 */ lha r5, 4(r7) /* 8012E0E0 0012B020 A8 C7 00 00 */ lha r6, 0(r7) /* 8012E0E4 0012B024 A8 E7 00 02 */ lha r7, 2(r7) -/* 8012E0E8 0012B028 48 14 24 59 */ bl cLib_addCalcAngleS +/* 8012E0E8 0012B028 48 14 24 59 */ bl cLib_addCalcAngleS__FPsssss /* 8012E0EC 0012B02C A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 8012E0F0 0012B030 3C 63 00 01 */ addis r3, r3, 1 /* 8012E0F4 0012B034 38 03 80 00 */ addi r0, r3, -32768 @@ -29,7 +29,7 @@ lbl_8012E100: /* 8012E118 0012B058 38 A0 00 05 */ li r5, 5 /* 8012E11C 0012B05C 38 C0 05 E8 */ li r6, 0x5e8 /* 8012E120 0012B060 38 E0 01 3C */ li r7, 0x13c -/* 8012E124 0012B064 48 14 24 1D */ bl cLib_addCalcAngleS +/* 8012E124 0012B064 48 14 24 1D */ bl cLib_addCalcAngleS__FPsssss /* 8012E128 0012B068 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 8012E12C 0012B06C 28 00 00 02 */ cmplwi r0, 2 /* 8012E130 0012B070 40 82 00 14 */ bne lbl_8012E144 diff --git a/include/d/d_a/d_a_alink/asm/func_8012E398.s b/include/d/d_a/d_a_alink/asm/func_8012E398.s index cad0a7e3e0..2d3ee26a51 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E398.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E398.s @@ -68,7 +68,7 @@ lbl_8012E484: /* 8012E494 0012B3D4 40 82 00 18 */ bne lbl_8012E4AC /* 8012E498 0012B3D8 38 7D 04 D0 */ addi r3, r29, 0x4d0 /* 8012E49C 0012B3DC 38 84 05 38 */ addi r4, r4, 0x538 -/* 8012E4A0 0012B3E0 48 14 27 65 */ bl cLib_targetAngleY +/* 8012E4A0 0012B3E0 48 14 27 65 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8012E4A4 0012B3E4 B0 7D 30 0C */ sth r3, 0x300c(r29) /* 8012E4A8 0012B3E8 48 00 00 0C */ b lbl_8012E4B4 lbl_8012E4AC: diff --git a/include/d/d_a/d_a_alink/asm/func_8012E508.s b/include/d/d_a/d_a_alink/asm/func_8012E508.s index eade3bc0c3..8151d04a8d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E508.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E508.s @@ -10,7 +10,7 @@ /* 8012E52C 0012B46C A8 A7 00 04 */ lha r5, 4(r7) /* 8012E530 0012B470 A8 C7 00 00 */ lha r6, 0(r7) /* 8012E534 0012B474 A8 E7 00 02 */ lha r7, 2(r7) -/* 8012E538 0012B478 48 14 20 09 */ bl cLib_addCalcAngleS +/* 8012E538 0012B478 48 14 20 09 */ bl cLib_addCalcAngleS__FPsssss /* 8012E53C 0012B47C A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 8012E540 0012B480 3C 63 00 01 */ addis r3, r3, 1 /* 8012E544 0012B484 38 03 80 00 */ addi r0, r3, -32768 diff --git a/include/d/d_a/d_a_alink/asm/func_8012EB94.s b/include/d/d_a/d_a_alink/asm/func_8012EB94.s index fbb1f25e6b..cc3858c7f8 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012EB94.s +++ b/include/d/d_a/d_a_alink/asm/func_8012EB94.s @@ -23,7 +23,7 @@ /* 8012EBEC 0012BB2C C0 42 93 F8 */ lfs f2, lbl_80452DF8-_SDA2_BASE_(r2) /* 8012EBF0 0012BB30 C0 1F 33 A8 */ lfs f0, 0x33a8(r31) /* 8012EBF4 0012BB34 EC 42 00 32 */ fmuls f2, f2, f0 -/* 8012EBF8 0012BB38 48 14 1B 49 */ bl cLib_chaseF +/* 8012EBF8 0012BB38 48 14 1B 49 */ bl cLib_chaseF__FPfff /* 8012EBFC 0012BB3C 48 00 00 24 */ b lbl_8012EC20 lbl_8012EC00: /* 8012EC00 0012BB40 C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -33,7 +33,7 @@ lbl_8012EC00: /* 8012EC10 0012BB50 38 7F 33 98 */ addi r3, r31, 0x3398 /* 8012EC14 0012BB54 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8012EC18 0012BB58 C0 42 93 A0 */ lfs f2, lbl_80452DA0-_SDA2_BASE_(r2) -/* 8012EC1C 0012BB5C 48 14 1B 25 */ bl cLib_chaseF +/* 8012EC1C 0012BB5C 48 14 1B 25 */ bl cLib_chaseF__FPfff lbl_8012EC20: /* 8012EC20 0012BB60 38 00 00 07 */ li r0, 7 /* 8012EC24 0012BB64 98 1F 2F 99 */ stb r0, 0x2f99(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8012EFB8.s b/include/d/d_a/d_a_alink/asm/func_8012EFB8.s index 192af993f9..1aab23308d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012EFB8.s +++ b/include/d/d_a/d_a_alink/asm/func_8012EFB8.s @@ -9,7 +9,7 @@ /* 8012EFD8 0012BF18 38 7F 33 98 */ addi r3, r31, 0x3398 /* 8012EFDC 0012BF1C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8012EFE0 0012BF20 C0 42 93 A0 */ lfs f2, lbl_80452DA0-_SDA2_BASE_(r2) -/* 8012EFE4 0012BF24 48 14 17 5D */ bl cLib_chaseF +/* 8012EFE4 0012BF24 48 14 17 5D */ bl cLib_chaseF__FPfff /* 8012EFE8 0012BF28 48 00 00 1C */ b lbl_8012F004 lbl_8012EFEC: /* 8012EFEC 0012BF2C 7C 60 07 35 */ extsh. r0, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_8012F358.s b/include/d/d_a/d_a_alink/asm/func_8012F358.s index 736eed9e61..a7b798ccec 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F358.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F358.s @@ -19,7 +19,7 @@ lbl_8012F39C: /* 8012F39C 0012C2DC 38 9F 18 D0 */ addi r4, r31, 0x18d0 /* 8012F3A0 0012C2E0 C0 44 00 10 */ lfs f2, 0x10(r4) lbl_8012F3A4: -/* 8012F3A4 0012C2E4 48 14 13 9D */ bl cLib_chaseF +/* 8012F3A4 0012C2E4 48 14 13 9D */ bl cLib_chaseF__FPfff /* 8012F3A8 0012C2E8 7F A3 EB 78 */ mr r3, r29 /* 8012F3AC 0012C2EC 4B F8 32 B9 */ bl daAlink_c_NS_spActionButton /* 8012F3B0 0012C2F0 2C 03 00 00 */ cmpwi r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8012F6EC.s b/include/d/d_a/d_a_alink/asm/func_8012F6EC.s index 4e3eb27aa3..139bcfe980 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F6EC.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F6EC.s @@ -21,7 +21,7 @@ lbl_8012F734: /* 8012F738 0012C678 38 84 EF 28 */ addi r4, r4, lbl_8038EF28@l /* 8012F73C 0012C67C C0 44 00 40 */ lfs f2, 0x40(r4) lbl_8012F740: -/* 8012F740 0012C680 48 14 10 01 */ bl cLib_chaseF +/* 8012F740 0012C680 48 14 10 01 */ bl cLib_chaseF__FPfff /* 8012F744 0012C684 7F C3 F3 78 */ mr r3, r30 /* 8012F748 0012C688 48 02 ED 85 */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 8012F74C 0012C68C 54 60 06 3F */ clrlwi. r0, r3, 0x18 diff --git a/include/d/d_a/d_a_alink/asm/func_8012FD2C.s b/include/d/d_a/d_a_alink/asm/func_8012FD2C.s index 746bc66076..2607e4f930 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012FD2C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012FD2C.s @@ -29,19 +29,19 @@ /* 8012FD9C 0012CCDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012FDA0 0012CCE0 41 82 00 3C */ beq lbl_8012FDDC /* 8012FDA4 0012CCE4 38 61 00 08 */ addi r3, r1, 8 -/* 8012FDA8 0012CCE8 48 13 73 81 */ bl cXyz_NS_atan2sX_Z +/* 8012FDA8 0012CCE8 48 13 73 81 */ bl atan2sX_Z__4cXyzCFv /* 8012FDAC 0012CCEC 7C 64 1B 78 */ mr r4, r3 /* 8012FDB0 0012CCF0 38 7E 04 DE */ addi r3, r30, 0x4de /* 8012FDB4 0012CCF4 38 A0 00 04 */ li r5, 4 /* 8012FDB8 0012CCF8 38 C0 10 00 */ li r6, 0x1000 /* 8012FDBC 0012CCFC 38 E0 04 00 */ li r7, 0x400 -/* 8012FDC0 0012CD00 48 14 07 81 */ bl cLib_addCalcAngleS +/* 8012FDC0 0012CD00 48 14 07 81 */ bl cLib_addCalcAngleS__FPsssss /* 8012FDC4 0012CD04 38 7E 04 E6 */ addi r3, r30, 0x4e6 /* 8012FDC8 0012CD08 A8 9E 04 DE */ lha r4, 0x4de(r30) /* 8012FDCC 0012CD0C 38 A0 00 04 */ li r5, 4 /* 8012FDD0 0012CD10 38 C0 10 00 */ li r6, 0x1000 /* 8012FDD4 0012CD14 38 E0 04 00 */ li r7, 0x400 -/* 8012FDD8 0012CD18 48 14 07 69 */ bl cLib_addCalcAngleS +/* 8012FDD8 0012CD18 48 14 07 69 */ bl cLib_addCalcAngleS__FPsssss lbl_8012FDDC: /* 8012FDDC 0012CD1C 7F E3 FB 78 */ mr r3, r31 /* 8012FDE0 0012CD20 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_8012FE80.s b/include/d/d_a/d_a_alink/asm/func_8012FE80.s index 3d6a62f95d..7fc471ef51 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012FE80.s +++ b/include/d/d_a/d_a_alink/asm/func_8012FE80.s @@ -8,7 +8,7 @@ /* 8012FE9C 0012CDDC 7C BD 2B 78 */ mr r29, r5 /* 8012FEA0 0012CDE0 7F C3 F3 78 */ mr r3, r30 /* 8012FEA4 0012CDE4 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 8012FEA8 0012CDE8 48 14 0F 7D */ bl cLib_distanceAngleS +/* 8012FEA8 0012CDE8 48 14 0F 7D */ bl cLib_distanceAngleS__Fss /* 8012FEAC 0012CDEC 2C 03 38 00 */ cmpwi r3, 0x3800 /* 8012FEB0 0012CDF0 40 80 00 20 */ bge lbl_8012FED0 /* 8012FEB4 0012CDF4 2C 1D 00 00 */ cmpwi r29, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8012FFA4.s b/include/d/d_a/d_a_alink/asm/func_8012FFA4.s index 2d2be9ad8b..efe9800904 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012FFA4.s +++ b/include/d/d_a/d_a_alink/asm/func_8012FFA4.s @@ -12,14 +12,14 @@ /* 8012FFD0 0012CF10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012FFD4 0012CF14 41 82 00 D0 */ beq lbl_801300A4 /* 8012FFD8 0012CF18 38 61 00 08 */ addi r3, r1, 8 -/* 8012FFDC 0012CF1C 48 13 71 4D */ bl cXyz_NS_atan2sX_Z +/* 8012FFDC 0012CF1C 48 13 71 4D */ bl atan2sX_Z__4cXyzCFv /* 8012FFE0 0012CF20 7C 7E 1B 78 */ mr r30, r3 /* 8012FFE4 0012CF24 38 7F 04 DE */ addi r3, r31, 0x4de /* 8012FFE8 0012CF28 7F C4 F3 78 */ mr r4, r30 /* 8012FFEC 0012CF2C 38 A0 00 04 */ li r5, 4 /* 8012FFF0 0012CF30 38 C0 10 00 */ li r6, 0x1000 /* 8012FFF4 0012CF34 38 E0 04 00 */ li r7, 0x400 -/* 8012FFF8 0012CF38 48 14 05 49 */ bl cLib_addCalcAngleS +/* 8012FFF8 0012CF38 48 14 05 49 */ bl cLib_addCalcAngleS__FPsssss /* 8012FFFC 0012CF3C 38 7F 04 E6 */ addi r3, r31, 0x4e6 /* 80130000 0012CF40 A8 9F 04 DE */ lha r4, 0x4de(r31) /* 80130004 0012CF44 3C 84 00 01 */ addis r4, r4, 1 @@ -28,7 +28,7 @@ /* 80130010 0012CF50 38 A0 00 04 */ li r5, 4 /* 80130014 0012CF54 38 C0 10 00 */ li r6, 0x1000 /* 80130018 0012CF58 38 E0 04 00 */ li r7, 0x400 -/* 8013001C 0012CF5C 48 14 05 25 */ bl cLib_addCalcAngleS +/* 8013001C 0012CF5C 48 14 05 25 */ bl cLib_addCalcAngleS__FPsssss /* 80130020 0012CF60 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 80130024 0012CF64 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l /* 80130028 0012CF68 A8 1F 04 DE */ lha r0, 0x4de(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80130138.s b/include/d/d_a/d_a_alink/asm/func_80130138.s index 040f694a34..236252b580 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130138.s +++ b/include/d/d_a/d_a_alink/asm/func_80130138.s @@ -8,7 +8,7 @@ /* 80130154 0012D094 38 7E 33 98 */ addi r3, r30, 0x3398 /* 80130158 0012D098 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013015C 0012D09C C0 42 93 24 */ lfs f2, lbl_80452D24-_SDA2_BASE_(r2) -/* 80130160 0012D0A0 48 14 05 E1 */ bl cLib_chaseF +/* 80130160 0012D0A0 48 14 05 E1 */ bl cLib_chaseF__FPfff /* 80130164 0012D0A4 7F E3 FB 78 */ mr r3, r31 /* 80130168 0012D0A8 48 02 E3 65 */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 8013016C 0012D0AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 diff --git a/include/d/d_a/d_a_alink/asm/func_80130268.s b/include/d/d_a/d_a_alink/asm/func_80130268.s index 66fe50bdc8..7477961cbe 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130268.s +++ b/include/d/d_a/d_a_alink/asm/func_80130268.s @@ -28,7 +28,7 @@ /* 801302D4 0012D214 38 A1 00 08 */ addi r5, r1, 8 /* 801302D8 0012D218 4B F4 44 6D */ bl cBgS_NS_GetTriPla /* 801302DC 0012D21C 38 61 00 08 */ addi r3, r1, 8 -/* 801302E0 0012D220 48 13 6E 49 */ bl cXyz_NS_atan2sX_Z +/* 801302E0 0012D220 48 13 6E 49 */ bl atan2sX_Z__4cXyzCFv /* 801302E4 0012D224 7C 7E 1B 78 */ mr r30, r3 /* 801302E8 0012D228 7F E3 FB 78 */ mr r3, r31 /* 801302EC 0012D22C 38 9F 1A 60 */ addi r4, r31, 0x1a60 @@ -108,7 +108,7 @@ lbl_801303F4: /* 801303FC 0012D33C 38 E6 F3 F0 */ addi r7, r6, lbl_8038F3F0@l /* 80130400 0012D340 A8 C7 00 50 */ lha r6, 0x50(r7) /* 80130404 0012D344 A8 E7 00 52 */ lha r7, 0x52(r7) -/* 80130408 0012D348 48 14 01 39 */ bl cLib_addCalcAngleS +/* 80130408 0012D348 48 14 01 39 */ bl cLib_addCalcAngleS__FPsssss /* 8013040C 0012D34C 7F E3 FB 78 */ mr r3, r31 /* 80130410 0012D350 3C 80 00 03 */ lis r4, 0x00030018@ha /* 80130414 0012D354 38 84 00 18 */ addi r4, r4, 0x00030018@l diff --git a/include/d/d_a/d_a_alink/asm/func_80130BC4.s b/include/d/d_a/d_a_alink/asm/func_80130BC4.s index 0a1367f113..8e4eda04bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130BC4.s +++ b/include/d/d_a/d_a_alink/asm/func_80130BC4.s @@ -491,7 +491,7 @@ lbl_8013128C: /* 80131294 0012E1D4 38 A0 00 05 */ li r5, 5 /* 80131298 0012E1D8 38 C0 08 00 */ li r6, 0x800 /* 8013129C 0012E1DC 38 E0 01 00 */ li r7, 0x100 -/* 801312A0 0012E1E0 48 13 F2 A1 */ bl cLib_addCalcAngleS +/* 801312A0 0012E1E0 48 13 F2 A1 */ bl cLib_addCalcAngleS__FPsssss lbl_801312A4: /* 801312A4 0012E1E4 38 60 00 01 */ li r3, 1 lbl_801312A8: diff --git a/include/d/d_a/d_a_alink/asm/func_801316A4.s b/include/d/d_a/d_a_alink/asm/func_801316A4.s index 59a4c96444..a9700e44cc 100644 --- a/include/d/d_a/d_a_alink/asm/func_801316A4.s +++ b/include/d/d_a/d_a_alink/asm/func_801316A4.s @@ -12,7 +12,7 @@ lbl_801316D0: /* 801316D0 0012E610 C0 02 97 74 */ lfs f0, lbl_80453174-_SDA2_BASE_(r2) /* 801316D4 0012E614 EC 20 00 72 */ fmuls f1, f0, f1 -/* 801316D8 0012E618 48 13 5F 0D */ bl cM_rad2s +/* 801316D8 0012E618 48 13 5F 0D */ bl cM_rad2s__Ff /* 801316DC 0012E61C 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 801316E0 0012E620 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 801316E4 0012E624 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l diff --git a/include/d/d_a/d_a_alink/asm/func_80131718.s b/include/d/d_a/d_a_alink/asm/func_80131718.s index 93224d1362..79f391595f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80131718.s +++ b/include/d/d_a/d_a_alink/asm/func_80131718.s @@ -172,7 +172,7 @@ lbl_80131970: lbl_80131988: /* 80131988 0012E8C8 C0 02 93 AC */ lfs f0, lbl_80452DAC-_SDA2_BASE_(r2) /* 8013198C 0012E8CC EC 20 07 F2 */ fmuls f1, f0, f31 -/* 80131990 0012E8D0 48 13 5C 55 */ bl cM_rad2s +/* 80131990 0012E8D0 48 13 5C 55 */ bl cM_rad2s__Ff /* 80131994 0012E8D4 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 80131998 0012E8D8 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 8013199C 0012E8DC 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l diff --git a/include/d/d_a/d_a_alink/asm/func_80131AFC.s b/include/d/d_a/d_a_alink/asm/func_80131AFC.s index 105ffb7ec4..7381149acb 100644 --- a/include/d/d_a/d_a_alink/asm/func_80131AFC.s +++ b/include/d/d_a/d_a_alink/asm/func_80131AFC.s @@ -23,7 +23,7 @@ lbl_80131B44: /* 80131B4C 0012EA8C C0 42 92 A4 */ lfs f2, lbl_80452CA4-_SDA2_BASE_(r2) /* 80131B50 0012EA90 C0 62 92 B8 */ lfs f3, lbl_80452CB8-_SDA2_BASE_(r2) /* 80131B54 0012EA94 FC 80 10 90 */ fmr f4, f2 -/* 80131B58 0012EA98 48 13 DE 25 */ bl cLib_addCalc +/* 80131B58 0012EA98 48 13 DE 25 */ bl cLib_addCalc__FPfffff /* 80131B5C 0012EA9C 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 80131B60 0012EAA0 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l /* 80131B64 0012EAA4 A8 1F 30 08 */ lha r0, 0x3008(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80131DA0.s b/include/d/d_a/d_a_alink/asm/func_80131DA0.s index 3d2c0cb20c..fccd1751ad 100644 --- a/include/d/d_a/d_a_alink/asm/func_80131DA0.s +++ b/include/d/d_a/d_a_alink/asm/func_80131DA0.s @@ -279,9 +279,9 @@ lbl_80132140: /* 8013218C 0012F0CC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80132190 0012F0D0 40 81 00 44 */ ble lbl_801321D4 /* 80132194 0012F0D4 38 7A 08 14 */ addi r3, r26, 0x814 -/* 80132198 0012F0D8 48 13 17 C5 */ bl cCcD_Stts_NS_ClrCcMove +/* 80132198 0012F0D8 48 13 17 C5 */ bl ClrCcMove__9cCcD_SttsFv /* 8013219C 0012F0DC 38 7A 08 14 */ addi r3, r26, 0x814 -/* 801321A0 0012F0E0 48 13 4F 89 */ bl cXyz_NS_atan2sX_Z +/* 801321A0 0012F0E0 48 13 4F 89 */ bl atan2sX_Z__4cXyzCFv /* 801321A4 0012F0E4 7C 63 07 34 */ extsh r3, r3 /* 801321A8 0012F0E8 A8 1A 04 E6 */ lha r0, 0x4e6(r26) /* 801321AC 0012F0EC 7C 00 18 51 */ subf. r0, r0, r3 @@ -308,7 +308,7 @@ lbl_801321D4: /* 801321F8 0012F138 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801321FC 0012F13C 40 81 00 3C */ ble lbl_80132238 /* 80132200 0012F140 38 7A 35 B8 */ addi r3, r26, 0x35b8 -/* 80132204 0012F144 48 13 4F 25 */ bl cXyz_NS_atan2sX_Z +/* 80132204 0012F144 48 13 4F 25 */ bl atan2sX_Z__4cXyzCFv /* 80132208 0012F148 7C 63 07 34 */ extsh r3, r3 /* 8013220C 0012F14C A8 1A 04 E6 */ lha r0, 0x4e6(r26) /* 80132210 0012F150 7C 00 18 51 */ subf. r0, r0, r3 @@ -342,7 +342,7 @@ lbl_80132260: /* 80132274 0012F1B4 48 00 04 84 */ b lbl_801326F8 lbl_80132278: /* 80132278 0012F1B8 38 7A 08 14 */ addi r3, r26, 0x814 -/* 8013227C 0012F1BC 48 13 16 E1 */ bl cCcD_Stts_NS_ClrCcMove +/* 8013227C 0012F1BC 48 13 16 E1 */ bl ClrCcMove__9cCcD_SttsFv /* 80132280 0012F1C0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80132284 0012F1C4 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 80132288 0012F1C8 40 81 00 80 */ ble lbl_80132308 @@ -411,7 +411,7 @@ lbl_80132340: /* 80132370 0012F2B0 40 81 00 54 */ ble lbl_801323C4 /* 80132374 0012F2B4 A8 7A 2F E2 */ lha r3, 0x2fe2(r26) /* 80132378 0012F2B8 A8 9A 04 E6 */ lha r4, 0x4e6(r26) -/* 8013237C 0012F2BC 48 13 EA A9 */ bl cLib_distanceAngleS +/* 8013237C 0012F2BC 48 13 EA A9 */ bl cLib_distanceAngleS__Fss /* 80132380 0012F2C0 2C 03 70 00 */ cmpwi r3, 0x7000 /* 80132384 0012F2C4 40 81 00 40 */ ble lbl_801323C4 /* 80132388 0012F2C8 A8 7A 04 E6 */ lha r3, 0x4e6(r26) diff --git a/include/d/d_a/d_a_alink/asm/func_80133164.s b/include/d/d_a/d_a_alink/asm/func_80133164.s index fcef61ad23..8464e217db 100644 --- a/include/d/d_a/d_a_alink/asm/func_80133164.s +++ b/include/d/d_a/d_a_alink/asm/func_80133164.s @@ -214,9 +214,9 @@ lbl_8013343C: /* 80133460 001303A0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80133464 001303A4 40 81 00 44 */ ble lbl_801334A8 /* 80133468 001303A8 38 7D 08 14 */ addi r3, r29, 0x814 -/* 8013346C 001303AC 48 13 04 F1 */ bl cCcD_Stts_NS_ClrCcMove +/* 8013346C 001303AC 48 13 04 F1 */ bl ClrCcMove__9cCcD_SttsFv /* 80133470 001303B0 38 7D 08 14 */ addi r3, r29, 0x814 -/* 80133474 001303B4 48 13 3C B5 */ bl cXyz_NS_atan2sX_Z +/* 80133474 001303B4 48 13 3C B5 */ bl atan2sX_Z__4cXyzCFv /* 80133478 001303B8 7C 63 07 34 */ extsh r3, r3 /* 8013347C 001303BC A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 80133480 001303C0 7C 00 18 51 */ subf. r0, r0, r3 @@ -268,7 +268,7 @@ lbl_80133518: /* 80133524 00130464 48 00 02 F8 */ b lbl_8013381C lbl_80133528: /* 80133528 00130468 38 7D 08 14 */ addi r3, r29, 0x814 -/* 8013352C 0013046C 48 13 04 31 */ bl cCcD_Stts_NS_ClrCcMove +/* 8013352C 0013046C 48 13 04 31 */ bl ClrCcMove__9cCcD_SttsFv /* 80133530 00130470 7F A3 EB 78 */ mr r3, r29 /* 80133534 00130474 4B FF E6 CD */ bl daAlink_c_NS_getDirectionRopeMove /* 80133538 00130478 A8 9D 30 0E */ lha r4, 0x300e(r29) @@ -394,7 +394,7 @@ lbl_801336E8: /* 801336EC 0013062C EC 20 00 72 */ fmuls f1, f0, f1 /* 801336F0 00130630 C0 02 94 64 */ lfs f0, lbl_80452E64-_SDA2_BASE_(r2) /* 801336F4 00130634 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801336F8 00130638 48 13 3E ED */ bl cM_rad2s +/* 801336F8 00130638 48 13 3E ED */ bl cM_rad2s__Ff /* 801336FC 0013063C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80133700 00130640 7C 00 1E 70 */ srawi r0, r0, 3 /* 80133704 00130644 54 00 18 38 */ slwi r0, r0, 3 diff --git a/include/d/d_a/d_a_alink/asm/func_80133930.s b/include/d/d_a/d_a_alink/asm/func_80133930.s index 7b5db5a0c3..110a8fdcc0 100644 --- a/include/d/d_a/d_a_alink/asm/func_80133930.s +++ b/include/d/d_a/d_a_alink/asm/func_80133930.s @@ -215,9 +215,9 @@ lbl_80133BDC: /* 80133C34 00130B74 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80133C38 00130B78 40 81 00 44 */ ble lbl_80133C7C /* 80133C3C 00130B7C 38 7F 08 14 */ addi r3, r31, 0x814 -/* 80133C40 00130B80 48 12 FD 1D */ bl cCcD_Stts_NS_ClrCcMove +/* 80133C40 00130B80 48 12 FD 1D */ bl ClrCcMove__9cCcD_SttsFv /* 80133C44 00130B84 38 7F 08 14 */ addi r3, r31, 0x814 -/* 80133C48 00130B88 48 13 34 E1 */ bl cXyz_NS_atan2sX_Z +/* 80133C48 00130B88 48 13 34 E1 */ bl atan2sX_Z__4cXyzCFv /* 80133C4C 00130B8C 7C 63 07 34 */ extsh r3, r3 /* 80133C50 00130B90 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80133C54 00130B94 7C 00 18 51 */ subf. r0, r0, r3 @@ -233,7 +233,7 @@ lbl_80133C6C: /* 80133C78 00130BB8 48 00 00 CC */ b lbl_80133D44 lbl_80133C7C: /* 80133C7C 00130BBC 38 7F 08 14 */ addi r3, r31, 0x814 -/* 80133C80 00130BC0 48 12 FC DD */ bl cCcD_Stts_NS_ClrCcMove +/* 80133C80 00130BC0 48 12 FC DD */ bl ClrCcMove__9cCcD_SttsFv /* 80133C84 00130BC4 7F E3 FB 78 */ mr r3, r31 /* 80133C88 00130BC8 4B FF DA 91 */ bl daAlink_c_NS_setWolfRopePosY /* 80133C8C 00130BCC 7C 64 1B 78 */ mr r4, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_80134000.s b/include/d/d_a/d_a_alink/asm/func_80134000.s index 81d662cc94..33cefa8949 100644 --- a/include/d/d_a/d_a_alink/asm/func_80134000.s +++ b/include/d/d_a/d_a_alink/asm/func_80134000.s @@ -63,7 +63,7 @@ lbl_801340D4: /* 801340EC 0013102C 38 61 00 48 */ addi r3, r1, 0x48 /* 801340F0 00131030 38 9E 37 C8 */ addi r4, r30, 0x37c8 /* 801340F4 00131034 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 801340F8 00131038 48 13 2A 3D */ bl cXyz_NS___mi +/* 801340F8 00131038 48 13 2A 3D */ bl __mi__4cXyzCFRC3Vec /* 801340FC 0013103C C0 41 00 48 */ lfs f2, 0x48(r1) /* 80134100 00131040 D0 41 00 60 */ stfs f2, 0x60(r1) /* 80134104 00131044 C0 01 00 4C */ lfs f0, 0x4c(r1) @@ -181,7 +181,7 @@ lbl_8013425C: /* 8013429C 001311DC 38 61 00 3C */ addi r3, r1, 0x3c /* 801342A0 001311E0 38 9E 37 C8 */ addi r4, r30, 0x37c8 /* 801342A4 001311E4 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 801342A8 001311E8 48 13 28 8D */ bl cXyz_NS___mi +/* 801342A8 001311E8 48 13 28 8D */ bl __mi__4cXyzCFRC3Vec /* 801342AC 001311EC C0 01 00 3C */ lfs f0, 0x3c(r1) /* 801342B0 001311F0 D0 01 00 54 */ stfs f0, 0x54(r1) /* 801342B4 001311F4 C0 01 00 40 */ lfs f0, 0x40(r1) @@ -259,7 +259,7 @@ lbl_801343B0: /* 801343B0 001312F0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 801343B4 001312F4 EF E0 08 24 */ fdivs f31, f0, f1 /* 801343B8 001312F8 38 61 00 54 */ addi r3, r1, 0x54 -/* 801343BC 001312FC 48 13 2D 6D */ bl cXyz_NS_atan2sX_Z +/* 801343BC 001312FC 48 13 2D 6D */ bl atan2sX_Z__4cXyzCFv /* 801343C0 00131300 B0 7E 04 E6 */ sth r3, 0x4e6(r30) /* 801343C4 00131304 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 801343C8 00131308 B0 1E 04 DE */ sth r0, 0x4de(r30) @@ -541,7 +541,7 @@ lbl_801347B8: /* 801347B8 001316F8 C0 1E 04 FC */ lfs f0, 0x4fc(r30) /* 801347BC 001316FC FC 20 00 50 */ fneg f1, f0 /* 801347C0 00131700 C0 5E 33 98 */ lfs f2, 0x3398(r30) -/* 801347C4 00131704 48 13 2E B1 */ bl cM_atan2s +/* 801347C4 00131704 48 13 2E B1 */ bl cM_atan2s__Fff /* 801347C8 00131708 7C 60 07 34 */ extsh r0, r3 /* 801347CC 0013170C 7C 00 0E 70 */ srawi r0, r0, 1 /* 801347D0 00131710 B0 1E 30 0C */ sth r0, 0x300c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80134838.s b/include/d/d_a/d_a_alink/asm/func_80134838.s index 5f221a6a77..e8ab96f5f8 100644 --- a/include/d/d_a/d_a_alink/asm/func_80134838.s +++ b/include/d/d_a/d_a_alink/asm/func_80134838.s @@ -61,13 +61,13 @@ lbl_801348EC: /* 8013490C 0013184C 4B F7 E9 45 */ bl daAlink_c_NS_setDoStatus /* 80134910 00131850 38 7D 04 D0 */ addi r3, r29, 0x4d0 /* 80134914 00131854 38 9D 37 38 */ addi r4, r29, 0x3738 -/* 80134918 00131858 48 13 C2 ED */ bl cLib_targetAngleY +/* 80134918 00131858 48 13 C2 ED */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8013491C 0013185C 7C 64 1B 78 */ mr r4, r3 /* 80134920 00131860 38 7D 04 E6 */ addi r3, r29, 0x4e6 /* 80134924 00131864 38 A0 00 02 */ li r5, 2 /* 80134928 00131868 38 C0 20 00 */ li r6, 0x2000 /* 8013492C 0013186C 38 E0 08 00 */ li r7, 0x800 -/* 80134930 00131870 48 13 BC 11 */ bl cLib_addCalcAngleS +/* 80134930 00131870 48 13 BC 11 */ bl cLib_addCalcAngleS__FPsssss /* 80134934 00131874 A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 80134938 00131878 B0 1D 04 DE */ sth r0, 0x4de(r29) /* 8013493C 0013187C 88 1D 2F 8D */ lbz r0, 0x2f8d(r29) @@ -131,7 +131,7 @@ lbl_80134A0C: /* 80134A0C 0013194C C0 1D 04 FC */ lfs f0, 0x4fc(r29) /* 80134A10 00131950 FC 20 00 50 */ fneg f1, f0 /* 80134A14 00131954 C0 5D 33 98 */ lfs f2, 0x3398(r29) -/* 80134A18 00131958 48 13 2C 5D */ bl cM_atan2s +/* 80134A18 00131958 48 13 2C 5D */ bl cM_atan2s__Fff /* 80134A1C 0013195C 7C 60 07 34 */ extsh r0, r3 /* 80134A20 00131960 7C 00 0E 70 */ srawi r0, r0, 1 /* 80134A24 00131964 B0 1D 30 0C */ sth r0, 0x300c(r29) @@ -160,7 +160,7 @@ lbl_80134A70: /* 80134A7C 001319BC 38 61 00 24 */ addi r3, r1, 0x24 /* 80134A80 001319C0 38 9D 37 C8 */ addi r4, r29, 0x37c8 /* 80134A84 001319C4 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80134A88 001319C8 48 13 20 AD */ bl cXyz_NS___mi +/* 80134A88 001319C8 48 13 20 AD */ bl __mi__4cXyzCFRC3Vec /* 80134A8C 001319CC C0 41 00 24 */ lfs f2, 0x24(r1) /* 80134A90 001319D0 D0 41 00 30 */ stfs f2, 0x30(r1) /* 80134A94 001319D4 C0 01 00 28 */ lfs f0, 0x28(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80134EBC.s b/include/d/d_a/d_a_alink/asm/func_80134EBC.s index 8bc6275901..c12fbe09d2 100644 --- a/include/d/d_a/d_a_alink/asm/func_80134EBC.s +++ b/include/d/d_a/d_a_alink/asm/func_80134EBC.s @@ -61,7 +61,7 @@ lbl_80134F80: /* 80134F98 00131ED8 C0 44 00 70 */ lfs f2, 0x70(r4) /* 80134F9C 00131EDC C0 64 00 74 */ lfs f3, 0x74(r4) /* 80134FA0 00131EE0 C0 84 00 78 */ lfs f4, 0x78(r4) -/* 80134FA4 00131EE4 48 13 A9 D9 */ bl cLib_addCalc +/* 80134FA4 00131EE4 48 13 A9 D9 */ bl cLib_addCalc__FPfffff /* 80134FA8 00131EE8 C0 02 92 C4 */ lfs f0, lbl_80452CC4-_SDA2_BASE_(r2) /* 80134FAC 00131EEC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80134FB0 00131EF0 40 80 00 6C */ bge lbl_8013501C diff --git a/include/d/d_a/d_a_alink/asm/func_801351F8.s b/include/d/d_a/d_a_alink/asm/func_801351F8.s index 0a6e9ef38f..697623bdf1 100644 --- a/include/d/d_a/d_a_alink/asm/func_801351F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801351F8.s @@ -75,7 +75,7 @@ lbl_80135298: /* 80135310 00132250 D0 81 00 10 */ stfs f4, 0x10(r1) /* 80135314 00132254 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 80135318 00132258 38 81 00 08 */ addi r4, r1, 8 -/* 8013531C 0013225C 48 13 2A 0D */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8013531C 0013225C 48 13 2A 0D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80135320 00132260 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80135324 00132264 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80135328 00132268 38 63 0F 38 */ addi r3, r3, 0xf38 @@ -126,7 +126,7 @@ lbl_801353C4: /* 801353C4 00132304 38 7F 33 98 */ addi r3, r31, 0x3398 /* 801353C8 00132308 C0 3F 34 78 */ lfs f1, 0x3478(r31) /* 801353CC 0013230C C0 5F 34 7C */ lfs f2, 0x347c(r31) -/* 801353D0 00132310 48 13 B3 71 */ bl cLib_chaseF +/* 801353D0 00132310 48 13 B3 71 */ bl cLib_chaseF__FPfff /* 801353D4 00132314 A8 9F 30 0C */ lha r4, 0x300c(r31) /* 801353D8 00132318 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 801353DC 0013231C 7C 04 00 00 */ cmpw r4, r0 @@ -137,7 +137,7 @@ lbl_801353C4: /* 801353F0 00132330 A8 A7 00 04 */ lha r5, 4(r7) /* 801353F4 00132334 A8 C7 00 00 */ lha r6, 0(r7) /* 801353F8 00132338 A8 E7 00 02 */ lha r7, 2(r7) -/* 801353FC 0013233C 48 13 B1 45 */ bl cLib_addCalcAngleS +/* 801353FC 0013233C 48 13 B1 45 */ bl cLib_addCalcAngleS__FPsssss /* 80135400 00132340 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80135404 00132344 B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_80135408: diff --git a/include/d/d_a/d_a_alink/asm/func_80135458.s b/include/d/d_a/d_a_alink/asm/func_80135458.s index 728ab3c479..1a73c18f62 100644 --- a/include/d/d_a/d_a_alink/asm/func_80135458.s +++ b/include/d/d_a/d_a_alink/asm/func_80135458.s @@ -14,7 +14,7 @@ /* 8013548C 001323CC D0 01 00 10 */ stfs f0, 0x10(r1) /* 80135490 001323D0 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 80135494 001323D4 38 81 00 08 */ addi r4, r1, 8 -/* 80135498 001323D8 48 13 28 91 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 80135498 001323D8 48 13 28 91 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8013549C 001323DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801354A0 001323E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801354A4 001323E4 38 63 0F 38 */ addi r3, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_80135668.s b/include/d/d_a/d_a_alink/asm/func_80135668.s index bc80f9de06..d6e1236207 100644 --- a/include/d/d_a/d_a_alink/asm/func_80135668.s +++ b/include/d/d_a/d_a_alink/asm/func_80135668.s @@ -8,7 +8,7 @@ /* 80135684 001325C4 38 A0 00 02 */ li r5, 2 /* 80135688 001325C8 38 C0 10 00 */ li r6, 0x1000 /* 8013568C 001325CC 38 E0 04 00 */ li r7, 0x400 -/* 80135690 001325D0 48 13 AE B1 */ bl cLib_addCalcAngleS +/* 80135690 001325D0 48 13 AE B1 */ bl cLib_addCalcAngleS__FPsssss /* 80135694 001325D4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80135698 001325D8 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8013569C 001325DC 38 7F 1F D0 */ addi r3, r31, 0x1fd0 diff --git a/include/d/d_a/d_a_alink/asm/func_801356F0.s b/include/d/d_a/d_a_alink/asm/func_801356F0.s index 111a85009d..715872c496 100644 --- a/include/d/d_a/d_a_alink/asm/func_801356F0.s +++ b/include/d/d_a/d_a_alink/asm/func_801356F0.s @@ -166,7 +166,7 @@ lbl_80135904: lbl_80135954: /* 80135954 00132894 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 80135958 00132898 38 81 00 30 */ addi r4, r1, 0x30 -/* 8013595C 0013289C 48 13 23 CD */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8013595C 0013289C 48 13 23 CD */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80135960 001328A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80135964 001328A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80135968 001328A8 3B A3 0F 38 */ addi r29, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_80135CD8.s b/include/d/d_a/d_a_alink/asm/func_80135CD8.s index f1fb10d534..04511fd9f9 100644 --- a/include/d/d_a/d_a_alink/asm/func_80135CD8.s +++ b/include/d/d_a/d_a_alink/asm/func_80135CD8.s @@ -16,7 +16,7 @@ lbl_80135D0C: /* 80135D10 00132C50 48 00 01 D8 */ b lbl_80135EE8 lbl_80135D14: /* 80135D14 00132C54 7F A3 EB 78 */ mr r3, r29 -/* 80135D18 00132C58 48 13 14 11 */ bl cXyz_NS_atan2sX_Z +/* 80135D18 00132C58 48 13 14 11 */ bl atan2sX_Z__4cXyzCFv /* 80135D1C 00132C5C 7C 7E 1B 78 */ mr r30, r3 /* 80135D20 00132C60 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) /* 80135D24 00132C64 C0 42 93 2C */ lfs f2, lbl_80452D2C-_SDA2_BASE_(r2) @@ -42,7 +42,7 @@ lbl_80135D14: /* 80135D74 00132CB4 D0 41 00 28 */ stfs f2, 0x28(r1) /* 80135D78 00132CB8 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 80135D7C 00132CBC 38 81 00 20 */ addi r4, r1, 0x20 -/* 80135D80 00132CC0 48 13 1F A9 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 80135D80 00132CC0 48 13 1F A9 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80135D84 00132CC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80135D88 00132CC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80135D8C 00132CCC 38 63 0F 38 */ addi r3, r3, 0xf38 diff --git a/include/d/d_a/d_a_alink/asm/func_801360EC.s b/include/d/d_a/d_a_alink/asm/func_801360EC.s index bff048ef53..e0733940d5 100644 --- a/include/d/d_a/d_a_alink/asm/func_801360EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801360EC.s @@ -51,7 +51,7 @@ lbl_8013617C: /* 801361AC 001330EC D0 61 00 20 */ stfs f3, 0x20(r1) /* 801361B0 001330F0 FC 20 00 50 */ fneg f1, f0 /* 801361B4 001330F4 FC 40 18 50 */ fneg f2, f3 -/* 801361B8 001330F8 48 13 14 BD */ bl cM_atan2s +/* 801361B8 001330F8 48 13 14 BD */ bl cM_atan2s__Fff /* 801361BC 001330FC 4B F7 D2 D9 */ bl daAlink_c_NS_getDirectionFromAngle /* 801361C0 00133100 2C 03 00 00 */ cmpwi r3, 0 /* 801361C4 00133104 40 82 00 2C */ bne lbl_801361F0 @@ -109,7 +109,7 @@ lbl_80136280: /* 80136284 001331C4 38 80 00 90 */ li r4, 0x90 /* 80136288 001331C8 4B F7 96 19 */ bl daAlink_c_NS_setFaceBasicTexture /* 8013628C 001331CC 7F E3 FB 78 */ mr r3, r31 -/* 80136290 001331D0 48 13 0E 99 */ bl cXyz_NS_atan2sX_Z +/* 80136290 001331D0 48 13 0E 99 */ bl atan2sX_Z__4cXyzCFv /* 80136294 001331D4 B0 7D 04 DE */ sth r3, 0x4de(r29) /* 80136298 001331D8 A8 1D 04 DE */ lha r0, 0x4de(r29) /* 8013629C 001331DC B0 1D 30 10 */ sth r0, 0x3010(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_80136508.s b/include/d/d_a/d_a_alink/asm/func_80136508.s index e9998ad48a..b2ac786baf 100644 --- a/include/d/d_a/d_a_alink/asm/func_80136508.s +++ b/include/d/d_a/d_a_alink/asm/func_80136508.s @@ -10,7 +10,7 @@ /* 8013652C 0013346C 3C 80 80 39 */ lis r4, lbl_8038F23C@ha /* 80136530 00133470 38 84 F2 3C */ addi r4, r4, lbl_8038F23C@l /* 80136534 00133474 C0 44 00 58 */ lfs f2, 0x58(r4) -/* 80136538 00133478 48 13 A2 09 */ bl cLib_chaseF +/* 80136538 00133478 48 13 A2 09 */ bl cLib_chaseF__FPfff /* 8013653C 0013347C 38 00 00 05 */ li r0, 5 /* 80136540 00133480 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 80136544 00133484 80 1E 05 74 */ lwz r0, 0x574(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8013712C.s b/include/d/d_a/d_a_alink/asm/func_8013712C.s index 0505816c10..f5b544cbc1 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013712C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013712C.s @@ -12,7 +12,7 @@ lbl_80137158: /* 80137158 00134098 C0 02 97 A4 */ lfs f0, lbl_804531A4-_SDA2_BASE_(r2) /* 8013715C 0013409C EC 20 00 72 */ fmuls f1, f0, f1 -/* 80137160 001340A0 48 13 04 85 */ bl cM_rad2s +/* 80137160 001340A0 48 13 04 85 */ bl cM_rad2s__Ff /* 80137164 001340A4 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 80137168 001340A8 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 8013716C 001340AC 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l diff --git a/include/d/d_a/d_a_alink/asm/func_801377F0.s b/include/d/d_a/d_a_alink/asm/func_801377F0.s index 64bb80a896..cf94ec173b 100644 --- a/include/d/d_a/d_a_alink/asm/func_801377F0.s +++ b/include/d/d_a/d_a_alink/asm/func_801377F0.s @@ -255,7 +255,7 @@ lbl_80137B90: /* 80137B98 00134AD8 A8 A7 00 28 */ lha r5, 0x28(r7) /* 80137B9C 00134ADC A8 C7 00 2A */ lha r6, 0x2a(r7) /* 80137BA0 00134AE0 A8 E7 00 2C */ lha r7, 0x2c(r7) -/* 80137BA4 00134AE4 48 13 89 9D */ bl cLib_addCalcAngleS +/* 80137BA4 00134AE4 48 13 89 9D */ bl cLib_addCalcAngleS__FPsssss lbl_80137BA8: /* 80137BA8 00134AE8 7F 23 CB 78 */ mr r3, r25 /* 80137BAC 00134AEC 4B FF F5 81 */ bl daAlink_c_NS_getWolfLieMoveSpeed diff --git a/include/d/d_a/d_a_alink/asm/func_80137D4C.s b/include/d/d_a/d_a_alink/asm/func_80137D4C.s index 5ca7d040d4..d01671b470 100644 --- a/include/d/d_a/d_a_alink/asm/func_80137D4C.s +++ b/include/d/d_a/d_a_alink/asm/func_80137D4C.s @@ -106,7 +106,7 @@ lbl_80137EB8: /* 80137ECC 00134E0C 38 A0 00 05 */ li r5, 5 /* 80137ED0 00134E10 38 C0 04 80 */ li r6, 0x480 /* 80137ED4 00134E14 38 E0 00 80 */ li r7, 0x80 -/* 80137ED8 00134E18 48 13 86 69 */ bl cLib_addCalcAngleS +/* 80137ED8 00134E18 48 13 86 69 */ bl cLib_addCalcAngleS__FPsssss /* 80137EDC 00134E1C 7C 60 07 35 */ extsh. r0, r3 /* 80137EE0 00134E20 41 82 00 08 */ beq lbl_80137EE8 /* 80137EE4 00134E24 3B 80 00 00 */ li r28, 0 @@ -128,18 +128,18 @@ lbl_80137F10: /* 80137F18 00134E58 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 80137F1C 00134E5C C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) /* 80137F20 00134E60 C0 82 92 B8 */ lfs f4, lbl_80452CB8-_SDA2_BASE_(r2) -/* 80137F24 00134E64 48 13 7A 59 */ bl cLib_addCalc +/* 80137F24 00134E64 48 13 7A 59 */ bl cLib_addCalc__FPfffff /* 80137F28 00134E68 38 7F 04 D8 */ addi r3, r31, 0x4d8 /* 80137F2C 00134E6C C0 3F 37 D0 */ lfs f1, 0x37d0(r31) /* 80137F30 00134E70 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 80137F34 00134E74 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) /* 80137F38 00134E78 C0 82 92 B8 */ lfs f4, lbl_80452CB8-_SDA2_BASE_(r2) -/* 80137F3C 00134E7C 48 13 7A 41 */ bl cLib_addCalc +/* 80137F3C 00134E7C 48 13 7A 41 */ bl cLib_addCalc__FPfffff lbl_80137F40: /* 80137F40 00134E80 38 61 00 08 */ addi r3, r1, 8 /* 80137F44 00134E84 38 9F 37 C8 */ addi r4, r31, 0x37c8 /* 80137F48 00134E88 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80137F4C 00134E8C 48 12 EB E9 */ bl cXyz_NS___mi +/* 80137F4C 00134E8C 48 12 EB E9 */ bl __mi__4cXyzCFRC3Vec /* 80137F50 00134E90 C0 01 00 08 */ lfs f0, 8(r1) /* 80137F54 00134E94 D0 01 00 14 */ stfs f0, 0x14(r1) /* 80137F58 00134E98 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -147,9 +147,9 @@ lbl_80137F40: /* 80137F60 00134EA0 C0 01 00 10 */ lfs f0, 0x10(r1) /* 80137F64 00134EA4 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 80137F68 00134EA8 38 61 00 14 */ addi r3, r1, 0x14 -/* 80137F6C 00134EAC 48 12 F1 BD */ bl cXyz_NS_atan2sX_Z +/* 80137F6C 00134EAC 48 12 F1 BD */ bl atan2sX_Z__4cXyzCFv /* 80137F70 00134EB0 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80137F74 00134EB4 48 13 8E B1 */ bl cLib_distanceAngleS +/* 80137F74 00134EB4 48 13 8E B1 */ bl cLib_distanceAngleS__Fss /* 80137F78 00134EB8 2C 03 60 00 */ cmpwi r3, 0x6000 /* 80137F7C 00134EBC 40 80 00 08 */ bge lbl_80137F84 /* 80137F80 00134EC0 3B 80 00 00 */ li r28, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80138000.s b/include/d/d_a/d_a_alink/asm/func_80138000.s index 4a5a639657..bd43059ffb 100644 --- a/include/d/d_a/d_a_alink/asm/func_80138000.s +++ b/include/d/d_a/d_a_alink/asm/func_80138000.s @@ -32,7 +32,7 @@ lbl_80138050: /* 80138074 00134FB4 A8 A7 00 3C */ lha r5, 0x3c(r7) /* 80138078 00134FB8 A8 C7 00 40 */ lha r6, 0x40(r7) /* 8013807C 00134FBC A8 E7 00 3E */ lha r7, 0x3e(r7) -/* 80138080 00134FC0 48 13 84 C1 */ bl cLib_addCalcAngleS +/* 80138080 00134FC0 48 13 84 C1 */ bl cLib_addCalcAngleS__FPsssss /* 80138084 00134FC4 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 80138088 00134FC8 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l /* 8013808C 00134FCC A8 9F 04 DE */ lha r4, 0x4de(r31) @@ -78,7 +78,7 @@ lbl_8013810C: /* 8013811C 0013505C A8 A7 00 42 */ lha r5, 0x42(r7) /* 80138120 00135060 A8 C7 00 46 */ lha r6, 0x46(r7) /* 80138124 00135064 A8 E7 00 44 */ lha r7, 0x44(r7) -/* 80138128 00135068 48 13 84 19 */ bl cLib_addCalcAngleS +/* 80138128 00135068 48 13 84 19 */ bl cLib_addCalcAngleS__FPsssss lbl_8013812C: /* 8013812C 0013506C A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80138130 00135070 B0 1F 04 DE */ sth r0, 0x4de(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80139908.s b/include/d/d_a/d_a_alink/asm/func_80139908.s index 286866df5c..262436ee55 100644 --- a/include/d/d_a/d_a_alink/asm/func_80139908.s +++ b/include/d/d_a/d_a_alink/asm/func_80139908.s @@ -32,7 +32,7 @@ lbl_80139970: /* 80139978 001368B8 3C 80 80 39 */ lis r4, lbl_8038EF28@ha /* 8013997C 001368BC 38 84 EF 28 */ addi r4, r4, lbl_8038EF28@l /* 80139980 001368C0 C0 44 00 10 */ lfs f2, 0x10(r4) -/* 80139984 001368C4 48 13 6D BD */ bl cLib_chaseF +/* 80139984 001368C4 48 13 6D BD */ bl cLib_chaseF__FPfff /* 80139988 001368C8 7F E3 FB 78 */ mr r3, r31 /* 8013998C 001368CC 38 80 00 00 */ li r4, 0 /* 80139990 001368D0 4B F7 9D A5 */ bl daAlink_c_NS_setShapeAngleToAtnActor diff --git a/include/d/d_a/d_a_alink/asm/func_80139A70.s b/include/d/d_a/d_a_alink/asm/func_80139A70.s index e67933d34c..9471304e17 100644 --- a/include/d/d_a/d_a_alink/asm/func_80139A70.s +++ b/include/d/d_a/d_a_alink/asm/func_80139A70.s @@ -27,7 +27,7 @@ lbl_80139AC8: /* 80139AD0 00136A10 41 82 00 1C */ beq lbl_80139AEC /* 80139AD4 00136A14 38 7E 04 D0 */ addi r3, r30, 0x4d0 /* 80139AD8 00136A18 38 84 05 38 */ addi r4, r4, 0x538 -/* 80139ADC 00136A1C 48 13 71 29 */ bl cLib_targetAngleY +/* 80139ADC 00136A1C 48 13 71 29 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 80139AE0 00136A20 B0 7E 04 E6 */ sth r3, 0x4e6(r30) /* 80139AE4 00136A24 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 80139AE8 00136A28 B0 1E 04 DE */ sth r0, 0x4de(r30) @@ -96,7 +96,7 @@ lbl_80139B7C: /* 80139BD0 00136B10 40 80 00 20 */ bge lbl_80139BF0 /* 80139BD4 00136B14 38 7E 34 90 */ addi r3, r30, 0x3490 /* 80139BD8 00136B18 C0 44 00 34 */ lfs f2, 0x34(r4) -/* 80139BDC 00136B1C 48 13 6B 65 */ bl cLib_chaseF +/* 80139BDC 00136B1C 48 13 6B 65 */ bl cLib_chaseF__FPfff /* 80139BE0 00136B20 2C 03 00 00 */ cmpwi r3, 0 /* 80139BE4 00136B24 41 82 00 0C */ beq lbl_80139BF0 /* 80139BE8 00136B28 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_80139DE0.s b/include/d/d_a/d_a_alink/asm/func_80139DE0.s index bfa308ae48..30461704a5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80139DE0.s +++ b/include/d/d_a/d_a_alink/asm/func_80139DE0.s @@ -185,7 +185,7 @@ lbl_8013A084: /* 8013A09C 00136FDC 41 82 03 58 */ beq lbl_8013A3F4 /* 8013A0A0 00136FE0 38 7D 04 D0 */ addi r3, r29, 0x4d0 /* 8013A0A4 00136FE4 38 84 05 38 */ addi r4, r4, 0x538 -/* 8013A0A8 00136FE8 48 13 6B 5D */ bl cLib_targetAngleY +/* 8013A0A8 00136FE8 48 13 6B 5D */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8013A0AC 00136FEC B0 7D 04 E6 */ sth r3, 0x4e6(r29) /* 8013A0B0 00136FF0 88 1D 05 69 */ lbz r0, 0x569(r29) /* 8013A0B4 00136FF4 28 00 00 01 */ cmplwi r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8013A4F8.s b/include/d/d_a/d_a_alink/asm/func_8013A4F8.s index a95e2f6197..b6e9d1474b 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013A4F8.s +++ b/include/d/d_a/d_a_alink/asm/func_8013A4F8.s @@ -17,7 +17,7 @@ /* 8013A538 00137478 40 81 00 10 */ ble lbl_8013A548 /* 8013A53C 0013747C 38 7D 33 98 */ addi r3, r29, 0x3398 /* 8013A540 00137480 C0 44 00 60 */ lfs f2, 0x60(r4) -/* 8013A544 00137484 48 13 61 FD */ bl cLib_chaseF +/* 8013A544 00137484 48 13 61 FD */ bl cLib_chaseF__FPfff lbl_8013A548: /* 8013A548 00137488 38 7D 10 F0 */ addi r3, r29, 0x10f0 /* 8013A54C 0013748C 4B F4 9D 75 */ bl dCcD_GObjInf_NS_ChkAtHit diff --git a/include/d/d_a/d_a_alink/asm/func_8013AAC4.s b/include/d/d_a/d_a_alink/asm/func_8013AAC4.s index 85d1c1ef82..e56c8d03a8 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013AAC4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013AAC4.s @@ -20,7 +20,7 @@ lbl_8013AAF0: /* 8013AB0C 00137A4C 38 84 F6 18 */ addi r4, r4, lbl_8038F618@l /* 8013AB10 00137A50 C0 64 00 3C */ lfs f3, 0x3c(r4) /* 8013AB14 00137A54 C0 82 92 98 */ lfs f4, lbl_80452C98-_SDA2_BASE_(r2) -/* 8013AB18 00137A58 48 13 4E 65 */ bl cLib_addCalc +/* 8013AB18 00137A58 48 13 4E 65 */ bl cLib_addCalc__FPfffff /* 8013AB1C 00137A5C A8 1E 30 10 */ lha r0, 0x3010(r30) /* 8013AB20 00137A60 2C 00 00 00 */ cmpwi r0, 0 /* 8013AB24 00137A64 41 82 00 10 */ beq lbl_8013AB34 diff --git a/include/d/d_a/d_a_alink/asm/func_8013ACF4.s b/include/d/d_a/d_a_alink/asm/func_8013ACF4.s index 39324e5059..fedc5588e1 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013ACF4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013ACF4.s @@ -18,7 +18,7 @@ lbl_8013AD20: /* 8013AD34 00137C74 3C 80 80 39 */ lis r4, lbl_8038EF28@ha /* 8013AD38 00137C78 38 84 EF 28 */ addi r4, r4, lbl_8038EF28@l /* 8013AD3C 00137C7C C0 44 00 10 */ lfs f2, 0x10(r4) -/* 8013AD40 00137C80 48 13 5A 01 */ bl cLib_chaseF +/* 8013AD40 00137C80 48 13 5A 01 */ bl cLib_chaseF__FPfff /* 8013AD44 00137C84 7F C3 F3 78 */ mr r3, r30 /* 8013AD48 00137C88 4B F9 73 B5 */ bl daAlink_c_NS_setComboReserb /* 8013AD4C 00137C8C 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_8013ADF0.s b/include/d/d_a/d_a_alink/asm/func_8013ADF0.s index 9db7346727..70afb97577 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013ADF0.s +++ b/include/d/d_a/d_a_alink/asm/func_8013ADF0.s @@ -79,7 +79,7 @@ lbl_8013AEF4: /* 8013AF14 00137E54 41 82 00 14 */ beq lbl_8013AF28 /* 8013AF18 00137E58 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 8013AF1C 00137E5C 38 84 05 38 */ addi r4, r4, 0x538 -/* 8013AF20 00137E60 48 13 5C E5 */ bl cLib_targetAngleY +/* 8013AF20 00137E60 48 13 5C E5 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8013AF24 00137E64 B0 7F 04 E6 */ sth r3, 0x4e6(r31) lbl_8013AF28: /* 8013AF28 00137E68 A8 1F 04 E6 */ lha r0, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8013AFC0.s b/include/d/d_a/d_a_alink/asm/func_8013AFC0.s index 674fbe971e..a0394c06da 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013AFC0.s +++ b/include/d/d_a/d_a_alink/asm/func_8013AFC0.s @@ -18,7 +18,7 @@ lbl_8013AFEC: /* 8013B000 00137F40 3C 80 80 39 */ lis r4, lbl_8038EF28@ha /* 8013B004 00137F44 38 84 EF 28 */ addi r4, r4, lbl_8038EF28@l /* 8013B008 00137F48 C0 44 00 10 */ lfs f2, 0x10(r4) -/* 8013B00C 00137F4C 48 13 57 35 */ bl cLib_chaseF +/* 8013B00C 00137F4C 48 13 57 35 */ bl cLib_chaseF__FPfff /* 8013B010 00137F50 7F C3 F3 78 */ mr r3, r30 /* 8013B014 00137F54 4B F9 70 E9 */ bl daAlink_c_NS_setComboReserb /* 8013B018 00137F58 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_8013B424.s b/include/d/d_a/d_a_alink/asm/func_8013B424.s index c6f10db1b5..e43c450a83 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013B424.s +++ b/include/d/d_a/d_a_alink/asm/func_8013B424.s @@ -16,7 +16,7 @@ lbl_8013B450: /* 8013B45C 0013839C 3C 80 80 39 */ lis r4, lbl_8038EF28@ha /* 8013B460 001383A0 38 84 EF 28 */ addi r4, r4, lbl_8038EF28@l /* 8013B464 001383A4 C0 44 00 10 */ lfs f2, 0x10(r4) -/* 8013B468 001383A8 48 13 52 D9 */ bl cLib_chaseF +/* 8013B468 001383A8 48 13 52 D9 */ bl cLib_chaseF__FPfff /* 8013B46C 001383AC 7F E3 FB 78 */ mr r3, r31 /* 8013B470 001383B0 48 02 30 5D */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 8013B474 001383B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -59,7 +59,7 @@ lbl_8013B4F0: /* 8013B4FC 0013843C 38 7E 12 20 */ addi r3, r30, 0x1220 /* 8013B500 00138440 C0 3E 34 78 */ lfs f1, 0x3478(r30) /* 8013B504 00138444 C0 42 93 78 */ lfs f2, lbl_80452D78-_SDA2_BASE_(r2) -/* 8013B508 00138448 48 13 52 39 */ bl cLib_chaseF +/* 8013B508 00138448 48 13 52 39 */ bl cLib_chaseF__FPfff lbl_8013B50C: /* 8013B50C 0013844C 38 60 00 01 */ li r3, 1 lbl_8013B510: diff --git a/include/d/d_a/d_a_alink/asm/func_8013B528.s b/include/d/d_a/d_a_alink/asm/func_8013B528.s index e08d41ad7c..0bbca57c22 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013B528.s +++ b/include/d/d_a/d_a_alink/asm/func_8013B528.s @@ -35,7 +35,7 @@ lbl_8013B59C: lbl_8013B5AC: /* 8013B5AC 001384EC 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 8013B5B0 001384F0 38 81 00 24 */ addi r4, r1, 0x24 -/* 8013B5B4 001384F4 48 13 56 51 */ bl cLib_targetAngleY +/* 8013B5B4 001384F4 48 13 56 51 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8013B5B8 001384F8 B0 7F 04 DE */ sth r3, 0x4de(r31) /* 8013B5BC 001384FC A8 1F 04 DE */ lha r0, 0x4de(r31) /* 8013B5C0 00138500 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c diff --git a/include/d/d_a/d_a_alink/asm/func_8013B808.s b/include/d/d_a/d_a_alink/asm/func_8013B808.s index 426835fc2e..98df8dc0c8 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013B808.s +++ b/include/d/d_a/d_a_alink/asm/func_8013B808.s @@ -80,7 +80,7 @@ lbl_8013B91C: /* 8013B938 00138878 38 A0 00 02 */ li r5, 2 /* 8013B93C 0013887C 38 C0 20 00 */ li r6, 0x2000 /* 8013B940 00138880 38 E0 08 00 */ li r7, 0x800 -/* 8013B944 00138884 48 13 4B FD */ bl cLib_addCalcAngleS +/* 8013B944 00138884 48 13 4B FD */ bl cLib_addCalcAngleS__FPsssss lbl_8013B948: /* 8013B948 00138888 38 60 00 01 */ li r3, 1 /* 8013B94C 0013888C 83 E1 00 2C */ lwz r31, 0x2c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013BE24.s b/include/d/d_a/d_a_alink/asm/func_8013BE24.s index 556cdb1980..4049fc0606 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013BE24.s +++ b/include/d/d_a/d_a_alink/asm/func_8013BE24.s @@ -57,14 +57,14 @@ lbl_8013BED4: lbl_8013BEFC: /* 8013BEFC 00138E3C 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 8013BF00 00138E40 38 9F 37 C8 */ addi r4, r31, 0x37c8 -/* 8013BF04 00138E44 48 13 4D 01 */ bl cLib_targetAngleY +/* 8013BF04 00138E44 48 13 4D 01 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8013BF08 00138E48 B0 7F 04 E6 */ sth r3, 0x4e6(r31) /* 8013BF0C 00138E4C A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8013BF10 00138E50 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8013BF14 00138E54 38 61 00 44 */ addi r3, r1, 0x44 /* 8013BF18 00138E58 38 9F 37 C8 */ addi r4, r31, 0x37c8 /* 8013BF1C 00138E5C 38 BF 05 38 */ addi r5, r31, 0x538 -/* 8013BF20 00138E60 48 12 AC 15 */ bl cXyz_NS___mi +/* 8013BF20 00138E60 48 12 AC 15 */ bl __mi__4cXyzCFRC3Vec /* 8013BF24 00138E64 C0 01 00 44 */ lfs f0, 0x44(r1) /* 8013BF28 00138E68 D0 01 00 50 */ stfs f0, 0x50(r1) /* 8013BF2C 00138E6C C0 21 00 48 */ lfs f1, 0x48(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013C3E4.s b/include/d/d_a/d_a_alink/asm/func_8013C3E4.s index f7e498ac73..d6ae138d7d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013C3E4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013C3E4.s @@ -83,7 +83,7 @@ lbl_8013C4FC: /* 8013C510 00139450 C0 42 94 A8 */ lfs f2, lbl_80452EA8-_SDA2_BASE_(r2) /* 8013C514 00139454 C0 62 93 3C */ lfs f3, lbl_80452D3C-_SDA2_BASE_(r2) /* 8013C518 00139458 C0 82 92 B8 */ lfs f4, lbl_80452CB8-_SDA2_BASE_(r2) -/* 8013C51C 0013945C 48 13 34 61 */ bl cLib_addCalc +/* 8013C51C 0013945C 48 13 34 61 */ bl cLib_addCalc__FPfffff lbl_8013C520: /* 8013C520 00139460 38 7F 1F D0 */ addi r3, r31, 0x1fd0 /* 8013C524 00139464 48 02 1F A9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd diff --git a/include/d/d_a/d_a_alink/asm/func_8013C630.s b/include/d/d_a/d_a_alink/asm/func_8013C630.s index 39203b3189..165f1732bf 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013C630.s +++ b/include/d/d_a/d_a_alink/asm/func_8013C630.s @@ -10,7 +10,7 @@ /* 8013C654 00139594 38 7E 04 D0 */ addi r3, r30, 0x4d0 /* 8013C658 00139598 80 9E 07 C8 */ lwz r4, 0x7c8(r30) /* 8013C65C 0013959C 38 84 05 38 */ addi r4, r4, 0x538 -/* 8013C660 001395A0 48 13 45 A5 */ bl cLib_targetAngleY +/* 8013C660 001395A0 48 13 45 A5 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8013C664 001395A4 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 8013C668 001395A8 7C 00 18 50 */ subf r0, r0, r3 /* 8013C66C 001395AC 7C 03 07 34 */ extsh r3, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_8013C7A4.s b/include/d/d_a/d_a_alink/asm/func_8013C7A4.s index 20660eed57..4351d1f461 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013C7A4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013C7A4.s @@ -20,7 +20,7 @@ lbl_8013C7E0: /* 8013C7EC 0013972C 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 8013C7F0 00139730 80 9F 07 C8 */ lwz r4, 0x7c8(r31) /* 8013C7F4 00139734 38 84 05 38 */ addi r4, r4, 0x538 -/* 8013C7F8 00139738 48 13 44 0D */ bl cLib_targetAngleY +/* 8013C7F8 00139738 48 13 44 0D */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8013C7FC 0013973C 7C 64 1B 78 */ mr r4, r3 /* 8013C800 00139740 A8 1F 30 0C */ lha r0, 0x300c(r31) /* 8013C804 00139744 2C 00 00 00 */ cmpwi r0, 0 @@ -33,14 +33,14 @@ lbl_8013C818: /* 8013C81C 0013975C 38 A0 00 02 */ li r5, 2 /* 8013C820 00139760 38 C0 20 00 */ li r6, 0x2000 /* 8013C824 00139764 38 E0 08 00 */ li r7, 0x800 -/* 8013C828 00139768 48 13 3D 19 */ bl cLib_addCalcAngleS +/* 8013C828 00139768 48 13 3D 19 */ bl cLib_addCalcAngleS__FPsssss lbl_8013C82C: /* 8013C82C 0013976C 38 7F 33 98 */ addi r3, r31, 0x3398 /* 8013C830 00139770 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013C834 00139774 C0 42 94 A8 */ lfs f2, lbl_80452EA8-_SDA2_BASE_(r2) /* 8013C838 00139778 C0 62 93 3C */ lfs f3, lbl_80452D3C-_SDA2_BASE_(r2) /* 8013C83C 0013977C C0 82 92 B8 */ lfs f4, lbl_80452CB8-_SDA2_BASE_(r2) -/* 8013C840 00139780 48 13 31 3D */ bl cLib_addCalc +/* 8013C840 00139780 48 13 31 3D */ bl cLib_addCalc__FPfffff /* 8013C844 00139784 38 7F 1F D0 */ addi r3, r31, 0x1fd0 /* 8013C848 00139788 48 02 1C 85 */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 8013C84C 0013978C 54 60 06 3F */ clrlwi. r0, r3, 0x18 diff --git a/include/d/d_a/d_a_alink/asm/func_8013CB48.s b/include/d/d_a/d_a_alink/asm/func_8013CB48.s index 823489d9cb..5ccfa459a9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013CB48.s +++ b/include/d/d_a/d_a_alink/asm/func_8013CB48.s @@ -13,7 +13,7 @@ /* 8013CB78 00139AB8 41 82 00 1C */ beq lbl_8013CB94 /* 8013CB7C 00139ABC 2C 1E 00 04 */ cmpwi r30, 4 /* 8013CB80 00139AC0 40 82 00 28 */ bne lbl_8013CBA8 -/* 8013CB84 00139AC4 48 12 AC E9 */ bl cM_rnd +/* 8013CB84 00139AC4 48 12 AC E9 */ bl cM_rnd__Fv /* 8013CB88 00139AC8 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) /* 8013CB8C 00139ACC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8013CB90 00139AD0 40 80 00 18 */ bge lbl_8013CBA8 diff --git a/include/d/d_a/d_a_alink/asm/func_8013CDEC.s b/include/d/d_a/d_a_alink/asm/func_8013CDEC.s index f03fb3b30d..d984b80884 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013CDEC.s +++ b/include/d/d_a/d_a_alink/asm/func_8013CDEC.s @@ -19,7 +19,7 @@ lbl_8013CE28: /* 8013CE30 00139D70 38 A0 00 02 */ li r5, 2 /* 8013CE34 00139D74 38 C0 20 00 */ li r6, 0x2000 /* 8013CE38 00139D78 38 E0 08 00 */ li r7, 0x800 -/* 8013CE3C 00139D7C 48 13 37 05 */ bl cLib_addCalcAngleS +/* 8013CE3C 00139D7C 48 13 37 05 */ bl cLib_addCalcAngleS__FPsssss /* 8013CE40 00139D80 A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 8013CE44 00139D84 B0 1D 04 DE */ sth r0, 0x4de(r29) /* 8013CE48 00139D88 7F A3 EB 78 */ mr r3, r29 @@ -85,7 +85,7 @@ lbl_8013CF10: /* 8013CF24 00139E64 38 84 F7 48 */ addi r4, r4, lbl_8038F748@l /* 8013CF28 00139E68 C0 24 00 48 */ lfs f1, 0x48(r4) /* 8013CF2C 00139E6C C0 44 00 50 */ lfs f2, 0x50(r4) -/* 8013CF30 00139E70 48 13 38 11 */ bl cLib_chaseF +/* 8013CF30 00139E70 48 13 38 11 */ bl cLib_chaseF__FPfff /* 8013CF34 00139E74 48 00 00 1C */ b lbl_8013CF50 lbl_8013CF38: /* 8013CF38 00139E78 38 7D 34 78 */ addi r3, r29, 0x3478 @@ -93,7 +93,7 @@ lbl_8013CF38: /* 8013CF40 00139E80 38 84 F7 48 */ addi r4, r4, lbl_8038F748@l /* 8013CF44 00139E84 C0 24 00 40 */ lfs f1, 0x40(r4) /* 8013CF48 00139E88 C0 44 00 58 */ lfs f2, 0x58(r4) -/* 8013CF4C 00139E8C 48 13 37 F5 */ bl cLib_chaseF +/* 8013CF4C 00139E8C 48 13 37 F5 */ bl cLib_chaseF__FPfff lbl_8013CF50: /* 8013CF50 00139E90 C0 3F 00 0C */ lfs f1, 0xc(r31) /* 8013CF54 00139E94 C0 02 93 A0 */ lfs f0, lbl_80452DA0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_8013D0D4.s b/include/d/d_a/d_a_alink/asm/func_8013D0D4.s index 987cb17102..380fd9a390 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013D0D4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013D0D4.s @@ -69,7 +69,7 @@ lbl_8013D1A4: /* 8013D1D4 0013A114 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 8013D1D8 0013A118 38 84 04 D0 */ addi r4, r4, 0x4d0 /* 8013D1DC 0013A11C 38 BF 35 10 */ addi r5, r31, 0x3510 -/* 8013D1E0 0013A120 48 12 99 55 */ bl cXyz_NS___mi +/* 8013D1E0 0013A120 48 12 99 55 */ bl __mi__4cXyzCFRC3Vec /* 8013D1E4 0013A124 C0 01 00 24 */ lfs f0, 0x24(r1) /* 8013D1E8 0013A128 D0 1F 37 C8 */ stfs f0, 0x37c8(r31) /* 8013D1EC 0013A12C C0 01 00 28 */ lfs f0, 0x28(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013D65C.s b/include/d/d_a/d_a_alink/asm/func_8013D65C.s index a5f078f4f7..4db86072b8 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013D65C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013D65C.s @@ -92,7 +92,7 @@ lbl_8013D78C: /* 8013D7B0 0013A6F0 38 61 00 08 */ addi r3, r1, 8 /* 8013D7B4 0013A6F4 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 8013D7B8 0013A6F8 38 BF 1E 8C */ addi r5, r31, 0x1e8c -/* 8013D7BC 0013A6FC 48 12 93 79 */ bl cXyz_NS___mi +/* 8013D7BC 0013A6FC 48 12 93 79 */ bl __mi__4cXyzCFRC3Vec /* 8013D7C0 0013A700 C0 81 00 08 */ lfs f4, 8(r1) /* 8013D7C4 0013A704 D0 81 00 14 */ stfs f4, 0x14(r1) /* 8013D7C8 0013A708 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013D86C.s b/include/d/d_a/d_a_alink/asm/func_8013D86C.s index 3f8558ab91..3d83096faf 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013D86C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013D86C.s @@ -10,7 +10,7 @@ /* 8013D890 0013A7D0 3C 80 80 39 */ lis r4, lbl_8038EF28@ha /* 8013D894 0013A7D4 38 84 EF 28 */ addi r4, r4, lbl_8038EF28@l /* 8013D898 0013A7D8 C0 44 00 10 */ lfs f2, 0x10(r4) -/* 8013D89C 0013A7DC 48 13 2E A5 */ bl cLib_chaseF +/* 8013D89C 0013A7DC 48 13 2E A5 */ bl cLib_chaseF__FPfff /* 8013D8A0 0013A7E0 7F C3 F3 78 */ mr r3, r30 /* 8013D8A4 0013A7E4 38 80 00 00 */ li r4, 0 /* 8013D8A8 0013A7E8 4B F7 5E 8D */ bl daAlink_c_NS_setShapeAngleToAtnActor diff --git a/include/d/d_a/d_a_alink/asm/func_8013DF30.s b/include/d/d_a/d_a_alink/asm/func_8013DF30.s index d08929b609..781bf59cff 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013DF30.s +++ b/include/d/d_a/d_a_alink/asm/func_8013DF30.s @@ -38,7 +38,7 @@ lbl_8013DF74: /* 8013DFC0 0013AF00 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 8013DFC4 0013AF04 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 8013DFC8 0013AF08 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 8013DFCC 0013AF0C 48 13 2C 39 */ bl cLib_targetAngleY +/* 8013DFCC 0013AF0C 48 13 2C 39 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8013DFD0 0013AF10 B0 7F 04 E6 */ sth r3, 0x4e6(r31) /* 8013DFD4 0013AF14 A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 8013DFD8 0013AF18 3C 63 00 01 */ addis r3, r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8013E034.s b/include/d/d_a/d_a_alink/asm/func_8013E034.s index 2412fee375..8282f5ed68 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013E034.s +++ b/include/d/d_a/d_a_alink/asm/func_8013E034.s @@ -58,7 +58,7 @@ lbl_8013E100: /* 8013E100 0013B040 38 7F 33 98 */ addi r3, r31, 0x3398 /* 8013E104 0013B044 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013E108 0013B048 C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) -/* 8013E10C 0013B04C 48 13 26 35 */ bl cLib_chaseF +/* 8013E10C 0013B04C 48 13 26 35 */ bl cLib_chaseF__FPfff /* 8013E110 0013B050 2C 03 00 00 */ cmpwi r3, 0 /* 8013E114 0013B054 41 82 00 A0 */ beq lbl_8013E1B4 /* 8013E118 0013B058 A8 7F 30 12 */ lha r3, 0x3012(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8013E2A8.s b/include/d/d_a/d_a_alink/asm/func_8013E2A8.s index f91bc76537..31801918c6 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013E2A8.s +++ b/include/d/d_a/d_a_alink/asm/func_8013E2A8.s @@ -29,13 +29,13 @@ lbl_8013E304: /* 8013E310 0013B250 40 80 00 34 */ bge lbl_8013E344 /* 8013E314 0013B254 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 8013E318 0013B258 38 9E 05 38 */ addi r4, r30, 0x538 -/* 8013E31C 0013B25C 48 13 28 E9 */ bl cLib_targetAngleY +/* 8013E31C 0013B25C 48 13 28 E9 */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8013E320 0013B260 7C 64 1B 78 */ mr r4, r3 /* 8013E324 0013B264 38 7F 04 E6 */ addi r3, r31, 0x4e6 /* 8013E328 0013B268 38 A0 00 02 */ li r5, 2 /* 8013E32C 0013B26C 38 C0 20 00 */ li r6, 0x2000 /* 8013E330 0013B270 38 E0 08 00 */ li r7, 0x800 -/* 8013E334 0013B274 48 13 22 0D */ bl cLib_addCalcAngleS +/* 8013E334 0013B274 48 13 22 0D */ bl cLib_addCalcAngleS__FPsssss /* 8013E338 0013B278 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8013E33C 0013B27C B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8013E340 0013B280 48 00 03 54 */ b lbl_8013E694 @@ -45,7 +45,7 @@ lbl_8013E344: /* 8013E34C 0013B28C 40 82 02 F4 */ bne lbl_8013E640 /* 8013E350 0013B290 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 8013E354 0013B294 38 9E 05 38 */ addi r4, r30, 0x538 -/* 8013E358 0013B298 48 13 28 AD */ bl cLib_targetAngleY +/* 8013E358 0013B298 48 13 28 AD */ bl cLib_targetAngleY__FPC3VecPC3Vec /* 8013E35C 0013B29C B0 7F 04 E6 */ sth r3, 0x4e6(r31) /* 8013E360 0013B2A0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8013E364 0013B2A4 B0 1F 04 DE */ sth r0, 0x4de(r31) @@ -54,7 +54,7 @@ lbl_8013E344: /* 8013E370 0013B2B0 38 61 00 1C */ addi r3, r1, 0x1c /* 8013E374 0013B2B4 38 9E 05 38 */ addi r4, r30, 0x538 /* 8013E378 0013B2B8 38 BF 34 E0 */ addi r5, r31, 0x34e0 -/* 8013E37C 0013B2BC 48 12 87 B9 */ bl cXyz_NS___mi +/* 8013E37C 0013B2BC 48 12 87 B9 */ bl __mi__4cXyzCFRC3Vec /* 8013E380 0013B2C0 C0 41 00 1C */ lfs f2, 0x1c(r1) /* 8013E384 0013B2C4 D0 41 00 28 */ stfs f2, 0x28(r1) /* 8013E388 0013B2C8 C0 01 00 20 */ lfs f0, 0x20(r1) @@ -208,7 +208,7 @@ lbl_8013E58C: /* 8013E58C 0013B4CC FF C0 08 90 */ fmr f30, f1 lbl_8013E590: /* 8013E590 0013B4D0 38 61 00 28 */ addi r3, r1, 0x28 -/* 8013E594 0013B4D4 48 12 8B BD */ bl cXyz_NS_atan2sY_XZ +/* 8013E594 0013B4D4 48 12 8B BD */ bl atan2sY_XZ__4cXyzCFv /* 8013E598 0013B4D8 7C 60 07 34 */ extsh r0, r3 /* 8013E59C 0013B4DC 7C 00 0E 70 */ srawi r0, r0, 1 /* 8013E5A0 0013B4E0 B0 1F 30 0C */ sth r0, 0x300c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8013E80C.s b/include/d/d_a/d_a_alink/asm/func_8013E80C.s index d34593b1af..5b0eee423b 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013E80C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013E80C.s @@ -93,7 +93,7 @@ lbl_8013E948: lbl_8013E958: /* 8013E958 0013B898 D0 3D 33 98 */ stfs f1, 0x3398(r29) /* 8013E95C 0013B89C 38 7D 37 C8 */ addi r3, r29, 0x37c8 -/* 8013E960 0013B8A0 48 12 87 C9 */ bl cXyz_NS_atan2sX_Z +/* 8013E960 0013B8A0 48 12 87 C9 */ bl atan2sX_Z__4cXyzCFv /* 8013E964 0013B8A4 B0 7D 04 DE */ sth r3, 0x4de(r29) /* 8013E968 0013B8A8 80 1D 05 78 */ lwz r0, 0x578(r29) /* 8013E96C 0013B8AC 60 00 02 00 */ ori r0, r0, 0x200 @@ -183,7 +183,7 @@ lbl_8013EAA8: /* 8013EAA8 0013B9E8 38 61 00 54 */ addi r3, r1, 0x54 /* 8013EAAC 0013B9EC 38 9D 04 D0 */ addi r4, r29, 0x4d0 /* 8013EAB0 0013B9F0 38 BF 07 B0 */ addi r5, r31, 0x7b0 -/* 8013EAB4 0013B9F4 48 12 80 81 */ bl cXyz_NS___mi +/* 8013EAB4 0013B9F4 48 12 80 81 */ bl __mi__4cXyzCFRC3Vec /* 8013EAB8 0013B9F8 C0 61 00 54 */ lfs f3, 0x54(r1) /* 8013EABC 0013B9FC D0 61 00 6C */ stfs f3, 0x6c(r1) /* 8013EAC0 0013BA00 C0 01 00 58 */ lfs f0, 0x58(r1) @@ -219,17 +219,17 @@ lbl_8013EB18: /* 8013EB34 0013BA74 48 20 85 5D */ bl PSVECAdd /* 8013EB38 0013BA78 38 61 00 48 */ addi r3, r1, 0x48 /* 8013EB3C 0013BA7C 38 81 00 6C */ addi r4, r1, 0x6c -/* 8013EB40 0013BA80 48 12 84 09 */ bl cXyz_NS_normalizeZP +/* 8013EB40 0013BA80 48 12 84 09 */ bl normalizeZP__4cXyzFv /* 8013EB44 0013BA84 38 61 00 3C */ addi r3, r1, 0x3c /* 8013EB48 0013BA88 38 81 00 6C */ addi r4, r1, 0x6c /* 8013EB4C 0013BA8C C0 3D 34 78 */ lfs f1, 0x3478(r29) /* 8013EB50 0013BA90 C0 1F 07 A4 */ lfs f0, 0x7a4(r31) /* 8013EB54 0013BA94 EC 21 00 2A */ fadds f1, f1, f0 -/* 8013EB58 0013BA98 48 12 80 2D */ bl cXyz_NS___ml +/* 8013EB58 0013BA98 48 12 80 2D */ bl __ml__4cXyzCFf /* 8013EB5C 0013BA9C 38 61 00 30 */ addi r3, r1, 0x30 /* 8013EB60 0013BAA0 38 9F 07 B0 */ addi r4, r31, 0x7b0 /* 8013EB64 0013BAA4 38 A1 00 3C */ addi r5, r1, 0x3c -/* 8013EB68 0013BAA8 48 12 7F 7D */ bl cXyz_NS___pl +/* 8013EB68 0013BAA8 48 12 7F 7D */ bl __pl__4cXyzCFRC3Vec /* 8013EB6C 0013BAAC C0 01 00 30 */ lfs f0, 0x30(r1) /* 8013EB70 0013BAB0 D0 1D 04 D0 */ stfs f0, 0x4d0(r29) /* 8013EB74 0013BAB4 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -239,11 +239,11 @@ lbl_8013EB18: /* 8013EB84 0013BAC4 38 61 00 24 */ addi r3, r1, 0x24 /* 8013EB88 0013BAC8 38 9D 04 D0 */ addi r4, r29, 0x4d0 /* 8013EB8C 0013BACC 38 BD 37 98 */ addi r5, r29, 0x3798 -/* 8013EB90 0013BAD0 48 12 7F A5 */ bl cXyz_NS___mi +/* 8013EB90 0013BAD0 48 12 7F A5 */ bl __mi__4cXyzCFRC3Vec /* 8013EB94 0013BAD4 38 61 00 18 */ addi r3, r1, 0x18 /* 8013EB98 0013BAD8 38 81 00 24 */ addi r4, r1, 0x24 /* 8013EB9C 0013BADC C0 22 97 D0 */ lfs f1, lbl_804531D0-_SDA2_BASE_(r2) -/* 8013EBA0 0013BAE0 48 12 7F E5 */ bl cXyz_NS___ml +/* 8013EBA0 0013BAE0 48 12 7F E5 */ bl __ml__4cXyzCFf /* 8013EBA4 0013BAE4 C0 01 00 18 */ lfs f0, 0x18(r1) /* 8013EBA8 0013BAE8 D0 1D 37 C8 */ stfs f0, 0x37c8(r29) /* 8013EBAC 0013BAEC C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -265,7 +265,7 @@ lbl_8013EB18: /* 8013EBEC 0013BB2C FC 20 00 50 */ fneg f1, f0 /* 8013EBF0 0013BB30 C0 01 00 70 */ lfs f0, 0x70(r1) /* 8013EBF4 0013BB34 FC 40 00 50 */ fneg f2, f0 -/* 8013EBF8 0013BB38 48 12 8A 7D */ bl cM_atan2s +/* 8013EBF8 0013BB38 48 12 8A 7D */ bl cM_atan2s__Fff /* 8013EBFC 0013BB3C B0 7D 04 E4 */ sth r3, 0x4e4(r29) /* 8013EC00 0013BB40 C0 01 00 70 */ lfs f0, 0x70(r1) /* 8013EC04 0013BB44 EC 20 00 32 */ fmuls f1, f0, f0 @@ -279,7 +279,7 @@ lbl_8013EB18: /* 8013EC24 0013BB64 EC 40 00 B2 */ fmuls f2, f0, f2 lbl_8013EC28: /* 8013EC28 0013BB68 C0 21 00 6C */ lfs f1, 0x6c(r1) -/* 8013EC2C 0013BB6C 48 12 8A 49 */ bl cM_atan2s +/* 8013EC2C 0013BB6C 48 12 8A 49 */ bl cM_atan2s__Fff /* 8013EC30 0013BB70 B0 7D 04 E8 */ sth r3, 0x4e8(r29) /* 8013EC34 0013BB74 A8 1D 04 E4 */ lha r0, 0x4e4(r29) /* 8013EC38 0013BB78 B0 1D 30 0C */ sth r0, 0x300c(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_8013ED44.s b/include/d/d_a/d_a_alink/asm/func_8013ED44.s index d84c2f9fcc..bdbf0e13d1 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013ED44.s +++ b/include/d/d_a/d_a_alink/asm/func_8013ED44.s @@ -256,7 +256,7 @@ lbl_8013F078: /* 8013F0E0 0013C020 D0 41 00 10 */ stfs f2, 0x10(r1) /* 8013F0E4 0013C024 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 8013F0E8 0013C028 38 81 00 08 */ addi r4, r1, 8 -/* 8013F0EC 0013C02C 48 12 8C 3D */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8013F0EC 0013C02C 48 12 8C 3D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8013F0F0 0013C030 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8013F0F4 0013C034 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013F0F8 0013C038 3B E3 0F 38 */ addi r31, r3, 0xf38 @@ -271,13 +271,13 @@ lbl_8013F078: /* 8013F11C 0013C05C 40 80 00 18 */ bge lbl_8013F134 /* 8013F120 0013C060 38 7E 1E 2C */ addi r3, r30, 0x1e2c /* 8013F124 0013C064 38 9E 1D 1C */ addi r4, r30, 0x1d1c -/* 8013F128 0013C068 48 12 90 21 */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 8013F128 0013C068 48 12 90 21 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 8013F12C 0013C06C D3 FE 37 CC */ stfs f31, 0x37cc(r30) /* 8013F130 0013C070 48 00 00 10 */ b lbl_8013F140 lbl_8013F134: /* 8013F134 0013C074 38 7E 1E 2C */ addi r3, r30, 0x1e2c /* 8013F138 0013C078 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 8013F13C 0013C07C 48 12 90 0D */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 8013F13C 0013C07C 48 12 90 0D */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo lbl_8013F140: /* 8013F140 0013C080 C0 1E 37 C8 */ lfs f0, 0x37c8(r30) /* 8013F144 0013C084 D0 1E 37 D4 */ stfs f0, 0x37d4(r30) @@ -305,7 +305,7 @@ lbl_8013F140: /* 8013F19C 0013C0DC 38 7E 1E 2C */ addi r3, r30, 0x1e2c /* 8013F1A0 0013C0E0 3C 80 80 3F */ lis r4, lbl_803F1D80@ha /* 8013F1A4 0013C0E4 38 84 1D 80 */ addi r4, r4, lbl_803F1D80@l -/* 8013F1A8 0013C0E8 48 12 8F A1 */ bl cBgS_PolyInfo_NS_SetPolyInfo +/* 8013F1A8 0013C0E8 48 12 8F A1 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 8013F1AC 0013C0EC 48 00 00 14 */ b lbl_8013F1C0 lbl_8013F1B0: /* 8013F1B0 0013C0F0 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_8013F1F0.s b/include/d/d_a/d_a_alink/asm/func_8013F1F0.s index 66692113fe..d0af0c102c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013F1F0.s +++ b/include/d/d_a/d_a_alink/asm/func_8013F1F0.s @@ -46,7 +46,7 @@ lbl_8013F23C: /* 8013F298 0013C1D8 38 61 00 08 */ addi r3, r1, 8 /* 8013F29C 0013C1DC 38 9F 37 C8 */ addi r4, r31, 0x37c8 /* 8013F2A0 0013C1E0 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8013F2A4 0013C1E4 48 12 78 91 */ bl cXyz_NS___mi +/* 8013F2A4 0013C1E4 48 12 78 91 */ bl __mi__4cXyzCFRC3Vec /* 8013F2A8 0013C1E8 38 7F 37 D4 */ addi r3, r31, 0x37d4 /* 8013F2AC 0013C1EC 38 81 00 08 */ addi r4, r1, 8 /* 8013F2B0 0013C1F0 7C 65 1B 78 */ mr r5, r3 diff --git a/include/d/d_a/d_a_alink/d_a_alink.h b/include/d/d_a/d_a_alink/d_a_alink.h index bd6116d318..9e505ae60b 100644 --- a/include/d/d_a/d_a_alink/d_a_alink.h +++ b/include/d/d_a/d_a_alink/d_a_alink.h @@ -6,6 +6,8 @@ #include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "JSystem/J3DGraphAnimator/J3DModelLoader.h" #include "SComponent/c_bg_s_poly_info.h" +#include "SComponent/c_sxyz.h" +#include "SComponent/c_xyz.h" #include "d/d_a/d_a_player/d_a_player.h" #include "d/d_cc/d_cc_d.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" @@ -38,10 +40,6 @@ class daAlinkHIO_anm_c; class daPy_frameCtrl_c; struct cM3dGPla; -struct csXyz { // move later - s16 x, y, z; -}; - class daAlink_c { public: // member functions @@ -241,6 +239,7 @@ void tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf(fopAc dCcD_GObjInf*); void coHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInf(fopAc_ac_c*, dCcD_GObjInf*); void J3DMaterialAnm_NS_calc(void); +void mDoMtx_stack_c_NS_transM(float, float, float); void daAlink_c_NS_concatMagneBootInvMtx(void); void mDoMtx_ZXYrotM(void); void mDoMtx_YrotM(void); @@ -254,7 +253,7 @@ void daAlink_c_NS_checkBowAnime(void); void setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz(float (*)[4], short, short, short, int, const cXyz*); void daAlink_c_NS_checkHorseLieAnime(void); -void csXyz_X1_(void); +void __ct__5csXyzFsss(void); void daAlink_c_NS_checkNoUpperAnime(void); void daAlink_c_NS_checkUpperReadyThrowAnime(void); void daAlink_c_NS_setDoubleAnimeBlendRatio(void); @@ -273,21 +272,21 @@ bool headModelCallBack__9daAlink_cFi(int); void daAlink_c_NS_changeWolfBlendRate(void); void daAlink_c_NS_setWolfFootMatrix(void); bool wolfModelCallBack__9daAlink_cFi(int); -void cLib_addCalcAngleS2(void); +void cLib_addCalcAngleS2__FPssss(void); void daAlink_c_NS_getMoveBGActorName(void); void daAlink_c_NS_multVecMagneBootInvMtx(void); -void cXyz_NS___ml(void); -void cXyz_NS_atan2sY_XZ(void); -void cM_atan2s(void); -void cLib_distanceAngleS(void); -void cXyz_NS_atan2sX_Z(void); -void cXyz_NS___mi(void); +void __ml__4cXyzCFf(void); +void atan2sY_XZ__4cXyzCFv(void); +void cM_atan2s__Fff(void); +void cLib_distanceAngleS__Fss(void); +void atan2sX_Z__4cXyzCFv(void); +void __mi__4cXyzCFRC3Vec(void); void dKyw_get_AllWind_vec(void); -void cLib_addCalcAngleS(void); -void cM_rndF(void); +void cLib_addCalcAngleS__FPsssss(void); +void cM_rndF__Ff(void); void calcHairAngle__9daAlink_cFPs(short*); void setHairAngle__9daAlink_cFP4cXyzff(cXyz*, float, float); -void cLib_targetAngleY(void); +void cLib_targetAngleY__FPC3VecPC3Vec(void); void daAlink_c_NS_checkEnemyGroup(void); int checkAttentionPosAngle__9daAlink_cFP4cXyz(cXyz*); void daAlink_c_NS_getDemoLookActor(void); @@ -304,7 +303,7 @@ bool checkActorPosAngle__9daAlink_cFP10fopAc_ac_cPP4cXyz(fopAc_ac_c*, cXyz**); void dCamera_c_NS_GetForceLockOnActor(void); void dCam_getBody(void); void dAttention_c_NS_LockonTarget(void); -void cM_rnd(void); +void cM_rnd__Fv(void); void fopAcIt_Judge(void); void dAttList_c_NS_getActor(void); void dAttention_c_NS_GetLockonList(void); @@ -349,6 +348,7 @@ extern float lbl_80453058; extern float lbl_80453100; extern float lbl_804531F0; extern float lbl_804531F4; +extern u8 lbl_80439A20[65536]; // JMath::JMath::sincosTable_ // daalink sethairangle extern float lbl_80452C98; @@ -375,9 +375,10 @@ extern float lbl_80453210; extern u8 lbl_8038E5A4[0x6C]; // daAlinkHIO_horse_c0::m // daalink getneckaimpos +extern u32 lbl_80451018; // daPy_py_c::m_midnaActor extern float lbl_80452D68; extern float lbl_80452DB0; extern float lbl_80452DE0; extern float lbl_80452E44; -#endif
\ No newline at end of file +#endif diff --git a/include/d/d_attention/asm/func_80070CA0.s b/include/d/d_attention/asm/func_80070CA0.s index 7e9cf8f04f..323b7d80dd 100644 --- a/include/d/d_attention/asm/func_80070CA0.s +++ b/include/d/d_attention/asm/func_80070CA0.s @@ -19,7 +19,7 @@ /* 80070CE8 0006DC28 38 61 00 18 */ addi r3, r1, 0x18 /* 80070CEC 0006DC2C 7C A4 2B 78 */ mr r4, r5 /* 80070CF0 0006DC30 7C 05 03 78 */ mr r5, r0 -/* 80070CF4 0006DC34 48 1F 5E 41 */ bl cXyz_NS___mi +/* 80070CF4 0006DC34 48 1F 5E 41 */ bl __mi__4cXyzCFRC3Vec /* 80070CF8 0006DC38 C0 01 00 18 */ lfs f0, 0x18(r1) /* 80070CFC 0006DC3C D0 01 00 24 */ stfs f0, 0x24(r1) /* 80070D00 0006DC40 C0 21 00 1C */ lfs f1, 0x1c(r1) diff --git a/include/d/d_attention/asm/func_80071488.s b/include/d/d_attention/asm/func_80071488.s index 716c23b7d3..6d7e2aa9c6 100644 --- a/include/d/d_attention/asm/func_80071488.s +++ b/include/d/d_attention/asm/func_80071488.s @@ -21,27 +21,27 @@ lbl_800714C8: /* 800714D0 0006E410 38 61 00 34 */ addi r3, r1, 0x34 /* 800714D4 0006E414 38 9F 05 50 */ addi r4, r31, 0x550 /* 800714D8 0006E418 38 BE 03 1C */ addi r5, r30, 0x31c -/* 800714DC 0006E41C 48 1F 56 59 */ bl cXyz_NS___mi +/* 800714DC 0006E41C 48 1F 56 59 */ bl __mi__4cXyzCFRC3Vec /* 800714E0 0006E420 38 61 00 2C */ addi r3, r1, 0x2c /* 800714E4 0006E424 38 81 00 34 */ addi r4, r1, 0x34 -/* 800714E8 0006E428 48 20 03 99 */ bl cSGlobe_X4_ +/* 800714E8 0006E428 48 20 03 99 */ bl __ct__7cSGlobeFRC4cXyz /* 800714EC 0006E42C 80 BE 00 00 */ lwz r5, 0(r30) /* 800714F0 0006E430 38 61 00 1C */ addi r3, r1, 0x1c /* 800714F4 0006E434 3B A1 00 32 */ addi r29, r1, 0x32 /* 800714F8 0006E438 7F A4 EB 78 */ mr r4, r29 /* 800714FC 0006E43C A8 A5 04 E6 */ lha r5, 0x4e6(r5) -/* 80071500 0006E440 48 1F FD 29 */ bl cSAngle_NS___mi_X2_ +/* 80071500 0006E440 48 1F FD 29 */ bl __mi__7cSAngleCFs /* 80071504 0006E444 A8 01 00 1C */ lha r0, 0x1c(r1) /* 80071508 0006E448 B0 01 00 24 */ sth r0, 0x24(r1) /* 8007150C 0006E44C 7F A3 EB 78 */ mr r3, r29 -/* 80071510 0006E450 48 1F FB D9 */ bl cSAngle_NS_Inv +/* 80071510 0006E450 48 1F FB D9 */ bl Inv__7cSAngleCFv /* 80071514 0006E454 7C 64 1B 78 */ mr r4, r3 /* 80071518 0006E458 38 61 00 18 */ addi r3, r1, 0x18 -/* 8007151C 0006E45C 48 1F FA 7D */ bl cSAngle_X2_ +/* 8007151C 0006E45C 48 1F FA 7D */ bl __ct__7cSAngleFs /* 80071520 0006E460 38 61 00 14 */ addi r3, r1, 0x14 /* 80071524 0006E464 38 81 00 18 */ addi r4, r1, 0x18 /* 80071528 0006E468 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 8007152C 0006E46C 48 1F FC FD */ bl cSAngle_NS___mi_X2_ +/* 8007152C 0006E46C 48 1F FC FD */ bl __mi__7cSAngleCFs /* 80071530 0006E470 A8 E1 00 14 */ lha r7, 0x14(r1) /* 80071534 0006E474 B0 E1 00 20 */ sth r7, 0x20(r1) /* 80071538 0006E478 80 1F 05 5C */ lwz r0, 0x55c(r31) @@ -61,7 +61,7 @@ lbl_800714C8: /* 80071570 0006E4B0 FF E0 08 90 */ fmr f31, f1 /* 80071574 0006E4B4 38 61 00 10 */ addi r3, r1, 0x10 /* 80071578 0006E4B8 38 81 00 24 */ addi r4, r1, 0x24 -/* 8007157C 0006E4BC 48 1F F9 ED */ bl cSAngle_X1_ +/* 8007157C 0006E4BC 48 1F F9 ED */ bl __ct__7cSAngleFRC7cSAngle /* 80071580 0006E4C0 7F C3 F3 78 */ mr r3, r30 /* 80071584 0006E4C4 38 80 00 4C */ li r4, 0x4c /* 80071588 0006E4C8 7F E5 FB 78 */ mr r5, r31 @@ -85,7 +85,7 @@ lbl_800715A0: /* 800715CC 0006E50C FF E0 08 90 */ fmr f31, f1 /* 800715D0 0006E510 38 61 00 0C */ addi r3, r1, 0xc /* 800715D4 0006E514 38 81 00 24 */ addi r4, r1, 0x24 -/* 800715D8 0006E518 48 1F F9 91 */ bl cSAngle_X1_ +/* 800715D8 0006E518 48 1F F9 91 */ bl __ct__7cSAngleFRC7cSAngle /* 800715DC 0006E51C 7F C3 F3 78 */ mr r3, r30 /* 800715E0 0006E520 38 80 00 41 */ li r4, 0x41 /* 800715E4 0006E524 7F E5 FB 78 */ mr r5, r31 @@ -109,7 +109,7 @@ lbl_800715FC: /* 80071628 0006E568 FF E0 08 90 */ fmr f31, f1 /* 8007162C 0006E56C 38 61 00 08 */ addi r3, r1, 8 /* 80071630 0006E570 38 81 00 24 */ addi r4, r1, 0x24 -/* 80071634 0006E574 48 1F F9 35 */ bl cSAngle_X1_ +/* 80071634 0006E574 48 1F F9 35 */ bl __ct__7cSAngleFRC7cSAngle /* 80071638 0006E578 7F C3 F3 78 */ mr r3, r30 /* 8007163C 0006E57C 38 80 00 43 */ li r4, 0x43 /* 80071640 0006E580 7F E5 FB 78 */ mr r5, r31 diff --git a/include/d/d_attention/asm/func_80071A98.s b/include/d/d_attention/asm/func_80071A98.s index 95423b95fb..e692edc13d 100644 --- a/include/d/d_attention/asm/func_80071A98.s +++ b/include/d/d_attention/asm/func_80071A98.s @@ -23,28 +23,28 @@ lbl_80071AE0: /* 80071AEC 0006EA2C 38 61 00 38 */ addi r3, r1, 0x38 /* 80071AF0 0006EA30 38 9E 05 50 */ addi r4, r30, 0x550 /* 80071AF4 0006EA34 38 BD 03 1C */ addi r5, r29, 0x31c -/* 80071AF8 0006EA38 48 1F 50 3D */ bl cXyz_NS___mi +/* 80071AF8 0006EA38 48 1F 50 3D */ bl __mi__4cXyzCFRC3Vec /* 80071AFC 0006EA3C 38 61 00 24 */ addi r3, r1, 0x24 /* 80071B00 0006EA40 38 81 00 38 */ addi r4, r1, 0x38 -/* 80071B04 0006EA44 48 1F FD 7D */ bl cSGlobe_X4_ +/* 80071B04 0006EA44 48 1F FD 7D */ bl __ct__7cSGlobeFRC4cXyz /* 80071B08 0006EA48 80 BD 00 00 */ lwz r5, 0(r29) /* 80071B0C 0006EA4C 38 61 00 0C */ addi r3, r1, 0xc /* 80071B10 0006EA50 38 81 00 2A */ addi r4, r1, 0x2a /* 80071B14 0006EA54 A8 A5 04 E6 */ lha r5, 0x4e6(r5) -/* 80071B18 0006EA58 48 1F F7 11 */ bl cSAngle_NS___mi_X2_ +/* 80071B18 0006EA58 48 1F F7 11 */ bl __mi__7cSAngleCFs /* 80071B1C 0006EA5C A8 01 00 0C */ lha r0, 0xc(r1) /* 80071B20 0006EA60 B0 01 00 14 */ sth r0, 0x14(r1) /* 80071B24 0006EA64 38 61 00 2C */ addi r3, r1, 0x2c /* 80071B28 0006EA68 38 9D 03 1C */ addi r4, r29, 0x31c /* 80071B2C 0006EA6C 38 BE 05 50 */ addi r5, r30, 0x550 -/* 80071B30 0006EA70 48 1F 50 05 */ bl cXyz_NS___mi +/* 80071B30 0006EA70 48 1F 50 05 */ bl __mi__4cXyzCFRC3Vec /* 80071B34 0006EA74 38 61 00 1C */ addi r3, r1, 0x1c /* 80071B38 0006EA78 38 81 00 2C */ addi r4, r1, 0x2c -/* 80071B3C 0006EA7C 48 1F FD 45 */ bl cSGlobe_X4_ +/* 80071B3C 0006EA7C 48 1F FD 45 */ bl __ct__7cSGlobeFRC4cXyz /* 80071B40 0006EA80 38 61 00 08 */ addi r3, r1, 8 /* 80071B44 0006EA84 38 81 00 22 */ addi r4, r1, 0x22 /* 80071B48 0006EA88 A8 BE 04 E6 */ lha r5, 0x4e6(r30) -/* 80071B4C 0006EA8C 48 1F F6 DD */ bl cSAngle_NS___mi_X2_ +/* 80071B4C 0006EA8C 48 1F F6 DD */ bl __mi__7cSAngleCFs /* 80071B50 0006EA90 A8 01 00 08 */ lha r0, 8(r1) /* 80071B54 0006EA94 B0 01 00 10 */ sth r0, 0x10(r1) /* 80071B58 0006EA98 7F A3 EB 78 */ mr r3, r29 diff --git a/include/d/d_attention/asm/func_800735DC.s b/include/d/d_attention/asm/func_800735DC.s index fb8756d980..d10319b5c4 100644 --- a/include/d/d_attention/asm/func_800735DC.s +++ b/include/d/d_attention/asm/func_800735DC.s @@ -29,18 +29,18 @@ lbl_8007362C: /* 80073644 00070584 38 61 00 18 */ addi r3, r1, 0x18 /* 80073648 00070588 38 84 05 50 */ addi r4, r4, 0x550 /* 8007364C 0007058C 38 BE 03 1C */ addi r5, r30, 0x31c -/* 80073650 00070590 48 1F 34 E5 */ bl cXyz_NS___mi +/* 80073650 00070590 48 1F 34 E5 */ bl __mi__4cXyzCFRC3Vec /* 80073654 00070594 38 61 00 10 */ addi r3, r1, 0x10 /* 80073658 00070598 38 81 00 18 */ addi r4, r1, 0x18 -/* 8007365C 0007059C 48 1F E2 25 */ bl cSGlobe_X4_ +/* 8007365C 0007059C 48 1F E2 25 */ bl __ct__7cSGlobeFRC4cXyz /* 80073660 000705A0 80 BE 00 00 */ lwz r5, 0(r30) /* 80073664 000705A4 38 61 00 08 */ addi r3, r1, 8 /* 80073668 000705A8 38 81 00 16 */ addi r4, r1, 0x16 /* 8007366C 000705AC A8 A5 04 E6 */ lha r5, 0x4e6(r5) -/* 80073670 000705B0 48 1F DB B9 */ bl cSAngle_NS___mi_X2_ +/* 80073670 000705B0 48 1F DB B9 */ bl __mi__7cSAngleCFs /* 80073674 000705B4 38 61 00 0C */ addi r3, r1, 0xc /* 80073678 000705B8 38 81 00 08 */ addi r4, r1, 8 -/* 8007367C 000705BC 48 1F D8 ED */ bl cSAngle_X1_ +/* 8007367C 000705BC 48 1F D8 ED */ bl __ct__7cSAngleFRC7cSAngle /* 80073680 000705C0 1F FF 00 1C */ mulli r31, r31, 0x1c /* 80073684 000705C4 3C 60 80 3B */ lis r3, lbl_803A9C70@ha /* 80073688 000705C8 38 03 9C 70 */ addi r0, r3, lbl_803A9C70@l diff --git a/include/d/d_attention/asm/func_80073A08.s b/include/d/d_attention/asm/func_80073A08.s index e7694a54bd..0218d8ae6c 100644 --- a/include/d/d_attention/asm/func_80073A08.s +++ b/include/d/d_attention/asm/func_80073A08.s @@ -29,7 +29,7 @@ lbl_80073A74: /* 80073A74 000709B4 38 61 00 24 */ addi r3, r1, 0x24 /* 80073A78 000709B8 38 9C 05 50 */ addi r4, r28, 0x550 /* 80073A7C 000709BC 38 BA 05 50 */ addi r5, r26, 0x550 -/* 80073A80 000709C0 48 1F 30 B5 */ bl cXyz_NS___mi +/* 80073A80 000709C0 48 1F 30 B5 */ bl __mi__4cXyzCFRC3Vec /* 80073A84 000709C4 C0 41 00 24 */ lfs f2, 0x24(r1) /* 80073A88 000709C8 D0 41 00 30 */ stfs f2, 0x30(r1) /* 80073A8C 000709CC C0 01 00 28 */ lfs f0, 0x28(r1) @@ -128,11 +128,11 @@ lbl_80073BC8: /* 80073BCC 00070B0C 41 82 00 60 */ beq lbl_80073C2C /* 80073BD0 00070B10 38 61 00 10 */ addi r3, r1, 0x10 /* 80073BD4 00070B14 38 81 00 30 */ addi r4, r1, 0x30 -/* 80073BD8 00070B18 48 1F DC A9 */ bl cSGlobe_X4_ +/* 80073BD8 00070B18 48 1F DC A9 */ bl __ct__7cSGlobeFRC4cXyz /* 80073BDC 00070B1C 38 61 00 08 */ addi r3, r1, 8 /* 80073BE0 00070B20 38 81 00 16 */ addi r4, r1, 0x16 /* 80073BE4 00070B24 A8 BA 04 E6 */ lha r5, 0x4e6(r26) -/* 80073BE8 00070B28 48 1F D6 41 */ bl cSAngle_NS___mi_X2_ +/* 80073BE8 00070B28 48 1F D6 41 */ bl __mi__7cSAngleCFs /* 80073BEC 00070B2C A8 01 00 08 */ lha r0, 8(r1) /* 80073BF0 00070B30 7C 00 07 35 */ extsh. r0, r0 /* 80073BF4 00070B34 7C 03 03 78 */ mr r3, r0 diff --git a/include/d/d_attention/asm/func_80073D08.s b/include/d/d_attention/asm/func_80073D08.s index ebf3f26ed1..49c60ea90c 100644 --- a/include/d/d_attention/asm/func_80073D08.s +++ b/include/d/d_attention/asm/func_80073D08.s @@ -28,7 +28,7 @@ lbl_80073D70: /* 80073D70 00070CB0 38 61 00 30 */ addi r3, r1, 0x30 /* 80073D74 00070CB4 38 9D 05 38 */ addi r4, r29, 0x538 /* 80073D78 00070CB8 38 BB 05 38 */ addi r5, r27, 0x538 -/* 80073D7C 00070CBC 48 1F 2D B9 */ bl cXyz_NS___mi +/* 80073D7C 00070CBC 48 1F 2D B9 */ bl __mi__4cXyzCFRC3Vec /* 80073D80 00070CC0 C0 41 00 30 */ lfs f2, 0x30(r1) /* 80073D84 00070CC4 D0 41 00 3C */ stfs f2, 0x3c(r1) /* 80073D88 00070CC8 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -128,7 +128,7 @@ lbl_80073EC4: /* 80073ECC 00070E0C 38 61 00 24 */ addi r3, r1, 0x24 /* 80073ED0 00070E10 38 9D 04 D0 */ addi r4, r29, 0x4d0 /* 80073ED4 00070E14 38 BB 04 D0 */ addi r5, r27, 0x4d0 -/* 80073ED8 00070E18 48 1F 2C 5D */ bl cXyz_NS___mi +/* 80073ED8 00070E18 48 1F 2C 5D */ bl __mi__4cXyzCFRC3Vec /* 80073EDC 00070E1C C0 01 00 24 */ lfs f0, 0x24(r1) /* 80073EE0 00070E20 D0 01 00 3C */ stfs f0, 0x3c(r1) /* 80073EE4 00070E24 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -137,11 +137,11 @@ lbl_80073EC4: /* 80073EF0 00070E30 D0 01 00 44 */ stfs f0, 0x44(r1) /* 80073EF4 00070E34 38 61 00 10 */ addi r3, r1, 0x10 /* 80073EF8 00070E38 38 81 00 3C */ addi r4, r1, 0x3c -/* 80073EFC 00070E3C 48 1F D9 85 */ bl cSGlobe_X4_ +/* 80073EFC 00070E3C 48 1F D9 85 */ bl __ct__7cSGlobeFRC4cXyz /* 80073F00 00070E40 38 61 00 08 */ addi r3, r1, 8 /* 80073F04 00070E44 38 81 00 16 */ addi r4, r1, 0x16 /* 80073F08 00070E48 A8 BB 04 E6 */ lha r5, 0x4e6(r27) -/* 80073F0C 00070E4C 48 1F D3 1D */ bl cSAngle_NS___mi_X2_ +/* 80073F0C 00070E4C 48 1F D3 1D */ bl __mi__7cSAngleCFs /* 80073F10 00070E50 A8 01 00 08 */ lha r0, 8(r1) /* 80073F14 00070E54 7C 00 07 35 */ extsh. r0, r0 /* 80073F18 00070E58 7C 03 03 78 */ mr r3, r0 diff --git a/include/d/d_attention/d_attention.h b/include/d/d_attention/d_attention.h index 166f0bcb21..55ff2b944b 100644 --- a/include/d/d_attention/d_attention.h +++ b/include/d/d_attention/d_attention.h @@ -1,7 +1,7 @@ #ifndef __D_ATTENTION_H_ #define __D_ATTENTION_H_ -#include "SComponent/c_angle/c_angle.h" +#include "SComponent/c_angle.h" #include "SComponent/c_xyz/c_xyz.h" #include "global.h" #include "m_Do/m_Do_ext/m_Do_ext.h" diff --git a/include/d/d_camera/asm/func_8015FBF8.s b/include/d/d_camera/asm/func_8015FBF8.s index d77491bfd4..a8ed520296 100644 --- a/include/d/d_camera/asm/func_8015FBF8.s +++ b/include/d/d_camera/asm/func_8015FBF8.s @@ -41,7 +41,7 @@ lbl_8015FC60: /* 8015FC90 0015CBD0 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8015FC94 0015CBD4 38 81 00 DC */ addi r4, r1, 0xdc /* 8015FC98 0015CBD8 38 A1 00 E8 */ addi r5, r1, 0xe8 -/* 8015FC9C 0015CBDC 48 10 6E 99 */ bl cXyz_NS___mi +/* 8015FC9C 0015CBDC 48 10 6E 99 */ bl __mi__4cXyzCFRC3Vec /* 8015FCA0 0015CBE0 C0 01 00 A0 */ lfs f0, 0xa0(r1) /* 8015FCA4 0015CBE4 D0 01 00 D0 */ stfs f0, 0xd0(r1) /* 8015FCA8 0015CBE8 C0 01 00 A4 */ lfs f0, 0xa4(r1) @@ -50,10 +50,10 @@ lbl_8015FC60: /* 8015FCB4 0015CBF4 D0 01 00 D8 */ stfs f0, 0xd8(r1) /* 8015FCB8 0015CBF8 38 61 00 20 */ addi r3, r1, 0x20 /* 8015FCBC 0015CBFC 38 81 00 D0 */ addi r4, r1, 0xd0 -/* 8015FCC0 0015CC00 48 11 1B C1 */ bl cSGlobe_X4_ +/* 8015FCC0 0015CC00 48 11 1B C1 */ bl __ct__7cSGlobeFRC4cXyz /* 8015FCC4 0015CC04 38 61 00 94 */ addi r3, r1, 0x94 /* 8015FCC8 0015CC08 38 81 00 D0 */ addi r4, r1, 0xd0 -/* 8015FCCC 0015CC0C 48 10 72 29 */ bl cXyz_NS_normalize +/* 8015FCCC 0015CC0C 48 10 72 29 */ bl normalize__4cXyzFv /* 8015FCD0 0015CC10 38 61 00 88 */ addi r3, r1, 0x88 /* 8015FCD4 0015CC14 38 81 00 D0 */ addi r4, r1, 0xd0 /* 8015FCD8 0015CC18 A8 1B 05 4E */ lha r0, 0x54e(r27) @@ -64,7 +64,7 @@ lbl_8015FC60: /* 8015FCEC 0015CC2C 90 01 00 F8 */ stw r0, 0xf8(r1) /* 8015FCF0 0015CC30 C8 01 00 F8 */ lfd f0, 0xf8(r1) /* 8015FCF4 0015CC34 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8015FCF8 0015CC38 48 10 6E 8D */ bl cXyz_NS___ml +/* 8015FCF8 0015CC38 48 10 6E 8D */ bl __ml__4cXyzCFf /* 8015FCFC 0015CC3C 38 61 00 E8 */ addi r3, r1, 0xe8 /* 8015FD00 0015CC40 38 81 00 88 */ addi r4, r1, 0x88 /* 8015FD04 0015CC44 7C 65 1B 78 */ mr r5, r3 @@ -79,7 +79,7 @@ lbl_8015FC60: /* 8015FD28 0015CC68 90 01 01 00 */ stw r0, 0x100(r1) /* 8015FD2C 0015CC6C C8 01 01 00 */ lfd f0, 0x100(r1) /* 8015FD30 0015CC70 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8015FD34 0015CC74 48 10 6E 51 */ bl cXyz_NS___ml +/* 8015FD34 0015CC74 48 10 6E 51 */ bl __ml__4cXyzCFf /* 8015FD38 0015CC78 38 61 00 DC */ addi r3, r1, 0xdc /* 8015FD3C 0015CC7C 38 81 00 7C */ addi r4, r1, 0x7c /* 8015FD40 0015CC80 7C 65 1B 78 */ mr r5, r3 @@ -87,15 +87,15 @@ lbl_8015FC60: /* 8015FD48 0015CC88 38 61 00 70 */ addi r3, r1, 0x70 /* 8015FD4C 0015CC8C 38 81 00 DC */ addi r4, r1, 0xdc /* 8015FD50 0015CC90 38 A1 00 E8 */ addi r5, r1, 0xe8 -/* 8015FD54 0015CC94 48 10 6D E1 */ bl cXyz_NS___mi +/* 8015FD54 0015CC94 48 10 6D E1 */ bl __mi__4cXyzCFRC3Vec /* 8015FD58 0015CC98 38 61 00 64 */ addi r3, r1, 0x64 /* 8015FD5C 0015CC9C 38 81 00 70 */ addi r4, r1, 0x70 /* 8015FD60 0015CCA0 C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) -/* 8015FD64 0015CCA4 48 10 6E 21 */ bl cXyz_NS___ml +/* 8015FD64 0015CCA4 48 10 6E 21 */ bl __ml__4cXyzCFf /* 8015FD68 0015CCA8 38 61 00 58 */ addi r3, r1, 0x58 /* 8015FD6C 0015CCAC 38 81 00 E8 */ addi r4, r1, 0xe8 /* 8015FD70 0015CCB0 38 A1 00 64 */ addi r5, r1, 0x64 -/* 8015FD74 0015CCB4 48 10 6D 71 */ bl cXyz_NS___pl +/* 8015FD74 0015CCB4 48 10 6D 71 */ bl __pl__4cXyzCFRC3Vec /* 8015FD78 0015CCB8 C0 01 00 58 */ lfs f0, 0x58(r1) /* 8015FD7C 0015CCBC D0 01 00 C4 */ stfs f0, 0xc4(r1) /* 8015FD80 0015CCC0 C0 01 00 5C */ lfs f0, 0x5c(r1) @@ -112,10 +112,10 @@ lbl_8015FC60: /* 8015FDAC 0015CCEC 7F C4 F3 78 */ mr r4, r30 /* 8015FDB0 0015CCF0 3B C1 00 26 */ addi r30, r1, 0x26 /* 8015FDB4 0015CCF4 7F C5 F3 78 */ mr r5, r30 -/* 8015FDB8 0015CCF8 48 11 13 ED */ bl cSAngle_NS___mi_X1_ +/* 8015FDB8 0015CCF8 48 11 13 ED */ bl __mi__7cSAngleCFRC7cSAngle /* 8015FDBC 0015CCFC 38 61 00 14 */ addi r3, r1, 0x14 /* 8015FDC0 0015CD00 38 81 00 10 */ addi r4, r1, 0x10 -/* 8015FDC4 0015CD04 48 11 11 A5 */ bl cSAngle_X1_ +/* 8015FDC4 0015CD04 48 11 11 A5 */ bl __ct__7cSAngleFRC7cSAngle /* 8015FDC8 0015CD08 A8 61 00 14 */ lha r3, 0x14(r1) /* 8015FDCC 0015CD0C A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) /* 8015FDD0 0015CD10 7C 03 00 00 */ cmpw r3, r0 @@ -126,19 +126,19 @@ lbl_8015FC60: lbl_8015FDE4: /* 8015FDE4 0015CD24 38 61 00 18 */ addi r3, r1, 0x18 /* 8015FDE8 0015CD28 38 81 00 B8 */ addi r4, r1, 0xb8 -/* 8015FDEC 0015CD2C 48 11 1A 95 */ bl cSGlobe_X4_ +/* 8015FDEC 0015CD2C 48 11 1A 95 */ bl __ct__7cSGlobeFRC4cXyz /* 8015FDF0 0015CD30 38 61 00 0C */ addi r3, r1, 0xc /* 8015FDF4 0015CD34 7F C4 F3 78 */ mr r4, r30 /* 8015FDF8 0015CD38 38 A1 00 1E */ addi r5, r1, 0x1e -/* 8015FDFC 0015CD3C 48 11 13 79 */ bl cSAngle_NS___pl +/* 8015FDFC 0015CD3C 48 11 13 79 */ bl __pl__7cSAngleCFRC7cSAngle /* 8015FE00 0015CD40 38 61 00 08 */ addi r3, r1, 8 /* 8015FE04 0015CD44 A8 81 00 0C */ lha r4, 0xc(r1) -/* 8015FE08 0015CD48 48 11 11 91 */ bl cSAngle_X2_ +/* 8015FE08 0015CD48 48 11 11 91 */ bl __ct__7cSAngleFs /* 8015FE0C 0015CD4C A8 01 00 08 */ lha r0, 8(r1) /* 8015FE10 0015CD50 B0 01 00 1E */ sth r0, 0x1e(r1) /* 8015FE14 0015CD54 C3 C1 00 20 */ lfs f30, 0x20(r1) /* 8015FE18 0015CD58 38 61 00 14 */ addi r3, r1, 0x14 -/* 8015FE1C 0015CD5C 48 11 13 05 */ bl cSAngle_NS_Cos +/* 8015FE1C 0015CD5C 48 11 13 05 */ bl Cos__7cSAngleCFv /* 8015FE20 0015CD60 C0 02 9C 90 */ lfs f0, lbl_80453690-_SDA2_BASE_(r2) /* 8015FE24 0015CD64 EC 00 07 B2 */ fmuls f0, f0, f30 /* 8015FE28 0015CD68 EC 00 00 72 */ fmuls f0, f0, f1 @@ -146,18 +146,18 @@ lbl_8015FDE4: /* 8015FE30 0015CD70 D0 01 00 20 */ stfs f0, 0x20(r1) /* 8015FE34 0015CD74 38 61 00 4C */ addi r3, r1, 0x4c /* 8015FE38 0015CD78 38 81 00 20 */ addi r4, r1, 0x20 -/* 8015FE3C 0015CD7C 48 11 1C 79 */ bl cSGlobe_NS_Xyz +/* 8015FE3C 0015CD7C 48 11 1C 79 */ bl Xyz__7cSGlobeCFv /* 8015FE40 0015CD80 38 61 00 40 */ addi r3, r1, 0x40 /* 8015FE44 0015CD84 38 81 00 C4 */ addi r4, r1, 0xc4 /* 8015FE48 0015CD88 38 A1 00 4C */ addi r5, r1, 0x4c -/* 8015FE4C 0015CD8C 48 10 6C 99 */ bl cXyz_NS___pl +/* 8015FE4C 0015CD8C 48 10 6C 99 */ bl __pl__4cXyzCFRC3Vec /* 8015FE50 0015CD90 38 61 00 34 */ addi r3, r1, 0x34 /* 8015FE54 0015CD94 38 81 00 18 */ addi r4, r1, 0x18 -/* 8015FE58 0015CD98 48 11 1C 5D */ bl cSGlobe_NS_Xyz +/* 8015FE58 0015CD98 48 11 1C 5D */ bl Xyz__7cSGlobeCFv /* 8015FE5C 0015CD9C 38 61 00 28 */ addi r3, r1, 0x28 /* 8015FE60 0015CDA0 38 81 00 40 */ addi r4, r1, 0x40 /* 8015FE64 0015CDA4 38 A1 00 34 */ addi r5, r1, 0x34 -/* 8015FE68 0015CDA8 48 10 6C 7D */ bl cXyz_NS___pl +/* 8015FE68 0015CDA8 48 10 6C 7D */ bl __pl__4cXyzCFRC3Vec /* 8015FE6C 0015CDAC C0 41 00 28 */ lfs f2, 0x28(r1) /* 8015FE70 0015CDB0 D0 41 00 AC */ stfs f2, 0xac(r1) /* 8015FE74 0015CDB4 C0 21 00 2C */ lfs f1, 0x2c(r1) diff --git a/include/d/d_camera/asm/func_80160470.s b/include/d/d_camera/asm/func_80160470.s index f7ac763f64..3e996c9049 100644 --- a/include/d/d_camera/asm/func_80160470.s +++ b/include/d/d_camera/asm/func_80160470.s @@ -728,10 +728,10 @@ lbl_80160F1C: /* 80160F84 0015DEC4 38 61 00 BC */ addi r3, r1, 0xbc /* 80160F88 0015DEC8 38 9C 00 3C */ addi r4, r28, 0x3c /* 80160F8C 0015DECC 38 BC 00 30 */ addi r5, r28, 0x30 -/* 80160F90 0015DED0 48 10 5B A5 */ bl cXyz_NS___mi +/* 80160F90 0015DED0 48 10 5B A5 */ bl __mi__4cXyzCFRC3Vec /* 80160F94 0015DED4 38 7C 00 5C */ addi r3, r28, 0x5c /* 80160F98 0015DED8 38 81 00 BC */ addi r4, r1, 0xbc -/* 80160F9C 0015DEDC 48 11 0A D5 */ bl cSGlobe_NS_Val_X3_ +/* 80160F9C 0015DEDC 48 11 0A D5 */ bl Val__7cSGlobeFRC4cXyz /* 80160FA0 0015DEE0 C0 1C 00 5C */ lfs f0, 0x5c(r28) /* 80160FA4 0015DEE4 D0 1C 00 28 */ stfs f0, 0x28(r28) /* 80160FA8 0015DEE8 A8 1C 00 60 */ lha r0, 0x60(r28) @@ -739,10 +739,10 @@ lbl_80160F1C: /* 80160FB0 0015DEF0 A8 1C 00 62 */ lha r0, 0x62(r28) /* 80160FB4 0015DEF4 B0 1C 00 2E */ sth r0, 0x2e(r28) /* 80160FB8 0015DEF8 38 7C 00 62 */ addi r3, r28, 0x62 -/* 80160FBC 0015DEFC 48 11 01 2D */ bl cSAngle_NS_Inv +/* 80160FBC 0015DEFC 48 11 01 2D */ bl Inv__7cSAngleCFv /* 80160FC0 0015DF00 7C 64 1B 78 */ mr r4, r3 /* 80160FC4 0015DF04 38 61 00 24 */ addi r3, r1, 0x24 -/* 80160FC8 0015DF08 48 10 FF D1 */ bl cSAngle_X2_ +/* 80160FC8 0015DF08 48 10 FF D1 */ bl __ct__7cSAngleFs /* 80160FCC 0015DF0C A8 01 00 24 */ lha r0, 0x24(r1) /* 80160FD0 0015DF10 B0 1C 00 8C */ sth r0, 0x8c(r28) /* 80160FD4 0015DF14 C0 1D 0F 04 */ lfs f0, 0xf04(r29) @@ -785,7 +785,7 @@ lbl_8016100C: lbl_80161064: /* 80161064 0015DFA4 38 61 00 20 */ addi r3, r1, 0x20 /* 80161068 0015DFA8 38 80 00 00 */ li r4, 0 -/* 8016106C 0015DFAC 48 10 FF 2D */ bl cSAngle_X2_ +/* 8016106C 0015DFAC 48 10 FF 2D */ bl __ct__7cSAngleFs /* 80161070 0015DFB0 38 61 00 1C */ addi r3, r1, 0x1c /* 80161074 0015DFB4 7F 84 E3 78 */ mr r4, r28 /* 80161078 0015DFB8 80 BC 01 80 */ lwz r5, 0x180(r28) @@ -794,14 +794,14 @@ lbl_80161064: /* 80161084 0015DFC4 C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 80161088 0015DFC8 38 81 00 20 */ addi r4, r1, 0x20 /* 8016108C 0015DFCC 38 A1 00 1C */ addi r5, r1, 0x1c -/* 80161090 0015DFD0 48 11 07 C1 */ bl cSGlobe_X3_ +/* 80161090 0015DFD0 48 11 07 C1 */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80161094 0015DFD4 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80161098 0015DFD8 38 81 00 30 */ addi r4, r1, 0x30 -/* 8016109C 0015DFDC 48 11 0A 19 */ bl cSGlobe_NS_Xyz +/* 8016109C 0015DFDC 48 11 0A 19 */ bl Xyz__7cSGlobeCFv /* 801610A0 0015DFE0 38 61 00 98 */ addi r3, r1, 0x98 /* 801610A4 0015DFE4 38 81 00 EC */ addi r4, r1, 0xec /* 801610A8 0015DFE8 38 A1 00 A4 */ addi r5, r1, 0xa4 -/* 801610AC 0015DFEC 48 10 5A 39 */ bl cXyz_NS___pl +/* 801610AC 0015DFEC 48 10 5A 39 */ bl __pl__4cXyzCFRC3Vec /* 801610B0 0015DFF0 C0 01 00 98 */ lfs f0, 0x98(r1) /* 801610B4 0015DFF4 D0 1C 00 64 */ stfs f0, 0x64(r28) /* 801610B8 0015DFF8 C0 01 00 9C */ lfs f0, 0x9c(r1) @@ -831,24 +831,24 @@ lbl_80161064: /* 80161118 0015E058 38 61 00 8C */ addi r3, r1, 0x8c /* 8016111C 0015E05C 38 81 00 D4 */ addi r4, r1, 0xd4 /* 80161120 0015E060 38 A1 00 E0 */ addi r5, r1, 0xe0 -/* 80161124 0015E064 48 10 5A 11 */ bl cXyz_NS___mi +/* 80161124 0015E064 48 10 5A 11 */ bl __mi__4cXyzCFRC3Vec /* 80161128 0015E068 38 7C 00 5C */ addi r3, r28, 0x5c /* 8016112C 0015E06C 38 81 00 8C */ addi r4, r1, 0x8c -/* 80161130 0015E070 48 11 09 41 */ bl cSGlobe_NS_Val_X3_ +/* 80161130 0015E070 48 11 09 41 */ bl Val__7cSGlobeFRC4cXyz /* 80161134 0015E074 38 7C 00 62 */ addi r3, r28, 0x62 -/* 80161138 0015E078 48 10 FF B1 */ bl cSAngle_NS_Inv +/* 80161138 0015E078 48 10 FF B1 */ bl Inv__7cSAngleCFv /* 8016113C 0015E07C 7C 64 1B 78 */ mr r4, r3 /* 80161140 0015E080 38 61 00 18 */ addi r3, r1, 0x18 -/* 80161144 0015E084 48 10 FE 55 */ bl cSAngle_X2_ +/* 80161144 0015E084 48 10 FE 55 */ bl __ct__7cSAngleFs /* 80161148 0015E088 A8 01 00 18 */ lha r0, 0x18(r1) /* 8016114C 0015E08C B0 1C 00 8C */ sth r0, 0x8c(r28) /* 80161150 0015E090 38 61 00 80 */ addi r3, r1, 0x80 /* 80161154 0015E094 38 9C 00 5C */ addi r4, r28, 0x5c -/* 80161158 0015E098 48 11 09 5D */ bl cSGlobe_NS_Xyz +/* 80161158 0015E098 48 11 09 5D */ bl Xyz__7cSGlobeCFv /* 8016115C 0015E09C 38 61 00 74 */ addi r3, r1, 0x74 /* 80161160 0015E0A0 38 9C 00 64 */ addi r4, r28, 0x64 /* 80161164 0015E0A4 38 A1 00 80 */ addi r5, r1, 0x80 -/* 80161168 0015E0A8 48 10 59 7D */ bl cXyz_NS___pl +/* 80161168 0015E0A8 48 10 59 7D */ bl __pl__4cXyzCFRC3Vec /* 8016116C 0015E0AC C0 01 00 74 */ lfs f0, 0x74(r1) /* 80161170 0015E0B0 D0 1C 00 70 */ stfs f0, 0x70(r28) /* 80161174 0015E0B4 C0 01 00 78 */ lfs f0, 0x78(r1) @@ -896,7 +896,7 @@ lbl_801611D4: lbl_80161218: /* 80161218 0015E158 38 61 00 14 */ addi r3, r1, 0x14 /* 8016121C 0015E15C 38 80 00 00 */ li r4, 0 -/* 80161220 0015E160 48 10 FD 79 */ bl cSAngle_X2_ +/* 80161220 0015E160 48 10 FD 79 */ bl __ct__7cSAngleFs /* 80161224 0015E164 38 61 00 10 */ addi r3, r1, 0x10 /* 80161228 0015E168 7F 84 E3 78 */ mr r4, r28 /* 8016122C 0015E16C 80 BC 01 80 */ lwz r5, 0x180(r28) @@ -905,14 +905,14 @@ lbl_80161218: /* 80161238 0015E178 C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 8016123C 0015E17C 38 81 00 14 */ addi r4, r1, 0x14 /* 80161240 0015E180 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80161244 0015E184 48 11 06 0D */ bl cSGlobe_X3_ +/* 80161244 0015E184 48 11 06 0D */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80161248 0015E188 38 61 00 5C */ addi r3, r1, 0x5c /* 8016124C 0015E18C 38 81 00 28 */ addi r4, r1, 0x28 -/* 80161250 0015E190 48 11 08 65 */ bl cSGlobe_NS_Xyz +/* 80161250 0015E190 48 11 08 65 */ bl Xyz__7cSGlobeCFv /* 80161254 0015E194 38 61 00 50 */ addi r3, r1, 0x50 /* 80161258 0015E198 38 81 00 C8 */ addi r4, r1, 0xc8 /* 8016125C 0015E19C 38 A1 00 5C */ addi r5, r1, 0x5c -/* 80161260 0015E1A0 48 10 58 85 */ bl cXyz_NS___pl +/* 80161260 0015E1A0 48 10 58 85 */ bl __pl__4cXyzCFRC3Vec /* 80161264 0015E1A4 C0 01 00 50 */ lfs f0, 0x50(r1) /* 80161268 0015E1A8 D0 1C 00 64 */ stfs f0, 0x64(r28) /* 8016126C 0015E1AC C0 01 00 54 */ lfs f0, 0x54(r1) @@ -930,19 +930,19 @@ lbl_80161218: /* 8016129C 0015E1DC 80 BC 01 80 */ lwz r5, 0x180(r28) /* 801612A0 0015E1E0 4B F3 64 99 */ bl dCamera_c_NS_directionOf /* 801612A4 0015E1E4 38 61 00 0C */ addi r3, r1, 0xc -/* 801612A8 0015E1E8 48 10 FE 41 */ bl cSAngle_NS_Inv +/* 801612A8 0015E1E8 48 10 FE 41 */ bl Inv__7cSAngleCFv /* 801612AC 0015E1EC 7C 65 1B 78 */ mr r5, r3 /* 801612B0 0015E1F0 38 7C 00 5C */ addi r3, r28, 0x5c /* 801612B4 0015E1F4 C0 22 9C B4 */ lfs f1, lbl_804536B4-_SDA2_BASE_(r2) /* 801612B8 0015E1F8 38 80 00 00 */ li r4, 0 -/* 801612BC 0015E1FC 48 11 06 E9 */ bl cSGlobe_NS_Val_X1_ +/* 801612BC 0015E1FC 48 11 06 E9 */ bl Val__7cSGlobeFfss /* 801612C0 0015E200 38 61 00 44 */ addi r3, r1, 0x44 /* 801612C4 0015E204 38 9C 00 5C */ addi r4, r28, 0x5c -/* 801612C8 0015E208 48 11 07 ED */ bl cSGlobe_NS_Xyz +/* 801612C8 0015E208 48 11 07 ED */ bl Xyz__7cSGlobeCFv /* 801612CC 0015E20C 38 61 00 38 */ addi r3, r1, 0x38 /* 801612D0 0015E210 38 9C 00 64 */ addi r4, r28, 0x64 /* 801612D4 0015E214 38 A1 00 44 */ addi r5, r1, 0x44 -/* 801612D8 0015E218 48 10 58 0D */ bl cXyz_NS___pl +/* 801612D8 0015E218 48 10 58 0D */ bl __pl__4cXyzCFRC3Vec /* 801612DC 0015E21C C0 01 00 38 */ lfs f0, 0x38(r1) /* 801612E0 0015E220 D0 1C 00 70 */ stfs f0, 0x70(r28) /* 801612E4 0015E224 C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -962,10 +962,10 @@ lbl_80161218: /* 8016131C 0015E25C A8 1C 00 62 */ lha r0, 0x62(r28) /* 80161320 0015E260 B0 1C 00 2E */ sth r0, 0x2e(r28) /* 80161324 0015E264 38 7C 00 62 */ addi r3, r28, 0x62 -/* 80161328 0015E268 48 10 FD C1 */ bl cSAngle_NS_Inv +/* 80161328 0015E268 48 10 FD C1 */ bl Inv__7cSAngleCFv /* 8016132C 0015E26C 7C 64 1B 78 */ mr r4, r3 /* 80161330 0015E270 38 61 00 08 */ addi r3, r1, 8 -/* 80161334 0015E274 48 10 FC 65 */ bl cSAngle_X2_ +/* 80161334 0015E274 48 10 FC 65 */ bl __ct__7cSAngleFs /* 80161338 0015E278 A8 01 00 08 */ lha r0, 8(r1) /* 8016133C 0015E27C B0 1C 00 8C */ sth r0, 0x8c(r28) /* 80161340 0015E280 C0 02 9C B8 */ lfs f0, lbl_804536B8-_SDA2_BASE_(r2) diff --git a/include/d/d_camera/asm/func_801617B0.s b/include/d/d_camera/asm/func_801617B0.s index 06e4a28657..47a9b62281 100644 --- a/include/d/d_camera/asm/func_801617B0.s +++ b/include/d/d_camera/asm/func_801617B0.s @@ -45,7 +45,7 @@ lbl_80161818: /* 80161858 0015E798 7C 60 22 14 */ add r3, r0, r4 /* 8016185C 0015E79C A8 83 00 0C */ lha r4, 0xc(r3) /* 80161860 0015E7A0 38 7E 01 D4 */ addi r3, r30, 0x1d4 -/* 80161864 0015E7A4 48 10 F7 A1 */ bl cSAngle_NS_Val_X2_ +/* 80161864 0015E7A4 48 10 F7 A1 */ bl Val__7cSAngleFs /* 80161868 0015E7A8 80 1E 06 0C */ lwz r0, 0x60c(r30) /* 8016186C 0015E7AC 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 80161870 0015E7B0 41 82 00 14 */ beq lbl_80161884 @@ -82,7 +82,7 @@ lbl_801618A4: /* 801618E4 0015E824 7C 60 22 14 */ add r3, r0, r4 /* 801618E8 0015E828 A8 83 00 1C */ lha r4, 0x1c(r3) /* 801618EC 0015E82C 38 7E 01 F0 */ addi r3, r30, 0x1f0 -/* 801618F0 0015E830 48 10 F7 15 */ bl cSAngle_NS_Val_X2_ +/* 801618F0 0015E830 48 10 F7 15 */ bl Val__7cSAngleFs /* 801618F4 0015E834 80 1E 01 7C */ lwz r0, 0x17c(r30) /* 801618F8 0015E838 54 00 30 32 */ slwi r0, r0, 6 /* 801618FC 0015E83C 3C 60 80 3E */ lis r3, m_cpadInfo@ha diff --git a/include/d/d_camera/asm/func_80161E34.s b/include/d/d_camera/asm/func_80161E34.s index 777cfa8878..cd1f3f8ac9 100644 --- a/include/d/d_camera/asm/func_80161E34.s +++ b/include/d/d_camera/asm/func_80161E34.s @@ -18,7 +18,7 @@ /* 80161E78 0015EDB8 38 61 00 24 */ addi r3, r1, 0x24 /* 80161E7C 0015EDBC 38 81 00 3C */ addi r4, r1, 0x3c /* 80161E80 0015EDC0 38 BF 02 A0 */ addi r5, r31, 0x2a0 -/* 80161E84 0015EDC4 48 10 4C B1 */ bl cXyz_NS___mi +/* 80161E84 0015EDC4 48 10 4C B1 */ bl __mi__4cXyzCFRC3Vec /* 80161E88 0015EDC8 C0 01 00 24 */ lfs f0, 0x24(r1) /* 80161E8C 0015EDCC D0 1F 02 B4 */ stfs f0, 0x2b4(r31) /* 80161E90 0015EDD0 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -44,7 +44,7 @@ lbl_80161ED0: /* 80161EDC 0015EE1C 38 61 00 18 */ addi r3, r1, 0x18 /* 80161EE0 0015EE20 38 81 00 3C */ addi r4, r1, 0x3c /* 80161EE4 0015EE24 38 BF 02 A0 */ addi r5, r31, 0x2a0 -/* 80161EE8 0015EE28 48 10 4C 4D */ bl cXyz_NS___mi +/* 80161EE8 0015EE28 48 10 4C 4D */ bl __mi__4cXyzCFRC3Vec /* 80161EEC 0015EE2C C0 01 00 18 */ lfs f0, 0x18(r1) /* 80161EF0 0015EE30 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80161EF4 0015EE34 C0 01 00 1C */ lfs f0, 0x1c(r1) diff --git a/include/d/d_camera/asm/func_80162088.s b/include/d/d_camera/asm/func_80162088.s index f6358a2d30..53f99fbfb1 100644 --- a/include/d/d_camera/asm/func_80162088.s +++ b/include/d/d_camera/asm/func_80162088.s @@ -56,7 +56,7 @@ lbl_801620F8: /* 80162160 0015F0A0 38 61 00 18 */ addi r3, r1, 0x18 /* 80162164 0015F0A4 38 81 00 30 */ addi r4, r1, 0x30 /* 80162168 0015F0A8 38 A1 00 24 */ addi r5, r1, 0x24 -/* 8016216C 0015F0AC 48 10 49 C9 */ bl cXyz_NS___mi +/* 8016216C 0015F0AC 48 10 49 C9 */ bl __mi__4cXyzCFRC3Vec /* 80162170 0015F0B0 C0 01 00 18 */ lfs f0, 0x18(r1) /* 80162174 0015F0B4 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80162178 0015F0B8 C0 01 00 1C */ lfs f0, 0x1c(r1) diff --git a/include/d/d_camera/asm/func_801622B4.s b/include/d/d_camera/asm/func_801622B4.s index d0e181a865..8ea543d525 100644 --- a/include/d/d_camera/asm/func_801622B4.s +++ b/include/d/d_camera/asm/func_801622B4.s @@ -321,14 +321,14 @@ lbl_80162744: /* 80162758 0015F698 38 61 00 38 */ addi r3, r1, 0x38 /* 8016275C 0015F69C 38 81 00 3C */ addi r4, r1, 0x3c /* 80162760 0015F6A0 38 BF 01 B0 */ addi r5, r31, 0x1b0 -/* 80162764 0015F6A4 48 10 EA 41 */ bl cSAngle_NS___mi_X1_ +/* 80162764 0015F6A4 48 10 EA 41 */ bl __mi__7cSAngleCFRC7cSAngle /* 80162768 0015F6A8 38 61 00 34 */ addi r3, r1, 0x34 /* 8016276C 0015F6AC 38 81 00 38 */ addi r4, r1, 0x38 /* 80162770 0015F6B0 C0 3F 0A AC */ lfs f1, 0xaac(r31) -/* 80162774 0015F6B4 48 10 EA F1 */ bl cSAngle_NS___ml +/* 80162774 0015F6B4 48 10 EA F1 */ bl __ml__7cSAngleCFf /* 80162778 0015F6B8 38 7F 01 B0 */ addi r3, r31, 0x1b0 /* 8016277C 0015F6BC 38 81 00 34 */ addi r4, r1, 0x34 -/* 80162780 0015F6C0 48 10 EA 55 */ bl cSAngle_NS___apl +/* 80162780 0015F6C0 48 10 EA 55 */ bl __apl__7cSAngleFRC7cSAngle /* 80162784 0015F6C4 48 00 00 0C */ b lbl_80162790 lbl_80162788: /* 80162788 0015F6C8 A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) @@ -407,10 +407,10 @@ lbl_80162884: /* 80162898 0015F7D8 38 61 00 30 */ addi r3, r1, 0x30 /* 8016289C 0015F7DC 38 9F 00 7C */ addi r4, r31, 0x7c /* 801628A0 0015F7E0 C0 22 9C E8 */ lfs f1, lbl_804536E8-_SDA2_BASE_(r2) -/* 801628A4 0015F7E4 48 10 E9 C1 */ bl cSAngle_NS___ml +/* 801628A4 0015F7E4 48 10 E9 C1 */ bl __ml__7cSAngleCFf /* 801628A8 0015F7E8 38 7F 00 7C */ addi r3, r31, 0x7c /* 801628AC 0015F7EC 38 81 00 30 */ addi r4, r1, 0x30 -/* 801628B0 0015F7F0 48 10 E9 39 */ bl cSAngle_NS___ami +/* 801628B0 0015F7F0 48 10 E9 39 */ bl __ami__7cSAngleFRC7cSAngle lbl_801628B4: /* 801628B4 0015F7F4 7F E3 FB 78 */ mr r3, r31 /* 801628B8 0015F7F8 48 01 E4 6D */ bl dCamera_c_NS_shakeCamera @@ -490,17 +490,17 @@ lbl_801629A8: /* 801629C4 0015F904 38 61 00 2C */ addi r3, r1, 0x2c /* 801629C8 0015F908 38 9F 01 D4 */ addi r4, r31, 0x1d4 /* 801629CC 0015F90C 38 BF 02 9C */ addi r5, r31, 0x29c -/* 801629D0 0015F910 48 10 E7 D5 */ bl cSAngle_NS___mi_X1_ +/* 801629D0 0015F910 48 10 E7 D5 */ bl __mi__7cSAngleCFRC7cSAngle /* 801629D4 0015F914 38 61 00 40 */ addi r3, r1, 0x40 /* 801629D8 0015F918 38 81 00 2C */ addi r4, r1, 0x2c -/* 801629DC 0015F91C 48 10 E5 8D */ bl cSAngle_X1_ +/* 801629DC 0015F91C 48 10 E5 8D */ bl __ct__7cSAngleFRC7cSAngle /* 801629E0 0015F920 C0 3F 01 C4 */ lfs f1, 0x1c4(r31) /* 801629E4 0015F924 C0 1F 0A 14 */ lfs f0, 0xa14(r31) /* 801629E8 0015F928 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801629EC 0015F92C 41 80 00 60 */ blt lbl_80162A4C /* 801629F0 0015F930 38 61 00 28 */ addi r3, r1, 0x28 /* 801629F4 0015F934 C0 3F 0A 18 */ lfs f1, 0xa18(r31) -/* 801629F8 0015F938 48 10 E5 D1 */ bl cSAngle_X3_ +/* 801629F8 0015F938 48 10 E5 D1 */ bl __ct__7cSAngleFf /* 801629FC 0015F93C A8 81 00 40 */ lha r4, 0x40(r1) /* 80162A00 0015F940 A8 01 00 28 */ lha r0, 0x28(r1) /* 80162A04 0015F944 7C 80 02 78 */ xor r0, r4, r0 @@ -512,7 +512,7 @@ lbl_801629A8: /* 80162A1C 0015F95C 38 61 00 24 */ addi r3, r1, 0x24 /* 80162A20 0015F960 C0 1F 0A 18 */ lfs f0, 0xa18(r31) /* 80162A24 0015F964 FC 20 00 50 */ fneg f1, f0 -/* 80162A28 0015F968 48 10 E5 A1 */ bl cSAngle_X3_ +/* 80162A28 0015F968 48 10 E5 A1 */ bl __ct__7cSAngleFf /* 80162A2C 0015F96C A8 01 00 40 */ lha r0, 0x40(r1) /* 80162A30 0015F970 A8 81 00 24 */ lha r4, 0x24(r1) /* 80162A34 0015F974 7C 80 02 78 */ xor r0, r4, r0 @@ -530,7 +530,7 @@ lbl_80162A54: /* 80162A5C 0015F99C 41 82 00 2C */ beq lbl_80162A88 /* 80162A60 0015F9A0 38 61 00 20 */ addi r3, r1, 0x20 /* 80162A64 0015F9A4 38 9F 01 D4 */ addi r4, r31, 0x1d4 -/* 80162A68 0015F9A8 48 10 E5 01 */ bl cSAngle_X1_ +/* 80162A68 0015F9A8 48 10 E5 01 */ bl __ct__7cSAngleFRC7cSAngle /* 80162A6C 0015F9AC 38 61 00 1C */ addi r3, r1, 0x1c /* 80162A70 0015F9B0 7F E4 FB 78 */ mr r4, r31 /* 80162A74 0015F9B4 38 A1 00 20 */ addi r5, r1, 0x20 @@ -540,10 +540,10 @@ lbl_80162A54: /* 80162A84 0015F9C4 48 00 00 20 */ b lbl_80162AA4 lbl_80162A88: /* 80162A88 0015F9C8 38 7F 00 2E */ addi r3, r31, 0x2e -/* 80162A8C 0015F9CC 48 10 E6 5D */ bl cSAngle_NS_Inv +/* 80162A8C 0015F9CC 48 10 E6 5D */ bl Inv__7cSAngleCFv /* 80162A90 0015F9D0 7C 64 1B 78 */ mr r4, r3 /* 80162A94 0015F9D4 38 61 00 18 */ addi r3, r1, 0x18 -/* 80162A98 0015F9D8 48 10 E5 01 */ bl cSAngle_X2_ +/* 80162A98 0015F9D8 48 10 E5 01 */ bl __ct__7cSAngleFs /* 80162A9C 0015F9DC A8 01 00 18 */ lha r0, 0x18(r1) /* 80162AA0 0015F9E0 B0 1F 00 8C */ sth r0, 0x8c(r31) lbl_80162AA4: @@ -558,7 +558,7 @@ lbl_80162AB8: /* 80162AC0 0015FA00 41 82 00 2C */ beq lbl_80162AEC /* 80162AC4 0015FA04 38 61 00 58 */ addi r3, r1, 0x58 /* 80162AC8 0015FA08 38 9F 07 58 */ addi r4, r31, 0x758 -/* 80162ACC 0015FA0C 48 10 42 19 */ bl cXyz_NS_norm +/* 80162ACC 0015FA0C 48 10 42 19 */ bl norm__4cXyzCFv /* 80162AD0 0015FA10 C0 01 00 58 */ lfs f0, 0x58(r1) /* 80162AD4 0015FA14 D0 1F 00 48 */ stfs f0, 0x48(r31) /* 80162AD8 0015FA18 C0 01 00 5C */ lfs f0, 0x5c(r1) @@ -577,25 +577,25 @@ lbl_80162AEC: /* 80162B08 0015FA48 38 61 00 14 */ addi r3, r1, 0x14 /* 80162B0C 0015FA4C 7C 00 00 D0 */ neg r0, r0 /* 80162B10 0015FA50 7C 04 07 34 */ extsh r4, r0 -/* 80162B14 0015FA54 48 10 E4 85 */ bl cSAngle_X2_ +/* 80162B14 0015FA54 48 10 E4 85 */ bl __ct__7cSAngleFs /* 80162B18 0015FA58 38 61 00 0C */ addi r3, r1, 0xc /* 80162B1C 0015FA5C A8 81 00 14 */ lha r4, 0x14(r1) -/* 80162B20 0015FA60 48 10 E4 79 */ bl cSAngle_X2_ +/* 80162B20 0015FA60 48 10 E4 79 */ bl __ct__7cSAngleFs /* 80162B24 0015FA64 A8 01 00 0C */ lha r0, 0xc(r1) /* 80162B28 0015FA68 B0 01 00 48 */ sth r0, 0x48(r1) /* 80162B2C 0015FA6C 38 61 00 10 */ addi r3, r1, 0x10 /* 80162B30 0015FA70 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80162B34 0015FA74 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80162B38 0015FA78 A8 84 4E 78 */ lha r4, 0x4e78(r4) -/* 80162B3C 0015FA7C 48 10 E4 5D */ bl cSAngle_X2_ +/* 80162B3C 0015FA7C 48 10 E4 5D */ bl __ct__7cSAngleFs /* 80162B40 0015FA80 38 61 00 08 */ addi r3, r1, 8 /* 80162B44 0015FA84 A8 81 00 10 */ lha r4, 0x10(r1) -/* 80162B48 0015FA88 48 10 E4 51 */ bl cSAngle_X2_ +/* 80162B48 0015FA88 48 10 E4 51 */ bl __ct__7cSAngleFs /* 80162B4C 0015FA8C A8 01 00 08 */ lha r0, 8(r1) /* 80162B50 0015FA90 B0 01 00 4A */ sth r0, 0x4a(r1) /* 80162B54 0015FA94 38 61 00 4C */ addi r3, r1, 0x4c /* 80162B58 0015FA98 38 81 00 44 */ addi r4, r1, 0x44 -/* 80162B5C 0015FA9C 48 10 EB 91 */ bl cSPolar_NS_Xyz +/* 80162B5C 0015FA9C 48 10 EB 91 */ bl Xyz__7cSPolarCFv /* 80162B60 0015FAA0 C0 01 00 4C */ lfs f0, 0x4c(r1) /* 80162B64 0015FAA4 D0 1F 00 48 */ stfs f0, 0x48(r31) /* 80162B68 0015FAA8 C0 01 00 50 */ lfs f0, 0x50(r1) diff --git a/include/d/d_camera/asm/func_80162FD4.s b/include/d/d_camera/asm/func_80162FD4.s index 0a9a9814b1..0e45a70def 100644 --- a/include/d/d_camera/asm/func_80162FD4.s +++ b/include/d/d_camera/asm/func_80162FD4.s @@ -8,7 +8,7 @@ /* 80162FF0 0015FF30 48 00 00 0C */ b lbl_80162FFC lbl_80162FF4: /* 80162FF4 0015FF34 38 63 00 2E */ addi r3, r3, 0x2e -/* 80162FF8 0015FF38 48 10 E0 F1 */ bl cSAngle_NS_Inv +/* 80162FF8 0015FF38 48 10 E0 F1 */ bl Inv__7cSAngleCFv lbl_80162FFC: /* 80162FFC 0015FF3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80163000 0015FF40 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_camera/asm/func_8016444C.s b/include/d/d_camera/asm/func_8016444C.s index 204be3cfae..a14312a8fc 100644 --- a/include/d/d_camera/asm/func_8016444C.s +++ b/include/d/d_camera/asm/func_8016444C.s @@ -24,7 +24,7 @@ lbl_80164488: /* 801644A4 001613E4 38 61 00 24 */ addi r3, r1, 0x24 /* 801644A8 001613E8 38 9F 01 38 */ addi r4, r31, 0x138 /* 801644AC 001613EC 38 A1 00 30 */ addi r5, r1, 0x30 -/* 801644B0 001613F0 48 10 26 85 */ bl cXyz_NS___mi +/* 801644B0 001613F0 48 10 26 85 */ bl __mi__4cXyzCFRC3Vec /* 801644B4 001613F4 C0 01 00 24 */ lfs f0, 0x24(r1) /* 801644B8 001613F8 D0 01 00 54 */ stfs f0, 0x54(r1) /* 801644BC 001613FC C0 01 00 28 */ lfs f0, 0x28(r1) @@ -90,7 +90,7 @@ lbl_80164570: /* 801645A4 001614E4 38 61 00 60 */ addi r3, r1, 0x60 /* 801645A8 001614E8 38 9F 00 64 */ addi r4, r31, 0x64 /* 801645AC 001614EC 38 BF 00 70 */ addi r5, r31, 0x70 -/* 801645B0 001614F0 48 10 AC F9 */ bl cM3dGLin +/* 801645B0 001614F0 48 10 AC F9 */ bl __ct__8cM3dGLinFRC4cXyzRC4cXyz /* 801645B4 001614F4 38 61 00 18 */ addi r3, r1, 0x18 /* 801645B8 001614F8 7F E4 FB 78 */ mr r4, r31 /* 801645BC 001614FC 80 BF 01 80 */ lwz r5, 0x180(r31) @@ -105,7 +105,7 @@ lbl_80164570: /* 801645E0 00161520 38 81 00 48 */ addi r4, r1, 0x48 /* 801645E4 00161524 38 A1 00 3C */ addi r5, r1, 0x3c /* 801645E8 00161528 38 C1 00 08 */ addi r6, r1, 8 -/* 801645EC 0016152C 48 10 41 25 */ bl cM3d_Len3dSqPntAndSegLine +/* 801645EC 0016152C 48 10 41 25 */ bl cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf /* 801645F0 00161530 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801645F4 00161534 41 82 00 38 */ beq lbl_8016462C /* 801645F8 00161538 C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -117,10 +117,10 @@ lbl_80164570: /* 80164610 00161550 38 61 00 0C */ addi r3, r1, 0xc /* 80164614 00161554 38 9F 00 70 */ addi r4, r31, 0x70 /* 80164618 00161558 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8016461C 0016155C 48 10 25 19 */ bl cXyz_NS___mi +/* 8016461C 0016155C 48 10 25 19 */ bl __mi__4cXyzCFRC3Vec /* 80164620 00161560 38 7F 00 5C */ addi r3, r31, 0x5c /* 80164624 00161564 38 81 00 0C */ addi r4, r1, 0xc -/* 80164628 00161568 48 10 D4 49 */ bl cSGlobe_NS_Val_X3_ +/* 80164628 00161568 48 10 D4 49 */ bl Val__7cSGlobeFRC4cXyz lbl_8016462C: /* 8016462C 0016156C 80 1F 06 0C */ lwz r0, 0x60c(r31) /* 80164630 00161570 54 00 00 80 */ rlwinm r0, r0, 0, 2, 0 diff --git a/include/d/d_camera/asm/func_80164D6C.s b/include/d/d_camera/asm/func_80164D6C.s index d725b7a065..0dffc21297 100644 --- a/include/d/d_camera/asm/func_80164D6C.s +++ b/include/d/d_camera/asm/func_80164D6C.s @@ -19,7 +19,7 @@ lbl_80164DB4: /* 80164DB4 00161CF4 38 61 00 08 */ addi r3, r1, 8 /* 80164DB8 00161CF8 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80164DBC 00161CFC 48 10 C1 DD */ bl cSAngle_X2_ +/* 80164DBC 00161CFC 48 10 C1 DD */ bl __ct__7cSAngleFs /* 80164DC0 00161D00 38 61 00 18 */ addi r3, r1, 0x18 /* 80164DC4 00161D04 7F E4 FB 78 */ mr r4, r31 /* 80164DC8 00161D08 38 A1 00 08 */ addi r5, r1, 8 @@ -37,7 +37,7 @@ lbl_80164DB4: /* 80164DF8 00161D38 7F 83 E3 78 */ mr r3, r28 /* 80164DFC 00161D3C 38 81 00 0C */ addi r4, r1, 0xc /* 80164E00 00161D40 38 A1 00 24 */ addi r5, r1, 0x24 -/* 80164E04 00161D44 48 10 1C E1 */ bl cXyz_NS___pl +/* 80164E04 00161D44 48 10 1C E1 */ bl __pl__4cXyzCFRC3Vec lbl_80164E08: /* 80164E08 00161D48 39 61 00 40 */ addi r11, r1, 0x40 /* 80164E0C 00161D4C 48 1F D4 19 */ bl _restgpr_28 diff --git a/include/d/d_camera/asm/func_80164E20.s b/include/d/d_camera/asm/func_80164E20.s index c7c91723f4..6978aa8a3e 100644 --- a/include/d/d_camera/asm/func_80164E20.s +++ b/include/d/d_camera/asm/func_80164E20.s @@ -50,7 +50,7 @@ lbl_80164E94: /* 80164EDC 00161E1C 38 61 00 A0 */ addi r3, r1, 0xa0 /* 80164EE0 00161E20 38 81 00 F4 */ addi r4, r1, 0xf4 /* 80164EE4 00161E24 38 A1 01 00 */ addi r5, r1, 0x100 -/* 80164EE8 00161E28 48 10 1C 4D */ bl cXyz_NS___mi +/* 80164EE8 00161E28 48 10 1C 4D */ bl __mi__4cXyzCFRC3Vec /* 80164EEC 00161E2C C0 01 00 A0 */ lfs f0, 0xa0(r1) /* 80164EF0 00161E30 D0 01 00 E8 */ stfs f0, 0xe8(r1) /* 80164EF4 00161E34 C0 01 00 A4 */ lfs f0, 0xa4(r1) @@ -59,10 +59,10 @@ lbl_80164E94: /* 80164F00 00161E40 D0 01 00 F0 */ stfs f0, 0xf0(r1) /* 80164F04 00161E44 38 61 00 20 */ addi r3, r1, 0x20 /* 80164F08 00161E48 38 81 00 E8 */ addi r4, r1, 0xe8 -/* 80164F0C 00161E4C 48 10 C9 75 */ bl cSGlobe_X4_ +/* 80164F0C 00161E4C 48 10 C9 75 */ bl __ct__7cSGlobeFRC4cXyz /* 80164F10 00161E50 38 61 00 94 */ addi r3, r1, 0x94 /* 80164F14 00161E54 38 81 00 E8 */ addi r4, r1, 0xe8 -/* 80164F18 00161E58 48 10 1F DD */ bl cXyz_NS_normalize +/* 80164F18 00161E58 48 10 1F DD */ bl normalize__4cXyzFv /* 80164F1C 00161E5C 38 61 00 88 */ addi r3, r1, 0x88 /* 80164F20 00161E60 38 81 00 E8 */ addi r4, r1, 0xe8 /* 80164F24 00161E64 A8 1C 05 4E */ lha r0, 0x54e(r28) @@ -73,7 +73,7 @@ lbl_80164E94: /* 80164F38 00161E78 90 01 01 10 */ stw r0, 0x110(r1) /* 80164F3C 00161E7C C8 01 01 10 */ lfd f0, 0x110(r1) /* 80164F40 00161E80 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80164F44 00161E84 48 10 1C 41 */ bl cXyz_NS___ml +/* 80164F44 00161E84 48 10 1C 41 */ bl __ml__4cXyzCFf /* 80164F48 00161E88 38 61 01 00 */ addi r3, r1, 0x100 /* 80164F4C 00161E8C 38 81 00 88 */ addi r4, r1, 0x88 /* 80164F50 00161E90 7C 65 1B 78 */ mr r5, r3 @@ -88,7 +88,7 @@ lbl_80164E94: /* 80164F74 00161EB4 90 01 01 18 */ stw r0, 0x118(r1) /* 80164F78 00161EB8 C8 01 01 18 */ lfd f0, 0x118(r1) /* 80164F7C 00161EBC EC 20 08 28 */ fsubs f1, f0, f1 -/* 80164F80 00161EC0 48 10 1C 05 */ bl cXyz_NS___ml +/* 80164F80 00161EC0 48 10 1C 05 */ bl __ml__4cXyzCFf /* 80164F84 00161EC4 38 61 00 F4 */ addi r3, r1, 0xf4 /* 80164F88 00161EC8 38 81 00 7C */ addi r4, r1, 0x7c /* 80164F8C 00161ECC 7C 65 1B 78 */ mr r5, r3 @@ -96,15 +96,15 @@ lbl_80164E94: /* 80164F94 00161ED4 38 61 00 70 */ addi r3, r1, 0x70 /* 80164F98 00161ED8 38 81 00 F4 */ addi r4, r1, 0xf4 /* 80164F9C 00161EDC 38 A1 01 00 */ addi r5, r1, 0x100 -/* 80164FA0 00161EE0 48 10 1B 95 */ bl cXyz_NS___mi +/* 80164FA0 00161EE0 48 10 1B 95 */ bl __mi__4cXyzCFRC3Vec /* 80164FA4 00161EE4 38 61 00 64 */ addi r3, r1, 0x64 /* 80164FA8 00161EE8 38 81 00 70 */ addi r4, r1, 0x70 /* 80164FAC 00161EEC C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) -/* 80164FB0 00161EF0 48 10 1B D5 */ bl cXyz_NS___ml +/* 80164FB0 00161EF0 48 10 1B D5 */ bl __ml__4cXyzCFf /* 80164FB4 00161EF4 38 61 00 58 */ addi r3, r1, 0x58 /* 80164FB8 00161EF8 38 81 01 00 */ addi r4, r1, 0x100 /* 80164FBC 00161EFC 38 A1 00 64 */ addi r5, r1, 0x64 -/* 80164FC0 00161F00 48 10 1B 25 */ bl cXyz_NS___pl +/* 80164FC0 00161F00 48 10 1B 25 */ bl __pl__4cXyzCFRC3Vec /* 80164FC4 00161F04 C0 01 00 58 */ lfs f0, 0x58(r1) /* 80164FC8 00161F08 D0 01 00 DC */ stfs f0, 0xdc(r1) /* 80164FCC 00161F0C C0 01 00 5C */ lfs f0, 0x5c(r1) @@ -121,10 +121,10 @@ lbl_80164E94: /* 80164FF8 00161F38 38 9B 00 62 */ addi r4, r27, 0x62 /* 80164FFC 00161F3C 3B C1 00 26 */ addi r30, r1, 0x26 /* 80165000 00161F40 7F C5 F3 78 */ mr r5, r30 -/* 80165004 00161F44 48 10 C1 A1 */ bl cSAngle_NS___mi_X1_ +/* 80165004 00161F44 48 10 C1 A1 */ bl __mi__7cSAngleCFRC7cSAngle /* 80165008 00161F48 38 61 00 14 */ addi r3, r1, 0x14 /* 8016500C 00161F4C 38 81 00 10 */ addi r4, r1, 0x10 -/* 80165010 00161F50 48 10 BF 59 */ bl cSAngle_X1_ +/* 80165010 00161F50 48 10 BF 59 */ bl __ct__7cSAngleFRC7cSAngle /* 80165014 00161F54 A8 61 00 14 */ lha r3, 0x14(r1) /* 80165018 00161F58 A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) /* 8016501C 00161F5C 7C 03 00 00 */ cmpw r3, r0 @@ -135,19 +135,19 @@ lbl_80164E94: lbl_80165030: /* 80165030 00161F70 38 61 00 18 */ addi r3, r1, 0x18 /* 80165034 00161F74 38 81 00 D0 */ addi r4, r1, 0xd0 -/* 80165038 00161F78 48 10 C8 49 */ bl cSGlobe_X4_ +/* 80165038 00161F78 48 10 C8 49 */ bl __ct__7cSGlobeFRC4cXyz /* 8016503C 00161F7C 38 61 00 0C */ addi r3, r1, 0xc /* 80165040 00161F80 7F C4 F3 78 */ mr r4, r30 /* 80165044 00161F84 38 A1 00 1E */ addi r5, r1, 0x1e -/* 80165048 00161F88 48 10 C1 2D */ bl cSAngle_NS___pl +/* 80165048 00161F88 48 10 C1 2D */ bl __pl__7cSAngleCFRC7cSAngle /* 8016504C 00161F8C 38 61 00 08 */ addi r3, r1, 8 /* 80165050 00161F90 A8 81 00 0C */ lha r4, 0xc(r1) -/* 80165054 00161F94 48 10 BF 45 */ bl cSAngle_X2_ +/* 80165054 00161F94 48 10 BF 45 */ bl __ct__7cSAngleFs /* 80165058 00161F98 A8 01 00 08 */ lha r0, 8(r1) /* 8016505C 00161F9C B0 01 00 1E */ sth r0, 0x1e(r1) /* 80165060 00161FA0 C3 C1 00 20 */ lfs f30, 0x20(r1) /* 80165064 00161FA4 38 61 00 14 */ addi r3, r1, 0x14 -/* 80165068 00161FA8 48 10 C0 B9 */ bl cSAngle_NS_Cos +/* 80165068 00161FA8 48 10 C0 B9 */ bl Cos__7cSAngleCFv /* 8016506C 00161FAC C0 02 9C 90 */ lfs f0, lbl_80453690-_SDA2_BASE_(r2) /* 80165070 00161FB0 EC 00 07 B2 */ fmuls f0, f0, f30 /* 80165074 00161FB4 EC 00 00 72 */ fmuls f0, f0, f1 @@ -155,18 +155,18 @@ lbl_80165030: /* 8016507C 00161FBC D0 01 00 20 */ stfs f0, 0x20(r1) /* 80165080 00161FC0 38 61 00 4C */ addi r3, r1, 0x4c /* 80165084 00161FC4 38 81 00 20 */ addi r4, r1, 0x20 -/* 80165088 00161FC8 48 10 CA 2D */ bl cSGlobe_NS_Xyz +/* 80165088 00161FC8 48 10 CA 2D */ bl Xyz__7cSGlobeCFv /* 8016508C 00161FCC 38 61 00 40 */ addi r3, r1, 0x40 /* 80165090 00161FD0 38 81 00 DC */ addi r4, r1, 0xdc /* 80165094 00161FD4 38 A1 00 4C */ addi r5, r1, 0x4c -/* 80165098 00161FD8 48 10 1A 4D */ bl cXyz_NS___pl +/* 80165098 00161FD8 48 10 1A 4D */ bl __pl__4cXyzCFRC3Vec /* 8016509C 00161FDC 38 61 00 34 */ addi r3, r1, 0x34 /* 801650A0 00161FE0 38 81 00 18 */ addi r4, r1, 0x18 -/* 801650A4 00161FE4 48 10 CA 11 */ bl cSGlobe_NS_Xyz +/* 801650A4 00161FE4 48 10 CA 11 */ bl Xyz__7cSGlobeCFv /* 801650A8 00161FE8 38 61 00 28 */ addi r3, r1, 0x28 /* 801650AC 00161FEC 38 81 00 40 */ addi r4, r1, 0x40 /* 801650B0 00161FF0 38 A1 00 34 */ addi r5, r1, 0x34 -/* 801650B4 00161FF4 48 10 1A 31 */ bl cXyz_NS___pl +/* 801650B4 00161FF4 48 10 1A 31 */ bl __pl__4cXyzCFRC3Vec /* 801650B8 00161FF8 C0 41 00 28 */ lfs f2, 0x28(r1) /* 801650BC 00161FFC D0 41 00 C4 */ stfs f2, 0xc4(r1) /* 801650C0 00162000 C0 21 00 2C */ lfs f1, 0x2c(r1) diff --git a/include/d/d_camera/asm/func_80165104.s b/include/d/d_camera/asm/func_80165104.s index a9075c6181..57005f3419 100644 --- a/include/d/d_camera/asm/func_80165104.s +++ b/include/d/d_camera/asm/func_80165104.s @@ -6,10 +6,10 @@ /* 80165118 00162058 38 00 00 01 */ li r0, 1 /* 8016511C 0016205C 98 03 02 98 */ stb r0, 0x298(r3) /* 80165120 00162060 38 7F 00 2E */ addi r3, r31, 0x2e -/* 80165124 00162064 48 10 BF C5 */ bl cSAngle_NS_Inv +/* 80165124 00162064 48 10 BF C5 */ bl Inv__7cSAngleCFv /* 80165128 00162068 7C 64 1B 78 */ mr r4, r3 /* 8016512C 0016206C 38 61 00 08 */ addi r3, r1, 8 -/* 80165130 00162070 48 10 BE 69 */ bl cSAngle_X2_ +/* 80165130 00162070 48 10 BE 69 */ bl __ct__7cSAngleFs /* 80165134 00162074 A8 01 00 08 */ lha r0, 8(r1) /* 80165138 00162078 B0 1F 02 9A */ sth r0, 0x29a(r31) /* 8016513C 0016207C A8 1F 01 D4 */ lha r0, 0x1d4(r31) diff --git a/include/d/d_camera/asm/func_80165158.s b/include/d/d_camera/asm/func_80165158.s index feab28ef23..e4a671175c 100644 --- a/include/d/d_camera/asm/func_80165158.s +++ b/include/d/d_camera/asm/func_80165158.s @@ -2,7 +2,7 @@ /* 8016515C 0016209C 7C 08 02 A6 */ mflr r0 /* 80165160 001620A0 90 01 00 14 */ stw r0, 0x14(r1) /* 80165164 001620A4 38 84 02 9A */ addi r4, r4, 0x29a -/* 80165168 001620A8 48 10 BE 01 */ bl cSAngle_X1_ +/* 80165168 001620A8 48 10 BE 01 */ bl __ct__7cSAngleFRC7cSAngle /* 8016516C 001620AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80165170 001620B0 7C 08 03 A6 */ mtlr r0 /* 80165174 001620B4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_camera/asm/func_80165238.s b/include/d/d_camera/asm/func_80165238.s index caa5cb8521..8a67805b7a 100644 --- a/include/d/d_camera/asm/func_80165238.s +++ b/include/d/d_camera/asm/func_80165238.s @@ -116,7 +116,7 @@ lbl_80165308: /* 801653FC 0016233C 38 61 00 30 */ addi r3, r1, 0x30 /* 80165400 00162340 38 81 00 9C */ addi r4, r1, 0x9c /* 80165404 00162344 38 A1 00 90 */ addi r5, r1, 0x90 -/* 80165408 00162348 48 10 17 2D */ bl cXyz_NS___mi +/* 80165408 00162348 48 10 17 2D */ bl __mi__4cXyzCFRC3Vec /* 8016540C 0016234C C0 01 00 30 */ lfs f0, 0x30(r1) /* 80165410 00162350 D0 01 00 84 */ stfs f0, 0x84(r1) /* 80165414 00162354 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -211,7 +211,7 @@ lbl_80165548: /* 8016554C 0016248C EF 61 00 32 */ fmuls f27, f1, f0 /* 80165550 00162490 38 61 00 24 */ addi r3, r1, 0x24 /* 80165554 00162494 38 81 00 84 */ addi r4, r1, 0x84 -/* 80165558 00162498 48 10 19 9D */ bl cXyz_NS_normalize +/* 80165558 00162498 48 10 19 9D */ bl normalize__4cXyzFv /* 8016555C 0016249C 38 61 00 18 */ addi r3, r1, 0x18 /* 80165560 001624A0 38 81 00 84 */ addi r4, r1, 0x84 /* 80165564 001624A4 A8 1B 05 4E */ lha r0, 0x54e(r27) @@ -223,7 +223,7 @@ lbl_80165548: /* 8016557C 001624BC C8 01 00 D8 */ lfd f0, 0xd8(r1) /* 80165580 001624C0 EC 00 08 28 */ fsubs f0, f0, f1 /* 80165584 001624C4 EC 20 D8 2A */ fadds f1, f0, f27 -/* 80165588 001624C8 48 10 15 FD */ bl cXyz_NS___ml +/* 80165588 001624C8 48 10 15 FD */ bl __ml__4cXyzCFf /* 8016558C 001624CC 38 61 00 9C */ addi r3, r1, 0x9c /* 80165590 001624D0 38 81 00 18 */ addi r4, r1, 0x18 /* 80165594 001624D4 7C 65 1B 78 */ mr r5, r3 @@ -239,7 +239,7 @@ lbl_80165548: /* 801655BC 001624FC C8 01 00 E0 */ lfd f0, 0xe0(r1) /* 801655C0 00162500 EC 00 08 28 */ fsubs f0, f0, f1 /* 801655C4 00162504 EC 20 D8 2A */ fadds f1, f0, f27 -/* 801655C8 00162508 48 10 15 BD */ bl cXyz_NS___ml +/* 801655C8 00162508 48 10 15 BD */ bl __ml__4cXyzCFf /* 801655CC 0016250C 38 61 00 90 */ addi r3, r1, 0x90 /* 801655D0 00162510 38 81 00 0C */ addi r4, r1, 0xc /* 801655D4 00162514 7C 65 1B 78 */ mr r5, r3 diff --git a/include/d/d_camera/asm/func_801657EC.s b/include/d/d_camera/asm/func_801657EC.s index 239981a971..8153158707 100644 --- a/include/d/d_camera/asm/func_801657EC.s +++ b/include/d/d_camera/asm/func_801657EC.s @@ -10,7 +10,7 @@ /* 80165810 00162750 4B F1 1D 6D */ bl dBgS_GndChk /* 80165814 00162754 38 61 00 5C */ addi r3, r1, 0x5c /* 80165818 00162758 7F C4 F3 78 */ mr r4, r30 -/* 8016581C 0016275C 48 10 25 0D */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8016581C 0016275C 48 10 25 0D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80165820 00162760 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80165824 00162764 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80165828 00162768 3B E3 0F 38 */ addi r31, r3, 0xf38 @@ -22,7 +22,7 @@ /* 80165840 00162780 4B F1 21 C1 */ bl dBgS_CamGndChk_Wtr /* 80165844 00162784 38 61 00 08 */ addi r3, r1, 8 /* 80165848 00162788 7F C4 F3 78 */ mr r4, r30 -/* 8016584C 0016278C 48 10 24 DD */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8016584C 0016278C 48 10 24 DD */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80165850 00162790 7F E3 FB 78 */ mr r3, r31 /* 80165854 00162794 38 81 00 08 */ addi r4, r1, 8 /* 80165858 00162798 4B F0 EC 49 */ bl cBgS_NS_GroundCross diff --git a/include/d/d_camera/asm/func_801659F4.s b/include/d/d_camera/asm/func_801659F4.s index 14331fd84a..0355683e25 100644 --- a/include/d/d_camera/asm/func_801659F4.s +++ b/include/d/d_camera/asm/func_801659F4.s @@ -30,7 +30,7 @@ /* 80165A68 001629A8 38 61 00 08 */ addi r3, r1, 8 /* 80165A6C 001629AC 38 81 00 58 */ addi r4, r1, 0x58 /* 80165A70 001629B0 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80165A74 001629B4 48 10 10 71 */ bl cXyz_NS___pl +/* 80165A74 001629B4 48 10 10 71 */ bl __pl__4cXyzCFRC3Vec /* 80165A78 001629B8 C0 01 00 08 */ lfs f0, 8(r1) /* 80165A7C 001629BC D0 1E 00 00 */ stfs f0, 0(r30) /* 80165A80 001629C0 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_camera/asm/func_80165B60.s b/include/d/d_camera/asm/func_80165B60.s index 3803696bbd..946749d31b 100644 --- a/include/d/d_camera/asm/func_80165B60.s +++ b/include/d/d_camera/asm/func_80165B60.s @@ -29,13 +29,13 @@ lbl_80165BB8: /* 80165BC4 00162B04 7F 84 E3 78 */ mr r4, r28 /* 80165BC8 00162B08 7F A5 EB 78 */ mr r5, r29 /* 80165BCC 00162B0C C0 22 9D 18 */ lfs f1, lbl_80453718-_SDA2_BASE_(r2) -/* 80165BD0 00162B10 48 10 94 31 */ bl cM3dGCps_NS_Set +/* 80165BD0 00162B10 48 10 94 31 */ bl Set__8cM3dGCpsFRC4cXyzRC4cXyzf /* 80165BD4 00162B14 7F E3 FB 78 */ mr r3, r31 /* 80165BD8 00162B18 38 81 00 08 */ addi r4, r1, 8 /* 80165BDC 00162B1C 4B F2 02 91 */ bl dCcMassS_Mng_NS_SetCam /* 80165BE0 00162B20 38 61 00 08 */ addi r3, r1, 8 /* 80165BE4 00162B24 38 80 FF FF */ li r4, -1 -/* 80165BE8 00162B28 48 10 93 BD */ bl cM3dGCps_NS_dtor +/* 80165BE8 00162B28 48 10 93 BD */ bl __dt__8cM3dGCpsFv /* 80165BEC 00162B2C 7F C3 F3 78 */ mr r3, r30 /* 80165BF0 00162B30 39 61 00 40 */ addi r11, r1, 0x40 /* 80165BF4 00162B34 48 1F C6 31 */ bl _restgpr_28 diff --git a/include/d/d_camera/asm/func_80165C08.s b/include/d/d_camera/asm/func_80165C08.s index ef33729ff7..198d11d1d1 100644 --- a/include/d/d_camera/asm/func_80165C08.s +++ b/include/d/d_camera/asm/func_80165C08.s @@ -12,7 +12,7 @@ /* 80165C34 00162B74 40 82 00 8C */ bne lbl_80165CC0 /* 80165C38 00162B78 7F C3 F3 78 */ mr r3, r30 /* 80165C3C 00162B7C 38 9F 00 0C */ addi r4, r31, 0xc -/* 80165C40 00162B80 48 10 2B D5 */ bl cM3d_SignedLenPlaAndPos +/* 80165C40 00162B80 48 10 2B D5 */ bl cM3d_SignedLenPlaAndPos__FPC8cM3dGPlaPC3Vec /* 80165C44 00162B84 FF E0 08 90 */ fmr f31, f1 /* 80165C48 00162B88 7F C3 F3 78 */ mr r3, r30 /* 80165C4C 00162B8C 80 9F 00 08 */ lwz r4, 8(r31) @@ -37,7 +37,7 @@ /* 80165C98 00162BD8 C0 02 9D 0C */ lfs f0, lbl_8045370C-_SDA2_BASE_(r2) /* 80165C9C 00162BDC EC 00 08 2A */ fadds f0, f0, f1 /* 80165CA0 00162BE0 EC 20 F8 28 */ fsubs f1, f0, f31 -/* 80165CA4 00162BE4 48 10 0E E1 */ bl cXyz_NS___ml +/* 80165CA4 00162BE4 48 10 0E E1 */ bl __ml__4cXyzCFf /* 80165CA8 00162BE8 38 7F 00 0C */ addi r3, r31, 0xc /* 80165CAC 00162BEC 38 81 00 08 */ addi r4, r1, 8 /* 80165CB0 00162BF0 7C 65 1B 78 */ mr r5, r3 diff --git a/include/d/d_camera/asm/func_80165CE0.s b/include/d/d_camera/asm/func_80165CE0.s index 502a19b5e0..e300a27b21 100644 --- a/include/d/d_camera/asm/func_80165CE0.s +++ b/include/d/d_camera/asm/func_80165CE0.s @@ -45,7 +45,7 @@ /* 80165D88 00162CC8 7F C3 F3 78 */ mr r3, r30 /* 80165D8C 00162CCC 7F A4 EB 78 */ mr r4, r29 /* 80165D90 00162CD0 FC 20 F8 90 */ fmr f1, f31 -/* 80165D94 00162CD4 48 10 98 D1 */ bl cM3dGSph_NS_Set +/* 80165D94 00162CD4 48 10 98 D1 */ bl Set__8cM3dGSphFRC4cXyzf /* 80165D98 00162CD8 D3 E1 00 2C */ stfs f31, 0x2c(r1) /* 80165D9C 00162CDC 3B 00 00 00 */ li r24, 0 /* 80165DA0 00162CE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -66,7 +66,7 @@ lbl_80165DB0: /* 80165DD8 00162D18 38 61 00 34 */ addi r3, r1, 0x34 /* 80165DDC 00162D1C 7F C4 F3 78 */ mr r4, r30 /* 80165DE0 00162D20 FC 20 F8 90 */ fmr f1, f31 -/* 80165DE4 00162D24 48 10 98 81 */ bl cM3dGSph_NS_Set +/* 80165DE4 00162D24 48 10 98 81 */ bl Set__8cM3dGSphFRC4cXyzf /* 80165DE8 00162D28 38 00 00 00 */ li r0, 0 /* 80165DEC 00162D2C 98 01 00 30 */ stb r0, 0x30(r1) /* 80165DF0 00162D30 7F A3 EB 78 */ mr r3, r29 diff --git a/include/d/d_camera/asm/func_8016608C.s b/include/d/d_camera/asm/func_8016608C.s index ef0a1bd0f0..e6d4efc103 100644 --- a/include/d/d_camera/asm/func_8016608C.s +++ b/include/d/d_camera/asm/func_8016608C.s @@ -13,7 +13,7 @@ /* 801660BC 00162FFC 4B F1 1C E9 */ bl dBgS_CamLinChk /* 801660C0 00163000 38 61 00 3C */ addi r3, r1, 0x3c /* 801660C4 00163004 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 801660C8 00163008 48 10 AE A1 */ bl cSAngle_X1_ +/* 801660C8 00163008 48 10 AE A1 */ bl __ct__7cSAngleFRC7cSAngle /* 801660CC 0016300C 38 61 01 10 */ addi r3, r1, 0x110 /* 801660D0 00163010 7F C4 F3 78 */ mr r4, r30 /* 801660D4 00163014 80 BE 01 80 */ lwz r5, 0x180(r30) @@ -38,24 +38,24 @@ /* 80166120 00163060 D8 01 01 D8 */ stfd f0, 0x1d8(r1) /* 80166124 00163064 80 81 01 DC */ lwz r4, 0x1dc(r1) /* 80166128 00163068 38 61 00 30 */ addi r3, r1, 0x30 -/* 8016612C 0016306C 48 10 AE 6D */ bl cSAngle_X2_ +/* 8016612C 0016306C 48 10 AE 6D */ bl __ct__7cSAngleFs /* 80166130 00163070 AB 81 00 30 */ lha r28, 0x30(r1) /* 80166134 00163074 C3 DE 0A 88 */ lfs f30, 0xa88(r30) /* 80166138 00163078 3B FE 00 2E */ addi r31, r30, 0x2e /* 8016613C 0016307C 7F E3 FB 78 */ mr r3, r31 -/* 80166140 00163080 48 10 AF A9 */ bl cSAngle_NS_Inv +/* 80166140 00163080 48 10 AF A9 */ bl Inv__7cSAngleCFv /* 80166144 00163084 7C 65 1B 78 */ mr r5, r3 /* 80166148 00163088 38 61 00 60 */ addi r3, r1, 0x60 /* 8016614C 0016308C EC 3F 07 B2 */ fmuls f1, f31, f30 /* 80166150 00163090 7F 84 E3 78 */ mr r4, r28 -/* 80166154 00163094 48 10 B6 CD */ bl cSGlobe_X2_ +/* 80166154 00163094 48 10 B6 CD */ bl __ct__7cSGlobeFfss /* 80166158 00163098 38 61 01 04 */ addi r3, r1, 0x104 /* 8016615C 0016309C 38 81 00 60 */ addi r4, r1, 0x60 -/* 80166160 001630A0 48 10 B9 55 */ bl cSGlobe_NS_Xyz +/* 80166160 001630A0 48 10 B9 55 */ bl Xyz__7cSGlobeCFv /* 80166164 001630A4 38 61 00 F8 */ addi r3, r1, 0xf8 /* 80166168 001630A8 38 81 01 58 */ addi r4, r1, 0x158 /* 8016616C 001630AC 38 A1 01 04 */ addi r5, r1, 0x104 -/* 80166170 001630B0 48 10 09 75 */ bl cXyz_NS___pl +/* 80166170 001630B0 48 10 09 75 */ bl __pl__4cXyzCFRC3Vec /* 80166174 001630B4 C0 01 00 F8 */ lfs f0, 0xf8(r1) /* 80166178 001630B8 D0 01 01 40 */ stfs f0, 0x140(r1) /* 8016617C 001630BC C0 01 00 FC */ lfs f0, 0xfc(r1) @@ -73,7 +73,7 @@ /* 801661AC 001630EC 38 61 00 EC */ addi r3, r1, 0xec /* 801661B0 001630F0 38 81 01 40 */ addi r4, r1, 0x140 /* 801661B4 001630F4 38 A1 01 58 */ addi r5, r1, 0x158 -/* 801661B8 001630F8 48 10 09 7D */ bl cXyz_NS___mi +/* 801661B8 001630F8 48 10 09 7D */ bl __mi__4cXyzCFRC3Vec /* 801661BC 001630FC C0 01 00 EC */ lfs f0, 0xec(r1) /* 801661C0 00163100 D0 01 01 34 */ stfs f0, 0x134(r1) /* 801661C4 00163104 C0 01 00 F0 */ lfs f0, 0xf0(r1) @@ -161,15 +161,15 @@ lbl_801662C0: lbl_801662E8: /* 801662E8 00163228 38 61 00 E0 */ addi r3, r1, 0xe0 /* 801662EC 0016322C 38 81 01 34 */ addi r4, r1, 0x134 -/* 801662F0 00163230 48 10 09 F5 */ bl cXyz_NS_norm +/* 801662F0 00163230 48 10 09 F5 */ bl norm__4cXyzCFv /* 801662F4 00163234 38 61 00 D4 */ addi r3, r1, 0xd4 /* 801662F8 00163238 38 81 00 E0 */ addi r4, r1, 0xe0 /* 801662FC 0016323C C0 3E 0A A8 */ lfs f1, 0xaa8(r30) -/* 80166300 00163240 48 10 08 85 */ bl cXyz_NS___ml +/* 80166300 00163240 48 10 08 85 */ bl __ml__4cXyzCFf /* 80166304 00163244 38 61 00 C8 */ addi r3, r1, 0xc8 /* 80166308 00163248 38 81 01 4C */ addi r4, r1, 0x14c /* 8016630C 0016324C 38 A1 00 D4 */ addi r5, r1, 0xd4 -/* 80166310 00163250 48 10 08 25 */ bl cXyz_NS___mi +/* 80166310 00163250 48 10 08 25 */ bl __mi__4cXyzCFRC3Vec /* 80166314 00163254 C0 01 00 C8 */ lfs f0, 0xc8(r1) /* 80166318 00163258 D0 01 01 40 */ stfs f0, 0x140(r1) /* 8016631C 0016325C C0 01 00 CC */ lfs f0, 0xcc(r1) @@ -191,10 +191,10 @@ lbl_8016632C: /* 80166358 00163298 38 61 00 BC */ addi r3, r1, 0xbc /* 8016635C 0016329C 38 81 01 4C */ addi r4, r1, 0x14c /* 80166360 001632A0 38 A1 01 58 */ addi r5, r1, 0x158 -/* 80166364 001632A4 48 10 07 D1 */ bl cXyz_NS___mi +/* 80166364 001632A4 48 10 07 D1 */ bl __mi__4cXyzCFRC3Vec /* 80166368 001632A8 38 61 00 58 */ addi r3, r1, 0x58 /* 8016636C 001632AC 38 81 00 BC */ addi r4, r1, 0xbc -/* 80166370 001632B0 48 10 B5 11 */ bl cSGlobe_X4_ +/* 80166370 001632B0 48 10 B5 11 */ bl __ct__7cSGlobeFRC4cXyz /* 80166374 001632B4 38 81 00 5C */ addi r4, r1, 0x5c /* 80166378 001632B8 A8 61 00 5C */ lha r3, 0x5c(r1) /* 8016637C 001632BC A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) @@ -202,14 +202,14 @@ lbl_8016632C: /* 80166384 001632C4 41 80 00 1C */ blt lbl_801663A0 /* 80166388 001632C8 38 61 00 28 */ addi r3, r1, 0x28 /* 8016638C 001632CC C0 3E 0A 90 */ lfs f1, 0xa90(r30) -/* 80166390 001632D0 48 10 AE D5 */ bl cSAngle_NS___ml +/* 80166390 001632D0 48 10 AE D5 */ bl __ml__7cSAngleCFf /* 80166394 001632D4 A8 01 00 28 */ lha r0, 0x28(r1) /* 80166398 001632D8 B0 01 00 38 */ sth r0, 0x38(r1) /* 8016639C 001632DC 48 00 00 18 */ b lbl_801663B4 lbl_801663A0: /* 801663A0 001632E0 38 61 00 24 */ addi r3, r1, 0x24 /* 801663A4 001632E4 C0 3E 0A 94 */ lfs f1, 0xa94(r30) -/* 801663A8 001632E8 48 10 AE BD */ bl cSAngle_NS___ml +/* 801663A8 001632E8 48 10 AE BD */ bl __ml__7cSAngleCFf /* 801663AC 001632EC A8 01 00 24 */ lha r0, 0x24(r1) /* 801663B0 001632F0 B0 01 00 38 */ sth r0, 0x38(r1) lbl_801663B4: @@ -220,23 +220,23 @@ lbl_801663B4: /* 801663C4 00163304 D8 01 01 D8 */ stfd f0, 0x1d8(r1) /* 801663C8 00163308 80 81 01 DC */ lwz r4, 0x1dc(r1) /* 801663CC 0016330C 38 61 00 2C */ addi r3, r1, 0x2c -/* 801663D0 00163310 48 10 AB C9 */ bl cSAngle_X2_ +/* 801663D0 00163310 48 10 AB C9 */ bl __ct__7cSAngleFs /* 801663D4 00163314 AB 81 00 2C */ lha r28, 0x2c(r1) /* 801663D8 00163318 C3 DE 0A 98 */ lfs f30, 0xa98(r30) /* 801663DC 0016331C 7F E3 FB 78 */ mr r3, r31 -/* 801663E0 00163320 48 10 AD 09 */ bl cSAngle_NS_Inv +/* 801663E0 00163320 48 10 AD 09 */ bl Inv__7cSAngleCFv /* 801663E4 00163324 7C 65 1B 78 */ mr r5, r3 /* 801663E8 00163328 38 61 00 50 */ addi r3, r1, 0x50 /* 801663EC 0016332C EC 3F 07 B2 */ fmuls f1, f31, f30 /* 801663F0 00163330 7F 84 E3 78 */ mr r4, r28 -/* 801663F4 00163334 48 10 B4 2D */ bl cSGlobe_X2_ +/* 801663F4 00163334 48 10 B4 2D */ bl __ct__7cSGlobeFfss /* 801663F8 00163338 38 61 00 B0 */ addi r3, r1, 0xb0 /* 801663FC 0016333C 38 81 00 50 */ addi r4, r1, 0x50 -/* 80166400 00163340 48 10 B6 B5 */ bl cSGlobe_NS_Xyz +/* 80166400 00163340 48 10 B6 B5 */ bl Xyz__7cSGlobeCFv /* 80166404 00163344 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80166408 00163348 38 81 01 58 */ addi r4, r1, 0x158 /* 8016640C 0016334C 38 A1 00 B0 */ addi r5, r1, 0xb0 -/* 80166410 00163350 48 10 06 D5 */ bl cXyz_NS___pl +/* 80166410 00163350 48 10 06 D5 */ bl __pl__4cXyzCFRC3Vec /* 80166414 00163354 C0 01 00 A4 */ lfs f0, 0xa4(r1) /* 80166418 00163358 D0 01 01 28 */ stfs f0, 0x128(r1) /* 8016641C 0016335C C0 01 00 A8 */ lfs f0, 0xa8(r1) @@ -254,7 +254,7 @@ lbl_801663B4: /* 8016644C 0016338C 38 61 00 98 */ addi r3, r1, 0x98 /* 80166450 00163390 38 81 01 28 */ addi r4, r1, 0x128 /* 80166454 00163394 38 A1 01 58 */ addi r5, r1, 0x158 -/* 80166458 00163398 48 10 06 DD */ bl cXyz_NS___mi +/* 80166458 00163398 48 10 06 DD */ bl __mi__4cXyzCFRC3Vec /* 8016645C 0016339C C0 01 00 98 */ lfs f0, 0x98(r1) /* 80166460 001633A0 D0 01 01 1C */ stfs f0, 0x11c(r1) /* 80166464 001633A4 C0 01 00 9C */ lfs f0, 0x9c(r1) @@ -342,15 +342,15 @@ lbl_80166560: lbl_80166588: /* 80166588 001634C8 38 61 00 8C */ addi r3, r1, 0x8c /* 8016658C 001634CC 38 81 01 1C */ addi r4, r1, 0x11c -/* 80166590 001634D0 48 10 07 55 */ bl cXyz_NS_norm +/* 80166590 001634D0 48 10 07 55 */ bl norm__4cXyzCFv /* 80166594 001634D4 38 61 00 80 */ addi r3, r1, 0x80 /* 80166598 001634D8 38 81 00 8C */ addi r4, r1, 0x8c /* 8016659C 001634DC C0 3E 0A A8 */ lfs f1, 0xaa8(r30) -/* 801665A0 001634E0 48 10 05 E5 */ bl cXyz_NS___ml +/* 801665A0 001634E0 48 10 05 E5 */ bl __ml__4cXyzCFf /* 801665A4 001634E4 38 61 00 74 */ addi r3, r1, 0x74 /* 801665A8 001634E8 38 81 01 4C */ addi r4, r1, 0x14c /* 801665AC 001634EC 38 A1 00 80 */ addi r5, r1, 0x80 -/* 801665B0 001634F0 48 10 05 85 */ bl cXyz_NS___mi +/* 801665B0 001634F0 48 10 05 85 */ bl __mi__4cXyzCFRC3Vec /* 801665B4 001634F4 C0 01 00 74 */ lfs f0, 0x74(r1) /* 801665B8 001634F8 D0 01 01 28 */ stfs f0, 0x128(r1) /* 801665BC 001634FC C0 01 00 78 */ lfs f0, 0x78(r1) @@ -372,10 +372,10 @@ lbl_801665CC: /* 801665F8 00163538 38 61 00 68 */ addi r3, r1, 0x68 /* 801665FC 0016353C 38 81 01 4C */ addi r4, r1, 0x14c /* 80166600 00163540 38 A1 01 58 */ addi r5, r1, 0x158 -/* 80166604 00163544 48 10 05 31 */ bl cXyz_NS___mi +/* 80166604 00163544 48 10 05 31 */ bl __mi__4cXyzCFRC3Vec /* 80166608 00163548 38 61 00 48 */ addi r3, r1, 0x48 /* 8016660C 0016354C 38 81 00 68 */ addi r4, r1, 0x68 -/* 80166610 00163550 48 10 B2 71 */ bl cSGlobe_X4_ +/* 80166610 00163550 48 10 B2 71 */ bl __ct__7cSGlobeFRC4cXyz /* 80166614 00163554 38 81 00 4C */ addi r4, r1, 0x4c /* 80166618 00163558 A8 61 00 4C */ lha r3, 0x4c(r1) /* 8016661C 0016355C A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) @@ -383,14 +383,14 @@ lbl_801665CC: /* 80166624 00163564 41 80 00 1C */ blt lbl_80166640 /* 80166628 00163568 38 61 00 20 */ addi r3, r1, 0x20 /* 8016662C 0016356C C0 3E 0A A0 */ lfs f1, 0xaa0(r30) -/* 80166630 00163570 48 10 AC 35 */ bl cSAngle_NS___ml +/* 80166630 00163570 48 10 AC 35 */ bl __ml__7cSAngleCFf /* 80166634 00163574 A8 01 00 20 */ lha r0, 0x20(r1) /* 80166638 00163578 B0 01 00 34 */ sth r0, 0x34(r1) /* 8016663C 0016357C 48 00 00 18 */ b lbl_80166654 lbl_80166640: /* 80166640 00163580 38 61 00 1C */ addi r3, r1, 0x1c /* 80166644 00163584 C0 3E 0A A4 */ lfs f1, 0xaa4(r30) -/* 80166648 00163588 48 10 AC 1D */ bl cSAngle_NS___ml +/* 80166648 00163588 48 10 AC 1D */ bl __ml__7cSAngleCFf /* 8016664C 0016358C A8 01 00 1C */ lha r0, 0x1c(r1) /* 80166650 00163590 B0 01 00 34 */ sth r0, 0x34(r1) lbl_80166654: @@ -405,13 +405,13 @@ lbl_80166654: /* 80166674 001635B4 41 80 00 18 */ blt lbl_8016668C /* 80166678 001635B8 38 61 00 18 */ addi r3, r1, 0x18 /* 8016667C 001635BC 38 81 00 38 */ addi r4, r1, 0x38 -/* 80166680 001635C0 48 10 AA C9 */ bl cSAngle_NS___mi +/* 80166680 001635C0 48 10 AA C9 */ bl __mi__7cSAngleCFv /* 80166684 001635C4 38 61 00 18 */ addi r3, r1, 0x18 /* 80166688 001635C8 48 00 00 14 */ b lbl_8016669C lbl_8016668C: /* 8016668C 001635CC 38 61 00 14 */ addi r3, r1, 0x14 /* 80166690 001635D0 38 81 00 34 */ addi r4, r1, 0x34 -/* 80166694 001635D4 48 10 AA B5 */ bl cSAngle_NS___mi +/* 80166694 001635D4 48 10 AA B5 */ bl __mi__7cSAngleCFv /* 80166698 001635D8 38 61 00 14 */ addi r3, r1, 0x14 lbl_8016669C: /* 8016669C 001635DC A8 03 00 00 */ lha r0, 0(r3) @@ -427,13 +427,13 @@ lbl_801666A8: /* 801666C0 00163600 41 81 00 18 */ bgt lbl_801666D8 /* 801666C4 00163604 38 61 00 10 */ addi r3, r1, 0x10 /* 801666C8 00163608 38 81 00 38 */ addi r4, r1, 0x38 -/* 801666CC 0016360C 48 10 AA 7D */ bl cSAngle_NS___mi +/* 801666CC 0016360C 48 10 AA 7D */ bl __mi__7cSAngleCFv /* 801666D0 00163610 38 61 00 10 */ addi r3, r1, 0x10 /* 801666D4 00163614 48 00 00 14 */ b lbl_801666E8 lbl_801666D8: /* 801666D8 00163618 38 61 00 0C */ addi r3, r1, 0xc /* 801666DC 0016361C 38 81 00 34 */ addi r4, r1, 0x34 -/* 801666E0 00163620 48 10 AA 69 */ bl cSAngle_NS___mi +/* 801666E0 00163620 48 10 AA 69 */ bl __mi__7cSAngleCFv /* 801666E4 00163624 38 61 00 0C */ addi r3, r1, 0xc lbl_801666E8: /* 801666E8 00163628 A8 03 00 00 */ lha r0, 0(r3) @@ -442,7 +442,7 @@ lbl_801666E8: lbl_801666F4: /* 801666F4 00163634 38 61 00 08 */ addi r3, r1, 8 /* 801666F8 00163638 38 81 00 38 */ addi r4, r1, 0x38 -/* 801666FC 0016363C 48 10 AA 4D */ bl cSAngle_NS___mi +/* 801666FC 0016363C 48 10 AA 4D */ bl __mi__7cSAngleCFv /* 80166700 00163640 A8 01 00 08 */ lha r0, 8(r1) /* 80166704 00163644 B0 01 00 3C */ sth r0, 0x3c(r1) lbl_80166708: @@ -452,11 +452,11 @@ lbl_80166708: /* 80166714 00163654 41 81 00 10 */ bgt lbl_80166724 /* 80166718 00163658 38 61 00 3C */ addi r3, r1, 0x3c /* 8016671C 0016365C C0 22 9D 24 */ lfs f1, lbl_80453724-_SDA2_BASE_(r2) -/* 80166720 00163660 48 10 AB 95 */ bl cSAngle_NS___amu +/* 80166720 00163660 48 10 AB 95 */ bl __amu__7cSAngleFf lbl_80166724: /* 80166724 00163664 7F A3 EB 78 */ mr r3, r29 /* 80166728 00163668 38 81 00 3C */ addi r4, r1, 0x3c -/* 8016672C 0016366C 48 10 A8 3D */ bl cSAngle_X1_ +/* 8016672C 0016366C 48 10 A8 3D */ bl __ct__7cSAngleFRC7cSAngle /* 80166730 00163670 38 61 01 64 */ addi r3, r1, 0x164 /* 80166734 00163674 38 80 FF FF */ li r4, -1 /* 80166738 00163678 4B F1 16 C9 */ bl dBgS_CamLinChk_NS_dtor diff --git a/include/d/d_camera/asm/func_80166764.s b/include/d/d_camera/asm/func_80166764.s index 0fa8cd4849..7b37cc1a6e 100644 --- a/include/d/d_camera/asm/func_80166764.s +++ b/include/d/d_camera/asm/func_80166764.s @@ -42,9 +42,9 @@ lbl_801667F4: /* 80166800 00163740 EF E1 00 2A */ fadds f31, f1, f0 /* 80166804 00163744 38 61 00 48 */ addi r3, r1, 0x48 /* 80166808 00163748 C0 3C 0A C8 */ lfs f1, 0xac8(r28) -/* 8016680C 0016374C 48 10 AB 41 */ bl cDegree +/* 8016680C 0016374C 48 10 AB 41 */ bl __ct__7cDegreeFf /* 80166810 00163750 38 61 00 48 */ addi r3, r1, 0x48 -/* 80166814 00163754 48 10 AC 05 */ bl cDegree_NS_Cos +/* 80166814 00163754 48 10 AC 05 */ bl Cos__7cDegreeCFv /* 80166818 00163758 C3 DC 0A C0 */ lfs f30, 0xac0(r28) /* 8016681C 0016375C 38 61 03 A0 */ addi r3, r1, 0x3a0 /* 80166820 00163760 38 9C 00 64 */ addi r4, r28, 0x64 @@ -54,7 +54,7 @@ lbl_801667F4: /* 80166830 00163770 4B F3 0F C5 */ bl cXyz_X1_ /* 80166834 00163774 38 61 00 74 */ addi r3, r1, 0x74 /* 80166838 00163778 38 9C 00 5C */ addi r4, r28, 0x5c -/* 8016683C 0016377C 48 10 AF B5 */ bl cSGlobe_X1_ +/* 8016683C 0016377C 48 10 AF B5 */ bl __ct__7cSGlobeFRC7cSGlobe /* 80166840 00163780 A0 1C 09 7A */ lhz r0, 0x97a(r28) /* 80166844 00163784 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80166848 00163788 41 82 00 E8 */ beq lbl_80166930 @@ -69,7 +69,7 @@ lbl_801667F4: /* 8016686C 001637AC 4B EF 42 75 */ bl dKyw_get_wind_vec /* 80166870 001637B0 7C 64 1B 78 */ mr r4, r3 /* 80166874 001637B4 38 61 00 6C */ addi r3, r1, 0x6c -/* 80166878 001637B8 48 10 B0 09 */ bl cSGlobe_X4_ +/* 80166878 001637B8 48 10 B0 09 */ bl __ct__7cSGlobeFRC4cXyz /* 8016687C 001637BC C3 7C 00 5C */ lfs f27, 0x5c(r28) /* 80166880 001637C0 C0 22 9D 2C */ lfs f1, lbl_8045372C-_SDA2_BASE_(r2) /* 80166884 001637C4 C0 1C 0A 08 */ lfs f0, 0xa08(r28) @@ -79,7 +79,7 @@ lbl_801667F4: /* 80166894 001637D4 D0 01 00 6C */ stfs f0, 0x6c(r1) /* 80166898 001637D8 38 61 02 B0 */ addi r3, r1, 0x2b0 /* 8016689C 001637DC 38 81 00 6C */ addi r4, r1, 0x6c -/* 801668A0 001637E0 48 10 B2 15 */ bl cSGlobe_NS_Xyz +/* 801668A0 001637E0 48 10 B2 15 */ bl Xyz__7cSGlobeCFv /* 801668A4 001637E4 38 61 03 A0 */ addi r3, r1, 0x3a0 /* 801668A8 001637E8 38 81 02 B0 */ addi r4, r1, 0x2b0 /* 801668AC 001637EC 7C 65 1B 78 */ mr r5, r3 @@ -94,13 +94,13 @@ lbl_801668C4: /* 801668CC 0016380C 38 61 00 3C */ addi r3, r1, 0x3c /* 801668D0 00163810 38 81 00 72 */ addi r4, r1, 0x72 /* 801668D4 00163814 38 BC 00 62 */ addi r5, r28, 0x62 -/* 801668D8 00163818 48 10 A8 CD */ bl cSAngle_NS___mi_X1_ +/* 801668D8 00163818 48 10 A8 CD */ bl __mi__7cSAngleCFRC7cSAngle /* 801668DC 0016381C 38 61 00 40 */ addi r3, r1, 0x40 /* 801668E0 00163820 38 81 00 3C */ addi r4, r1, 0x3c -/* 801668E4 00163824 48 10 A6 85 */ bl cSAngle_X1_ +/* 801668E4 00163824 48 10 A6 85 */ bl __ct__7cSAngleFRC7cSAngle /* 801668E8 00163828 C3 7C 0A 10 */ lfs f27, 0xa10(r28) /* 801668EC 0016382C 38 61 00 40 */ addi r3, r1, 0x40 -/* 801668F0 00163830 48 10 A7 A9 */ bl cSAngle_NS_Norm +/* 801668F0 00163830 48 10 A7 A9 */ bl Norm__7cSAngleCFv /* 801668F4 00163834 FC 00 0A 10 */ fabs f0, f1 /* 801668F8 00163838 FF 40 00 18 */ frsp f26, f0 /* 801668FC 0016383C C0 02 9D 30 */ lfs f0, lbl_80453730-_SDA2_BASE_(r2) @@ -152,7 +152,7 @@ lbl_8016699C: lbl_801669A4: /* 801669A4 001638E4 C3 5C 00 5C */ lfs f26, 0x5c(r28) /* 801669A8 001638E8 38 7C 00 60 */ addi r3, r28, 0x60 -/* 801669AC 001638EC 48 10 A7 4D */ bl cSAngle_NS_Sin +/* 801669AC 001638EC 48 10 A7 4D */ bl Sin__7cSAngleCFv /* 801669B0 001638F0 EC 1A 00 72 */ fmuls f0, f26, f1 /* 801669B4 001638F4 57 BB 06 F7 */ rlwinm. r27, r29, 0, 0x1b, 0x1b /* 801669B8 001638F8 41 82 00 14 */ beq lbl_801669CC @@ -215,11 +215,11 @@ lbl_80166A78: /* 80166A88 001639C8 D0 01 00 74 */ stfs f0, 0x74(r1) /* 80166A8C 001639CC 38 61 02 A4 */ addi r3, r1, 0x2a4 /* 80166A90 001639D0 38 81 00 74 */ addi r4, r1, 0x74 -/* 80166A94 001639D4 48 10 B0 21 */ bl cSGlobe_NS_Xyz +/* 80166A94 001639D4 48 10 B0 21 */ bl Xyz__7cSGlobeCFv /* 80166A98 001639D8 38 61 02 98 */ addi r3, r1, 0x298 /* 80166A9C 001639DC 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 80166AA0 001639E0 38 A1 02 A4 */ addi r5, r1, 0x2a4 -/* 80166AA4 001639E4 48 10 00 41 */ bl cXyz_NS___pl +/* 80166AA4 001639E4 48 10 00 41 */ bl __pl__4cXyzCFRC3Vec /* 80166AA8 001639E8 38 61 03 94 */ addi r3, r1, 0x394 /* 80166AAC 001639EC 38 81 02 98 */ addi r4, r1, 0x298 /* 80166AB0 001639F0 4B F3 0D 29 */ bl cXyz_NS___as @@ -273,11 +273,11 @@ lbl_80166B50: /* 80166B60 00163AA0 D0 01 00 74 */ stfs f0, 0x74(r1) /* 80166B64 00163AA4 38 61 02 8C */ addi r3, r1, 0x28c /* 80166B68 00163AA8 38 81 00 74 */ addi r4, r1, 0x74 -/* 80166B6C 00163AAC 48 10 AF 49 */ bl cSGlobe_NS_Xyz +/* 80166B6C 00163AAC 48 10 AF 49 */ bl Xyz__7cSGlobeCFv /* 80166B70 00163AB0 38 61 02 80 */ addi r3, r1, 0x280 /* 80166B74 00163AB4 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 80166B78 00163AB8 38 A1 02 8C */ addi r5, r1, 0x28c -/* 80166B7C 00163ABC 48 0F FF 69 */ bl cXyz_NS___pl +/* 80166B7C 00163ABC 48 0F FF 69 */ bl __pl__4cXyzCFRC3Vec /* 80166B80 00163AC0 38 61 03 94 */ addi r3, r1, 0x394 /* 80166B84 00163AC4 38 81 02 80 */ addi r4, r1, 0x280 /* 80166B88 00163AC8 4B F3 0C 51 */ bl cXyz_NS___as @@ -298,11 +298,11 @@ lbl_80166B8C: /* 80166BC0 00163B00 D0 01 00 74 */ stfs f0, 0x74(r1) /* 80166BC4 00163B04 38 61 02 74 */ addi r3, r1, 0x274 /* 80166BC8 00163B08 38 81 00 74 */ addi r4, r1, 0x74 -/* 80166BCC 00163B0C 48 10 AE E9 */ bl cSGlobe_NS_Xyz +/* 80166BCC 00163B0C 48 10 AE E9 */ bl Xyz__7cSGlobeCFv /* 80166BD0 00163B10 38 61 02 68 */ addi r3, r1, 0x268 /* 80166BD4 00163B14 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 80166BD8 00163B18 38 A1 02 74 */ addi r5, r1, 0x274 -/* 80166BDC 00163B1C 48 0F FF 09 */ bl cXyz_NS___pl +/* 80166BDC 00163B1C 48 0F FF 09 */ bl __pl__4cXyzCFRC3Vec /* 80166BE0 00163B20 38 61 03 94 */ addi r3, r1, 0x394 /* 80166BE4 00163B24 38 81 02 68 */ addi r4, r1, 0x268 /* 80166BE8 00163B28 4B F3 0B F1 */ bl cXyz_NS___as @@ -313,21 +313,21 @@ lbl_80166BEC: /* 80166BF8 00163B38 2C 00 00 00 */ cmpwi r0, 0 /* 80166BFC 00163B3C 41 82 00 54 */ beq lbl_80166C50 /* 80166C00 00163B40 38 61 00 78 */ addi r3, r1, 0x78 -/* 80166C04 00163B44 48 10 A4 2D */ bl cSAngle_NS_Degree +/* 80166C04 00163B44 48 10 A4 2D */ bl Degree__7cSAngleCFv /* 80166C08 00163B48 C0 1C 03 D8 */ lfs f0, 0x3d8(r28) /* 80166C0C 00163B4C EC 20 08 2A */ fadds f1, f0, f1 /* 80166C10 00163B50 38 61 00 38 */ addi r3, r1, 0x38 -/* 80166C14 00163B54 48 10 A3 B5 */ bl cSAngle_X3_ +/* 80166C14 00163B54 48 10 A3 B5 */ bl __ct__7cSAngleFf /* 80166C18 00163B58 38 61 00 74 */ addi r3, r1, 0x74 /* 80166C1C 00163B5C 38 81 00 38 */ addi r4, r1, 0x38 /* 80166C20 00163B60 4B F2 8E 39 */ bl cSGlobe_NS_V /* 80166C24 00163B64 38 61 02 5C */ addi r3, r1, 0x25c /* 80166C28 00163B68 38 81 00 74 */ addi r4, r1, 0x74 -/* 80166C2C 00163B6C 48 10 AE 89 */ bl cSGlobe_NS_Xyz +/* 80166C2C 00163B6C 48 10 AE 89 */ bl Xyz__7cSGlobeCFv /* 80166C30 00163B70 38 61 02 50 */ addi r3, r1, 0x250 /* 80166C34 00163B74 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 80166C38 00163B78 38 A1 02 5C */ addi r5, r1, 0x25c -/* 80166C3C 00163B7C 48 0F FE A9 */ bl cXyz_NS___pl +/* 80166C3C 00163B7C 48 0F FE A9 */ bl __pl__4cXyzCFRC3Vec /* 80166C40 00163B80 38 61 03 94 */ addi r3, r1, 0x394 /* 80166C44 00163B84 38 81 02 50 */ addi r4, r1, 0x250 /* 80166C48 00163B88 4B F3 0B 91 */ bl cXyz_NS___as @@ -340,24 +340,24 @@ lbl_80166C50: /* 80166C60 00163BA0 38 61 02 44 */ addi r3, r1, 0x244 /* 80166C64 00163BA4 38 81 03 94 */ addi r4, r1, 0x394 /* 80166C68 00163BA8 38 A1 03 A0 */ addi r5, r1, 0x3a0 -/* 80166C6C 00163BAC 48 0F FE C9 */ bl cXyz_NS___mi +/* 80166C6C 00163BAC 48 0F FE C9 */ bl __mi__4cXyzCFRC3Vec /* 80166C70 00163BB0 38 61 02 38 */ addi r3, r1, 0x238 /* 80166C74 00163BB4 38 81 02 44 */ addi r4, r1, 0x244 /* 80166C78 00163BB8 4B F3 0B 7D */ bl cXyz_X1_ /* 80166C7C 00163BBC 38 61 02 2C */ addi r3, r1, 0x22c /* 80166C80 00163BC0 38 81 02 38 */ addi r4, r1, 0x238 -/* 80166C84 00163BC4 48 10 00 61 */ bl cXyz_NS_norm +/* 80166C84 00163BC4 48 10 00 61 */ bl norm__4cXyzCFv /* 80166C88 00163BC8 38 61 03 88 */ addi r3, r1, 0x388 /* 80166C8C 00163BCC 38 81 02 2C */ addi r4, r1, 0x22c /* 80166C90 00163BD0 4B F3 0B 65 */ bl cXyz_X1_ /* 80166C94 00163BD4 38 61 02 20 */ addi r3, r1, 0x220 /* 80166C98 00163BD8 38 81 03 88 */ addi r4, r1, 0x388 /* 80166C9C 00163BDC FC 20 F8 90 */ fmr f1, f31 -/* 80166CA0 00163BE0 48 0F FE E5 */ bl cXyz_NS___ml +/* 80166CA0 00163BE0 48 0F FE E5 */ bl __ml__4cXyzCFf /* 80166CA4 00163BE4 38 61 02 14 */ addi r3, r1, 0x214 /* 80166CA8 00163BE8 38 81 03 94 */ addi r4, r1, 0x394 /* 80166CAC 00163BEC 38 A1 02 20 */ addi r5, r1, 0x220 -/* 80166CB0 00163BF0 48 0F FE 35 */ bl cXyz_NS___pl +/* 80166CB0 00163BF0 48 0F FE 35 */ bl __pl__4cXyzCFRC3Vec /* 80166CB4 00163BF4 38 61 03 7C */ addi r3, r1, 0x37c /* 80166CB8 00163BF8 38 81 02 14 */ addi r4, r1, 0x214 /* 80166CBC 00163BFC 4B F3 0B 39 */ bl cXyz_X1_ @@ -428,7 +428,7 @@ lbl_80166D90: /* 80166DB0 00163CF0 38 61 02 08 */ addi r3, r1, 0x208 /* 80166DB4 00163CF4 38 81 05 84 */ addi r4, r1, 0x584 /* 80166DB8 00163CF8 38 A1 05 14 */ addi r5, r1, 0x514 -/* 80166DBC 00163CFC 48 0F FD 79 */ bl cXyz_NS___mi +/* 80166DBC 00163CFC 48 0F FD 79 */ bl __mi__4cXyzCFRC3Vec /* 80166DC0 00163D00 38 61 01 FC */ addi r3, r1, 0x1fc /* 80166DC4 00163D04 38 81 02 08 */ addi r4, r1, 0x208 /* 80166DC8 00163D08 4B F3 0A 2D */ bl cXyz_X1_ @@ -518,11 +518,11 @@ lbl_80166EC8: /* 80166EF8 00163E38 38 61 01 F0 */ addi r3, r1, 0x1f0 /* 80166EFC 00163E3C 38 81 03 4C */ addi r4, r1, 0x34c /* 80166F00 00163E40 38 A1 03 40 */ addi r5, r1, 0x340 -/* 80166F04 00163E44 48 0F FB E1 */ bl cXyz_NS___pl +/* 80166F04 00163E44 48 0F FB E1 */ bl __pl__4cXyzCFRC3Vec /* 80166F08 00163E48 38 61 01 E4 */ addi r3, r1, 0x1e4 /* 80166F0C 00163E4C 38 81 01 F0 */ addi r4, r1, 0x1f0 /* 80166F10 00163E50 C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) -/* 80166F14 00163E54 48 0F FC 71 */ bl cXyz_NS___ml +/* 80166F14 00163E54 48 0F FC 71 */ bl __ml__4cXyzCFf /* 80166F18 00163E58 38 61 03 64 */ addi r3, r1, 0x364 /* 80166F1C 00163E5C 38 81 01 E4 */ addi r4, r1, 0x1e4 /* 80166F20 00163E60 4B F3 08 B9 */ bl cXyz_NS___as @@ -530,13 +530,13 @@ lbl_80166EC8: /* 80166F28 00163E68 38 81 03 F8 */ addi r4, r1, 0x3f8 /* 80166F2C 00163E6C 38 A1 03 64 */ addi r5, r1, 0x364 /* 80166F30 00163E70 38 C1 03 70 */ addi r6, r1, 0x370 -/* 80166F34 00163E74 48 10 7C 05 */ bl cM3d_2PlaneLinePosNearPos +/* 80166F34 00163E74 48 10 7C 05 */ bl cM3d_2PlaneLinePosNearPos__FRC8cM3dGPlaRC8cM3dGPlaPC3VecP3Vec /* 80166F38 00163E78 2C 03 00 00 */ cmpwi r3, 0 /* 80166F3C 00163E7C 41 82 02 78 */ beq lbl_801671B4 /* 80166F40 00163E80 38 61 01 D8 */ addi r3, r1, 0x1d8 /* 80166F44 00163E84 38 81 04 0C */ addi r4, r1, 0x40c /* 80166F48 00163E88 38 A1 03 F8 */ addi r5, r1, 0x3f8 -/* 80166F4C 00163E8C 48 0F FB 99 */ bl cXyz_NS___pl +/* 80166F4C 00163E8C 48 0F FB 99 */ bl __pl__4cXyzCFRC3Vec /* 80166F50 00163E90 38 7C 00 9C */ addi r3, r28, 0x9c /* 80166F54 00163E94 38 81 01 D8 */ addi r4, r1, 0x1d8 /* 80166F58 00163E98 4B F3 08 81 */ bl cXyz_NS___as @@ -546,11 +546,11 @@ lbl_80166EC8: /* 80166F68 00163EA8 38 61 01 CC */ addi r3, r1, 0x1cc /* 80166F6C 00163EAC 38 9C 00 9C */ addi r4, r28, 0x9c /* 80166F70 00163EB0 C0 22 9C F8 */ lfs f1, lbl_804536F8-_SDA2_BASE_(r2) -/* 80166F74 00163EB4 48 0F FC 11 */ bl cXyz_NS___ml +/* 80166F74 00163EB4 48 0F FC 11 */ bl __ml__4cXyzCFf /* 80166F78 00163EB8 38 61 01 C0 */ addi r3, r1, 0x1c0 /* 80166F7C 00163EBC 38 81 03 70 */ addi r4, r1, 0x370 /* 80166F80 00163EC0 38 A1 01 CC */ addi r5, r1, 0x1cc -/* 80166F84 00163EC4 48 0F FB 61 */ bl cXyz_NS___pl +/* 80166F84 00163EC4 48 0F FB 61 */ bl __pl__4cXyzCFRC3Vec /* 80166F88 00163EC8 38 61 03 34 */ addi r3, r1, 0x334 /* 80166F8C 00163ECC 38 81 01 C0 */ addi r4, r1, 0x1c0 /* 80166F90 00163ED0 4B F3 08 65 */ bl cXyz_X1_ @@ -592,7 +592,7 @@ lbl_80166EC8: /* 80167020 00163F60 38 61 01 B4 */ addi r3, r1, 0x1b4 /* 80167024 00163F64 38 9C 00 3C */ addi r4, r28, 0x3c /* 80167028 00163F68 38 BC 00 70 */ addi r5, r28, 0x70 -/* 8016702C 00163F6C 48 0F FB 09 */ bl cXyz_NS___mi +/* 8016702C 00163F6C 48 0F FB 09 */ bl __mi__4cXyzCFRC3Vec /* 80167030 00163F70 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 80167034 00163F74 38 81 01 B4 */ addi r4, r1, 0x1b4 /* 80167038 00163F78 4B F3 07 BD */ bl cXyz_X1_ @@ -633,25 +633,25 @@ lbl_8016708C: /* 801670B8 00163FF8 38 81 00 78 */ addi r4, r1, 0x78 /* 801670BC 00163FFC 3B 5C 00 2C */ addi r26, r28, 0x2c /* 801670C0 00164000 7F 45 D3 78 */ mr r5, r26 -/* 801670C4 00164004 48 10 A0 E1 */ bl cSAngle_NS___mi_X1_ +/* 801670C4 00164004 48 10 A0 E1 */ bl __mi__7cSAngleCFRC7cSAngle /* 801670C8 00164008 38 61 00 30 */ addi r3, r1, 0x30 /* 801670CC 0016400C 38 81 00 34 */ addi r4, r1, 0x34 /* 801670D0 00164010 FC 20 C8 90 */ fmr f1, f25 -/* 801670D4 00164014 48 10 A1 91 */ bl cSAngle_NS___ml +/* 801670D4 00164014 48 10 A1 91 */ bl __ml__7cSAngleCFf /* 801670D8 00164018 38 61 00 2C */ addi r3, r1, 0x2c /* 801670DC 0016401C 7F 44 D3 78 */ mr r4, r26 /* 801670E0 00164020 38 A1 00 30 */ addi r5, r1, 0x30 -/* 801670E4 00164024 48 10 A0 91 */ bl cSAngle_NS___pl +/* 801670E4 00164024 48 10 A0 91 */ bl __pl__7cSAngleCFRC7cSAngle /* 801670E8 00164028 38 61 00 74 */ addi r3, r1, 0x74 /* 801670EC 0016402C 38 81 00 2C */ addi r4, r1, 0x2c /* 801670F0 00164030 4B F2 89 69 */ bl cSGlobe_NS_V /* 801670F4 00164034 38 61 01 9C */ addi r3, r1, 0x19c /* 801670F8 00164038 38 81 00 74 */ addi r4, r1, 0x74 -/* 801670FC 0016403C 48 10 A9 B9 */ bl cSGlobe_NS_Xyz +/* 801670FC 0016403C 48 10 A9 B9 */ bl Xyz__7cSGlobeCFv /* 80167100 00164040 38 61 01 90 */ addi r3, r1, 0x190 /* 80167104 00164044 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 80167108 00164048 38 A1 01 9C */ addi r5, r1, 0x19c -/* 8016710C 0016404C 48 0F F9 D9 */ bl cXyz_NS___pl +/* 8016710C 0016404C 48 0F F9 D9 */ bl __pl__4cXyzCFRC3Vec /* 80167110 00164050 38 61 03 7C */ addi r3, r1, 0x37c /* 80167114 00164054 38 81 01 90 */ addi r4, r1, 0x190 /* 80167118 00164058 4B F3 06 C1 */ bl cXyz_NS___as @@ -733,26 +733,26 @@ lbl_80167208: lbl_80167228: /* 80167228 00164168 38 61 00 54 */ addi r3, r1, 0x54 /* 8016722C 0016416C 38 81 04 0C */ addi r4, r1, 0x40c -/* 80167230 00164170 48 10 A6 51 */ bl cSGlobe_X4_ +/* 80167230 00164170 48 10 A6 51 */ bl __ct__7cSGlobeFRC4cXyz /* 80167234 00164174 38 61 00 28 */ addi r3, r1, 0x28 /* 80167238 00164178 3B 61 00 58 */ addi r27, r1, 0x58 /* 8016723C 0016417C 7F 64 DB 78 */ mr r4, r27 /* 80167240 00164180 38 AD 8C 10 */ addi r5, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ -/* 80167244 00164184 48 10 9F 31 */ bl cSAngle_NS___pl +/* 80167244 00164184 48 10 9F 31 */ bl __pl__7cSAngleCFRC7cSAngle /* 80167248 00164188 38 61 00 54 */ addi r3, r1, 0x54 /* 8016724C 0016418C 38 81 00 28 */ addi r4, r1, 0x28 /* 80167250 00164190 4B F2 88 09 */ bl cSGlobe_NS_V /* 80167254 00164194 7F 63 DB 78 */ mr r3, r27 -/* 80167258 00164198 48 10 9E A1 */ bl cSAngle_NS_Sin +/* 80167258 00164198 48 10 9E A1 */ bl Sin__7cSAngleCFv /* 8016725C 0016419C EC 19 00 72 */ fmuls f0, f25, f1 /* 80167260 001641A0 D0 01 00 54 */ stfs f0, 0x54(r1) /* 80167264 001641A4 38 61 01 78 */ addi r3, r1, 0x178 /* 80167268 001641A8 38 81 00 54 */ addi r4, r1, 0x54 -/* 8016726C 001641AC 48 10 A8 49 */ bl cSGlobe_NS_Xyz +/* 8016726C 001641AC 48 10 A8 49 */ bl Xyz__7cSGlobeCFv /* 80167270 001641B0 38 61 01 6C */ addi r3, r1, 0x16c /* 80167274 001641B4 38 81 03 7C */ addi r4, r1, 0x37c /* 80167278 001641B8 38 A1 01 78 */ addi r5, r1, 0x178 -/* 8016727C 001641BC 48 0F F8 69 */ bl cXyz_NS___pl +/* 8016727C 001641BC 48 0F F8 69 */ bl __pl__4cXyzCFRC3Vec /* 80167280 001641C0 38 61 03 28 */ addi r3, r1, 0x328 /* 80167284 001641C4 38 81 01 6C */ addi r4, r1, 0x16c /* 80167288 001641C8 4B F3 05 6D */ bl cXyz_X1_ @@ -821,13 +821,13 @@ lbl_80167360: /* 80167360 001642A0 EF 21 00 32 */ fmuls f25, f1, f0 /* 80167364 001642A4 38 61 01 60 */ addi r3, r1, 0x160 /* 80167368 001642A8 38 81 03 1C */ addi r4, r1, 0x31c -/* 8016736C 001642AC 48 0F F9 79 */ bl cXyz_NS_norm +/* 8016736C 001642AC 48 0F F9 79 */ bl norm__4cXyzCFv /* 80167370 001642B0 7F 63 DB 78 */ mr r3, r27 -/* 80167374 001642B4 48 10 9D 85 */ bl cSAngle_NS_Sin +/* 80167374 001642B4 48 10 9D 85 */ bl Sin__7cSAngleCFv /* 80167378 001642B8 EC 39 00 72 */ fmuls f1, f25, f1 /* 8016737C 001642BC 38 61 01 54 */ addi r3, r1, 0x154 /* 80167380 001642C0 38 81 01 60 */ addi r4, r1, 0x160 -/* 80167384 001642C4 48 0F F8 01 */ bl cXyz_NS___ml +/* 80167384 001642C4 48 0F F8 01 */ bl __ml__4cXyzCFf /* 80167388 001642C8 38 61 03 A0 */ addi r3, r1, 0x3a0 /* 8016738C 001642CC 38 81 01 54 */ addi r4, r1, 0x154 /* 80167390 001642D0 7C 65 1B 78 */ mr r5, r3 @@ -835,29 +835,29 @@ lbl_80167360: /* 80167398 001642D8 38 61 01 48 */ addi r3, r1, 0x148 /* 8016739C 001642DC 38 81 03 28 */ addi r4, r1, 0x328 /* 801673A0 001642E0 38 A1 03 A0 */ addi r5, r1, 0x3a0 -/* 801673A4 001642E4 48 0F F7 91 */ bl cXyz_NS___mi +/* 801673A4 001642E4 48 0F F7 91 */ bl __mi__4cXyzCFRC3Vec /* 801673A8 001642E8 38 61 00 4C */ addi r3, r1, 0x4c /* 801673AC 001642EC 38 81 01 48 */ addi r4, r1, 0x148 -/* 801673B0 001642F0 48 10 A4 D1 */ bl cSGlobe_X4_ +/* 801673B0 001642F0 48 10 A4 D1 */ bl __ct__7cSGlobeFRC4cXyz /* 801673B4 001642F4 38 61 00 24 */ addi r3, r1, 0x24 /* 801673B8 001642F8 38 81 00 50 */ addi r4, r1, 0x50 /* 801673BC 001642FC 3B 5C 00 2C */ addi r26, r28, 0x2c /* 801673C0 00164300 7F 45 D3 78 */ mr r5, r26 -/* 801673C4 00164304 48 10 9D E1 */ bl cSAngle_NS___mi_X1_ +/* 801673C4 00164304 48 10 9D E1 */ bl __mi__7cSAngleCFRC7cSAngle /* 801673C8 00164308 38 61 00 20 */ addi r3, r1, 0x20 /* 801673CC 0016430C 38 81 00 24 */ addi r4, r1, 0x24 /* 801673D0 00164310 C0 3C 09 68 */ lfs f1, 0x968(r28) -/* 801673D4 00164314 48 10 9E 91 */ bl cSAngle_NS___ml +/* 801673D4 00164314 48 10 9E 91 */ bl __ml__7cSAngleCFf /* 801673D8 00164318 38 61 00 1C */ addi r3, r1, 0x1c /* 801673DC 0016431C 7F 44 D3 78 */ mr r4, r26 /* 801673E0 00164320 38 A1 00 20 */ addi r5, r1, 0x20 -/* 801673E4 00164324 48 10 9D 91 */ bl cSAngle_NS___pl +/* 801673E4 00164324 48 10 9D 91 */ bl __pl__7cSAngleCFRC7cSAngle /* 801673E8 00164328 38 61 00 4C */ addi r3, r1, 0x4c /* 801673EC 0016432C 38 81 00 1C */ addi r4, r1, 0x1c /* 801673F0 00164330 4B F2 86 69 */ bl cSGlobe_NS_V /* 801673F4 00164334 38 61 00 18 */ addi r3, r1, 0x18 /* 801673F8 00164338 C0 22 9D 54 */ lfs f1, lbl_80453754-_SDA2_BASE_(r2) -/* 801673FC 0016433C 48 10 9B CD */ bl cSAngle_X3_ +/* 801673FC 0016433C 48 10 9B CD */ bl __ct__7cSAngleFf /* 80167400 00164340 A8 81 00 50 */ lha r4, 0x50(r1) /* 80167404 00164344 A8 01 00 18 */ lha r0, 0x18(r1) /* 80167408 00164348 7C 80 02 78 */ xor r0, r4, r0 @@ -868,7 +868,7 @@ lbl_80167360: /* 8016741C 0016435C 41 82 00 1C */ beq lbl_80167438 /* 80167420 00164360 38 61 00 14 */ addi r3, r1, 0x14 /* 80167424 00164364 C0 22 9D 54 */ lfs f1, lbl_80453754-_SDA2_BASE_(r2) -/* 80167428 00164368 48 10 9B A1 */ bl cSAngle_X3_ +/* 80167428 00164368 48 10 9B A1 */ bl __ct__7cSAngleFf /* 8016742C 0016436C 38 61 00 4C */ addi r3, r1, 0x4c /* 80167430 00164370 38 81 00 14 */ addi r4, r1, 0x14 /* 80167434 00164374 4B F2 86 25 */ bl cSGlobe_NS_V @@ -878,11 +878,11 @@ lbl_80167438: /* 80167440 00164380 D0 01 00 4C */ stfs f0, 0x4c(r1) /* 80167444 00164384 38 61 01 3C */ addi r3, r1, 0x13c /* 80167448 00164388 38 81 00 4C */ addi r4, r1, 0x4c -/* 8016744C 0016438C 48 10 A6 69 */ bl cSGlobe_NS_Xyz +/* 8016744C 0016438C 48 10 A6 69 */ bl Xyz__7cSGlobeCFv /* 80167450 00164390 38 61 01 30 */ addi r3, r1, 0x130 /* 80167454 00164394 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 80167458 00164398 38 A1 01 3C */ addi r5, r1, 0x13c -/* 8016745C 0016439C 48 0F F6 89 */ bl cXyz_NS___pl +/* 8016745C 0016439C 48 0F F6 89 */ bl __pl__4cXyzCFRC3Vec /* 80167460 001643A0 38 61 03 7C */ addi r3, r1, 0x37c /* 80167464 001643A4 38 81 01 30 */ addi r4, r1, 0x130 /* 80167468 001643A8 4B F3 03 71 */ bl cXyz_NS___as @@ -973,7 +973,7 @@ lbl_80167590: /* 801675AC 001644EC 38 61 01 0C */ addi r3, r1, 0x10c /* 801675B0 001644F0 38 9C 00 3C */ addi r4, r28, 0x3c /* 801675B4 001644F4 38 BC 00 70 */ addi r5, r28, 0x70 -/* 801675B8 001644F8 48 0F F5 7D */ bl cXyz_NS___mi +/* 801675B8 001644F8 48 0F F5 7D */ bl __mi__4cXyzCFRC3Vec /* 801675BC 001644FC 38 61 01 00 */ addi r3, r1, 0x100 /* 801675C0 00164500 38 81 01 0C */ addi r4, r1, 0x10c /* 801675C4 00164504 4B F3 02 31 */ bl cXyz_X1_ @@ -1020,25 +1020,25 @@ lbl_80167618: /* 8016765C 0016459C 38 81 00 78 */ addi r4, r1, 0x78 /* 80167660 001645A0 3B 3C 00 2C */ addi r25, r28, 0x2c /* 80167664 001645A4 7F 25 CB 78 */ mr r5, r25 -/* 80167668 001645A8 48 10 9B 3D */ bl cSAngle_NS___mi_X1_ +/* 80167668 001645A8 48 10 9B 3D */ bl __mi__7cSAngleCFRC7cSAngle /* 8016766C 001645AC 38 61 00 0C */ addi r3, r1, 0xc /* 80167670 001645B0 38 81 00 10 */ addi r4, r1, 0x10 /* 80167674 001645B4 FC 20 C8 90 */ fmr f1, f25 -/* 80167678 001645B8 48 10 9B ED */ bl cSAngle_NS___ml +/* 80167678 001645B8 48 10 9B ED */ bl __ml__7cSAngleCFf /* 8016767C 001645BC 38 61 00 08 */ addi r3, r1, 8 /* 80167680 001645C0 7F 24 CB 78 */ mr r4, r25 /* 80167684 001645C4 38 A1 00 0C */ addi r5, r1, 0xc -/* 80167688 001645C8 48 10 9A ED */ bl cSAngle_NS___pl +/* 80167688 001645C8 48 10 9A ED */ bl __pl__7cSAngleCFRC7cSAngle /* 8016768C 001645CC 38 61 00 74 */ addi r3, r1, 0x74 /* 80167690 001645D0 38 81 00 08 */ addi r4, r1, 8 /* 80167694 001645D4 4B F2 83 C5 */ bl cSGlobe_NS_V /* 80167698 001645D8 38 61 00 F4 */ addi r3, r1, 0xf4 /* 8016769C 001645DC 38 81 00 74 */ addi r4, r1, 0x74 -/* 801676A0 001645E0 48 10 A4 15 */ bl cSGlobe_NS_Xyz +/* 801676A0 001645E0 48 10 A4 15 */ bl Xyz__7cSGlobeCFv /* 801676A4 001645E4 38 61 00 E8 */ addi r3, r1, 0xe8 /* 801676A8 001645E8 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 801676AC 001645EC 38 A1 00 F4 */ addi r5, r1, 0xf4 -/* 801676B0 001645F0 48 0F F4 35 */ bl cXyz_NS___pl +/* 801676B0 001645F0 48 0F F4 35 */ bl __pl__4cXyzCFRC3Vec /* 801676B4 001645F4 38 61 03 7C */ addi r3, r1, 0x37c /* 801676B8 001645F8 38 81 00 E8 */ addi r4, r1, 0xe8 /* 801676BC 001645FC 4B F3 01 1D */ bl cXyz_NS___as @@ -1165,12 +1165,12 @@ lbl_80167860: /* 8016787C 001647BC 38 61 03 AC */ addi r3, r1, 0x3ac /* 80167880 001647C0 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 80167884 001647C4 38 A1 03 94 */ addi r5, r1, 0x394 -/* 80167888 001647C8 48 10 7A 21 */ bl cM3dGLin +/* 80167888 001647C8 48 10 7A 21 */ bl __ct__8cM3dGLinFRC4cXyzRC4cXyz /* 8016788C 001647CC 38 61 03 C8 */ addi r3, r1, 0x3c8 /* 80167890 001647D0 38 81 03 AC */ addi r4, r1, 0x3ac /* 80167894 001647D4 38 A1 02 F8 */ addi r5, r1, 0x2f8 /* 80167898 001647D8 38 C1 02 EC */ addi r6, r1, 0x2ec -/* 8016789C 001647DC 48 10 50 A9 */ bl cM3d_Cross_CylLin +/* 8016789C 001647DC 48 10 50 A9 */ bl cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec /* 801678A0 001647E0 2C 03 00 00 */ cmpwi r3, 0 /* 801678A4 001647E4 41 82 00 68 */ beq lbl_8016790C /* 801678A8 001647E8 C0 21 02 F8 */ lfs f1, 0x2f8(r1) @@ -1185,15 +1185,15 @@ lbl_80167860: /* 801678CC 0016480C D0 01 02 E8 */ stfs f0, 0x2e8(r1) /* 801678D0 00164810 38 61 00 D0 */ addi r3, r1, 0xd0 /* 801678D4 00164814 38 81 02 E0 */ addi r4, r1, 0x2e0 -/* 801678D8 00164818 48 0F F6 1D */ bl cXyz_NS_normalize +/* 801678D8 00164818 48 0F F6 1D */ bl normalize__4cXyzFv /* 801678DC 0016481C 38 61 00 C4 */ addi r3, r1, 0xc4 /* 801678E0 00164820 38 81 02 E0 */ addi r4, r1, 0x2e0 /* 801678E4 00164824 C0 22 9C F8 */ lfs f1, lbl_804536F8-_SDA2_BASE_(r2) -/* 801678E8 00164828 48 0F F2 9D */ bl cXyz_NS___ml +/* 801678E8 00164828 48 0F F2 9D */ bl __ml__4cXyzCFf /* 801678EC 0016482C 38 61 00 B8 */ addi r3, r1, 0xb8 /* 801678F0 00164830 38 81 02 F8 */ addi r4, r1, 0x2f8 /* 801678F4 00164834 38 A1 00 C4 */ addi r5, r1, 0xc4 -/* 801678F8 00164838 48 0F F1 ED */ bl cXyz_NS___pl +/* 801678F8 00164838 48 0F F1 ED */ bl __pl__4cXyzCFRC3Vec /* 801678FC 0016483C 38 61 03 94 */ addi r3, r1, 0x394 /* 80167900 00164840 38 81 00 B8 */ addi r4, r1, 0xb8 /* 80167904 00164844 4B F2 FE D5 */ bl cXyz_NS___as @@ -1220,7 +1220,7 @@ lbl_8016793C: /* 80167948 00164888 4B F0 FC 35 */ bl dBgS_GndChk /* 8016794C 0016488C 38 61 04 20 */ addi r3, r1, 0x420 /* 80167950 00164890 38 81 03 94 */ addi r4, r1, 0x394 -/* 80167954 00164894 48 10 03 D5 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 80167954 00164894 48 10 03 D5 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80167958 00164898 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8016795C 0016489C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80167960 001648A0 38 63 0F 38 */ addi r3, r3, 0xf38 @@ -1240,11 +1240,11 @@ lbl_8016793C: /* 80167998 001648D8 38 61 00 AC */ addi r3, r1, 0xac /* 8016799C 001648DC 38 81 02 D4 */ addi r4, r1, 0x2d4 /* 801679A0 001648E0 38 A1 02 C8 */ addi r5, r1, 0x2c8 -/* 801679A4 001648E4 48 0F F1 91 */ bl cXyz_NS___mi +/* 801679A4 001648E4 48 0F F1 91 */ bl __mi__4cXyzCFRC3Vec /* 801679A8 001648E8 38 61 00 A0 */ addi r3, r1, 0xa0 /* 801679AC 001648EC 38 81 00 AC */ addi r4, r1, 0xac /* 801679B0 001648F0 C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) -/* 801679B4 001648F4 48 0F F1 D1 */ bl cXyz_NS___ml +/* 801679B4 001648F4 48 0F F1 D1 */ bl __ml__4cXyzCFf /* 801679B8 001648F8 38 61 02 C8 */ addi r3, r1, 0x2c8 /* 801679BC 001648FC 38 81 00 A0 */ addi r4, r1, 0xa0 /* 801679C0 00164900 7C 65 1B 78 */ mr r5, r3 @@ -1260,11 +1260,11 @@ lbl_801679CC: /* 801679E4 00164924 38 61 00 94 */ addi r3, r1, 0x94 /* 801679E8 00164928 38 81 02 C8 */ addi r4, r1, 0x2c8 /* 801679EC 0016492C 38 A1 02 D4 */ addi r5, r1, 0x2d4 -/* 801679F0 00164930 48 0F F1 45 */ bl cXyz_NS___mi +/* 801679F0 00164930 48 0F F1 45 */ bl __mi__4cXyzCFRC3Vec /* 801679F4 00164934 38 61 00 88 */ addi r3, r1, 0x88 /* 801679F8 00164938 38 81 00 94 */ addi r4, r1, 0x94 /* 801679FC 0016493C C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) -/* 80167A00 00164940 48 0F F1 85 */ bl cXyz_NS___ml +/* 80167A00 00164940 48 0F F1 85 */ bl __ml__4cXyzCFf /* 80167A04 00164944 38 61 02 D4 */ addi r3, r1, 0x2d4 /* 80167A08 00164948 38 81 00 88 */ addi r4, r1, 0x88 /* 80167A0C 0016494C 7C 65 1B 78 */ mr r5, r3 @@ -1341,10 +1341,10 @@ lbl_80167AF4: /* 80167B14 00164A54 38 61 00 7C */ addi r3, r1, 0x7c /* 80167B18 00164A58 38 81 03 94 */ addi r4, r1, 0x394 /* 80167B1C 00164A5C 38 A1 03 A0 */ addi r5, r1, 0x3a0 -/* 80167B20 00164A60 48 0F F0 15 */ bl cXyz_NS___mi +/* 80167B20 00164A60 48 0F F0 15 */ bl __mi__4cXyzCFRC3Vec /* 80167B24 00164A64 38 61 00 74 */ addi r3, r1, 0x74 /* 80167B28 00164A68 38 81 00 7C */ addi r4, r1, 0x7c -/* 80167B2C 00164A6C 48 10 9F 45 */ bl cSGlobe_NS_Val_X3_ +/* 80167B2C 00164A6C 48 10 9F 45 */ bl Val__7cSGlobeFRC4cXyz lbl_80167B30: /* 80167B30 00164A70 38 7C 00 28 */ addi r3, r28, 0x28 /* 80167B34 00164A74 38 81 00 74 */ addi r4, r1, 0x74 diff --git a/include/d/d_camera/asm/func_80167CD8.s b/include/d/d_camera/asm/func_80167CD8.s index 5e96f31107..cefc43f1e0 100644 --- a/include/d/d_camera/asm/func_80167CD8.s +++ b/include/d/d_camera/asm/func_80167CD8.s @@ -25,11 +25,11 @@ /* 80167D38 00164C78 38 61 00 20 */ addi r3, r1, 0x20 /* 80167D3C 00164C7C 38 81 00 2C */ addi r4, r1, 0x2c /* 80167D40 00164C80 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80167D44 00164C84 48 0F ED F1 */ bl cXyz_NS___mi +/* 80167D44 00164C84 48 0F ED F1 */ bl __mi__4cXyzCFRC3Vec /* 80167D48 00164C88 38 61 00 14 */ addi r3, r1, 0x14 /* 80167D4C 00164C8C 38 81 00 20 */ addi r4, r1, 0x20 /* 80167D50 00164C90 C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) -/* 80167D54 00164C94 48 0F EE 31 */ bl cXyz_NS___ml +/* 80167D54 00164C94 48 0F EE 31 */ bl __ml__4cXyzCFf /* 80167D58 00164C98 38 61 00 44 */ addi r3, r1, 0x44 /* 80167D5C 00164C9C 38 81 00 14 */ addi r4, r1, 0x14 /* 80167D60 00164CA0 7C 65 1B 78 */ mr r5, r3 @@ -62,7 +62,7 @@ /* 80167DCC 00164D0C 38 61 00 08 */ addi r3, r1, 8 /* 80167DD0 00164D10 38 81 00 50 */ addi r4, r1, 0x50 /* 80167DD4 00164D14 FC 20 F8 90 */ fmr f1, f31 -/* 80167DD8 00164D18 48 0F ED AD */ bl cXyz_NS___ml +/* 80167DD8 00164D18 48 0F ED AD */ bl __ml__4cXyzCFf /* 80167DDC 00164D1C 7F E3 FB 78 */ mr r3, r31 /* 80167DE0 00164D20 38 81 00 08 */ addi r4, r1, 8 /* 80167DE4 00164D24 7F E5 FB 78 */ mr r5, r31 diff --git a/include/d/d_camera/asm/func_80167E3C.s b/include/d/d_camera/asm/func_80167E3C.s index 976cffb0c0..d92874955f 100644 --- a/include/d/d_camera/asm/func_80167E3C.s +++ b/include/d/d_camera/asm/func_80167E3C.s @@ -17,10 +17,10 @@ /* 80167E7C 00164DBC 38 61 00 28 */ addi r3, r1, 0x28 /* 80167E80 00164DC0 7F E4 FB 78 */ mr r4, r31 /* 80167E84 00164DC4 38 A1 00 40 */ addi r5, r1, 0x40 -/* 80167E88 00164DC8 48 0F EC AD */ bl cXyz_NS___mi +/* 80167E88 00164DC8 48 0F EC AD */ bl __mi__4cXyzCFRC3Vec /* 80167E8C 00164DCC 38 61 00 08 */ addi r3, r1, 8 /* 80167E90 00164DD0 38 81 00 28 */ addi r4, r1, 0x28 -/* 80167E94 00164DD4 48 10 99 ED */ bl cSGlobe_X4_ +/* 80167E94 00164DD4 48 10 99 ED */ bl __ct__7cSGlobeFRC4cXyz /* 80167E98 00164DD8 C0 21 00 08 */ lfs f1, 8(r1) /* 80167E9C 00164DDC C0 02 9D 34 */ lfs f0, lbl_80453734-_SDA2_BASE_(r2) /* 80167EA0 00164DE0 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -28,11 +28,11 @@ /* 80167EA8 00164DE8 D0 01 00 08 */ stfs f0, 8(r1) /* 80167EAC 00164DEC 38 61 00 1C */ addi r3, r1, 0x1c /* 80167EB0 00164DF0 38 81 00 08 */ addi r4, r1, 8 -/* 80167EB4 00164DF4 48 10 9C 01 */ bl cSGlobe_NS_Xyz +/* 80167EB4 00164DF4 48 10 9C 01 */ bl Xyz__7cSGlobeCFv /* 80167EB8 00164DF8 38 61 00 10 */ addi r3, r1, 0x10 /* 80167EBC 00164DFC 38 81 00 40 */ addi r4, r1, 0x40 /* 80167EC0 00164E00 38 A1 00 1C */ addi r5, r1, 0x1c -/* 80167EC4 00164E04 48 0F EC 21 */ bl cXyz_NS___pl +/* 80167EC4 00164E04 48 0F EC 21 */ bl __pl__4cXyzCFRC3Vec /* 80167EC8 00164E08 C0 01 00 10 */ lfs f0, 0x10(r1) /* 80167ECC 00164E0C D0 1F 00 00 */ stfs f0, 0(r31) /* 80167ED0 00164E10 C0 01 00 14 */ lfs f0, 0x14(r1) diff --git a/include/d/d_camera/asm/func_80167EF4.s b/include/d/d_camera/asm/func_80167EF4.s index d1b01f9dc5..de174087da 100644 --- a/include/d/d_camera/asm/func_80167EF4.s +++ b/include/d/d_camera/asm/func_80167EF4.s @@ -38,7 +38,7 @@ lbl_80167F80: /* 80167F84 00164EC4 4B F0 FA 7D */ bl dBgS_CamGndChk_Wtr /* 80167F88 00164EC8 38 61 00 14 */ addi r3, r1, 0x14 /* 80167F8C 00164ECC 38 81 00 08 */ addi r4, r1, 8 -/* 80167F90 00164ED0 48 0F FD 99 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 80167F90 00164ED0 48 0F FD 99 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80167F94 00164ED4 7F E3 FB 78 */ mr r3, r31 /* 80167F98 00164ED8 38 81 00 14 */ addi r4, r1, 0x14 /* 80167F9C 00164EDC 4B F0 C5 05 */ bl cBgS_NS_GroundCross diff --git a/include/d/d_camera/asm/func_80167FEC.s b/include/d/d_camera/asm/func_80167FEC.s index dad0075fa1..a8bb4cff41 100644 --- a/include/d/d_camera/asm/func_80167FEC.s +++ b/include/d/d_camera/asm/func_80167FEC.s @@ -94,7 +94,7 @@ lbl_80168110: /* 80168158 00165098 4B F1 0D 11 */ bl dBgS_PolyPassChk_NS_SetObj /* 8016815C 0016509C 38 61 00 8C */ addi r3, r1, 0x8c /* 80168160 001650A0 38 81 00 80 */ addi r4, r1, 0x80 -/* 80168164 001650A4 48 0F FB C5 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 80168164 001650A4 48 0F FB C5 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80168168 001650A8 7F E3 FB 78 */ mr r3, r31 /* 8016816C 001650AC 38 81 00 8C */ addi r4, r1, 0x8c /* 80168170 001650B0 4B F0 C3 31 */ bl cBgS_NS_GroundCross @@ -105,7 +105,7 @@ lbl_80168110: /* 80168184 001650C4 4B F1 0C F1 */ bl dBgS_PolyPassChk_NS_ClrObj /* 80168188 001650C8 38 7C 03 2C */ addi r3, r28, 0x32c /* 8016818C 001650CC 38 81 00 80 */ addi r4, r1, 0x80 -/* 80168190 001650D0 48 0F FB 99 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 80168190 001650D0 48 0F FB 99 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80168194 001650D4 7F E3 FB 78 */ mr r3, r31 /* 80168198 001650D8 38 9C 03 2C */ addi r4, r28, 0x32c /* 8016819C 001650DC 4B F0 C3 05 */ bl cBgS_NS_GroundCross @@ -176,7 +176,7 @@ lbl_80168284: /* 8016829C 001651DC 98 1C 03 28 */ stb r0, 0x328(r28) /* 801682A0 001651E0 38 7C 02 D0 */ addi r3, r28, 0x2d0 /* 801682A4 001651E4 38 81 00 74 */ addi r4, r1, 0x74 -/* 801682A8 001651E8 48 0F FA 81 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 801682A8 001651E8 48 0F FA 81 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 801682AC 001651EC 7F E3 FB 78 */ mr r3, r31 /* 801682B0 001651F0 38 9C 02 D0 */ addi r4, r28, 0x2d0 /* 801682B4 001651F4 4B F0 C1 ED */ bl cBgS_NS_GroundCross @@ -351,14 +351,14 @@ lbl_801684C4: /* 80168530 00165470 4B F2 F2 09 */ bl dCamera_c_NS_directionOf /* 80168534 00165474 38 61 00 10 */ addi r3, r1, 0x10 /* 80168538 00165478 38 81 00 0C */ addi r4, r1, 0xc -/* 8016853C 0016547C 48 10 8A 2D */ bl cSAngle_X1_ +/* 8016853C 0016547C 48 10 8A 2D */ bl __ct__7cSAngleFRC7cSAngle /* 80168540 00165480 88 1C 03 8C */ lbz r0, 0x38c(r28) /* 80168544 00165484 28 00 00 00 */ cmplwi r0, 0 /* 80168548 00165488 41 82 00 44 */ beq lbl_8016858C /* 8016854C 0016548C 38 61 00 20 */ addi r3, r1, 0x20 /* 80168550 00165490 38 9C 03 9C */ addi r4, r28, 0x39c /* 80168554 00165494 38 A1 00 68 */ addi r5, r1, 0x68 -/* 80168558 00165498 48 0F E5 DD */ bl cXyz_NS___mi +/* 80168558 00165498 48 0F E5 DD */ bl __mi__4cXyzCFRC3Vec /* 8016855C 0016549C C0 01 00 20 */ lfs f0, 0x20(r1) /* 80168560 001654A0 D0 1C 03 90 */ stfs f0, 0x390(r28) /* 80168564 001654A4 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -368,7 +368,7 @@ lbl_801684C4: /* 80168574 001654B4 38 61 00 08 */ addi r3, r1, 8 /* 80168578 001654B8 38 9C 03 AA */ addi r4, r28, 0x3aa /* 8016857C 001654BC 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80168580 001654C0 48 10 8C 25 */ bl cSAngle_NS___mi_X1_ +/* 80168580 001654C0 48 10 8C 25 */ bl __mi__7cSAngleCFRC7cSAngle /* 80168584 001654C4 A8 01 00 08 */ lha r0, 8(r1) /* 80168588 001654C8 B0 1C 03 A8 */ sth r0, 0x3a8(r28) lbl_8016858C: @@ -405,10 +405,10 @@ lbl_801685BC: /* 80168600 00165540 38 61 00 14 */ addi r3, r1, 0x14 /* 80168604 00165544 38 9C 00 70 */ addi r4, r28, 0x70 /* 80168608 00165548 38 BC 00 64 */ addi r5, r28, 0x64 -/* 8016860C 0016554C 48 0F E5 29 */ bl cXyz_NS___mi +/* 8016860C 0016554C 48 0F E5 29 */ bl __mi__4cXyzCFRC3Vec /* 80168610 00165550 38 7C 00 5C */ addi r3, r28, 0x5c /* 80168614 00165554 38 81 00 14 */ addi r4, r1, 0x14 -/* 80168618 00165558 48 10 94 59 */ bl cSGlobe_NS_Val_X3_ +/* 80168618 00165558 48 10 94 59 */ bl Val__7cSGlobeFRC4cXyz lbl_8016861C: /* 8016861C 0016555C C0 01 00 68 */ lfs f0, 0x68(r1) /* 80168620 00165560 D0 1C 03 9C */ stfs f0, 0x39c(r28) diff --git a/include/d/d_camera/asm/func_80168744.s b/include/d/d_camera/asm/func_80168744.s index fed6db50a9..7d1a1e2f9e 100644 --- a/include/d/d_camera/asm/func_80168744.s +++ b/include/d/d_camera/asm/func_80168744.s @@ -62,7 +62,7 @@ lbl_8016880C: /* 80168834 00165774 40 82 00 2C */ bne lbl_80168860 /* 80168838 00165778 38 6D 8A BC */ addi r3, r13, 0x8045103C - 0x80458580 /*SDA HACK; original: lbl_8045103C-_SDA_BASE_*/ /* 8016883C 0016577C C0 22 9D 54 */ lfs f1, lbl_80453754-_SDA2_BASE_(r2) -/* 80168840 00165780 48 10 87 89 */ bl cSAngle_X3_ +/* 80168840 00165780 48 10 87 89 */ bl __ct__7cSAngleFf /* 80168844 00165784 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha /* 80168848 00165788 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l /* 8016884C 0016578C 3C A0 80 43 */ lis r5, lbl_8042C9A0@ha @@ -207,10 +207,10 @@ lbl_80168894: /* 80168A70 001659B0 FF 80 08 90 */ fmr f28, f1 /* 80168A74 001659B4 38 61 00 DC */ addi r3, r1, 0xdc /* 80168A78 001659B8 C0 22 9D 70 */ lfs f1, lbl_80453770-_SDA2_BASE_(r2) -/* 80168A7C 001659BC 48 10 85 4D */ bl cSAngle_X3_ +/* 80168A7C 001659BC 48 10 85 4D */ bl __ct__7cSAngleFf /* 80168A80 001659C0 38 61 00 D8 */ addi r3, r1, 0xd8 /* 80168A84 001659C4 C0 22 9D 74 */ lfs f1, lbl_80453774-_SDA2_BASE_(r2) -/* 80168A88 001659C8 48 10 85 41 */ bl cSAngle_X3_ +/* 80168A88 001659C8 48 10 85 41 */ bl __ct__7cSAngleFf /* 80168A8C 001659CC C3 A2 9C EC */ lfs f29, lbl_804536EC-_SDA2_BASE_(r2) /* 80168A90 001659D0 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168A94 001659D4 38 80 00 01 */ li r4, 1 @@ -254,7 +254,7 @@ lbl_80168AF4: /* 80168B20 00165A60 38 61 03 78 */ addi r3, r1, 0x378 /* 80168B24 00165A64 38 81 03 90 */ addi r4, r1, 0x390 /* 80168B28 00165A68 38 A1 03 84 */ addi r5, r1, 0x384 -/* 80168B2C 00165A6C 48 0F E0 09 */ bl cXyz_NS___mi +/* 80168B2C 00165A6C 48 0F E0 09 */ bl __mi__4cXyzCFRC3Vec /* 80168B30 00165A70 38 61 04 68 */ addi r3, r1, 0x468 /* 80168B34 00165A74 38 81 03 78 */ addi r4, r1, 0x378 /* 80168B38 00165A78 4B F2 EC BD */ bl cXyz_X1_ @@ -296,10 +296,10 @@ lbl_80168BAC: /* 80168BC4 00165B04 80 BF 01 80 */ lwz r5, 0x180(r31) /* 80168BC8 00165B08 4B F2 EB 71 */ bl dCamera_c_NS_directionOf /* 80168BCC 00165B0C 38 61 00 B4 */ addi r3, r1, 0xb4 -/* 80168BD0 00165B10 48 10 85 19 */ bl cSAngle_NS_Inv +/* 80168BD0 00165B10 48 10 85 19 */ bl Inv__7cSAngleCFv /* 80168BD4 00165B14 7C 64 1B 78 */ mr r4, r3 /* 80168BD8 00165B18 38 61 00 B0 */ addi r3, r1, 0xb0 -/* 80168BDC 00165B1C 48 10 83 BD */ bl cSAngle_X2_ +/* 80168BDC 00165B1C 48 10 83 BD */ bl __ct__7cSAngleFs /* 80168BE0 00165B20 38 7F 04 7E */ addi r3, r31, 0x47e /* 80168BE4 00165B24 38 81 00 B0 */ addi r4, r1, 0xb0 /* 80168BE8 00165B28 48 01 A0 C1 */ bl cSAngle_NS___as @@ -382,7 +382,7 @@ lbl_80168CF8: /* 80168D04 00165C44 4B F2 EA 35 */ bl dCamera_c_NS_directionOf /* 80168D08 00165C48 38 61 00 D4 */ addi r3, r1, 0xd4 /* 80168D0C 00165C4C 38 81 00 A8 */ addi r4, r1, 0xa8 -/* 80168D10 00165C50 48 10 82 59 */ bl cSAngle_X1_ +/* 80168D10 00165C50 48 10 82 59 */ bl __ct__7cSAngleFRC7cSAngle /* 80168D14 00165C54 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80168D18 00165C58 38 80 FF FF */ li r4, -1 /* 80168D1C 00165C5C 4B EC 77 F5 */ bl cSAngle_NS_dtor @@ -425,10 +425,10 @@ lbl_80168D9C: /* 80168DA4 00165CE4 7C 65 1B 78 */ mr r5, r3 /* 80168DA8 00165CE8 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80168DAC 00165CEC 38 81 00 D4 */ addi r4, r1, 0xd4 -/* 80168DB0 00165CF0 48 10 83 F5 */ bl cSAngle_NS___mi_X1_ +/* 80168DB0 00165CF0 48 10 83 F5 */ bl __mi__7cSAngleCFRC7cSAngle /* 80168DB4 00165CF4 38 61 00 D0 */ addi r3, r1, 0xd0 /* 80168DB8 00165CF8 38 81 00 A4 */ addi r4, r1, 0xa4 -/* 80168DBC 00165CFC 48 10 81 AD */ bl cSAngle_X1_ +/* 80168DBC 00165CFC 48 10 81 AD */ bl __ct__7cSAngleFRC7cSAngle /* 80168DC0 00165D00 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80168DC4 00165D04 38 80 FF FF */ li r4, -1 /* 80168DC8 00165D08 4B EC 77 49 */ bl cSAngle_NS_dtor @@ -961,10 +961,10 @@ lbl_80169554: lbl_80169558: /* 80169558 00166498 38 61 00 DC */ addi r3, r1, 0xdc /* 8016955C 0016649C C0 22 9D 90 */ lfs f1, lbl_80453790-_SDA2_BASE_(r2) -/* 80169560 001664A0 48 10 7A AD */ bl cSAngle_NS_Val_X3_ +/* 80169560 001664A0 48 10 7A AD */ bl Val__7cSAngleFf /* 80169564 001664A4 38 61 00 D8 */ addi r3, r1, 0xd8 /* 80169568 001664A8 C0 22 9D 54 */ lfs f1, lbl_80453754-_SDA2_BASE_(r2) -/* 8016956C 001664AC 48 10 7A A1 */ bl cSAngle_NS_Val_X3_ +/* 8016956C 001664AC 48 10 7A A1 */ bl Val__7cSAngleFf /* 80169570 001664B0 C3 42 9D 34 */ lfs f26, lbl_80453734-_SDA2_BASE_(r2) /* 80169574 001664B4 C3 02 9D 18 */ lfs f24, lbl_80453718-_SDA2_BASE_(r2) /* 80169578 001664B8 38 61 00 D0 */ addi r3, r1, 0xd0 @@ -1010,10 +1010,10 @@ lbl_801695DC: /* 80169608 00166548 EE B5 08 28 */ fsubs f21, f21, f1 /* 8016960C 0016654C 38 61 00 DC */ addi r3, r1, 0xdc /* 80169610 00166550 C0 22 9D 98 */ lfs f1, lbl_80453798-_SDA2_BASE_(r2) -/* 80169614 00166554 48 10 79 F9 */ bl cSAngle_NS_Val_X3_ +/* 80169614 00166554 48 10 79 F9 */ bl Val__7cSAngleFf /* 80169618 00166558 38 61 00 D8 */ addi r3, r1, 0xd8 /* 8016961C 0016655C C0 22 9C B8 */ lfs f1, lbl_804536B8-_SDA2_BASE_(r2) -/* 80169620 00166560 48 10 79 ED */ bl cSAngle_NS_Val_X3_ +/* 80169620 00166560 48 10 79 ED */ bl Val__7cSAngleFf /* 80169624 00166564 C0 02 9D 18 */ lfs f0, lbl_80453718-_SDA2_BASE_(r2) /* 80169628 00166568 FC 1A 00 40 */ fcmpo cr0, f26, f0 /* 8016962C 0016656C 40 81 00 08 */ ble lbl_80169634 @@ -1206,10 +1206,10 @@ lbl_801698A0: /* 801698C0 00166800 38 61 03 54 */ addi r3, r1, 0x354 /* 801698C4 00166804 38 9F 00 70 */ addi r4, r31, 0x70 /* 801698C8 00166808 38 BF 00 64 */ addi r5, r31, 0x64 -/* 801698CC 0016680C 48 0F D2 69 */ bl cXyz_NS___mi +/* 801698CC 0016680C 48 0F D2 69 */ bl __mi__4cXyzCFRC3Vec /* 801698D0 00166810 38 7F 00 5C */ addi r3, r31, 0x5c /* 801698D4 00166814 38 81 03 54 */ addi r4, r1, 0x354 -/* 801698D8 00166818 48 10 81 99 */ bl cSGlobe_NS_Val_X3_ +/* 801698D8 00166818 48 10 81 99 */ bl Val__7cSGlobeFRC4cXyz /* 801698DC 0016681C 38 61 03 54 */ addi r3, r1, 0x354 /* 801698E0 00166820 38 80 FF FF */ li r4, -1 /* 801698E4 00166824 4B E9 F8 A1 */ bl cXyz_NS_dtor @@ -1305,20 +1305,20 @@ lbl_80169A18: /* 80169A3C 0016697C 38 80 FF FF */ li r4, -1 /* 80169A40 00166980 4B E9 F7 45 */ bl cXyz_NS_dtor /* 80169A44 00166984 38 7F 00 28 */ addi r3, r31, 0x28 -/* 80169A48 00166988 48 10 81 35 */ bl cSGlobe_NS_Invert +/* 80169A48 00166988 48 10 81 35 */ bl Invert__7cSGlobeFv /* 80169A4C 0016698C 7C 64 1B 78 */ mr r4, r3 /* 80169A50 00166990 38 61 01 18 */ addi r3, r1, 0x118 -/* 80169A54 00166994 48 10 7D 9D */ bl cSGlobe_X1_ +/* 80169A54 00166994 48 10 7D 9D */ bl __ct__7cSGlobeFRC7cSGlobe /* 80169A58 00166998 38 61 01 18 */ addi r3, r1, 0x118 /* 80169A5C 0016699C C0 22 9D B0 */ lfs f1, lbl_804537B0-_SDA2_BASE_(r2) /* 80169A60 001669A0 48 01 8F ED */ bl cSGlobe_NS_R /* 80169A64 001669A4 38 61 03 30 */ addi r3, r1, 0x330 /* 80169A68 001669A8 38 81 01 18 */ addi r4, r1, 0x118 -/* 80169A6C 001669AC 48 10 80 49 */ bl cSGlobe_NS_Xyz +/* 80169A6C 001669AC 48 10 80 49 */ bl Xyz__7cSGlobeCFv /* 80169A70 001669B0 38 61 03 24 */ addi r3, r1, 0x324 /* 80169A74 001669B4 38 9F 00 3C */ addi r4, r31, 0x3c /* 80169A78 001669B8 38 A1 03 30 */ addi r5, r1, 0x330 -/* 80169A7C 001669BC 48 0F D0 69 */ bl cXyz_NS___pl +/* 80169A7C 001669BC 48 0F D0 69 */ bl __pl__4cXyzCFRC3Vec /* 80169A80 001669C0 38 61 04 2C */ addi r3, r1, 0x42c /* 80169A84 001669C4 38 81 03 24 */ addi r4, r1, 0x324 /* 80169A88 001669C8 4B F2 DD 6D */ bl cXyz_X1_ @@ -1331,12 +1331,12 @@ lbl_80169A18: /* 80169AA4 001669E4 38 61 04 9C */ addi r3, r1, 0x49c /* 80169AA8 001669E8 38 81 04 2C */ addi r4, r1, 0x42c /* 80169AAC 001669EC 38 BF 00 3C */ addi r5, r31, 0x3c -/* 80169AB0 001669F0 48 10 57 F9 */ bl cM3dGLin +/* 80169AB0 001669F0 48 10 57 F9 */ bl __ct__8cM3dGLinFRC4cXyzRC4cXyz /* 80169AB4 001669F4 38 61 04 9C */ addi r3, r1, 0x49c /* 80169AB8 001669F8 38 81 04 38 */ addi r4, r1, 0x438 /* 80169ABC 001669FC 38 A1 04 2C */ addi r5, r1, 0x42c /* 80169AC0 00166A00 38 C1 00 E0 */ addi r6, r1, 0xe0 -/* 80169AC4 00166A04 48 0F EC 4D */ bl cM3d_Len3dSqPntAndSegLine +/* 80169AC4 00166A04 48 0F EC 4D */ bl cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf /* 80169AC8 00166A08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80169ACC 00166A0C 41 82 00 78 */ beq lbl_80169B44 /* 80169AD0 00166A10 A8 1F 01 36 */ lha r0, 0x136(r31) @@ -1348,10 +1348,10 @@ lbl_80169A18: /* 80169AE8 00166A28 38 61 03 18 */ addi r3, r1, 0x318 /* 80169AEC 00166A2C 38 9F 00 3C */ addi r4, r31, 0x3c /* 80169AF0 00166A30 38 BF 00 30 */ addi r5, r31, 0x30 -/* 80169AF4 00166A34 48 0F D0 41 */ bl cXyz_NS___mi +/* 80169AF4 00166A34 48 0F D0 41 */ bl __mi__4cXyzCFRC3Vec /* 80169AF8 00166A38 38 7F 00 28 */ addi r3, r31, 0x28 /* 80169AFC 00166A3C 38 81 03 18 */ addi r4, r1, 0x318 -/* 80169B00 00166A40 48 10 7F 71 */ bl cSGlobe_NS_Val_X3_ +/* 80169B00 00166A40 48 10 7F 71 */ bl Val__7cSGlobeFRC4cXyz /* 80169B04 00166A44 38 61 03 18 */ addi r3, r1, 0x318 /* 80169B08 00166A48 38 80 FF FF */ li r4, -1 /* 80169B0C 00166A4C 4B E9 F6 79 */ bl cXyz_NS_dtor @@ -1362,10 +1362,10 @@ lbl_80169B10: /* 80169B1C 00166A5C 38 61 03 0C */ addi r3, r1, 0x30c /* 80169B20 00166A60 38 9F 00 70 */ addi r4, r31, 0x70 /* 80169B24 00166A64 38 BF 00 64 */ addi r5, r31, 0x64 -/* 80169B28 00166A68 48 0F D0 0D */ bl cXyz_NS___mi +/* 80169B28 00166A68 48 0F D0 0D */ bl __mi__4cXyzCFRC3Vec /* 80169B2C 00166A6C 38 7F 00 5C */ addi r3, r31, 0x5c /* 80169B30 00166A70 38 81 03 0C */ addi r4, r1, 0x30c -/* 80169B34 00166A74 48 10 7F 3D */ bl cSGlobe_NS_Val_X3_ +/* 80169B34 00166A74 48 10 7F 3D */ bl Val__7cSGlobeFRC4cXyz /* 80169B38 00166A78 38 61 03 0C */ addi r3, r1, 0x30c /* 80169B3C 00166A7C 38 80 FF FF */ li r4, -1 /* 80169B40 00166A80 4B E9 F6 45 */ bl cXyz_NS_dtor @@ -1392,10 +1392,10 @@ lbl_80169B70: /* 80169B8C 00166ACC 80 BF 01 80 */ lwz r5, 0x180(r31) /* 80169B90 00166AD0 4B F2 DB A9 */ bl dCamera_c_NS_directionOf /* 80169B94 00166AD4 38 61 00 A0 */ addi r3, r1, 0xa0 -/* 80169B98 00166AD8 48 10 75 51 */ bl cSAngle_NS_Inv +/* 80169B98 00166AD8 48 10 75 51 */ bl Inv__7cSAngleCFv /* 80169B9C 00166ADC 7C 64 1B 78 */ mr r4, r3 /* 80169BA0 00166AE0 38 61 00 CC */ addi r3, r1, 0xcc -/* 80169BA4 00166AE4 48 10 74 61 */ bl cSAngle_NS_Val_X2_ +/* 80169BA4 00166AE4 48 10 74 61 */ bl Val__7cSAngleFs /* 80169BA8 00166AE8 38 61 00 A0 */ addi r3, r1, 0xa0 /* 80169BAC 00166AEC 38 80 FF FF */ li r4, -1 /* 80169BB0 00166AF0 4B EC 69 61 */ bl cSAngle_NS_dtor @@ -1405,30 +1405,30 @@ lbl_80169BB8: /* 80169BBC 00166AFC 48 01 90 C9 */ bl cSGlobe_NS_U_X1_ /* 80169BC0 00166B00 7C 64 1B 78 */ mr r4, r3 /* 80169BC4 00166B04 38 61 00 CC */ addi r3, r1, 0xcc -/* 80169BC8 00166B08 48 10 74 31 */ bl cSAngle_NS_Val_X1_ +/* 80169BC8 00166B08 48 10 74 31 */ bl Val__7cSAngleFRC7cSAngle lbl_80169BCC: /* 80169BCC 00166B0C 38 61 00 9C */ addi r3, r1, 0x9c /* 80169BD0 00166B10 C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) /* 80169BD4 00166B14 EC 13 90 2A */ fadds f0, f19, f18 /* 80169BD8 00166B18 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80169BDC 00166B1C 48 10 73 ED */ bl cSAngle_X3_ +/* 80169BDC 00166B1C 48 10 73 ED */ bl __ct__7cSAngleFf /* 80169BE0 00166B20 38 61 01 10 */ addi r3, r1, 0x110 /* 80169BE4 00166B24 C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) /* 80169BE8 00166B28 EC 15 B0 2A */ fadds f0, f21, f22 /* 80169BEC 00166B2C EC 21 00 32 */ fmuls f1, f1, f0 /* 80169BF0 00166B30 38 81 00 9C */ addi r4, r1, 0x9c /* 80169BF4 00166B34 38 A1 00 CC */ addi r5, r1, 0xcc -/* 80169BF8 00166B38 48 10 7C 59 */ bl cSGlobe_X3_ +/* 80169BF8 00166B38 48 10 7C 59 */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80169BFC 00166B3C 38 61 00 9C */ addi r3, r1, 0x9c /* 80169C00 00166B40 38 80 FF FF */ li r4, -1 /* 80169C04 00166B44 4B EC 69 0D */ bl cSAngle_NS_dtor /* 80169C08 00166B48 38 61 03 00 */ addi r3, r1, 0x300 /* 80169C0C 00166B4C 38 81 01 10 */ addi r4, r1, 0x110 -/* 80169C10 00166B50 48 10 7E A5 */ bl cSGlobe_NS_Xyz +/* 80169C10 00166B50 48 10 7E A5 */ bl Xyz__7cSGlobeCFv /* 80169C14 00166B54 38 61 02 F4 */ addi r3, r1, 0x2f4 /* 80169C18 00166B58 38 81 04 38 */ addi r4, r1, 0x438 /* 80169C1C 00166B5C 38 A1 03 00 */ addi r5, r1, 0x300 -/* 80169C20 00166B60 48 0F CE C5 */ bl cXyz_NS___pl +/* 80169C20 00166B60 48 0F CE C5 */ bl __pl__4cXyzCFRC3Vec /* 80169C24 00166B64 38 61 04 20 */ addi r3, r1, 0x420 /* 80169C28 00166B68 38 81 02 F4 */ addi r4, r1, 0x2f4 /* 80169C2C 00166B6C 4B F2 DB C9 */ bl cXyz_X1_ @@ -1441,7 +1441,7 @@ lbl_80169BCC: /* 80169C48 00166B88 38 61 02 E8 */ addi r3, r1, 0x2e8 /* 80169C4C 00166B8C 38 9F 00 3C */ addi r4, r31, 0x3c /* 80169C50 00166B90 38 A1 04 20 */ addi r5, r1, 0x420 -/* 80169C54 00166B94 48 0F CE E1 */ bl cXyz_NS___mi +/* 80169C54 00166B94 48 0F CE E1 */ bl __mi__4cXyzCFRC3Vec /* 80169C58 00166B98 38 61 02 DC */ addi r3, r1, 0x2dc /* 80169C5C 00166B9C 38 81 02 E8 */ addi r4, r1, 0x2e8 /* 80169C60 00166BA0 4B F2 DB 95 */ bl cXyz_X1_ @@ -1470,7 +1470,7 @@ lbl_80169BCC: /* 80169CBC 00166BFC 38 61 02 D0 */ addi r3, r1, 0x2d0 /* 80169CC0 00166C00 38 9F 00 30 */ addi r4, r31, 0x30 /* 80169CC4 00166C04 38 A1 04 20 */ addi r5, r1, 0x420 -/* 80169CC8 00166C08 48 0F CE 6D */ bl cXyz_NS___mi +/* 80169CC8 00166C08 48 0F CE 6D */ bl __mi__4cXyzCFRC3Vec /* 80169CCC 00166C0C 38 61 02 C4 */ addi r3, r1, 0x2c4 /* 80169CD0 00166C10 38 81 02 D0 */ addi r4, r1, 0x2d0 /* 80169CD4 00166C14 4B F2 DB 21 */ bl cXyz_X1_ @@ -1509,9 +1509,9 @@ lbl_80169D4C: /* 80169D4C 00166C8C FC 20 88 90 */ fmr f1, f17 lbl_80169D50: /* 80169D50 00166C90 38 61 00 98 */ addi r3, r1, 0x98 -/* 80169D54 00166C94 48 10 72 75 */ bl cSAngle_X3_ +/* 80169D54 00166C94 48 10 72 75 */ bl __ct__7cSAngleFf /* 80169D58 00166C98 38 61 00 98 */ addi r3, r1, 0x98 -/* 80169D5C 00166C9C 48 10 73 9D */ bl cSAngle_NS_Sin +/* 80169D5C 00166C9C 48 10 73 9D */ bl Sin__7cSAngleCFv /* 80169D60 00166CA0 FE 20 08 90 */ fmr f17, f1 /* 80169D64 00166CA4 38 61 00 98 */ addi r3, r1, 0x98 /* 80169D68 00166CA8 38 80 FF FF */ li r4, -1 @@ -1617,10 +1617,10 @@ lbl_80169EB4: /* 80169ED8 00166E18 7C 70 1B 78 */ mr r16, r3 /* 80169EDC 00166E1C 38 61 02 B8 */ addi r3, r1, 0x2b8 /* 80169EE0 00166E20 38 9F 00 28 */ addi r4, r31, 0x28 -/* 80169EE4 00166E24 48 10 7B D1 */ bl cSGlobe_NS_Xyz +/* 80169EE4 00166E24 48 10 7B D1 */ bl Xyz__7cSGlobeCFv /* 80169EE8 00166E28 38 61 02 AC */ addi r3, r1, 0x2ac /* 80169EEC 00166E2C 38 81 02 B8 */ addi r4, r1, 0x2b8 -/* 80169EF0 00166E30 48 0F CD F5 */ bl cXyz_NS_norm +/* 80169EF0 00166E30 48 0F CD F5 */ bl norm__4cXyzCFv /* 80169EF4 00166E34 38 61 04 14 */ addi r3, r1, 0x414 /* 80169EF8 00166E38 38 81 02 AC */ addi r4, r1, 0x2ac /* 80169EFC 00166E3C 4B F2 D8 F9 */ bl cXyz_X1_ @@ -1639,11 +1639,11 @@ lbl_80169EB4: /* 80169F30 00166E70 38 61 02 A0 */ addi r3, r1, 0x2a0 /* 80169F34 00166E74 38 81 04 14 */ addi r4, r1, 0x414 /* 80169F38 00166E78 7E 05 83 78 */ mr r5, r16 -/* 80169F3C 00166E7C 48 0F CB A9 */ bl cXyz_NS___pl +/* 80169F3C 00166E7C 48 0F CB A9 */ bl __pl__4cXyzCFRC3Vec /* 80169F40 00166E80 38 61 02 94 */ addi r3, r1, 0x294 /* 80169F44 00166E84 38 81 02 A0 */ addi r4, r1, 0x2a0 /* 80169F48 00166E88 C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) -/* 80169F4C 00166E8C 48 0F CC 39 */ bl cXyz_NS___ml +/* 80169F4C 00166E8C 48 0F CC 39 */ bl __ml__4cXyzCFf /* 80169F50 00166E90 38 61 04 14 */ addi r3, r1, 0x414 /* 80169F54 00166E94 38 81 02 94 */ addi r4, r1, 0x294 /* 80169F58 00166E98 4B F2 D8 81 */ bl cXyz_NS___as @@ -1655,17 +1655,17 @@ lbl_80169EB4: /* 80169F70 00166EB0 4B E9 F2 15 */ bl cXyz_NS_dtor /* 80169F74 00166EB4 38 7F 00 5C */ addi r3, r31, 0x5c /* 80169F78 00166EB8 38 81 04 14 */ addi r4, r1, 0x414 -/* 80169F7C 00166EBC 48 10 7A F5 */ bl cSGlobe_NS_Val_X3_ +/* 80169F7C 00166EBC 48 10 7A F5 */ bl Val__7cSGlobeFRC4cXyz /* 80169F80 00166EC0 38 7F 00 5C */ addi r3, r31, 0x5c /* 80169F84 00166EC4 FC 20 A8 90 */ fmr f1, f21 /* 80169F88 00166EC8 48 01 8A C5 */ bl cSGlobe_NS_R /* 80169F8C 00166ECC 38 61 02 88 */ addi r3, r1, 0x288 /* 80169F90 00166ED0 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80169F94 00166ED4 48 10 7B 21 */ bl cSGlobe_NS_Xyz +/* 80169F94 00166ED4 48 10 7B 21 */ bl Xyz__7cSGlobeCFv /* 80169F98 00166ED8 38 61 02 7C */ addi r3, r1, 0x27c /* 80169F9C 00166EDC 38 9F 00 64 */ addi r4, r31, 0x64 /* 80169FA0 00166EE0 38 A1 02 88 */ addi r5, r1, 0x288 -/* 80169FA4 00166EE4 48 0F CB 41 */ bl cXyz_NS___pl +/* 80169FA4 00166EE4 48 0F CB 41 */ bl __pl__4cXyzCFRC3Vec /* 80169FA8 00166EE8 38 7F 00 70 */ addi r3, r31, 0x70 /* 80169FAC 00166EEC 38 81 02 7C */ addi r4, r1, 0x27c /* 80169FB0 00166EF0 4B F2 D8 29 */ bl cXyz_NS___as @@ -1704,24 +1704,24 @@ lbl_80169FE8: /* 8016A02C 00166F6C 4B E9 F1 59 */ bl cXyz_NS_dtor /* 8016A030 00166F70 38 61 00 94 */ addi r3, r1, 0x94 /* 8016A034 00166F74 FC 20 90 90 */ fmr f1, f18 -/* 8016A038 00166F78 48 10 6F 91 */ bl cSAngle_X3_ +/* 8016A038 00166F78 48 10 6F 91 */ bl __ct__7cSAngleFf /* 8016A03C 00166F7C 38 7F 00 28 */ addi r3, r31, 0x28 /* 8016A040 00166F80 48 01 8C 45 */ bl cSGlobe_NS_U_X1_ /* 8016A044 00166F84 7C 65 1B 78 */ mr r5, r3 /* 8016A048 00166F88 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016A04C 00166F8C FC 20 A8 90 */ fmr f1, f21 /* 8016A050 00166F90 38 81 00 94 */ addi r4, r1, 0x94 -/* 8016A054 00166F94 48 10 79 B5 */ bl cSGlobe_NS_Val_X2_ +/* 8016A054 00166F94 48 10 79 B5 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8016A058 00166F98 38 61 00 94 */ addi r3, r1, 0x94 /* 8016A05C 00166F9C 38 80 FF FF */ li r4, -1 /* 8016A060 00166FA0 4B EC 64 B1 */ bl cSAngle_NS_dtor /* 8016A064 00166FA4 38 61 02 64 */ addi r3, r1, 0x264 /* 8016A068 00166FA8 38 9F 00 5C */ addi r4, r31, 0x5c -/* 8016A06C 00166FAC 48 10 7A 49 */ bl cSGlobe_NS_Xyz +/* 8016A06C 00166FAC 48 10 7A 49 */ bl Xyz__7cSGlobeCFv /* 8016A070 00166FB0 38 61 02 58 */ addi r3, r1, 0x258 /* 8016A074 00166FB4 38 9F 00 64 */ addi r4, r31, 0x64 /* 8016A078 00166FB8 38 A1 02 64 */ addi r5, r1, 0x264 -/* 8016A07C 00166FBC 48 0F CA 69 */ bl cXyz_NS___pl +/* 8016A07C 00166FBC 48 0F CA 69 */ bl __pl__4cXyzCFRC3Vec /* 8016A080 00166FC0 38 7F 00 70 */ addi r3, r31, 0x70 /* 8016A084 00166FC4 38 81 02 58 */ addi r4, r1, 0x258 /* 8016A088 00166FC8 4B F2 D7 51 */ bl cXyz_NS___as @@ -1767,7 +1767,7 @@ lbl_8016A114: lbl_8016A120: /* 8016A120 00167060 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016A124 00167064 48 01 88 E5 */ bl cSGlobe_NS_V_X1_ -/* 8016A128 00167068 48 10 6F 09 */ bl cSAngle_NS_Degree +/* 8016A128 00167068 48 10 6F 09 */ bl Degree__7cSAngleCFv /* 8016A12C 0016706C D0 3F 04 38 */ stfs f1, 0x438(r31) /* 8016A130 00167070 38 7F 04 40 */ addi r3, r31, 0x440 /* 8016A134 00167074 38 9F 00 64 */ addi r4, r31, 0x64 @@ -1876,7 +1876,7 @@ lbl_8016A284: /* 8016A2BC 001671FC 4B F2 D4 61 */ bl dCamera_c_NS_attentionPos /* 8016A2C0 00167200 38 61 00 90 */ addi r3, r1, 0x90 /* 8016A2C4 00167204 38 81 00 D4 */ addi r4, r1, 0xd4 -/* 8016A2C8 00167208 48 10 6C A1 */ bl cSAngle_X1_ +/* 8016A2C8 00167208 48 10 6C A1 */ bl __ct__7cSAngleFRC7cSAngle /* 8016A2CC 0016720C 38 61 02 28 */ addi r3, r1, 0x228 /* 8016A2D0 00167210 38 81 03 F0 */ addi r4, r1, 0x3f0 /* 8016A2D4 00167214 38 A1 00 90 */ addi r5, r1, 0x90 @@ -1884,7 +1884,7 @@ lbl_8016A284: /* 8016A2DC 0016721C 38 61 02 1C */ addi r3, r1, 0x21c /* 8016A2E0 00167220 38 81 02 34 */ addi r4, r1, 0x234 /* 8016A2E4 00167224 38 A1 02 28 */ addi r5, r1, 0x228 -/* 8016A2E8 00167228 48 0F C7 FD */ bl cXyz_NS___pl +/* 8016A2E8 00167228 48 0F C7 FD */ bl __pl__4cXyzCFRC3Vec /* 8016A2EC 0016722C 38 61 03 E4 */ addi r3, r1, 0x3e4 /* 8016A2F0 00167230 38 81 02 1C */ addi r4, r1, 0x21c /* 8016A2F4 00167234 4B F2 D5 01 */ bl cXyz_X1_ @@ -1936,10 +1936,10 @@ lbl_8016A3A4: /* 8016A3A8 001672E8 28 00 00 00 */ cmplwi r0, 0 /* 8016A3AC 001672EC 40 82 05 3C */ bne lbl_8016A8E8 /* 8016A3B0 001672F0 38 61 00 D4 */ addi r3, r1, 0xd4 -/* 8016A3B4 001672F4 48 10 6D 35 */ bl cSAngle_NS_Inv +/* 8016A3B4 001672F4 48 10 6D 35 */ bl Inv__7cSAngleCFv /* 8016A3B8 001672F8 7C 64 1B 78 */ mr r4, r3 /* 8016A3BC 001672FC 38 61 00 8C */ addi r3, r1, 0x8c -/* 8016A3C0 00167300 48 10 6B D9 */ bl cSAngle_X2_ +/* 8016A3C0 00167300 48 10 6B D9 */ bl __ct__7cSAngleFs /* 8016A3C4 00167304 38 7F 04 7E */ addi r3, r31, 0x47e /* 8016A3C8 00167308 38 81 00 8C */ addi r4, r1, 0x8c /* 8016A3CC 0016730C 48 01 88 DD */ bl cSAngle_NS___as @@ -1995,11 +1995,11 @@ lbl_8016A48C: /* 8016A48C 001673CC 38 61 02 10 */ addi r3, r1, 0x210 /* 8016A490 001673D0 38 81 04 08 */ addi r4, r1, 0x408 /* 8016A494 001673D4 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8016A498 001673D8 48 0F C6 9D */ bl cXyz_NS___mi +/* 8016A498 001673D8 48 0F C6 9D */ bl __mi__4cXyzCFRC3Vec /* 8016A49C 001673DC 38 61 02 04 */ addi r3, r1, 0x204 /* 8016A4A0 001673E0 38 81 02 10 */ addi r4, r1, 0x210 /* 8016A4A4 001673E4 FC 20 70 90 */ fmr f1, f14 -/* 8016A4A8 001673E8 48 0F C6 DD */ bl cXyz_NS___ml +/* 8016A4A8 001673E8 48 0F C6 DD */ bl __ml__4cXyzCFf /* 8016A4AC 001673EC 38 7F 00 64 */ addi r3, r31, 0x64 /* 8016A4B0 001673F0 38 81 02 04 */ addi r4, r1, 0x204 /* 8016A4B4 001673F4 4B F2 44 51 */ bl cXyz_NS___apl @@ -2088,27 +2088,27 @@ lbl_8016A5D0: /* 8016A5F0 00167530 EC 12 98 28 */ fsubs f0, f18, f19 /* 8016A5F4 00167534 EC 01 00 32 */ fmuls f0, f1, f0 /* 8016A5F8 00167538 EC 33 00 2A */ fadds f1, f19, f0 -/* 8016A5FC 0016753C 48 10 69 CD */ bl cSAngle_X3_ +/* 8016A5FC 0016753C 48 10 69 CD */ bl __ct__7cSAngleFf /* 8016A600 00167540 88 1F 04 7D */ lbz r0, 0x47d(r31) /* 8016A604 00167544 28 00 00 00 */ cmplwi r0, 0 /* 8016A608 00167548 40 82 00 10 */ bne lbl_8016A618 /* 8016A60C 0016754C 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8016A610 00167550 38 9F 01 B0 */ addi r4, r31, 0x1b0 -/* 8016A614 00167554 48 10 6B C1 */ bl cSAngle_NS___apl +/* 8016A614 00167554 48 10 6B C1 */ bl __apl__7cSAngleFRC7cSAngle lbl_8016A618: /* 8016A618 00167558 38 61 00 C8 */ addi r3, r1, 0xc8 -/* 8016A61C 0016755C 48 10 6A 15 */ bl cSAngle_NS_Degree +/* 8016A61C 0016755C 48 10 6A 15 */ bl Degree__7cSAngleCFv /* 8016A620 00167560 D0 3F 04 38 */ stfs f1, 0x438(r31) /* 8016A624 00167564 38 7F 00 8C */ addi r3, r31, 0x8c -/* 8016A628 00167568 48 10 6A C1 */ bl cSAngle_NS_Inv +/* 8016A628 00167568 48 10 6A C1 */ bl Inv__7cSAngleCFv /* 8016A62C 0016756C 7C 64 1B 78 */ mr r4, r3 /* 8016A630 00167570 38 61 00 88 */ addi r3, r1, 0x88 -/* 8016A634 00167574 48 10 69 65 */ bl cSAngle_X2_ +/* 8016A634 00167574 48 10 69 65 */ bl __ct__7cSAngleFs /* 8016A638 00167578 38 61 01 08 */ addi r3, r1, 0x108 /* 8016A63C 0016757C FC 20 80 90 */ fmr f1, f16 /* 8016A640 00167580 38 81 00 C8 */ addi r4, r1, 0xc8 /* 8016A644 00167584 38 A1 00 88 */ addi r5, r1, 0x88 -/* 8016A648 00167588 48 10 72 09 */ bl cSGlobe_X3_ +/* 8016A648 00167588 48 10 72 09 */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8016A64C 0016758C 38 61 00 88 */ addi r3, r1, 0x88 /* 8016A650 00167590 38 80 FF FF */ li r4, -1 /* 8016A654 00167594 4B EC 5E BD */ bl cSAngle_NS_dtor @@ -2132,17 +2132,17 @@ lbl_8016A618: /* 8016A69C 001675DC 7C 64 1B 78 */ mr r4, r3 /* 8016A6A0 001675E0 38 61 00 84 */ addi r3, r1, 0x84 /* 8016A6A4 001675E4 7E 05 83 78 */ mr r5, r16 -/* 8016A6A8 001675E8 48 10 6A FD */ bl cSAngle_NS___mi_X1_ +/* 8016A6A8 001675E8 48 10 6A FD */ bl __mi__7cSAngleCFRC7cSAngle /* 8016A6AC 001675EC 38 61 00 80 */ addi r3, r1, 0x80 /* 8016A6B0 001675F0 38 81 00 84 */ addi r4, r1, 0x84 /* 8016A6B4 001675F4 FC 20 70 90 */ fmr f1, f14 -/* 8016A6B8 001675F8 48 10 6B AD */ bl cSAngle_NS___ml +/* 8016A6B8 001675F8 48 10 6B AD */ bl __ml__7cSAngleCFf /* 8016A6BC 001675FC 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016A6C0 00167600 48 01 83 49 */ bl cSGlobe_NS_V_X1_ /* 8016A6C4 00167604 7C 64 1B 78 */ mr r4, r3 /* 8016A6C8 00167608 38 61 00 7C */ addi r3, r1, 0x7c /* 8016A6CC 0016760C 38 A1 00 80 */ addi r5, r1, 0x80 -/* 8016A6D0 00167610 48 10 6A A5 */ bl cSAngle_NS___pl +/* 8016A6D0 00167610 48 10 6A A5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016A6D4 00167614 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016A6D8 00167618 38 81 00 7C */ addi r4, r1, 0x7c /* 8016A6DC 0016761C 4B F2 53 7D */ bl cSGlobe_NS_V @@ -2170,17 +2170,17 @@ lbl_8016A728: /* 8016A730 00167670 7C 65 1B 78 */ mr r5, r3 /* 8016A734 00167674 38 61 00 78 */ addi r3, r1, 0x78 /* 8016A738 00167678 38 9F 04 7E */ addi r4, r31, 0x47e -/* 8016A73C 0016767C 48 10 6A 69 */ bl cSAngle_NS___mi_X1_ +/* 8016A73C 0016767C 48 10 6A 69 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016A740 00167680 38 61 00 74 */ addi r3, r1, 0x74 /* 8016A744 00167684 38 81 00 78 */ addi r4, r1, 0x78 /* 8016A748 00167688 FC 20 70 90 */ fmr f1, f14 -/* 8016A74C 0016768C 48 10 6B 19 */ bl cSAngle_NS___ml +/* 8016A74C 0016768C 48 10 6B 19 */ bl __ml__7cSAngleCFf /* 8016A750 00167690 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016A754 00167694 48 01 85 31 */ bl cSGlobe_NS_U_X1_ /* 8016A758 00167698 7C 64 1B 78 */ mr r4, r3 /* 8016A75C 0016769C 38 61 00 70 */ addi r3, r1, 0x70 /* 8016A760 001676A0 38 A1 00 74 */ addi r5, r1, 0x74 -/* 8016A764 001676A4 48 10 6A 11 */ bl cSAngle_NS___pl +/* 8016A764 001676A4 48 10 6A 11 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016A768 001676A8 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016A76C 001676AC 38 81 00 70 */ addi r4, r1, 0x70 /* 8016A770 001676B0 4B F2 41 25 */ bl cSGlobe_NS_U @@ -2196,11 +2196,11 @@ lbl_8016A728: lbl_8016A798: /* 8016A798 001676D8 38 61 01 EC */ addi r3, r1, 0x1ec /* 8016A79C 001676DC 38 9F 00 5C */ addi r4, r31, 0x5c -/* 8016A7A0 001676E0 48 10 73 15 */ bl cSGlobe_NS_Xyz +/* 8016A7A0 001676E0 48 10 73 15 */ bl Xyz__7cSGlobeCFv /* 8016A7A4 001676E4 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 8016A7A8 001676E8 38 9F 00 64 */ addi r4, r31, 0x64 /* 8016A7AC 001676EC 38 A1 01 EC */ addi r5, r1, 0x1ec -/* 8016A7B0 001676F0 48 0F C3 35 */ bl cXyz_NS___pl +/* 8016A7B0 001676F0 48 0F C3 35 */ bl __pl__4cXyzCFRC3Vec /* 8016A7B4 001676F4 38 7F 04 4C */ addi r3, r31, 0x44c /* 8016A7B8 001676F8 38 81 01 E0 */ addi r4, r1, 0x1e0 /* 8016A7BC 001676FC 4B F2 D0 1D */ bl cXyz_NS___as @@ -2460,10 +2460,10 @@ lbl_8016AB74: /* 8016AB84 00167AC4 38 61 00 64 */ addi r3, r1, 0x64 /* 8016AB88 00167AC8 38 9F 04 80 */ addi r4, r31, 0x480 /* 8016AB8C 00167ACC 38 A1 00 68 */ addi r5, r1, 0x68 -/* 8016AB90 00167AD0 48 10 66 15 */ bl cSAngle_NS___mi_X1_ +/* 8016AB90 00167AD0 48 10 66 15 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016AB94 00167AD4 38 61 00 C4 */ addi r3, r1, 0xc4 /* 8016AB98 00167AD8 38 81 00 64 */ addi r4, r1, 0x64 -/* 8016AB9C 00167ADC 48 10 63 CD */ bl cSAngle_X1_ +/* 8016AB9C 00167ADC 48 10 63 CD */ bl __ct__7cSAngleFRC7cSAngle /* 8016ABA0 00167AE0 38 61 00 64 */ addi r3, r1, 0x64 /* 8016ABA4 00167AE4 38 80 FF FF */ li r4, -1 /* 8016ABA8 00167AE8 4B EC 59 69 */ bl cSAngle_NS_dtor @@ -2472,12 +2472,12 @@ lbl_8016AB74: /* 8016ABB4 00167AF4 4B EC 59 5D */ bl cSAngle_NS_dtor /* 8016ABB8 00167AF8 38 61 00 60 */ addi r3, r1, 0x60 /* 8016ABBC 00167AFC C0 22 9D 88 */ lfs f1, lbl_80453788-_SDA2_BASE_(r2) -/* 8016ABC0 00167B00 48 10 64 09 */ bl cSAngle_X3_ +/* 8016ABC0 00167B00 48 10 64 09 */ bl __ct__7cSAngleFf /* 8016ABC4 00167B04 38 61 00 60 */ addi r3, r1, 0x60 /* 8016ABC8 00167B08 48 01 80 4D */ bl cSAngle_NS___ops /* 8016ABCC 00167B0C 7C 70 07 34 */ extsh r16, r3 /* 8016ABD0 00167B10 38 61 00 C4 */ addi r3, r1, 0xc4 -/* 8016ABD4 00167B14 48 10 64 F9 */ bl cSAngle_NS_Abs +/* 8016ABD4 00167B14 48 10 64 F9 */ bl Abs__7cSAngleCFv /* 8016ABD8 00167B18 7C 64 07 34 */ extsh r4, r3 /* 8016ABDC 00167B1C 7C 80 82 78 */ xor r0, r4, r16 /* 8016ABE0 00167B20 7C 03 0E 70 */ srawi r3, r0, 1 @@ -2697,7 +2697,7 @@ lbl_8016AEC0: /* 8016AEF0 00167E30 38 61 01 B0 */ addi r3, r1, 0x1b0 /* 8016AEF4 00167E34 38 81 01 C8 */ addi r4, r1, 0x1c8 /* 8016AEF8 00167E38 38 A1 01 BC */ addi r5, r1, 0x1bc -/* 8016AEFC 00167E3C 48 0F BC 39 */ bl cXyz_NS___mi +/* 8016AEFC 00167E3C 48 0F BC 39 */ bl __mi__4cXyzCFRC3Vec /* 8016AF00 00167E40 38 61 03 B4 */ addi r3, r1, 0x3b4 /* 8016AF04 00167E44 38 81 01 B0 */ addi r4, r1, 0x1b0 /* 8016AF08 00167E48 4B F2 C8 ED */ bl cXyz_X1_ @@ -2714,16 +2714,16 @@ lbl_8016AEC0: /* 8016AF34 00167E74 48 01 7D 51 */ bl cSGlobe_NS_U_X1_ /* 8016AF38 00167E78 7C 64 1B 78 */ mr r4, r3 /* 8016AF3C 00167E7C 38 61 00 5C */ addi r3, r1, 0x5c -/* 8016AF40 00167E80 48 10 62 09 */ bl cSAngle_NS___mi +/* 8016AF40 00167E80 48 10 62 09 */ bl __mi__7cSAngleCFv /* 8016AF44 00167E84 38 61 00 C0 */ addi r3, r1, 0xc0 /* 8016AF48 00167E88 38 81 00 5C */ addi r4, r1, 0x5c -/* 8016AF4C 00167E8C 48 10 60 1D */ bl cSAngle_X1_ +/* 8016AF4C 00167E8C 48 10 60 1D */ bl __ct__7cSAngleFRC7cSAngle /* 8016AF50 00167E90 38 61 00 5C */ addi r3, r1, 0x5c /* 8016AF54 00167E94 38 80 FF FF */ li r4, -1 /* 8016AF58 00167E98 4B EC 55 B9 */ bl cSAngle_NS_dtor /* 8016AF5C 00167E9C 38 61 00 58 */ addi r3, r1, 0x58 /* 8016AF60 00167EA0 38 81 00 C0 */ addi r4, r1, 0xc0 -/* 8016AF64 00167EA4 48 10 60 05 */ bl cSAngle_X1_ +/* 8016AF64 00167EA4 48 10 60 05 */ bl __ct__7cSAngleFRC7cSAngle /* 8016AF68 00167EA8 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 8016AF6C 00167EAC 38 81 03 B4 */ addi r4, r1, 0x3b4 /* 8016AF70 00167EB0 38 A1 00 58 */ addi r5, r1, 0x58 @@ -2786,20 +2786,20 @@ lbl_8016B02C: /* 8016B04C 00167F8C 7C 64 1B 78 */ mr r4, r3 /* 8016B050 00167F90 38 61 00 54 */ addi r3, r1, 0x54 /* 8016B054 00167F94 38 AD 8C 18 */ addi r5, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ -/* 8016B058 00167F98 48 10 61 1D */ bl cSAngle_NS___pl +/* 8016B058 00167F98 48 10 61 1D */ bl __pl__7cSAngleCFRC7cSAngle /* 8016B05C 00167F9C 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016B060 00167FA0 48 01 79 A9 */ bl cSGlobe_NS_V_X1_ /* 8016B064 00167FA4 7C 64 1B 78 */ mr r4, r3 /* 8016B068 00167FA8 38 61 01 00 */ addi r3, r1, 0x100 /* 8016B06C 00167FAC C0 3F 04 28 */ lfs f1, 0x428(r31) /* 8016B070 00167FB0 38 A1 00 54 */ addi r5, r1, 0x54 -/* 8016B074 00167FB4 48 10 67 DD */ bl cSGlobe_X3_ +/* 8016B074 00167FB4 48 10 67 DD */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8016B078 00167FB8 38 61 00 54 */ addi r3, r1, 0x54 /* 8016B07C 00167FBC 38 80 FF FF */ li r4, -1 /* 8016B080 00167FC0 4B EC 54 91 */ bl cSAngle_NS_dtor /* 8016B084 00167FC4 38 61 01 98 */ addi r3, r1, 0x198 /* 8016B088 00167FC8 38 81 01 00 */ addi r4, r1, 0x100 -/* 8016B08C 00167FCC 48 10 6A 29 */ bl cSGlobe_NS_Xyz +/* 8016B08C 00167FCC 48 10 6A 29 */ bl Xyz__7cSGlobeCFv /* 8016B090 00167FD0 38 61 04 08 */ addi r3, r1, 0x408 /* 8016B094 00167FD4 38 81 01 98 */ addi r4, r1, 0x198 /* 8016B098 00167FD8 4B F2 38 6D */ bl cXyz_NS___apl @@ -2813,11 +2813,11 @@ lbl_8016B0B4: /* 8016B0B4 00167FF4 38 61 01 8C */ addi r3, r1, 0x18c /* 8016B0B8 00167FF8 38 81 04 08 */ addi r4, r1, 0x408 /* 8016B0BC 00167FFC 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8016B0C0 00168000 48 0F BA 75 */ bl cXyz_NS___mi +/* 8016B0C0 00168000 48 0F BA 75 */ bl __mi__4cXyzCFRC3Vec /* 8016B0C4 00168004 38 61 01 80 */ addi r3, r1, 0x180 /* 8016B0C8 00168008 38 81 01 8C */ addi r4, r1, 0x18c /* 8016B0CC 0016800C 38 A1 03 C0 */ addi r5, r1, 0x3c0 -/* 8016B0D0 00168010 48 0F BB 01 */ bl cXyz_NS___ml_X1_ +/* 8016B0D0 00168010 48 0F BB 01 */ bl __ml__4cXyzCFRC3Vec /* 8016B0D4 00168014 38 7F 00 64 */ addi r3, r31, 0x64 /* 8016B0D8 00168018 38 81 01 80 */ addi r4, r1, 0x180 /* 8016B0DC 0016801C 4B F2 38 29 */ bl cXyz_NS___apl @@ -2830,10 +2830,10 @@ lbl_8016B0B4: /* 8016B0F8 00168038 38 61 01 74 */ addi r3, r1, 0x174 /* 8016B0FC 0016803C 38 9F 00 70 */ addi r4, r31, 0x70 /* 8016B100 00168040 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8016B104 00168044 48 0F BA 31 */ bl cXyz_NS___mi +/* 8016B104 00168044 48 0F BA 31 */ bl __mi__4cXyzCFRC3Vec /* 8016B108 00168048 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8016B10C 0016804C 38 81 01 74 */ addi r4, r1, 0x174 -/* 8016B110 00168050 48 10 67 71 */ bl cSGlobe_X4_ +/* 8016B110 00168050 48 10 67 71 */ bl __ct__7cSGlobeFRC4cXyz /* 8016B114 00168054 38 61 01 74 */ addi r3, r1, 0x174 /* 8016B118 00168058 38 80 FF FF */ li r4, -1 /* 8016B11C 0016805C 4B E9 E0 69 */ bl cXyz_NS_dtor @@ -2881,9 +2881,9 @@ lbl_8016B190: /* 8016B1BC 001680FC 38 61 00 50 */ addi r3, r1, 0x50 /* 8016B1C0 00168100 C0 02 9D E8 */ lfs f0, lbl_804537E8-_SDA2_BASE_(r2) /* 8016B1C4 00168104 EC 20 03 B2 */ fmuls f1, f0, f14 -/* 8016B1C8 00168108 48 10 5E 01 */ bl cSAngle_X3_ +/* 8016B1C8 00168108 48 10 5E 01 */ bl __ct__7cSAngleFf /* 8016B1CC 0016810C 38 61 00 50 */ addi r3, r1, 0x50 -/* 8016B1D0 00168110 48 10 5F 51 */ bl cSAngle_NS_Cos +/* 8016B1D0 00168110 48 10 5F 51 */ bl Cos__7cSAngleCFv /* 8016B1D4 00168114 EC 5C 00 72 */ fmuls f2, f28, f1 /* 8016B1D8 00168118 C0 22 9C A8 */ lfs f1, lbl_804536A8-_SDA2_BASE_(r2) /* 8016B1DC 0016811C EC 01 E0 28 */ fsubs f0, f1, f28 @@ -2964,9 +2964,9 @@ lbl_8016B2CC: /* 8016B2EC 0016822C 38 61 00 4C */ addi r3, r1, 0x4c /* 8016B2F0 00168230 C0 02 9D E8 */ lfs f0, lbl_804537E8-_SDA2_BASE_(r2) /* 8016B2F4 00168234 EC 20 00 72 */ fmuls f1, f0, f1 -/* 8016B2F8 00168238 48 10 5C D1 */ bl cSAngle_X3_ +/* 8016B2F8 00168238 48 10 5C D1 */ bl __ct__7cSAngleFf /* 8016B2FC 0016823C 38 61 00 4C */ addi r3, r1, 0x4c -/* 8016B300 00168240 48 10 5E 21 */ bl cSAngle_NS_Cos +/* 8016B300 00168240 48 10 5E 21 */ bl Cos__7cSAngleCFv /* 8016B304 00168244 EC 5C 00 72 */ fmuls f2, f28, f1 /* 8016B308 00168248 C0 22 9C A8 */ lfs f1, lbl_804536A8-_SDA2_BASE_(r2) /* 8016B30C 0016824C EC 01 E0 28 */ fsubs f0, f1, f28 @@ -2986,9 +2986,9 @@ lbl_8016B32C: /* 8016B340 00168280 38 61 00 48 */ addi r3, r1, 0x48 /* 8016B344 00168284 C0 02 9D E8 */ lfs f0, lbl_804537E8-_SDA2_BASE_(r2) /* 8016B348 00168288 EC 20 00 72 */ fmuls f1, f0, f1 -/* 8016B34C 0016828C 48 10 5C 7D */ bl cSAngle_X3_ +/* 8016B34C 0016828C 48 10 5C 7D */ bl __ct__7cSAngleFf /* 8016B350 00168290 38 61 00 48 */ addi r3, r1, 0x48 -/* 8016B354 00168294 48 10 5D CD */ bl cSAngle_NS_Cos +/* 8016B354 00168294 48 10 5D CD */ bl Cos__7cSAngleCFv /* 8016B358 00168298 EC 5C 00 72 */ fmuls f2, f28, f1 /* 8016B35C 0016829C C0 22 9C A8 */ lfs f1, lbl_804536A8-_SDA2_BASE_(r2) /* 8016B360 001682A0 EC 01 E0 28 */ fsubs f0, f1, f28 @@ -3077,7 +3077,7 @@ lbl_8016B488: /* 8016B48C 001683CC 48 01 75 BD */ bl __ct__7cSAngleFv /* 8016B490 001683D0 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8016B494 001683D4 48 01 75 75 */ bl cSGlobe_NS_V_X1_ -/* 8016B498 001683D8 48 10 5C 89 */ bl cSAngle_NS_Cos +/* 8016B498 001683D8 48 10 5C 89 */ bl Cos__7cSAngleCFv /* 8016B49C 001683DC C0 1F 04 30 */ lfs f0, 0x430(r31) /* 8016B4A0 001683E0 EE 20 00 72 */ fmuls f17, f0, f1 /* 8016B4A4 001683E4 7F E3 FB 78 */ mr r3, r31 @@ -3091,10 +3091,10 @@ lbl_8016B488: /* 8016B4C4 00168404 38 61 01 68 */ addi r3, r1, 0x168 /* 8016B4C8 00168408 38 81 03 9C */ addi r4, r1, 0x39c /* 8016B4CC 0016840C 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8016B4D0 00168410 48 0F B6 65 */ bl cXyz_NS___mi +/* 8016B4D0 00168410 48 0F B6 65 */ bl __mi__4cXyzCFRC3Vec /* 8016B4D4 00168414 38 61 00 F0 */ addi r3, r1, 0xf0 /* 8016B4D8 00168418 38 81 01 68 */ addi r4, r1, 0x168 -/* 8016B4DC 0016841C 48 10 63 A5 */ bl cSGlobe_X4_ +/* 8016B4DC 0016841C 48 10 63 A5 */ bl __ct__7cSGlobeFRC4cXyz /* 8016B4E0 00168420 38 61 01 68 */ addi r3, r1, 0x168 /* 8016B4E4 00168424 38 80 FF FF */ li r4, -1 /* 8016B4E8 00168428 4B E9 DC 9D */ bl cXyz_NS_dtor @@ -3107,7 +3107,7 @@ lbl_8016B488: /* 8016B504 00168444 38 9F 00 9C */ addi r4, r31, 0x9c /* 8016B508 00168448 48 00 0D CD */ bl _unnamed_d_camera_cpp__NS_sAngleX /* 8016B50C 0016844C 38 61 00 44 */ addi r3, r1, 0x44 -/* 8016B510 00168450 48 10 5C 11 */ bl cSAngle_NS_Cos +/* 8016B510 00168450 48 10 5C 11 */ bl Cos__7cSAngleCFv /* 8016B514 00168454 C0 02 9D 28 */ lfs f0, lbl_80453728-_SDA2_BASE_(r2) /* 8016B518 00168458 EC 20 00 72 */ fmuls f1, f0, f1 /* 8016B51C 0016845C C0 02 9D D4 */ lfs f0, lbl_804537D4-_SDA2_BASE_(r2) @@ -3127,10 +3127,10 @@ lbl_8016B54C: /* 8016B550 00168490 28 00 00 00 */ cmplwi r0, 0 /* 8016B554 00168494 41 82 00 40 */ beq lbl_8016B594 /* 8016B558 00168498 38 61 00 D4 */ addi r3, r1, 0xd4 -/* 8016B55C 0016849C 48 10 5B 8D */ bl cSAngle_NS_Inv +/* 8016B55C 0016849C 48 10 5B 8D */ bl Inv__7cSAngleCFv /* 8016B560 001684A0 7C 64 1B 78 */ mr r4, r3 /* 8016B564 001684A4 38 61 00 40 */ addi r3, r1, 0x40 -/* 8016B568 001684A8 48 10 5A 31 */ bl cSAngle_X2_ +/* 8016B568 001684A8 48 10 5A 31 */ bl __ct__7cSAngleFs /* 8016B56C 001684AC 38 61 00 BC */ addi r3, r1, 0xbc /* 8016B570 001684B0 38 81 00 40 */ addi r4, r1, 0x40 /* 8016B574 001684B4 48 01 77 35 */ bl cSAngle_NS___as @@ -3154,10 +3154,10 @@ lbl_8016B5B4: /* 8016B5B4 001684F4 57 40 06 3F */ clrlwi. r0, r26, 0x18 /* 8016B5B8 001684F8 41 82 00 34 */ beq lbl_8016B5EC /* 8016B5BC 001684FC 38 61 00 D4 */ addi r3, r1, 0xd4 -/* 8016B5C0 00168500 48 10 5B 29 */ bl cSAngle_NS_Inv +/* 8016B5C0 00168500 48 10 5B 29 */ bl Inv__7cSAngleCFv /* 8016B5C4 00168504 7C 64 1B 78 */ mr r4, r3 /* 8016B5C8 00168508 38 61 00 3C */ addi r3, r1, 0x3c -/* 8016B5CC 0016850C 48 10 59 CD */ bl cSAngle_X2_ +/* 8016B5CC 0016850C 48 10 59 CD */ bl __ct__7cSAngleFs /* 8016B5D0 00168510 38 61 00 BC */ addi r3, r1, 0xbc /* 8016B5D4 00168514 38 81 00 3C */ addi r4, r1, 0x3c /* 8016B5D8 00168518 48 01 76 D1 */ bl cSAngle_NS___as @@ -3190,10 +3190,10 @@ lbl_8016B608: /* 8016B63C 0016857C 38 61 01 50 */ addi r3, r1, 0x150 /* 8016B640 00168580 38 9F 00 64 */ addi r4, r31, 0x64 /* 8016B644 00168584 38 A1 01 5C */ addi r5, r1, 0x15c -/* 8016B648 00168588 48 0F B4 ED */ bl cXyz_NS___mi +/* 8016B648 00168588 48 0F B4 ED */ bl __mi__4cXyzCFRC3Vec /* 8016B64C 0016858C 38 61 00 E8 */ addi r3, r1, 0xe8 /* 8016B650 00168590 38 81 01 50 */ addi r4, r1, 0x150 -/* 8016B654 00168594 48 10 62 2D */ bl cSGlobe_X4_ +/* 8016B654 00168594 48 10 62 2D */ bl __ct__7cSGlobeFRC4cXyz /* 8016B658 00168598 38 61 01 50 */ addi r3, r1, 0x150 /* 8016B65C 0016859C 38 80 FF FF */ li r4, -1 /* 8016B660 001685A0 4B E9 DB 25 */ bl cXyz_NS_dtor @@ -3224,10 +3224,10 @@ lbl_8016B6AC: /* 8016B6BC 001685FC 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8016B6C0 00168600 40 82 00 34 */ bne lbl_8016B6F4 /* 8016B6C4 00168604 38 61 00 D4 */ addi r3, r1, 0xd4 -/* 8016B6C8 00168608 48 10 5A 21 */ bl cSAngle_NS_Inv +/* 8016B6C8 00168608 48 10 5A 21 */ bl Inv__7cSAngleCFv /* 8016B6CC 0016860C 7C 64 1B 78 */ mr r4, r3 /* 8016B6D0 00168610 38 61 00 38 */ addi r3, r1, 0x38 -/* 8016B6D4 00168614 48 10 58 C5 */ bl cSAngle_X2_ +/* 8016B6D4 00168614 48 10 58 C5 */ bl __ct__7cSAngleFs /* 8016B6D8 00168618 38 61 00 BC */ addi r3, r1, 0xbc /* 8016B6DC 0016861C 38 81 00 38 */ addi r4, r1, 0x38 /* 8016B6E0 00168620 48 01 75 C9 */ bl cSAngle_NS___as @@ -3242,10 +3242,10 @@ lbl_8016B6F4: /* 8016B700 00168640 48 00 00 30 */ b lbl_8016B730 lbl_8016B704: /* 8016B704 00168644 38 61 00 D4 */ addi r3, r1, 0xd4 -/* 8016B708 00168648 48 10 59 E1 */ bl cSAngle_NS_Inv +/* 8016B708 00168648 48 10 59 E1 */ bl Inv__7cSAngleCFv /* 8016B70C 0016864C 7C 64 1B 78 */ mr r4, r3 /* 8016B710 00168650 38 61 00 34 */ addi r3, r1, 0x34 -/* 8016B714 00168654 48 10 58 85 */ bl cSAngle_X2_ +/* 8016B714 00168654 48 10 58 85 */ bl __ct__7cSAngleFs /* 8016B718 00168658 38 61 00 BC */ addi r3, r1, 0xbc /* 8016B71C 0016865C 38 81 00 34 */ addi r4, r1, 0x34 /* 8016B720 00168660 48 01 75 89 */ bl cSAngle_NS___as @@ -3284,13 +3284,13 @@ lbl_8016B730: /* 8016B7A0 001686E0 D0 1F 04 94 */ stfs f0, 0x494(r31) /* 8016B7A4 001686E4 38 61 00 30 */ addi r3, r1, 0x30 /* 8016B7A8 001686E8 C0 3F 04 94 */ lfs f1, 0x494(r31) -/* 8016B7AC 001686EC 48 10 58 1D */ bl cSAngle_X3_ +/* 8016B7AC 001686EC 48 10 58 1D */ bl __ct__7cSAngleFf /* 8016B7B0 001686F0 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8016B7B4 001686F4 48 01 74 D1 */ bl cSGlobe_NS_U_X1_ /* 8016B7B8 001686F8 7C 64 1B 78 */ mr r4, r3 /* 8016B7BC 001686FC 38 61 00 2C */ addi r3, r1, 0x2c /* 8016B7C0 00168700 38 A1 00 30 */ addi r5, r1, 0x30 -/* 8016B7C4 00168704 48 10 59 B1 */ bl cSAngle_NS___pl +/* 8016B7C4 00168704 48 10 59 B1 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016B7C8 00168708 38 61 00 BC */ addi r3, r1, 0xbc /* 8016B7CC 0016870C 38 81 00 2C */ addi r4, r1, 0x2c /* 8016B7D0 00168710 48 01 74 D9 */ bl cSAngle_NS___as @@ -3356,7 +3356,7 @@ lbl_8016B888: /* 8016B8B0 001687F0 48 00 0A 1D */ bl cSAngle_NS_Val /* 8016B8B4 001687F4 7C 64 1B 78 */ mr r4, r3 /* 8016B8B8 001687F8 38 61 00 28 */ addi r3, r1, 0x28 -/* 8016B8BC 001687FC 48 10 56 DD */ bl cSAngle_X2_ +/* 8016B8BC 001687FC 48 10 56 DD */ bl __ct__7cSAngleFs /* 8016B8C0 00168800 38 7F 04 82 */ addi r3, r31, 0x482 /* 8016B8C4 00168804 38 81 00 28 */ addi r4, r1, 0x28 /* 8016B8C8 00168808 48 01 73 E1 */ bl cSAngle_NS___as @@ -3379,7 +3379,7 @@ lbl_8016B8E4: /* 8016B908 00168848 48 00 09 C5 */ bl cSAngle_NS_Val /* 8016B90C 0016884C 7C 64 1B 78 */ mr r4, r3 /* 8016B910 00168850 38 61 00 24 */ addi r3, r1, 0x24 -/* 8016B914 00168854 48 10 56 85 */ bl cSAngle_X2_ +/* 8016B914 00168854 48 10 56 85 */ bl __ct__7cSAngleFs /* 8016B918 00168858 38 7F 04 82 */ addi r3, r31, 0x482 /* 8016B91C 0016885C 38 81 00 24 */ addi r4, r1, 0x24 /* 8016B920 00168860 48 01 73 89 */ bl cSAngle_NS___as @@ -3407,7 +3407,7 @@ lbl_8016B964: /* 8016B96C 001688AC 48 00 09 61 */ bl cSAngle_NS_Val /* 8016B970 001688B0 7C 64 1B 78 */ mr r4, r3 /* 8016B974 001688B4 38 61 00 20 */ addi r3, r1, 0x20 -/* 8016B978 001688B8 48 10 56 21 */ bl cSAngle_X2_ +/* 8016B978 001688B8 48 10 56 21 */ bl __ct__7cSAngleFs /* 8016B97C 001688BC 38 7F 04 82 */ addi r3, r31, 0x482 /* 8016B980 001688C0 38 81 00 20 */ addi r4, r1, 0x20 /* 8016B984 001688C4 48 01 73 25 */ bl cSAngle_NS___as @@ -3430,17 +3430,17 @@ lbl_8016B9B8: /* 8016B9C0 00168900 7C 65 1B 78 */ mr r5, r3 /* 8016B9C4 00168904 38 61 00 1C */ addi r3, r1, 0x1c /* 8016B9C8 00168908 38 81 00 BC */ addi r4, r1, 0xbc -/* 8016B9CC 0016890C 48 10 57 D9 */ bl cSAngle_NS___mi_X1_ +/* 8016B9CC 0016890C 48 10 57 D9 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016B9D0 00168910 38 61 00 18 */ addi r3, r1, 0x18 /* 8016B9D4 00168914 38 81 00 1C */ addi r4, r1, 0x1c /* 8016B9D8 00168918 FC 20 88 90 */ fmr f1, f17 -/* 8016B9DC 0016891C 48 10 58 89 */ bl cSAngle_NS___ml +/* 8016B9DC 0016891C 48 10 58 89 */ bl __ml__7cSAngleCFf /* 8016B9E0 00168920 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8016B9E4 00168924 48 01 72 A1 */ bl cSGlobe_NS_U_X1_ /* 8016B9E8 00168928 7C 64 1B 78 */ mr r4, r3 /* 8016B9EC 0016892C 38 61 00 14 */ addi r3, r1, 0x14 /* 8016B9F0 00168930 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8016B9F4 00168934 48 10 57 81 */ bl cSAngle_NS___pl +/* 8016B9F4 00168934 48 10 57 81 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016B9F8 00168938 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016B9FC 0016893C 38 81 00 14 */ addi r4, r1, 0x14 /* 8016BA00 00168940 4B F2 2E 95 */ bl cSGlobe_NS_U @@ -3579,7 +3579,7 @@ lbl_8016BBE4: /* 8016BBE8 00168B28 D0 1F 04 60 */ stfs f0, 0x460(r31) /* 8016BBEC 00168B2C 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016BBF0 00168B30 48 01 6E 19 */ bl cSGlobe_NS_V_X1_ -/* 8016BBF4 00168B34 48 10 54 3D */ bl cSAngle_NS_Degree +/* 8016BBF4 00168B34 48 10 54 3D */ bl Degree__7cSAngleCFv /* 8016BBF8 00168B38 D0 3F 04 38 */ stfs f1, 0x438(r31) /* 8016BBFC 00168B3C 48 00 01 7C */ b lbl_8016BD78 lbl_8016BC00: @@ -3604,7 +3604,7 @@ lbl_8016BC38: /* 8016BC40 00168B80 EC 01 00 32 */ fmuls f0, f1, f0 /* 8016BC44 00168B84 ED D3 00 2A */ fadds f14, f19, f0 /* 8016BC48 00168B88 38 7F 01 B0 */ addi r3, r31, 0x1b0 -/* 8016BC4C 00168B8C 48 10 53 E5 */ bl cSAngle_NS_Degree +/* 8016BC4C 00168B8C 48 10 53 E5 */ bl Degree__7cSAngleCFv /* 8016BC50 00168B90 ED CE 08 2A */ fadds f14, f14, f1 /* 8016BC54 00168B94 C0 3F 04 38 */ lfs f1, 0x438(r31) /* 8016BC58 00168B98 EC 0E 08 28 */ fsubs f0, f14, f1 @@ -3624,7 +3624,7 @@ lbl_8016BC88: /* 8016BC8C 00168BCC 41 82 00 20 */ beq lbl_8016BCAC /* 8016BC90 00168BD0 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8016BC94 00168BD4 48 01 6D 75 */ bl cSGlobe_NS_V_X1_ -/* 8016BC98 00168BD8 48 10 53 99 */ bl cSAngle_NS_Degree +/* 8016BC98 00168BD8 48 10 53 99 */ bl Degree__7cSAngleCFv /* 8016BC9C 00168BDC D0 3F 04 38 */ stfs f1, 0x438(r31) /* 8016BCA0 00168BE0 C0 02 9D 00 */ lfs f0, lbl_80453700-_SDA2_BASE_(r2) /* 8016BCA4 00168BE4 D0 1F 04 60 */ stfs f0, 0x460(r31) @@ -3664,13 +3664,13 @@ lbl_8016BD08: lbl_8016BD24: /* 8016BD24 00168C64 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8016BD28 00168C68 48 01 6C E1 */ bl cSGlobe_NS_V_X1_ -/* 8016BD2C 00168C6C 48 10 53 05 */ bl cSAngle_NS_Degree +/* 8016BD2C 00168C6C 48 10 53 05 */ bl Degree__7cSAngleCFv /* 8016BD30 00168C70 D0 3F 04 38 */ stfs f1, 0x438(r31) /* 8016BD34 00168C74 48 00 00 44 */ b lbl_8016BD78 lbl_8016BD38: /* 8016BD38 00168C78 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8016BD3C 00168C7C 48 01 6C CD */ bl cSGlobe_NS_V_X1_ -/* 8016BD40 00168C80 48 10 52 F1 */ bl cSAngle_NS_Degree +/* 8016BD40 00168C80 48 10 52 F1 */ bl Degree__7cSAngleCFv /* 8016BD44 00168C84 D0 3F 04 38 */ stfs f1, 0x438(r31) /* 8016BD48 00168C88 C0 3F 04 08 */ lfs f1, 0x408(r31) /* 8016BD4C 00168C8C C0 41 05 B8 */ lfs f2, 0x5b8(r1) @@ -3681,7 +3681,7 @@ lbl_8016BD38: /* 8016BD60 00168CA0 41 82 00 18 */ beq lbl_8016BD78 /* 8016BD64 00168CA4 38 61 00 DC */ addi r3, r1, 0xdc /* 8016BD68 00168CA8 C0 22 9D EC */ lfs f1, lbl_804537EC-_SDA2_BASE_(r2) -/* 8016BD6C 00168CAC 48 10 52 A1 */ bl cSAngle_NS_Val_X3_ +/* 8016BD6C 00168CAC 48 10 52 A1 */ bl Val__7cSAngleFf /* 8016BD70 00168CB0 C0 02 9D 24 */ lfs f0, lbl_80453724-_SDA2_BASE_(r2) /* 8016BD74 00168CB4 D0 1F 04 60 */ stfs f0, 0x460(r31) lbl_8016BD78: @@ -3702,7 +3702,7 @@ lbl_8016BD8C: /* 8016BDAC 00168CEC 4B E9 D3 D9 */ bl cXyz_NS_dtor /* 8016BDB0 00168CF0 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8016BDB4 00168CF4 C0 3F 04 38 */ lfs f1, 0x438(r31) -/* 8016BDB8 00168CF8 48 10 52 55 */ bl cSAngle_NS_Val_X3_ +/* 8016BDB8 00168CF8 48 10 52 55 */ bl Val__7cSAngleFf /* 8016BDBC 00168CFC 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8016BDC0 00168D00 38 81 00 DC */ addi r4, r1, 0xdc /* 8016BDC4 00168D04 48 01 6C A9 */ bl cSAngle_NS___lt @@ -3710,7 +3710,7 @@ lbl_8016BD8C: /* 8016BDCC 00168D0C 41 82 00 14 */ beq lbl_8016BDE0 /* 8016BDD0 00168D10 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8016BDD4 00168D14 38 81 00 DC */ addi r4, r1, 0xdc -/* 8016BDD8 00168D18 48 10 52 21 */ bl cSAngle_NS_Val_X1_ +/* 8016BDD8 00168D18 48 10 52 21 */ bl Val__7cSAngleFRC7cSAngle /* 8016BDDC 00168D1C 48 00 00 24 */ b lbl_8016BE00 lbl_8016BDE0: /* 8016BDE0 00168D20 38 61 00 B8 */ addi r3, r1, 0xb8 @@ -3720,7 +3720,7 @@ lbl_8016BDE0: /* 8016BDF0 00168D30 41 82 00 10 */ beq lbl_8016BE00 /* 8016BDF4 00168D34 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8016BDF8 00168D38 38 81 00 D8 */ addi r4, r1, 0xd8 -/* 8016BDFC 00168D3C 48 10 51 FD */ bl cSAngle_NS_Val_X1_ +/* 8016BDFC 00168D3C 48 10 51 FD */ bl Val__7cSAngleFRC7cSAngle lbl_8016BE00: /* 8016BE00 00168D40 A8 1F 04 04 */ lha r0, 0x404(r31) /* 8016BE04 00168D44 2C 00 00 00 */ cmpwi r0, 0 @@ -3732,17 +3732,17 @@ lbl_8016BE10: /* 8016BE18 00168D58 7C 65 1B 78 */ mr r5, r3 /* 8016BE1C 00168D5C 38 61 00 10 */ addi r3, r1, 0x10 /* 8016BE20 00168D60 38 81 00 B8 */ addi r4, r1, 0xb8 -/* 8016BE24 00168D64 48 10 53 81 */ bl cSAngle_NS___mi_X1_ +/* 8016BE24 00168D64 48 10 53 81 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016BE28 00168D68 38 61 00 0C */ addi r3, r1, 0xc /* 8016BE2C 00168D6C 38 81 00 10 */ addi r4, r1, 0x10 /* 8016BE30 00168D70 C0 3F 04 60 */ lfs f1, 0x460(r31) -/* 8016BE34 00168D74 48 10 54 31 */ bl cSAngle_NS___ml +/* 8016BE34 00168D74 48 10 54 31 */ bl __ml__7cSAngleCFf /* 8016BE38 00168D78 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016BE3C 00168D7C 48 01 6B CD */ bl cSGlobe_NS_V_X1_ /* 8016BE40 00168D80 7C 64 1B 78 */ mr r4, r3 /* 8016BE44 00168D84 38 61 00 08 */ addi r3, r1, 8 /* 8016BE48 00168D88 38 A1 00 0C */ addi r5, r1, 0xc -/* 8016BE4C 00168D8C 48 10 53 29 */ bl cSAngle_NS___pl +/* 8016BE4C 00168D8C 48 10 53 29 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016BE50 00168D90 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016BE54 00168D94 38 81 00 08 */ addi r4, r1, 8 /* 8016BE58 00168D98 4B F2 3C 01 */ bl cSGlobe_NS_V @@ -3880,11 +3880,11 @@ lbl_8016C014: /* 8016C040 00168F80 48 01 6A 0D */ bl cSGlobe_NS_R /* 8016C044 00168F84 38 61 01 2C */ addi r3, r1, 0x12c /* 8016C048 00168F88 38 9F 00 5C */ addi r4, r31, 0x5c -/* 8016C04C 00168F8C 48 10 5A 69 */ bl cSGlobe_NS_Xyz +/* 8016C04C 00168F8C 48 10 5A 69 */ bl Xyz__7cSGlobeCFv /* 8016C050 00168F90 38 61 01 20 */ addi r3, r1, 0x120 /* 8016C054 00168F94 38 9F 00 64 */ addi r4, r31, 0x64 /* 8016C058 00168F98 38 A1 01 2C */ addi r5, r1, 0x12c -/* 8016C05C 00168F9C 48 0F AA 89 */ bl cXyz_NS___pl +/* 8016C05C 00168F9C 48 0F AA 89 */ bl __pl__4cXyzCFRC3Vec /* 8016C060 00168FA0 38 7F 04 4C */ addi r3, r31, 0x44c /* 8016C064 00168FA4 38 81 01 20 */ addi r4, r1, 0x120 /* 8016C068 00168FA8 4B F2 B7 71 */ bl cXyz_NS___as diff --git a/include/d/d_camera/asm/func_8016C2D4.s b/include/d/d_camera/asm/func_8016C2D4.s index 43bf37d75d..8927bc10e1 100644 --- a/include/d/d_camera/asm/func_8016C2D4.s +++ b/include/d/d_camera/asm/func_8016C2D4.s @@ -8,7 +8,7 @@ /* 8016C2F0 00169230 48 0F B3 85 */ bl cM_atan2s /* 8016C2F4 00169234 7C 64 1B 78 */ mr r4, r3 /* 8016C2F8 00169238 7F E3 FB 78 */ mr r3, r31 -/* 8016C2FC 0016923C 48 10 4C 9D */ bl cSAngle_X2_ +/* 8016C2FC 0016923C 48 10 4C 9D */ bl __ct__7cSAngleFs /* 8016C300 00169240 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8016C304 00169244 80 01 00 14 */ lwz r0, 0x14(r1) /* 8016C308 00169248 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_camera/asm/func_8016C384.s b/include/d/d_camera/asm/func_8016C384.s index d676c87d95..ff73256aea 100644 --- a/include/d/d_camera/asm/func_8016C384.s +++ b/include/d/d_camera/asm/func_8016C384.s @@ -44,10 +44,10 @@ /* 8016C430 00169370 C3 C3 0A 40 */ lfs f30, 0xa40(r3) /* 8016C434 00169374 38 61 00 F4 */ addi r3, r1, 0xf4 /* 8016C438 00169378 C0 3E 0A 30 */ lfs f1, 0xa30(r30) -/* 8016C43C 0016937C 48 10 4B 8D */ bl cSAngle_X3_ +/* 8016C43C 0016937C 48 10 4B 8D */ bl __ct__7cSAngleFf /* 8016C440 00169380 38 61 01 48 */ addi r3, r1, 0x148 /* 8016C444 00169384 38 81 00 F4 */ addi r4, r1, 0xf4 -/* 8016C448 00169388 48 10 4B 21 */ bl cSAngle_X1_ +/* 8016C448 00169388 48 10 4B 21 */ bl __ct__7cSAngleFRC7cSAngle /* 8016C44C 0016938C 38 61 00 F4 */ addi r3, r1, 0xf4 /* 8016C450 00169390 38 80 FF FF */ li r4, -1 /* 8016C454 00169394 4B EC 40 BD */ bl cSAngle_NS_dtor @@ -195,10 +195,10 @@ lbl_8016C62C: /* 8016C684 001695C4 38 61 02 58 */ addi r3, r1, 0x258 /* 8016C688 001695C8 38 9E 00 64 */ addi r4, r30, 0x64 /* 8016C68C 001695CC 38 A1 02 C4 */ addi r5, r1, 0x2c4 -/* 8016C690 001695D0 48 0F A4 A5 */ bl cXyz_NS___mi +/* 8016C690 001695D0 48 0F A4 A5 */ bl __mi__4cXyzCFRC3Vec /* 8016C694 001695D4 38 7E 04 1C */ addi r3, r30, 0x41c /* 8016C698 001695D8 38 81 02 58 */ addi r4, r1, 0x258 -/* 8016C69C 001695DC 48 10 53 D5 */ bl cSGlobe_NS_Val_X3_ +/* 8016C69C 001695DC 48 10 53 D5 */ bl Val__7cSGlobeFRC4cXyz /* 8016C6A0 001695E0 38 61 02 58 */ addi r3, r1, 0x258 /* 8016C6A4 001695E4 38 80 FF FF */ li r4, -1 /* 8016C6A8 001695E8 4B E9 CA DD */ bl cXyz_NS_dtor @@ -296,14 +296,14 @@ lbl_8016C7F0: /* 8016C804 00169744 40 82 00 90 */ bne lbl_8016C894 /* 8016C808 00169748 38 61 01 44 */ addi r3, r1, 0x144 /* 8016C80C 0016974C C0 22 9D F0 */ lfs f1, lbl_804537F0-_SDA2_BASE_(r2) -/* 8016C810 00169750 48 10 47 B9 */ bl cSAngle_X3_ +/* 8016C810 00169750 48 10 47 B9 */ bl __ct__7cSAngleFf /* 8016C814 00169754 A8 73 00 00 */ lha r3, 0(r19) /* 8016C818 00169758 A8 01 01 44 */ lha r0, 0x144(r1) /* 8016C81C 0016975C 7C 03 00 00 */ cmpw r3, r0 /* 8016C820 00169760 40 80 00 68 */ bge lbl_8016C888 /* 8016C824 00169764 38 61 00 EC */ addi r3, r1, 0xec /* 8016C828 00169768 C0 22 9D F0 */ lfs f1, lbl_804537F0-_SDA2_BASE_(r2) -/* 8016C82C 0016976C 48 10 47 9D */ bl cSAngle_X3_ +/* 8016C82C 0016976C 48 10 47 9D */ bl __ct__7cSAngleFf /* 8016C830 00169770 38 7E 00 5C */ addi r3, r30, 0x5c /* 8016C834 00169774 38 81 00 EC */ addi r4, r1, 0xec /* 8016C838 00169778 4B F2 32 21 */ bl cSGlobe_NS_V @@ -312,11 +312,11 @@ lbl_8016C7F0: /* 8016C844 00169784 4B EC 3C CD */ bl cSAngle_NS_dtor /* 8016C848 00169788 38 61 02 4C */ addi r3, r1, 0x24c /* 8016C84C 0016978C 38 9E 00 5C */ addi r4, r30, 0x5c -/* 8016C850 00169790 48 10 52 65 */ bl cSGlobe_NS_Xyz +/* 8016C850 00169790 48 10 52 65 */ bl Xyz__7cSGlobeCFv /* 8016C854 00169794 38 61 02 40 */ addi r3, r1, 0x240 /* 8016C858 00169798 38 9E 00 64 */ addi r4, r30, 0x64 /* 8016C85C 0016979C 38 A1 02 4C */ addi r5, r1, 0x24c -/* 8016C860 001697A0 48 0F A2 85 */ bl cXyz_NS___pl +/* 8016C860 001697A0 48 0F A2 85 */ bl __pl__4cXyzCFRC3Vec /* 8016C864 001697A4 38 7E 00 70 */ addi r3, r30, 0x70 /* 8016C868 001697A8 38 81 02 40 */ addi r4, r1, 0x240 /* 8016C86C 001697AC 4B F2 AF 6D */ bl cXyz_NS___as @@ -455,7 +455,7 @@ lbl_8016CA14: /* 8016CA38 00169978 38 61 02 34 */ addi r3, r1, 0x234 /* 8016CA3C 0016997C 38 9E 00 90 */ addi r4, r30, 0x90 /* 8016CA40 00169980 38 BE 00 64 */ addi r5, r30, 0x64 -/* 8016CA44 00169984 48 0F A0 F1 */ bl cXyz_NS___mi +/* 8016CA44 00169984 48 0F A0 F1 */ bl __mi__4cXyzCFRC3Vec /* 8016CA48 00169988 38 61 02 28 */ addi r3, r1, 0x228 /* 8016CA4C 0016998C 38 81 02 34 */ addi r4, r1, 0x234 /* 8016CA50 00169990 4B F2 AD A5 */ bl cXyz_X1_ @@ -483,7 +483,7 @@ lbl_8016CA90: lbl_8016CAA0: /* 8016CAA0 001699E0 C3 02 9D 24 */ lfs f24, lbl_80453724-_SDA2_BASE_(r2) /* 8016CAA4 001699E4 38 7E 04 38 */ addi r3, r30, 0x438 -/* 8016CAA8 001699E8 48 10 45 89 */ bl cSAngle_NS_Degree +/* 8016CAA8 001699E8 48 10 45 89 */ bl Degree__7cSAngleCFv /* 8016CAAC 001699EC FE E0 08 90 */ fmr f23, f1 /* 8016CAB0 001699F0 C2 C2 9D 68 */ lfs f22, lbl_80453768-_SDA2_BASE_(r2) /* 8016CAB4 001699F4 C2 A2 9D 0C */ lfs f21, lbl_8045370C-_SDA2_BASE_(r2) @@ -559,7 +559,7 @@ lbl_8016CB98: /* 8016CBB4 00169AF4 98 1E 04 12 */ stb r0, 0x412(r30) lbl_8016CBB8: /* 8016CBB8 00169AF8 38 61 01 60 */ addi r3, r1, 0x160 -/* 8016CBBC 00169AFC 48 00 18 65 */ bl cSGlobe +/* 8016CBBC 00169AFC 48 00 18 65 */ bl __ct__7cSGlobeFv /* 8016CBC0 00169B00 7F 83 E3 78 */ mr r3, r28 /* 8016CBC4 00169B04 4B F0 6A 19 */ bl dAttention_c_NS_LockonReleaseDistanse /* 8016CBC8 00169B08 FD E0 08 90 */ fmr f15, f1 @@ -642,10 +642,10 @@ lbl_8016CCF4: /* 8016CCF4 00169C34 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 8016CCF8 00169C38 38 81 02 B8 */ addi r4, r1, 0x2b8 /* 8016CCFC 00169C3C 38 A1 02 AC */ addi r5, r1, 0x2ac -/* 8016CD00 00169C40 48 0F 9E 35 */ bl cXyz_NS___mi +/* 8016CD00 00169C40 48 0F 9E 35 */ bl __mi__4cXyzCFRC3Vec /* 8016CD04 00169C44 38 61 01 60 */ addi r3, r1, 0x160 /* 8016CD08 00169C48 38 81 01 E0 */ addi r4, r1, 0x1e0 -/* 8016CD0C 00169C4C 48 10 4D 65 */ bl cSGlobe_NS_Val_X3_ +/* 8016CD0C 00169C4C 48 10 4D 65 */ bl Val__7cSGlobeFRC4cXyz /* 8016CD10 00169C50 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 8016CD14 00169C54 38 80 FF FF */ li r4, -1 /* 8016CD18 00169C58 4B E9 C4 6D */ bl cXyz_NS_dtor @@ -686,7 +686,7 @@ lbl_8016CD88: /* 8016CD9C 00169CDC C0 3E 09 B0 */ lfs f1, 0x9b0(r30) /* 8016CDA0 00169CE0 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 8016CDA4 00169CE4 38 A1 00 E4 */ addi r5, r1, 0xe4 -/* 8016CDA8 00169CE8 48 10 4C 61 */ bl cSGlobe_NS_Val_X2_ +/* 8016CDA8 00169CE8 48 10 4C 61 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8016CDAC 00169CEC 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8016CDB0 00169CF0 38 80 FF FF */ li r4, -1 /* 8016CDB4 00169CF4 4B EC 37 5D */ bl cSAngle_NS_dtor @@ -695,13 +695,13 @@ lbl_8016CDBC: /* 8016CDBC 00169CFC 38 61 01 40 */ addi r3, r1, 0x140 /* 8016CDC0 00169D00 3B 21 01 66 */ addi r25, r1, 0x166 /* 8016CDC4 00169D04 7F 24 CB 78 */ mr r4, r25 -/* 8016CDC8 00169D08 48 10 41 A1 */ bl cSAngle_X1_ +/* 8016CDC8 00169D08 48 10 41 A1 */ bl __ct__7cSAngleFRC7cSAngle /* 8016CDCC 00169D0C FC 20 98 90 */ fmr f1, f19 /* 8016CDD0 00169D10 FC 40 90 90 */ fmr f2, f18 /* 8016CDD4 00169D14 FC 60 78 90 */ fmr f3, f15 /* 8016CDD8 00169D18 48 00 16 39 */ bl _unnamed_d_camera_cpp__NS_rangef /* 8016CDDC 00169D1C 38 61 01 3C */ addi r3, r1, 0x13c -/* 8016CDE0 00169D20 48 10 41 E9 */ bl cSAngle_X3_ +/* 8016CDE0 00169D20 48 10 41 E9 */ bl __ct__7cSAngleFf /* 8016CDE4 00169D24 7F 63 DB 78 */ mr r3, r27 /* 8016CDE8 00169D28 81 9B 06 28 */ lwz r12, 0x628(r27) /* 8016CDEC 00169D2C 81 8C 01 88 */ lwz r12, 0x188(r12) @@ -715,7 +715,7 @@ lbl_8016CDBC: /* 8016CE0C 00169D4C 4B F2 A9 2D */ bl dCamera_c_NS_directionOf /* 8016CE10 00169D50 38 61 01 40 */ addi r3, r1, 0x140 /* 8016CE14 00169D54 38 81 00 E0 */ addi r4, r1, 0xe0 -/* 8016CE18 00169D58 48 10 41 E1 */ bl cSAngle_NS_Val_X1_ +/* 8016CE18 00169D58 48 10 41 E1 */ bl Val__7cSAngleFRC7cSAngle /* 8016CE1C 00169D5C 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8016CE20 00169D60 38 80 FF FF */ li r4, -1 /* 8016CE24 00169D64 4B EC 36 ED */ bl cSAngle_NS_dtor @@ -770,7 +770,7 @@ lbl_8016CE8C: /* 8016CEDC 00169E1C 4B F1 B2 61 */ bl dCamMath_NS_rationalBezierRatio /* 8016CEE0 00169E20 FD C0 08 90 */ fmr f14, f1 /* 8016CEE4 00169E24 38 61 01 3C */ addi r3, r1, 0x13c -/* 8016CEE8 00169E28 48 10 43 CD */ bl cSAngle_NS___amu +/* 8016CEE8 00169E28 48 10 43 CD */ bl __amu__7cSAngleFf /* 8016CEEC 00169E2C 48 00 00 18 */ b lbl_8016CF04 lbl_8016CEF0: /* 8016CEF0 00169E30 7C 03 E8 40 */ cmplw r3, r29 @@ -781,14 +781,14 @@ lbl_8016CEF0: lbl_8016CF04: /* 8016CF04 00169E44 3A FE 00 62 */ addi r23, r30, 0x62 /* 8016CF08 00169E48 7E E3 BB 78 */ mr r3, r23 -/* 8016CF0C 00169E4C 48 10 41 DD */ bl cSAngle_NS_Inv +/* 8016CF0C 00169E4C 48 10 41 DD */ bl Inv__7cSAngleCFv /* 8016CF10 00169E50 7C 64 1B 78 */ mr r4, r3 /* 8016CF14 00169E54 38 61 00 DC */ addi r3, r1, 0xdc /* 8016CF18 00169E58 38 A1 01 40 */ addi r5, r1, 0x140 -/* 8016CF1C 00169E5C 48 10 44 05 */ bl cSAngle_NS___mi_short +/* 8016CF1C 00169E5C 48 10 44 05 */ bl __mi__FsRC7cSAngle /* 8016CF20 00169E60 38 61 01 38 */ addi r3, r1, 0x138 /* 8016CF24 00169E64 38 81 00 DC */ addi r4, r1, 0xdc -/* 8016CF28 00169E68 48 10 40 41 */ bl cSAngle_X1_ +/* 8016CF28 00169E68 48 10 40 41 */ bl __ct__7cSAngleFRC7cSAngle /* 8016CF2C 00169E6C 38 61 00 DC */ addi r3, r1, 0xdc /* 8016CF30 00169E70 38 80 FF FF */ li r4, -1 /* 8016CF34 00169E74 4B EC 35 DD */ bl cSAngle_NS_dtor @@ -802,10 +802,10 @@ lbl_8016CF04: /* 8016CF54 00169E94 40 82 00 38 */ bne lbl_8016CF8C /* 8016CF58 00169E98 38 61 01 40 */ addi r3, r1, 0x140 /* 8016CF5C 00169E9C 38 81 01 3C */ addi r4, r1, 0x13c -/* 8016CF60 00169EA0 48 10 42 89 */ bl cSAngle_NS___ami +/* 8016CF60 00169EA0 48 10 42 89 */ bl __ami__7cSAngleFRC7cSAngle /* 8016CF64 00169EA4 38 61 00 D8 */ addi r3, r1, 0xd8 /* 8016CF68 00169EA8 38 81 01 38 */ addi r4, r1, 0x138 -/* 8016CF6C 00169EAC 48 10 41 DD */ bl cSAngle_NS___mi +/* 8016CF6C 00169EAC 48 10 41 DD */ bl __mi__7cSAngleCFv /* 8016CF70 00169EB0 38 61 01 38 */ addi r3, r1, 0x138 /* 8016CF74 00169EB4 38 81 00 D8 */ addi r4, r1, 0xd8 /* 8016CF78 00169EB8 48 01 5D 31 */ bl cSAngle_NS___as @@ -816,7 +816,7 @@ lbl_8016CF04: lbl_8016CF8C: /* 8016CF8C 00169ECC 38 61 01 40 */ addi r3, r1, 0x140 /* 8016CF90 00169ED0 38 81 01 3C */ addi r4, r1, 0x13c -/* 8016CF94 00169ED4 48 10 42 41 */ bl cSAngle_NS___apl +/* 8016CF94 00169ED4 48 10 42 41 */ bl __apl__7cSAngleFRC7cSAngle /* 8016CF98 00169ED8 48 00 00 64 */ b lbl_8016CFFC lbl_8016CF9C: /* 8016CF9C 00169EDC A8 61 01 38 */ lha r3, 0x138(r1) @@ -827,10 +827,10 @@ lbl_8016CF9C: /* 8016CFB0 00169EF0 90 1E 04 14 */ stw r0, 0x414(r30) /* 8016CFB4 00169EF4 38 61 01 40 */ addi r3, r1, 0x140 /* 8016CFB8 00169EF8 38 81 01 3C */ addi r4, r1, 0x13c -/* 8016CFBC 00169EFC 48 10 42 2D */ bl cSAngle_NS___ami +/* 8016CFBC 00169EFC 48 10 42 2D */ bl __ami__7cSAngleFRC7cSAngle /* 8016CFC0 00169F00 38 61 00 D4 */ addi r3, r1, 0xd4 /* 8016CFC4 00169F04 38 81 01 38 */ addi r4, r1, 0x138 -/* 8016CFC8 00169F08 48 10 41 81 */ bl cSAngle_NS___mi +/* 8016CFC8 00169F08 48 10 41 81 */ bl __mi__7cSAngleCFv /* 8016CFCC 00169F0C 38 61 01 38 */ addi r3, r1, 0x138 /* 8016CFD0 00169F10 38 81 00 D4 */ addi r4, r1, 0xd4 /* 8016CFD4 00169F14 48 01 5C D5 */ bl cSAngle_NS___as @@ -843,7 +843,7 @@ lbl_8016CFE8: /* 8016CFEC 00169F2C 90 1E 04 14 */ stw r0, 0x414(r30) /* 8016CFF0 00169F30 38 61 01 40 */ addi r3, r1, 0x140 /* 8016CFF4 00169F34 38 81 01 3C */ addi r4, r1, 0x13c -/* 8016CFF8 00169F38 48 10 41 DD */ bl cSAngle_NS___apl +/* 8016CFF8 00169F38 48 10 41 DD */ bl __apl__7cSAngleFRC7cSAngle lbl_8016CFFC: /* 8016CFFC 00169F3C 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 8016D000 00169F40 7F C4 F3 78 */ mr r4, r30 @@ -978,10 +978,10 @@ lbl_8016D1A0: /* 8016D1D8 0016A118 38 61 01 BC */ addi r3, r1, 0x1bc /* 8016D1DC 0016A11C 38 9E 00 64 */ addi r4, r30, 0x64 /* 8016D1E0 0016A120 38 A1 02 7C */ addi r5, r1, 0x27c -/* 8016D1E4 0016A124 48 0F 99 51 */ bl cXyz_NS___mi +/* 8016D1E4 0016A124 48 0F 99 51 */ bl __mi__4cXyzCFRC3Vec /* 8016D1E8 0016A128 38 7E 04 1C */ addi r3, r30, 0x41c /* 8016D1EC 0016A12C 38 81 01 BC */ addi r4, r1, 0x1bc -/* 8016D1F0 0016A130 48 10 48 81 */ bl cSGlobe_NS_Val_X3_ +/* 8016D1F0 0016A130 48 10 48 81 */ bl Val__7cSGlobeFRC4cXyz /* 8016D1F4 0016A134 38 61 01 BC */ addi r3, r1, 0x1bc /* 8016D1F8 0016A138 38 80 FF FF */ li r4, -1 /* 8016D1FC 0016A13C 4B E9 BF 89 */ bl cXyz_NS_dtor @@ -1012,13 +1012,13 @@ lbl_8016D254: /* 8016D258 0016A198 28 00 00 00 */ cmplwi r0, 0 /* 8016D25C 0016A19C 41 82 00 A8 */ beq lbl_8016D304 /* 8016D260 0016A1A0 38 61 01 38 */ addi r3, r1, 0x138 -/* 8016D264 0016A1A4 48 10 3E BD */ bl cSAngle_NS_Cos +/* 8016D264 0016A1A4 48 10 3E BD */ bl Cos__7cSAngleCFv /* 8016D268 0016A1A8 FE 60 08 90 */ fmr f19, f1 /* 8016D26C 0016A1AC 38 61 00 CC */ addi r3, r1, 0xcc /* 8016D270 0016A1B0 38 81 01 64 */ addi r4, r1, 0x164 -/* 8016D274 0016A1B4 48 10 3C F5 */ bl cSAngle_X1_ +/* 8016D274 0016A1B4 48 10 3C F5 */ bl __ct__7cSAngleFRC7cSAngle /* 8016D278 0016A1B8 38 61 00 CC */ addi r3, r1, 0xcc -/* 8016D27C 0016A1BC 48 10 3E A5 */ bl cSAngle_NS_Cos +/* 8016D27C 0016A1BC 48 10 3E A5 */ bl Cos__7cSAngleCFv /* 8016D280 0016A1C0 FF 40 08 90 */ fmr f26, f1 /* 8016D284 0016A1C4 38 61 00 CC */ addi r3, r1, 0xcc /* 8016D288 0016A1C8 38 80 FF FF */ li r4, -1 @@ -1062,13 +1062,13 @@ lbl_8016D304: /* 8016D308 0016A248 C0 01 01 60 */ lfs f0, 0x160(r1) /* 8016D30C 0016A24C EE 61 00 32 */ fmuls f19, f1, f0 /* 8016D310 0016A250 38 61 01 38 */ addi r3, r1, 0x138 -/* 8016D314 0016A254 48 10 3E 0D */ bl cSAngle_NS_Cos +/* 8016D314 0016A254 48 10 3E 0D */ bl Cos__7cSAngleCFv /* 8016D318 0016A258 EC 13 00 72 */ fmuls f0, f19, f1 /* 8016D31C 0016A25C EE 73 00 2A */ fadds f19, f19, f0 lbl_8016D320: /* 8016D320 0016A260 38 61 01 34 */ addi r3, r1, 0x134 /* 8016D324 0016A264 7F 24 CB 78 */ mr r4, r25 -/* 8016D328 0016A268 48 10 3C 41 */ bl cSAngle_X1_ +/* 8016D328 0016A268 48 10 3C 41 */ bl __ct__7cSAngleFRC7cSAngle /* 8016D32C 0016A26C C0 5E 04 40 */ lfs f2, 0x440(r30) /* 8016D330 0016A270 EC 3C 10 28 */ fsubs f1, f28, f2 /* 8016D334 0016A274 C0 1E 09 90 */ lfs f0, 0x990(r30) @@ -1085,10 +1085,10 @@ lbl_8016D320: /* 8016D360 0016A2A0 38 81 01 64 */ addi r4, r1, 0x164 /* 8016D364 0016A2A4 3B 1E 04 20 */ addi r24, r30, 0x420 /* 8016D368 0016A2A8 7F 05 C3 78 */ mr r5, r24 -/* 8016D36C 0016A2AC 48 10 3E 39 */ bl cSAngle_NS___mi_X1_ +/* 8016D36C 0016A2AC 48 10 3E 39 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016D370 0016A2B0 38 61 01 28 */ addi r3, r1, 0x128 /* 8016D374 0016A2B4 38 81 00 C8 */ addi r4, r1, 0xc8 -/* 8016D378 0016A2B8 48 10 3B F1 */ bl cSAngle_X1_ +/* 8016D378 0016A2B8 48 10 3B F1 */ bl __ct__7cSAngleFRC7cSAngle /* 8016D37C 0016A2BC 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8016D380 0016A2C0 38 80 FF FF */ li r4, -1 /* 8016D384 0016A2C4 4B EC 31 8D */ bl cSAngle_NS_dtor @@ -1096,7 +1096,7 @@ lbl_8016D320: /* 8016D38C 0016A2CC 41 82 00 CC */ beq lbl_8016D458 /* 8016D390 0016A2D0 C2 7E 04 1C */ lfs f19, 0x41c(r30) /* 8016D394 0016A2D4 38 61 01 28 */ addi r3, r1, 0x128 -/* 8016D398 0016A2D8 48 10 3D 89 */ bl cSAngle_NS_Cos +/* 8016D398 0016A2D8 48 10 3D 89 */ bl Cos__7cSAngleCFv /* 8016D39C 0016A2DC 48 01 56 A1 */ bl std_NS_fabsf /* 8016D3A0 0016A2E0 C0 02 9D 24 */ lfs f0, lbl_80453724-_SDA2_BASE_(r2) /* 8016D3A4 0016A2E4 EC 00 04 F2 */ fmuls f0, f0, f19 @@ -1105,18 +1105,18 @@ lbl_8016D320: /* 8016D3B0 0016A2F0 38 81 01 34 */ addi r4, r1, 0x134 /* 8016D3B4 0016A2F4 3A 7E 04 22 */ addi r19, r30, 0x422 /* 8016D3B8 0016A2F8 7E 65 9B 78 */ mr r5, r19 -/* 8016D3BC 0016A2FC 48 10 3D E9 */ bl cSAngle_NS___mi_X1_ +/* 8016D3BC 0016A2FC 48 10 3D E9 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016D3C0 0016A300 38 61 00 C0 */ addi r3, r1, 0xc0 /* 8016D3C4 0016A304 38 81 00 C4 */ addi r4, r1, 0xc4 /* 8016D3C8 0016A308 C0 3E 04 40 */ lfs f1, 0x440(r30) -/* 8016D3CC 0016A30C 48 10 3E 99 */ bl cSAngle_NS___ml +/* 8016D3CC 0016A30C 48 10 3E 99 */ bl __ml__7cSAngleCFf /* 8016D3D0 0016A310 38 61 00 BC */ addi r3, r1, 0xbc /* 8016D3D4 0016A314 7E 64 9B 78 */ mr r4, r19 /* 8016D3D8 0016A318 38 A1 00 C0 */ addi r5, r1, 0xc0 -/* 8016D3DC 0016A31C 48 10 3D 99 */ bl cSAngle_NS___pl +/* 8016D3DC 0016A31C 48 10 3D 99 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016D3E0 0016A320 38 61 01 30 */ addi r3, r1, 0x130 /* 8016D3E4 0016A324 38 81 00 BC */ addi r4, r1, 0xbc -/* 8016D3E8 0016A328 48 10 3C 11 */ bl cSAngle_NS_Val_X1_ +/* 8016D3E8 0016A328 48 10 3C 11 */ bl Val__7cSAngleFRC7cSAngle /* 8016D3EC 0016A32C 38 61 00 BC */ addi r3, r1, 0xbc /* 8016D3F0 0016A330 38 80 FF FF */ li r4, -1 /* 8016D3F4 0016A334 4B EC 31 1D */ bl cSAngle_NS_dtor @@ -1129,14 +1129,14 @@ lbl_8016D320: /* 8016D410 0016A350 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8016D414 0016A354 38 81 01 28 */ addi r4, r1, 0x128 /* 8016D418 0016A358 C0 22 9C E8 */ lfs f1, lbl_804536E8-_SDA2_BASE_(r2) -/* 8016D41C 0016A35C 48 10 3E 49 */ bl cSAngle_NS___ml +/* 8016D41C 0016A35C 48 10 3E 49 */ bl __ml__7cSAngleCFf /* 8016D420 0016A360 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8016D424 0016A364 7F 04 C3 78 */ mr r4, r24 /* 8016D428 0016A368 38 A1 00 B8 */ addi r5, r1, 0xb8 -/* 8016D42C 0016A36C 48 10 3D 49 */ bl cSAngle_NS___pl +/* 8016D42C 0016A36C 48 10 3D 49 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016D430 0016A370 38 61 01 2C */ addi r3, r1, 0x12c /* 8016D434 0016A374 38 81 00 B4 */ addi r4, r1, 0xb4 -/* 8016D438 0016A378 48 10 3B C1 */ bl cSAngle_NS_Val_X1_ +/* 8016D438 0016A378 48 10 3B C1 */ bl Val__7cSAngleFRC7cSAngle /* 8016D43C 0016A37C 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8016D440 0016A380 38 80 FF FF */ li r4, -1 /* 8016D444 0016A384 4B EC 30 CD */ bl cSAngle_NS_dtor @@ -1147,7 +1147,7 @@ lbl_8016D320: lbl_8016D458: /* 8016D458 0016A398 C3 3E 04 1C */ lfs f25, 0x41c(r30) /* 8016D45C 0016A39C 38 61 01 28 */ addi r3, r1, 0x128 -/* 8016D460 0016A3A0 48 10 3C C1 */ bl cSAngle_NS_Cos +/* 8016D460 0016A3A0 48 10 3C C1 */ bl Cos__7cSAngleCFv /* 8016D464 0016A3A4 48 01 55 D9 */ bl std_NS_fabsf /* 8016D468 0016A3A8 C0 5E 04 3C */ lfs f2, 0x43c(r30) /* 8016D46C 0016A3AC EC 13 C8 28 */ fsubs f0, f19, f25 @@ -1158,18 +1158,18 @@ lbl_8016D458: /* 8016D480 0016A3C0 38 81 01 34 */ addi r4, r1, 0x134 /* 8016D484 0016A3C4 3A 7E 04 22 */ addi r19, r30, 0x422 /* 8016D488 0016A3C8 7E 65 9B 78 */ mr r5, r19 -/* 8016D48C 0016A3CC 48 10 3D 19 */ bl cSAngle_NS___mi_X1_ +/* 8016D48C 0016A3CC 48 10 3D 19 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016D490 0016A3D0 38 61 00 AC */ addi r3, r1, 0xac /* 8016D494 0016A3D4 38 81 00 B0 */ addi r4, r1, 0xb0 /* 8016D498 0016A3D8 C0 3E 04 40 */ lfs f1, 0x440(r30) -/* 8016D49C 0016A3DC 48 10 3D C9 */ bl cSAngle_NS___ml +/* 8016D49C 0016A3DC 48 10 3D C9 */ bl __ml__7cSAngleCFf /* 8016D4A0 0016A3E0 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8016D4A4 0016A3E4 7E 64 9B 78 */ mr r4, r19 /* 8016D4A8 0016A3E8 38 A1 00 AC */ addi r5, r1, 0xac -/* 8016D4AC 0016A3EC 48 10 3C C9 */ bl cSAngle_NS___pl +/* 8016D4AC 0016A3EC 48 10 3C C9 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016D4B0 0016A3F0 38 61 01 30 */ addi r3, r1, 0x130 /* 8016D4B4 0016A3F4 38 81 00 A8 */ addi r4, r1, 0xa8 -/* 8016D4B8 0016A3F8 48 10 3B 41 */ bl cSAngle_NS_Val_X1_ +/* 8016D4B8 0016A3F8 48 10 3B 41 */ bl Val__7cSAngleFRC7cSAngle /* 8016D4BC 0016A3FC 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8016D4C0 0016A400 38 80 FF FF */ li r4, -1 /* 8016D4C4 0016A404 4B EC 30 4D */ bl cSAngle_NS_dtor @@ -1182,14 +1182,14 @@ lbl_8016D458: /* 8016D4E0 0016A420 38 61 00 A4 */ addi r3, r1, 0xa4 /* 8016D4E4 0016A424 38 81 01 28 */ addi r4, r1, 0x128 /* 8016D4E8 0016A428 C0 3E 04 40 */ lfs f1, 0x440(r30) -/* 8016D4EC 0016A42C 48 10 3D 79 */ bl cSAngle_NS___ml +/* 8016D4EC 0016A42C 48 10 3D 79 */ bl __ml__7cSAngleCFf /* 8016D4F0 0016A430 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8016D4F4 0016A434 7F 04 C3 78 */ mr r4, r24 /* 8016D4F8 0016A438 38 A1 00 A4 */ addi r5, r1, 0xa4 -/* 8016D4FC 0016A43C 48 10 3C 79 */ bl cSAngle_NS___pl +/* 8016D4FC 0016A43C 48 10 3C 79 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016D500 0016A440 38 61 01 2C */ addi r3, r1, 0x12c /* 8016D504 0016A444 38 81 00 A0 */ addi r4, r1, 0xa0 -/* 8016D508 0016A448 48 10 3A F1 */ bl cSAngle_NS_Val_X1_ +/* 8016D508 0016A448 48 10 3A F1 */ bl Val__7cSAngleFRC7cSAngle /* 8016D50C 0016A44C 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8016D510 0016A450 38 80 FF FF */ li r4, -1 /* 8016D514 0016A454 4B EC 2F FD */ bl cSAngle_NS_dtor @@ -1201,14 +1201,14 @@ lbl_8016D524: /* 8016D528 0016A468 FC 20 98 90 */ fmr f1, f19 /* 8016D52C 0016A46C 38 81 01 2C */ addi r4, r1, 0x12c /* 8016D530 0016A470 38 A1 01 30 */ addi r5, r1, 0x130 -/* 8016D534 0016A474 48 10 44 D5 */ bl cSGlobe_NS_Val_X2_ +/* 8016D534 0016A474 48 10 44 D5 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8016D538 0016A478 38 61 01 B0 */ addi r3, r1, 0x1b0 /* 8016D53C 0016A47C 38 9E 04 1C */ addi r4, r30, 0x41c -/* 8016D540 0016A480 48 10 45 75 */ bl cSGlobe_NS_Xyz +/* 8016D540 0016A480 48 10 45 75 */ bl Xyz__7cSGlobeCFv /* 8016D544 0016A484 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 8016D548 0016A488 38 9E 04 04 */ addi r4, r30, 0x404 /* 8016D54C 0016A48C 38 A1 01 B0 */ addi r5, r1, 0x1b0 -/* 8016D550 0016A490 48 0F 95 95 */ bl cXyz_NS___pl +/* 8016D550 0016A490 48 0F 95 95 */ bl __pl__4cXyzCFRC3Vec /* 8016D554 0016A494 38 7E 00 64 */ addi r3, r30, 0x64 /* 8016D558 0016A498 38 81 01 A4 */ addi r4, r1, 0x1a4 /* 8016D55C 0016A49C 4B F2 A2 7D */ bl cXyz_NS___as @@ -1283,7 +1283,7 @@ lbl_8016D62C: /* 8016D668 0016A5A8 38 61 01 8C */ addi r3, r1, 0x18c /* 8016D66C 0016A5AC 38 81 02 D0 */ addi r4, r1, 0x2d0 /* 8016D670 0016A5B0 C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) -/* 8016D674 0016A5B4 48 0F 95 11 */ bl cXyz_NS___ml +/* 8016D674 0016A5B4 48 0F 95 11 */ bl __ml__4cXyzCFf /* 8016D678 0016A5B8 38 7E 00 64 */ addi r3, r30, 0x64 /* 8016D67C 0016A5BC 38 81 01 8C */ addi r4, r1, 0x18c /* 8016D680 0016A5C0 4B F2 12 85 */ bl cXyz_NS___apl @@ -1313,28 +1313,28 @@ lbl_8016D6D4: /* 8016D6D4 0016A614 38 61 01 80 */ addi r3, r1, 0x180 /* 8016D6D8 0016A618 38 9E 00 70 */ addi r4, r30, 0x70 /* 8016D6DC 0016A61C 38 BE 00 64 */ addi r5, r30, 0x64 -/* 8016D6E0 0016A620 48 0F 94 55 */ bl cXyz_NS___mi +/* 8016D6E0 0016A620 48 0F 94 55 */ bl __mi__4cXyzCFRC3Vec /* 8016D6E4 0016A624 38 61 01 58 */ addi r3, r1, 0x158 /* 8016D6E8 0016A628 38 81 01 80 */ addi r4, r1, 0x180 -/* 8016D6EC 0016A62C 48 10 41 95 */ bl cSGlobe_X4_ +/* 8016D6EC 0016A62C 48 10 41 95 */ bl __ct__7cSGlobeFRC4cXyz /* 8016D6F0 0016A630 38 61 01 80 */ addi r3, r1, 0x180 /* 8016D6F4 0016A634 38 80 FF FF */ li r4, -1 /* 8016D6F8 0016A638 4B E9 BA 8D */ bl cXyz_NS_dtor /* 8016D6FC 0016A63C 38 61 01 24 */ addi r3, r1, 0x124 /* 8016D700 0016A640 7E E4 BB 78 */ mr r4, r23 -/* 8016D704 0016A644 48 10 38 65 */ bl cSAngle_X1_ +/* 8016D704 0016A644 48 10 38 65 */ bl __ct__7cSAngleFRC7cSAngle /* 8016D708 0016A648 38 61 01 20 */ addi r3, r1, 0x120 /* 8016D70C 0016A64C 3A DE 00 60 */ addi r22, r30, 0x60 /* 8016D710 0016A650 7E C4 B3 78 */ mr r4, r22 -/* 8016D714 0016A654 48 10 38 55 */ bl cSAngle_X1_ +/* 8016D714 0016A654 48 10 38 55 */ bl __ct__7cSAngleFRC7cSAngle /* 8016D718 0016A658 C2 7E 00 5C */ lfs f19, 0x5c(r30) /* 8016D71C 0016A65C 38 61 00 9C */ addi r3, r1, 0x9c /* 8016D720 0016A660 38 81 01 38 */ addi r4, r1, 0x138 /* 8016D724 0016A664 38 A1 01 3C */ addi r5, r1, 0x13c -/* 8016D728 0016A668 48 10 3A 7D */ bl cSAngle_NS___mi_X1_ +/* 8016D728 0016A668 48 10 3A 7D */ bl __mi__7cSAngleCFRC7cSAngle /* 8016D72C 0016A66C 38 61 01 1C */ addi r3, r1, 0x11c /* 8016D730 0016A670 38 81 00 9C */ addi r4, r1, 0x9c -/* 8016D734 0016A674 48 10 38 35 */ bl cSAngle_X1_ +/* 8016D734 0016A674 48 10 38 35 */ bl __ct__7cSAngleFRC7cSAngle /* 8016D738 0016A678 38 61 00 9C */ addi r3, r1, 0x9c /* 8016D73C 0016A67C 38 80 FF FF */ li r4, -1 /* 8016D740 0016A680 4B EC 2D D1 */ bl cSAngle_NS_dtor @@ -1379,14 +1379,14 @@ lbl_8016D7A8: /* 8016D7CC 0016A70C C0 02 9E 04 */ lfs f0, lbl_80453804-_SDA2_BASE_(r2) /* 8016D7D0 0016A710 EC 20 00 72 */ fmuls f1, f0, f1 /* 8016D7D4 0016A714 38 61 00 98 */ addi r3, r1, 0x98 -/* 8016D7D8 0016A718 48 10 37 F1 */ bl cSAngle_X3_ +/* 8016D7D8 0016A718 48 10 37 F1 */ bl __ct__7cSAngleFf /* 8016D7DC 0016A71C 38 61 00 94 */ addi r3, r1, 0x94 /* 8016D7E0 0016A720 38 81 01 5E */ addi r4, r1, 0x15e /* 8016D7E4 0016A724 38 A1 00 98 */ addi r5, r1, 0x98 -/* 8016D7E8 0016A728 48 10 39 8D */ bl cSAngle_NS___pl +/* 8016D7E8 0016A728 48 10 39 8D */ bl __pl__7cSAngleCFRC7cSAngle /* 8016D7EC 0016A72C 38 61 01 18 */ addi r3, r1, 0x118 /* 8016D7F0 0016A730 38 81 00 94 */ addi r4, r1, 0x94 -/* 8016D7F4 0016A734 48 10 37 75 */ bl cSAngle_X1_ +/* 8016D7F4 0016A734 48 10 37 75 */ bl __ct__7cSAngleFRC7cSAngle /* 8016D7F8 0016A738 38 61 00 94 */ addi r3, r1, 0x94 /* 8016D7FC 0016A73C 38 80 FF FF */ li r4, -1 /* 8016D800 0016A740 4B EC 2D 11 */ bl cSAngle_NS_dtor @@ -1427,10 +1427,10 @@ lbl_8016D848: /* 8016D888 0016A7C8 3A 41 01 5E */ addi r18, r1, 0x15e /* 8016D88C 0016A7CC 7E 44 93 78 */ mr r4, r18 /* 8016D890 0016A7D0 38 A1 00 90 */ addi r5, r1, 0x90 -/* 8016D894 0016A7D4 48 10 39 11 */ bl cSAngle_NS___mi_X1_ +/* 8016D894 0016A7D4 48 10 39 11 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016D898 0016A7D8 38 61 01 14 */ addi r3, r1, 0x114 /* 8016D89C 0016A7DC 38 81 00 8C */ addi r4, r1, 0x8c -/* 8016D8A0 0016A7E0 48 10 36 C9 */ bl cSAngle_X1_ +/* 8016D8A0 0016A7E0 48 10 36 C9 */ bl __ct__7cSAngleFRC7cSAngle /* 8016D8A4 0016A7E4 38 61 00 8C */ addi r3, r1, 0x8c /* 8016D8A8 0016A7E8 38 80 FF FF */ li r4, -1 /* 8016D8AC 0016A7EC 4B EC 2C 65 */ bl cSAngle_NS_dtor @@ -1440,20 +1440,20 @@ lbl_8016D848: /* 8016D8BC 0016A7FC 38 61 00 88 */ addi r3, r1, 0x88 /* 8016D8C0 0016A800 7E 44 93 78 */ mr r4, r18 /* 8016D8C4 0016A804 7E E5 BB 78 */ mr r5, r23 -/* 8016D8C8 0016A808 48 10 38 DD */ bl cSAngle_NS___mi_X1_ +/* 8016D8C8 0016A808 48 10 38 DD */ bl __mi__7cSAngleCFRC7cSAngle /* 8016D8CC 0016A80C 38 61 00 84 */ addi r3, r1, 0x84 /* 8016D8D0 0016A810 38 81 00 88 */ addi r4, r1, 0x88 /* 8016D8D4 0016A814 FC 20 A0 90 */ fmr f1, f20 -/* 8016D8D8 0016A818 48 10 39 8D */ bl cSAngle_NS___ml +/* 8016D8D8 0016A818 48 10 39 8D */ bl __ml__7cSAngleCFf /* 8016D8DC 0016A81C 38 61 01 14 */ addi r3, r1, 0x114 -/* 8016D8E0 0016A820 48 10 38 19 */ bl cSAngle_NS_Sin +/* 8016D8E0 0016A820 48 10 38 19 */ bl Sin__7cSAngleCFv /* 8016D8E4 0016A824 38 61 00 80 */ addi r3, r1, 0x80 /* 8016D8E8 0016A828 38 81 00 84 */ addi r4, r1, 0x84 -/* 8016D8EC 0016A82C 48 10 39 79 */ bl cSAngle_NS___ml +/* 8016D8EC 0016A82C 48 10 39 79 */ bl __ml__7cSAngleCFf /* 8016D8F0 0016A830 38 61 00 7C */ addi r3, r1, 0x7c /* 8016D8F4 0016A834 7E E4 BB 78 */ mr r4, r23 /* 8016D8F8 0016A838 38 A1 00 80 */ addi r5, r1, 0x80 -/* 8016D8FC 0016A83C 48 10 38 79 */ bl cSAngle_NS___pl +/* 8016D8FC 0016A83C 48 10 38 79 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016D900 0016A840 38 7E 04 2A */ addi r3, r30, 0x42a /* 8016D904 0016A844 38 81 00 7C */ addi r4, r1, 0x7c /* 8016D908 0016A848 48 01 53 A1 */ bl cSAngle_NS___as @@ -1482,7 +1482,7 @@ lbl_8016D948: /* 8016D960 0016A8A0 4B F2 9D D9 */ bl dCamera_c_NS_directionOf /* 8016D964 0016A8A4 38 61 01 40 */ addi r3, r1, 0x140 /* 8016D968 0016A8A8 38 81 00 78 */ addi r4, r1, 0x78 -/* 8016D96C 0016A8AC 48 10 36 8D */ bl cSAngle_NS_Val_X1_ +/* 8016D96C 0016A8AC 48 10 36 8D */ bl Val__7cSAngleFRC7cSAngle /* 8016D970 0016A8B0 38 61 00 78 */ addi r3, r1, 0x78 /* 8016D974 0016A8B4 38 80 FF FF */ li r4, -1 /* 8016D978 0016A8B8 4B EC 2B 99 */ bl cSAngle_NS_dtor @@ -1515,15 +1515,15 @@ lbl_8016D9D0: /* 8016D9D4 0016A914 38 9E 04 2A */ addi r4, r30, 0x42a /* 8016D9D8 0016A918 3A 41 01 5E */ addi r18, r1, 0x15e /* 8016D9DC 0016A91C 7E 45 93 78 */ mr r5, r18 -/* 8016D9E0 0016A920 48 10 37 C5 */ bl cSAngle_NS___mi_X1_ +/* 8016D9E0 0016A920 48 10 37 C5 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016D9E4 0016A924 38 61 00 70 */ addi r3, r1, 0x70 /* 8016D9E8 0016A928 38 81 00 74 */ addi r4, r1, 0x74 /* 8016D9EC 0016A92C FC 20 F8 90 */ fmr f1, f31 -/* 8016D9F0 0016A930 48 10 38 75 */ bl cSAngle_NS___ml +/* 8016D9F0 0016A930 48 10 38 75 */ bl __ml__7cSAngleCFf /* 8016D9F4 0016A934 38 61 00 6C */ addi r3, r1, 0x6c /* 8016D9F8 0016A938 7E 44 93 78 */ mr r4, r18 /* 8016D9FC 0016A93C 38 A1 00 70 */ addi r5, r1, 0x70 -/* 8016DA00 0016A940 48 10 37 75 */ bl cSAngle_NS___pl +/* 8016DA00 0016A940 48 10 37 75 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016DA04 0016A944 38 61 01 24 */ addi r3, r1, 0x124 /* 8016DA08 0016A948 38 81 00 6C */ addi r4, r1, 0x6c /* 8016DA0C 0016A94C 48 01 52 9D */ bl cSAngle_NS___as @@ -1545,30 +1545,30 @@ lbl_8016DA38: /* 8016DA48 0016A988 40 82 00 14 */ bne lbl_8016DA5C /* 8016DA4C 0016A98C 38 61 01 10 */ addi r3, r1, 0x110 /* 8016DA50 0016A990 C0 22 9D CC */ lfs f1, lbl_804537CC-_SDA2_BASE_(r2) -/* 8016DA54 0016A994 48 10 35 B9 */ bl cSAngle_NS_Val_X3_ +/* 8016DA54 0016A994 48 10 35 B9 */ bl Val__7cSAngleFf /* 8016DA58 0016A998 48 00 00 10 */ b lbl_8016DA68 lbl_8016DA5C: /* 8016DA5C 0016A99C 38 61 01 10 */ addi r3, r1, 0x110 /* 8016DA60 0016A9A0 C0 22 9E 08 */ lfs f1, lbl_80453808-_SDA2_BASE_(r2) -/* 8016DA64 0016A9A4 48 10 35 A9 */ bl cSAngle_NS_Val_X3_ +/* 8016DA64 0016A9A4 48 10 35 A9 */ bl Val__7cSAngleFf lbl_8016DA68: /* 8016DA68 0016A9A8 7F 23 CB 78 */ mr r3, r25 -/* 8016DA6C 0016A9AC 48 10 36 7D */ bl cSAngle_NS_Inv +/* 8016DA6C 0016A9AC 48 10 36 7D */ bl Inv__7cSAngleCFv /* 8016DA70 0016A9B0 7C 64 1B 78 */ mr r4, r3 /* 8016DA74 0016A9B4 38 61 00 68 */ addi r3, r1, 0x68 /* 8016DA78 0016A9B8 38 A1 01 10 */ addi r5, r1, 0x110 -/* 8016DA7C 0016A9BC 48 10 38 79 */ bl cSAngle_NS___pl_short +/* 8016DA7C 0016A9BC 48 10 38 79 */ bl __pl__FsRC7cSAngle /* 8016DA80 0016A9C0 38 61 00 64 */ addi r3, r1, 0x64 /* 8016DA84 0016A9C4 38 81 00 68 */ addi r4, r1, 0x68 /* 8016DA88 0016A9C8 38 A1 01 24 */ addi r5, r1, 0x124 -/* 8016DA8C 0016A9CC 48 10 37 19 */ bl cSAngle_NS___mi_X1_ +/* 8016DA8C 0016A9CC 48 10 37 19 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DA90 0016A9D0 38 61 00 60 */ addi r3, r1, 0x60 /* 8016DA94 0016A9D4 38 81 00 64 */ addi r4, r1, 0x64 /* 8016DA98 0016A9D8 C0 22 9C E8 */ lfs f1, lbl_804536E8-_SDA2_BASE_(r2) -/* 8016DA9C 0016A9DC 48 10 37 C9 */ bl cSAngle_NS___ml +/* 8016DA9C 0016A9DC 48 10 37 C9 */ bl __ml__7cSAngleCFf /* 8016DAA0 0016A9E0 38 61 01 24 */ addi r3, r1, 0x124 /* 8016DAA4 0016A9E4 38 81 00 60 */ addi r4, r1, 0x60 -/* 8016DAA8 0016A9E8 48 10 37 2D */ bl cSAngle_NS___apl +/* 8016DAA8 0016A9E8 48 10 37 2D */ bl __apl__7cSAngleFRC7cSAngle /* 8016DAAC 0016A9EC 38 61 00 60 */ addi r3, r1, 0x60 /* 8016DAB0 0016A9F0 38 80 FF FF */ li r4, -1 /* 8016DAB4 0016A9F4 4B EC 2A 5D */ bl cSAngle_NS_dtor @@ -1627,18 +1627,18 @@ lbl_8016DB78: /* 8016DB78 0016AAB8 38 61 00 5C */ addi r3, r1, 0x5c /* 8016DB7C 0016AABC 38 8D 8C 14 */ addi r4, r13, 0x80451194 - 0x80458580 /*SDA HACK; original: lbl_80451194-_SDA_BASE_*/ /* 8016DB80 0016AAC0 38 A1 01 3C */ addi r5, r1, 0x13c -/* 8016DB84 0016AAC4 48 10 36 21 */ bl cSAngle_NS___mi_X1_ +/* 8016DB84 0016AAC4 48 10 36 21 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DB88 0016AAC8 38 61 00 58 */ addi r3, r1, 0x58 /* 8016DB8C 0016AACC 38 81 00 5C */ addi r4, r1, 0x5c /* 8016DB90 0016AAD0 C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) -/* 8016DB94 0016AAD4 48 10 36 D1 */ bl cSAngle_NS___ml +/* 8016DB94 0016AAD4 48 10 36 D1 */ bl __ml__7cSAngleCFf /* 8016DB98 0016AAD8 38 61 00 54 */ addi r3, r1, 0x54 /* 8016DB9C 0016AADC 38 81 01 3C */ addi r4, r1, 0x13c /* 8016DBA0 0016AAE0 38 A1 00 58 */ addi r5, r1, 0x58 -/* 8016DBA4 0016AAE4 48 10 35 D1 */ bl cSAngle_NS___pl +/* 8016DBA4 0016AAE4 48 10 35 D1 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016DBA8 0016AAE8 38 61 01 0C */ addi r3, r1, 0x10c /* 8016DBAC 0016AAEC 38 81 00 54 */ addi r4, r1, 0x54 -/* 8016DBB0 0016AAF0 48 10 33 B9 */ bl cSAngle_X1_ +/* 8016DBB0 0016AAF0 48 10 33 B9 */ bl __ct__7cSAngleFRC7cSAngle /* 8016DBB4 0016AAF4 38 61 00 54 */ addi r3, r1, 0x54 /* 8016DBB8 0016AAF8 38 80 FF FF */ li r4, -1 /* 8016DBBC 0016AAFC 4B EC 29 55 */ bl cSAngle_NS_dtor @@ -1655,7 +1655,7 @@ lbl_8016DB78: /* 8016DBE8 0016AB28 38 61 00 50 */ addi r3, r1, 0x50 /* 8016DBEC 0016AB2C 38 8D 8C 14 */ addi r4, r13, 0x80451194 - 0x80458580 /*SDA HACK; original: lbl_80451194-_SDA_BASE_*/ /* 8016DBF0 0016AB30 38 A1 01 1C */ addi r5, r1, 0x11c -/* 8016DBF4 0016AB34 48 10 35 B1 */ bl cSAngle_NS___mi_X1_ +/* 8016DBF4 0016AB34 48 10 35 B1 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DBF8 0016AB38 38 61 01 1C */ addi r3, r1, 0x11c /* 8016DBFC 0016AB3C 38 81 00 50 */ addi r4, r1, 0x50 /* 8016DC00 0016AB40 48 01 50 A9 */ bl cSAngle_NS___as @@ -1665,7 +1665,7 @@ lbl_8016DB78: /* 8016DC10 0016AB50 38 61 00 4C */ addi r3, r1, 0x4c /* 8016DC14 0016AB54 38 8D 8C 14 */ addi r4, r13, 0x80451194 - 0x80458580 /*SDA HACK; original: lbl_80451194-_SDA_BASE_*/ /* 8016DC18 0016AB58 38 A1 01 0C */ addi r5, r1, 0x10c -/* 8016DC1C 0016AB5C 48 10 35 89 */ bl cSAngle_NS___mi_X1_ +/* 8016DC1C 0016AB5C 48 10 35 89 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DC20 0016AB60 38 61 01 0C */ addi r3, r1, 0x10c /* 8016DC24 0016AB64 38 81 00 4C */ addi r4, r1, 0x4c /* 8016DC28 0016AB68 48 01 50 81 */ bl cSAngle_NS___as @@ -1741,11 +1741,11 @@ lbl_8016DCEC: /* 8016DD34 0016AC74 EF E1 00 2A */ fadds f31, f1, f0 lbl_8016DD38: /* 8016DD38 0016AC78 38 61 01 40 */ addi r3, r1, 0x140 -/* 8016DD3C 0016AC7C 48 10 33 AD */ bl cSAngle_NS_Inv +/* 8016DD3C 0016AC7C 48 10 33 AD */ bl Inv__7cSAngleCFv /* 8016DD40 0016AC80 7C 64 1B 78 */ mr r4, r3 /* 8016DD44 0016AC84 38 61 00 48 */ addi r3, r1, 0x48 /* 8016DD48 0016AC88 7E E5 BB 78 */ mr r5, r23 -/* 8016DD4C 0016AC8C 48 10 35 D5 */ bl cSAngle_NS___mi_short +/* 8016DD4C 0016AC8C 48 10 35 D5 */ bl __mi__FsRC7cSAngle /* 8016DD50 0016AC90 38 61 01 1C */ addi r3, r1, 0x11c /* 8016DD54 0016AC94 38 81 00 48 */ addi r4, r1, 0x48 /* 8016DD58 0016AC98 48 01 4F 51 */ bl cSAngle_NS___as @@ -1753,19 +1753,19 @@ lbl_8016DD38: /* 8016DD60 0016ACA0 38 80 FF FF */ li r4, -1 /* 8016DD64 0016ACA4 4B EC 27 AD */ bl cSAngle_NS_dtor /* 8016DD68 0016ACA8 38 61 01 1C */ addi r3, r1, 0x11c -/* 8016DD6C 0016ACAC 48 10 32 C5 */ bl cSAngle_NS_Degree +/* 8016DD6C 0016ACAC 48 10 32 C5 */ bl Degree__7cSAngleCFv /* 8016DD70 0016ACB0 48 01 4C CD */ bl std_NS_fabsf /* 8016DD74 0016ACB4 38 61 00 44 */ addi r3, r1, 0x44 /* 8016DD78 0016ACB8 38 81 01 1C */ addi r4, r1, 0x11c /* 8016DD7C 0016ACBC FC 20 F8 90 */ fmr f1, f31 -/* 8016DD80 0016ACC0 48 10 34 E5 */ bl cSAngle_NS___ml +/* 8016DD80 0016ACC0 48 10 34 E5 */ bl __ml__7cSAngleCFf /* 8016DD84 0016ACC4 38 61 00 40 */ addi r3, r1, 0x40 /* 8016DD88 0016ACC8 38 81 00 44 */ addi r4, r1, 0x44 /* 8016DD8C 0016ACCC C0 3E 04 34 */ lfs f1, 0x434(r30) -/* 8016DD90 0016ACD0 48 10 34 D5 */ bl cSAngle_NS___ml +/* 8016DD90 0016ACD0 48 10 34 D5 */ bl __ml__7cSAngleCFf /* 8016DD94 0016ACD4 38 61 01 24 */ addi r3, r1, 0x124 /* 8016DD98 0016ACD8 38 81 00 40 */ addi r4, r1, 0x40 -/* 8016DD9C 0016ACDC 48 10 34 39 */ bl cSAngle_NS___apl +/* 8016DD9C 0016ACDC 48 10 34 39 */ bl __apl__7cSAngleFRC7cSAngle /* 8016DDA0 0016ACE0 38 61 00 40 */ addi r3, r1, 0x40 /* 8016DDA4 0016ACE4 38 80 FF FF */ li r4, -1 /* 8016DDA8 0016ACE8 4B EC 27 69 */ bl cSAngle_NS_dtor @@ -1776,17 +1776,17 @@ lbl_8016DDB8: /* 8016DDB8 0016ACF8 56 A0 06 3F */ clrlwi. r0, r21, 0x18 /* 8016DDBC 0016ACFC 41 82 00 C8 */ beq lbl_8016DE84 /* 8016DDC0 0016AD00 38 61 01 40 */ addi r3, r1, 0x140 -/* 8016DDC4 0016AD04 48 10 33 25 */ bl cSAngle_NS_Inv +/* 8016DDC4 0016AD04 48 10 33 25 */ bl Inv__7cSAngleCFv /* 8016DDC8 0016AD08 7C 64 1B 78 */ mr r4, r3 /* 8016DDCC 0016AD0C 38 61 01 08 */ addi r3, r1, 0x108 -/* 8016DDD0 0016AD10 48 10 31 C9 */ bl cSAngle_X2_ +/* 8016DDD0 0016AD10 48 10 31 C9 */ bl __ct__7cSAngleFs /* 8016DDD4 0016AD14 38 61 00 3C */ addi r3, r1, 0x3c /* 8016DDD8 0016AD18 38 81 01 08 */ addi r4, r1, 0x108 /* 8016DDDC 0016AD1C 38 A1 01 24 */ addi r5, r1, 0x124 -/* 8016DDE0 0016AD20 48 10 33 C5 */ bl cSAngle_NS___mi_X1_ +/* 8016DDE0 0016AD20 48 10 33 C5 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DDE4 0016AD24 38 61 01 04 */ addi r3, r1, 0x104 /* 8016DDE8 0016AD28 38 81 00 3C */ addi r4, r1, 0x3c -/* 8016DDEC 0016AD2C 48 10 31 7D */ bl cSAngle_X1_ +/* 8016DDEC 0016AD2C 48 10 31 7D */ bl __ct__7cSAngleFRC7cSAngle /* 8016DDF0 0016AD30 38 61 00 3C */ addi r3, r1, 0x3c /* 8016DDF4 0016AD34 38 80 FF FF */ li r4, -1 /* 8016DDF8 0016AD38 4B EC 27 19 */ bl cSAngle_NS_dtor @@ -1797,7 +1797,7 @@ lbl_8016DDB8: /* 8016DE0C 0016AD4C 38 61 00 38 */ addi r3, r1, 0x38 /* 8016DE10 0016AD50 38 81 01 08 */ addi r4, r1, 0x108 /* 8016DE14 0016AD54 38 AD 8C 18 */ addi r5, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ -/* 8016DE18 0016AD58 48 10 33 8D */ bl cSAngle_NS___mi_X1_ +/* 8016DE18 0016AD58 48 10 33 8D */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DE1C 0016AD5C 38 61 01 24 */ addi r3, r1, 0x124 /* 8016DE20 0016AD60 38 81 00 38 */ addi r4, r1, 0x38 /* 8016DE24 0016AD64 48 01 4E 85 */ bl cSAngle_NS___as @@ -1812,7 +1812,7 @@ lbl_8016DE38: /* 8016DE44 0016AD84 38 61 00 34 */ addi r3, r1, 0x34 /* 8016DE48 0016AD88 38 81 01 08 */ addi r4, r1, 0x108 /* 8016DE4C 0016AD8C 38 AD 8C 10 */ addi r5, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ -/* 8016DE50 0016AD90 48 10 33 55 */ bl cSAngle_NS___mi_X1_ +/* 8016DE50 0016AD90 48 10 33 55 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DE54 0016AD94 38 61 01 24 */ addi r3, r1, 0x124 /* 8016DE58 0016AD98 38 81 00 34 */ addi r4, r1, 0x34 /* 8016DE5C 0016AD9C 48 01 4E 4D */ bl cSAngle_NS___as @@ -1846,16 +1846,16 @@ lbl_8016DE84: /* 8016DEC4 0016AE04 38 61 00 30 */ addi r3, r1, 0x30 /* 8016DEC8 0016AE08 38 81 01 48 */ addi r4, r1, 0x148 /* 8016DECC 0016AE0C 38 A1 01 20 */ addi r5, r1, 0x120 -/* 8016DED0 0016AE10 48 10 32 D5 */ bl cSAngle_NS___mi_X1_ +/* 8016DED0 0016AE10 48 10 32 D5 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DED4 0016AE14 FC 20 90 90 */ fmr f1, f18 /* 8016DED8 0016AE18 C0 41 03 E0 */ lfs f2, 0x3e0(r1) /* 8016DEDC 0016AE1C 4B F1 A2 61 */ bl dCamMath_NS_rationalBezierRatio /* 8016DEE0 0016AE20 38 61 00 2C */ addi r3, r1, 0x2c /* 8016DEE4 0016AE24 38 81 00 30 */ addi r4, r1, 0x30 -/* 8016DEE8 0016AE28 48 10 33 7D */ bl cSAngle_NS___ml +/* 8016DEE8 0016AE28 48 10 33 7D */ bl __ml__7cSAngleCFf /* 8016DEEC 0016AE2C 38 61 01 20 */ addi r3, r1, 0x120 /* 8016DEF0 0016AE30 38 81 00 2C */ addi r4, r1, 0x2c -/* 8016DEF4 0016AE34 48 10 32 E1 */ bl cSAngle_NS___apl +/* 8016DEF4 0016AE34 48 10 32 E1 */ bl __apl__7cSAngleFRC7cSAngle /* 8016DEF8 0016AE38 38 61 00 2C */ addi r3, r1, 0x2c /* 8016DEFC 0016AE3C 38 80 FF FF */ li r4, -1 /* 8016DF00 0016AE40 4B EC 26 11 */ bl cSAngle_NS_dtor @@ -1885,20 +1885,20 @@ lbl_8016DF3C: /* 8016DF58 0016AE98 38 61 00 28 */ addi r3, r1, 0x28 /* 8016DF5C 0016AE9C 38 81 01 5C */ addi r4, r1, 0x15c /* 8016DF60 0016AEA0 38 A1 01 20 */ addi r5, r1, 0x120 -/* 8016DF64 0016AEA4 48 10 32 41 */ bl cSAngle_NS___mi_X1_ +/* 8016DF64 0016AEA4 48 10 32 41 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DF68 0016AEA8 38 61 00 24 */ addi r3, r1, 0x24 /* 8016DF6C 0016AEAC 38 81 00 28 */ addi r4, r1, 0x28 /* 8016DF70 0016AEB0 FC 20 90 90 */ fmr f1, f18 -/* 8016DF74 0016AEB4 48 10 32 F1 */ bl cSAngle_NS___ml +/* 8016DF74 0016AEB4 48 10 32 F1 */ bl __ml__7cSAngleCFf /* 8016DF78 0016AEB8 7E C3 B3 78 */ mr r3, r22 -/* 8016DF7C 0016AEBC 48 10 31 A5 */ bl cSAngle_NS_Cos +/* 8016DF7C 0016AEBC 48 10 31 A5 */ bl Cos__7cSAngleCFv /* 8016DF80 0016AEC0 48 01 4A BD */ bl std_NS_fabsf /* 8016DF84 0016AEC4 38 61 00 20 */ addi r3, r1, 0x20 /* 8016DF88 0016AEC8 38 81 00 24 */ addi r4, r1, 0x24 -/* 8016DF8C 0016AECC 48 10 32 D9 */ bl cSAngle_NS___ml +/* 8016DF8C 0016AECC 48 10 32 D9 */ bl __ml__7cSAngleCFf /* 8016DF90 0016AED0 38 61 01 20 */ addi r3, r1, 0x120 /* 8016DF94 0016AED4 38 81 00 20 */ addi r4, r1, 0x20 -/* 8016DF98 0016AED8 48 10 32 3D */ bl cSAngle_NS___apl +/* 8016DF98 0016AED8 48 10 32 3D */ bl __apl__7cSAngleFRC7cSAngle /* 8016DF9C 0016AEDC 38 61 00 20 */ addi r3, r1, 0x20 /* 8016DFA0 0016AEE0 38 80 FF FF */ li r4, -1 /* 8016DFA4 0016AEE4 4B EC 25 6D */ bl cSAngle_NS_dtor @@ -1912,18 +1912,18 @@ lbl_8016DF3C: lbl_8016DFC4: /* 8016DFC4 0016AF04 38 61 01 00 */ addi r3, r1, 0x100 /* 8016DFC8 0016AF08 7F 04 C3 78 */ mr r4, r24 -/* 8016DFCC 0016AF0C 48 10 2F 9D */ bl cSAngle_X1_ +/* 8016DFCC 0016AF0C 48 10 2F 9D */ bl __ct__7cSAngleFRC7cSAngle /* 8016DFD0 0016AF10 38 61 00 1C */ addi r3, r1, 0x1c /* 8016DFD4 0016AF14 38 9E 04 22 */ addi r4, r30, 0x422 /* 8016DFD8 0016AF18 7E E5 BB 78 */ mr r5, r23 -/* 8016DFDC 0016AF1C 48 10 31 C9 */ bl cSAngle_NS___mi_X1_ +/* 8016DFDC 0016AF1C 48 10 31 C9 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DFE0 0016AF20 38 61 00 18 */ addi r3, r1, 0x18 /* 8016DFE4 0016AF24 38 81 00 1C */ addi r4, r1, 0x1c -/* 8016DFE8 0016AF28 48 10 2F 81 */ bl cSAngle_X1_ +/* 8016DFE8 0016AF28 48 10 2F 81 */ bl __ct__7cSAngleFRC7cSAngle /* 8016DFEC 0016AF2C 38 61 00 18 */ addi r3, r1, 0x18 -/* 8016DFF0 0016AF30 48 10 31 31 */ bl cSAngle_NS_Cos +/* 8016DFF0 0016AF30 48 10 31 31 */ bl Cos__7cSAngleCFv /* 8016DFF4 0016AF34 38 61 01 00 */ addi r3, r1, 0x100 -/* 8016DFF8 0016AF38 48 10 32 BD */ bl cSAngle_NS___amu +/* 8016DFF8 0016AF38 48 10 32 BD */ bl __amu__7cSAngleFf /* 8016DFFC 0016AF3C 38 61 00 18 */ addi r3, r1, 0x18 /* 8016E000 0016AF40 38 80 FF FF */ li r4, -1 /* 8016E004 0016AF44 4B EC 25 0D */ bl cSAngle_NS_dtor @@ -1932,36 +1932,36 @@ lbl_8016DFC4: /* 8016E010 0016AF50 4B EC 25 01 */ bl cSAngle_NS_dtor /* 8016E014 0016AF54 38 61 01 00 */ addi r3, r1, 0x100 /* 8016E018 0016AF58 FC 20 C0 90 */ fmr f1, f24 -/* 8016E01C 0016AF5C 48 10 32 99 */ bl cSAngle_NS___amu +/* 8016E01C 0016AF5C 48 10 32 99 */ bl __amu__7cSAngleFf /* 8016E020 0016AF60 FC 20 B8 90 */ fmr f1, f23 /* 8016E024 0016AF64 FC 40 B0 90 */ fmr f2, f22 /* 8016E028 0016AF68 FC 60 78 90 */ fmr f3, f15 /* 8016E02C 0016AF6C 48 00 03 E5 */ bl _unnamed_d_camera_cpp__NS_rangef /* 8016E030 0016AF70 38 61 00 FC */ addi r3, r1, 0xfc -/* 8016E034 0016AF74 48 10 2F 95 */ bl cSAngle_X3_ +/* 8016E034 0016AF74 48 10 2F 95 */ bl __ct__7cSAngleFf /* 8016E038 0016AF78 38 61 00 FC */ addi r3, r1, 0xfc /* 8016E03C 0016AF7C C0 02 9C A8 */ lfs f0, lbl_804536A8-_SDA2_BASE_(r2) /* 8016E040 0016AF80 EC 20 C0 28 */ fsubs f1, f0, f24 -/* 8016E044 0016AF84 48 10 32 71 */ bl cSAngle_NS___amu +/* 8016E044 0016AF84 48 10 32 71 */ bl __amu__7cSAngleFf /* 8016E048 0016AF88 38 61 00 14 */ addi r3, r1, 0x14 /* 8016E04C 0016AF8C 38 81 01 00 */ addi r4, r1, 0x100 /* 8016E050 0016AF90 38 A1 00 FC */ addi r5, r1, 0xfc -/* 8016E054 0016AF94 48 10 31 21 */ bl cSAngle_NS___pl +/* 8016E054 0016AF94 48 10 31 21 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016E058 0016AF98 38 61 00 10 */ addi r3, r1, 0x10 /* 8016E05C 0016AF9C 38 81 00 14 */ addi r4, r1, 0x14 /* 8016E060 0016AFA0 38 A1 01 20 */ addi r5, r1, 0x120 -/* 8016E064 0016AFA4 48 10 31 41 */ bl cSAngle_NS___mi_X1_ +/* 8016E064 0016AFA4 48 10 31 41 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016E068 0016AFA8 38 61 00 0C */ addi r3, r1, 0xc /* 8016E06C 0016AFAC 38 81 00 10 */ addi r4, r1, 0x10 /* 8016E070 0016AFB0 C0 22 9D 94 */ lfs f1, lbl_80453794-_SDA2_BASE_(r2) -/* 8016E074 0016AFB4 48 10 31 F1 */ bl cSAngle_NS___ml +/* 8016E074 0016AFB4 48 10 31 F1 */ bl __ml__7cSAngleCFf /* 8016E078 0016AFB8 38 61 00 08 */ addi r3, r1, 8 /* 8016E07C 0016AFBC 38 81 00 0C */ addi r4, r1, 0xc /* 8016E080 0016AFC0 FC 20 70 90 */ fmr f1, f14 -/* 8016E084 0016AFC4 48 10 31 E1 */ bl cSAngle_NS___ml +/* 8016E084 0016AFC4 48 10 31 E1 */ bl __ml__7cSAngleCFf /* 8016E088 0016AFC8 38 61 01 20 */ addi r3, r1, 0x120 /* 8016E08C 0016AFCC 38 81 00 08 */ addi r4, r1, 8 -/* 8016E090 0016AFD0 48 10 31 45 */ bl cSAngle_NS___apl +/* 8016E090 0016AFD0 48 10 31 45 */ bl __apl__7cSAngleFRC7cSAngle /* 8016E094 0016AFD4 38 61 00 08 */ addi r3, r1, 8 /* 8016E098 0016AFD8 38 80 FF FF */ li r4, -1 /* 8016E09C 0016AFDC 4B EC 24 75 */ bl cSAngle_NS_dtor @@ -1990,7 +1990,7 @@ lbl_8016E0DC: /* 8016E0F4 0016B034 40 82 00 10 */ bne lbl_8016E104 /* 8016E0F8 0016B038 38 61 01 20 */ addi r3, r1, 0x120 /* 8016E0FC 0016B03C A8 81 00 F8 */ lha r4, 0xf8(r1) -/* 8016E100 0016B040 48 10 2F 05 */ bl cSAngle_NS_Val_X2_ +/* 8016E100 0016B040 48 10 2F 05 */ bl Val__7cSAngleFs lbl_8016E104: /* 8016E104 0016B044 56 80 06 3F */ clrlwi. r0, r20, 0x18 /* 8016E108 0016B048 41 82 00 1C */ beq lbl_8016E124 @@ -2030,14 +2030,14 @@ lbl_8016E184: /* 8016E184 0016B0C4 38 7E 00 5C */ addi r3, r30, 0x5c /* 8016E188 0016B0C8 38 81 01 20 */ addi r4, r1, 0x120 /* 8016E18C 0016B0CC 38 A1 01 24 */ addi r5, r1, 0x124 -/* 8016E190 0016B0D0 48 10 38 79 */ bl cSGlobe_NS_Val_X2_ +/* 8016E190 0016B0D0 48 10 38 79 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8016E194 0016B0D4 38 61 01 74 */ addi r3, r1, 0x174 /* 8016E198 0016B0D8 38 9E 00 5C */ addi r4, r30, 0x5c -/* 8016E19C 0016B0DC 48 10 39 19 */ bl cSGlobe_NS_Xyz +/* 8016E19C 0016B0DC 48 10 39 19 */ bl Xyz__7cSGlobeCFv /* 8016E1A0 0016B0E0 38 61 01 68 */ addi r3, r1, 0x168 /* 8016E1A4 0016B0E4 38 9E 00 64 */ addi r4, r30, 0x64 /* 8016E1A8 0016B0E8 38 A1 01 74 */ addi r5, r1, 0x174 -/* 8016E1AC 0016B0EC 48 0F 89 39 */ bl cXyz_NS___pl +/* 8016E1AC 0016B0EC 48 0F 89 39 */ bl __pl__4cXyzCFRC3Vec /* 8016E1B0 0016B0F0 38 7E 00 70 */ addi r3, r30, 0x70 /* 8016E1B4 0016B0F4 38 81 01 68 */ addi r4, r1, 0x168 /* 8016E1B8 0016B0F8 4B F2 96 21 */ bl cXyz_NS___as diff --git a/include/d/d_camera/asm/func_8016E4F4.s b/include/d/d_camera/asm/func_8016E4F4.s index 8d61e26162..a4bf39ddb0 100644 --- a/include/d/d_camera/asm/func_8016E4F4.s +++ b/include/d/d_camera/asm/func_8016E4F4.s @@ -396,16 +396,16 @@ lbl_8016EAA8: lbl_8016EAD8: /* 8016EAD8 0016BA18 38 61 02 44 */ addi r3, r1, 0x244 /* 8016EADC 0016BA1C FC 20 B8 90 */ fmr f1, f23 -/* 8016EAE0 0016BA20 48 10 24 E9 */ bl cSAngle_X3_ +/* 8016EAE0 0016BA20 48 10 24 E9 */ bl __ct__7cSAngleFf /* 8016EAE4 0016BA24 38 61 02 40 */ addi r3, r1, 0x240 /* 8016EAE8 0016BA28 FC 20 B0 90 */ fmr f1, f22 -/* 8016EAEC 0016BA2C 48 10 24 DD */ bl cSAngle_X3_ +/* 8016EAEC 0016BA2C 48 10 24 DD */ bl __ct__7cSAngleFf /* 8016EAF0 0016BA30 38 61 02 3C */ addi r3, r1, 0x23c /* 8016EAF4 0016BA34 FC 20 98 90 */ fmr f1, f19 -/* 8016EAF8 0016BA38 48 10 24 D1 */ bl cSAngle_X3_ +/* 8016EAF8 0016BA38 48 10 24 D1 */ bl __ct__7cSAngleFf /* 8016EAFC 0016BA3C 38 61 02 38 */ addi r3, r1, 0x238 /* 8016EB00 0016BA40 FC 20 A0 90 */ fmr f1, f20 -/* 8016EB04 0016BA44 48 10 24 C5 */ bl cSAngle_X3_ +/* 8016EB04 0016BA44 48 10 24 C5 */ bl __ct__7cSAngleFf /* 8016EB08 0016BA48 80 1F 01 74 */ lwz r0, 0x174(r31) /* 8016EB0C 0016BA4C 28 00 00 00 */ cmplwi r0, 0 /* 8016EB10 0016BA50 40 82 17 C4 */ bne lbl_801702D4 @@ -424,10 +424,10 @@ lbl_8016EAD8: /* 8016EB44 0016BA84 38 61 11 9C */ addi r3, r1, 0x119c /* 8016EB48 0016BA88 38 81 11 B4 */ addi r4, r1, 0x11b4 /* 8016EB4C 0016BA8C 38 A1 11 A8 */ addi r5, r1, 0x11a8 -/* 8016EB50 0016BA90 48 0F 7F E5 */ bl cXyz_NS___mi +/* 8016EB50 0016BA90 48 0F 7F E5 */ bl __mi__4cXyzCFRC3Vec /* 8016EB54 0016BA94 38 61 02 D0 */ addi r3, r1, 0x2d0 /* 8016EB58 0016BA98 38 81 11 9C */ addi r4, r1, 0x119c -/* 8016EB5C 0016BA9C 48 10 2D 25 */ bl cSGlobe_X4_ +/* 8016EB5C 0016BA9C 48 10 2D 25 */ bl __ct__7cSGlobeFRC4cXyz /* 8016EB60 0016BAA0 38 61 11 9C */ addi r3, r1, 0x119c /* 8016EB64 0016BAA4 38 80 FF FF */ li r4, -1 /* 8016EB68 0016BAA8 4B E9 A6 1D */ bl cXyz_NS_dtor @@ -514,7 +514,7 @@ lbl_8016EC84: /* 8016ECA4 0016BBE4 38 61 11 60 */ addi r3, r1, 0x1160 /* 8016ECA8 0016BBE8 38 81 11 78 */ addi r4, r1, 0x1178 /* 8016ECAC 0016BBEC 38 A1 11 6C */ addi r5, r1, 0x116c -/* 8016ECB0 0016BBF0 48 0F 7E 85 */ bl cXyz_NS___mi +/* 8016ECB0 0016BBF0 48 0F 7E 85 */ bl __mi__4cXyzCFRC3Vec /* 8016ECB4 0016BBF4 38 61 14 54 */ addi r3, r1, 0x1454 /* 8016ECB8 0016BBF8 38 81 11 60 */ addi r4, r1, 0x1160 /* 8016ECBC 0016BBFC 4B F2 8B 1D */ bl cXyz_NS___as @@ -536,10 +536,10 @@ lbl_8016EC84: /* 8016ECFC 0016BC3C 7C 64 1B 78 */ mr r4, r3 /* 8016ED00 0016BC40 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 8016ED04 0016BC44 38 A1 01 EC */ addi r5, r1, 0x1ec -/* 8016ED08 0016BC48 48 10 24 9D */ bl cSAngle_NS___mi_X1_ +/* 8016ED08 0016BC48 48 10 24 9D */ bl __mi__7cSAngleCFRC7cSAngle /* 8016ED0C 0016BC4C 38 61 02 34 */ addi r3, r1, 0x234 /* 8016ED10 0016BC50 38 81 01 E8 */ addi r4, r1, 0x1e8 -/* 8016ED14 0016BC54 48 10 22 E5 */ bl cSAngle_NS_Val_X1_ +/* 8016ED14 0016BC54 48 10 22 E5 */ bl Val__7cSAngleFRC7cSAngle /* 8016ED18 0016BC58 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 8016ED1C 0016BC5C 38 80 FF FF */ li r4, -1 /* 8016ED20 0016BC60 4B EC 17 F1 */ bl cSAngle_NS_dtor @@ -552,7 +552,7 @@ lbl_8016EC84: /* 8016ED3C 0016BC7C 4B F2 8A 21 */ bl dCamera_c_NS_positionOf /* 8016ED40 0016BC80 38 61 01 E4 */ addi r3, r1, 0x1e4 /* 8016ED44 0016BC84 38 81 02 34 */ addi r4, r1, 0x234 -/* 8016ED48 0016BC88 48 10 22 21 */ bl cSAngle_X1_ +/* 8016ED48 0016BC88 48 10 22 21 */ bl __ct__7cSAngleFRC7cSAngle /* 8016ED4C 0016BC8C 38 61 11 48 */ addi r3, r1, 0x1148 /* 8016ED50 0016BC90 38 81 14 54 */ addi r4, r1, 0x1454 /* 8016ED54 0016BC94 38 A1 01 E4 */ addi r5, r1, 0x1e4 @@ -560,7 +560,7 @@ lbl_8016EC84: /* 8016ED5C 0016BC9C 38 61 11 3C */ addi r3, r1, 0x113c /* 8016ED60 0016BCA0 38 81 11 54 */ addi r4, r1, 0x1154 /* 8016ED64 0016BCA4 38 A1 11 48 */ addi r5, r1, 0x1148 -/* 8016ED68 0016BCA8 48 0F 7D 7D */ bl cXyz_NS___pl +/* 8016ED68 0016BCA8 48 0F 7D 7D */ bl __pl__4cXyzCFRC3Vec /* 8016ED6C 0016BCAC 38 61 14 48 */ addi r3, r1, 0x1448 /* 8016ED70 0016BCB0 38 81 11 3C */ addi r4, r1, 0x113c /* 8016ED74 0016BCB4 4B F2 8A 65 */ bl cXyz_NS___as @@ -587,7 +587,7 @@ lbl_8016EC84: /* 8016EDC8 0016BD08 38 61 11 18 */ addi r3, r1, 0x1118 /* 8016EDCC 0016BD0C 38 81 11 30 */ addi r4, r1, 0x1130 /* 8016EDD0 0016BD10 38 A1 11 24 */ addi r5, r1, 0x1124 -/* 8016EDD4 0016BD14 48 0F 7D 61 */ bl cXyz_NS___mi +/* 8016EDD4 0016BD14 48 0F 7D 61 */ bl __mi__4cXyzCFRC3Vec /* 8016EDD8 0016BD18 38 61 14 54 */ addi r3, r1, 0x1454 /* 8016EDDC 0016BD1C 38 81 11 18 */ addi r4, r1, 0x1118 /* 8016EDE0 0016BD20 4B F2 89 F9 */ bl cXyz_NS___as @@ -606,14 +606,14 @@ lbl_8016EC84: /* 8016EE14 0016BD54 4B F2 89 25 */ bl dCamera_c_NS_directionOf /* 8016EE18 0016BD58 38 61 02 D0 */ addi r3, r1, 0x2d0 /* 8016EE1C 0016BD5C 48 01 3E 69 */ bl cSGlobe_NS_U_X1_ -/* 8016EE20 0016BD60 48 10 22 C9 */ bl cSAngle_NS_Inv +/* 8016EE20 0016BD60 48 10 22 C9 */ bl Inv__7cSAngleCFv /* 8016EE24 0016BD64 7C 64 1B 78 */ mr r4, r3 /* 8016EE28 0016BD68 38 61 01 DC */ addi r3, r1, 0x1dc /* 8016EE2C 0016BD6C 38 A1 01 E0 */ addi r5, r1, 0x1e0 -/* 8016EE30 0016BD70 48 10 24 F1 */ bl cSAngle_NS___mi_short +/* 8016EE30 0016BD70 48 10 24 F1 */ bl __mi__FsRC7cSAngle /* 8016EE34 0016BD74 38 61 02 34 */ addi r3, r1, 0x234 /* 8016EE38 0016BD78 38 81 01 DC */ addi r4, r1, 0x1dc -/* 8016EE3C 0016BD7C 48 10 21 BD */ bl cSAngle_NS_Val_X1_ +/* 8016EE3C 0016BD7C 48 10 21 BD */ bl Val__7cSAngleFRC7cSAngle /* 8016EE40 0016BD80 38 61 01 DC */ addi r3, r1, 0x1dc /* 8016EE44 0016BD84 38 80 FF FF */ li r4, -1 /* 8016EE48 0016BD88 4B EC 16 C9 */ bl cSAngle_NS_dtor @@ -626,7 +626,7 @@ lbl_8016EC84: /* 8016EE64 0016BDA4 4B F2 88 F9 */ bl dCamera_c_NS_positionOf /* 8016EE68 0016BDA8 38 61 01 D8 */ addi r3, r1, 0x1d8 /* 8016EE6C 0016BDAC 38 81 02 34 */ addi r4, r1, 0x234 -/* 8016EE70 0016BDB0 48 10 20 F9 */ bl cSAngle_X1_ +/* 8016EE70 0016BDB0 48 10 20 F9 */ bl __ct__7cSAngleFRC7cSAngle /* 8016EE74 0016BDB4 38 61 11 00 */ addi r3, r1, 0x1100 /* 8016EE78 0016BDB8 38 81 14 54 */ addi r4, r1, 0x1454 /* 8016EE7C 0016BDBC 38 A1 01 D8 */ addi r5, r1, 0x1d8 @@ -634,7 +634,7 @@ lbl_8016EC84: /* 8016EE84 0016BDC4 38 61 10 F4 */ addi r3, r1, 0x10f4 /* 8016EE88 0016BDC8 38 81 11 0C */ addi r4, r1, 0x110c /* 8016EE8C 0016BDCC 38 A1 11 00 */ addi r5, r1, 0x1100 -/* 8016EE90 0016BDD0 48 0F 7C 55 */ bl cXyz_NS___pl +/* 8016EE90 0016BDD0 48 0F 7C 55 */ bl __pl__4cXyzCFRC3Vec /* 8016EE94 0016BDD4 38 61 14 3C */ addi r3, r1, 0x143c /* 8016EE98 0016BDD8 38 81 10 F4 */ addi r4, r1, 0x10f4 /* 8016EE9C 0016BDDC 4B F2 89 3D */ bl cXyz_NS___as @@ -676,7 +676,7 @@ lbl_8016EF14: /* 8016EF20 0016BE60 38 61 10 E8 */ addi r3, r1, 0x10e8 /* 8016EF24 0016BE64 38 81 14 48 */ addi r4, r1, 0x1448 /* 8016EF28 0016BE68 38 A1 14 3C */ addi r5, r1, 0x143c -/* 8016EF2C 0016BE6C 48 0F 7C 09 */ bl cXyz_NS___mi +/* 8016EF2C 0016BE6C 48 0F 7C 09 */ bl __mi__4cXyzCFRC3Vec /* 8016EF30 0016BE70 38 7F 04 9C */ addi r3, r31, 0x49c /* 8016EF34 0016BE74 38 81 10 E8 */ addi r4, r1, 0x10e8 /* 8016EF38 0016BE78 4B F2 88 A1 */ bl cXyz_NS___as @@ -685,10 +685,10 @@ lbl_8016EF14: /* 8016EF44 0016BE84 4B E9 A2 41 */ bl cXyz_NS_dtor /* 8016EF48 0016BE88 38 7F 04 18 */ addi r3, r31, 0x418 /* 8016EF4C 0016BE8C 38 9F 04 9C */ addi r4, r31, 0x49c -/* 8016EF50 0016BE90 48 10 2B 21 */ bl cSGlobe_NS_Val_X3_ +/* 8016EF50 0016BE90 48 10 2B 21 */ bl Val__7cSGlobeFRC4cXyz /* 8016EF54 0016BE94 38 61 10 DC */ addi r3, r1, 0x10dc /* 8016EF58 0016BE98 38 9F 04 9C */ addi r4, r31, 0x49c -/* 8016EF5C 0016BE9C 48 0F 7F 99 */ bl cXyz_NS_normalize +/* 8016EF5C 0016BE9C 48 0F 7F 99 */ bl normalize__4cXyzFv /* 8016EF60 0016BEA0 38 61 10 DC */ addi r3, r1, 0x10dc /* 8016EF64 0016BEA4 38 80 FF FF */ li r4, -1 /* 8016EF68 0016BEA8 4B E9 A2 1D */ bl cXyz_NS_dtor @@ -702,7 +702,7 @@ lbl_8016EF14: /* 8016EF88 0016BEC8 90 01 14 60 */ stw r0, 0x1460(r1) /* 8016EF8C 0016BECC C8 01 14 60 */ lfd f0, 0x1460(r1) /* 8016EF90 0016BED0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8016EF94 0016BED4 48 0F 7B F1 */ bl cXyz_NS___ml +/* 8016EF94 0016BED4 48 0F 7B F1 */ bl __ml__4cXyzCFf /* 8016EF98 0016BED8 38 61 14 48 */ addi r3, r1, 0x1448 /* 8016EF9C 0016BEDC 38 81 10 D0 */ addi r4, r1, 0x10d0 /* 8016EFA0 0016BEE0 4B F1 F9 65 */ bl cXyz_NS___apl @@ -719,7 +719,7 @@ lbl_8016EF14: /* 8016EFCC 0016BF0C 90 01 14 68 */ stw r0, 0x1468(r1) /* 8016EFD0 0016BF10 C8 01 14 68 */ lfd f0, 0x1468(r1) /* 8016EFD4 0016BF14 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8016EFD8 0016BF18 48 0F 7B AD */ bl cXyz_NS___ml +/* 8016EFD8 0016BF18 48 0F 7B AD */ bl __ml__4cXyzCFf /* 8016EFDC 0016BF1C 38 61 14 3C */ addi r3, r1, 0x143c /* 8016EFE0 0016BF20 38 81 10 C4 */ addi r4, r1, 0x10c4 /* 8016EFE4 0016BF24 4B F1 F8 ED */ bl cXyz_NS___ami @@ -823,13 +823,13 @@ lbl_8016F120: /* 8016F14C 0016C08C 4C 40 13 82 */ cror 2, 0, 2 /* 8016F150 0016C090 40 82 00 4C */ bne lbl_8016F19C /* 8016F154 0016C094 38 61 02 30 */ addi r3, r1, 0x230 -/* 8016F158 0016C098 48 10 1E B5 */ bl cSAngle_NS_Val_X3_ +/* 8016F158 0016C098 48 10 1E B5 */ bl Val__7cSAngleFf /* 8016F15C 0016C09C 38 7F 04 18 */ addi r3, r31, 0x418 /* 8016F160 0016C0A0 48 01 3B 25 */ bl cSGlobe_NS_U_X1_ /* 8016F164 0016C0A4 7C 65 1B 78 */ mr r5, r3 /* 8016F168 0016C0A8 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 8016F16C 0016C0AC 38 81 02 30 */ addi r4, r1, 0x230 -/* 8016F170 0016C0B0 48 10 20 35 */ bl cSAngle_NS___mi_X1_ +/* 8016F170 0016C0B0 48 10 20 35 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F174 0016C0B4 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F178 0016C0B8 38 81 01 D4 */ addi r4, r1, 0x1d4 /* 8016F17C 0016C0BC 48 01 3B 2D */ bl cSAngle_NS___as @@ -868,7 +868,7 @@ lbl_8016F1EC: /* 8016F1F8 0016C138 4B F2 85 41 */ bl dCamera_c_NS_directionOf /* 8016F1FC 0016C13C 38 61 02 30 */ addi r3, r1, 0x230 /* 8016F200 0016C140 38 81 01 D0 */ addi r4, r1, 0x1d0 -/* 8016F204 0016C144 48 10 1D F5 */ bl cSAngle_NS_Val_X1_ +/* 8016F204 0016C144 48 10 1D F5 */ bl Val__7cSAngleFRC7cSAngle /* 8016F208 0016C148 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 8016F20C 0016C14C 38 80 FF FF */ li r4, -1 /* 8016F210 0016C150 4B EC 13 01 */ bl cSAngle_NS_dtor @@ -877,7 +877,7 @@ lbl_8016F1EC: /* 8016F21C 0016C15C 7C 65 1B 78 */ mr r5, r3 /* 8016F220 0016C160 38 61 01 CC */ addi r3, r1, 0x1cc /* 8016F224 0016C164 38 81 02 30 */ addi r4, r1, 0x230 -/* 8016F228 0016C168 48 10 1F 7D */ bl cSAngle_NS___mi_X1_ +/* 8016F228 0016C168 48 10 1F 7D */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F22C 0016C16C 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F230 0016C170 38 81 01 CC */ addi r4, r1, 0x1cc /* 8016F234 0016C174 48 01 3A 75 */ bl cSAngle_NS___as @@ -893,13 +893,13 @@ lbl_8016F254: /* 8016F258 0016C198 48 01 3A 2D */ bl cSGlobe_NS_U_X1_ /* 8016F25C 0016C19C 7C 64 1B 78 */ mr r4, r3 /* 8016F260 0016C1A0 38 61 02 30 */ addi r3, r1, 0x230 -/* 8016F264 0016C1A4 48 10 1D 95 */ bl cSAngle_NS_Val_X1_ +/* 8016F264 0016C1A4 48 10 1D 95 */ bl Val__7cSAngleFRC7cSAngle /* 8016F268 0016C1A8 38 7F 04 18 */ addi r3, r31, 0x418 /* 8016F26C 0016C1AC 48 01 3A 19 */ bl cSGlobe_NS_U_X1_ /* 8016F270 0016C1B0 7C 65 1B 78 */ mr r5, r3 /* 8016F274 0016C1B4 38 61 01 C8 */ addi r3, r1, 0x1c8 /* 8016F278 0016C1B8 38 81 02 30 */ addi r4, r1, 0x230 -/* 8016F27C 0016C1BC 48 10 1F 29 */ bl cSAngle_NS___mi_X1_ +/* 8016F27C 0016C1BC 48 10 1F 29 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F280 0016C1C0 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F284 0016C1C4 38 81 01 C8 */ addi r4, r1, 0x1c8 /* 8016F288 0016C1C8 48 01 3A 21 */ bl cSAngle_NS___as @@ -914,11 +914,11 @@ lbl_8016F254: /* 8016F2AC 0016C1EC 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 8016F2B0 0016C1F0 38 81 02 2C */ addi r4, r1, 0x22c /* 8016F2B4 0016C1F4 38 AD 8C 10 */ addi r5, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ -/* 8016F2B8 0016C1F8 48 10 1E ED */ bl cSAngle_NS___mi_X1_ +/* 8016F2B8 0016C1F8 48 10 1E ED */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F2BC 0016C1FC 38 61 01 C0 */ addi r3, r1, 0x1c0 /* 8016F2C0 0016C200 38 8D 8C 10 */ addi r4, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ /* 8016F2C4 0016C204 38 A1 01 C4 */ addi r5, r1, 0x1c4 -/* 8016F2C8 0016C208 48 10 1E DD */ bl cSAngle_NS___mi_X1_ +/* 8016F2C8 0016C208 48 10 1E DD */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F2CC 0016C20C 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F2D0 0016C210 38 81 01 C0 */ addi r4, r1, 0x1c0 /* 8016F2D4 0016C214 48 01 39 D5 */ bl cSAngle_NS___as @@ -937,11 +937,11 @@ lbl_8016F2F0: /* 8016F304 0016C244 38 61 01 BC */ addi r3, r1, 0x1bc /* 8016F308 0016C248 38 81 02 2C */ addi r4, r1, 0x22c /* 8016F30C 0016C24C 38 AD 8C 18 */ addi r5, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ -/* 8016F310 0016C250 48 10 1E 95 */ bl cSAngle_NS___mi_X1_ +/* 8016F310 0016C250 48 10 1E 95 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F314 0016C254 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 8016F318 0016C258 38 8D 8C 18 */ addi r4, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ /* 8016F31C 0016C25C 38 A1 01 BC */ addi r5, r1, 0x1bc -/* 8016F320 0016C260 48 10 1E 85 */ bl cSAngle_NS___mi_X1_ +/* 8016F320 0016C260 48 10 1E 85 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F324 0016C264 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F328 0016C268 38 81 01 B8 */ addi r4, r1, 0x1b8 /* 8016F32C 0016C26C 48 01 39 7D */ bl cSAngle_NS___as @@ -977,7 +977,7 @@ lbl_8016F368: lbl_8016F39C: /* 8016F39C 0016C2DC 38 61 01 B4 */ addi r3, r1, 0x1b4 /* 8016F3A0 0016C2E0 38 81 02 3C */ addi r4, r1, 0x23c -/* 8016F3A4 0016C2E4 48 10 1D A5 */ bl cSAngle_NS___mi +/* 8016F3A4 0016C2E4 48 10 1D A5 */ bl __mi__7cSAngleCFv /* 8016F3A8 0016C2E8 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F3AC 0016C2EC 38 81 01 B4 */ addi r4, r1, 0x1b4 /* 8016F3B0 0016C2F0 48 01 36 BD */ bl cSAngle_NS___lt @@ -989,7 +989,7 @@ lbl_8016F39C: /* 8016F3C8 0016C308 41 82 00 28 */ beq lbl_8016F3F0 /* 8016F3CC 0016C30C 38 61 01 B0 */ addi r3, r1, 0x1b0 /* 8016F3D0 0016C310 38 81 02 3C */ addi r4, r1, 0x23c -/* 8016F3D4 0016C314 48 10 1D 75 */ bl cSAngle_NS___mi +/* 8016F3D4 0016C314 48 10 1D 75 */ bl __mi__7cSAngleCFv /* 8016F3D8 0016C318 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F3DC 0016C31C 38 81 01 B0 */ addi r4, r1, 0x1b0 /* 8016F3E0 0016C320 48 01 38 C9 */ bl cSAngle_NS___as @@ -1004,7 +1004,7 @@ lbl_8016F3F0: /* 8016F400 0016C340 41 82 00 58 */ beq lbl_8016F458 /* 8016F404 0016C344 38 61 01 AC */ addi r3, r1, 0x1ac /* 8016F408 0016C348 38 81 02 38 */ addi r4, r1, 0x238 -/* 8016F40C 0016C34C 48 10 1D 3D */ bl cSAngle_NS___mi +/* 8016F40C 0016C34C 48 10 1D 3D */ bl __mi__7cSAngleCFv /* 8016F410 0016C350 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F414 0016C354 38 81 01 AC */ addi r4, r1, 0x1ac /* 8016F418 0016C358 48 01 36 75 */ bl cSAngle_NS___gt @@ -1016,7 +1016,7 @@ lbl_8016F3F0: /* 8016F430 0016C370 41 82 00 28 */ beq lbl_8016F458 /* 8016F434 0016C374 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 8016F438 0016C378 38 81 02 38 */ addi r4, r1, 0x238 -/* 8016F43C 0016C37C 48 10 1D 0D */ bl cSAngle_NS___mi +/* 8016F43C 0016C37C 48 10 1D 0D */ bl __mi__7cSAngleCFv /* 8016F440 0016C380 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F444 0016C384 38 81 01 A8 */ addi r4, r1, 0x1a8 /* 8016F448 0016C388 48 01 38 61 */ bl cSAngle_NS___as @@ -1029,7 +1029,7 @@ lbl_8016F458: /* 8016F460 0016C3A0 7C 64 1B 78 */ mr r4, r3 /* 8016F464 0016C3A4 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 8016F468 0016C3A8 38 A1 02 2C */ addi r5, r1, 0x22c -/* 8016F46C 0016C3AC 48 10 1D 09 */ bl cSAngle_NS___pl +/* 8016F46C 0016C3AC 48 10 1D 09 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016F470 0016C3B0 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016F474 0016C3B4 38 81 01 A4 */ addi r4, r1, 0x1a4 /* 8016F478 0016C3B8 4B F1 F4 1D */ bl cSGlobe_NS_U @@ -1041,7 +1041,7 @@ lbl_8016F488: /* 8016F48C 0016C3CC 48 01 37 F9 */ bl cSGlobe_NS_U_X1_ /* 8016F490 0016C3D0 7C 64 1B 78 */ mr r4, r3 /* 8016F494 0016C3D4 38 61 02 28 */ addi r3, r1, 0x228 -/* 8016F498 0016C3D8 48 10 1A D1 */ bl cSAngle_X1_ +/* 8016F498 0016C3D8 48 10 1A D1 */ bl __ct__7cSAngleFRC7cSAngle /* 8016F49C 0016C3DC 38 61 14 24 */ addi r3, r1, 0x1424 /* 8016F4A0 0016C3E0 38 81 14 48 */ addi r4, r1, 0x1448 /* 8016F4A4 0016C3E4 4B F2 83 51 */ bl cXyz_X1_ @@ -1051,7 +1051,7 @@ lbl_8016F488: /* 8016F4B4 0016C3F4 38 61 10 B8 */ addi r3, r1, 0x10b8 /* 8016F4B8 0016C3F8 38 81 14 18 */ addi r4, r1, 0x1418 /* 8016F4BC 0016C3FC 38 A1 14 24 */ addi r5, r1, 0x1424 -/* 8016F4C0 0016C400 48 0F 76 75 */ bl cXyz_NS___mi +/* 8016F4C0 0016C400 48 0F 76 75 */ bl __mi__4cXyzCFRC3Vec /* 8016F4C4 0016C404 38 61 14 0C */ addi r3, r1, 0x140c /* 8016F4C8 0016C408 38 81 10 B8 */ addi r4, r1, 0x10b8 /* 8016F4CC 0016C40C 4B F2 83 29 */ bl cXyz_X1_ @@ -1060,10 +1060,10 @@ lbl_8016F488: /* 8016F4D8 0016C418 4B E9 9C AD */ bl cXyz_NS_dtor /* 8016F4DC 0016C41C 38 61 02 C8 */ addi r3, r1, 0x2c8 /* 8016F4E0 0016C420 38 81 14 0C */ addi r4, r1, 0x140c -/* 8016F4E4 0016C424 48 10 23 9D */ bl cSGlobe_X4_ +/* 8016F4E4 0016C424 48 10 23 9D */ bl __ct__7cSGlobeFRC4cXyz /* 8016F4E8 0016C428 38 61 10 AC */ addi r3, r1, 0x10ac /* 8016F4EC 0016C42C 38 81 14 0C */ addi r4, r1, 0x140c -/* 8016F4F0 0016C430 48 0F 7A 05 */ bl cXyz_NS_normalize +/* 8016F4F0 0016C430 48 0F 7A 05 */ bl normalize__4cXyzFv /* 8016F4F4 0016C434 38 61 10 AC */ addi r3, r1, 0x10ac /* 8016F4F8 0016C438 38 80 FF FF */ li r4, -1 /* 8016F4FC 0016C43C 4B E9 9C 89 */ bl cXyz_NS_dtor @@ -1077,7 +1077,7 @@ lbl_8016F488: /* 8016F51C 0016C45C 90 01 14 68 */ stw r0, 0x1468(r1) /* 8016F520 0016C460 C8 01 14 68 */ lfd f0, 0x1468(r1) /* 8016F524 0016C464 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8016F528 0016C468 48 0F 76 5D */ bl cXyz_NS___ml +/* 8016F528 0016C468 48 0F 76 5D */ bl __ml__4cXyzCFf /* 8016F52C 0016C46C 38 61 14 24 */ addi r3, r1, 0x1424 /* 8016F530 0016C470 38 81 10 A0 */ addi r4, r1, 0x10a0 /* 8016F534 0016C474 4B F1 F3 9D */ bl cXyz_NS___ami @@ -1094,7 +1094,7 @@ lbl_8016F488: /* 8016F560 0016C4A0 90 01 14 60 */ stw r0, 0x1460(r1) /* 8016F564 0016C4A4 C8 01 14 60 */ lfd f0, 0x1460(r1) /* 8016F568 0016C4A8 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8016F56C 0016C4AC 48 0F 76 19 */ bl cXyz_NS___ml +/* 8016F56C 0016C4AC 48 0F 76 19 */ bl __ml__4cXyzCFf /* 8016F570 0016C4B0 38 61 14 18 */ addi r3, r1, 0x1418 /* 8016F574 0016C4B4 38 81 10 94 */ addi r4, r1, 0x1094 /* 8016F578 0016C4B8 4B F1 F3 8D */ bl cXyz_NS___apl @@ -1106,7 +1106,7 @@ lbl_8016F488: /* 8016F590 0016C4D0 38 61 10 88 */ addi r3, r1, 0x1088 /* 8016F594 0016C4D4 38 81 14 18 */ addi r4, r1, 0x1418 /* 8016F598 0016C4D8 38 A1 14 24 */ addi r5, r1, 0x1424 -/* 8016F59C 0016C4DC 48 0F 75 99 */ bl cXyz_NS___mi +/* 8016F59C 0016C4DC 48 0F 75 99 */ bl __mi__4cXyzCFRC3Vec /* 8016F5A0 0016C4E0 38 61 13 F4 */ addi r3, r1, 0x13f4 /* 8016F5A4 0016C4E4 38 81 10 88 */ addi r4, r1, 0x1088 /* 8016F5A8 0016C4E8 4B F2 82 4D */ bl cXyz_X1_ @@ -1123,15 +1123,15 @@ lbl_8016F488: /* 8016F5D4 0016C514 41 82 00 88 */ beq lbl_8016F65C /* 8016F5D8 0016C518 38 61 10 7C */ addi r3, r1, 0x107c /* 8016F5DC 0016C51C 38 81 13 F4 */ addi r4, r1, 0x13f4 -/* 8016F5E0 0016C520 48 0F 77 05 */ bl cXyz_NS_norm +/* 8016F5E0 0016C520 48 0F 77 05 */ bl norm__4cXyzCFv /* 8016F5E4 0016C524 38 61 10 70 */ addi r3, r1, 0x1070 /* 8016F5E8 0016C528 38 81 10 7C */ addi r4, r1, 0x107c /* 8016F5EC 0016C52C C0 22 9C E4 */ lfs f1, lbl_804536E4-_SDA2_BASE_(r2) -/* 8016F5F0 0016C530 48 0F 75 95 */ bl cXyz_NS___ml +/* 8016F5F0 0016C530 48 0F 75 95 */ bl __ml__4cXyzCFf /* 8016F5F4 0016C534 38 61 10 64 */ addi r3, r1, 0x1064 /* 8016F5F8 0016C538 38 81 14 00 */ addi r4, r1, 0x1400 /* 8016F5FC 0016C53C 38 A1 10 70 */ addi r5, r1, 0x1070 -/* 8016F600 0016C540 48 0F 75 35 */ bl cXyz_NS___mi +/* 8016F600 0016C540 48 0F 75 35 */ bl __mi__4cXyzCFRC3Vec /* 8016F604 0016C544 38 61 14 18 */ addi r3, r1, 0x1418 /* 8016F608 0016C548 38 81 10 64 */ addi r4, r1, 0x1064 /* 8016F60C 0016C54C 4B F2 81 CD */ bl cXyz_NS___as @@ -1147,7 +1147,7 @@ lbl_8016F488: /* 8016F634 0016C574 38 61 10 58 */ addi r3, r1, 0x1058 /* 8016F638 0016C578 38 81 14 18 */ addi r4, r1, 0x1418 /* 8016F63C 0016C57C 38 A1 14 24 */ addi r5, r1, 0x1424 -/* 8016F640 0016C580 48 0F 74 F5 */ bl cXyz_NS___mi +/* 8016F640 0016C580 48 0F 74 F5 */ bl __mi__4cXyzCFRC3Vec /* 8016F644 0016C584 38 61 13 F4 */ addi r3, r1, 0x13f4 /* 8016F648 0016C588 38 81 10 58 */ addi r4, r1, 0x1058 /* 8016F64C 0016C58C 4B F2 81 8D */ bl cXyz_NS___as @@ -1158,11 +1158,11 @@ lbl_8016F65C: /* 8016F65C 0016C59C 38 61 10 4C */ addi r3, r1, 0x104c /* 8016F660 0016C5A0 38 81 13 F4 */ addi r4, r1, 0x13f4 /* 8016F664 0016C5A4 C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) -/* 8016F668 0016C5A8 48 0F 75 1D */ bl cXyz_NS___ml +/* 8016F668 0016C5A8 48 0F 75 1D */ bl __ml__4cXyzCFf /* 8016F66C 0016C5AC 38 61 10 40 */ addi r3, r1, 0x1040 /* 8016F670 0016C5B0 38 81 14 24 */ addi r4, r1, 0x1424 /* 8016F674 0016C5B4 38 A1 10 4C */ addi r5, r1, 0x104c -/* 8016F678 0016C5B8 48 0F 74 6D */ bl cXyz_NS___pl +/* 8016F678 0016C5B8 48 0F 74 6D */ bl __pl__4cXyzCFRC3Vec /* 8016F67C 0016C5BC 38 61 13 E8 */ addi r3, r1, 0x13e8 /* 8016F680 0016C5C0 38 81 10 40 */ addi r4, r1, 0x1040 /* 8016F684 0016C5C4 4B F2 81 71 */ bl cXyz_X1_ @@ -1180,10 +1180,10 @@ lbl_8016F65C: /* 8016F6B4 0016C5F4 7C 65 1B 78 */ mr r5, r3 /* 8016F6B8 0016C5F8 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 8016F6BC 0016C5FC 38 81 02 28 */ addi r4, r1, 0x228 -/* 8016F6C0 0016C600 48 10 1A E5 */ bl cSAngle_NS___mi_X1_ +/* 8016F6C0 0016C600 48 10 1A E5 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F6C4 0016C604 38 61 02 24 */ addi r3, r1, 0x224 /* 8016F6C8 0016C608 38 81 01 A0 */ addi r4, r1, 0x1a0 -/* 8016F6CC 0016C60C 48 10 18 9D */ bl cSAngle_X1_ +/* 8016F6CC 0016C60C 48 10 18 9D */ bl __ct__7cSAngleFRC7cSAngle /* 8016F6D0 0016C610 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 8016F6D4 0016C614 38 80 FF FF */ li r4, -1 /* 8016F6D8 0016C618 4B EC 0E 39 */ bl cSAngle_NS_dtor @@ -1198,7 +1198,7 @@ lbl_8016F65C: lbl_8016F6FC: /* 8016F6FC 0016C63C 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 8016F700 0016C640 38 81 13 DC */ addi r4, r1, 0x13dc -/* 8016F704 0016C644 48 10 21 7D */ bl cSGlobe_X4_ +/* 8016F704 0016C644 48 10 21 7D */ bl __ct__7cSGlobeFRC4cXyz /* 8016F708 0016C648 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 8016F70C 0016C64C 48 01 35 79 */ bl cSGlobe_NS_U_X1_ /* 8016F710 0016C650 7C 76 1B 78 */ mr r22, r3 @@ -1207,7 +1207,7 @@ lbl_8016F6FC: /* 8016F71C 0016C65C 7C 64 1B 78 */ mr r4, r3 /* 8016F720 0016C660 38 61 01 9C */ addi r3, r1, 0x19c /* 8016F724 0016C664 7E C5 B3 78 */ mr r5, r22 -/* 8016F728 0016C668 48 10 1A 4D */ bl cSAngle_NS___pl +/* 8016F728 0016C668 48 10 1A 4D */ bl __pl__7cSAngleCFRC7cSAngle /* 8016F72C 0016C66C 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 8016F730 0016C670 38 81 01 9C */ addi r4, r1, 0x19c /* 8016F734 0016C674 4B F1 F1 61 */ bl cSGlobe_NS_U @@ -1215,7 +1215,7 @@ lbl_8016F6FC: /* 8016F73C 0016C67C 38 80 FF FF */ li r4, -1 /* 8016F740 0016C680 4B EC 0D D1 */ bl cSAngle_NS_dtor /* 8016F744 0016C684 38 61 02 24 */ addi r3, r1, 0x224 -/* 8016F748 0016C688 48 10 19 D9 */ bl cSAngle_NS_Cos +/* 8016F748 0016C688 48 10 19 D9 */ bl Cos__7cSAngleCFv /* 8016F74C 0016C68C FE A0 08 90 */ fmr f21, f1 /* 8016F750 0016C690 38 61 02 C8 */ addi r3, r1, 0x2c8 /* 8016F754 0016C694 48 01 33 11 */ bl cSGlobe_NS_R_X1_ @@ -1228,18 +1228,18 @@ lbl_8016F6FC: /* 8016F770 0016C6B0 48 01 32 DD */ bl cSGlobe_NS_R /* 8016F774 0016C6B4 38 61 10 34 */ addi r3, r1, 0x1034 /* 8016F778 0016C6B8 38 81 02 C8 */ addi r4, r1, 0x2c8 -/* 8016F77C 0016C6BC 48 10 23 39 */ bl cSGlobe_NS_Xyz +/* 8016F77C 0016C6BC 48 10 23 39 */ bl Xyz__7cSGlobeCFv /* 8016F780 0016C6C0 38 61 10 28 */ addi r3, r1, 0x1028 /* 8016F784 0016C6C4 38 81 13 E8 */ addi r4, r1, 0x13e8 /* 8016F788 0016C6C8 38 A1 10 34 */ addi r5, r1, 0x1034 -/* 8016F78C 0016C6CC 48 0F 73 59 */ bl cXyz_NS___pl +/* 8016F78C 0016C6CC 48 0F 73 59 */ bl __pl__4cXyzCFRC3Vec /* 8016F790 0016C6D0 38 61 10 1C */ addi r3, r1, 0x101c /* 8016F794 0016C6D4 38 81 02 C0 */ addi r4, r1, 0x2c0 -/* 8016F798 0016C6D8 48 10 23 1D */ bl cSGlobe_NS_Xyz +/* 8016F798 0016C6D8 48 10 23 1D */ bl Xyz__7cSGlobeCFv /* 8016F79C 0016C6DC 38 61 10 10 */ addi r3, r1, 0x1010 /* 8016F7A0 0016C6E0 38 81 10 28 */ addi r4, r1, 0x1028 /* 8016F7A4 0016C6E4 38 A1 10 1C */ addi r5, r1, 0x101c -/* 8016F7A8 0016C6E8 48 0F 73 3D */ bl cXyz_NS___pl +/* 8016F7A8 0016C6E8 48 0F 73 3D */ bl __pl__4cXyzCFRC3Vec /* 8016F7AC 0016C6EC 38 7F 03 EC */ addi r3, r31, 0x3ec /* 8016F7B0 0016C6F0 38 81 10 10 */ addi r4, r1, 0x1010 /* 8016F7B4 0016C6F4 4B F2 80 25 */ bl cXyz_NS___as @@ -1298,11 +1298,11 @@ lbl_8016F6FC: /* 8016F888 0016C7C8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8016F88C 0016C7CC 41 82 00 10 */ beq lbl_8016F89C /* 8016F890 0016C7D0 38 61 02 20 */ addi r3, r1, 0x220 -/* 8016F894 0016C7D4 48 10 17 79 */ bl cSAngle_NS_Val_X3_ +/* 8016F894 0016C7D4 48 10 17 79 */ bl Val__7cSAngleFf /* 8016F898 0016C7D8 48 00 00 D4 */ b lbl_8016F96C lbl_8016F89C: /* 8016F89C 0016C7DC 38 61 02 2C */ addi r3, r1, 0x22c -/* 8016F8A0 0016C7E0 48 10 18 81 */ bl cSAngle_NS_Cos +/* 8016F8A0 0016C7E0 48 10 18 81 */ bl Cos__7cSAngleCFv /* 8016F8A4 0016C7E4 C0 02 9D 0C */ lfs f0, lbl_8045370C-_SDA2_BASE_(r2) /* 8016F8A8 0016C7E8 EE A0 08 2A */ fadds f21, f0, f1 /* 8016F8AC 0016C7EC 38 7F 04 18 */ addi r3, r31, 0x418 @@ -1310,18 +1310,18 @@ lbl_8016F89C: /* 8016F8B4 0016C7F4 7C 64 1B 78 */ mr r4, r3 /* 8016F8B8 0016C7F8 38 61 01 98 */ addi r3, r1, 0x198 /* 8016F8BC 0016C7FC FC 20 A8 90 */ fmr f1, f21 -/* 8016F8C0 0016C800 48 10 19 A5 */ bl cSAngle_NS___ml +/* 8016F8C0 0016C800 48 10 19 A5 */ bl __ml__7cSAngleCFf /* 8016F8C4 0016C804 38 61 01 94 */ addi r3, r1, 0x194 /* 8016F8C8 0016C808 38 81 01 98 */ addi r4, r1, 0x198 /* 8016F8CC 0016C80C FC 20 F0 90 */ fmr f1, f30 -/* 8016F8D0 0016C810 48 10 19 95 */ bl cSAngle_NS___ml +/* 8016F8D0 0016C810 48 10 19 95 */ bl __ml__7cSAngleCFf /* 8016F8D4 0016C814 38 61 01 90 */ addi r3, r1, 0x190 /* 8016F8D8 0016C818 FC 20 F8 90 */ fmr f1, f31 -/* 8016F8DC 0016C81C 48 10 16 ED */ bl cSAngle_X3_ +/* 8016F8DC 0016C81C 48 10 16 ED */ bl __ct__7cSAngleFf /* 8016F8E0 0016C820 38 61 01 8C */ addi r3, r1, 0x18c /* 8016F8E4 0016C824 38 81 01 94 */ addi r4, r1, 0x194 /* 8016F8E8 0016C828 38 A1 01 90 */ addi r5, r1, 0x190 -/* 8016F8EC 0016C82C 48 10 18 89 */ bl cSAngle_NS___pl +/* 8016F8EC 0016C82C 48 10 18 89 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016F8F0 0016C830 38 61 02 20 */ addi r3, r1, 0x220 /* 8016F8F4 0016C834 38 81 01 8C */ addi r4, r1, 0x18c /* 8016F8F8 0016C838 48 01 33 B1 */ bl cSAngle_NS___as @@ -1376,7 +1376,7 @@ lbl_8016F99C: /* 8016F9B0 0016C8F0 7C 64 1B 78 */ mr r4, r3 /* 8016F9B4 0016C8F4 38 61 01 88 */ addi r3, r1, 0x188 /* 8016F9B8 0016C8F8 7E C5 B3 78 */ mr r5, r22 -/* 8016F9BC 0016C8FC 48 10 17 E9 */ bl cSAngle_NS___mi_X1_ +/* 8016F9BC 0016C8FC 48 10 17 E9 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F9C0 0016C900 38 61 01 88 */ addi r3, r1, 0x188 /* 8016F9C4 0016C904 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 8016F9C8 0016C908 48 01 30 C5 */ bl cSAngle_NS___gt @@ -1388,7 +1388,7 @@ lbl_8016F99C: /* 8016F9E0 0016C920 41 82 00 2C */ beq lbl_8016FA0C /* 8016F9E4 0016C924 38 61 01 84 */ addi r3, r1, 0x184 /* 8016F9E8 0016C928 C0 22 9C E4 */ lfs f1, lbl_804536E4-_SDA2_BASE_(r2) -/* 8016F9EC 0016C92C 48 10 15 DD */ bl cSAngle_X3_ +/* 8016F9EC 0016C92C 48 10 15 DD */ bl __ct__7cSAngleFf /* 8016F9F0 0016C930 38 61 02 1C */ addi r3, r1, 0x21c /* 8016F9F4 0016C934 38 81 01 84 */ addi r4, r1, 0x184 /* 8016F9F8 0016C938 48 01 32 B1 */ bl cSAngle_NS___as @@ -1399,7 +1399,7 @@ lbl_8016F99C: lbl_8016FA0C: /* 8016FA0C 0016C94C 38 61 01 80 */ addi r3, r1, 0x180 /* 8016FA10 0016C950 C0 22 9D F0 */ lfs f1, lbl_804537F0-_SDA2_BASE_(r2) -/* 8016FA14 0016C954 48 10 15 B5 */ bl cSAngle_X3_ +/* 8016FA14 0016C954 48 10 15 B5 */ bl __ct__7cSAngleFf /* 8016FA18 0016C958 38 61 02 1C */ addi r3, r1, 0x21c /* 8016FA1C 0016C95C 38 81 01 80 */ addi r4, r1, 0x180 /* 8016FA20 0016C960 48 01 32 89 */ bl cSAngle_NS___as @@ -1409,11 +1409,11 @@ lbl_8016FA0C: lbl_8016FA30: /* 8016FA30 0016C970 38 61 10 04 */ addi r3, r1, 0x1004 /* 8016FA34 0016C974 38 9F 04 10 */ addi r4, r31, 0x410 -/* 8016FA38 0016C978 48 10 20 7D */ bl cSGlobe_NS_Xyz +/* 8016FA38 0016C978 48 10 20 7D */ bl Xyz__7cSGlobeCFv /* 8016FA3C 0016C97C 38 61 0F F8 */ addi r3, r1, 0xff8 /* 8016FA40 0016C980 38 9F 03 EC */ addi r4, r31, 0x3ec /* 8016FA44 0016C984 38 A1 10 04 */ addi r5, r1, 0x1004 -/* 8016FA48 0016C988 48 0F 70 9D */ bl cXyz_NS___pl +/* 8016FA48 0016C988 48 0F 70 9D */ bl __pl__4cXyzCFRC3Vec /* 8016FA4C 0016C98C 38 7F 03 F8 */ addi r3, r31, 0x3f8 /* 8016FA50 0016C990 38 81 0F F8 */ addi r4, r1, 0xff8 /* 8016FA54 0016C994 4B F2 7D 85 */ bl cXyz_NS___as @@ -1461,7 +1461,7 @@ lbl_8016FA30: /* 8016FAFC 0016CA3C 7C 64 1B 78 */ mr r4, r3 /* 8016FB00 0016CA40 38 61 01 7C */ addi r3, r1, 0x17c /* 8016FB04 0016CA44 7E C5 B3 78 */ mr r5, r22 -/* 8016FB08 0016CA48 48 10 16 9D */ bl cSAngle_NS___mi_X1_ +/* 8016FB08 0016CA48 48 10 16 9D */ bl __mi__7cSAngleCFRC7cSAngle /* 8016FB0C 0016CA4C 38 61 01 7C */ addi r3, r1, 0x17c /* 8016FB10 0016CA50 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 8016FB14 0016CA54 48 01 2F 79 */ bl cSAngle_NS___gt @@ -1477,7 +1477,7 @@ lbl_8016FB2C: /* 8016FB34 0016CA74 4B EC 09 DD */ bl cSAngle_NS_dtor /* 8016FB38 0016CA78 38 61 01 78 */ addi r3, r1, 0x178 /* 8016FB3C 0016CA7C FC 20 A8 90 */ fmr f1, f21 -/* 8016FB40 0016CA80 48 10 14 89 */ bl cSAngle_X3_ +/* 8016FB40 0016CA80 48 10 14 89 */ bl __ct__7cSAngleFf /* 8016FB44 0016CA84 38 61 01 74 */ addi r3, r1, 0x174 /* 8016FB48 0016CA88 7F E4 FB 78 */ mr r4, r31 /* 8016FB4C 0016CA8C 7F A5 EB 78 */ mr r5, r29 @@ -1485,7 +1485,7 @@ lbl_8016FB2C: /* 8016FB54 0016CA94 38 61 01 70 */ addi r3, r1, 0x170 /* 8016FB58 0016CA98 38 81 01 78 */ addi r4, r1, 0x178 /* 8016FB5C 0016CA9C 38 A1 01 74 */ addi r5, r1, 0x174 -/* 8016FB60 0016CAA0 48 10 16 15 */ bl cSAngle_NS___pl +/* 8016FB60 0016CAA0 48 10 16 15 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016FB64 0016CAA4 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016FB68 0016CAA8 38 81 01 70 */ addi r4, r1, 0x170 /* 8016FB6C 0016CAAC 4B F1 ED 29 */ bl cSGlobe_NS_U @@ -1500,7 +1500,7 @@ lbl_8016FB2C: /* 8016FB90 0016CAD0 4B EC 09 81 */ bl cSAngle_NS_dtor /* 8016FB94 0016CAD4 38 61 01 6C */ addi r3, r1, 0x16c /* 8016FB98 0016CAD8 C0 22 9C E4 */ lfs f1, lbl_804536E4-_SDA2_BASE_(r2) -/* 8016FB9C 0016CADC 48 10 14 2D */ bl cSAngle_X3_ +/* 8016FB9C 0016CADC 48 10 14 2D */ bl __ct__7cSAngleFf /* 8016FBA0 0016CAE0 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016FBA4 0016CAE4 38 81 01 6C */ addi r4, r1, 0x16c /* 8016FBA8 0016CAE8 4B F1 FE B1 */ bl cSGlobe_NS_V @@ -1512,11 +1512,11 @@ lbl_8016FB2C: /* 8016FBC0 0016CB00 48 01 2E 8D */ bl cSGlobe_NS_R /* 8016FBC4 0016CB04 38 61 0F E0 */ addi r3, r1, 0xfe0 /* 8016FBC8 0016CB08 38 9F 04 10 */ addi r4, r31, 0x410 -/* 8016FBCC 0016CB0C 48 10 1E E9 */ bl cSGlobe_NS_Xyz +/* 8016FBCC 0016CB0C 48 10 1E E9 */ bl Xyz__7cSGlobeCFv /* 8016FBD0 0016CB10 38 61 0F D4 */ addi r3, r1, 0xfd4 /* 8016FBD4 0016CB14 38 9F 03 EC */ addi r4, r31, 0x3ec /* 8016FBD8 0016CB18 38 A1 0F E0 */ addi r5, r1, 0xfe0 -/* 8016FBDC 0016CB1C 48 0F 6F 09 */ bl cXyz_NS___pl +/* 8016FBDC 0016CB1C 48 0F 6F 09 */ bl __pl__4cXyzCFRC3Vec /* 8016FBE0 0016CB20 38 7F 03 F8 */ addi r3, r31, 0x3f8 /* 8016FBE4 0016CB24 38 81 0F D4 */ addi r4, r1, 0xfd4 /* 8016FBE8 0016CB28 4B F2 7B F1 */ bl cXyz_NS___as @@ -1578,7 +1578,7 @@ lbl_8016FCA4: /* 8016FCB8 0016CBF8 7C 64 1B 78 */ mr r4, r3 /* 8016FCBC 0016CBFC 38 61 01 68 */ addi r3, r1, 0x168 /* 8016FCC0 0016CC00 7E C5 B3 78 */ mr r5, r22 -/* 8016FCC4 0016CC04 48 10 14 E1 */ bl cSAngle_NS___mi_X1_ +/* 8016FCC4 0016CC04 48 10 14 E1 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016FCC8 0016CC08 38 61 02 18 */ addi r3, r1, 0x218 /* 8016FCCC 0016CC0C 38 81 01 68 */ addi r4, r1, 0x168 /* 8016FCD0 0016CC10 48 01 2F D9 */ bl cSAngle_NS___as @@ -1586,7 +1586,7 @@ lbl_8016FCA4: /* 8016FCD8 0016CC18 38 80 FF FF */ li r4, -1 /* 8016FCDC 0016CC1C 4B EC 08 35 */ bl cSAngle_NS_dtor /* 8016FCE0 0016CC20 38 61 02 18 */ addi r3, r1, 0x218 -/* 8016FCE4 0016CC24 48 10 13 4D */ bl cSAngle_NS_Degree +/* 8016FCE4 0016CC24 48 10 13 4D */ bl Degree__7cSAngleCFv /* 8016FCE8 0016CC28 48 01 2D 55 */ bl std_NS_fabsf /* 8016FCEC 0016CC2C FC 01 B0 40 */ fcmpo cr0, f1, f22 /* 8016FCF0 0016CC30 40 80 00 38 */ bge lbl_8016FD28 @@ -1595,7 +1595,7 @@ lbl_8016FCA4: /* 8016FCFC 0016CC3C 7C 64 1B 78 */ mr r4, r3 /* 8016FD00 0016CC40 38 61 01 64 */ addi r3, r1, 0x164 /* 8016FD04 0016CC44 38 A1 02 1C */ addi r5, r1, 0x21c -/* 8016FD08 0016CC48 48 10 14 6D */ bl cSAngle_NS___pl +/* 8016FD08 0016CC48 48 10 14 6D */ bl __pl__7cSAngleCFRC7cSAngle /* 8016FD0C 0016CC4C 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016FD10 0016CC50 38 81 01 64 */ addi r4, r1, 0x164 /* 8016FD14 0016CC54 4B F1 EB 81 */ bl cSGlobe_NS_U @@ -1626,11 +1626,11 @@ lbl_8016FD28: /* 8016FD74 0016CCB4 48 01 2C D9 */ bl cSGlobe_NS_R /* 8016FD78 0016CCB8 38 61 0F BC */ addi r3, r1, 0xfbc /* 8016FD7C 0016CCBC 38 9F 04 10 */ addi r4, r31, 0x410 -/* 8016FD80 0016CCC0 48 10 1D 35 */ bl cSGlobe_NS_Xyz +/* 8016FD80 0016CCC0 48 10 1D 35 */ bl Xyz__7cSGlobeCFv /* 8016FD84 0016CCC4 38 61 0F B0 */ addi r3, r1, 0xfb0 /* 8016FD88 0016CCC8 38 9F 03 EC */ addi r4, r31, 0x3ec /* 8016FD8C 0016CCCC 38 A1 0F BC */ addi r5, r1, 0xfbc -/* 8016FD90 0016CCD0 48 0F 6D 55 */ bl cXyz_NS___pl +/* 8016FD90 0016CCD0 48 0F 6D 55 */ bl __pl__4cXyzCFRC3Vec /* 8016FD94 0016CCD4 38 7F 03 F8 */ addi r3, r31, 0x3f8 /* 8016FD98 0016CCD8 38 81 0F B0 */ addi r4, r1, 0xfb0 /* 8016FD9C 0016CCDC 4B F2 7A 3D */ bl cXyz_NS___as @@ -1716,7 +1716,7 @@ lbl_8016FEC8: /* 8016FED0 0016CE10 7C 64 1B 78 */ mr r4, r3 /* 8016FED4 0016CE14 38 61 01 60 */ addi r3, r1, 0x160 /* 8016FED8 0016CE18 38 A1 02 1C */ addi r5, r1, 0x21c -/* 8016FEDC 0016CE1C 48 10 12 99 */ bl cSAngle_NS___pl +/* 8016FEDC 0016CE1C 48 10 12 99 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016FEE0 0016CE20 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016FEE4 0016CE24 38 81 01 60 */ addi r4, r1, 0x160 /* 8016FEE8 0016CE28 4B F1 E9 AD */ bl cSGlobe_NS_U @@ -1728,7 +1728,7 @@ lbl_8016FEC8: /* 8016FF00 0016CE40 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8016FF04 0016CE44 41 82 00 10 */ beq lbl_8016FF14 /* 8016FF08 0016CE48 38 61 02 20 */ addi r3, r1, 0x220 -/* 8016FF0C 0016CE4C 48 10 11 01 */ bl cSAngle_NS_Val_X3_ +/* 8016FF0C 0016CE4C 48 10 11 01 */ bl Val__7cSAngleFf /* 8016FF10 0016CE50 48 00 01 1C */ b lbl_8017002C lbl_8016FF14: /* 8016FF14 0016CE54 38 7F 04 10 */ addi r3, r31, 0x410 @@ -1739,12 +1739,12 @@ lbl_8016FF14: /* 8016FF28 0016CE68 7C 64 1B 78 */ mr r4, r3 /* 8016FF2C 0016CE6C 38 61 01 5C */ addi r3, r1, 0x15c /* 8016FF30 0016CE70 7E C5 B3 78 */ mr r5, r22 -/* 8016FF34 0016CE74 48 10 12 71 */ bl cSAngle_NS___mi_X1_ +/* 8016FF34 0016CE74 48 10 12 71 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016FF38 0016CE78 38 61 01 58 */ addi r3, r1, 0x158 /* 8016FF3C 0016CE7C 38 81 01 5C */ addi r4, r1, 0x15c -/* 8016FF40 0016CE80 48 10 10 29 */ bl cSAngle_X1_ +/* 8016FF40 0016CE80 48 10 10 29 */ bl __ct__7cSAngleFRC7cSAngle /* 8016FF44 0016CE84 38 61 01 58 */ addi r3, r1, 0x158 -/* 8016FF48 0016CE88 48 10 11 D9 */ bl cSAngle_NS_Cos +/* 8016FF48 0016CE88 48 10 11 D9 */ bl Cos__7cSAngleCFv /* 8016FF4C 0016CE8C C0 02 9D 0C */ lfs f0, lbl_8045370C-_SDA2_BASE_(r2) /* 8016FF50 0016CE90 EE A0 08 2A */ fadds f21, f0, f1 /* 8016FF54 0016CE94 38 7F 04 18 */ addi r3, r31, 0x418 @@ -1752,18 +1752,18 @@ lbl_8016FF14: /* 8016FF5C 0016CE9C 7C 64 1B 78 */ mr r4, r3 /* 8016FF60 0016CEA0 38 61 01 54 */ addi r3, r1, 0x154 /* 8016FF64 0016CEA4 FC 20 A8 90 */ fmr f1, f21 -/* 8016FF68 0016CEA8 48 10 12 FD */ bl cSAngle_NS___ml +/* 8016FF68 0016CEA8 48 10 12 FD */ bl __ml__7cSAngleCFf /* 8016FF6C 0016CEAC 38 61 01 50 */ addi r3, r1, 0x150 /* 8016FF70 0016CEB0 38 81 01 54 */ addi r4, r1, 0x154 /* 8016FF74 0016CEB4 FC 20 F0 90 */ fmr f1, f30 -/* 8016FF78 0016CEB8 48 10 12 ED */ bl cSAngle_NS___ml +/* 8016FF78 0016CEB8 48 10 12 ED */ bl __ml__7cSAngleCFf /* 8016FF7C 0016CEBC 38 61 01 4C */ addi r3, r1, 0x14c /* 8016FF80 0016CEC0 FC 20 F8 90 */ fmr f1, f31 -/* 8016FF84 0016CEC4 48 10 10 45 */ bl cSAngle_X3_ +/* 8016FF84 0016CEC4 48 10 10 45 */ bl __ct__7cSAngleFf /* 8016FF88 0016CEC8 38 61 01 48 */ addi r3, r1, 0x148 /* 8016FF8C 0016CECC 38 81 01 50 */ addi r4, r1, 0x150 /* 8016FF90 0016CED0 38 A1 01 4C */ addi r5, r1, 0x14c -/* 8016FF94 0016CED4 48 10 11 E1 */ bl cSAngle_NS___pl +/* 8016FF94 0016CED4 48 10 11 E1 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016FF98 0016CED8 38 61 02 20 */ addi r3, r1, 0x220 /* 8016FF9C 0016CEDC 38 81 01 48 */ addi r4, r1, 0x148 /* 8016FFA0 0016CEE0 48 01 2D 09 */ bl cSAngle_NS___as @@ -1813,7 +1813,7 @@ lbl_8017002C: /* 80170048 0016CF88 48 01 2C 3D */ bl cSGlobe_NS_U_X1_ /* 8017004C 0016CF8C 7C 64 1B 78 */ mr r4, r3 /* 80170050 0016CF90 38 61 01 44 */ addi r3, r1, 0x144 -/* 80170054 0016CF94 48 10 0F 15 */ bl cSAngle_X1_ +/* 80170054 0016CF94 48 10 0F 15 */ bl __ct__7cSAngleFRC7cSAngle /* 80170058 0016CF98 38 61 0F 74 */ addi r3, r1, 0xf74 /* 8017005C 0016CF9C 7F A4 EB 78 */ mr r4, r29 /* 80170060 0016CFA0 7F C5 F3 78 */ mr r5, r30 @@ -1833,11 +1833,11 @@ lbl_8017002C: lbl_80170098: /* 80170098 0016CFD8 38 61 0F 68 */ addi r3, r1, 0xf68 /* 8017009C 0016CFDC 38 9F 04 10 */ addi r4, r31, 0x410 -/* 801700A0 0016CFE0 48 10 1A 15 */ bl cSGlobe_NS_Xyz +/* 801700A0 0016CFE0 48 10 1A 15 */ bl Xyz__7cSGlobeCFv /* 801700A4 0016CFE4 38 61 0F 5C */ addi r3, r1, 0xf5c /* 801700A8 0016CFE8 38 9F 03 EC */ addi r4, r31, 0x3ec /* 801700AC 0016CFEC 38 A1 0F 68 */ addi r5, r1, 0xf68 -/* 801700B0 0016CFF0 48 0F 6A 35 */ bl cXyz_NS___pl +/* 801700B0 0016CFF0 48 0F 6A 35 */ bl __pl__4cXyzCFRC3Vec /* 801700B4 0016CFF4 38 7F 03 F8 */ addi r3, r31, 0x3f8 /* 801700B8 0016CFF8 38 81 0F 5C */ addi r4, r1, 0xf5c /* 801700BC 0016CFFC 4B F2 77 1D */ bl cXyz_NS___as @@ -1889,10 +1889,10 @@ lbl_801700E4: /* 8017016C 0016D0AC 38 61 0F 38 */ addi r3, r1, 0xf38 /* 80170170 0016D0B0 38 9F 03 F8 */ addi r4, r31, 0x3f8 /* 80170174 0016D0B4 38 BF 03 EC */ addi r5, r31, 0x3ec -/* 80170178 0016D0B8 48 0F 69 BD */ bl cXyz_NS___mi +/* 80170178 0016D0B8 48 0F 69 BD */ bl __mi__4cXyzCFRC3Vec /* 8017017C 0016D0BC 38 7F 04 10 */ addi r3, r31, 0x410 /* 80170180 0016D0C0 38 81 0F 38 */ addi r4, r1, 0xf38 -/* 80170184 0016D0C4 48 10 18 ED */ bl cSGlobe_NS_Val_X3_ +/* 80170184 0016D0C4 48 10 18 ED */ bl Val__7cSGlobeFRC4cXyz /* 80170188 0016D0C8 38 61 0F 38 */ addi r3, r1, 0xf38 /* 8017018C 0016D0CC 38 80 FF FF */ li r4, -1 /* 80170190 0016D0D0 4B E9 8F F5 */ bl cXyz_NS_dtor @@ -1926,7 +1926,7 @@ lbl_80170194: /* 801701FC 0016D13C 7C 64 1B 78 */ mr r4, r3 /* 80170200 0016D140 38 61 01 40 */ addi r3, r1, 0x140 /* 80170204 0016D144 7E C5 B3 78 */ mr r5, r22 -/* 80170208 0016D148 48 10 0F 9D */ bl cSAngle_NS___mi_X1_ +/* 80170208 0016D148 48 10 0F 9D */ bl __mi__7cSAngleCFRC7cSAngle /* 8017020C 0016D14C 38 61 01 40 */ addi r3, r1, 0x140 /* 80170210 0016D150 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 80170214 0016D154 48 01 28 79 */ bl cSAngle_NS___gt @@ -2018,7 +2018,7 @@ lbl_80170344: /* 80170354 0016D294 40 82 00 94 */ bne lbl_801703E8 /* 80170358 0016D298 38 61 01 3C */ addi r3, r1, 0x13c /* 8017035C 0016D29C C0 22 9D CC */ lfs f1, lbl_804537CC-_SDA2_BASE_(r2) -/* 80170360 0016D2A0 48 10 0C 69 */ bl cSAngle_X3_ +/* 80170360 0016D2A0 48 10 0C 69 */ bl __ct__7cSAngleFf /* 80170364 0016D2A4 38 61 01 38 */ addi r3, r1, 0x138 /* 80170368 0016D2A8 7F E4 FB 78 */ mr r4, r31 /* 8017036C 0016D2AC 7F A5 EB 78 */ mr r5, r29 @@ -2026,7 +2026,7 @@ lbl_80170344: /* 80170374 0016D2B4 38 61 01 34 */ addi r3, r1, 0x134 /* 80170378 0016D2B8 38 81 01 3C */ addi r4, r1, 0x13c /* 8017037C 0016D2BC 38 A1 01 38 */ addi r5, r1, 0x138 -/* 80170380 0016D2C0 48 10 0D F5 */ bl cSAngle_NS___pl +/* 80170380 0016D2C0 48 10 0D F5 */ bl __pl__7cSAngleCFRC7cSAngle /* 80170384 0016D2C4 38 7F 04 10 */ addi r3, r31, 0x410 /* 80170388 0016D2C8 38 81 01 34 */ addi r4, r1, 0x134 /* 8017038C 0016D2CC 4B F1 E5 09 */ bl cSGlobe_NS_U @@ -2041,7 +2041,7 @@ lbl_80170344: /* 801703B0 0016D2F0 4B EC 01 61 */ bl cSAngle_NS_dtor /* 801703B4 0016D2F4 38 61 01 30 */ addi r3, r1, 0x130 /* 801703B8 0016D2F8 C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) -/* 801703BC 0016D2FC 48 10 0C 0D */ bl cSAngle_X3_ +/* 801703BC 0016D2FC 48 10 0C 0D */ bl __ct__7cSAngleFf /* 801703C0 0016D300 38 7F 04 10 */ addi r3, r31, 0x410 /* 801703C4 0016D304 38 81 01 30 */ addi r4, r1, 0x130 /* 801703C8 0016D308 4B F1 F6 91 */ bl cSGlobe_NS_V @@ -2055,7 +2055,7 @@ lbl_80170344: lbl_801703E8: /* 801703E8 0016D328 38 61 01 2C */ addi r3, r1, 0x12c /* 801703EC 0016D32C C0 22 9D 18 */ lfs f1, lbl_80453718-_SDA2_BASE_(r2) -/* 801703F0 0016D330 48 10 0B D9 */ bl cSAngle_X3_ +/* 801703F0 0016D330 48 10 0B D9 */ bl __ct__7cSAngleFf /* 801703F4 0016D334 38 61 01 28 */ addi r3, r1, 0x128 /* 801703F8 0016D338 7F E4 FB 78 */ mr r4, r31 /* 801703FC 0016D33C 7F A5 EB 78 */ mr r5, r29 @@ -2063,7 +2063,7 @@ lbl_801703E8: /* 80170404 0016D344 38 61 01 24 */ addi r3, r1, 0x124 /* 80170408 0016D348 38 81 01 2C */ addi r4, r1, 0x12c /* 8017040C 0016D34C 38 A1 01 28 */ addi r5, r1, 0x128 -/* 80170410 0016D350 48 10 0D 65 */ bl cSAngle_NS___pl +/* 80170410 0016D350 48 10 0D 65 */ bl __pl__7cSAngleCFRC7cSAngle /* 80170414 0016D354 38 7F 04 10 */ addi r3, r31, 0x410 /* 80170418 0016D358 38 81 01 24 */ addi r4, r1, 0x124 /* 8017041C 0016D35C 4B F1 E4 79 */ bl cSGlobe_NS_U @@ -2078,7 +2078,7 @@ lbl_801703E8: /* 80170440 0016D380 4B EC 00 D1 */ bl cSAngle_NS_dtor /* 80170444 0016D384 38 61 01 20 */ addi r3, r1, 0x120 /* 80170448 0016D388 C0 22 9E 00 */ lfs f1, lbl_80453800-_SDA2_BASE_(r2) -/* 8017044C 0016D38C 48 10 0B 7D */ bl cSAngle_X3_ +/* 8017044C 0016D38C 48 10 0B 7D */ bl __ct__7cSAngleFf /* 80170450 0016D390 38 7F 04 10 */ addi r3, r31, 0x410 /* 80170454 0016D394 38 81 01 20 */ addi r4, r1, 0x120 /* 80170458 0016D398 4B F1 F6 01 */ bl cSGlobe_NS_V @@ -2091,11 +2091,11 @@ lbl_801703E8: lbl_80170474: /* 80170474 0016D3B4 38 61 0F 2C */ addi r3, r1, 0xf2c /* 80170478 0016D3B8 38 9F 04 10 */ addi r4, r31, 0x410 -/* 8017047C 0016D3BC 48 10 16 39 */ bl cSGlobe_NS_Xyz +/* 8017047C 0016D3BC 48 10 16 39 */ bl Xyz__7cSGlobeCFv /* 80170480 0016D3C0 38 61 0F 20 */ addi r3, r1, 0xf20 /* 80170484 0016D3C4 38 9F 03 EC */ addi r4, r31, 0x3ec /* 80170488 0016D3C8 38 A1 0F 2C */ addi r5, r1, 0xf2c -/* 8017048C 0016D3CC 48 0F 66 59 */ bl cXyz_NS___pl +/* 8017048C 0016D3CC 48 0F 66 59 */ bl __pl__4cXyzCFRC3Vec /* 80170490 0016D3D0 38 7F 03 F8 */ addi r3, r31, 0x3f8 /* 80170494 0016D3D4 38 81 0F 20 */ addi r4, r1, 0xf20 /* 80170498 0016D3D8 4B F2 73 41 */ bl cXyz_NS___as @@ -2352,10 +2352,10 @@ lbl_80170820: /* 80170860 0016D7A0 38 61 0E 78 */ addi r3, r1, 0xe78 /* 80170864 0016D7A4 38 81 13 7C */ addi r4, r1, 0x137c /* 80170868 0016D7A8 38 A1 13 70 */ addi r5, r1, 0x1370 -/* 8017086C 0016D7AC 48 0F 62 C9 */ bl cXyz_NS___mi +/* 8017086C 0016D7AC 48 0F 62 C9 */ bl __mi__4cXyzCFRC3Vec /* 80170870 0016D7B0 38 7F 00 5C */ addi r3, r31, 0x5c /* 80170874 0016D7B4 38 81 0E 78 */ addi r4, r1, 0xe78 -/* 80170878 0016D7B8 48 10 11 F9 */ bl cSGlobe_NS_Val_X3_ +/* 80170878 0016D7B8 48 10 11 F9 */ bl Val__7cSGlobeFRC4cXyz /* 8017087C 0016D7BC 38 61 0E 78 */ addi r3, r1, 0xe78 /* 80170880 0016D7C0 38 80 FF FF */ li r4, -1 /* 80170884 0016D7C4 4B E9 89 01 */ bl cXyz_NS_dtor @@ -2396,11 +2396,11 @@ lbl_801708FC: /* 80170908 0016D848 D0 1F 00 68 */ stfs f0, 0x68(r31) /* 8017090C 0016D84C 38 61 0E 6C */ addi r3, r1, 0xe6c /* 80170910 0016D850 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80170914 0016D854 48 10 11 A1 */ bl cSGlobe_NS_Xyz +/* 80170914 0016D854 48 10 11 A1 */ bl Xyz__7cSGlobeCFv /* 80170918 0016D858 38 61 0E 60 */ addi r3, r1, 0xe60 /* 8017091C 0016D85C 38 9F 00 64 */ addi r4, r31, 0x64 /* 80170920 0016D860 38 A1 0E 6C */ addi r5, r1, 0xe6c -/* 80170924 0016D864 48 0F 61 C1 */ bl cXyz_NS___pl +/* 80170924 0016D864 48 0F 61 C1 */ bl __pl__4cXyzCFRC3Vec /* 80170928 0016D868 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017092C 0016D86C 38 81 0E 60 */ addi r4, r1, 0xe60 /* 80170930 0016D870 4B F2 6E A9 */ bl cXyz_NS___as @@ -2562,10 +2562,10 @@ lbl_80170B54: /* 80170B88 0016DAC8 38 61 0D DC */ addi r3, r1, 0xddc /* 80170B8C 0016DACC 38 81 13 64 */ addi r4, r1, 0x1364 /* 80170B90 0016DAD0 38 A1 13 58 */ addi r5, r1, 0x1358 -/* 80170B94 0016DAD4 48 0F 5F A1 */ bl cXyz_NS___mi +/* 80170B94 0016DAD4 48 0F 5F A1 */ bl __mi__4cXyzCFRC3Vec /* 80170B98 0016DAD8 38 7F 00 5C */ addi r3, r31, 0x5c /* 80170B9C 0016DADC 38 81 0D DC */ addi r4, r1, 0xddc -/* 80170BA0 0016DAE0 48 10 0E D1 */ bl cSGlobe_NS_Val_X3_ +/* 80170BA0 0016DAE0 48 10 0E D1 */ bl Val__7cSGlobeFRC4cXyz /* 80170BA4 0016DAE4 38 61 0D DC */ addi r3, r1, 0xddc /* 80170BA8 0016DAE8 38 80 FF FF */ li r4, -1 /* 80170BAC 0016DAEC 4B E9 85 D9 */ bl cXyz_NS_dtor @@ -2587,7 +2587,7 @@ lbl_80170BE0: /* 80170BE8 0016DB28 48 01 1E 65 */ bl cSGlobe_NS_R /* 80170BEC 0016DB2C 38 61 01 10 */ addi r3, r1, 0x110 /* 80170BF0 0016DB30 C0 22 9E 30 */ lfs f1, lbl_80453830-_SDA2_BASE_(r2) -/* 80170BF4 0016DB34 48 10 03 D5 */ bl cSAngle_X3_ +/* 80170BF4 0016DB34 48 10 03 D5 */ bl __ct__7cSAngleFf /* 80170BF8 0016DB38 38 7F 00 5C */ addi r3, r31, 0x5c /* 80170BFC 0016DB3C 38 81 01 10 */ addi r4, r1, 0x110 /* 80170C00 0016DB40 4B F1 EE 59 */ bl cSGlobe_NS_V @@ -2608,11 +2608,11 @@ lbl_80170BE0: /* 80170C3C 0016DB7C D0 1F 00 68 */ stfs f0, 0x68(r31) /* 80170C40 0016DB80 38 61 0D D0 */ addi r3, r1, 0xdd0 /* 80170C44 0016DB84 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80170C48 0016DB88 48 10 0E 6D */ bl cSGlobe_NS_Xyz +/* 80170C48 0016DB88 48 10 0E 6D */ bl Xyz__7cSGlobeCFv /* 80170C4C 0016DB8C 38 61 0D C4 */ addi r3, r1, 0xdc4 /* 80170C50 0016DB90 38 9F 00 64 */ addi r4, r31, 0x64 /* 80170C54 0016DB94 38 A1 0D D0 */ addi r5, r1, 0xdd0 -/* 80170C58 0016DB98 48 0F 5E 8D */ bl cXyz_NS___pl +/* 80170C58 0016DB98 48 0F 5E 8D */ bl __pl__4cXyzCFRC3Vec /* 80170C5C 0016DB9C 38 7F 00 70 */ addi r3, r31, 0x70 /* 80170C60 0016DBA0 38 81 0D C4 */ addi r4, r1, 0xdc4 /* 80170C64 0016DBA4 4B F2 6B 75 */ bl cXyz_NS___as @@ -2774,10 +2774,10 @@ lbl_80170E80: /* 80170EC0 0016DE00 38 61 0D 40 */ addi r3, r1, 0xd40 /* 80170EC4 0016DE04 38 81 13 4C */ addi r4, r1, 0x134c /* 80170EC8 0016DE08 38 A1 13 40 */ addi r5, r1, 0x1340 -/* 80170ECC 0016DE0C 48 0F 5C 69 */ bl cXyz_NS___mi +/* 80170ECC 0016DE0C 48 0F 5C 69 */ bl __mi__4cXyzCFRC3Vec /* 80170ED0 0016DE10 38 7F 00 5C */ addi r3, r31, 0x5c /* 80170ED4 0016DE14 38 81 0D 40 */ addi r4, r1, 0xd40 -/* 80170ED8 0016DE18 48 10 0B 99 */ bl cSGlobe_NS_Val_X3_ +/* 80170ED8 0016DE18 48 10 0B 99 */ bl Val__7cSGlobeFRC4cXyz /* 80170EDC 0016DE1C 38 61 0D 40 */ addi r3, r1, 0xd40 /* 80170EE0 0016DE20 38 80 FF FF */ li r4, -1 /* 80170EE4 0016DE24 4B E9 82 A1 */ bl cXyz_NS_dtor @@ -2818,11 +2818,11 @@ lbl_80170F5C: /* 80170F68 0016DEA8 D0 1F 00 68 */ stfs f0, 0x68(r31) /* 80170F6C 0016DEAC 38 61 0D 34 */ addi r3, r1, 0xd34 /* 80170F70 0016DEB0 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80170F74 0016DEB4 48 10 0B 41 */ bl cSGlobe_NS_Xyz +/* 80170F74 0016DEB4 48 10 0B 41 */ bl Xyz__7cSGlobeCFv /* 80170F78 0016DEB8 38 61 0D 28 */ addi r3, r1, 0xd28 /* 80170F7C 0016DEBC 38 9F 00 64 */ addi r4, r31, 0x64 /* 80170F80 0016DEC0 38 A1 0D 34 */ addi r5, r1, 0xd34 -/* 80170F84 0016DEC4 48 0F 5B 61 */ bl cXyz_NS___pl +/* 80170F84 0016DEC4 48 0F 5B 61 */ bl __pl__4cXyzCFRC3Vec /* 80170F88 0016DEC8 38 7F 00 70 */ addi r3, r31, 0x70 /* 80170F8C 0016DECC 38 81 0D 28 */ addi r4, r1, 0xd28 /* 80170F90 0016DED0 4B F2 68 49 */ bl cXyz_NS___as @@ -2977,10 +2977,10 @@ lbl_80171194: /* 801711D4 0016E114 38 61 0C A4 */ addi r3, r1, 0xca4 /* 801711D8 0016E118 38 81 13 34 */ addi r4, r1, 0x1334 /* 801711DC 0016E11C 38 A1 13 28 */ addi r5, r1, 0x1328 -/* 801711E0 0016E120 48 0F 59 55 */ bl cXyz_NS___mi +/* 801711E0 0016E120 48 0F 59 55 */ bl __mi__4cXyzCFRC3Vec /* 801711E4 0016E124 38 7F 00 5C */ addi r3, r31, 0x5c /* 801711E8 0016E128 38 81 0C A4 */ addi r4, r1, 0xca4 -/* 801711EC 0016E12C 48 10 08 85 */ bl cSGlobe_NS_Val_X3_ +/* 801711EC 0016E12C 48 10 08 85 */ bl Val__7cSGlobeFRC4cXyz /* 801711F0 0016E130 38 61 0C A4 */ addi r3, r1, 0xca4 /* 801711F4 0016E134 38 80 FF FF */ li r4, -1 /* 801711F8 0016E138 4B E9 7F 8D */ bl cXyz_NS_dtor @@ -3021,11 +3021,11 @@ lbl_80171270: /* 8017127C 0016E1BC D0 1F 00 68 */ stfs f0, 0x68(r31) /* 80171280 0016E1C0 38 61 0C 98 */ addi r3, r1, 0xc98 /* 80171284 0016E1C4 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80171288 0016E1C8 48 10 08 2D */ bl cSGlobe_NS_Xyz +/* 80171288 0016E1C8 48 10 08 2D */ bl Xyz__7cSGlobeCFv /* 8017128C 0016E1CC 38 61 0C 8C */ addi r3, r1, 0xc8c /* 80171290 0016E1D0 38 9F 00 64 */ addi r4, r31, 0x64 /* 80171294 0016E1D4 38 A1 0C 98 */ addi r5, r1, 0xc98 -/* 80171298 0016E1D8 48 0F 58 4D */ bl cXyz_NS___pl +/* 80171298 0016E1D8 48 0F 58 4D */ bl __pl__4cXyzCFRC3Vec /* 8017129C 0016E1DC 38 7F 00 70 */ addi r3, r31, 0x70 /* 801712A0 0016E1E0 38 81 0C 8C */ addi r4, r1, 0xc8c /* 801712A4 0016E1E4 4B F2 65 35 */ bl cXyz_NS___as @@ -3182,10 +3182,10 @@ lbl_801714B0: /* 801714F0 0016E430 38 61 0C 08 */ addi r3, r1, 0xc08 /* 801714F4 0016E434 38 81 13 1C */ addi r4, r1, 0x131c /* 801714F8 0016E438 38 A1 13 10 */ addi r5, r1, 0x1310 -/* 801714FC 0016E43C 48 0F 56 39 */ bl cXyz_NS___mi +/* 801714FC 0016E43C 48 0F 56 39 */ bl __mi__4cXyzCFRC3Vec /* 80171500 0016E440 38 7F 04 90 */ addi r3, r31, 0x490 /* 80171504 0016E444 38 81 0C 08 */ addi r4, r1, 0xc08 -/* 80171508 0016E448 48 10 05 69 */ bl cSGlobe_NS_Val_X3_ +/* 80171508 0016E448 48 10 05 69 */ bl Val__7cSGlobeFRC4cXyz /* 8017150C 0016E44C 38 61 0C 08 */ addi r3, r1, 0xc08 /* 80171510 0016E450 38 80 FF FF */ li r4, -1 /* 80171514 0016E454 4B E9 7C 71 */ bl cXyz_NS_dtor @@ -3226,11 +3226,11 @@ lbl_8017158C: /* 80171598 0016E4D8 D0 1F 04 7C */ stfs f0, 0x47c(r31) /* 8017159C 0016E4DC 38 61 0B FC */ addi r3, r1, 0xbfc /* 801715A0 0016E4E0 38 9F 04 90 */ addi r4, r31, 0x490 -/* 801715A4 0016E4E4 48 10 05 11 */ bl cSGlobe_NS_Xyz +/* 801715A4 0016E4E4 48 10 05 11 */ bl Xyz__7cSGlobeCFv /* 801715A8 0016E4E8 38 61 0B F0 */ addi r3, r1, 0xbf0 /* 801715AC 0016E4EC 38 9F 04 78 */ addi r4, r31, 0x478 /* 801715B0 0016E4F0 38 A1 0B FC */ addi r5, r1, 0xbfc -/* 801715B4 0016E4F4 48 0F 55 31 */ bl cXyz_NS___pl +/* 801715B4 0016E4F4 48 0F 55 31 */ bl __pl__4cXyzCFRC3Vec /* 801715B8 0016E4F8 38 7F 04 84 */ addi r3, r31, 0x484 /* 801715BC 0016E4FC 38 81 0B F0 */ addi r4, r1, 0xbf0 /* 801715C0 0016E500 4B F2 62 19 */ bl cXyz_NS___as @@ -3328,7 +3328,7 @@ lbl_801716B8: /* 80171724 0016E664 4B E9 7A 61 */ bl cXyz_NS_dtor /* 80171728 0016E668 38 61 02 B8 */ addi r3, r1, 0x2b8 /* 8017172C 0016E66C 38 9F 04 18 */ addi r4, r31, 0x418 -/* 80171730 0016E670 48 10 00 C1 */ bl cSGlobe_X1_ +/* 80171730 0016E670 48 10 00 C1 */ bl __ct__7cSGlobeFRC7cSGlobe /* 80171734 0016E674 38 61 0B A8 */ addi r3, r1, 0xba8 /* 80171738 0016E678 7F E4 FB 78 */ mr r4, r31 /* 8017173C 0016E67C 7F A5 EB 78 */ mr r5, r29 @@ -3448,10 +3448,10 @@ lbl_801718BC: /* 801718F0 0016E830 38 61 0B 48 */ addi r3, r1, 0xb48 /* 801718F4 0016E834 38 81 13 AC */ addi r4, r1, 0x13ac /* 801718F8 0016E838 38 A1 13 A0 */ addi r5, r1, 0x13a0 -/* 801718FC 0016E83C 48 0F 52 39 */ bl cXyz_NS___mi +/* 801718FC 0016E83C 48 0F 52 39 */ bl __mi__4cXyzCFRC3Vec /* 80171900 0016E840 38 7F 00 5C */ addi r3, r31, 0x5c /* 80171904 0016E844 38 81 0B 48 */ addi r4, r1, 0xb48 -/* 80171908 0016E848 48 10 01 69 */ bl cSGlobe_NS_Val_X3_ +/* 80171908 0016E848 48 10 01 69 */ bl Val__7cSGlobeFRC4cXyz /* 8017190C 0016E84C 38 61 0B 48 */ addi r3, r1, 0xb48 /* 80171910 0016E850 38 80 FF FF */ li r4, -1 /* 80171914 0016E854 4B E9 78 71 */ bl cXyz_NS_dtor @@ -3466,11 +3466,11 @@ lbl_801718BC: lbl_80171938: /* 80171938 0016E878 38 61 0B 3C */ addi r3, r1, 0xb3c /* 8017193C 0016E87C 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80171940 0016E880 48 10 01 75 */ bl cSGlobe_NS_Xyz +/* 80171940 0016E880 48 10 01 75 */ bl Xyz__7cSGlobeCFv /* 80171944 0016E884 38 61 0B 30 */ addi r3, r1, 0xb30 /* 80171948 0016E888 38 9F 00 64 */ addi r4, r31, 0x64 /* 8017194C 0016E88C 38 A1 0B 3C */ addi r5, r1, 0xb3c -/* 80171950 0016E890 48 0F 51 95 */ bl cXyz_NS___pl +/* 80171950 0016E890 48 0F 51 95 */ bl __pl__4cXyzCFRC3Vec /* 80171954 0016E894 38 7F 00 70 */ addi r3, r31, 0x70 /* 80171958 0016E898 38 81 0B 30 */ addi r4, r1, 0xb30 /* 8017195C 0016E89C 4B F2 5E 7D */ bl cXyz_NS___as @@ -3644,10 +3644,10 @@ lbl_80171BB4: /* 80171BEC 0016EB2C 38 61 0A 94 */ addi r3, r1, 0xa94 /* 80171BF0 0016EB30 38 81 13 AC */ addi r4, r1, 0x13ac /* 80171BF4 0016EB34 38 A1 0A A0 */ addi r5, r1, 0xaa0 -/* 80171BF8 0016EB38 48 0F 4F 3D */ bl cXyz_NS___mi +/* 80171BF8 0016EB38 48 0F 4F 3D */ bl __mi__4cXyzCFRC3Vec /* 80171BFC 0016EB3C 38 61 02 B0 */ addi r3, r1, 0x2b0 /* 80171C00 0016EB40 38 81 0A 94 */ addi r4, r1, 0xa94 -/* 80171C04 0016EB44 48 0F FC 7D */ bl cSGlobe_X4_ +/* 80171C04 0016EB44 48 0F FC 7D */ bl __ct__7cSGlobeFRC4cXyz /* 80171C08 0016EB48 38 61 0A 94 */ addi r3, r1, 0xa94 /* 80171C0C 0016EB4C 38 80 FF FF */ li r4, -1 /* 80171C10 0016EB50 4B E9 75 75 */ bl cXyz_NS_dtor @@ -3656,7 +3656,7 @@ lbl_80171BB4: /* 80171C1C 0016EB5C 4B E9 75 69 */ bl cXyz_NS_dtor /* 80171C20 0016EB60 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 80171C24 0016EB64 38 81 12 EC */ addi r4, r1, 0x12ec -/* 80171C28 0016EB68 48 0F FC 59 */ bl cSGlobe_X4_ +/* 80171C28 0016EB68 48 0F FC 59 */ bl __ct__7cSGlobeFRC4cXyz /* 80171C2C 0016EB6C 38 61 02 B0 */ addi r3, r1, 0x2b0 /* 80171C30 0016EB70 48 01 10 55 */ bl cSGlobe_NS_U_X1_ /* 80171C34 0016EB74 7C 76 1B 78 */ mr r22, r3 @@ -3665,7 +3665,7 @@ lbl_80171BB4: /* 80171C40 0016EB80 7C 64 1B 78 */ mr r4, r3 /* 80171C44 0016EB84 38 61 01 00 */ addi r3, r1, 0x100 /* 80171C48 0016EB88 7E C5 B3 78 */ mr r5, r22 -/* 80171C4C 0016EB8C 48 0F F5 29 */ bl cSAngle_NS___pl +/* 80171C4C 0016EB8C 48 0F F5 29 */ bl __pl__7cSAngleCFRC7cSAngle /* 80171C50 0016EB90 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 80171C54 0016EB94 38 81 01 00 */ addi r4, r1, 0x100 /* 80171C58 0016EB98 4B F1 CC 3D */ bl cSGlobe_NS_U @@ -3674,11 +3674,11 @@ lbl_80171BB4: /* 80171C64 0016EBA4 4B EB E8 AD */ bl cSAngle_NS_dtor /* 80171C68 0016EBA8 38 61 0A 88 */ addi r3, r1, 0xa88 /* 80171C6C 0016EBAC 38 81 02 A8 */ addi r4, r1, 0x2a8 -/* 80171C70 0016EBB0 48 0F FE 45 */ bl cSGlobe_NS_Xyz +/* 80171C70 0016EBB0 48 0F FE 45 */ bl Xyz__7cSGlobeCFv /* 80171C74 0016EBB4 38 61 0A 7C */ addi r3, r1, 0xa7c /* 80171C78 0016EBB8 38 81 13 88 */ addi r4, r1, 0x1388 /* 80171C7C 0016EBBC 38 A1 0A 88 */ addi r5, r1, 0xa88 -/* 80171C80 0016EBC0 48 0F 4E 65 */ bl cXyz_NS___pl +/* 80171C80 0016EBC0 48 0F 4E 65 */ bl __pl__4cXyzCFRC3Vec /* 80171C84 0016EBC4 38 7F 04 04 */ addi r3, r31, 0x404 /* 80171C88 0016EBC8 38 81 0A 7C */ addi r4, r1, 0xa7c /* 80171C8C 0016EBCC 4B F2 5B 4D */ bl cXyz_NS___as @@ -3702,7 +3702,7 @@ lbl_80171BB4: lbl_80171CD4: /* 80171CD4 0016EC14 C0 22 9D 74 */ lfs f1, lbl_80453774-_SDA2_BASE_(r2) lbl_80171CD8: -/* 80171CD8 0016EC18 48 0F F2 F1 */ bl cSAngle_X3_ +/* 80171CD8 0016EC18 48 0F F2 F1 */ bl __ct__7cSAngleFf /* 80171CDC 0016EC1C 38 7F 04 78 */ addi r3, r31, 0x478 /* 80171CE0 0016EC20 38 9F 04 04 */ addi r4, r31, 0x404 /* 80171CE4 0016EC24 4B F2 5A F5 */ bl cXyz_NS___as @@ -3713,12 +3713,12 @@ lbl_80171CD8: /* 80171CF8 0016EC38 38 61 00 F8 */ addi r3, r1, 0xf8 /* 80171CFC 0016EC3C 38 81 02 14 */ addi r4, r1, 0x214 /* 80171D00 0016EC40 38 A1 00 FC */ addi r5, r1, 0xfc -/* 80171D04 0016EC44 48 0F F4 71 */ bl cSAngle_NS___pl +/* 80171D04 0016EC44 48 0F F4 71 */ bl __pl__7cSAngleCFRC7cSAngle /* 80171D08 0016EC48 38 7F 04 90 */ addi r3, r31, 0x490 /* 80171D0C 0016EC4C C0 22 9E 58 */ lfs f1, lbl_80453858-_SDA2_BASE_(r2) /* 80171D10 0016EC50 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 80171D14 0016EC54 38 A1 00 F8 */ addi r5, r1, 0xf8 -/* 80171D18 0016EC58 48 0F FC F1 */ bl cSGlobe_NS_Val_X2_ +/* 80171D18 0016EC58 48 0F FC F1 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80171D1C 0016EC5C 38 61 00 F8 */ addi r3, r1, 0xf8 /* 80171D20 0016EC60 38 80 FF FF */ li r4, -1 /* 80171D24 0016EC64 4B EB E7 ED */ bl cSAngle_NS_dtor @@ -3740,11 +3740,11 @@ lbl_80171CD8: lbl_80171D64: /* 80171D64 0016ECA4 38 61 0A 70 */ addi r3, r1, 0xa70 /* 80171D68 0016ECA8 38 9F 04 90 */ addi r4, r31, 0x490 -/* 80171D6C 0016ECAC 48 0F FD 49 */ bl cSGlobe_NS_Xyz +/* 80171D6C 0016ECAC 48 0F FD 49 */ bl Xyz__7cSGlobeCFv /* 80171D70 0016ECB0 38 61 0A 64 */ addi r3, r1, 0xa64 /* 80171D74 0016ECB4 38 9F 04 78 */ addi r4, r31, 0x478 /* 80171D78 0016ECB8 38 A1 0A 70 */ addi r5, r1, 0xa70 -/* 80171D7C 0016ECBC 48 0F 4D 69 */ bl cXyz_NS___pl +/* 80171D7C 0016ECBC 48 0F 4D 69 */ bl __pl__4cXyzCFRC3Vec /* 80171D80 0016ECC0 38 7F 04 84 */ addi r3, r31, 0x484 /* 80171D84 0016ECC4 38 81 0A 64 */ addi r4, r1, 0xa64 /* 80171D88 0016ECC8 4B F2 5A 51 */ bl cXyz_NS___as @@ -3956,10 +3956,10 @@ lbl_8017206C: /* 801720A4 0016EFE4 38 61 09 B0 */ addi r3, r1, 0x9b0 /* 801720A8 0016EFE8 38 81 13 AC */ addi r4, r1, 0x13ac /* 801720AC 0016EFEC 38 A1 09 BC */ addi r5, r1, 0x9bc -/* 801720B0 0016EFF0 48 0F 4A 85 */ bl cXyz_NS___mi +/* 801720B0 0016EFF0 48 0F 4A 85 */ bl __mi__4cXyzCFRC3Vec /* 801720B4 0016EFF4 38 61 02 A0 */ addi r3, r1, 0x2a0 /* 801720B8 0016EFF8 38 81 09 B0 */ addi r4, r1, 0x9b0 -/* 801720BC 0016EFFC 48 0F F7 C5 */ bl cSGlobe_X4_ +/* 801720BC 0016EFFC 48 0F F7 C5 */ bl __ct__7cSGlobeFRC4cXyz /* 801720C0 0016F000 38 61 09 B0 */ addi r3, r1, 0x9b0 /* 801720C4 0016F004 38 80 FF FF */ li r4, -1 /* 801720C8 0016F008 4B E9 70 BD */ bl cXyz_NS_dtor @@ -3968,7 +3968,7 @@ lbl_8017206C: /* 801720D4 0016F014 4B E9 70 B1 */ bl cXyz_NS_dtor /* 801720D8 0016F018 38 61 02 98 */ addi r3, r1, 0x298 /* 801720DC 0016F01C 38 81 12 D4 */ addi r4, r1, 0x12d4 -/* 801720E0 0016F020 48 0F F7 A1 */ bl cSGlobe_X4_ +/* 801720E0 0016F020 48 0F F7 A1 */ bl __ct__7cSGlobeFRC4cXyz /* 801720E4 0016F024 38 61 02 A0 */ addi r3, r1, 0x2a0 /* 801720E8 0016F028 48 01 0B 9D */ bl cSGlobe_NS_U_X1_ /* 801720EC 0016F02C 7C 76 1B 78 */ mr r22, r3 @@ -3977,7 +3977,7 @@ lbl_8017206C: /* 801720F8 0016F038 7C 64 1B 78 */ mr r4, r3 /* 801720FC 0016F03C 38 61 00 F4 */ addi r3, r1, 0xf4 /* 80172100 0016F040 7E C5 B3 78 */ mr r5, r22 -/* 80172104 0016F044 48 0F F0 71 */ bl cSAngle_NS___pl +/* 80172104 0016F044 48 0F F0 71 */ bl __pl__7cSAngleCFRC7cSAngle /* 80172108 0016F048 38 61 02 98 */ addi r3, r1, 0x298 /* 8017210C 0016F04C 38 81 00 F4 */ addi r4, r1, 0xf4 /* 80172110 0016F050 4B F1 C7 85 */ bl cSGlobe_NS_U @@ -3986,11 +3986,11 @@ lbl_8017206C: /* 8017211C 0016F05C 4B EB E3 F5 */ bl cSAngle_NS_dtor /* 80172120 0016F060 38 61 09 A4 */ addi r3, r1, 0x9a4 /* 80172124 0016F064 38 81 02 98 */ addi r4, r1, 0x298 -/* 80172128 0016F068 48 0F F9 8D */ bl cSGlobe_NS_Xyz +/* 80172128 0016F068 48 0F F9 8D */ bl Xyz__7cSGlobeCFv /* 8017212C 0016F06C 38 61 09 98 */ addi r3, r1, 0x998 /* 80172130 0016F070 38 81 13 A0 */ addi r4, r1, 0x13a0 /* 80172134 0016F074 38 A1 09 A4 */ addi r5, r1, 0x9a4 -/* 80172138 0016F078 48 0F 49 AD */ bl cXyz_NS___pl +/* 80172138 0016F078 48 0F 49 AD */ bl __pl__4cXyzCFRC3Vec /* 8017213C 0016F07C 38 7F 04 04 */ addi r3, r31, 0x404 /* 80172140 0016F080 38 81 09 98 */ addi r4, r1, 0x998 /* 80172144 0016F084 4B F2 56 95 */ bl cXyz_NS___as @@ -4008,13 +4008,13 @@ lbl_8017206C: lbl_80172174: /* 80172174 0016F0B4 C0 22 9D A8 */ lfs f1, lbl_804537A8-_SDA2_BASE_(r2) lbl_80172178: -/* 80172178 0016F0B8 48 0F EE 51 */ bl cSAngle_X3_ +/* 80172178 0016F0B8 48 0F EE 51 */ bl __ct__7cSAngleFf /* 8017217C 0016F0BC 38 7F 04 78 */ addi r3, r31, 0x478 /* 80172180 0016F0C0 38 9F 04 04 */ addi r4, r31, 0x404 /* 80172184 0016F0C4 4B F2 56 55 */ bl cXyz_NS___as /* 80172188 0016F0C8 38 61 00 F0 */ addi r3, r1, 0xf0 /* 8017218C 0016F0CC C0 22 9E 00 */ lfs f1, lbl_80453800-_SDA2_BASE_(r2) -/* 80172190 0016F0D0 48 0F EE 39 */ bl cSAngle_X3_ +/* 80172190 0016F0D0 48 0F EE 39 */ bl __ct__7cSAngleFf /* 80172194 0016F0D4 38 61 00 EC */ addi r3, r1, 0xec /* 80172198 0016F0D8 7F E4 FB 78 */ mr r4, r31 /* 8017219C 0016F0DC 7F 25 CB 78 */ mr r5, r25 @@ -4022,12 +4022,12 @@ lbl_80172178: /* 801721A4 0016F0E4 38 61 00 E8 */ addi r3, r1, 0xe8 /* 801721A8 0016F0E8 38 81 02 10 */ addi r4, r1, 0x210 /* 801721AC 0016F0EC 38 A1 00 EC */ addi r5, r1, 0xec -/* 801721B0 0016F0F0 48 0F EF C5 */ bl cSAngle_NS___pl +/* 801721B0 0016F0F0 48 0F EF C5 */ bl __pl__7cSAngleCFRC7cSAngle /* 801721B4 0016F0F4 38 7F 04 90 */ addi r3, r31, 0x490 /* 801721B8 0016F0F8 C0 22 9E 58 */ lfs f1, lbl_80453858-_SDA2_BASE_(r2) /* 801721BC 0016F0FC 38 81 00 F0 */ addi r4, r1, 0xf0 /* 801721C0 0016F100 38 A1 00 E8 */ addi r5, r1, 0xe8 -/* 801721C4 0016F104 48 0F F8 45 */ bl cSGlobe_NS_Val_X2_ +/* 801721C4 0016F104 48 0F F8 45 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 801721C8 0016F108 38 61 00 E8 */ addi r3, r1, 0xe8 /* 801721CC 0016F10C 38 80 FF FF */ li r4, -1 /* 801721D0 0016F110 4B EB E3 41 */ bl cSAngle_NS_dtor @@ -4052,11 +4052,11 @@ lbl_80172178: lbl_8017221C: /* 8017221C 0016F15C 38 61 09 8C */ addi r3, r1, 0x98c /* 80172220 0016F160 38 9F 04 90 */ addi r4, r31, 0x490 -/* 80172224 0016F164 48 0F F8 91 */ bl cSGlobe_NS_Xyz +/* 80172224 0016F164 48 0F F8 91 */ bl Xyz__7cSGlobeCFv /* 80172228 0016F168 38 61 09 80 */ addi r3, r1, 0x980 /* 8017222C 0016F16C 38 9F 04 78 */ addi r4, r31, 0x478 /* 80172230 0016F170 38 A1 09 8C */ addi r5, r1, 0x98c -/* 80172234 0016F174 48 0F 48 B1 */ bl cXyz_NS___pl +/* 80172234 0016F174 48 0F 48 B1 */ bl __pl__4cXyzCFRC3Vec /* 80172238 0016F178 38 7F 04 84 */ addi r3, r31, 0x484 /* 8017223C 0016F17C 38 81 09 80 */ addi r4, r1, 0x980 /* 80172240 0016F180 4B F2 55 99 */ bl cXyz_NS___as @@ -4281,10 +4281,10 @@ lbl_8017256C: /* 8017258C 0016F4CC 38 61 08 C0 */ addi r3, r1, 0x8c0 /* 80172590 0016F4D0 38 81 08 D8 */ addi r4, r1, 0x8d8 /* 80172594 0016F4D4 38 A1 08 CC */ addi r5, r1, 0x8cc -/* 80172598 0016F4D8 48 0F 45 9D */ bl cXyz_NS___mi +/* 80172598 0016F4D8 48 0F 45 9D */ bl __mi__4cXyzCFRC3Vec /* 8017259C 0016F4DC 38 61 02 90 */ addi r3, r1, 0x290 /* 801725A0 0016F4E0 38 81 08 C0 */ addi r4, r1, 0x8c0 -/* 801725A4 0016F4E4 48 0F F2 DD */ bl cSGlobe_X4_ +/* 801725A4 0016F4E4 48 0F F2 DD */ bl __ct__7cSGlobeFRC4cXyz /* 801725A8 0016F4E8 38 61 08 C0 */ addi r3, r1, 0x8c0 /* 801725AC 0016F4EC 38 80 FF FF */ li r4, -1 /* 801725B0 0016F4F0 4B E9 6B D5 */ bl cXyz_NS_dtor @@ -4296,7 +4296,7 @@ lbl_8017256C: /* 801725C8 0016F508 4B E9 6B BD */ bl cXyz_NS_dtor /* 801725CC 0016F50C 38 61 02 88 */ addi r3, r1, 0x288 /* 801725D0 0016F510 38 81 12 BC */ addi r4, r1, 0x12bc -/* 801725D4 0016F514 48 0F F2 AD */ bl cSGlobe_X4_ +/* 801725D4 0016F514 48 0F F2 AD */ bl __ct__7cSGlobeFRC4cXyz /* 801725D8 0016F518 38 61 02 90 */ addi r3, r1, 0x290 /* 801725DC 0016F51C 48 01 06 A9 */ bl cSGlobe_NS_U_X1_ /* 801725E0 0016F520 7C 77 1B 78 */ mr r23, r3 @@ -4305,7 +4305,7 @@ lbl_8017256C: /* 801725EC 0016F52C 7C 64 1B 78 */ mr r4, r3 /* 801725F0 0016F530 38 61 00 E4 */ addi r3, r1, 0xe4 /* 801725F4 0016F534 7E E5 BB 78 */ mr r5, r23 -/* 801725F8 0016F538 48 0F EB 7D */ bl cSAngle_NS___pl +/* 801725F8 0016F538 48 0F EB 7D */ bl __pl__7cSAngleCFRC7cSAngle /* 801725FC 0016F53C 38 61 02 88 */ addi r3, r1, 0x288 /* 80172600 0016F540 38 81 00 E4 */ addi r4, r1, 0xe4 /* 80172604 0016F544 4B F1 C2 91 */ bl cSGlobe_NS_U @@ -4314,11 +4314,11 @@ lbl_8017256C: /* 80172610 0016F550 4B EB DF 01 */ bl cSAngle_NS_dtor /* 80172614 0016F554 38 61 08 B4 */ addi r3, r1, 0x8b4 /* 80172618 0016F558 38 81 02 88 */ addi r4, r1, 0x288 -/* 8017261C 0016F55C 48 0F F4 99 */ bl cSGlobe_NS_Xyz +/* 8017261C 0016F55C 48 0F F4 99 */ bl Xyz__7cSGlobeCFv /* 80172620 0016F560 38 61 08 A8 */ addi r3, r1, 0x8a8 /* 80172624 0016F564 38 81 13 A0 */ addi r4, r1, 0x13a0 /* 80172628 0016F568 38 A1 08 B4 */ addi r5, r1, 0x8b4 -/* 8017262C 0016F56C 48 0F 44 B9 */ bl cXyz_NS___pl +/* 8017262C 0016F56C 48 0F 44 B9 */ bl __pl__4cXyzCFRC3Vec /* 80172630 0016F570 38 7F 04 04 */ addi r3, r31, 0x404 /* 80172634 0016F574 38 81 08 A8 */ addi r4, r1, 0x8a8 /* 80172638 0016F578 4B F2 51 A1 */ bl cXyz_NS___as @@ -4336,7 +4336,7 @@ lbl_8017256C: lbl_80172668: /* 80172668 0016F5A8 C0 22 9E 30 */ lfs f1, lbl_80453830-_SDA2_BASE_(r2) lbl_8017266C: -/* 8017266C 0016F5AC 48 0F E9 5D */ bl cSAngle_X3_ +/* 8017266C 0016F5AC 48 0F E9 5D */ bl __ct__7cSAngleFf /* 80172670 0016F5B0 38 61 02 08 */ addi r3, r1, 0x208 /* 80172674 0016F5B4 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80172678 0016F5B8 41 82 00 0C */ beq lbl_80172684 @@ -4345,13 +4345,13 @@ lbl_8017266C: lbl_80172684: /* 80172684 0016F5C4 C0 22 9E 60 */ lfs f1, lbl_80453860-_SDA2_BASE_(r2) lbl_80172688: -/* 80172688 0016F5C8 48 0F E9 41 */ bl cSAngle_X3_ +/* 80172688 0016F5C8 48 0F E9 41 */ bl __ct__7cSAngleFf /* 8017268C 0016F5CC 38 7F 04 78 */ addi r3, r31, 0x478 /* 80172690 0016F5D0 38 9F 04 04 */ addi r4, r31, 0x404 /* 80172694 0016F5D4 4B F2 51 45 */ bl cXyz_NS___as /* 80172698 0016F5D8 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8017269C 0016F5DC C0 22 9E 60 */ lfs f1, lbl_80453860-_SDA2_BASE_(r2) -/* 801726A0 0016F5E0 48 0F E9 29 */ bl cSAngle_X3_ +/* 801726A0 0016F5E0 48 0F E9 29 */ bl __ct__7cSAngleFf /* 801726A4 0016F5E4 38 61 00 DC */ addi r3, r1, 0xdc /* 801726A8 0016F5E8 7F E4 FB 78 */ mr r4, r31 /* 801726AC 0016F5EC 7F 25 CB 78 */ mr r5, r25 @@ -4359,12 +4359,12 @@ lbl_80172688: /* 801726B4 0016F5F4 38 61 00 D8 */ addi r3, r1, 0xd8 /* 801726B8 0016F5F8 38 81 02 0C */ addi r4, r1, 0x20c /* 801726BC 0016F5FC 38 A1 00 DC */ addi r5, r1, 0xdc -/* 801726C0 0016F600 48 0F EA B5 */ bl cSAngle_NS___pl +/* 801726C0 0016F600 48 0F EA B5 */ bl __pl__7cSAngleCFRC7cSAngle /* 801726C4 0016F604 38 7F 04 90 */ addi r3, r31, 0x490 /* 801726C8 0016F608 C0 22 9D 84 */ lfs f1, lbl_80453784-_SDA2_BASE_(r2) /* 801726CC 0016F60C 38 81 00 E0 */ addi r4, r1, 0xe0 /* 801726D0 0016F610 38 A1 00 D8 */ addi r5, r1, 0xd8 -/* 801726D4 0016F614 48 0F F3 35 */ bl cSGlobe_NS_Val_X2_ +/* 801726D4 0016F614 48 0F F3 35 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 801726D8 0016F618 38 61 00 D8 */ addi r3, r1, 0xd8 /* 801726DC 0016F61C 38 80 FF FF */ li r4, -1 /* 801726E0 0016F620 4B EB DE 31 */ bl cSAngle_NS_dtor @@ -4392,11 +4392,11 @@ lbl_80172688: lbl_80172738: /* 80172738 0016F678 38 61 08 9C */ addi r3, r1, 0x89c /* 8017273C 0016F67C 38 9F 04 90 */ addi r4, r31, 0x490 -/* 80172740 0016F680 48 0F F3 75 */ bl cSGlobe_NS_Xyz +/* 80172740 0016F680 48 0F F3 75 */ bl Xyz__7cSGlobeCFv /* 80172744 0016F684 38 61 08 90 */ addi r3, r1, 0x890 /* 80172748 0016F688 38 9F 04 78 */ addi r4, r31, 0x478 /* 8017274C 0016F68C 38 A1 08 9C */ addi r5, r1, 0x89c -/* 80172750 0016F690 48 0F 43 95 */ bl cXyz_NS___pl +/* 80172750 0016F690 48 0F 43 95 */ bl __pl__4cXyzCFRC3Vec /* 80172754 0016F694 38 7F 04 84 */ addi r3, r31, 0x484 /* 80172758 0016F698 38 81 08 90 */ addi r4, r1, 0x890 /* 8017275C 0016F69C 4B F2 50 7D */ bl cXyz_NS___as @@ -4641,16 +4641,16 @@ lbl_80172AF8: /* 80172AF8 0016FA38 38 61 07 DC */ addi r3, r1, 0x7dc /* 80172AFC 0016FA3C 38 81 13 AC */ addi r4, r1, 0x13ac /* 80172B00 0016FA40 38 A1 13 A0 */ addi r5, r1, 0x13a0 -/* 80172B04 0016FA44 48 0F 40 31 */ bl cXyz_NS___mi +/* 80172B04 0016FA44 48 0F 40 31 */ bl __mi__4cXyzCFRC3Vec /* 80172B08 0016FA48 38 61 02 80 */ addi r3, r1, 0x280 /* 80172B0C 0016FA4C 38 81 07 DC */ addi r4, r1, 0x7dc -/* 80172B10 0016FA50 48 0F ED 71 */ bl cSGlobe_X4_ +/* 80172B10 0016FA50 48 0F ED 71 */ bl __ct__7cSGlobeFRC4cXyz /* 80172B14 0016FA54 38 61 07 DC */ addi r3, r1, 0x7dc /* 80172B18 0016FA58 38 80 FF FF */ li r4, -1 /* 80172B1C 0016FA5C 4B E9 66 69 */ bl cXyz_NS_dtor /* 80172B20 0016FA60 38 61 02 78 */ addi r3, r1, 0x278 /* 80172B24 0016FA64 38 81 12 A4 */ addi r4, r1, 0x12a4 -/* 80172B28 0016FA68 48 0F ED 59 */ bl cSGlobe_X4_ +/* 80172B28 0016FA68 48 0F ED 59 */ bl __ct__7cSGlobeFRC4cXyz /* 80172B2C 0016FA6C 38 61 02 80 */ addi r3, r1, 0x280 /* 80172B30 0016FA70 48 01 01 55 */ bl cSGlobe_NS_U_X1_ /* 80172B34 0016FA74 7C 77 1B 78 */ mr r23, r3 @@ -4659,7 +4659,7 @@ lbl_80172AF8: /* 80172B40 0016FA80 7C 64 1B 78 */ mr r4, r3 /* 80172B44 0016FA84 38 61 00 D4 */ addi r3, r1, 0xd4 /* 80172B48 0016FA88 7E E5 BB 78 */ mr r5, r23 -/* 80172B4C 0016FA8C 48 0F E6 29 */ bl cSAngle_NS___pl +/* 80172B4C 0016FA8C 48 0F E6 29 */ bl __pl__7cSAngleCFRC7cSAngle /* 80172B50 0016FA90 38 61 02 78 */ addi r3, r1, 0x278 /* 80172B54 0016FA94 38 81 00 D4 */ addi r4, r1, 0xd4 /* 80172B58 0016FA98 4B F1 BD 3D */ bl cSGlobe_NS_U @@ -4672,11 +4672,11 @@ lbl_80172AF8: /* 80172B74 0016FAB4 4B F2 4B A9 */ bl dCamera_c_NS_attentionPos /* 80172B78 0016FAB8 38 61 07 C4 */ addi r3, r1, 0x7c4 /* 80172B7C 0016FABC 38 81 02 78 */ addi r4, r1, 0x278 -/* 80172B80 0016FAC0 48 0F EF 35 */ bl cSGlobe_NS_Xyz +/* 80172B80 0016FAC0 48 0F EF 35 */ bl Xyz__7cSGlobeCFv /* 80172B84 0016FAC4 38 61 07 B8 */ addi r3, r1, 0x7b8 /* 80172B88 0016FAC8 38 81 07 D0 */ addi r4, r1, 0x7d0 /* 80172B8C 0016FACC 38 A1 07 C4 */ addi r5, r1, 0x7c4 -/* 80172B90 0016FAD0 48 0F 3F 55 */ bl cXyz_NS___pl +/* 80172B90 0016FAD0 48 0F 3F 55 */ bl __pl__4cXyzCFRC3Vec /* 80172B94 0016FAD4 38 7F 04 78 */ addi r3, r31, 0x478 /* 80172B98 0016FAD8 38 81 07 B8 */ addi r4, r1, 0x7b8 /* 80172B9C 0016FADC 4B F2 4C 3D */ bl cXyz_NS___as @@ -4694,17 +4694,17 @@ lbl_80172AF8: /* 80172BCC 0016FB0C D0 1F 04 7C */ stfs f0, 0x47c(r31) /* 80172BD0 0016FB10 38 61 02 78 */ addi r3, r1, 0x278 /* 80172BD4 0016FB14 38 81 12 98 */ addi r4, r1, 0x1298 -/* 80172BD8 0016FB18 48 0F EE 99 */ bl cSGlobe_NS_Val_X3_ +/* 80172BD8 0016FB18 48 0F EE 99 */ bl Val__7cSGlobeFRC4cXyz /* 80172BDC 0016FB1C 38 61 02 80 */ addi r3, r1, 0x280 /* 80172BE0 0016FB20 48 01 00 A5 */ bl cSGlobe_NS_U_X1_ -/* 80172BE4 0016FB24 48 0F E5 05 */ bl cSAngle_NS_Inv +/* 80172BE4 0016FB24 48 0F E5 05 */ bl Inv__7cSAngleCFv /* 80172BE8 0016FB28 7C 77 1B 78 */ mr r23, r3 /* 80172BEC 0016FB2C 38 61 02 78 */ addi r3, r1, 0x278 /* 80172BF0 0016FB30 48 01 00 95 */ bl cSGlobe_NS_U_X1_ /* 80172BF4 0016FB34 7C 64 1B 78 */ mr r4, r3 /* 80172BF8 0016FB38 38 61 00 D0 */ addi r3, r1, 0xd0 /* 80172BFC 0016FB3C 7E E5 07 34 */ extsh r5, r23 -/* 80172C00 0016FB40 48 0F E5 FD */ bl cSAngle_NS___pl_X1_ +/* 80172C00 0016FB40 48 0F E5 FD */ bl __pl__7cSAngleCFs /* 80172C04 0016FB44 38 61 02 78 */ addi r3, r1, 0x278 /* 80172C08 0016FB48 38 81 00 D0 */ addi r4, r1, 0xd0 /* 80172C0C 0016FB4C 4B F1 BC 89 */ bl cSGlobe_NS_U @@ -4716,17 +4716,17 @@ lbl_80172AF8: /* 80172C24 0016FB64 7C 64 1B 78 */ mr r4, r3 /* 80172C28 0016FB68 38 61 00 CC */ addi r3, r1, 0xcc /* 80172C2C 0016FB6C C0 22 9C EC */ lfs f1, lbl_804536EC-_SDA2_BASE_(r2) -/* 80172C30 0016FB70 48 0F E6 35 */ bl cSAngle_NS___ml +/* 80172C30 0016FB70 48 0F E6 35 */ bl __ml__7cSAngleCFf /* 80172C34 0016FB74 38 61 02 80 */ addi r3, r1, 0x280 /* 80172C38 0016FB78 48 00 FD D1 */ bl cSGlobe_NS_V_X1_ /* 80172C3C 0016FB7C 7C 64 1B 78 */ mr r4, r3 /* 80172C40 0016FB80 38 61 00 C8 */ addi r3, r1, 0xc8 /* 80172C44 0016FB84 C0 22 9D 24 */ lfs f1, lbl_80453724-_SDA2_BASE_(r2) -/* 80172C48 0016FB88 48 0F E6 1D */ bl cSAngle_NS___ml +/* 80172C48 0016FB88 48 0F E6 1D */ bl __ml__7cSAngleCFf /* 80172C4C 0016FB8C 38 61 00 C4 */ addi r3, r1, 0xc4 /* 80172C50 0016FB90 38 81 00 CC */ addi r4, r1, 0xcc /* 80172C54 0016FB94 38 A1 00 C8 */ addi r5, r1, 0xc8 -/* 80172C58 0016FB98 48 0F E5 1D */ bl cSAngle_NS___pl +/* 80172C58 0016FB98 48 0F E5 1D */ bl __pl__7cSAngleCFRC7cSAngle /* 80172C5C 0016FB9C 38 61 02 78 */ addi r3, r1, 0x278 /* 80172C60 0016FBA0 38 81 00 C4 */ addi r4, r1, 0xc4 /* 80172C64 0016FBA4 4B F1 CD F5 */ bl cSGlobe_NS_V @@ -4741,11 +4741,11 @@ lbl_80172AF8: /* 80172C88 0016FBC8 4B EB D8 89 */ bl cSAngle_NS_dtor /* 80172C8C 0016FBCC 38 61 07 AC */ addi r3, r1, 0x7ac /* 80172C90 0016FBD0 38 81 02 78 */ addi r4, r1, 0x278 -/* 80172C94 0016FBD4 48 0F EE 21 */ bl cSGlobe_NS_Xyz +/* 80172C94 0016FBD4 48 0F EE 21 */ bl Xyz__7cSGlobeCFv /* 80172C98 0016FBD8 38 61 07 A0 */ addi r3, r1, 0x7a0 /* 80172C9C 0016FBDC 38 81 13 AC */ addi r4, r1, 0x13ac /* 80172CA0 0016FBE0 38 A1 07 AC */ addi r5, r1, 0x7ac -/* 80172CA4 0016FBE4 48 0F 3E 41 */ bl cXyz_NS___pl +/* 80172CA4 0016FBE4 48 0F 3E 41 */ bl __pl__4cXyzCFRC3Vec /* 80172CA8 0016FBE8 38 7F 04 84 */ addi r3, r31, 0x484 /* 80172CAC 0016FBEC 38 81 07 A0 */ addi r4, r1, 0x7a0 /* 80172CB0 0016FBF0 4B F2 4B 29 */ bl cXyz_NS___as @@ -4758,10 +4758,10 @@ lbl_80172AF8: /* 80172CCC 0016FC0C 38 61 07 94 */ addi r3, r1, 0x794 /* 80172CD0 0016FC10 38 9F 04 84 */ addi r4, r31, 0x484 /* 80172CD4 0016FC14 38 BF 04 78 */ addi r5, r31, 0x478 -/* 80172CD8 0016FC18 48 0F 3E 5D */ bl cXyz_NS___mi +/* 80172CD8 0016FC18 48 0F 3E 5D */ bl __mi__4cXyzCFRC3Vec /* 80172CDC 0016FC1C 38 7F 04 90 */ addi r3, r31, 0x490 /* 80172CE0 0016FC20 38 81 07 94 */ addi r4, r1, 0x794 -/* 80172CE4 0016FC24 48 0F ED 8D */ bl cSGlobe_NS_Val_X3_ +/* 80172CE4 0016FC24 48 0F ED 8D */ bl Val__7cSGlobeFRC4cXyz /* 80172CE8 0016FC28 38 61 07 94 */ addi r3, r1, 0x794 /* 80172CEC 0016FC2C 38 80 FF FF */ li r4, -1 /* 80172CF0 0016FC30 4B E9 64 95 */ bl cXyz_NS_dtor @@ -4861,14 +4861,14 @@ lbl_80172E40: /* 80172E48 0016FD88 4B F2 49 91 */ bl cXyz_NS___as /* 80172E4C 0016FD8C 38 61 00 C0 */ addi r3, r1, 0xc0 /* 80172E50 0016FD90 C0 22 9E 30 */ lfs f1, lbl_80453830-_SDA2_BASE_(r2) -/* 80172E54 0016FD94 48 0F E1 75 */ bl cSAngle_X3_ +/* 80172E54 0016FD94 48 0F E1 75 */ bl __ct__7cSAngleFf /* 80172E58 0016FD98 38 7F 04 10 */ addi r3, r31, 0x410 /* 80172E5C 0016FD9C 48 00 FE 29 */ bl cSGlobe_NS_U_X1_ /* 80172E60 0016FDA0 7C 65 1B 78 */ mr r5, r3 /* 80172E64 0016FDA4 38 7F 00 5C */ addi r3, r31, 0x5c /* 80172E68 0016FDA8 C0 22 9E 6C */ lfs f1, lbl_8045386C-_SDA2_BASE_(r2) /* 80172E6C 0016FDAC 38 81 00 C0 */ addi r4, r1, 0xc0 -/* 80172E70 0016FDB0 48 0F EB 99 */ bl cSGlobe_NS_Val_X2_ +/* 80172E70 0016FDB0 48 0F EB 99 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80172E74 0016FDB4 38 61 00 C0 */ addi r3, r1, 0xc0 /* 80172E78 0016FDB8 38 80 FF FF */ li r4, -1 /* 80172E7C 0016FDBC 4B EB D6 95 */ bl cSAngle_NS_dtor @@ -4919,7 +4919,7 @@ lbl_80172EC8: /* 80172F28 0016FE68 41 82 00 2C */ beq lbl_80172F54 /* 80172F2C 0016FE6C 38 61 00 BC */ addi r3, r1, 0xbc /* 80172F30 0016FE70 C0 22 9D 68 */ lfs f1, lbl_80453768-_SDA2_BASE_(r2) -/* 80172F34 0016FE74 48 0F E0 95 */ bl cSAngle_X3_ +/* 80172F34 0016FE74 48 0F E0 95 */ bl __ct__7cSAngleFf /* 80172F38 0016FE78 38 61 02 04 */ addi r3, r1, 0x204 /* 80172F3C 0016FE7C 38 81 00 BC */ addi r4, r1, 0xbc /* 80172F40 0016FE80 48 00 FD 69 */ bl cSAngle_NS___as @@ -4930,7 +4930,7 @@ lbl_80172EC8: lbl_80172F54: /* 80172F54 0016FE94 38 61 00 B8 */ addi r3, r1, 0xb8 /* 80172F58 0016FE98 C0 22 9C B0 */ lfs f1, lbl_804536B0-_SDA2_BASE_(r2) -/* 80172F5C 0016FE9C 48 0F E0 6D */ bl cSAngle_X3_ +/* 80172F5C 0016FE9C 48 0F E0 6D */ bl __ct__7cSAngleFf /* 80172F60 0016FEA0 38 61 02 04 */ addi r3, r1, 0x204 /* 80172F64 0016FEA4 38 81 00 B8 */ addi r4, r1, 0xb8 /* 80172F68 0016FEA8 48 00 FD 41 */ bl cSAngle_NS___as @@ -4942,11 +4942,11 @@ lbl_80172F78: lbl_80172F7C: /* 80172F7C 0016FEBC 38 61 07 4C */ addi r3, r1, 0x74c /* 80172F80 0016FEC0 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80172F84 0016FEC4 48 0F EB 31 */ bl cSGlobe_NS_Xyz +/* 80172F84 0016FEC4 48 0F EB 31 */ bl Xyz__7cSGlobeCFv /* 80172F88 0016FEC8 38 61 07 40 */ addi r3, r1, 0x740 /* 80172F8C 0016FECC 38 9F 00 64 */ addi r4, r31, 0x64 /* 80172F90 0016FED0 38 A1 07 4C */ addi r5, r1, 0x74c -/* 80172F94 0016FED4 48 0F 3B 51 */ bl cXyz_NS___pl +/* 80172F94 0016FED4 48 0F 3B 51 */ bl __pl__4cXyzCFRC3Vec /* 80172F98 0016FED8 38 7F 00 70 */ addi r3, r31, 0x70 /* 80172F9C 0016FEDC 38 81 07 40 */ addi r4, r1, 0x740 /* 80172FA0 0016FEE0 4B F2 48 39 */ bl cXyz_NS___as @@ -5018,7 +5018,7 @@ lbl_8017309C: /* 801730A4 0016FFE4 7C 64 1B 78 */ mr r4, r3 /* 801730A8 0016FFE8 38 61 00 B4 */ addi r3, r1, 0xb4 /* 801730AC 0016FFEC 38 A1 02 04 */ addi r5, r1, 0x204 -/* 801730B0 0016FFF0 48 0F E0 C5 */ bl cSAngle_NS___pl +/* 801730B0 0016FFF0 48 0F E0 C5 */ bl __pl__7cSAngleCFRC7cSAngle /* 801730B4 0016FFF4 38 7F 00 5C */ addi r3, r31, 0x5c /* 801730B8 0016FFF8 38 81 00 B4 */ addi r4, r1, 0xb4 /* 801730BC 0016FFFC 4B F1 B7 D9 */ bl cSGlobe_NS_U @@ -5059,7 +5059,7 @@ lbl_801730D8: /* 80173144 00170084 7C 64 1B 78 */ mr r4, r3 /* 80173148 00170088 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8017314C 0017008C 38 AD 8C 10 */ addi r5, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ -/* 80173150 00170090 48 0F E0 25 */ bl cSAngle_NS___pl +/* 80173150 00170090 48 0F E0 25 */ bl __pl__7cSAngleCFRC7cSAngle /* 80173154 00170094 38 61 02 00 */ addi r3, r1, 0x200 /* 80173158 00170098 38 81 00 B0 */ addi r4, r1, 0xb0 /* 8017315C 0017009C 48 00 FB 4D */ bl cSAngle_NS___as @@ -5073,7 +5073,7 @@ lbl_80173170: /* 80173178 001700B8 7C 64 1B 78 */ mr r4, r3 /* 8017317C 001700BC 38 61 00 AC */ addi r3, r1, 0xac /* 80173180 001700C0 38 AD 8C 18 */ addi r5, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ -/* 80173184 001700C4 48 0F DF F1 */ bl cSAngle_NS___pl +/* 80173184 001700C4 48 0F DF F1 */ bl __pl__7cSAngleCFRC7cSAngle /* 80173188 001700C8 38 61 02 00 */ addi r3, r1, 0x200 /* 8017318C 001700CC 38 81 00 AC */ addi r4, r1, 0xac /* 80173190 001700D0 48 00 FB 19 */ bl cSAngle_NS___as @@ -5083,12 +5083,12 @@ lbl_80173170: lbl_801731A0: /* 801731A0 001700E0 38 61 00 A8 */ addi r3, r1, 0xa8 /* 801731A4 001700E4 C0 22 9D CC */ lfs f1, lbl_804537CC-_SDA2_BASE_(r2) -/* 801731A8 001700E8 48 0F DE 21 */ bl cSAngle_X3_ +/* 801731A8 001700E8 48 0F DE 21 */ bl __ct__7cSAngleFf /* 801731AC 001700EC 38 7F 00 5C */ addi r3, r31, 0x5c /* 801731B0 001700F0 C0 22 9E 6C */ lfs f1, lbl_8045386C-_SDA2_BASE_(r2) /* 801731B4 001700F4 38 81 00 A8 */ addi r4, r1, 0xa8 /* 801731B8 001700F8 38 A1 02 00 */ addi r5, r1, 0x200 -/* 801731BC 001700FC 48 0F E8 4D */ bl cSGlobe_NS_Val_X2_ +/* 801731BC 001700FC 48 0F E8 4D */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 801731C0 00170100 38 61 00 A8 */ addi r3, r1, 0xa8 /* 801731C4 00170104 38 80 FF FF */ li r4, -1 /* 801731C8 00170108 4B EB D3 49 */ bl cSAngle_NS_dtor @@ -5134,16 +5134,16 @@ lbl_80173214: /* 80173260 001701A0 4B E9 5F 25 */ bl cXyz_NS_dtor /* 80173264 001701A4 38 61 01 FC */ addi r3, r1, 0x1fc /* 80173268 001701A8 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 8017326C 001701AC 48 0F DC FD */ bl cSAngle_X1_ +/* 8017326C 001701AC 48 0F DC FD */ bl __ct__7cSAngleFRC7cSAngle /* 80173270 001701B0 3A E0 00 00 */ li r23, 0 lbl_80173274: /* 80173274 001701B4 38 61 06 EC */ addi r3, r1, 0x6ec /* 80173278 001701B8 38 9F 00 5C */ addi r4, r31, 0x5c -/* 8017327C 001701BC 48 0F E8 39 */ bl cSGlobe_NS_Xyz +/* 8017327C 001701BC 48 0F E8 39 */ bl Xyz__7cSGlobeCFv /* 80173280 001701C0 38 61 06 E0 */ addi r3, r1, 0x6e0 /* 80173284 001701C4 38 9F 00 64 */ addi r4, r31, 0x64 /* 80173288 001701C8 38 A1 06 EC */ addi r5, r1, 0x6ec -/* 8017328C 001701CC 48 0F 38 59 */ bl cXyz_NS___pl +/* 8017328C 001701CC 48 0F 38 59 */ bl __pl__4cXyzCFRC3Vec /* 80173290 001701D0 38 7F 00 70 */ addi r3, r31, 0x70 /* 80173294 001701D4 38 81 06 E0 */ addi r4, r1, 0x6e0 /* 80173298 001701D8 4B F2 45 41 */ bl cXyz_NS___as @@ -5214,17 +5214,17 @@ lbl_80173394: /* 80173398 001702D8 40 82 00 54 */ bne lbl_801733EC /* 8017339C 001702DC 38 61 00 A4 */ addi r3, r1, 0xa4 /* 801733A0 001702E0 C0 22 9D 68 */ lfs f1, lbl_80453768-_SDA2_BASE_(r2) -/* 801733A4 001702E4 48 0F DC 25 */ bl cSAngle_X3_ +/* 801733A4 001702E4 48 0F DC 25 */ bl __ct__7cSAngleFf /* 801733A8 001702E8 38 61 01 FC */ addi r3, r1, 0x1fc /* 801733AC 001702EC 38 81 00 A4 */ addi r4, r1, 0xa4 -/* 801733B0 001702F0 48 0F DE 25 */ bl cSAngle_NS___apl +/* 801733B0 001702F0 48 0F DE 25 */ bl __apl__7cSAngleFRC7cSAngle /* 801733B4 001702F4 38 61 00 A4 */ addi r3, r1, 0xa4 /* 801733B8 001702F8 38 80 FF FF */ li r4, -1 /* 801733BC 001702FC 4B EB D1 55 */ bl cSAngle_NS_dtor /* 801733C0 00170300 38 61 00 A0 */ addi r3, r1, 0xa0 /* 801733C4 00170304 38 81 02 00 */ addi r4, r1, 0x200 /* 801733C8 00170308 38 A1 01 FC */ addi r5, r1, 0x1fc -/* 801733CC 0017030C 48 0F DD A9 */ bl cSAngle_NS___pl +/* 801733CC 0017030C 48 0F DD A9 */ bl __pl__7cSAngleCFRC7cSAngle /* 801733D0 00170310 38 7F 00 5C */ addi r3, r31, 0x5c /* 801733D4 00170314 38 81 00 A0 */ addi r4, r1, 0xa0 /* 801733D8 00170318 4B F1 B4 BD */ bl cSGlobe_NS_U @@ -5236,7 +5236,7 @@ lbl_801733EC: /* 801733EC 0017032C 38 61 00 9C */ addi r3, r1, 0x9c /* 801733F0 00170330 38 81 02 00 */ addi r4, r1, 0x200 /* 801733F4 00170334 38 A1 01 FC */ addi r5, r1, 0x1fc -/* 801733F8 00170338 48 0F DD AD */ bl cSAngle_NS___mi_X1_ +/* 801733F8 00170338 48 0F DD AD */ bl __mi__7cSAngleCFRC7cSAngle /* 801733FC 0017033C 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173400 00170340 38 81 00 9C */ addi r4, r1, 0x9c /* 80173404 00170344 4B F1 B4 91 */ bl cSGlobe_NS_U @@ -5292,7 +5292,7 @@ lbl_80173470: /* 801734C0 00170400 38 61 06 8C */ addi r3, r1, 0x68c /* 801734C4 00170404 38 81 12 50 */ addi r4, r1, 0x1250 /* 801734C8 00170408 38 A1 12 44 */ addi r5, r1, 0x1244 -/* 801734CC 0017040C 48 0F 36 69 */ bl cXyz_NS___mi +/* 801734CC 0017040C 48 0F 36 69 */ bl __mi__4cXyzCFRC3Vec /* 801734D0 00170410 38 61 12 38 */ addi r3, r1, 0x1238 /* 801734D4 00170414 38 81 06 8C */ addi r4, r1, 0x68c /* 801734D8 00170418 4B F2 43 1D */ bl cXyz_X1_ @@ -5301,7 +5301,7 @@ lbl_80173470: /* 801734E4 00170424 4B E9 5C A1 */ bl cXyz_NS_dtor /* 801734E8 00170428 38 61 02 70 */ addi r3, r1, 0x270 /* 801734EC 0017042C 38 81 12 38 */ addi r4, r1, 0x1238 -/* 801734F0 00170430 48 0F E3 91 */ bl cSGlobe_X4_ +/* 801734F0 00170430 48 0F E3 91 */ bl __ct__7cSGlobeFRC4cXyz /* 801734F4 00170434 38 61 01 F8 */ addi r3, r1, 0x1f8 /* 801734F8 00170438 48 00 F5 51 */ bl __ct__7cSAngleFv /* 801734FC 0017043C 38 61 12 50 */ addi r3, r1, 0x1250 @@ -5316,9 +5316,9 @@ lbl_80173470: /* 80173520 00170460 C0 1F 09 2C */ lfs f0, 0x92c(r31) /* 80173524 00170464 EC 01 00 32 */ fmuls f0, f1, f0 /* 80173528 00170468 EC 22 00 32 */ fmuls f1, f2, f0 -/* 8017352C 0017046C 48 0F DE 21 */ bl cDegree +/* 8017352C 0017046C 48 0F DE 21 */ bl __ct__7cDegreeFf /* 80173530 00170470 38 61 02 48 */ addi r3, r1, 0x248 -/* 80173534 00170474 48 0F DF 0D */ bl cDegree_NS_Tan +/* 80173534 00170474 48 0F DF 0D */ bl Tan__7cDegreeCFv /* 80173538 00170478 EE 31 08 24 */ fdivs f17, f17, f1 /* 8017353C 0017047C 80 1F 04 20 */ lwz r0, 0x420(r31) /* 80173540 00170480 2C 00 00 00 */ cmpwi r0, 0 @@ -5339,11 +5339,11 @@ lbl_80173564: /* 80173574 001704B4 38 61 06 74 */ addi r3, r1, 0x674 /* 80173578 001704B8 38 81 12 38 */ addi r4, r1, 0x1238 /* 8017357C 001704BC C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) -/* 80173580 001704C0 48 0F 36 05 */ bl cXyz_NS___ml +/* 80173580 001704C0 48 0F 36 05 */ bl __ml__4cXyzCFf /* 80173584 001704C4 38 61 06 68 */ addi r3, r1, 0x668 /* 80173588 001704C8 38 81 06 80 */ addi r4, r1, 0x680 /* 8017358C 001704CC 38 A1 06 74 */ addi r5, r1, 0x674 -/* 80173590 001704D0 48 0F 35 55 */ bl cXyz_NS___pl +/* 80173590 001704D0 48 0F 35 55 */ bl __pl__4cXyzCFRC3Vec /* 80173594 001704D4 38 7F 04 78 */ addi r3, r31, 0x478 /* 80173598 001704D8 38 81 06 68 */ addi r4, r1, 0x668 /* 8017359C 001704DC 4B F2 42 3D */ bl cXyz_NS___as @@ -5383,22 +5383,22 @@ lbl_80173564: /* 80173624 00170564 7C 64 1B 78 */ mr r4, r3 /* 80173628 00170568 38 61 00 98 */ addi r3, r1, 0x98 /* 8017362C 0017056C 38 A1 01 F8 */ addi r5, r1, 0x1f8 -/* 80173630 00170570 48 0F DB 45 */ bl cSAngle_NS___pl +/* 80173630 00170570 48 0F DB 45 */ bl __pl__7cSAngleCFRC7cSAngle /* 80173634 00170574 38 7F 04 90 */ addi r3, r31, 0x490 /* 80173638 00170578 FC 20 88 90 */ fmr f1, f17 /* 8017363C 0017057C 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 80173640 00170580 38 A1 00 98 */ addi r5, r1, 0x98 -/* 80173644 00170584 48 0F E3 C5 */ bl cSGlobe_NS_Val_X2_ +/* 80173644 00170584 48 0F E3 C5 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80173648 00170588 38 61 00 98 */ addi r3, r1, 0x98 /* 8017364C 0017058C 38 80 FF FF */ li r4, -1 /* 80173650 00170590 4B EB CE C1 */ bl cSAngle_NS_dtor /* 80173654 00170594 38 61 06 44 */ addi r3, r1, 0x644 /* 80173658 00170598 38 9F 04 90 */ addi r4, r31, 0x490 -/* 8017365C 0017059C 48 0F E4 59 */ bl cSGlobe_NS_Xyz +/* 8017365C 0017059C 48 0F E4 59 */ bl Xyz__7cSGlobeCFv /* 80173660 001705A0 38 61 06 38 */ addi r3, r1, 0x638 /* 80173664 001705A4 38 9F 04 78 */ addi r4, r31, 0x478 /* 80173668 001705A8 38 A1 06 44 */ addi r5, r1, 0x644 -/* 8017366C 001705AC 48 0F 34 79 */ bl cXyz_NS___pl +/* 8017366C 001705AC 48 0F 34 79 */ bl __pl__4cXyzCFRC3Vec /* 80173670 001705B0 38 7F 04 84 */ addi r3, r31, 0x484 /* 80173674 001705B4 38 81 06 38 */ addi r4, r1, 0x638 /* 80173678 001705B8 4B F2 41 61 */ bl cXyz_NS___as @@ -5567,10 +5567,10 @@ lbl_801738D0: /* 801738F4 00170834 38 61 05 B4 */ addi r3, r1, 0x5b4 /* 801738F8 00170838 38 81 12 2C */ addi r4, r1, 0x122c /* 801738FC 0017083C 38 A1 12 20 */ addi r5, r1, 0x1220 -/* 80173900 00170840 48 0F 32 35 */ bl cXyz_NS___mi +/* 80173900 00170840 48 0F 32 35 */ bl __mi__4cXyzCFRC3Vec /* 80173904 00170844 38 7F 04 90 */ addi r3, r31, 0x490 /* 80173908 00170848 38 81 05 B4 */ addi r4, r1, 0x5b4 -/* 8017390C 0017084C 48 0F E1 65 */ bl cSGlobe_NS_Val_X3_ +/* 8017390C 0017084C 48 0F E1 65 */ bl Val__7cSGlobeFRC4cXyz /* 80173910 00170850 38 61 05 B4 */ addi r3, r1, 0x5b4 /* 80173914 00170854 38 80 FF FF */ li r4, -1 /* 80173918 00170858 4B E9 58 6D */ bl cXyz_NS_dtor @@ -5619,11 +5619,11 @@ lbl_80173998: /* 801739C0 00170900 4B E9 57 C5 */ bl cXyz_NS_dtor /* 801739C4 00170904 38 61 05 84 */ addi r3, r1, 0x584 /* 801739C8 00170908 38 9F 04 90 */ addi r4, r31, 0x490 -/* 801739CC 0017090C 48 0F E0 E9 */ bl cSGlobe_NS_Xyz +/* 801739CC 0017090C 48 0F E0 E9 */ bl Xyz__7cSGlobeCFv /* 801739D0 00170910 38 61 05 78 */ addi r3, r1, 0x578 /* 801739D4 00170914 38 9F 04 78 */ addi r4, r31, 0x478 /* 801739D8 00170918 38 A1 05 84 */ addi r5, r1, 0x584 -/* 801739DC 0017091C 48 0F 31 09 */ bl cXyz_NS___pl +/* 801739DC 0017091C 48 0F 31 09 */ bl __pl__4cXyzCFRC3Vec /* 801739E0 00170920 38 7F 04 84 */ addi r3, r31, 0x484 /* 801739E4 00170924 38 81 05 78 */ addi r4, r1, 0x578 /* 801739E8 00170928 4B F2 3D F1 */ bl cXyz_NS___as @@ -5772,22 +5772,22 @@ lbl_80173BDC: /* 80173C10 00170B50 38 61 05 0C */ addi r3, r1, 0x50c /* 80173C14 00170B54 38 81 12 08 */ addi r4, r1, 0x1208 /* 80173C18 00170B58 38 A1 11 FC */ addi r5, r1, 0x11fc -/* 80173C1C 00170B5C 48 0F 2F 19 */ bl cXyz_NS___mi +/* 80173C1C 00170B5C 48 0F 2F 19 */ bl __mi__4cXyzCFRC3Vec /* 80173C20 00170B60 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173C24 00170B64 38 81 05 0C */ addi r4, r1, 0x50c -/* 80173C28 00170B68 48 0F DE 49 */ bl cSGlobe_NS_Val_X3_ +/* 80173C28 00170B68 48 0F DE 49 */ bl Val__7cSGlobeFRC4cXyz /* 80173C2C 00170B6C 38 61 05 0C */ addi r3, r1, 0x50c /* 80173C30 00170B70 38 80 FF FF */ li r4, -1 /* 80173C34 00170B74 4B E9 55 51 */ bl cXyz_NS_dtor /* 80173C38 00170B78 38 61 00 94 */ addi r3, r1, 0x94 /* 80173C3C 00170B7C C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) -/* 80173C40 00170B80 48 0F D3 89 */ bl cSAngle_X3_ +/* 80173C40 00170B80 48 0F D3 89 */ bl __ct__7cSAngleFf /* 80173C44 00170B84 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173C48 00170B88 48 00 ED C1 */ bl cSGlobe_NS_V_X1_ /* 80173C4C 00170B8C 7C 64 1B 78 */ mr r4, r3 /* 80173C50 00170B90 38 61 00 90 */ addi r3, r1, 0x90 /* 80173C54 00170B94 38 A1 00 94 */ addi r5, r1, 0x94 -/* 80173C58 00170B98 48 0F D5 1D */ bl cSAngle_NS___pl +/* 80173C58 00170B98 48 0F D5 1D */ bl __pl__7cSAngleCFRC7cSAngle /* 80173C5C 00170B9C 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173C60 00170BA0 38 81 00 90 */ addi r4, r1, 0x90 /* 80173C64 00170BA4 4B F1 BD F5 */ bl cSGlobe_NS_V @@ -5837,13 +5837,13 @@ lbl_80173BDC: /* 80173D14 00170C54 41 82 00 74 */ beq lbl_80173D88 /* 80173D18 00170C58 38 61 00 8C */ addi r3, r1, 0x8c /* 80173D1C 00170C5C C0 22 9C E4 */ lfs f1, lbl_804536E4-_SDA2_BASE_(r2) -/* 80173D20 00170C60 48 0F D2 A9 */ bl cSAngle_X3_ +/* 80173D20 00170C60 48 0F D2 A9 */ bl __ct__7cSAngleFf /* 80173D24 00170C64 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173D28 00170C68 48 00 EF 5D */ bl cSGlobe_NS_U_X1_ /* 80173D2C 00170C6C 7C 64 1B 78 */ mr r4, r3 /* 80173D30 00170C70 38 61 00 88 */ addi r3, r1, 0x88 /* 80173D34 00170C74 38 A1 00 8C */ addi r5, r1, 0x8c -/* 80173D38 00170C78 48 0F D4 3D */ bl cSAngle_NS___pl +/* 80173D38 00170C78 48 0F D4 3D */ bl __pl__7cSAngleCFRC7cSAngle /* 80173D3C 00170C7C 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173D40 00170C80 38 81 00 88 */ addi r4, r1, 0x88 /* 80173D44 00170C84 4B F1 AB 51 */ bl cSGlobe_NS_U @@ -5855,7 +5855,7 @@ lbl_80173BDC: /* 80173D5C 00170C9C 4B EB C7 B5 */ bl cSAngle_NS_dtor /* 80173D60 00170CA0 38 61 00 84 */ addi r3, r1, 0x84 /* 80173D64 00170CA4 C0 22 9D 68 */ lfs f1, lbl_80453768-_SDA2_BASE_(r2) -/* 80173D68 00170CA8 48 0F D2 61 */ bl cSAngle_X3_ +/* 80173D68 00170CA8 48 0F D2 61 */ bl __ct__7cSAngleFf /* 80173D6C 00170CAC 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 80173D70 00170CB0 38 81 00 84 */ addi r4, r1, 0x84 /* 80173D74 00170CB4 48 00 EF 35 */ bl cSAngle_NS___as @@ -5866,13 +5866,13 @@ lbl_80173BDC: lbl_80173D88: /* 80173D88 00170CC8 38 61 00 80 */ addi r3, r1, 0x80 /* 80173D8C 00170CCC C0 22 9C E4 */ lfs f1, lbl_804536E4-_SDA2_BASE_(r2) -/* 80173D90 00170CD0 48 0F D2 39 */ bl cSAngle_X3_ +/* 80173D90 00170CD0 48 0F D2 39 */ bl __ct__7cSAngleFf /* 80173D94 00170CD4 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173D98 00170CD8 48 00 EE ED */ bl cSGlobe_NS_U_X1_ /* 80173D9C 00170CDC 7C 64 1B 78 */ mr r4, r3 /* 80173DA0 00170CE0 38 61 00 7C */ addi r3, r1, 0x7c /* 80173DA4 00170CE4 38 A1 00 80 */ addi r5, r1, 0x80 -/* 80173DA8 00170CE8 48 0F D3 FD */ bl cSAngle_NS___mi_X1_ +/* 80173DA8 00170CE8 48 0F D3 FD */ bl __mi__7cSAngleCFRC7cSAngle /* 80173DAC 00170CEC 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173DB0 00170CF0 38 81 00 7C */ addi r4, r1, 0x7c /* 80173DB4 00170CF4 4B F1 AA E1 */ bl cSGlobe_NS_U @@ -5884,7 +5884,7 @@ lbl_80173D88: /* 80173DCC 00170D0C 4B EB C7 45 */ bl cSAngle_NS_dtor /* 80173DD0 00170D10 38 61 00 78 */ addi r3, r1, 0x78 /* 80173DD4 00170D14 C0 22 9C B0 */ lfs f1, lbl_804536B0-_SDA2_BASE_(r2) -/* 80173DD8 00170D18 48 0F D1 F1 */ bl cSAngle_X3_ +/* 80173DD8 00170D18 48 0F D1 F1 */ bl __ct__7cSAngleFf /* 80173DDC 00170D1C 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 80173DE0 00170D20 38 81 00 78 */ addi r4, r1, 0x78 /* 80173DE4 00170D24 48 00 EE C5 */ bl cSAngle_NS___as @@ -5898,11 +5898,11 @@ lbl_80173DF4: lbl_80173E00: /* 80173E00 00170D40 38 61 04 E8 */ addi r3, r1, 0x4e8 /* 80173E04 00170D44 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80173E08 00170D48 48 0F DC AD */ bl cSGlobe_NS_Xyz +/* 80173E08 00170D48 48 0F DC AD */ bl Xyz__7cSGlobeCFv /* 80173E0C 00170D4C 38 61 04 DC */ addi r3, r1, 0x4dc /* 80173E10 00170D50 38 9F 00 64 */ addi r4, r31, 0x64 /* 80173E14 00170D54 38 A1 04 E8 */ addi r5, r1, 0x4e8 -/* 80173E18 00170D58 48 0F 2C CD */ bl cXyz_NS___pl +/* 80173E18 00170D58 48 0F 2C CD */ bl __pl__4cXyzCFRC3Vec /* 80173E1C 00170D5C 38 7F 00 70 */ addi r3, r31, 0x70 /* 80173E20 00170D60 38 81 04 DC */ addi r4, r1, 0x4dc /* 80173E24 00170D64 4B F2 39 B5 */ bl cXyz_NS___as @@ -5974,7 +5974,7 @@ lbl_80173F20: /* 80173F28 00170E68 7C 64 1B 78 */ mr r4, r3 /* 80173F2C 00170E6C 38 61 00 74 */ addi r3, r1, 0x74 /* 80173F30 00170E70 38 A1 01 F4 */ addi r5, r1, 0x1f4 -/* 80173F34 00170E74 48 0F D2 41 */ bl cSAngle_NS___pl +/* 80173F34 00170E74 48 0F D2 41 */ bl __pl__7cSAngleCFRC7cSAngle /* 80173F38 00170E78 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173F3C 00170E7C 38 81 00 74 */ addi r4, r1, 0x74 /* 80173F40 00170E80 4B F1 A9 55 */ bl cSGlobe_NS_U @@ -6026,10 +6026,10 @@ lbl_80173F5C: /* 80173FF4 00170F34 38 61 04 88 */ addi r3, r1, 0x488 /* 80173FF8 00170F38 38 81 13 AC */ addi r4, r1, 0x13ac /* 80173FFC 00170F3C 38 A1 13 A0 */ addi r5, r1, 0x13a0 -/* 80174000 00170F40 48 0F 2B 35 */ bl cXyz_NS___mi +/* 80174000 00170F40 48 0F 2B 35 */ bl __mi__4cXyzCFRC3Vec /* 80174004 00170F44 38 61 02 68 */ addi r3, r1, 0x268 /* 80174008 00170F48 38 81 04 88 */ addi r4, r1, 0x488 -/* 8017400C 00170F4C 48 0F D8 75 */ bl cSGlobe_X4_ +/* 8017400C 00170F4C 48 0F D8 75 */ bl __ct__7cSGlobeFRC4cXyz /* 80174010 00170F50 38 61 04 88 */ addi r3, r1, 0x488 /* 80174014 00170F54 38 80 FF FF */ li r4, -1 /* 80174018 00170F58 4B E9 51 6D */ bl cXyz_NS_dtor @@ -6040,7 +6040,7 @@ lbl_80173F5C: /* 8017402C 00170F6C 98 1F 01 58 */ stb r0, 0x158(r31) /* 80174030 00170F70 38 61 02 60 */ addi r3, r1, 0x260 /* 80174034 00170F74 38 81 02 68 */ addi r4, r1, 0x268 -/* 80174038 00170F78 48 0F D7 B9 */ bl cSGlobe_X1_ +/* 80174038 00170F78 48 0F D7 B9 */ bl __ct__7cSGlobeFRC7cSGlobe /* 8017403C 00170F7C 38 61 02 68 */ addi r3, r1, 0x268 /* 80174040 00170F80 48 00 EA 25 */ bl cSGlobe_NS_R_X1_ /* 80174044 00170F84 C0 02 9C 90 */ lfs f0, lbl_80453690-_SDA2_BASE_(r2) @@ -6049,11 +6049,11 @@ lbl_80173F5C: /* 80174050 00170F90 48 00 E9 FD */ bl cSGlobe_NS_R /* 80174054 00170F94 38 61 04 7C */ addi r3, r1, 0x47c /* 80174058 00170F98 38 81 02 60 */ addi r4, r1, 0x260 -/* 8017405C 00170F9C 48 0F DA 59 */ bl cSGlobe_NS_Xyz +/* 8017405C 00170F9C 48 0F DA 59 */ bl Xyz__7cSGlobeCFv /* 80174060 00170FA0 38 61 04 70 */ addi r3, r1, 0x470 /* 80174064 00170FA4 38 81 13 A0 */ addi r4, r1, 0x13a0 /* 80174068 00170FA8 38 A1 04 7C */ addi r5, r1, 0x47c -/* 8017406C 00170FAC 48 0F 2A 79 */ bl cXyz_NS___pl +/* 8017406C 00170FAC 48 0F 2A 79 */ bl __pl__4cXyzCFRC3Vec /* 80174070 00170FB0 38 7F 00 64 */ addi r3, r31, 0x64 /* 80174074 00170FB4 38 81 04 70 */ addi r4, r1, 0x470 /* 80174078 00170FB8 4B F2 37 61 */ bl cXyz_NS___as @@ -6087,7 +6087,7 @@ lbl_80173F5C: /* 801740E8 00171028 4B FC D8 75 */ bl cXyz_X2_ /* 801740EC 0017102C 38 61 02 60 */ addi r3, r1, 0x260 /* 801740F0 00171030 38 81 04 64 */ addi r4, r1, 0x464 -/* 801740F4 00171034 48 0F D9 7D */ bl cSGlobe_NS_Val_X3_ +/* 801740F4 00171034 48 0F D9 7D */ bl Val__7cSGlobeFRC4cXyz /* 801740F8 00171038 38 61 04 64 */ addi r3, r1, 0x464 /* 801740FC 0017103C 38 80 FF FF */ li r4, -1 /* 80174100 00171040 4B E9 50 85 */ bl cXyz_NS_dtor @@ -6106,7 +6106,7 @@ lbl_80174108: /* 80174130 00171070 4B FC D8 2D */ bl cXyz_X2_ /* 80174134 00171074 38 61 02 60 */ addi r3, r1, 0x260 /* 80174138 00171078 38 81 04 58 */ addi r4, r1, 0x458 -/* 8017413C 0017107C 48 0F D9 35 */ bl cSGlobe_NS_Val_X3_ +/* 8017413C 0017107C 48 0F D9 35 */ bl Val__7cSGlobeFRC4cXyz /* 80174140 00171080 38 61 04 58 */ addi r3, r1, 0x458 /* 80174144 00171084 38 80 FF FF */ li r4, -1 /* 80174148 00171088 4B E9 50 3D */ bl cXyz_NS_dtor @@ -6120,7 +6120,7 @@ lbl_8017414C: /* 80174164 001710A4 7C 64 1B 78 */ mr r4, r3 /* 80174168 001710A8 38 61 00 6C */ addi r3, r1, 0x6c /* 8017416C 001710AC 38 A1 00 70 */ addi r5, r1, 0x70 -/* 80174170 001710B0 48 0F D0 05 */ bl cSAngle_NS___pl +/* 80174170 001710B0 48 0F D0 05 */ bl __pl__7cSAngleCFRC7cSAngle /* 80174174 001710B4 38 61 02 60 */ addi r3, r1, 0x260 /* 80174178 001710B8 38 81 00 6C */ addi r4, r1, 0x6c /* 8017417C 001710BC 4B F1 A7 19 */ bl cSGlobe_NS_U @@ -6138,7 +6138,7 @@ lbl_8017414C: /* 801741AC 001710EC 7C 64 1B 78 */ mr r4, r3 /* 801741B0 001710F0 38 61 00 68 */ addi r3, r1, 0x68 /* 801741B4 001710F4 7E C5 B3 78 */ mr r5, r22 -/* 801741B8 001710F8 48 0F CF BD */ bl cSAngle_NS___pl +/* 801741B8 001710F8 48 0F CF BD */ bl __pl__7cSAngleCFRC7cSAngle /* 801741BC 001710FC 38 61 02 60 */ addi r3, r1, 0x260 /* 801741C0 00171100 38 81 00 68 */ addi r4, r1, 0x68 /* 801741C4 00171104 4B F1 B8 95 */ bl cSGlobe_NS_V @@ -6147,11 +6147,11 @@ lbl_8017414C: /* 801741D0 00171110 4B EB C3 41 */ bl cSAngle_NS_dtor /* 801741D4 00171114 38 61 04 4C */ addi r3, r1, 0x44c /* 801741D8 00171118 38 81 02 60 */ addi r4, r1, 0x260 -/* 801741DC 0017111C 48 0F D8 D9 */ bl cSGlobe_NS_Xyz +/* 801741DC 0017111C 48 0F D8 D9 */ bl Xyz__7cSGlobeCFv /* 801741E0 00171120 38 61 04 40 */ addi r3, r1, 0x440 /* 801741E4 00171124 38 81 13 AC */ addi r4, r1, 0x13ac /* 801741E8 00171128 38 A1 04 4C */ addi r5, r1, 0x44c -/* 801741EC 0017112C 48 0F 28 F9 */ bl cXyz_NS___pl +/* 801741EC 0017112C 48 0F 28 F9 */ bl __pl__4cXyzCFRC3Vec /* 801741F0 00171130 38 7F 00 70 */ addi r3, r31, 0x70 /* 801741F4 00171134 38 81 04 40 */ addi r4, r1, 0x440 /* 801741F8 00171138 4B F2 35 E1 */ bl cXyz_NS___as @@ -6164,10 +6164,10 @@ lbl_8017414C: /* 80174214 00171154 38 61 04 34 */ addi r3, r1, 0x434 /* 80174218 00171158 38 9F 00 70 */ addi r4, r31, 0x70 /* 8017421C 0017115C 38 BF 00 64 */ addi r5, r31, 0x64 -/* 80174220 00171160 48 0F 29 15 */ bl cXyz_NS___mi +/* 80174220 00171160 48 0F 29 15 */ bl __mi__4cXyzCFRC3Vec /* 80174224 00171164 38 7F 00 5C */ addi r3, r31, 0x5c /* 80174228 00171168 38 81 04 34 */ addi r4, r1, 0x434 -/* 8017422C 0017116C 48 0F D8 45 */ bl cSGlobe_NS_Val_X3_ +/* 8017422C 0017116C 48 0F D8 45 */ bl Val__7cSGlobeFRC4cXyz /* 80174230 00171170 38 61 04 34 */ addi r3, r1, 0x434 /* 80174234 00171174 38 80 FF FF */ li r4, -1 /* 80174238 00171178 4B E9 4F 4D */ bl cXyz_NS_dtor @@ -6192,7 +6192,7 @@ lbl_80174260: /* 80174280 001711C0 4B FC D6 DD */ bl cXyz_X2_ /* 80174284 001711C4 38 61 02 58 */ addi r3, r1, 0x258 /* 80174288 001711C8 38 81 11 D8 */ addi r4, r1, 0x11d8 -/* 8017428C 001711CC 48 0F D5 F5 */ bl cSGlobe_X4_ +/* 8017428C 001711CC 48 0F D5 F5 */ bl __ct__7cSGlobeFRC4cXyz /* 80174290 001711D0 38 61 00 64 */ addi r3, r1, 0x64 /* 80174294 001711D4 7F E4 FB 78 */ mr r4, r31 /* 80174298 001711D8 7F A5 EB 78 */ mr r5, r29 @@ -6202,7 +6202,7 @@ lbl_80174260: /* 801742A8 001711E8 7C 64 1B 78 */ mr r4, r3 /* 801742AC 001711EC 38 61 00 60 */ addi r3, r1, 0x60 /* 801742B0 001711F0 38 A1 00 64 */ addi r5, r1, 0x64 -/* 801742B4 001711F4 48 0F CE C1 */ bl cSAngle_NS___pl +/* 801742B4 001711F4 48 0F CE C1 */ bl __pl__7cSAngleCFRC7cSAngle /* 801742B8 001711F8 38 61 02 58 */ addi r3, r1, 0x258 /* 801742BC 001711FC 38 81 00 60 */ addi r4, r1, 0x60 /* 801742C0 00171200 4B F1 A5 D5 */ bl cSGlobe_NS_U @@ -6218,11 +6218,11 @@ lbl_80174260: /* 801742E8 00171228 4B F2 34 35 */ bl dCamera_c_NS_attentionPos /* 801742EC 0017122C 38 61 04 1C */ addi r3, r1, 0x41c /* 801742F0 00171230 38 81 02 58 */ addi r4, r1, 0x258 -/* 801742F4 00171234 48 0F D7 C1 */ bl cSGlobe_NS_Xyz +/* 801742F4 00171234 48 0F D7 C1 */ bl Xyz__7cSGlobeCFv /* 801742F8 00171238 38 61 04 10 */ addi r3, r1, 0x410 /* 801742FC 0017123C 38 81 04 28 */ addi r4, r1, 0x428 /* 80174300 00171240 38 A1 04 1C */ addi r5, r1, 0x41c -/* 80174304 00171244 48 0F 27 E1 */ bl cXyz_NS___pl +/* 80174304 00171244 48 0F 27 E1 */ bl __pl__4cXyzCFRC3Vec /* 80174308 00171248 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017430C 0017124C 38 81 04 10 */ addi r4, r1, 0x410 /* 80174310 00171250 4B F2 34 C9 */ bl cXyz_NS___as @@ -6237,10 +6237,10 @@ lbl_80174260: /* 80174334 00171274 4B E9 4E 51 */ bl cXyz_NS_dtor /* 80174338 00171278 38 61 00 5C */ addi r3, r1, 0x5c /* 8017433C 0017127C C0 22 9C B0 */ lfs f1, lbl_804536B0-_SDA2_BASE_(r2) -/* 80174340 00171280 48 0F CC 89 */ bl cSAngle_X3_ +/* 80174340 00171280 48 0F CC 89 */ bl __ct__7cSAngleFf /* 80174344 00171284 38 61 00 58 */ addi r3, r1, 0x58 /* 80174348 00171288 C0 22 9E 34 */ lfs f1, lbl_80453834-_SDA2_BASE_(r2) -/* 8017434C 0017128C 48 0F CC 7D */ bl cSAngle_X3_ +/* 8017434C 0017128C 48 0F CC 7D */ bl __ct__7cSAngleFf /* 80174350 00171290 38 61 00 54 */ addi r3, r1, 0x54 /* 80174354 00171294 7F E4 FB 78 */ mr r4, r31 /* 80174358 00171298 7F A5 EB 78 */ mr r5, r29 @@ -6248,12 +6248,12 @@ lbl_80174260: /* 80174360 001712A0 38 61 00 50 */ addi r3, r1, 0x50 /* 80174364 001712A4 38 81 00 58 */ addi r4, r1, 0x58 /* 80174368 001712A8 38 A1 00 54 */ addi r5, r1, 0x54 -/* 8017436C 001712AC 48 0F CE 09 */ bl cSAngle_NS___pl +/* 8017436C 001712AC 48 0F CE 09 */ bl __pl__7cSAngleCFRC7cSAngle /* 80174370 001712B0 38 7F 00 5C */ addi r3, r31, 0x5c /* 80174374 001712B4 C0 22 9E 44 */ lfs f1, lbl_80453844-_SDA2_BASE_(r2) /* 80174378 001712B8 38 81 00 5C */ addi r4, r1, 0x5c /* 8017437C 001712BC 38 A1 00 50 */ addi r5, r1, 0x50 -/* 80174380 001712C0 48 0F D6 89 */ bl cSGlobe_NS_Val_X2_ +/* 80174380 001712C0 48 0F D6 89 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80174384 001712C4 38 61 00 50 */ addi r3, r1, 0x50 /* 80174388 001712C8 38 80 FF FF */ li r4, -1 /* 8017438C 001712CC 4B EB C1 85 */ bl cSAngle_NS_dtor @@ -6270,11 +6270,11 @@ lbl_80174260: /* 801743B8 001712F8 98 1F 01 58 */ stb r0, 0x158(r31) /* 801743BC 001712FC 38 61 04 04 */ addi r3, r1, 0x404 /* 801743C0 00171300 38 9F 00 5C */ addi r4, r31, 0x5c -/* 801743C4 00171304 48 0F D6 F1 */ bl cSGlobe_NS_Xyz +/* 801743C4 00171304 48 0F D6 F1 */ bl Xyz__7cSGlobeCFv /* 801743C8 00171308 38 61 03 F8 */ addi r3, r1, 0x3f8 /* 801743CC 0017130C 38 9F 00 64 */ addi r4, r31, 0x64 /* 801743D0 00171310 38 A1 04 04 */ addi r5, r1, 0x404 -/* 801743D4 00171314 48 0F 27 11 */ bl cXyz_NS___pl +/* 801743D4 00171314 48 0F 27 11 */ bl __pl__4cXyzCFRC3Vec /* 801743D8 00171318 38 7F 00 70 */ addi r3, r31, 0x70 /* 801743DC 0017131C 38 81 03 F8 */ addi r4, r1, 0x3f8 /* 801743E0 00171320 4B F2 33 F9 */ bl cXyz_NS___as @@ -6308,7 +6308,7 @@ lbl_80174260: /* 80174450 00171390 40 82 00 8C */ bne lbl_801744DC /* 80174454 00171394 38 61 00 4C */ addi r3, r1, 0x4c /* 80174458 00171398 C0 22 9D 68 */ lfs f1, lbl_80453768-_SDA2_BASE_(r2) -/* 8017445C 0017139C 48 0F CB 6D */ bl cSAngle_X3_ +/* 8017445C 0017139C 48 0F CB 6D */ bl __ct__7cSAngleFf /* 80174460 001713A0 38 7F 00 5C */ addi r3, r31, 0x5c /* 80174464 001713A4 38 81 00 4C */ addi r4, r1, 0x4c /* 80174468 001713A8 4B F1 B5 F1 */ bl cSGlobe_NS_V @@ -6323,10 +6323,10 @@ lbl_80174260: /* 8017448C 001713CC 7F A5 EB 78 */ mr r5, r29 /* 80174490 001713D0 4B F2 32 A9 */ bl dCamera_c_NS_directionOf /* 80174494 001713D4 38 61 00 48 */ addi r3, r1, 0x48 -/* 80174498 001713D8 48 0F CC 51 */ bl cSAngle_NS_Inv +/* 80174498 001713D8 48 0F CC 51 */ bl Inv__7cSAngleCFv /* 8017449C 001713DC 7C 64 1B 78 */ mr r4, r3 /* 801744A0 001713E0 38 61 00 44 */ addi r3, r1, 0x44 -/* 801744A4 001713E4 48 0F CA F5 */ bl cSAngle_X2_ +/* 801744A4 001713E4 48 0F CA F5 */ bl __ct__7cSAngleFs /* 801744A8 001713E8 38 7F 00 5C */ addi r3, r31, 0x5c /* 801744AC 001713EC 38 81 00 44 */ addi r4, r1, 0x44 /* 801744B0 001713F0 4B F1 A3 E5 */ bl cSGlobe_NS_U @@ -6347,11 +6347,11 @@ lbl_801744DC: /* 801744E8 00171428 D0 1F 00 68 */ stfs f0, 0x68(r31) /* 801744EC 0017142C 38 61 03 E0 */ addi r3, r1, 0x3e0 /* 801744F0 00171430 38 9F 00 5C */ addi r4, r31, 0x5c -/* 801744F4 00171434 48 0F D5 C1 */ bl cSGlobe_NS_Xyz +/* 801744F4 00171434 48 0F D5 C1 */ bl Xyz__7cSGlobeCFv /* 801744F8 00171438 38 61 03 D4 */ addi r3, r1, 0x3d4 /* 801744FC 0017143C 38 9F 00 64 */ addi r4, r31, 0x64 /* 80174500 00171440 38 A1 03 E0 */ addi r5, r1, 0x3e0 -/* 80174504 00171444 48 0F 25 E1 */ bl cXyz_NS___pl +/* 80174504 00171444 48 0F 25 E1 */ bl __pl__4cXyzCFRC3Vec /* 80174508 00171448 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017450C 0017144C 38 81 03 D4 */ addi r4, r1, 0x3d4 /* 80174510 00171450 4B F2 32 C9 */ bl cXyz_NS___as @@ -6417,7 +6417,7 @@ lbl_801745EC: /* 801745FC 0017153C 4B FC D3 61 */ bl cXyz_X2_ /* 80174600 00171540 38 61 02 50 */ addi r3, r1, 0x250 /* 80174604 00171544 38 81 11 CC */ addi r4, r1, 0x11cc -/* 80174608 00171548 48 0F D2 79 */ bl cSGlobe_X4_ +/* 80174608 00171548 48 0F D2 79 */ bl __ct__7cSGlobeFRC4cXyz /* 8017460C 0017154C 38 61 00 40 */ addi r3, r1, 0x40 /* 80174610 00171550 7F E4 FB 78 */ mr r4, r31 /* 80174614 00171554 7F A5 EB 78 */ mr r5, r29 @@ -6427,7 +6427,7 @@ lbl_801745EC: /* 80174624 00171564 7C 64 1B 78 */ mr r4, r3 /* 80174628 00171568 38 61 00 3C */ addi r3, r1, 0x3c /* 8017462C 0017156C 38 A1 00 40 */ addi r5, r1, 0x40 -/* 80174630 00171570 48 0F CB 45 */ bl cSAngle_NS___pl +/* 80174630 00171570 48 0F CB 45 */ bl __pl__7cSAngleCFRC7cSAngle /* 80174634 00171574 38 61 02 50 */ addi r3, r1, 0x250 /* 80174638 00171578 38 81 00 3C */ addi r4, r1, 0x3c /* 8017463C 0017157C 4B F1 A2 59 */ bl cSGlobe_NS_U @@ -6439,11 +6439,11 @@ lbl_801745EC: /* 80174654 00171594 4B EB BE BD */ bl cSAngle_NS_dtor /* 80174658 00171598 38 61 03 98 */ addi r3, r1, 0x398 /* 8017465C 0017159C 38 81 02 50 */ addi r4, r1, 0x250 -/* 80174660 001715A0 48 0F D4 55 */ bl cSGlobe_NS_Xyz +/* 80174660 001715A0 48 0F D4 55 */ bl Xyz__7cSGlobeCFv /* 80174664 001715A4 38 61 03 8C */ addi r3, r1, 0x38c /* 80174668 001715A8 38 81 13 A0 */ addi r4, r1, 0x13a0 /* 8017466C 001715AC 38 A1 03 98 */ addi r5, r1, 0x398 -/* 80174670 001715B0 48 0F 24 75 */ bl cXyz_NS___pl +/* 80174670 001715B0 48 0F 24 75 */ bl __pl__4cXyzCFRC3Vec /* 80174674 001715B4 38 7F 04 78 */ addi r3, r31, 0x478 /* 80174678 001715B8 38 81 03 8C */ addi r4, r1, 0x38c /* 8017467C 001715BC 4B F2 31 5D */ bl cXyz_NS___as @@ -6459,7 +6459,7 @@ lbl_801745EC: /* 801746A4 001715E4 40 82 00 60 */ bne lbl_80174704 /* 801746A8 001715E8 38 61 01 F0 */ addi r3, r1, 0x1f0 /* 801746AC 001715EC C0 22 9E 84 */ lfs f1, lbl_80453884-_SDA2_BASE_(r2) -/* 801746B0 001715F0 48 0F C9 5D */ bl cSAngle_NS_Val_X3_ +/* 801746B0 001715F0 48 0F C9 5D */ bl Val__7cSAngleFf /* 801746B4 001715F4 38 61 00 38 */ addi r3, r1, 0x38 /* 801746B8 001715F8 7F E4 FB 78 */ mr r4, r31 /* 801746BC 001715FC 7F A5 EB 78 */ mr r5, r29 @@ -6467,12 +6467,12 @@ lbl_801745EC: /* 801746C4 00171604 38 61 00 34 */ addi r3, r1, 0x34 /* 801746C8 00171608 38 81 01 F0 */ addi r4, r1, 0x1f0 /* 801746CC 0017160C 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801746D0 00171610 48 0F CA A5 */ bl cSAngle_NS___pl +/* 801746D0 00171610 48 0F CA A5 */ bl __pl__7cSAngleCFRC7cSAngle /* 801746D4 00171614 38 7F 04 90 */ addi r3, r31, 0x490 /* 801746D8 00171618 C0 22 9D 10 */ lfs f1, lbl_80453710-_SDA2_BASE_(r2) /* 801746DC 0017161C 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 801746E0 00171620 38 A1 00 34 */ addi r5, r1, 0x34 -/* 801746E4 00171624 48 0F D3 25 */ bl cSGlobe_NS_Val_X2_ +/* 801746E4 00171624 48 0F D3 25 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 801746E8 00171628 38 61 00 34 */ addi r3, r1, 0x34 /* 801746EC 0017162C 38 80 FF FF */ li r4, -1 /* 801746F0 00171630 4B EB BE 21 */ bl cSAngle_NS_dtor @@ -6483,7 +6483,7 @@ lbl_801745EC: lbl_80174704: /* 80174704 00171644 38 61 01 F0 */ addi r3, r1, 0x1f0 /* 80174708 00171648 C0 22 9E 60 */ lfs f1, lbl_80453860-_SDA2_BASE_(r2) -/* 8017470C 0017164C 48 0F C9 01 */ bl cSAngle_NS_Val_X3_ +/* 8017470C 0017164C 48 0F C9 01 */ bl Val__7cSAngleFf /* 80174710 00171650 38 61 00 30 */ addi r3, r1, 0x30 /* 80174714 00171654 7F E4 FB 78 */ mr r4, r31 /* 80174718 00171658 7F A5 EB 78 */ mr r5, r29 @@ -6491,12 +6491,12 @@ lbl_80174704: /* 80174720 00171660 38 61 00 2C */ addi r3, r1, 0x2c /* 80174724 00171664 38 81 01 F0 */ addi r4, r1, 0x1f0 /* 80174728 00171668 38 A1 00 30 */ addi r5, r1, 0x30 -/* 8017472C 0017166C 48 0F CA 49 */ bl cSAngle_NS___pl +/* 8017472C 0017166C 48 0F CA 49 */ bl __pl__7cSAngleCFRC7cSAngle /* 80174730 00171670 38 7F 04 90 */ addi r3, r31, 0x490 /* 80174734 00171674 C0 22 9E 7C */ lfs f1, lbl_8045387C-_SDA2_BASE_(r2) /* 80174738 00171678 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 8017473C 0017167C 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80174740 00171680 48 0F D2 C9 */ bl cSGlobe_NS_Val_X2_ +/* 80174740 00171680 48 0F D2 C9 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80174744 00171684 38 61 00 2C */ addi r3, r1, 0x2c /* 80174748 00171688 38 80 FF FF */ li r4, -1 /* 8017474C 0017168C 4B EB BD C5 */ bl cSAngle_NS_dtor @@ -6508,11 +6508,11 @@ lbl_8017475C: /* 80174760 001716A0 D0 1F 04 98 */ stfs f0, 0x498(r31) /* 80174764 001716A4 38 61 03 80 */ addi r3, r1, 0x380 /* 80174768 001716A8 38 9F 04 90 */ addi r4, r31, 0x490 -/* 8017476C 001716AC 48 0F D3 49 */ bl cSGlobe_NS_Xyz +/* 8017476C 001716AC 48 0F D3 49 */ bl Xyz__7cSGlobeCFv /* 80174770 001716B0 38 61 03 74 */ addi r3, r1, 0x374 /* 80174774 001716B4 38 9F 04 78 */ addi r4, r31, 0x478 /* 80174778 001716B8 38 A1 03 80 */ addi r5, r1, 0x380 -/* 8017477C 001716BC 48 0F 23 69 */ bl cXyz_NS___pl +/* 8017477C 001716BC 48 0F 23 69 */ bl __pl__4cXyzCFRC3Vec /* 80174780 001716C0 38 7F 04 84 */ addi r3, r31, 0x484 /* 80174784 001716C4 38 81 03 74 */ addi r4, r1, 0x374 /* 80174788 001716C8 4B F2 30 51 */ bl cXyz_NS___as @@ -6567,7 +6567,7 @@ lbl_8017483C: /* 80174848 00171788 D0 1F 04 7C */ stfs f0, 0x47c(r31) /* 8017484C 0017178C 38 61 00 28 */ addi r3, r1, 0x28 /* 80174850 00171790 C0 22 9E 30 */ lfs f1, lbl_80453830-_SDA2_BASE_(r2) -/* 80174854 00171794 48 0F C7 75 */ bl cSAngle_X3_ +/* 80174854 00171794 48 0F C7 75 */ bl __ct__7cSAngleFf /* 80174858 00171798 38 61 00 24 */ addi r3, r1, 0x24 /* 8017485C 0017179C 7F E4 FB 78 */ mr r4, r31 /* 80174860 001717A0 7F A5 EB 78 */ mr r5, r29 @@ -6575,12 +6575,12 @@ lbl_8017483C: /* 80174868 001717A8 38 61 00 20 */ addi r3, r1, 0x20 /* 8017486C 001717AC 38 81 01 F0 */ addi r4, r1, 0x1f0 /* 80174870 001717B0 38 A1 00 24 */ addi r5, r1, 0x24 -/* 80174874 001717B4 48 0F C9 01 */ bl cSAngle_NS___pl +/* 80174874 001717B4 48 0F C9 01 */ bl __pl__7cSAngleCFRC7cSAngle /* 80174878 001717B8 38 7F 04 90 */ addi r3, r31, 0x490 /* 8017487C 001717BC C0 22 9D E8 */ lfs f1, lbl_804537E8-_SDA2_BASE_(r2) /* 80174880 001717C0 38 81 00 28 */ addi r4, r1, 0x28 /* 80174884 001717C4 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80174888 001717C8 48 0F D1 81 */ bl cSGlobe_NS_Val_X2_ +/* 80174888 001717C8 48 0F D1 81 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8017488C 001717CC 38 61 00 20 */ addi r3, r1, 0x20 /* 80174890 001717D0 38 80 FF FF */ li r4, -1 /* 80174894 001717D4 4B EB BC 7D */ bl cSAngle_NS_dtor @@ -6592,11 +6592,11 @@ lbl_8017483C: /* 801748AC 001717EC 4B EB BC 65 */ bl cSAngle_NS_dtor /* 801748B0 001717F0 38 61 03 44 */ addi r3, r1, 0x344 /* 801748B4 001717F4 38 9F 04 90 */ addi r4, r31, 0x490 -/* 801748B8 001717F8 48 0F D1 FD */ bl cSGlobe_NS_Xyz +/* 801748B8 001717F8 48 0F D1 FD */ bl Xyz__7cSGlobeCFv /* 801748BC 001717FC 38 61 03 38 */ addi r3, r1, 0x338 /* 801748C0 00171800 38 9F 04 78 */ addi r4, r31, 0x478 /* 801748C4 00171804 38 A1 03 44 */ addi r5, r1, 0x344 -/* 801748C8 00171808 48 0F 22 1D */ bl cXyz_NS___pl +/* 801748C8 00171808 48 0F 22 1D */ bl __pl__4cXyzCFRC3Vec /* 801748CC 0017180C 38 7F 04 84 */ addi r3, r31, 0x484 /* 801748D0 00171810 38 81 03 38 */ addi r4, r1, 0x338 /* 801748D4 00171814 4B F2 2F 05 */ bl cXyz_NS___as @@ -6698,11 +6698,11 @@ lbl_80174A10: /* 80174A38 00171978 4B F1 9D 3D */ bl cSGlobe_NS___as /* 80174A3C 0017197C 38 61 03 14 */ addi r3, r1, 0x314 /* 80174A40 00171980 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80174A44 00171984 48 0F D0 71 */ bl cSGlobe_NS_Xyz +/* 80174A44 00171984 48 0F D0 71 */ bl Xyz__7cSGlobeCFv /* 80174A48 00171988 38 61 03 08 */ addi r3, r1, 0x308 /* 80174A4C 0017198C 38 9F 00 64 */ addi r4, r31, 0x64 /* 80174A50 00171990 38 A1 03 14 */ addi r5, r1, 0x314 -/* 80174A54 00171994 48 0F 20 91 */ bl cXyz_NS___pl +/* 80174A54 00171994 48 0F 20 91 */ bl __pl__4cXyzCFRC3Vec /* 80174A58 00171998 38 7F 00 70 */ addi r3, r31, 0x70 /* 80174A5C 0017199C 38 81 03 08 */ addi r4, r1, 0x308 /* 80174A60 001719A0 4B F2 2D 79 */ bl cXyz_NS___as @@ -6740,11 +6740,11 @@ lbl_80174A88: /* 80174ADC 00171A1C 38 61 02 FC */ addi r3, r1, 0x2fc /* 80174AE0 00171A20 38 9F 03 EC */ addi r4, r31, 0x3ec /* 80174AE4 00171A24 38 BF 00 64 */ addi r5, r31, 0x64 -/* 80174AE8 00171A28 48 0F 20 4D */ bl cXyz_NS___mi +/* 80174AE8 00171A28 48 0F 20 4D */ bl __mi__4cXyzCFRC3Vec /* 80174AEC 00171A2C 38 61 02 F0 */ addi r3, r1, 0x2f0 /* 80174AF0 00171A30 38 81 02 FC */ addi r4, r1, 0x2fc /* 80174AF4 00171A34 FC 20 88 90 */ fmr f1, f17 -/* 80174AF8 00171A38 48 0F 20 8D */ bl cXyz_NS___ml +/* 80174AF8 00171A38 48 0F 20 8D */ bl __ml__4cXyzCFf /* 80174AFC 00171A3C 38 7F 00 64 */ addi r3, r31, 0x64 /* 80174B00 00171A40 38 81 02 F0 */ addi r4, r1, 0x2f0 /* 80174B04 00171A44 4B F1 9E 01 */ bl cXyz_NS___apl @@ -6774,17 +6774,17 @@ lbl_80174A88: /* 80174B64 00171AA4 7C 64 1B 78 */ mr r4, r3 /* 80174B68 00171AA8 38 61 00 1C */ addi r3, r1, 0x1c /* 80174B6C 00171AAC 7E C5 B3 78 */ mr r5, r22 -/* 80174B70 00171AB0 48 0F C6 35 */ bl cSAngle_NS___mi_X1_ +/* 80174B70 00171AB0 48 0F C6 35 */ bl __mi__7cSAngleCFRC7cSAngle /* 80174B74 00171AB4 38 61 00 18 */ addi r3, r1, 0x18 /* 80174B78 00171AB8 38 81 00 1C */ addi r4, r1, 0x1c /* 80174B7C 00171ABC FC 20 88 90 */ fmr f1, f17 -/* 80174B80 00171AC0 48 0F C6 E5 */ bl cSAngle_NS___ml +/* 80174B80 00171AC0 48 0F C6 E5 */ bl __ml__7cSAngleCFf /* 80174B84 00171AC4 38 7F 00 5C */ addi r3, r31, 0x5c /* 80174B88 00171AC8 48 00 DE 81 */ bl cSGlobe_NS_V_X1_ /* 80174B8C 00171ACC 7C 64 1B 78 */ mr r4, r3 /* 80174B90 00171AD0 38 61 00 14 */ addi r3, r1, 0x14 /* 80174B94 00171AD4 38 A1 00 18 */ addi r5, r1, 0x18 -/* 80174B98 00171AD8 48 0F C5 DD */ bl cSAngle_NS___pl +/* 80174B98 00171AD8 48 0F C5 DD */ bl __pl__7cSAngleCFRC7cSAngle /* 80174B9C 00171ADC 38 7F 00 5C */ addi r3, r31, 0x5c /* 80174BA0 00171AE0 38 81 00 14 */ addi r4, r1, 0x14 /* 80174BA4 00171AE4 4B F1 AE B5 */ bl cSGlobe_NS_V @@ -6805,17 +6805,17 @@ lbl_80174A88: /* 80174BE0 00171B20 7C 64 1B 78 */ mr r4, r3 /* 80174BE4 00171B24 38 61 00 10 */ addi r3, r1, 0x10 /* 80174BE8 00171B28 7E C5 B3 78 */ mr r5, r22 -/* 80174BEC 00171B2C 48 0F C5 B9 */ bl cSAngle_NS___mi_X1_ +/* 80174BEC 00171B2C 48 0F C5 B9 */ bl __mi__7cSAngleCFRC7cSAngle /* 80174BF0 00171B30 38 61 00 0C */ addi r3, r1, 0xc /* 80174BF4 00171B34 38 81 00 10 */ addi r4, r1, 0x10 /* 80174BF8 00171B38 FC 20 88 90 */ fmr f1, f17 -/* 80174BFC 00171B3C 48 0F C6 69 */ bl cSAngle_NS___ml +/* 80174BFC 00171B3C 48 0F C6 69 */ bl __ml__7cSAngleCFf /* 80174C00 00171B40 38 7F 00 5C */ addi r3, r31, 0x5c /* 80174C04 00171B44 48 00 E0 81 */ bl cSGlobe_NS_U_X1_ /* 80174C08 00171B48 7C 64 1B 78 */ mr r4, r3 /* 80174C0C 00171B4C 38 61 00 08 */ addi r3, r1, 8 /* 80174C10 00171B50 38 A1 00 0C */ addi r5, r1, 0xc -/* 80174C14 00171B54 48 0F C5 61 */ bl cSAngle_NS___pl +/* 80174C14 00171B54 48 0F C5 61 */ bl __pl__7cSAngleCFRC7cSAngle /* 80174C18 00171B58 38 7F 00 5C */ addi r3, r31, 0x5c /* 80174C1C 00171B5C 38 81 00 08 */ addi r4, r1, 8 /* 80174C20 00171B60 4B F1 9C 75 */ bl cSGlobe_NS_U @@ -6830,11 +6830,11 @@ lbl_80174A88: /* 80174C44 00171B84 4B EB B8 CD */ bl cSAngle_NS_dtor /* 80174C48 00171B88 38 61 02 E4 */ addi r3, r1, 0x2e4 /* 80174C4C 00171B8C 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80174C50 00171B90 48 0F CE 65 */ bl cSGlobe_NS_Xyz +/* 80174C50 00171B90 48 0F CE 65 */ bl Xyz__7cSGlobeCFv /* 80174C54 00171B94 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 80174C58 00171B98 38 9F 00 64 */ addi r4, r31, 0x64 /* 80174C5C 00171B9C 38 A1 02 E4 */ addi r5, r1, 0x2e4 -/* 80174C60 00171BA0 48 0F 1E 85 */ bl cXyz_NS___pl +/* 80174C60 00171BA0 48 0F 1E 85 */ bl __pl__4cXyzCFRC3Vec /* 80174C64 00171BA4 38 7F 00 70 */ addi r3, r31, 0x70 /* 80174C68 00171BA8 38 81 02 D8 */ addi r4, r1, 0x2d8 /* 80174C6C 00171BAC 4B F2 2B 6D */ bl cXyz_NS___as diff --git a/include/d/d_camera/asm/func_80174ED4.s b/include/d/d_camera/asm/func_80174ED4.s index 0884c709dd..5e3ec8e71c 100644 --- a/include/d/d_camera/asm/func_80174ED4.s +++ b/include/d/d_camera/asm/func_80174ED4.s @@ -88,13 +88,13 @@ /* 80175030 00171F70 90 1F 03 E8 */ stw r0, 0x3e8(r31) /* 80175034 00171F74 3A FF 00 62 */ addi r23, r31, 0x62 /* 80175038 00171F78 7E E3 BB 78 */ mr r3, r23 -/* 8017503C 00171F7C 48 0F C0 AD */ bl cSAngle_NS_Inv +/* 8017503C 00171F7C 48 0F C0 AD */ bl Inv__7cSAngleCFv /* 80175040 00171F80 7C 64 1B 78 */ mr r4, r3 /* 80175044 00171F84 38 7F 04 12 */ addi r3, r31, 0x412 -/* 80175048 00171F88 48 0F BF BD */ bl cSAngle_NS_Val_X2_ +/* 80175048 00171F88 48 0F BF BD */ bl Val__7cSAngleFs /* 8017504C 00171F8C 38 7F 04 10 */ addi r3, r31, 0x410 /* 80175050 00171F90 38 9F 00 60 */ addi r4, r31, 0x60 -/* 80175054 00171F94 48 0F BF A5 */ bl cSAngle_NS_Val_X1_ +/* 80175054 00171F94 48 0F BF A5 */ bl Val__7cSAngleFRC7cSAngle /* 80175058 00171F98 38 00 00 07 */ li r0, 7 /* 8017505C 00171F9C 90 1F 03 FC */ stw r0, 0x3fc(r31) /* 80175060 00171FA0 80 7F 01 7C */ lwz r3, 0x17c(r31) @@ -127,7 +127,7 @@ lbl_801750B4: /* 801750C4 00172004 38 61 00 44 */ addi r3, r1, 0x44 /* 801750C8 00172008 38 81 00 48 */ addi r4, r1, 0x48 /* 801750CC 0017200C 7E E5 BB 78 */ mr r5, r23 -/* 801750D0 00172010 48 0F C0 D5 */ bl cSAngle_NS___mi_X1_ +/* 801750D0 00172010 48 0F C0 D5 */ bl __mi__7cSAngleCFRC7cSAngle /* 801750D4 00172014 A8 81 00 44 */ lha r4, 0x44(r1) /* 801750D8 00172018 A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) /* 801750DC 0017201C 7C 80 02 78 */ xor r0, r4, r0 @@ -164,7 +164,7 @@ lbl_80175120: /* 8017514C 0017208C 3A DD 2C 78 */ addi r22, r29, 0x2c78 /* 80175150 00172090 38 61 00 40 */ addi r3, r1, 0x40 /* 80175154 00172094 A8 9D 31 18 */ lha r4, 0x3118(r29) -/* 80175158 00172098 48 0F BE 41 */ bl cSAngle_X2_ +/* 80175158 00172098 48 0F BE 41 */ bl __ct__7cSAngleFs /* 8017515C 0017209C A8 01 00 40 */ lha r0, 0x40(r1) /* 80175160 001720A0 B0 01 00 58 */ sth r0, 0x58(r1) /* 80175164 001720A4 48 00 00 3C */ b lbl_801751A0 @@ -186,10 +186,10 @@ lbl_80175168: lbl_801751A0: /* 801751A0 001720E0 38 61 00 50 */ addi r3, r1, 0x50 /* 801751A4 001720E4 A8 9D 31 0A */ lha r4, 0x310a(r29) -/* 801751A8 001720E8 48 0F BD F1 */ bl cSAngle_X2_ +/* 801751A8 001720E8 48 0F BD F1 */ bl __ct__7cSAngleFs /* 801751AC 001720EC 38 61 00 4C */ addi r3, r1, 0x4c /* 801751B0 001720F0 A8 9D 31 0C */ lha r4, 0x310c(r29) -/* 801751B4 001720F4 48 0F BD E5 */ bl cSAngle_X2_ +/* 801751B4 001720F4 48 0F BD E5 */ bl __ct__7cSAngleFs /* 801751B8 001720F8 7F A3 EB 78 */ mr r3, r29 /* 801751BC 001720FC 38 81 00 56 */ addi r4, r1, 0x56 /* 801751C0 00172100 38 A1 00 54 */ addi r5, r1, 0x54 @@ -207,10 +207,10 @@ lbl_801751A0: /* 801751F0 00172130 4B F2 25 E9 */ bl cXyz_NS___as /* 801751F4 00172134 38 61 00 50 */ addi r3, r1, 0x50 /* 801751F8 00172138 A8 81 00 56 */ lha r4, 0x56(r1) -/* 801751FC 0017213C 48 0F BE 09 */ bl cSAngle_NS_Val_X2_ +/* 801751FC 0017213C 48 0F BE 09 */ bl Val__7cSAngleFs /* 80175200 00172140 38 61 00 4C */ addi r3, r1, 0x4c /* 80175204 00172144 A8 81 00 54 */ lha r4, 0x54(r1) -/* 80175208 00172148 48 0F BD FD */ bl cSAngle_NS_Val_X2_ +/* 80175208 00172148 48 0F BD FD */ bl Val__7cSAngleFs /* 8017520C 0017214C 48 00 01 9C */ b lbl_801753A8 lbl_80175210: /* 80175210 00172150 57 60 06 3F */ clrlwi. r0, r27, 0x18 @@ -254,14 +254,14 @@ lbl_8017525C: /* 801752A0 001721E0 38 61 02 24 */ addi r3, r1, 0x224 /* 801752A4 001721E4 38 81 02 D8 */ addi r4, r1, 0x2d8 /* 801752A8 001721E8 7E A5 AB 78 */ mr r5, r21 -/* 801752AC 001721EC 48 0F 18 89 */ bl cXyz_NS___mi +/* 801752AC 001721EC 48 0F 18 89 */ bl __mi__4cXyzCFRC3Vec /* 801752B0 001721F0 38 61 00 6C */ addi r3, r1, 0x6c /* 801752B4 001721F4 38 81 02 24 */ addi r4, r1, 0x224 -/* 801752B8 001721F8 48 0F C5 C9 */ bl cSGlobe_X4_ +/* 801752B8 001721F8 48 0F C5 C9 */ bl __ct__7cSGlobeFRC4cXyz /* 801752BC 001721FC 38 61 02 18 */ addi r3, r1, 0x218 /* 801752C0 00172200 7E A4 AB 78 */ mr r4, r21 /* 801752C4 00172204 38 A1 02 D8 */ addi r5, r1, 0x2d8 -/* 801752C8 00172208 48 0F 18 6D */ bl cXyz_NS___mi +/* 801752C8 00172208 48 0F 18 6D */ bl __mi__4cXyzCFRC3Vec /* 801752CC 0017220C 38 61 02 0C */ addi r3, r1, 0x20c /* 801752D0 00172210 38 81 02 18 */ addi r4, r1, 0x218 /* 801752D4 00172214 4B F2 25 21 */ bl cXyz_X1_ @@ -273,10 +273,10 @@ lbl_8017525C: /* 801752EC 0017222C A8 01 00 70 */ lha r0, 0x70(r1) /* 801752F0 00172230 B0 01 00 50 */ sth r0, 0x50(r1) /* 801752F4 00172234 38 61 00 72 */ addi r3, r1, 0x72 -/* 801752F8 00172238 48 0F BD F1 */ bl cSAngle_NS_Inv +/* 801752F8 00172238 48 0F BD F1 */ bl Inv__7cSAngleCFv /* 801752FC 0017223C 7C 64 1B 78 */ mr r4, r3 /* 80175300 00172240 38 61 00 38 */ addi r3, r1, 0x38 -/* 80175304 00172244 48 0F BC 95 */ bl cSAngle_X2_ +/* 80175304 00172244 48 0F BC 95 */ bl __ct__7cSAngleFs /* 80175308 00172248 A8 01 00 38 */ lha r0, 0x38(r1) /* 8017530C 0017224C B0 01 00 4C */ sth r0, 0x4c(r1) /* 80175310 00172250 48 00 00 14 */ b lbl_80175324 @@ -288,10 +288,10 @@ lbl_80175314: lbl_80175324: /* 80175324 00172264 38 61 00 34 */ addi r3, r1, 0x34 /* 80175328 00172268 C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) -/* 8017532C 0017226C 48 0F BC 9D */ bl cSAngle_X3_ +/* 8017532C 0017226C 48 0F BC 9D */ bl __ct__7cSAngleFf /* 80175330 00172270 38 61 00 50 */ addi r3, r1, 0x50 /* 80175334 00172274 38 81 00 34 */ addi r4, r1, 0x34 -/* 80175338 00172278 48 0F BE 9D */ bl cSAngle_NS___apl +/* 80175338 00172278 48 0F BE 9D */ bl __apl__7cSAngleFRC7cSAngle /* 8017533C 0017227C 38 61 00 6C */ addi r3, r1, 0x6c /* 80175340 00172280 38 80 FF FF */ li r4, -1 /* 80175344 00172284 4B EF C3 39 */ bl cSGlobe_NS_dtor @@ -312,10 +312,10 @@ lbl_8017534C: /* 8017537C 001722BC B0 1F 04 12 */ sth r0, 0x412(r31) /* 80175380 001722C0 38 61 00 30 */ addi r3, r1, 0x30 /* 80175384 001722C4 C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) -/* 80175388 001722C8 48 0F BC 41 */ bl cSAngle_X3_ +/* 80175388 001722C8 48 0F BC 41 */ bl __ct__7cSAngleFf /* 8017538C 001722CC 38 61 00 50 */ addi r3, r1, 0x50 /* 80175390 001722D0 38 81 00 30 */ addi r4, r1, 0x30 -/* 80175394 001722D4 48 0F BE 41 */ bl cSAngle_NS___apl +/* 80175394 001722D4 48 0F BE 41 */ bl __apl__7cSAngleFRC7cSAngle /* 80175398 001722D8 48 00 00 10 */ b lbl_801753A8 lbl_8017539C: /* 8017539C 001722DC 38 61 02 D8 */ addi r3, r1, 0x2d8 @@ -338,14 +338,14 @@ lbl_801753A8: /* 801753DC 0017231C 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 801753E0 00172320 38 9F 00 64 */ addi r4, r31, 0x64 /* 801753E4 00172324 38 A1 02 B4 */ addi r5, r1, 0x2b4 -/* 801753E8 00172328 48 0F 17 4D */ bl cXyz_NS___mi +/* 801753E8 00172328 48 0F 17 4D */ bl __mi__4cXyzCFRC3Vec /* 801753EC 0017232C 38 7F 03 EC */ addi r3, r31, 0x3ec /* 801753F0 00172330 38 81 01 E8 */ addi r4, r1, 0x1e8 /* 801753F4 00172334 4B F2 23 E5 */ bl cXyz_NS___as /* 801753F8 00172338 38 61 01 DC */ addi r3, r1, 0x1dc /* 801753FC 0017233C 38 9F 00 70 */ addi r4, r31, 0x70 /* 80175400 00172340 38 A1 02 B4 */ addi r5, r1, 0x2b4 -/* 80175404 00172344 48 0F 17 31 */ bl cXyz_NS___mi +/* 80175404 00172344 48 0F 17 31 */ bl __mi__4cXyzCFRC3Vec /* 80175408 00172348 38 7F 04 18 */ addi r3, r31, 0x418 /* 8017540C 0017234C 38 81 01 DC */ addi r4, r1, 0x1dc /* 80175410 00172350 4B F2 23 C9 */ bl cXyz_NS___as @@ -368,10 +368,10 @@ lbl_801753A8: /* 80175454 00172394 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 80175458 00172398 38 9F 04 18 */ addi r4, r31, 0x418 /* 8017545C 0017239C 38 BF 03 EC */ addi r5, r31, 0x3ec -/* 80175460 001723A0 48 0F 16 D5 */ bl cXyz_NS___mi +/* 80175460 001723A0 48 0F 16 D5 */ bl __mi__4cXyzCFRC3Vec /* 80175464 001723A4 38 7F 04 30 */ addi r3, r31, 0x430 /* 80175468 001723A8 38 81 01 D0 */ addi r4, r1, 0x1d0 -/* 8017546C 001723AC 48 0F C6 05 */ bl cSGlobe_NS_Val_X3_ +/* 8017546C 001723AC 48 0F C6 05 */ bl Val__7cSGlobeFRC4cXyz lbl_80175470: /* 80175470 001723B0 80 1F 01 74 */ lwz r0, 0x174(r31) /* 80175474 001723B4 28 00 00 00 */ cmplwi r0, 0 @@ -616,7 +616,7 @@ lbl_801757D0: /* 801757D8 00172718 D3 81 02 B0 */ stfs f28, 0x2b0(r1) /* 801757DC 0017271C 38 61 00 2C */ addi r3, r1, 0x2c /* 801757E0 00172720 38 81 00 50 */ addi r4, r1, 0x50 -/* 801757E4 00172724 48 0F B7 85 */ bl cSAngle_X1_ +/* 801757E4 00172724 48 0F B7 85 */ bl __ct__7cSAngleFRC7cSAngle /* 801757E8 00172728 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 801757EC 0017272C 38 81 02 A8 */ addi r4, r1, 0x2a8 /* 801757F0 00172730 38 A1 00 2C */ addi r5, r1, 0x2c @@ -626,7 +626,7 @@ lbl_801757D0: /* 80175800 00172740 4B F2 1F D9 */ bl cXyz_NS___as /* 80175804 00172744 38 61 00 28 */ addi r3, r1, 0x28 /* 80175808 00172748 38 81 00 4C */ addi r4, r1, 0x4c -/* 8017580C 0017274C 48 0F B7 5D */ bl cSAngle_X1_ +/* 8017580C 0017274C 48 0F B7 5D */ bl __ct__7cSAngleFRC7cSAngle /* 80175810 00172750 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 80175814 00172754 38 81 02 CC */ addi r4, r1, 0x2cc /* 80175818 00172758 38 A1 00 28 */ addi r5, r1, 0x28 @@ -648,7 +648,7 @@ lbl_80175840: /* 80175850 00172790 D0 01 02 A4 */ stfs f0, 0x2a4(r1) /* 80175854 00172794 38 61 00 24 */ addi r3, r1, 0x24 /* 80175858 00172798 38 81 00 50 */ addi r4, r1, 0x50 -/* 8017585C 0017279C 48 0F B7 0D */ bl cSAngle_X1_ +/* 8017585C 0017279C 48 0F B7 0D */ bl __ct__7cSAngleFRC7cSAngle /* 80175860 001727A0 38 61 01 AC */ addi r3, r1, 0x1ac /* 80175864 001727A4 38 81 02 9C */ addi r4, r1, 0x29c /* 80175868 001727A8 38 A1 00 24 */ addi r5, r1, 0x24 @@ -658,7 +658,7 @@ lbl_80175840: /* 80175878 001727B8 4B F2 1F 61 */ bl cXyz_NS___as /* 8017587C 001727BC 38 61 00 20 */ addi r3, r1, 0x20 /* 80175880 001727C0 38 81 00 4C */ addi r4, r1, 0x4c -/* 80175884 001727C4 48 0F B6 E5 */ bl cSAngle_X1_ +/* 80175884 001727C4 48 0F B6 E5 */ bl __ct__7cSAngleFRC7cSAngle /* 80175888 001727C8 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 8017588C 001727CC 38 81 02 CC */ addi r4, r1, 0x2cc /* 80175890 001727D0 38 A1 00 20 */ addi r5, r1, 0x20 @@ -705,7 +705,7 @@ lbl_80175924: /* 80175924 00172864 38 61 01 94 */ addi r3, r1, 0x194 /* 80175928 00172868 38 81 02 D8 */ addi r4, r1, 0x2d8 /* 8017592C 0017286C 38 A1 02 A8 */ addi r5, r1, 0x2a8 -/* 80175930 00172870 48 0F 11 B5 */ bl cXyz_NS___pl +/* 80175930 00172870 48 0F 11 B5 */ bl __pl__4cXyzCFRC3Vec /* 80175934 00172874 38 61 02 90 */ addi r3, r1, 0x290 /* 80175938 00172878 38 81 01 94 */ addi r4, r1, 0x194 /* 8017593C 0017287C 4B F2 1E B9 */ bl cXyz_X1_ @@ -746,7 +746,7 @@ lbl_80175924: /* 801759C8 00172908 38 61 01 7C */ addi r3, r1, 0x17c /* 801759CC 0017290C 38 81 02 F0 */ addi r4, r1, 0x2f0 /* 801759D0 00172910 C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) -/* 801759D4 00172914 48 0F 11 B1 */ bl cXyz_NS___ml +/* 801759D4 00172914 48 0F 11 B1 */ bl __ml__4cXyzCFf /* 801759D8 00172918 38 61 02 90 */ addi r3, r1, 0x290 /* 801759DC 0017291C 38 81 01 7C */ addi r4, r1, 0x17c /* 801759E0 00172920 7C 65 1B 78 */ mr r5, r3 @@ -758,37 +758,37 @@ lbl_801759F4: /* 801759F4 00172934 38 61 01 70 */ addi r3, r1, 0x170 /* 801759F8 00172938 38 81 02 90 */ addi r4, r1, 0x290 /* 801759FC 0017293C 38 BF 00 64 */ addi r5, r31, 0x64 -/* 80175A00 00172940 48 0F 11 35 */ bl cXyz_NS___mi +/* 80175A00 00172940 48 0F 11 35 */ bl __mi__4cXyzCFRC3Vec /* 80175A04 00172944 38 61 01 64 */ addi r3, r1, 0x164 /* 80175A08 00172948 38 81 01 70 */ addi r4, r1, 0x170 /* 80175A0C 0017294C FC 20 90 90 */ fmr f1, f18 -/* 80175A10 00172950 48 0F 11 75 */ bl cXyz_NS___ml +/* 80175A10 00172950 48 0F 11 75 */ bl __ml__4cXyzCFf /* 80175A14 00172954 38 61 01 58 */ addi r3, r1, 0x158 /* 80175A18 00172958 38 9F 00 64 */ addi r4, r31, 0x64 /* 80175A1C 0017295C 38 A1 01 64 */ addi r5, r1, 0x164 -/* 80175A20 00172960 48 0F 10 C5 */ bl cXyz_NS___pl +/* 80175A20 00172960 48 0F 10 C5 */ bl __pl__4cXyzCFRC3Vec /* 80175A24 00172964 38 61 02 90 */ addi r3, r1, 0x290 /* 80175A28 00172968 38 81 01 58 */ addi r4, r1, 0x158 /* 80175A2C 0017296C 4B F2 1D AD */ bl cXyz_NS___as /* 80175A30 00172970 38 61 01 4C */ addi r3, r1, 0x14c /* 80175A34 00172974 38 81 02 90 */ addi r4, r1, 0x290 /* 80175A38 00172978 38 A1 02 9C */ addi r5, r1, 0x29c -/* 80175A3C 0017297C 48 0F 10 A9 */ bl cXyz_NS___pl +/* 80175A3C 0017297C 48 0F 10 A9 */ bl __pl__4cXyzCFRC3Vec /* 80175A40 00172980 38 61 02 78 */ addi r3, r1, 0x278 /* 80175A44 00172984 38 81 01 4C */ addi r4, r1, 0x14c /* 80175A48 00172988 4B F2 1D AD */ bl cXyz_X1_ /* 80175A4C 0017298C 38 61 01 40 */ addi r3, r1, 0x140 /* 80175A50 00172990 38 81 02 78 */ addi r4, r1, 0x278 /* 80175A54 00172994 38 BF 00 70 */ addi r5, r31, 0x70 -/* 80175A58 00172998 48 0F 10 DD */ bl cXyz_NS___mi +/* 80175A58 00172998 48 0F 10 DD */ bl __mi__4cXyzCFRC3Vec /* 80175A5C 0017299C 38 61 01 34 */ addi r3, r1, 0x134 /* 80175A60 001729A0 38 81 01 40 */ addi r4, r1, 0x140 /* 80175A64 001729A4 FC 20 90 90 */ fmr f1, f18 -/* 80175A68 001729A8 48 0F 11 1D */ bl cXyz_NS___ml +/* 80175A68 001729A8 48 0F 11 1D */ bl __ml__4cXyzCFf /* 80175A6C 001729AC 38 61 01 28 */ addi r3, r1, 0x128 /* 80175A70 001729B0 38 9F 00 70 */ addi r4, r31, 0x70 /* 80175A74 001729B4 38 A1 01 34 */ addi r5, r1, 0x134 -/* 80175A78 001729B8 48 0F 10 6D */ bl cXyz_NS___pl +/* 80175A78 001729B8 48 0F 10 6D */ bl __pl__4cXyzCFRC3Vec /* 80175A7C 001729BC 38 61 02 78 */ addi r3, r1, 0x278 /* 80175A80 001729C0 38 81 01 28 */ addi r4, r1, 0x128 /* 80175A84 001729C4 4B F2 1D 55 */ bl cXyz_NS___as @@ -810,21 +810,21 @@ lbl_80175ABC: /* 80175ABC 001729FC 38 61 01 1C */ addi r3, r1, 0x11c /* 80175AC0 00172A00 38 81 02 78 */ addi r4, r1, 0x278 /* 80175AC4 00172A04 38 A1 02 90 */ addi r5, r1, 0x290 -/* 80175AC8 00172A08 48 0F 10 6D */ bl cXyz_NS___mi +/* 80175AC8 00172A08 48 0F 10 6D */ bl __mi__4cXyzCFRC3Vec /* 80175ACC 00172A0C 38 61 02 6C */ addi r3, r1, 0x26c /* 80175AD0 00172A10 38 81 01 1C */ addi r4, r1, 0x11c /* 80175AD4 00172A14 4B F2 1D 21 */ bl cXyz_X1_ /* 80175AD8 00172A18 38 61 01 10 */ addi r3, r1, 0x110 /* 80175ADC 00172A1C 38 81 02 6C */ addi r4, r1, 0x26c -/* 80175AE0 00172A20 48 0F 14 15 */ bl cXyz_NS_normalize +/* 80175AE0 00172A20 48 0F 14 15 */ bl normalize__4cXyzFv /* 80175AE4 00172A24 38 61 01 04 */ addi r3, r1, 0x104 /* 80175AE8 00172A28 38 81 02 6C */ addi r4, r1, 0x26c /* 80175AEC 00172A2C C0 22 9D 34 */ lfs f1, lbl_80453734-_SDA2_BASE_(r2) -/* 80175AF0 00172A30 48 0F 10 95 */ bl cXyz_NS___ml +/* 80175AF0 00172A30 48 0F 10 95 */ bl __ml__4cXyzCFf /* 80175AF4 00172A34 38 61 00 F8 */ addi r3, r1, 0xf8 /* 80175AF8 00172A38 38 81 02 90 */ addi r4, r1, 0x290 /* 80175AFC 00172A3C 38 A1 01 04 */ addi r5, r1, 0x104 -/* 80175B00 00172A40 48 0F 0F E5 */ bl cXyz_NS___pl +/* 80175B00 00172A40 48 0F 0F E5 */ bl __pl__4cXyzCFRC3Vec /* 80175B04 00172A44 38 61 02 60 */ addi r3, r1, 0x260 /* 80175B08 00172A48 38 81 00 F8 */ addi r4, r1, 0xf8 /* 80175B0C 00172A4C 4B F2 1C CD */ bl cXyz_NS___as @@ -839,11 +839,11 @@ lbl_80175ABC: /* 80175B30 00172A70 38 61 00 EC */ addi r3, r1, 0xec /* 80175B34 00172A74 38 81 02 6C */ addi r4, r1, 0x26c /* 80175B38 00172A78 C0 22 9C E4 */ lfs f1, lbl_804536E4-_SDA2_BASE_(r2) -/* 80175B3C 00172A7C 48 0F 10 49 */ bl cXyz_NS___ml +/* 80175B3C 00172A7C 48 0F 10 49 */ bl __ml__4cXyzCFf /* 80175B40 00172A80 38 61 00 E0 */ addi r3, r1, 0xe0 /* 80175B44 00172A84 38 81 02 54 */ addi r4, r1, 0x254 /* 80175B48 00172A88 38 A1 00 EC */ addi r5, r1, 0xec -/* 80175B4C 00172A8C 48 0F 0F 99 */ bl cXyz_NS___pl +/* 80175B4C 00172A8C 48 0F 0F 99 */ bl __pl__4cXyzCFRC3Vec /* 80175B50 00172A90 38 61 02 78 */ addi r3, r1, 0x278 /* 80175B54 00172A94 38 81 00 E0 */ addi r4, r1, 0xe0 /* 80175B58 00172A98 4B F2 1C 81 */ bl cXyz_NS___as @@ -862,10 +862,10 @@ lbl_80175B84: /* 80175B84 00172AC4 38 61 00 D4 */ addi r3, r1, 0xd4 /* 80175B88 00172AC8 38 81 02 78 */ addi r4, r1, 0x278 /* 80175B8C 00172ACC 38 A1 02 90 */ addi r5, r1, 0x290 -/* 80175B90 00172AD0 48 0F 0F A5 */ bl cXyz_NS___mi +/* 80175B90 00172AD0 48 0F 0F A5 */ bl __mi__4cXyzCFRC3Vec /* 80175B94 00172AD4 38 61 00 64 */ addi r3, r1, 0x64 /* 80175B98 00172AD8 38 81 00 D4 */ addi r4, r1, 0xd4 -/* 80175B9C 00172ADC 48 0F BC E5 */ bl cSGlobe_X4_ +/* 80175B9C 00172ADC 48 0F BC E5 */ bl __ct__7cSGlobeFRC4cXyz /* 80175BA0 00172AE0 C0 42 9C A8 */ lfs f2, lbl_804536A8-_SDA2_BASE_(r2) /* 80175BA4 00172AE4 80 7F 03 F8 */ lwz r3, 0x3f8(r31) /* 80175BA8 00172AE8 80 1F 03 FC */ lwz r0, 0x3fc(r31) @@ -881,11 +881,11 @@ lbl_80175B84: /* 80175BD0 00172B10 38 61 00 C8 */ addi r3, r1, 0xc8 /* 80175BD4 00172B14 38 81 02 90 */ addi r4, r1, 0x290 /* 80175BD8 00172B18 38 BF 00 64 */ addi r5, r31, 0x64 -/* 80175BDC 00172B1C 48 0F 0F 59 */ bl cXyz_NS___mi +/* 80175BDC 00172B1C 48 0F 0F 59 */ bl __mi__4cXyzCFRC3Vec /* 80175BE0 00172B20 38 61 00 BC */ addi r3, r1, 0xbc /* 80175BE4 00172B24 38 81 00 C8 */ addi r4, r1, 0xc8 /* 80175BE8 00172B28 FC 20 88 90 */ fmr f1, f17 -/* 80175BEC 00172B2C 48 0F 0F 99 */ bl cXyz_NS___ml +/* 80175BEC 00172B2C 48 0F 0F 99 */ bl __ml__4cXyzCFf /* 80175BF0 00172B30 38 7F 00 64 */ addi r3, r31, 0x64 /* 80175BF4 00172B34 38 81 00 BC */ addi r4, r1, 0xbc /* 80175BF8 00172B38 7C 65 1B 78 */ mr r5, r3 @@ -900,15 +900,15 @@ lbl_80175B84: /* 80175C1C 00172B5C 38 81 00 68 */ addi r4, r1, 0x68 /* 80175C20 00172B60 3A DF 00 60 */ addi r22, r31, 0x60 /* 80175C24 00172B64 7E C5 B3 78 */ mr r5, r22 -/* 80175C28 00172B68 48 0F B5 7D */ bl cSAngle_NS___mi_X1_ +/* 80175C28 00172B68 48 0F B5 7D */ bl __mi__7cSAngleCFRC7cSAngle /* 80175C2C 00172B6C 38 61 00 18 */ addi r3, r1, 0x18 /* 80175C30 00172B70 38 81 00 1C */ addi r4, r1, 0x1c /* 80175C34 00172B74 FC 20 88 90 */ fmr f1, f17 -/* 80175C38 00172B78 48 0F B6 2D */ bl cSAngle_NS___ml +/* 80175C38 00172B78 48 0F B6 2D */ bl __ml__7cSAngleCFf /* 80175C3C 00172B7C 38 61 00 14 */ addi r3, r1, 0x14 /* 80175C40 00172B80 7E C4 B3 78 */ mr r4, r22 /* 80175C44 00172B84 38 A1 00 18 */ addi r5, r1, 0x18 -/* 80175C48 00172B88 48 0F B5 2D */ bl cSAngle_NS___pl +/* 80175C48 00172B88 48 0F B5 2D */ bl __pl__7cSAngleCFRC7cSAngle /* 80175C4C 00172B8C 38 7F 00 5C */ addi r3, r31, 0x5c /* 80175C50 00172B90 38 81 00 14 */ addi r4, r1, 0x14 /* 80175C54 00172B94 4B F1 9E 05 */ bl cSGlobe_NS_V @@ -916,25 +916,25 @@ lbl_80175B84: /* 80175C5C 00172B9C 38 81 00 6A */ addi r4, r1, 0x6a /* 80175C60 00172BA0 3A DF 00 62 */ addi r22, r31, 0x62 /* 80175C64 00172BA4 7E C5 B3 78 */ mr r5, r22 -/* 80175C68 00172BA8 48 0F B5 3D */ bl cSAngle_NS___mi_X1_ +/* 80175C68 00172BA8 48 0F B5 3D */ bl __mi__7cSAngleCFRC7cSAngle /* 80175C6C 00172BAC 38 61 00 0C */ addi r3, r1, 0xc /* 80175C70 00172BB0 38 81 00 10 */ addi r4, r1, 0x10 /* 80175C74 00172BB4 FC 20 88 90 */ fmr f1, f17 -/* 80175C78 00172BB8 48 0F B5 ED */ bl cSAngle_NS___ml +/* 80175C78 00172BB8 48 0F B5 ED */ bl __ml__7cSAngleCFf /* 80175C7C 00172BBC 38 61 00 08 */ addi r3, r1, 8 /* 80175C80 00172BC0 7E C4 B3 78 */ mr r4, r22 /* 80175C84 00172BC4 38 A1 00 0C */ addi r5, r1, 0xc -/* 80175C88 00172BC8 48 0F B4 ED */ bl cSAngle_NS___pl +/* 80175C88 00172BC8 48 0F B4 ED */ bl __pl__7cSAngleCFRC7cSAngle /* 80175C8C 00172BCC 38 7F 00 5C */ addi r3, r31, 0x5c /* 80175C90 00172BD0 38 81 00 08 */ addi r4, r1, 8 /* 80175C94 00172BD4 4B F1 8C 01 */ bl cSGlobe_NS_U /* 80175C98 00172BD8 38 61 00 B0 */ addi r3, r1, 0xb0 /* 80175C9C 00172BDC 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80175CA0 00172BE0 48 0F BE 15 */ bl cSGlobe_NS_Xyz +/* 80175CA0 00172BE0 48 0F BE 15 */ bl Xyz__7cSGlobeCFv /* 80175CA4 00172BE4 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80175CA8 00172BE8 38 9F 00 64 */ addi r4, r31, 0x64 /* 80175CAC 00172BEC 38 A1 00 B0 */ addi r5, r1, 0xb0 -/* 80175CB0 00172BF0 48 0F 0E 35 */ bl cXyz_NS___pl +/* 80175CB0 00172BF0 48 0F 0E 35 */ bl __pl__4cXyzCFRC3Vec /* 80175CB4 00172BF4 38 7F 00 70 */ addi r3, r31, 0x70 /* 80175CB8 00172BF8 38 81 00 A4 */ addi r4, r1, 0xa4 /* 80175CBC 00172BFC 4B F2 1B 1D */ bl cXyz_NS___as @@ -946,18 +946,18 @@ lbl_80175B84: /* 80175CD4 00172C14 38 61 00 98 */ addi r3, r1, 0x98 /* 80175CD8 00172C18 38 81 02 C0 */ addi r4, r1, 0x2c0 /* 80175CDC 00172C1C 38 BF 04 24 */ addi r5, r31, 0x424 -/* 80175CE0 00172C20 48 0F 0E 55 */ bl cXyz_NS___mi +/* 80175CE0 00172C20 48 0F 0E 55 */ bl __mi__4cXyzCFRC3Vec /* 80175CE4 00172C24 38 61 00 8C */ addi r3, r1, 0x8c /* 80175CE8 00172C28 38 81 00 98 */ addi r4, r1, 0x98 /* 80175CEC 00172C2C FC 20 88 90 */ fmr f1, f17 -/* 80175CF0 00172C30 48 0F 0E 95 */ bl cXyz_NS___ml +/* 80175CF0 00172C30 48 0F 0E 95 */ bl __ml__4cXyzCFf /* 80175CF4 00172C34 38 7F 04 24 */ addi r3, r31, 0x424 /* 80175CF8 00172C38 38 81 00 8C */ addi r4, r1, 0x8c /* 80175CFC 00172C3C 7C 65 1B 78 */ mr r5, r3 /* 80175D00 00172C40 48 1D 13 91 */ bl PSVECAdd /* 80175D04 00172C44 38 61 00 80 */ addi r3, r1, 0x80 /* 80175D08 00172C48 38 9F 04 24 */ addi r4, r31, 0x424 -/* 80175D0C 00172C4C 48 0F 0F D9 */ bl cXyz_NS_norm +/* 80175D0C 00172C4C 48 0F 0F D9 */ bl norm__4cXyzCFv /* 80175D10 00172C50 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 80175D14 00172C54 38 81 00 80 */ addi r4, r1, 0x80 /* 80175D18 00172C58 4B F2 1A C1 */ bl cXyz_NS___as @@ -999,10 +999,10 @@ lbl_80175D9C: /* 80175D9C 00172CDC 38 61 00 74 */ addi r3, r1, 0x74 /* 80175DA0 00172CE0 38 9F 00 70 */ addi r4, r31, 0x70 /* 80175DA4 00172CE4 38 BF 00 64 */ addi r5, r31, 0x64 -/* 80175DA8 00172CE8 48 0F 0D 8D */ bl cXyz_NS___mi +/* 80175DA8 00172CE8 48 0F 0D 8D */ bl __mi__4cXyzCFRC3Vec /* 80175DAC 00172CEC 38 7F 00 5C */ addi r3, r31, 0x5c /* 80175DB0 00172CF0 38 81 00 74 */ addi r4, r1, 0x74 -/* 80175DB4 00172CF4 48 0F BC BD */ bl cSGlobe_NS_Val_X3_ +/* 80175DB4 00172CF4 48 0F BC BD */ bl Val__7cSGlobeFRC4cXyz /* 80175DB8 00172CF8 38 7F 07 40 */ addi r3, r31, 0x740 /* 80175DBC 00172CFC 38 9F 00 64 */ addi r4, r31, 0x64 /* 80175DC0 00172D00 4B F2 1A 19 */ bl cXyz_NS___as diff --git a/include/d/d_camera/asm/func_80176074.s b/include/d/d_camera/asm/func_80176074.s index b2c57c2ab5..cdeee24b06 100644 --- a/include/d/d_camera/asm/func_80176074.s +++ b/include/d/d_camera/asm/func_80176074.s @@ -66,7 +66,7 @@ /* 80176178 001730B8 3B 84 2C 78 */ addi r28, r4, 0x2c78 /* 8017617C 001730BC 38 61 00 4C */ addi r3, r1, 0x4c /* 80176180 001730C0 A8 84 31 18 */ lha r4, 0x3118(r4) -/* 80176184 001730C4 48 0F AE 15 */ bl cSAngle_X2_ +/* 80176184 001730C4 48 0F AE 15 */ bl __ct__7cSAngleFs /* 80176188 001730C8 A8 01 00 4C */ lha r0, 0x4c(r1) /* 8017618C 001730CC B0 01 00 5C */ sth r0, 0x5c(r1) /* 80176190 001730D0 48 00 00 2C */ b lbl_801761BC @@ -95,7 +95,7 @@ lbl_801761BC: /* 801761E4 00173124 38 61 01 28 */ addi r3, r1, 0x128 /* 801761E8 00173128 38 9D 00 64 */ addi r4, r29, 0x64 /* 801761EC 0017312C 38 A1 01 70 */ addi r5, r1, 0x170 -/* 801761F0 00173130 48 0F 09 45 */ bl cXyz_NS___mi +/* 801761F0 00173130 48 0F 09 45 */ bl __mi__4cXyzCFRC3Vec /* 801761F4 00173134 C0 01 01 28 */ lfs f0, 0x128(r1) /* 801761F8 00173138 D0 1D 03 EC */ stfs f0, 0x3ec(r29) /* 801761FC 0017313C C0 01 01 2C */ lfs f0, 0x12c(r1) @@ -105,7 +105,7 @@ lbl_801761BC: /* 8017620C 0017314C 38 61 01 1C */ addi r3, r1, 0x11c /* 80176210 00173150 38 9D 00 70 */ addi r4, r29, 0x70 /* 80176214 00173154 38 A1 01 70 */ addi r5, r1, 0x170 -/* 80176218 00173158 48 0F 09 1D */ bl cXyz_NS___mi +/* 80176218 00173158 48 0F 09 1D */ bl __mi__4cXyzCFRC3Vec /* 8017621C 0017315C C0 01 01 1C */ lfs f0, 0x11c(r1) /* 80176220 00173160 D0 1D 03 F8 */ stfs f0, 0x3f8(r29) /* 80176224 00173164 C0 01 01 20 */ lfs f0, 0x120(r1) @@ -137,10 +137,10 @@ lbl_801761BC: /* 8017628C 001731CC 38 61 01 10 */ addi r3, r1, 0x110 /* 80176290 001731D0 38 9D 03 F8 */ addi r4, r29, 0x3f8 /* 80176294 001731D4 38 BD 03 EC */ addi r5, r29, 0x3ec -/* 80176298 001731D8 48 0F 08 9D */ bl cXyz_NS___mi +/* 80176298 001731D8 48 0F 08 9D */ bl __mi__4cXyzCFRC3Vec /* 8017629C 001731DC 38 7D 04 04 */ addi r3, r29, 0x404 /* 801762A0 001731E0 38 81 01 10 */ addi r4, r1, 0x110 -/* 801762A4 001731E4 48 0F B7 CD */ bl cSGlobe_NS_Val_X3_ +/* 801762A4 001731E4 48 0F B7 CD */ bl Val__7cSGlobeFRC4cXyz lbl_801762A8: /* 801762A8 001731E8 C0 1D 04 04 */ lfs f0, 0x404(r29) /* 801762AC 001731EC EC 20 80 28 */ fsubs f1, f0, f16 @@ -165,7 +165,7 @@ lbl_801762DC: /* 801762F0 00173230 D2 81 01 6C */ stfs f20, 0x16c(r1) /* 801762F4 00173234 38 61 00 44 */ addi r3, r1, 0x44 /* 801762F8 00173238 38 81 00 5C */ addi r4, r1, 0x5c -/* 801762FC 0017323C 48 0F AC 6D */ bl cSAngle_X1_ +/* 801762FC 0017323C 48 0F AC 6D */ bl __ct__7cSAngleFRC7cSAngle /* 80176300 00173240 38 61 01 04 */ addi r3, r1, 0x104 /* 80176304 00173244 38 81 01 64 */ addi r4, r1, 0x164 /* 80176308 00173248 38 A1 00 44 */ addi r5, r1, 0x44 @@ -183,7 +183,7 @@ lbl_801762DC: /* 80176338 00173278 38 61 00 EC */ addi r3, r1, 0xec /* 8017633C 0017327C 38 81 00 F8 */ addi r4, r1, 0xf8 /* 80176340 00173280 38 A1 01 70 */ addi r5, r1, 0x170 -/* 80176344 00173284 48 0F 07 F1 */ bl cXyz_NS___mi +/* 80176344 00173284 48 0F 07 F1 */ bl __mi__4cXyzCFRC3Vec /* 80176348 00173288 C0 01 00 EC */ lfs f0, 0xec(r1) /* 8017634C 0017328C D0 01 01 58 */ stfs f0, 0x158(r1) /* 80176350 00173290 C0 01 00 F0 */ lfs f0, 0xf0(r1) @@ -201,15 +201,15 @@ lbl_801762DC: /* 80176380 001732C0 38 61 00 E0 */ addi r3, r1, 0xe0 /* 80176384 001732C4 38 81 01 58 */ addi r4, r1, 0x158 /* 80176388 001732C8 38 A1 01 64 */ addi r5, r1, 0x164 -/* 8017638C 001732CC 48 0F 07 59 */ bl cXyz_NS___pl +/* 8017638C 001732CC 48 0F 07 59 */ bl __pl__4cXyzCFRC3Vec /* 80176390 001732D0 38 61 00 D4 */ addi r3, r1, 0xd4 /* 80176394 001732D4 38 81 00 E0 */ addi r4, r1, 0xe0 /* 80176398 001732D8 38 BD 03 EC */ addi r5, r29, 0x3ec -/* 8017639C 001732DC 48 0F 07 99 */ bl cXyz_NS___mi +/* 8017639C 001732DC 48 0F 07 99 */ bl __mi__4cXyzCFRC3Vec /* 801763A0 001732E0 38 61 00 C8 */ addi r3, r1, 0xc8 /* 801763A4 001732E4 38 81 00 D4 */ addi r4, r1, 0xd4 /* 801763A8 001732E8 FC 20 B0 90 */ fmr f1, f22 -/* 801763AC 001732EC 48 0F 07 D9 */ bl cXyz_NS___ml +/* 801763AC 001732EC 48 0F 07 D9 */ bl __ml__4cXyzCFf /* 801763B0 001732F0 38 7D 03 EC */ addi r3, r29, 0x3ec /* 801763B4 001732F4 38 81 00 C8 */ addi r4, r1, 0xc8 /* 801763B8 001732F8 7C 65 1B 78 */ mr r5, r3 @@ -217,10 +217,10 @@ lbl_801762DC: /* 801763C0 00173300 38 61 00 BC */ addi r3, r1, 0xbc /* 801763C4 00173304 38 9D 03 F8 */ addi r4, r29, 0x3f8 /* 801763C8 00173308 38 BD 03 EC */ addi r5, r29, 0x3ec -/* 801763CC 0017330C 48 0F 07 69 */ bl cXyz_NS___mi +/* 801763CC 0017330C 48 0F 07 69 */ bl __mi__4cXyzCFRC3Vec /* 801763D0 00173310 38 61 00 60 */ addi r3, r1, 0x60 /* 801763D4 00173314 38 81 00 BC */ addi r4, r1, 0xbc -/* 801763D8 00173318 48 0F B4 A9 */ bl cSGlobe_X4_ +/* 801763D8 00173318 48 0F B4 A9 */ bl __ct__7cSGlobeFRC4cXyz /* 801763DC 0017331C C0 01 00 60 */ lfs f0, 0x60(r1) /* 801763E0 00173320 FE 40 00 90 */ fmr f18, f0 /* 801763E4 00173324 FC 00 88 40 */ fcmpo cr0, f0, f17 @@ -244,10 +244,10 @@ lbl_8017641C: /* 80176420 00173360 2C 00 00 01 */ cmpwi r0, 1 /* 80176424 00173364 40 82 00 24 */ bne lbl_80176448 /* 80176428 00173368 38 61 00 5C */ addi r3, r1, 0x5c -/* 8017642C 0017336C 48 0F AC BD */ bl cSAngle_NS_Inv +/* 8017642C 0017336C 48 0F AC BD */ bl Inv__7cSAngleCFv /* 80176430 00173370 7C 64 1B 78 */ mr r4, r3 /* 80176434 00173374 38 61 00 40 */ addi r3, r1, 0x40 -/* 80176438 00173378 48 0F AB 61 */ bl cSAngle_X2_ +/* 80176438 00173378 48 0F AB 61 */ bl __ct__7cSAngleFs /* 8017643C 0017337C A8 01 00 40 */ lha r0, 0x40(r1) /* 80176440 00173380 B0 01 00 58 */ sth r0, 0x58(r1) /* 80176444 00173384 48 00 00 E4 */ b lbl_80176528 @@ -262,34 +262,34 @@ lbl_80176448: /* 80176464 001733A4 C0 02 9C E4 */ lfs f0, lbl_804536E4-_SDA2_BASE_(r2) /* 80176468 001733A8 EC 20 00 72 */ fmuls f1, f0, f1 /* 8017646C 001733AC 38 61 00 3C */ addi r3, r1, 0x3c -/* 80176470 001733B0 48 0F AB 59 */ bl cSAngle_X3_ +/* 80176470 001733B0 48 0F AB 59 */ bl __ct__7cSAngleFf /* 80176474 001733B4 38 61 00 38 */ addi r3, r1, 0x38 /* 80176478 001733B8 38 9D 04 0A */ addi r4, r29, 0x40a /* 8017647C 001733BC 38 A1 00 3C */ addi r5, r1, 0x3c -/* 80176480 001733C0 48 0F AC F5 */ bl cSAngle_NS___pl +/* 80176480 001733C0 48 0F AC F5 */ bl __pl__7cSAngleCFRC7cSAngle /* 80176484 001733C4 A8 01 00 38 */ lha r0, 0x38(r1) /* 80176488 001733C8 B0 01 00 58 */ sth r0, 0x58(r1) /* 8017648C 001733CC 48 00 00 9C */ b lbl_80176528 lbl_80176490: /* 80176490 001733D0 38 61 00 5C */ addi r3, r1, 0x5c -/* 80176494 001733D4 48 0F AC 55 */ bl cSAngle_NS_Inv +/* 80176494 001733D4 48 0F AC 55 */ bl Inv__7cSAngleCFv /* 80176498 001733D8 7C 64 1B 78 */ mr r4, r3 /* 8017649C 001733DC 38 61 00 34 */ addi r3, r1, 0x34 /* 801764A0 001733E0 3B E1 00 66 */ addi r31, r1, 0x66 /* 801764A4 001733E4 7F E5 FB 78 */ mr r5, r31 -/* 801764A8 001733E8 48 0F AE 79 */ bl cSAngle_NS___mi_short +/* 801764A8 001733E8 48 0F AE 79 */ bl __mi__FsRC7cSAngle /* 801764AC 001733EC 38 61 00 54 */ addi r3, r1, 0x54 /* 801764B0 001733F0 38 81 00 34 */ addi r4, r1, 0x34 -/* 801764B4 001733F4 48 0F AA B5 */ bl cSAngle_X1_ +/* 801764B4 001733F4 48 0F AA B5 */ bl __ct__7cSAngleFRC7cSAngle /* 801764B8 001733F8 38 61 00 54 */ addi r3, r1, 0x54 -/* 801764BC 001733FC 48 0F AC 3D */ bl cSAngle_NS_Sin +/* 801764BC 001733FC 48 0F AC 3D */ bl Sin__7cSAngleCFv /* 801764C0 00173400 FE 00 08 90 */ fmr f16, f1 /* 801764C4 00173404 C0 1D 01 C4 */ lfs f0, 0x1c4(r29) /* 801764C8 00173408 EC 10 00 32 */ fmuls f0, f16, f0 /* 801764CC 0017340C FC 00 02 10 */ fabs f0, f0 /* 801764D0 00173410 FE 20 00 18 */ frsp f17, f0 /* 801764D4 00173414 38 61 00 54 */ addi r3, r1, 0x54 -/* 801764D8 00173418 48 0F AC 49 */ bl cSAngle_NS_Cos +/* 801764D8 00173418 48 0F AC 49 */ bl Cos__7cSAngleCFv /* 801764DC 0017341C C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 801764E0 00173420 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801764E4 00173424 40 81 00 0C */ ble lbl_801764F0 @@ -304,11 +304,11 @@ lbl_801764F4: /* 80176500 00173440 EC 10 04 F2 */ fmuls f0, f16, f19 /* 80176504 00173444 EC 20 00 72 */ fmuls f1, f0, f1 /* 80176508 00173448 38 61 00 30 */ addi r3, r1, 0x30 -/* 8017650C 0017344C 48 0F AA BD */ bl cSAngle_X3_ +/* 8017650C 0017344C 48 0F AA BD */ bl __ct__7cSAngleFf /* 80176510 00173450 38 61 00 2C */ addi r3, r1, 0x2c /* 80176514 00173454 7F E4 FB 78 */ mr r4, r31 /* 80176518 00173458 38 A1 00 30 */ addi r5, r1, 0x30 -/* 8017651C 0017345C 48 0F AC 59 */ bl cSAngle_NS___pl +/* 8017651C 0017345C 48 0F AC 59 */ bl __pl__7cSAngleCFRC7cSAngle /* 80176520 00173460 A8 01 00 2C */ lha r0, 0x2c(r1) /* 80176524 00173464 B0 01 00 58 */ sth r0, 0x58(r1) lbl_80176528: @@ -316,19 +316,19 @@ lbl_80176528: /* 8017652C 0017346C EC 1E E8 28 */ fsubs f0, f30, f29 /* 80176530 00173470 EC 17 00 32 */ fmuls f0, f23, f0 /* 80176534 00173474 EC 3D 00 2A */ fadds f1, f29, f0 -/* 80176538 00173478 48 0F AA 91 */ bl cSAngle_X3_ +/* 80176538 00173478 48 0F AA 91 */ bl __ct__7cSAngleFf /* 8017653C 0017347C 38 7D 04 04 */ addi r3, r29, 0x404 /* 80176540 00173480 FC 20 90 90 */ fmr f1, f18 /* 80176544 00173484 38 81 00 50 */ addi r4, r1, 0x50 /* 80176548 00173488 38 A1 00 58 */ addi r5, r1, 0x58 -/* 8017654C 0017348C 48 0F B4 BD */ bl cSGlobe_NS_Val_X2_ +/* 8017654C 0017348C 48 0F B4 BD */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80176550 00173490 38 61 00 B0 */ addi r3, r1, 0xb0 /* 80176554 00173494 38 9D 04 04 */ addi r4, r29, 0x404 -/* 80176558 00173498 48 0F B5 5D */ bl cSGlobe_NS_Xyz +/* 80176558 00173498 48 0F B5 5D */ bl Xyz__7cSGlobeCFv /* 8017655C 0017349C 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80176560 001734A0 38 9D 03 EC */ addi r4, r29, 0x3ec /* 80176564 001734A4 38 A1 00 B0 */ addi r5, r1, 0xb0 -/* 80176568 001734A8 48 0F 05 7D */ bl cXyz_NS___pl +/* 80176568 001734A8 48 0F 05 7D */ bl __pl__4cXyzCFRC3Vec /* 8017656C 001734AC C0 01 00 A4 */ lfs f0, 0xa4(r1) /* 80176570 001734B0 D0 1D 03 F8 */ stfs f0, 0x3f8(r29) /* 80176574 001734B4 C0 01 00 A8 */ lfs f0, 0xa8(r1) @@ -338,7 +338,7 @@ lbl_80176528: /* 80176584 001734C4 38 61 00 98 */ addi r3, r1, 0x98 /* 80176588 001734C8 38 9D 03 EC */ addi r4, r29, 0x3ec /* 8017658C 001734CC 38 A1 01 70 */ addi r5, r1, 0x170 -/* 80176590 001734D0 48 0F 05 A5 */ bl cXyz_NS___mi +/* 80176590 001734D0 48 0F 05 A5 */ bl __mi__4cXyzCFRC3Vec /* 80176594 001734D4 C0 01 00 98 */ lfs f0, 0x98(r1) /* 80176598 001734D8 D0 01 01 4C */ stfs f0, 0x14c(r1) /* 8017659C 001734DC C0 01 00 9C */ lfs f0, 0x9c(r1) @@ -348,7 +348,7 @@ lbl_80176528: /* 801765AC 001734EC 38 61 00 8C */ addi r3, r1, 0x8c /* 801765B0 001734F0 38 9D 03 F8 */ addi r4, r29, 0x3f8 /* 801765B4 001734F4 38 A1 01 70 */ addi r5, r1, 0x170 -/* 801765B8 001734F8 48 0F 05 7D */ bl cXyz_NS___mi +/* 801765B8 001734F8 48 0F 05 7D */ bl __mi__4cXyzCFRC3Vec /* 801765BC 001734FC C0 01 00 8C */ lfs f0, 0x8c(r1) /* 801765C0 00173500 D0 01 01 40 */ stfs f0, 0x140(r1) /* 801765C4 00173504 C0 01 00 90 */ lfs f0, 0x90(r1) @@ -374,10 +374,10 @@ lbl_80176528: /* 80176614 00173554 38 61 00 80 */ addi r3, r1, 0x80 /* 80176618 00173558 38 81 01 40 */ addi r4, r1, 0x140 /* 8017661C 0017355C 38 A1 01 4C */ addi r5, r1, 0x14c -/* 80176620 00173560 48 0F 05 15 */ bl cXyz_NS___mi +/* 80176620 00173560 48 0F 05 15 */ bl __mi__4cXyzCFRC3Vec /* 80176624 00173564 38 61 00 60 */ addi r3, r1, 0x60 /* 80176628 00173568 38 81 00 80 */ addi r4, r1, 0x80 -/* 8017662C 0017356C 48 0F B4 45 */ bl cSGlobe_NS_Val_X3_ +/* 8017662C 0017356C 48 0F B4 45 */ bl Val__7cSGlobeFRC4cXyz /* 80176630 00173570 C0 01 01 4C */ lfs f0, 0x14c(r1) /* 80176634 00173574 D0 1D 00 64 */ stfs f0, 0x64(r29) /* 80176638 00173578 C0 01 01 50 */ lfs f0, 0x150(r1) @@ -395,50 +395,50 @@ lbl_80176528: /* 80176668 001735A8 7F E4 FB 78 */ mr r4, r31 /* 8017666C 001735AC 3B DD 00 60 */ addi r30, r29, 0x60 /* 80176670 001735B0 7F C5 F3 78 */ mr r5, r30 -/* 80176674 001735B4 48 0F AB 31 */ bl cSAngle_NS___mi_X1_ +/* 80176674 001735B4 48 0F AB 31 */ bl __mi__7cSAngleCFRC7cSAngle /* 80176678 001735B8 38 61 00 24 */ addi r3, r1, 0x24 /* 8017667C 001735BC 38 81 00 28 */ addi r4, r1, 0x28 /* 80176680 001735C0 FC 20 E0 90 */ fmr f1, f28 -/* 80176684 001735C4 48 0F AB E1 */ bl cSAngle_NS___ml +/* 80176684 001735C4 48 0F AB E1 */ bl __ml__7cSAngleCFf /* 80176688 001735C8 38 61 00 20 */ addi r3, r1, 0x20 /* 8017668C 001735CC 7F C4 F3 78 */ mr r4, r30 /* 80176690 001735D0 38 A1 00 24 */ addi r5, r1, 0x24 -/* 80176694 001735D4 48 0F AA E1 */ bl cSAngle_NS___pl +/* 80176694 001735D4 48 0F AA E1 */ bl __pl__7cSAngleCFRC7cSAngle /* 80176698 001735D8 38 61 00 0C */ addi r3, r1, 0xc /* 8017669C 001735DC A8 81 00 20 */ lha r4, 0x20(r1) -/* 801766A0 001735E0 48 0F A8 F9 */ bl cSAngle_X2_ +/* 801766A0 001735E0 48 0F A8 F9 */ bl __ct__7cSAngleFs /* 801766A4 001735E4 A8 01 00 0C */ lha r0, 0xc(r1) /* 801766A8 001735E8 B0 1D 00 60 */ sth r0, 0x60(r29) /* 801766AC 001735EC 38 61 00 1C */ addi r3, r1, 0x1c /* 801766B0 001735F0 38 81 00 66 */ addi r4, r1, 0x66 /* 801766B4 001735F4 3B DD 00 62 */ addi r30, r29, 0x62 /* 801766B8 001735F8 7F C5 F3 78 */ mr r5, r30 -/* 801766BC 001735FC 48 0F AA E9 */ bl cSAngle_NS___mi_X1_ +/* 801766BC 001735FC 48 0F AA E9 */ bl __mi__7cSAngleCFRC7cSAngle /* 801766C0 00173600 38 61 00 18 */ addi r3, r1, 0x18 /* 801766C4 00173604 38 81 00 1C */ addi r4, r1, 0x1c /* 801766C8 00173608 FC 20 D8 90 */ fmr f1, f27 -/* 801766CC 0017360C 48 0F AB 99 */ bl cSAngle_NS___ml +/* 801766CC 0017360C 48 0F AB 99 */ bl __ml__7cSAngleCFf /* 801766D0 00173610 7F E3 FB 78 */ mr r3, r31 -/* 801766D4 00173614 48 0F AA 4D */ bl cSAngle_NS_Cos +/* 801766D4 00173614 48 0F AA 4D */ bl Cos__7cSAngleCFv /* 801766D8 00173618 38 61 00 14 */ addi r3, r1, 0x14 /* 801766DC 0017361C 38 81 00 18 */ addi r4, r1, 0x18 -/* 801766E0 00173620 48 0F AB 85 */ bl cSAngle_NS___ml +/* 801766E0 00173620 48 0F AB 85 */ bl __ml__7cSAngleCFf /* 801766E4 00173624 38 61 00 10 */ addi r3, r1, 0x10 /* 801766E8 00173628 7F C4 F3 78 */ mr r4, r30 /* 801766EC 0017362C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 801766F0 00173630 48 0F AA 85 */ bl cSAngle_NS___pl +/* 801766F0 00173630 48 0F AA 85 */ bl __pl__7cSAngleCFRC7cSAngle /* 801766F4 00173634 38 61 00 08 */ addi r3, r1, 8 /* 801766F8 00173638 A8 81 00 10 */ lha r4, 0x10(r1) -/* 801766FC 0017363C 48 0F A8 9D */ bl cSAngle_X2_ +/* 801766FC 0017363C 48 0F A8 9D */ bl __ct__7cSAngleFs /* 80176700 00173640 A8 01 00 08 */ lha r0, 8(r1) /* 80176704 00173644 B0 1D 00 62 */ sth r0, 0x62(r29) /* 80176708 00173648 38 61 00 74 */ addi r3, r1, 0x74 /* 8017670C 0017364C 38 9D 00 5C */ addi r4, r29, 0x5c -/* 80176710 00173650 48 0F B3 A5 */ bl cSGlobe_NS_Xyz +/* 80176710 00173650 48 0F B3 A5 */ bl Xyz__7cSGlobeCFv /* 80176714 00173654 38 61 00 68 */ addi r3, r1, 0x68 /* 80176718 00173658 38 9D 00 64 */ addi r4, r29, 0x64 /* 8017671C 0017365C 38 A1 00 74 */ addi r5, r1, 0x74 -/* 80176720 00173660 48 0F 03 C5 */ bl cXyz_NS___pl +/* 80176720 00173660 48 0F 03 C5 */ bl __pl__4cXyzCFRC3Vec /* 80176724 00173664 C0 01 00 68 */ lfs f0, 0x68(r1) /* 80176728 00173668 D0 1D 00 70 */ stfs f0, 0x70(r29) /* 8017672C 0017366C C0 01 00 6C */ lfs f0, 0x6c(r1) diff --git a/include/d/d_camera/asm/func_801767F8.s b/include/d/d_camera/asm/func_801767F8.s index eba2a05b14..6e4397d0b8 100644 --- a/include/d/d_camera/asm/func_801767F8.s +++ b/include/d/d_camera/asm/func_801767F8.s @@ -170,10 +170,10 @@ lbl_80176A74: /* 80176A80 001739C0 D3 A1 01 04 */ stfs f29, 0x104(r1) /* 80176A84 001739C4 3B DD 00 62 */ addi r30, r29, 0x62 /* 80176A88 001739C8 7F C3 F3 78 */ mr r3, r30 -/* 80176A8C 001739CC 48 0F A6 5D */ bl cSAngle_NS_Inv +/* 80176A8C 001739CC 48 0F A6 5D */ bl Inv__7cSAngleCFv /* 80176A90 001739D0 7C 64 1B 78 */ mr r4, r3 /* 80176A94 001739D4 38 61 00 28 */ addi r3, r1, 0x28 -/* 80176A98 001739D8 48 0F A5 01 */ bl cSAngle_X2_ +/* 80176A98 001739D8 48 0F A5 01 */ bl __ct__7cSAngleFs /* 80176A9C 001739DC 38 61 00 9C */ addi r3, r1, 0x9c /* 80176AA0 001739E0 38 81 00 FC */ addi r4, r1, 0xfc /* 80176AA4 001739E4 38 A1 00 28 */ addi r5, r1, 0x28 @@ -195,10 +195,10 @@ lbl_80176A74: /* 80176AE4 00173A24 38 61 00 84 */ addi r3, r1, 0x84 /* 80176AE8 00173A28 38 81 00 F0 */ addi r4, r1, 0xf0 /* 80176AEC 00173A2C 38 A1 01 08 */ addi r5, r1, 0x108 -/* 80176AF0 00173A30 48 0F 00 45 */ bl cXyz_NS___mi +/* 80176AF0 00173A30 48 0F 00 45 */ bl __mi__4cXyzCFRC3Vec /* 80176AF4 00173A34 38 61 00 34 */ addi r3, r1, 0x34 /* 80176AF8 00173A38 38 81 00 84 */ addi r4, r1, 0x84 -/* 80176AFC 00173A3C 48 0F AD 85 */ bl cSGlobe_X4_ +/* 80176AFC 00173A3C 48 0F AD 85 */ bl __ct__7cSGlobeFRC4cXyz /* 80176B00 00173A40 C0 01 00 34 */ lfs f0, 0x34(r1) /* 80176B04 00173A44 FC 00 C0 40 */ fcmpo cr0, f0, f24 /* 80176B08 00173A48 40 80 00 10 */ bge lbl_80176B18 @@ -226,11 +226,11 @@ lbl_80176B44: /* 80176B54 00173A94 FF E0 08 90 */ fmr f31, f1 /* 80176B58 00173A98 38 61 00 78 */ addi r3, r1, 0x78 /* 80176B5C 00173A9C 38 81 00 34 */ addi r4, r1, 0x34 -/* 80176B60 00173AA0 48 0F AF 55 */ bl cSGlobe_NS_Xyz +/* 80176B60 00173AA0 48 0F AF 55 */ bl Xyz__7cSGlobeCFv /* 80176B64 00173AA4 38 61 00 6C */ addi r3, r1, 0x6c /* 80176B68 00173AA8 38 81 01 08 */ addi r4, r1, 0x108 /* 80176B6C 00173AAC 38 A1 00 78 */ addi r5, r1, 0x78 -/* 80176B70 00173AB0 48 0E FF 75 */ bl cXyz_NS___pl +/* 80176B70 00173AB0 48 0E FF 75 */ bl __pl__4cXyzCFRC3Vec /* 80176B74 00173AB4 C0 01 00 6C */ lfs f0, 0x6c(r1) /* 80176B78 00173AB8 D0 01 00 E4 */ stfs f0, 0xe4(r1) /* 80176B7C 00173ABC C0 01 00 70 */ lfs f0, 0x70(r1) @@ -258,7 +258,7 @@ lbl_80176BA8: /* 80176BD0 00173B10 EC 17 B0 28 */ fsubs f0, f23, f22 /* 80176BD4 00173B14 EC 1F 00 32 */ fmuls f0, f31, f0 /* 80176BD8 00173B18 EC 36 00 2A */ fadds f1, f22, f0 -/* 80176BDC 00173B1C 48 0F A3 ED */ bl cSAngle_X3_ +/* 80176BDC 00173B1C 48 0F A3 ED */ bl __ct__7cSAngleFf /* 80176BE0 00173B20 80 1D 0A F4 */ lwz r0, 0xaf4(r29) /* 80176BE4 00173B24 7C 60 FA 14 */ add r3, r0, r31 /* 80176BE8 00173B28 A0 03 00 06 */ lhz r0, 6(r3) @@ -266,22 +266,22 @@ lbl_80176BA8: /* 80176BF0 00173B30 41 82 00 10 */ beq lbl_80176C00 /* 80176BF4 00173B34 38 61 00 30 */ addi r3, r1, 0x30 /* 80176BF8 00173B38 38 81 00 38 */ addi r4, r1, 0x38 -/* 80176BFC 00173B3C 48 0F A5 D9 */ bl cSAngle_NS___apl +/* 80176BFC 00173B3C 48 0F A5 D9 */ bl __apl__7cSAngleFRC7cSAngle lbl_80176C00: /* 80176C00 00173B40 38 61 00 2C */ addi r3, r1, 0x2c /* 80176C04 00173B44 38 81 00 3A */ addi r4, r1, 0x3a -/* 80176C08 00173B48 48 0F A3 61 */ bl cSAngle_X1_ +/* 80176C08 00173B48 48 0F A3 61 */ bl __ct__7cSAngleFRC7cSAngle /* 80176C0C 00173B4C 88 1D 01 58 */ lbz r0, 0x158(r29) /* 80176C10 00173B50 28 00 00 00 */ cmplwi r0, 0 /* 80176C14 00173B54 40 82 00 DC */ bne lbl_80176CF0 /* 80176C18 00173B58 38 61 00 60 */ addi r3, r1, 0x60 /* 80176C1C 00173B5C 38 81 00 E4 */ addi r4, r1, 0xe4 /* 80176C20 00173B60 38 BD 00 64 */ addi r5, r29, 0x64 -/* 80176C24 00173B64 48 0E FF 11 */ bl cXyz_NS___mi +/* 80176C24 00173B64 48 0E FF 11 */ bl __mi__4cXyzCFRC3Vec /* 80176C28 00173B68 38 61 00 54 */ addi r3, r1, 0x54 /* 80176C2C 00173B6C 38 81 00 60 */ addi r4, r1, 0x60 /* 80176C30 00173B70 C0 3D 03 FC */ lfs f1, 0x3fc(r29) -/* 80176C34 00173B74 48 0E FF 51 */ bl cXyz_NS___ml +/* 80176C34 00173B74 48 0E FF 51 */ bl __ml__4cXyzCFf /* 80176C38 00173B78 38 7D 00 64 */ addi r3, r29, 0x64 /* 80176C3C 00173B7C 38 81 00 54 */ addi r4, r1, 0x54 /* 80176C40 00173B80 7C 65 1B 78 */ mr r5, r3 @@ -296,35 +296,35 @@ lbl_80176C00: /* 80176C64 00173BA4 38 81 00 30 */ addi r4, r1, 0x30 /* 80176C68 00173BA8 3B FD 00 60 */ addi r31, r29, 0x60 /* 80176C6C 00173BAC 7F E5 FB 78 */ mr r5, r31 -/* 80176C70 00173BB0 48 0F A5 35 */ bl cSAngle_NS___mi_X1_ +/* 80176C70 00173BB0 48 0F A5 35 */ bl __mi__7cSAngleCFRC7cSAngle /* 80176C74 00173BB4 38 61 00 20 */ addi r3, r1, 0x20 /* 80176C78 00173BB8 38 81 00 24 */ addi r4, r1, 0x24 /* 80176C7C 00173BBC C0 3D 03 FC */ lfs f1, 0x3fc(r29) -/* 80176C80 00173BC0 48 0F A5 E5 */ bl cSAngle_NS___ml +/* 80176C80 00173BC0 48 0F A5 E5 */ bl __ml__7cSAngleCFf /* 80176C84 00173BC4 38 61 00 1C */ addi r3, r1, 0x1c /* 80176C88 00173BC8 7F E4 FB 78 */ mr r4, r31 /* 80176C8C 00173BCC 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80176C90 00173BD0 48 0F A4 E5 */ bl cSAngle_NS___pl +/* 80176C90 00173BD0 48 0F A4 E5 */ bl __pl__7cSAngleCFRC7cSAngle /* 80176C94 00173BD4 38 61 00 0C */ addi r3, r1, 0xc /* 80176C98 00173BD8 A8 81 00 1C */ lha r4, 0x1c(r1) -/* 80176C9C 00173BDC 48 0F A2 FD */ bl cSAngle_X2_ +/* 80176C9C 00173BDC 48 0F A2 FD */ bl __ct__7cSAngleFs /* 80176CA0 00173BE0 A8 01 00 0C */ lha r0, 0xc(r1) /* 80176CA4 00173BE4 B0 1D 00 60 */ sth r0, 0x60(r29) /* 80176CA8 00173BE8 38 61 00 18 */ addi r3, r1, 0x18 /* 80176CAC 00173BEC 38 81 00 2C */ addi r4, r1, 0x2c /* 80176CB0 00173BF0 7F C5 F3 78 */ mr r5, r30 -/* 80176CB4 00173BF4 48 0F A4 F1 */ bl cSAngle_NS___mi_X1_ +/* 80176CB4 00173BF4 48 0F A4 F1 */ bl __mi__7cSAngleCFRC7cSAngle /* 80176CB8 00173BF8 38 61 00 14 */ addi r3, r1, 0x14 /* 80176CBC 00173BFC 38 81 00 18 */ addi r4, r1, 0x18 /* 80176CC0 00173C00 C0 3D 03 FC */ lfs f1, 0x3fc(r29) -/* 80176CC4 00173C04 48 0F A5 A1 */ bl cSAngle_NS___ml +/* 80176CC4 00173C04 48 0F A5 A1 */ bl __ml__7cSAngleCFf /* 80176CC8 00173C08 38 61 00 10 */ addi r3, r1, 0x10 /* 80176CCC 00173C0C 7F C4 F3 78 */ mr r4, r30 /* 80176CD0 00173C10 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80176CD4 00173C14 48 0F A4 A1 */ bl cSAngle_NS___pl +/* 80176CD4 00173C14 48 0F A4 A1 */ bl __pl__7cSAngleCFRC7cSAngle /* 80176CD8 00173C18 38 61 00 08 */ addi r3, r1, 8 /* 80176CDC 00173C1C A8 81 00 10 */ lha r4, 0x10(r1) -/* 80176CE0 00173C20 48 0F A2 B9 */ bl cSAngle_X2_ +/* 80176CE0 00173C20 48 0F A2 B9 */ bl __ct__7cSAngleFs /* 80176CE4 00173C24 A8 01 00 08 */ lha r0, 8(r1) /* 80176CE8 00173C28 B0 1D 00 62 */ sth r0, 0x62(r29) /* 80176CEC 00173C2C 48 00 00 30 */ b lbl_80176D1C @@ -339,15 +339,15 @@ lbl_80176CF0: /* 80176D0C 00173C4C FC 20 C0 90 */ fmr f1, f24 /* 80176D10 00173C50 38 81 00 30 */ addi r4, r1, 0x30 /* 80176D14 00173C54 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80176D18 00173C58 48 0F AC F1 */ bl cSGlobe_NS_Val_X2_ +/* 80176D18 00173C58 48 0F AC F1 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle lbl_80176D1C: /* 80176D1C 00173C5C 38 61 00 48 */ addi r3, r1, 0x48 /* 80176D20 00173C60 38 9D 00 5C */ addi r4, r29, 0x5c -/* 80176D24 00173C64 48 0F AD 91 */ bl cSGlobe_NS_Xyz +/* 80176D24 00173C64 48 0F AD 91 */ bl Xyz__7cSGlobeCFv /* 80176D28 00173C68 38 61 00 3C */ addi r3, r1, 0x3c /* 80176D2C 00173C6C 38 9D 00 64 */ addi r4, r29, 0x64 /* 80176D30 00173C70 38 A1 00 48 */ addi r5, r1, 0x48 -/* 80176D34 00173C74 48 0E FD B1 */ bl cXyz_NS___pl +/* 80176D34 00173C74 48 0E FD B1 */ bl __pl__4cXyzCFRC3Vec /* 80176D38 00173C78 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 80176D3C 00173C7C D0 1D 00 70 */ stfs f0, 0x70(r29) /* 80176D40 00173C80 C0 01 00 40 */ lfs f0, 0x40(r1) diff --git a/include/d/d_camera/asm/func_80176E00.s b/include/d/d_camera/asm/func_80176E00.s index a979a70d16..24d3e82d64 100644 --- a/include/d/d_camera/asm/func_80176E00.s +++ b/include/d/d_camera/asm/func_80176E00.s @@ -43,22 +43,22 @@ /* 80176EA8 00173DE8 7C 99 23 78 */ mr r25, r4 /* 80176EAC 00173DEC 38 61 00 FC */ addi r3, r1, 0xfc /* 80176EB0 00173DF0 C0 38 0A 30 */ lfs f1, 0xa30(r24) -/* 80176EB4 00173DF4 48 0F A1 15 */ bl cSAngle_X3_ +/* 80176EB4 00173DF4 48 0F A1 15 */ bl __ct__7cSAngleFf /* 80176EB8 00173DF8 38 61 01 4C */ addi r3, r1, 0x14c /* 80176EBC 00173DFC 38 81 00 FC */ addi r4, r1, 0xfc -/* 80176EC0 00173E00 48 0F A0 A9 */ bl cSAngle_X1_ +/* 80176EC0 00173E00 48 0F A0 A9 */ bl __ct__7cSAngleFRC7cSAngle /* 80176EC4 00173E04 38 61 00 FC */ addi r3, r1, 0xfc /* 80176EC8 00173E08 38 80 FF FF */ li r4, -1 /* 80176ECC 00173E0C 4B EB 96 45 */ bl cSAngle_NS_dtor /* 80176ED0 00173E10 38 61 01 48 */ addi r3, r1, 0x148 /* 80176ED4 00173E14 C0 22 9D 54 */ lfs f1, lbl_80453754-_SDA2_BASE_(r2) -/* 80176ED8 00173E18 48 0F A0 F1 */ bl cSAngle_X3_ +/* 80176ED8 00173E18 48 0F A0 F1 */ bl __ct__7cSAngleFf /* 80176EDC 00173E1C 38 61 01 44 */ addi r3, r1, 0x144 /* 80176EE0 00173E20 C0 22 9D 98 */ lfs f1, lbl_80453798-_SDA2_BASE_(r2) -/* 80176EE4 00173E24 48 0F A0 E5 */ bl cSAngle_X3_ +/* 80176EE4 00173E24 48 0F A0 E5 */ bl __ct__7cSAngleFf /* 80176EE8 00173E28 38 61 01 40 */ addi r3, r1, 0x140 /* 80176EEC 00173E2C C0 22 9C B8 */ lfs f1, lbl_804536B8-_SDA2_BASE_(r2) -/* 80176EF0 00173E30 48 0F A0 D9 */ bl cSAngle_X3_ +/* 80176EF0 00173E30 48 0F A0 D9 */ bl __ct__7cSAngleFf /* 80176EF4 00173E34 38 78 0A EC */ addi r3, r24, 0xaec /* 80176EF8 00173E38 7F 24 CB 78 */ mr r4, r25 /* 80176EFC 00173E3C 38 A0 00 00 */ li r5, 0 @@ -154,13 +154,13 @@ /* 80177064 00173FA4 38 A0 00 17 */ li r5, 0x17 /* 80177068 00173FA8 48 00 BC 69 */ bl dCamParam_c_NS_Val /* 8017706C 00173FAC 38 61 01 3C */ addi r3, r1, 0x13c -/* 80177070 00173FB0 48 0F 9F 59 */ bl cSAngle_X3_ +/* 80177070 00173FB0 48 0F 9F 59 */ bl __ct__7cSAngleFf /* 80177074 00173FB4 38 78 0A EC */ addi r3, r24, 0xaec /* 80177078 00173FB8 7F 24 CB 78 */ mr r4, r25 /* 8017707C 00173FBC 38 A0 00 18 */ li r5, 0x18 /* 80177080 00173FC0 48 00 BC 51 */ bl dCamParam_c_NS_Val /* 80177084 00173FC4 38 61 01 38 */ addi r3, r1, 0x138 -/* 80177088 00173FC8 48 0F 9F 41 */ bl cSAngle_X3_ +/* 80177088 00173FC8 48 0F 9F 41 */ bl __ct__7cSAngleFf /* 8017708C 00173FCC 38 78 0A EC */ addi r3, r24, 0xaec /* 80177090 00173FD0 7F 24 CB 78 */ mr r4, r25 /* 80177094 00173FD4 38 A0 00 16 */ li r5, 0x16 @@ -216,7 +216,7 @@ lbl_80177130: /* 80177158 00174098 D0 18 04 44 */ stfs f0, 0x444(r24) /* 8017715C 0017409C 38 61 00 F8 */ addi r3, r1, 0xf8 /* 80177160 001740A0 A8 98 07 D2 */ lha r4, 0x7d2(r24) -/* 80177164 001740A4 48 0F 9E 35 */ bl cSAngle_X2_ +/* 80177164 001740A4 48 0F 9E 35 */ bl __ct__7cSAngleFs /* 80177168 001740A8 38 78 04 48 */ addi r3, r24, 0x448 /* 8017716C 001740AC 38 81 00 F8 */ addi r4, r1, 0xf8 /* 80177170 001740B0 48 00 BB 39 */ bl cSAngle_NS___as @@ -277,7 +277,7 @@ lbl_80177234: /* 80177244 00174184 41 82 00 5C */ beq lbl_801772A0 /* 80177248 00174188 38 61 00 F4 */ addi r3, r1, 0xf4 /* 8017724C 0017418C C0 22 9E A4 */ lfs f1, lbl_804538A4-_SDA2_BASE_(r2) -/* 80177250 00174190 48 0F 9D 79 */ bl cSAngle_X3_ +/* 80177250 00174190 48 0F 9D 79 */ bl __ct__7cSAngleFf /* 80177254 00174194 A8 01 01 44 */ lha r0, 0x144(r1) /* 80177258 00174198 A8 81 00 F4 */ lha r4, 0xf4(r1) /* 8017725C 0017419C 7C 80 02 78 */ xor r0, r4, r0 @@ -292,7 +292,7 @@ lbl_80177234: /* 80177280 001741C0 41 82 00 10 */ beq lbl_80177290 /* 80177284 001741C4 38 61 01 44 */ addi r3, r1, 0x144 /* 80177288 001741C8 C0 22 9E A4 */ lfs f1, lbl_804538A4-_SDA2_BASE_(r2) -/* 8017728C 001741CC 48 0F 9D 81 */ bl cSAngle_NS_Val_X3_ +/* 8017728C 001741CC 48 0F 9D 81 */ bl Val__7cSAngleFf lbl_80177290: /* 80177290 001741D0 C0 02 9D F0 */ lfs f0, lbl_804537F0-_SDA2_BASE_(r2) /* 80177294 001741D4 FC 18 00 40 */ fcmpo cr0, f24, f0 @@ -306,10 +306,10 @@ lbl_801772A0: /* 801772B0 001741F0 38 61 03 14 */ addi r3, r1, 0x314 /* 801772B4 001741F4 38 81 03 20 */ addi r4, r1, 0x320 /* 801772B8 001741F8 38 B8 04 3C */ addi r5, r24, 0x43c -/* 801772BC 001741FC 48 0E F8 79 */ bl cXyz_NS___mi +/* 801772BC 001741FC 48 0E F8 79 */ bl __mi__4cXyzCFRC3Vec /* 801772C0 00174200 38 61 01 74 */ addi r3, r1, 0x174 /* 801772C4 00174204 38 81 03 14 */ addi r4, r1, 0x314 -/* 801772C8 00174208 48 0F A5 B9 */ bl cSGlobe_X4_ +/* 801772C8 00174208 48 0F A5 B9 */ bl __ct__7cSGlobeFRC4cXyz /* 801772CC 0017420C 38 61 03 14 */ addi r3, r1, 0x314 /* 801772D0 00174210 38 80 FF FF */ li r4, -1 /* 801772D4 00174214 4B E9 1E B1 */ bl cXyz_NS_dtor @@ -322,7 +322,7 @@ lbl_801772A0: /* 801772F0 00174230 4B F2 04 49 */ bl dCamera_c_NS_directionOf /* 801772F4 00174234 38 61 01 34 */ addi r3, r1, 0x134 /* 801772F8 00174238 38 81 00 F0 */ addi r4, r1, 0xf0 -/* 801772FC 0017423C 48 0F 9C 6D */ bl cSAngle_X1_ +/* 801772FC 0017423C 48 0F 9C 6D */ bl __ct__7cSAngleFRC7cSAngle /* 80177300 00174240 38 61 00 F0 */ addi r3, r1, 0xf0 /* 80177304 00174244 38 80 FF FF */ li r4, -1 /* 80177308 00174248 4B EB 92 09 */ bl cSAngle_NS_dtor @@ -331,7 +331,7 @@ lbl_801772A0: /* 80177314 00174254 7F 84 E3 78 */ mr r4, r28 /* 80177318 00174258 3B 78 00 62 */ addi r27, r24, 0x62 /* 8017731C 0017425C 7F 65 DB 78 */ mr r5, r27 -/* 80177320 00174260 48 0F 9E 85 */ bl cSAngle_NS___mi_X1_ +/* 80177320 00174260 48 0F 9E 85 */ bl __mi__7cSAngleCFRC7cSAngle /* 80177324 00174264 A8 81 00 EC */ lha r4, 0xec(r1) /* 80177328 00174268 A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) /* 8017732C 0017426C 7C 80 02 78 */ xor r0, r4, r0 @@ -345,7 +345,7 @@ lbl_801772A0: /* 8017734C 0017428C 38 61 00 E8 */ addi r3, r1, 0xe8 /* 80177350 00174290 7F 84 E3 78 */ mr r4, r28 /* 80177354 00174294 38 A1 01 34 */ addi r5, r1, 0x134 -/* 80177358 00174298 48 0F 9E 4D */ bl cSAngle_NS___mi_X1_ +/* 80177358 00174298 48 0F 9E 4D */ bl __mi__7cSAngleCFRC7cSAngle /* 8017735C 0017429C A8 81 00 E8 */ lha r4, 0xe8(r1) /* 80177360 001742A0 A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) /* 80177364 001742A4 7C 80 02 78 */ xor r0, r4, r0 @@ -365,10 +365,10 @@ lbl_801772A0: /* 8017739C 001742DC 38 61 03 08 */ addi r3, r1, 0x308 /* 801773A0 001742E0 38 98 00 70 */ addi r4, r24, 0x70 /* 801773A4 001742E4 38 B8 00 64 */ addi r5, r24, 0x64 -/* 801773A8 001742E8 48 0E F7 8D */ bl cXyz_NS___mi +/* 801773A8 001742E8 48 0E F7 8D */ bl __mi__4cXyzCFRC3Vec /* 801773AC 001742EC 38 78 00 5C */ addi r3, r24, 0x5c /* 801773B0 001742F0 38 81 03 08 */ addi r4, r1, 0x308 -/* 801773B4 001742F4 48 0F A6 BD */ bl cSGlobe_NS_Val_X3_ +/* 801773B4 001742F4 48 0F A6 BD */ bl Val__7cSGlobeFRC4cXyz /* 801773B8 001742F8 38 61 03 08 */ addi r3, r1, 0x308 /* 801773BC 001742FC 38 80 FF FF */ li r4, -1 /* 801773C0 00174300 4B E9 1D C5 */ bl cXyz_NS_dtor @@ -381,7 +381,7 @@ lbl_801772A0: /* 801773DC 0017431C 90 18 03 FC */ stw r0, 0x3fc(r24) /* 801773E0 00174320 90 18 03 F8 */ stw r0, 0x3f8(r24) /* 801773E4 00174324 38 78 00 2C */ addi r3, r24, 0x2c -/* 801773E8 00174328 48 0F 9C 49 */ bl cSAngle_NS_Degree +/* 801773E8 00174328 48 0F 9C 49 */ bl Degree__7cSAngleCFv /* 801773EC 0017432C D0 38 04 28 */ stfs f1, 0x428(r24) /* 801773F0 00174330 D0 38 04 0C */ stfs f1, 0x40c(r24) /* 801773F4 00174334 38 78 04 30 */ addi r3, r24, 0x430 @@ -413,15 +413,15 @@ lbl_801772A0: /* 8017745C 0017439C 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 80177460 001743A0 41 82 00 3C */ beq lbl_8017749C /* 80177464 001743A4 7F 63 DB 78 */ mr r3, r27 -/* 80177468 001743A8 48 0F 9C 81 */ bl cSAngle_NS_Inv +/* 80177468 001743A8 48 0F 9C 81 */ bl Inv__7cSAngleCFv /* 8017746C 001743AC 7C 60 1B 78 */ mr r0, r3 /* 80177470 001743B0 38 61 00 E4 */ addi r3, r1, 0xe4 /* 80177474 001743B4 7F 84 E3 78 */ mr r4, r28 /* 80177478 001743B8 7C 05 07 34 */ extsh r5, r0 -/* 8017747C 001743BC 48 0F 9D AD */ bl cSAngle_NS___mi_X2_ +/* 8017747C 001743BC 48 0F 9D AD */ bl __mi__7cSAngleCFs /* 80177480 001743C0 38 61 01 30 */ addi r3, r1, 0x130 /* 80177484 001743C4 38 81 00 E4 */ addi r4, r1, 0xe4 -/* 80177488 001743C8 48 0F 9B 71 */ bl cSAngle_NS_Val_X1_ +/* 80177488 001743C8 48 0F 9B 71 */ bl Val__7cSAngleFRC7cSAngle /* 8017748C 001743CC 38 61 00 E4 */ addi r3, r1, 0xe4 /* 80177490 001743D0 38 80 FF FF */ li r4, -1 /* 80177494 001743D4 4B EB 90 7D */ bl cSAngle_NS_dtor @@ -434,10 +434,10 @@ lbl_8017749C: /* 801774AC 001743EC 38 61 00 DC */ addi r3, r1, 0xdc /* 801774B0 001743F0 7F 84 E3 78 */ mr r4, r28 /* 801774B4 001743F4 38 A1 00 E0 */ addi r5, r1, 0xe0 -/* 801774B8 001743F8 48 0F 9C ED */ bl cSAngle_NS___mi_X1_ +/* 801774B8 001743F8 48 0F 9C ED */ bl __mi__7cSAngleCFRC7cSAngle /* 801774BC 001743FC 38 61 01 30 */ addi r3, r1, 0x130 /* 801774C0 00174400 38 81 00 DC */ addi r4, r1, 0xdc -/* 801774C4 00174404 48 0F 9B 35 */ bl cSAngle_NS_Val_X1_ +/* 801774C4 00174404 48 0F 9B 35 */ bl Val__7cSAngleFRC7cSAngle /* 801774C8 00174408 38 61 00 DC */ addi r3, r1, 0xdc /* 801774CC 0017440C 38 80 FF FF */ li r4, -1 /* 801774D0 00174410 4B EB 90 41 */ bl cSAngle_NS_dtor @@ -487,15 +487,15 @@ lbl_80177538: /* 80177570 001744B0 38 61 00 D8 */ addi r3, r1, 0xd8 /* 80177574 001744B4 38 98 04 48 */ addi r4, r24, 0x448 /* 80177578 001744B8 7F 85 E3 78 */ mr r5, r28 -/* 8017757C 001744BC 48 0F 9C 29 */ bl cSAngle_NS___mi_X1_ +/* 8017757C 001744BC 48 0F 9C 29 */ bl __mi__7cSAngleCFRC7cSAngle /* 80177580 001744C0 38 61 01 2C */ addi r3, r1, 0x12c /* 80177584 001744C4 38 81 00 D8 */ addi r4, r1, 0xd8 -/* 80177588 001744C8 48 0F 99 E1 */ bl cSAngle_X1_ +/* 80177588 001744C8 48 0F 99 E1 */ bl __ct__7cSAngleFRC7cSAngle /* 8017758C 001744CC 38 61 00 D8 */ addi r3, r1, 0xd8 /* 80177590 001744D0 38 80 FF FF */ li r4, -1 /* 80177594 001744D4 4B EB 8F 7D */ bl cSAngle_NS_dtor /* 80177598 001744D8 38 61 01 2C */ addi r3, r1, 0x12c -/* 8017759C 001744DC 48 0F 9B 5D */ bl cSAngle_NS_Sin +/* 8017759C 001744DC 48 0F 9B 5D */ bl Sin__7cSAngleCFv /* 801775A0 001744E0 EC 1A 00 72 */ fmuls f0, f26, f1 /* 801775A4 001744E4 D0 18 04 18 */ stfs f0, 0x418(r24) /* 801775A8 001744E8 38 61 01 2C */ addi r3, r1, 0x12c @@ -667,7 +667,7 @@ lbl_801777CC: /* 801777F8 00174738 38 61 02 F0 */ addi r3, r1, 0x2f0 /* 801777FC 0017473C 38 98 00 3C */ addi r4, r24, 0x3c /* 80177800 00174740 38 A1 03 74 */ addi r5, r1, 0x374 -/* 80177804 00174744 48 0E F3 31 */ bl cXyz_NS___mi +/* 80177804 00174744 48 0E F3 31 */ bl __mi__4cXyzCFRC3Vec /* 80177808 00174748 38 61 02 E4 */ addi r3, r1, 0x2e4 /* 8017780C 0017474C 38 81 02 F0 */ addi r4, r1, 0x2f0 /* 80177810 00174750 4B F1 FF E5 */ bl cXyz_X1_ @@ -683,7 +683,7 @@ lbl_801777CC: /* 80177838 00174778 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 8017783C 0017477C 38 98 00 30 */ addi r4, r24, 0x30 /* 80177840 00174780 38 A1 03 74 */ addi r5, r1, 0x374 -/* 80177844 00174784 48 0E F2 F1 */ bl cXyz_NS___mi +/* 80177844 00174784 48 0E F2 F1 */ bl __mi__4cXyzCFRC3Vec /* 80177848 00174788 38 61 02 CC */ addi r3, r1, 0x2cc /* 8017784C 0017478C 38 81 02 D8 */ addi r4, r1, 0x2d8 /* 80177850 00174790 4B F1 FF A5 */ bl cXyz_X1_ @@ -745,7 +745,7 @@ lbl_801778E4: lbl_8017791C: /* 8017791C 0017485C 38 61 01 6C */ addi r3, r1, 0x16c /* 80177920 00174860 38 81 03 80 */ addi r4, r1, 0x380 -/* 80177924 00174864 48 0F 9F 5D */ bl cSGlobe_X4_ +/* 80177924 00174864 48 0F 9F 5D */ bl __ct__7cSGlobeFRC4cXyz /* 80177928 00174868 38 78 0A EC */ addi r3, r24, 0xaec /* 8017792C 0017486C 7F 24 CB 78 */ mr r4, r25 /* 80177930 00174870 38 A0 10 00 */ li r5, 0x1000 @@ -759,7 +759,7 @@ lbl_8017791C: /* 80177950 00174890 38 61 00 D0 */ addi r3, r1, 0xd0 /* 80177954 00174894 38 81 01 72 */ addi r4, r1, 0x172 /* 80177958 00174898 38 A1 00 D4 */ addi r5, r1, 0xd4 -/* 8017795C 0017489C 48 0F 98 19 */ bl cSAngle_NS___pl +/* 8017795C 0017489C 48 0F 98 19 */ bl __pl__7cSAngleCFRC7cSAngle /* 80177960 001748A0 38 61 01 6C */ addi r3, r1, 0x16c /* 80177964 001748A4 38 81 00 D0 */ addi r4, r1, 0xd0 /* 80177968 001748A8 4B F1 6F 2D */ bl cSGlobe_NS_U @@ -774,7 +774,7 @@ lbl_80177988: /* 80177988 001748C8 38 61 00 CC */ addi r3, r1, 0xcc /* 8017798C 001748CC 38 81 01 72 */ addi r4, r1, 0x172 /* 80177990 001748D0 7F 85 E3 78 */ mr r5, r28 -/* 80177994 001748D4 48 0F 97 E1 */ bl cSAngle_NS___pl +/* 80177994 001748D4 48 0F 97 E1 */ bl __pl__7cSAngleCFRC7cSAngle /* 80177998 001748D8 38 61 01 6C */ addi r3, r1, 0x16c /* 8017799C 001748DC 38 81 00 CC */ addi r4, r1, 0xcc /* 801779A0 001748E0 4B F1 6E F5 */ bl cSGlobe_NS_U @@ -797,11 +797,11 @@ lbl_801779B0: /* 801779E0 00174920 4B F1 FD 3D */ bl dCamera_c_NS_attentionPos /* 801779E4 00174924 38 61 02 B4 */ addi r3, r1, 0x2b4 /* 801779E8 00174928 38 81 01 6C */ addi r4, r1, 0x16c -/* 801779EC 0017492C 48 0F A0 C9 */ bl cSGlobe_NS_Xyz +/* 801779EC 0017492C 48 0F A0 C9 */ bl Xyz__7cSGlobeCFv /* 801779F0 00174930 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 801779F4 00174934 38 81 02 C0 */ addi r4, r1, 0x2c0 /* 801779F8 00174938 38 A1 02 B4 */ addi r5, r1, 0x2b4 -/* 801779FC 0017493C 48 0E F0 E9 */ bl cXyz_NS___pl +/* 801779FC 0017493C 48 0E F0 E9 */ bl __pl__4cXyzCFRC3Vec /* 80177A00 00174940 38 61 02 9C */ addi r3, r1, 0x29c /* 80177A04 00174944 7F 04 C3 78 */ mr r4, r24 /* 80177A08 00174948 80 B8 01 84 */ lwz r5, 0x184(r24) @@ -813,15 +813,15 @@ lbl_801779B0: /* 80177A20 00174960 38 61 02 84 */ addi r3, r1, 0x284 /* 80177A24 00174964 38 81 02 9C */ addi r4, r1, 0x29c /* 80177A28 00174968 38 A1 02 90 */ addi r5, r1, 0x290 -/* 80177A2C 0017496C 48 0E F1 09 */ bl cXyz_NS___mi +/* 80177A2C 0017496C 48 0E F1 09 */ bl __mi__4cXyzCFRC3Vec /* 80177A30 00174970 38 61 02 78 */ addi r3, r1, 0x278 /* 80177A34 00174974 38 81 02 84 */ addi r4, r1, 0x284 /* 80177A38 00174978 C0 21 04 18 */ lfs f1, 0x418(r1) -/* 80177A3C 0017497C 48 0E F1 49 */ bl cXyz_NS___ml +/* 80177A3C 0017497C 48 0E F1 49 */ bl __ml__4cXyzCFf /* 80177A40 00174980 38 61 02 6C */ addi r3, r1, 0x26c /* 80177A44 00174984 38 81 02 A8 */ addi r4, r1, 0x2a8 /* 80177A48 00174988 38 A1 02 78 */ addi r5, r1, 0x278 -/* 80177A4C 0017498C 48 0E F0 99 */ bl cXyz_NS___pl +/* 80177A4C 0017498C 48 0E F0 99 */ bl __pl__4cXyzCFRC3Vec /* 80177A50 00174990 38 61 03 68 */ addi r3, r1, 0x368 /* 80177A54 00174994 38 81 02 6C */ addi r4, r1, 0x26c /* 80177A58 00174998 4B F1 FD 81 */ bl cXyz_NS___as @@ -862,11 +862,11 @@ lbl_80177AD4: /* 80177AE0 00174A20 4B F1 FC 3D */ bl dCamera_c_NS_attentionPos /* 80177AE4 00174A24 38 61 02 54 */ addi r3, r1, 0x254 /* 80177AE8 00174A28 38 81 01 6C */ addi r4, r1, 0x16c -/* 80177AEC 00174A2C 48 0F 9F C9 */ bl cSGlobe_NS_Xyz +/* 80177AEC 00174A2C 48 0F 9F C9 */ bl Xyz__7cSGlobeCFv /* 80177AF0 00174A30 38 61 02 48 */ addi r3, r1, 0x248 /* 80177AF4 00174A34 38 81 02 60 */ addi r4, r1, 0x260 /* 80177AF8 00174A38 38 A1 02 54 */ addi r5, r1, 0x254 -/* 80177AFC 00174A3C 48 0E EF E9 */ bl cXyz_NS___pl +/* 80177AFC 00174A3C 48 0E EF E9 */ bl __pl__4cXyzCFRC3Vec /* 80177B00 00174A40 38 61 03 68 */ addi r3, r1, 0x368 /* 80177B04 00174A44 38 81 02 48 */ addi r4, r1, 0x248 /* 80177B08 00174A48 4B F1 FC D1 */ bl cXyz_NS___as @@ -913,11 +913,11 @@ lbl_80177B6C: /* 80177BA4 00174AE4 38 61 02 3C */ addi r3, r1, 0x23c /* 80177BA8 00174AE8 38 81 03 68 */ addi r4, r1, 0x368 /* 80177BAC 00174AEC 38 B8 04 30 */ addi r5, r24, 0x430 -/* 80177BB0 00174AF0 48 0E EF 85 */ bl cXyz_NS___mi +/* 80177BB0 00174AF0 48 0E EF 85 */ bl __mi__4cXyzCFRC3Vec /* 80177BB4 00174AF4 38 61 02 30 */ addi r3, r1, 0x230 /* 80177BB8 00174AF8 38 81 02 3C */ addi r4, r1, 0x23c /* 80177BBC 00174AFC FC 20 78 90 */ fmr f1, f15 -/* 80177BC0 00174B00 48 0E EF C5 */ bl cXyz_NS___ml +/* 80177BC0 00174B00 48 0E EF C5 */ bl __ml__4cXyzCFf /* 80177BC4 00174B04 38 78 04 30 */ addi r3, r24, 0x430 /* 80177BC8 00174B08 38 81 02 30 */ addi r4, r1, 0x230 /* 80177BCC 00174B0C 4B F1 6D 39 */ bl cXyz_NS___apl @@ -930,11 +930,11 @@ lbl_80177B6C: /* 80177BE8 00174B28 38 61 02 24 */ addi r3, r1, 0x224 /* 80177BEC 00174B2C 38 98 04 30 */ addi r4, r24, 0x430 /* 80177BF0 00174B30 38 B8 00 64 */ addi r5, r24, 0x64 -/* 80177BF4 00174B34 48 0E EF 41 */ bl cXyz_NS___mi +/* 80177BF4 00174B34 48 0E EF 41 */ bl __mi__4cXyzCFRC3Vec /* 80177BF8 00174B38 38 61 02 18 */ addi r3, r1, 0x218 /* 80177BFC 00174B3C 38 81 02 24 */ addi r4, r1, 0x224 /* 80177C00 00174B40 FC 20 B8 90 */ fmr f1, f23 -/* 80177C04 00174B44 48 0E EF 81 */ bl cXyz_NS___ml +/* 80177C04 00174B44 48 0E EF 81 */ bl __ml__4cXyzCFf /* 80177C08 00174B48 38 78 00 64 */ addi r3, r24, 0x64 /* 80177C0C 00174B4C 38 81 02 18 */ addi r4, r1, 0x218 /* 80177C10 00174B50 4B F1 6C F5 */ bl cXyz_NS___apl @@ -1001,7 +1001,7 @@ lbl_80177CD8: /* 80177D00 00174C40 41 82 00 28 */ beq lbl_80177D28 /* 80177D04 00174C44 38 61 00 C8 */ addi r3, r1, 0xc8 /* 80177D08 00174C48 FC 20 98 90 */ fmr f1, f19 -/* 80177D0C 00174C4C 48 0F 92 BD */ bl cSAngle_X3_ +/* 80177D0C 00174C4C 48 0F 92 BD */ bl __ct__7cSAngleFf /* 80177D10 00174C50 38 61 01 28 */ addi r3, r1, 0x128 /* 80177D14 00174C54 38 81 00 C8 */ addi r4, r1, 0xc8 /* 80177D18 00174C58 48 00 AF 91 */ bl cSAngle_NS___as @@ -1026,15 +1026,15 @@ lbl_80177D44: /* 80177D5C 00174C9C 48 00 AF 4D */ bl cSAngle_NS___as lbl_80177D60: /* 80177D60 00174CA0 38 78 00 8C */ addi r3, r24, 0x8c -/* 80177D64 00174CA4 48 0F 93 85 */ bl cSAngle_NS_Inv +/* 80177D64 00174CA4 48 0F 93 85 */ bl Inv__7cSAngleCFv /* 80177D68 00174CA8 7C 64 1B 78 */ mr r4, r3 /* 80177D6C 00174CAC 38 61 00 C4 */ addi r3, r1, 0xc4 -/* 80177D70 00174CB0 48 0F 92 29 */ bl cSAngle_X2_ +/* 80177D70 00174CB0 48 0F 92 29 */ bl __ct__7cSAngleFs /* 80177D74 00174CB4 38 61 01 64 */ addi r3, r1, 0x164 /* 80177D78 00174CB8 FC 20 70 90 */ fmr f1, f14 /* 80177D7C 00174CBC 38 81 01 28 */ addi r4, r1, 0x128 /* 80177D80 00174CC0 38 A1 00 C4 */ addi r5, r1, 0xc4 -/* 80177D84 00174CC4 48 0F 9A CD */ bl cSGlobe_X3_ +/* 80177D84 00174CC4 48 0F 9A CD */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80177D88 00174CC8 38 61 00 C4 */ addi r3, r1, 0xc4 /* 80177D8C 00174CCC 38 80 FF FF */ li r4, -1 /* 80177D90 00174CD0 4B EB 87 81 */ bl cSAngle_NS_dtor @@ -1047,15 +1047,15 @@ lbl_80177D60: /* 80177DAC 00174CEC 38 61 00 C0 */ addi r3, r1, 0xc0 /* 80177DB0 00174CF0 38 81 01 68 */ addi r4, r1, 0x168 /* 80177DB4 00174CF4 7E C5 B3 78 */ mr r5, r22 -/* 80177DB8 00174CF8 48 0F 93 ED */ bl cSAngle_NS___mi_X1_ +/* 80177DB8 00174CF8 48 0F 93 ED */ bl __mi__7cSAngleCFRC7cSAngle /* 80177DBC 00174CFC 38 61 00 BC */ addi r3, r1, 0xbc /* 80177DC0 00174D00 38 81 00 C0 */ addi r4, r1, 0xc0 /* 80177DC4 00174D04 FC 20 78 90 */ fmr f1, f15 -/* 80177DC8 00174D08 48 0F 94 9D */ bl cSAngle_NS___ml +/* 80177DC8 00174D08 48 0F 94 9D */ bl __ml__7cSAngleCFf /* 80177DCC 00174D0C 38 61 00 B8 */ addi r3, r1, 0xb8 /* 80177DD0 00174D10 7E C4 B3 78 */ mr r4, r22 /* 80177DD4 00174D14 38 A1 00 BC */ addi r5, r1, 0xbc -/* 80177DD8 00174D18 48 0F 93 9D */ bl cSAngle_NS___pl +/* 80177DD8 00174D18 48 0F 93 9D */ bl __pl__7cSAngleCFRC7cSAngle /* 80177DDC 00174D1C 38 78 00 5C */ addi r3, r24, 0x5c /* 80177DE0 00174D20 38 81 00 B8 */ addi r4, r1, 0xb8 /* 80177DE4 00174D24 4B F1 7C 75 */ bl cSGlobe_NS_V @@ -1070,11 +1070,11 @@ lbl_80177D60: /* 80177E08 00174D48 4B EB 87 09 */ bl cSAngle_NS_dtor /* 80177E0C 00174D4C 38 61 02 00 */ addi r3, r1, 0x200 /* 80177E10 00174D50 38 98 00 5C */ addi r4, r24, 0x5c -/* 80177E14 00174D54 48 0F 9C A1 */ bl cSGlobe_NS_Xyz +/* 80177E14 00174D54 48 0F 9C A1 */ bl Xyz__7cSGlobeCFv /* 80177E18 00174D58 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 80177E1C 00174D5C 38 98 00 64 */ addi r4, r24, 0x64 /* 80177E20 00174D60 38 A1 02 00 */ addi r5, r1, 0x200 -/* 80177E24 00174D64 48 0E EC C1 */ bl cXyz_NS___pl +/* 80177E24 00174D64 48 0E EC C1 */ bl __pl__4cXyzCFRC3Vec /* 80177E28 00174D68 38 78 00 70 */ addi r3, r24, 0x70 /* 80177E2C 00174D6C 38 81 01 F4 */ addi r4, r1, 0x1f4 /* 80177E30 00174D70 4B F1 F9 A9 */ bl cXyz_NS___as @@ -1093,7 +1093,7 @@ lbl_80177D60: /* 80177E64 00174DA4 98 18 01 58 */ stb r0, 0x158(r24) lbl_80177E68: /* 80177E68 00174DA8 7E C3 B3 78 */ mr r3, r22 -/* 80177E6C 00174DAC 48 0F 91 C5 */ bl cSAngle_NS_Degree +/* 80177E6C 00174DAC 48 0F 91 C5 */ bl Degree__7cSAngleCFv /* 80177E70 00174DB0 D0 38 04 0C */ stfs f1, 0x40c(r24) /* 80177E74 00174DB4 C0 18 00 5C */ lfs f0, 0x5c(r24) /* 80177E78 00174DB8 D0 18 04 08 */ stfs f0, 0x408(r24) @@ -1208,10 +1208,10 @@ lbl_80178020: /* 80178020 00174F60 38 61 00 B4 */ addi r3, r1, 0xb4 /* 80178024 00174F64 38 81 01 34 */ addi r4, r1, 0x134 /* 80178028 00174F68 7F 65 DB 78 */ mr r5, r27 -/* 8017802C 00174F6C 48 0F 91 79 */ bl cSAngle_NS___mi_X1_ +/* 8017802C 00174F6C 48 0F 91 79 */ bl __mi__7cSAngleCFRC7cSAngle /* 80178030 00174F70 38 61 01 24 */ addi r3, r1, 0x124 /* 80178034 00174F74 38 81 00 B4 */ addi r4, r1, 0xb4 -/* 80178038 00174F78 48 0F 8F 31 */ bl cSAngle_X1_ +/* 80178038 00174F78 48 0F 8F 31 */ bl __ct__7cSAngleFRC7cSAngle /* 8017803C 00174F7C 38 61 00 B4 */ addi r3, r1, 0xb4 /* 80178040 00174F80 38 80 FF FF */ li r4, -1 /* 80178044 00174F84 4B EB 84 CD */ bl cSAngle_NS_dtor @@ -1223,11 +1223,11 @@ lbl_80178020: /* 8017805C 00174F9C 38 61 01 DC */ addi r3, r1, 0x1dc /* 80178060 00174FA0 38 81 03 68 */ addi r4, r1, 0x368 /* 80178064 00174FA4 38 B8 00 64 */ addi r5, r24, 0x64 -/* 80178068 00174FA8 48 0E EA CD */ bl cXyz_NS___mi +/* 80178068 00174FA8 48 0E EA CD */ bl __mi__4cXyzCFRC3Vec /* 8017806C 00174FAC 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 80178070 00174FB0 38 81 01 DC */ addi r4, r1, 0x1dc /* 80178074 00174FB4 38 A1 03 44 */ addi r5, r1, 0x344 -/* 80178078 00174FB8 48 0E EB 59 */ bl cXyz_NS___ml_X1_ +/* 80178078 00174FB8 48 0E EB 59 */ bl __ml__4cXyzCFRC3Vec /* 8017807C 00174FBC 38 78 00 64 */ addi r3, r24, 0x64 /* 80178080 00174FC0 38 81 01 D0 */ addi r4, r1, 0x1d0 /* 80178084 00174FC4 4B F1 68 81 */ bl cXyz_NS___apl @@ -1254,10 +1254,10 @@ lbl_80178020: /* 801780D8 00175018 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 801780DC 0017501C 38 98 00 70 */ addi r4, r24, 0x70 /* 801780E0 00175020 38 B8 00 64 */ addi r5, r24, 0x64 -/* 801780E4 00175024 48 0E EA 51 */ bl cXyz_NS___mi +/* 801780E4 00175024 48 0E EA 51 */ bl __mi__4cXyzCFRC3Vec /* 801780E8 00175028 38 61 01 5C */ addi r3, r1, 0x15c /* 801780EC 0017502C 38 81 01 B8 */ addi r4, r1, 0x1b8 -/* 801780F0 00175030 48 0F 97 91 */ bl cSGlobe_X4_ +/* 801780F0 00175030 48 0F 97 91 */ bl __ct__7cSGlobeFRC4cXyz /* 801780F4 00175034 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 801780F8 00175038 38 80 FF FF */ li r4, -1 /* 801780FC 0017503C 4B E9 10 89 */ bl cXyz_NS_dtor @@ -1293,18 +1293,18 @@ lbl_80178164: /* 80178164 001750A4 38 61 00 B0 */ addi r3, r1, 0xb0 /* 80178168 001750A8 38 81 01 3C */ addi r4, r1, 0x13c /* 8017816C 001750AC 38 A1 01 38 */ addi r5, r1, 0x138 -/* 80178170 001750B0 48 0F 90 35 */ bl cSAngle_NS___mi_X1_ +/* 80178170 001750B0 48 0F 90 35 */ bl __mi__7cSAngleCFRC7cSAngle /* 80178174 001750B4 38 61 00 AC */ addi r3, r1, 0xac /* 80178178 001750B8 38 81 00 B0 */ addi r4, r1, 0xb0 /* 8017817C 001750BC FC 20 B0 90 */ fmr f1, f22 -/* 80178180 001750C0 48 0F 90 E5 */ bl cSAngle_NS___ml +/* 80178180 001750C0 48 0F 90 E5 */ bl __ml__7cSAngleCFf /* 80178184 001750C4 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80178188 001750C8 38 81 01 3C */ addi r4, r1, 0x13c /* 8017818C 001750CC 38 A1 00 AC */ addi r5, r1, 0xac -/* 80178190 001750D0 48 0F 8F E5 */ bl cSAngle_NS___pl +/* 80178190 001750D0 48 0F 8F E5 */ bl __pl__7cSAngleCFRC7cSAngle /* 80178194 001750D4 38 61 01 1C */ addi r3, r1, 0x11c /* 80178198 001750D8 38 81 00 A8 */ addi r4, r1, 0xa8 -/* 8017819C 001750DC 48 0F 8D CD */ bl cSAngle_X1_ +/* 8017819C 001750DC 48 0F 8D CD */ bl __ct__7cSAngleFRC7cSAngle /* 801781A0 001750E0 38 61 00 A8 */ addi r3, r1, 0xa8 /* 801781A4 001750E4 38 80 FF FF */ li r4, -1 /* 801781A8 001750E8 4B EB 83 69 */ bl cSAngle_NS_dtor @@ -1331,14 +1331,14 @@ lbl_80178164: /* 801781FC 0017513C C0 02 9D B8 */ lfs f0, lbl_804537B8-_SDA2_BASE_(r2) /* 80178200 00175140 EC 20 00 72 */ fmuls f1, f0, f1 /* 80178204 00175144 38 61 00 A4 */ addi r3, r1, 0xa4 -/* 80178208 00175148 48 0F 8D C1 */ bl cSAngle_X3_ +/* 80178208 00175148 48 0F 8D C1 */ bl __ct__7cSAngleFf /* 8017820C 0017514C 38 61 00 A0 */ addi r3, r1, 0xa0 /* 80178210 00175150 7F 64 DB 78 */ mr r4, r27 /* 80178214 00175154 38 A1 00 A4 */ addi r5, r1, 0xa4 -/* 80178218 00175158 48 0F 8F 5D */ bl cSAngle_NS___pl +/* 80178218 00175158 48 0F 8F 5D */ bl __pl__7cSAngleCFRC7cSAngle /* 8017821C 0017515C 38 61 01 18 */ addi r3, r1, 0x118 /* 80178220 00175160 38 81 00 A0 */ addi r4, r1, 0xa0 -/* 80178224 00175164 48 0F 8D 45 */ bl cSAngle_X1_ +/* 80178224 00175164 48 0F 8D 45 */ bl __ct__7cSAngleFRC7cSAngle /* 80178228 00175168 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8017822C 0017516C 38 80 FF FF */ li r4, -1 /* 80178230 00175170 4B EB 82 E1 */ bl cSAngle_NS_dtor @@ -1352,18 +1352,18 @@ lbl_80178164: /* 80178250 00175190 38 61 00 9C */ addi r3, r1, 0x9c /* 80178254 00175194 38 81 01 18 */ addi r4, r1, 0x118 /* 80178258 00175198 7F 65 DB 78 */ mr r5, r27 -/* 8017825C 0017519C 48 0F 8F 49 */ bl cSAngle_NS___mi_X1_ +/* 8017825C 0017519C 48 0F 8F 49 */ bl __mi__7cSAngleCFRC7cSAngle /* 80178260 001751A0 38 61 00 98 */ addi r3, r1, 0x98 /* 80178264 001751A4 38 81 00 9C */ addi r4, r1, 0x9c /* 80178268 001751A8 FC 20 78 90 */ fmr f1, f15 -/* 8017826C 001751AC 48 0F 8F F9 */ bl cSAngle_NS___ml +/* 8017826C 001751AC 48 0F 8F F9 */ bl __ml__7cSAngleCFf /* 80178270 001751B0 38 61 00 94 */ addi r3, r1, 0x94 /* 80178274 001751B4 7F 64 DB 78 */ mr r4, r27 /* 80178278 001751B8 38 A1 00 98 */ addi r5, r1, 0x98 -/* 8017827C 001751BC 48 0F 8E F9 */ bl cSAngle_NS___pl +/* 8017827C 001751BC 48 0F 8E F9 */ bl __pl__7cSAngleCFRC7cSAngle /* 80178280 001751C0 38 61 01 20 */ addi r3, r1, 0x120 /* 80178284 001751C4 38 81 00 94 */ addi r4, r1, 0x94 -/* 80178288 001751C8 48 0F 8D 71 */ bl cSAngle_NS_Val_X1_ +/* 80178288 001751C8 48 0F 8D 71 */ bl Val__7cSAngleFRC7cSAngle /* 8017828C 001751CC 38 61 00 94 */ addi r3, r1, 0x94 /* 80178290 001751D0 38 80 FF FF */ li r4, -1 /* 80178294 001751D4 4B EB 82 7D */ bl cSAngle_NS_dtor @@ -1411,10 +1411,10 @@ lbl_8017830C: /* 80178334 00175274 38 61 00 8C */ addi r3, r1, 0x8c /* 80178338 00175278 7F 84 E3 78 */ mr r4, r28 /* 8017833C 0017527C 38 A1 00 90 */ addi r5, r1, 0x90 -/* 80178340 00175280 48 0F 8E 65 */ bl cSAngle_NS___mi_X1_ +/* 80178340 00175280 48 0F 8E 65 */ bl __mi__7cSAngleCFRC7cSAngle /* 80178344 00175284 38 61 01 14 */ addi r3, r1, 0x114 /* 80178348 00175288 38 81 00 8C */ addi r4, r1, 0x8c -/* 8017834C 0017528C 48 0F 8C AD */ bl cSAngle_NS_Val_X1_ +/* 8017834C 0017528C 48 0F 8C AD */ bl Val__7cSAngleFRC7cSAngle /* 80178350 00175290 38 61 00 8C */ addi r3, r1, 0x8c /* 80178354 00175294 38 80 FF FF */ li r4, -1 /* 80178358 00175298 4B EB 81 B9 */ bl cSAngle_NS_dtor @@ -1465,23 +1465,23 @@ lbl_801783D8: /* 80178400 00175340 38 61 00 88 */ addi r3, r1, 0x88 /* 80178404 00175344 38 8D 8C 14 */ addi r4, r13, 0x80451194 - 0x80458580 /*SDA HACK; original: lbl_80451194-_SDA_BASE_*/ /* 80178408 00175348 38 A1 01 1C */ addi r5, r1, 0x11c -/* 8017840C 0017534C 48 0F 8D 99 */ bl cSAngle_NS___mi_X1_ +/* 8017840C 0017534C 48 0F 8D 99 */ bl __mi__7cSAngleCFRC7cSAngle /* 80178410 00175350 38 61 01 10 */ addi r3, r1, 0x110 /* 80178414 00175354 38 81 00 88 */ addi r4, r1, 0x88 -/* 80178418 00175358 48 0F 8B 51 */ bl cSAngle_X1_ +/* 80178418 00175358 48 0F 8B 51 */ bl __ct__7cSAngleFRC7cSAngle /* 8017841C 0017535C 38 61 00 88 */ addi r3, r1, 0x88 /* 80178420 00175360 38 80 FF FF */ li r4, -1 /* 80178424 00175364 4B EB 80 ED */ bl cSAngle_NS_dtor /* 80178428 00175368 38 61 00 84 */ addi r3, r1, 0x84 /* 8017842C 0017536C 38 81 01 10 */ addi r4, r1, 0x110 /* 80178430 00175370 C0 38 04 2C */ lfs f1, 0x42c(r24) -/* 80178434 00175374 48 0F 8E 31 */ bl cSAngle_NS___ml +/* 80178434 00175374 48 0F 8E 31 */ bl __ml__7cSAngleCFf /* 80178438 00175378 7F 83 E3 78 */ mr r3, r28 -/* 8017843C 0017537C 48 0F 8C AD */ bl cSAngle_NS_Inv +/* 8017843C 0017537C 48 0F 8C AD */ bl Inv__7cSAngleCFv /* 80178440 00175380 7C 64 1B 78 */ mr r4, r3 /* 80178444 00175384 38 61 00 80 */ addi r3, r1, 0x80 /* 80178448 00175388 38 A1 00 84 */ addi r5, r1, 0x84 -/* 8017844C 0017538C 48 0F 8E D5 */ bl cSAngle_NS___mi_short +/* 8017844C 0017538C 48 0F 8E D5 */ bl __mi__FsRC7cSAngle /* 80178450 00175390 38 78 04 10 */ addi r3, r24, 0x410 /* 80178454 00175394 38 81 00 80 */ addi r4, r1, 0x80 /* 80178458 00175398 48 00 A8 51 */ bl cSAngle_NS___as @@ -1498,15 +1498,15 @@ lbl_801783D8: lbl_80178484: /* 80178484 001753C4 38 61 01 0C */ addi r3, r1, 0x10c /* 80178488 001753C8 38 81 01 1C */ addi r4, r1, 0x11c -/* 8017848C 001753CC 48 0F 8A DD */ bl cSAngle_X1_ +/* 8017848C 001753CC 48 0F 8A DD */ bl __ct__7cSAngleFRC7cSAngle /* 80178490 001753D0 38 61 00 7C */ addi r3, r1, 0x7c /* 80178494 001753D4 38 81 01 0C */ addi r4, r1, 0x10c /* 80178498 001753D8 C0 38 04 2C */ lfs f1, 0x42c(r24) -/* 8017849C 001753DC 48 0F 8D C9 */ bl cSAngle_NS___ml +/* 8017849C 001753DC 48 0F 8D C9 */ bl __ml__7cSAngleCFf /* 801784A0 001753E0 38 61 00 78 */ addi r3, r1, 0x78 /* 801784A4 001753E4 7F 84 E3 78 */ mr r4, r28 /* 801784A8 001753E8 38 A1 00 7C */ addi r5, r1, 0x7c -/* 801784AC 001753EC 48 0F 8C F9 */ bl cSAngle_NS___mi_X1_ +/* 801784AC 001753EC 48 0F 8C F9 */ bl __mi__7cSAngleCFRC7cSAngle /* 801784B0 001753F0 38 78 04 10 */ addi r3, r24, 0x410 /* 801784B4 001753F4 38 81 00 78 */ addi r4, r1, 0x78 /* 801784B8 001753F8 48 00 A7 F1 */ bl cSAngle_NS___as @@ -1537,10 +1537,10 @@ lbl_801784F0: /* 80178514 00175454 3A C1 01 62 */ addi r22, r1, 0x162 /* 80178518 00175458 7E C4 B3 78 */ mr r4, r22 /* 8017851C 0017545C 7F 85 E3 78 */ mr r5, r28 -/* 80178520 00175460 48 0F 8C 85 */ bl cSAngle_NS___mi_X1_ +/* 80178520 00175460 48 0F 8C 85 */ bl __mi__7cSAngleCFRC7cSAngle /* 80178524 00175464 38 61 01 08 */ addi r3, r1, 0x108 /* 80178528 00175468 38 81 00 74 */ addi r4, r1, 0x74 -/* 8017852C 0017546C 48 0F 8A 3D */ bl cSAngle_X1_ +/* 8017852C 0017546C 48 0F 8A 3D */ bl __ct__7cSAngleFRC7cSAngle /* 80178530 00175470 38 61 00 74 */ addi r3, r1, 0x74 /* 80178534 00175474 38 80 FF FF */ li r4, -1 /* 80178538 00175478 4B EB 7F D9 */ bl cSAngle_NS_dtor @@ -1557,22 +1557,22 @@ lbl_80178560: /* 80178560 001754A0 38 61 00 70 */ addi r3, r1, 0x70 /* 80178564 001754A4 7F 84 E3 78 */ mr r4, r28 /* 80178568 001754A8 38 A1 01 1C */ addi r5, r1, 0x11c -/* 8017856C 001754AC 48 0F 8C 09 */ bl cSAngle_NS___pl +/* 8017856C 001754AC 48 0F 8C 09 */ bl __pl__7cSAngleCFRC7cSAngle /* 80178570 001754B0 38 61 00 6C */ addi r3, r1, 0x6c /* 80178574 001754B4 38 81 00 70 */ addi r4, r1, 0x70 /* 80178578 001754B8 7E C5 B3 78 */ mr r5, r22 -/* 8017857C 001754BC 48 0F 8C 29 */ bl cSAngle_NS___mi_X1_ +/* 8017857C 001754BC 48 0F 8C 29 */ bl __mi__7cSAngleCFRC7cSAngle /* 80178580 001754C0 38 61 00 68 */ addi r3, r1, 0x68 /* 80178584 001754C4 38 81 00 6C */ addi r4, r1, 0x6c /* 80178588 001754C8 FC 20 78 90 */ fmr f1, f15 -/* 8017858C 001754CC 48 0F 8C D9 */ bl cSAngle_NS___ml +/* 8017858C 001754CC 48 0F 8C D9 */ bl __ml__7cSAngleCFf /* 80178590 001754D0 38 61 00 64 */ addi r3, r1, 0x64 /* 80178594 001754D4 7E C4 B3 78 */ mr r4, r22 /* 80178598 001754D8 38 A1 00 68 */ addi r5, r1, 0x68 -/* 8017859C 001754DC 48 0F 8B D9 */ bl cSAngle_NS___pl +/* 8017859C 001754DC 48 0F 8B D9 */ bl __pl__7cSAngleCFRC7cSAngle /* 801785A0 001754E0 38 61 01 20 */ addi r3, r1, 0x120 /* 801785A4 001754E4 38 81 00 64 */ addi r4, r1, 0x64 -/* 801785A8 001754E8 48 0F 8A 51 */ bl cSAngle_NS_Val_X1_ +/* 801785A8 001754E8 48 0F 8A 51 */ bl Val__7cSAngleFRC7cSAngle /* 801785AC 001754EC 38 61 00 64 */ addi r3, r1, 0x64 /* 801785B0 001754F0 38 80 FF FF */ li r4, -1 /* 801785B4 001754F4 4B EB 7F 5D */ bl cSAngle_NS_dtor @@ -1594,10 +1594,10 @@ lbl_801785EC: /* 801785F0 00175530 7F 84 E3 78 */ mr r4, r28 /* 801785F4 00175534 3A C1 01 62 */ addi r22, r1, 0x162 /* 801785F8 00175538 7E C5 B3 78 */ mr r5, r22 -/* 801785FC 0017553C 48 0F 8B A9 */ bl cSAngle_NS___mi_X1_ +/* 801785FC 0017553C 48 0F 8B A9 */ bl __mi__7cSAngleCFRC7cSAngle /* 80178600 00175540 38 61 01 04 */ addi r3, r1, 0x104 /* 80178604 00175544 38 81 00 60 */ addi r4, r1, 0x60 -/* 80178608 00175548 48 0F 89 61 */ bl cSAngle_X1_ +/* 80178608 00175548 48 0F 89 61 */ bl __ct__7cSAngleFRC7cSAngle /* 8017860C 0017554C 38 61 00 60 */ addi r3, r1, 0x60 /* 80178610 00175550 38 80 FF FF */ li r4, -1 /* 80178614 00175554 4B EB 7E FD */ bl cSAngle_NS_dtor @@ -1614,22 +1614,22 @@ lbl_8017863C: /* 8017863C 0017557C 38 61 00 5C */ addi r3, r1, 0x5c /* 80178640 00175580 7F 84 E3 78 */ mr r4, r28 /* 80178644 00175584 38 A1 01 1C */ addi r5, r1, 0x11c -/* 80178648 00175588 48 0F 8B 5D */ bl cSAngle_NS___mi_X1_ +/* 80178648 00175588 48 0F 8B 5D */ bl __mi__7cSAngleCFRC7cSAngle /* 8017864C 0017558C 38 61 00 58 */ addi r3, r1, 0x58 /* 80178650 00175590 38 81 00 5C */ addi r4, r1, 0x5c /* 80178654 00175594 7E C5 B3 78 */ mr r5, r22 -/* 80178658 00175598 48 0F 8B 4D */ bl cSAngle_NS___mi_X1_ +/* 80178658 00175598 48 0F 8B 4D */ bl __mi__7cSAngleCFRC7cSAngle /* 8017865C 0017559C 38 61 00 54 */ addi r3, r1, 0x54 /* 80178660 001755A0 38 81 00 58 */ addi r4, r1, 0x58 /* 80178664 001755A4 FC 20 78 90 */ fmr f1, f15 -/* 80178668 001755A8 48 0F 8B FD */ bl cSAngle_NS___ml +/* 80178668 001755A8 48 0F 8B FD */ bl __ml__7cSAngleCFf /* 8017866C 001755AC 38 61 00 50 */ addi r3, r1, 0x50 /* 80178670 001755B0 7E C4 B3 78 */ mr r4, r22 /* 80178674 001755B4 38 A1 00 54 */ addi r5, r1, 0x54 -/* 80178678 001755B8 48 0F 8A FD */ bl cSAngle_NS___pl +/* 80178678 001755B8 48 0F 8A FD */ bl __pl__7cSAngleCFRC7cSAngle /* 8017867C 001755BC 38 61 01 20 */ addi r3, r1, 0x120 /* 80178680 001755C0 38 81 00 50 */ addi r4, r1, 0x50 -/* 80178684 001755C4 48 0F 89 75 */ bl cSAngle_NS_Val_X1_ +/* 80178684 001755C4 48 0F 89 75 */ bl Val__7cSAngleFRC7cSAngle /* 80178688 001755C8 38 61 00 50 */ addi r3, r1, 0x50 /* 8017868C 001755CC 38 80 FF FF */ li r4, -1 /* 80178690 001755D0 4B EB 7E 81 */ bl cSAngle_NS_dtor @@ -1649,14 +1649,14 @@ lbl_801786C4: /* 801786C4 00175604 38 61 00 4C */ addi r3, r1, 0x4c /* 801786C8 00175608 38 81 01 20 */ addi r4, r1, 0x120 /* 801786CC 0017560C 38 B8 04 10 */ addi r5, r24, 0x410 -/* 801786D0 00175610 48 0F 8A D5 */ bl cSAngle_NS___mi_X1_ +/* 801786D0 00175610 48 0F 8A D5 */ bl __mi__7cSAngleCFRC7cSAngle /* 801786D4 00175614 38 61 00 48 */ addi r3, r1, 0x48 /* 801786D8 00175618 38 81 00 4C */ addi r4, r1, 0x4c /* 801786DC 0017561C C0 22 9D 3C */ lfs f1, lbl_8045373C-_SDA2_BASE_(r2) -/* 801786E0 00175620 48 0F 8B 85 */ bl cSAngle_NS___ml +/* 801786E0 00175620 48 0F 8B 85 */ bl __ml__7cSAngleCFf /* 801786E4 00175624 38 78 04 10 */ addi r3, r24, 0x410 /* 801786E8 00175628 38 81 00 48 */ addi r4, r1, 0x48 -/* 801786EC 0017562C 48 0F 8A E9 */ bl cSAngle_NS___apl +/* 801786EC 0017562C 48 0F 8A E9 */ bl __apl__7cSAngleFRC7cSAngle /* 801786F0 00175630 38 61 00 48 */ addi r3, r1, 0x48 /* 801786F4 00175634 38 80 FF FF */ li r4, -1 /* 801786F8 00175638 4B EB 7E 19 */ bl cSAngle_NS_dtor @@ -1682,23 +1682,23 @@ lbl_80178738: /* 80178740 00175680 38 61 00 44 */ addi r3, r1, 0x44 /* 80178744 00175684 7F 84 E3 78 */ mr r4, r28 /* 80178748 00175688 38 A1 01 1C */ addi r5, r1, 0x11c -/* 8017874C 0017568C 48 0F 8A 29 */ bl cSAngle_NS___pl +/* 8017874C 0017568C 48 0F 8A 29 */ bl __pl__7cSAngleCFRC7cSAngle /* 80178750 00175690 38 61 00 40 */ addi r3, r1, 0x40 /* 80178754 00175694 38 81 00 44 */ addi r4, r1, 0x44 /* 80178758 00175698 3A C1 01 62 */ addi r22, r1, 0x162 /* 8017875C 0017569C 7E C5 B3 78 */ mr r5, r22 -/* 80178760 001756A0 48 0F 8A 45 */ bl cSAngle_NS___mi_X1_ +/* 80178760 001756A0 48 0F 8A 45 */ bl __mi__7cSAngleCFRC7cSAngle /* 80178764 001756A4 38 61 00 3C */ addi r3, r1, 0x3c /* 80178768 001756A8 38 81 00 40 */ addi r4, r1, 0x40 /* 8017876C 001756AC C0 22 9C A8 */ lfs f1, lbl_804536A8-_SDA2_BASE_(r2) -/* 80178770 001756B0 48 0F 8A F5 */ bl cSAngle_NS___ml +/* 80178770 001756B0 48 0F 8A F5 */ bl __ml__7cSAngleCFf /* 80178774 001756B4 38 61 00 38 */ addi r3, r1, 0x38 /* 80178778 001756B8 7E C4 B3 78 */ mr r4, r22 /* 8017877C 001756BC 38 A1 00 3C */ addi r5, r1, 0x3c -/* 80178780 001756C0 48 0F 89 F5 */ bl cSAngle_NS___pl +/* 80178780 001756C0 48 0F 89 F5 */ bl __pl__7cSAngleCFRC7cSAngle /* 80178784 001756C4 38 61 01 20 */ addi r3, r1, 0x120 /* 80178788 001756C8 38 81 00 38 */ addi r4, r1, 0x38 -/* 8017878C 001756CC 48 0F 88 6D */ bl cSAngle_NS_Val_X1_ +/* 8017878C 001756CC 48 0F 88 6D */ bl Val__7cSAngleFRC7cSAngle /* 80178790 001756D0 38 61 00 38 */ addi r3, r1, 0x38 /* 80178794 001756D4 38 80 FF FF */ li r4, -1 /* 80178798 001756D8 4B EB 7D 79 */ bl cSAngle_NS_dtor @@ -1716,23 +1716,23 @@ lbl_801787C4: /* 801787C4 00175704 38 61 00 34 */ addi r3, r1, 0x34 /* 801787C8 00175708 7F 84 E3 78 */ mr r4, r28 /* 801787CC 0017570C 38 A1 01 1C */ addi r5, r1, 0x11c -/* 801787D0 00175710 48 0F 89 D5 */ bl cSAngle_NS___mi_X1_ +/* 801787D0 00175710 48 0F 89 D5 */ bl __mi__7cSAngleCFRC7cSAngle /* 801787D4 00175714 38 61 00 30 */ addi r3, r1, 0x30 /* 801787D8 00175718 38 81 00 34 */ addi r4, r1, 0x34 /* 801787DC 0017571C 3A C1 01 62 */ addi r22, r1, 0x162 /* 801787E0 00175720 7E C5 B3 78 */ mr r5, r22 -/* 801787E4 00175724 48 0F 89 C1 */ bl cSAngle_NS___mi_X1_ +/* 801787E4 00175724 48 0F 89 C1 */ bl __mi__7cSAngleCFRC7cSAngle /* 801787E8 00175728 38 61 00 2C */ addi r3, r1, 0x2c /* 801787EC 0017572C 38 81 00 30 */ addi r4, r1, 0x30 /* 801787F0 00175730 C0 22 9C A8 */ lfs f1, lbl_804536A8-_SDA2_BASE_(r2) -/* 801787F4 00175734 48 0F 8A 71 */ bl cSAngle_NS___ml +/* 801787F4 00175734 48 0F 8A 71 */ bl __ml__7cSAngleCFf /* 801787F8 00175738 38 61 00 28 */ addi r3, r1, 0x28 /* 801787FC 0017573C 7E C4 B3 78 */ mr r4, r22 /* 80178800 00175740 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80178804 00175744 48 0F 89 71 */ bl cSAngle_NS___pl +/* 80178804 00175744 48 0F 89 71 */ bl __pl__7cSAngleCFRC7cSAngle /* 80178808 00175748 38 61 01 20 */ addi r3, r1, 0x120 /* 8017880C 0017574C 38 81 00 28 */ addi r4, r1, 0x28 -/* 80178810 00175750 48 0F 87 E9 */ bl cSAngle_NS_Val_X1_ +/* 80178810 00175750 48 0F 87 E9 */ bl Val__7cSAngleFRC7cSAngle /* 80178814 00175754 38 61 00 28 */ addi r3, r1, 0x28 /* 80178818 00175758 38 80 FF FF */ li r4, -1 /* 8017881C 0017575C 4B EB 7C F5 */ bl cSAngle_NS_dtor @@ -1749,14 +1749,14 @@ lbl_80178844: /* 80178844 00175784 38 61 00 24 */ addi r3, r1, 0x24 /* 80178848 00175788 38 81 01 20 */ addi r4, r1, 0x120 /* 8017884C 0017578C 38 B8 04 10 */ addi r5, r24, 0x410 -/* 80178850 00175790 48 0F 89 55 */ bl cSAngle_NS___mi_X1_ +/* 80178850 00175790 48 0F 89 55 */ bl __mi__7cSAngleCFRC7cSAngle /* 80178854 00175794 38 61 00 20 */ addi r3, r1, 0x20 /* 80178858 00175798 38 81 00 24 */ addi r4, r1, 0x24 /* 8017885C 0017579C C0 22 9D 3C */ lfs f1, lbl_8045373C-_SDA2_BASE_(r2) -/* 80178860 001757A0 48 0F 8A 05 */ bl cSAngle_NS___ml +/* 80178860 001757A0 48 0F 8A 05 */ bl __ml__7cSAngleCFf /* 80178864 001757A4 38 78 04 10 */ addi r3, r24, 0x410 /* 80178868 001757A8 38 81 00 20 */ addi r4, r1, 0x20 -/* 8017886C 001757AC 48 0F 89 69 */ bl cSAngle_NS___apl +/* 8017886C 001757AC 48 0F 89 69 */ bl __apl__7cSAngleFRC7cSAngle /* 80178870 001757B0 38 61 00 20 */ addi r3, r1, 0x20 /* 80178874 001757B4 38 80 FF FF */ li r4, -1 /* 80178878 001757B8 4B EB 7C 99 */ bl cSAngle_NS_dtor @@ -1790,15 +1790,15 @@ lbl_801788D8: /* 801788DC 0017581C 38 61 00 1C */ addi r3, r1, 0x1c /* 801788E0 00175820 38 98 04 10 */ addi r4, r24, 0x410 /* 801788E4 00175824 7F 65 DB 78 */ mr r5, r27 -/* 801788E8 00175828 48 0F 88 BD */ bl cSAngle_NS___mi_X1_ +/* 801788E8 00175828 48 0F 88 BD */ bl __mi__7cSAngleCFRC7cSAngle /* 801788EC 0017582C 38 61 00 18 */ addi r3, r1, 0x18 /* 801788F0 00175830 38 81 00 1C */ addi r4, r1, 0x1c /* 801788F4 00175834 C0 38 04 60 */ lfs f1, 0x460(r24) -/* 801788F8 00175838 48 0F 89 6D */ bl cSAngle_NS___ml +/* 801788F8 00175838 48 0F 89 6D */ bl __ml__7cSAngleCFf /* 801788FC 0017583C 38 61 00 14 */ addi r3, r1, 0x14 /* 80178900 00175840 7F 64 DB 78 */ mr r4, r27 /* 80178904 00175844 38 A1 00 18 */ addi r5, r1, 0x18 -/* 80178908 00175848 48 0F 88 6D */ bl cSAngle_NS___pl +/* 80178908 00175848 48 0F 88 6D */ bl __pl__7cSAngleCFRC7cSAngle /* 8017890C 0017584C 38 78 00 5C */ addi r3, r24, 0x5c /* 80178910 00175850 38 81 00 14 */ addi r4, r1, 0x14 /* 80178914 00175854 4B F1 5F 81 */ bl cSGlobe_NS_U @@ -1833,11 +1833,11 @@ lbl_80178980: /* 80178984 001758C4 2C 00 00 00 */ cmpwi r0, 0 /* 80178988 001758C8 40 82 00 3C */ bne lbl_801789C4 /* 8017898C 001758CC 38 78 01 B0 */ addi r3, r24, 0x1b0 -/* 80178990 001758D0 48 0F 86 A1 */ bl cSAngle_NS_Degree +/* 80178990 001758D0 48 0F 86 A1 */ bl Degree__7cSAngleCFv /* 80178994 001758D4 C0 18 04 0C */ lfs f0, 0x40c(r24) /* 80178998 001758D8 EC 20 08 2A */ fadds f1, f0, f1 /* 8017899C 001758DC 38 61 01 00 */ addi r3, r1, 0x100 -/* 801789A0 001758E0 48 0F 86 6D */ bl cSAngle_NS_Val_X3_ +/* 801789A0 001758E0 48 0F 86 6D */ bl Val__7cSAngleFf /* 801789A4 001758E4 C0 58 04 5C */ lfs f2, 0x45c(r24) /* 801789A8 001758E8 C0 22 9C E0 */ lfs f1, lbl_804536E0-_SDA2_BASE_(r2) /* 801789AC 001758EC C8 01 04 30 */ lfd f0, 0x430(r1) @@ -1851,7 +1851,7 @@ lbl_801789C4: /* 801789C8 00175908 38 81 01 60 */ addi r4, r1, 0x160 /* 801789CC 0017590C 48 00 A2 DD */ bl cSAngle_NS___as /* 801789D0 00175910 38 61 01 00 */ addi r3, r1, 0x100 -/* 801789D4 00175914 48 0F 86 5D */ bl cSAngle_NS_Degree +/* 801789D4 00175914 48 0F 86 5D */ bl Degree__7cSAngleCFv /* 801789D8 00175918 D0 38 04 0C */ stfs f1, 0x40c(r24) /* 801789DC 0017591C C0 38 04 00 */ lfs f1, 0x400(r24) /* 801789E0 00175920 C0 42 9D 30 */ lfs f2, lbl_80453730-_SDA2_BASE_(r2) @@ -1864,7 +1864,7 @@ lbl_801789EC: /* 801789F8 00175938 40 80 00 14 */ bge lbl_80178A0C /* 801789FC 0017593C 38 61 01 00 */ addi r3, r1, 0x100 /* 80178A00 00175940 38 81 01 44 */ addi r4, r1, 0x144 -/* 80178A04 00175944 48 0F 85 F5 */ bl cSAngle_NS_Val_X1_ +/* 80178A04 00175944 48 0F 85 F5 */ bl Val__7cSAngleFRC7cSAngle /* 80178A08 00175948 48 00 00 1C */ b lbl_80178A24 lbl_80178A0C: /* 80178A0C 0017594C A8 01 01 40 */ lha r0, 0x140(r1) @@ -1872,21 +1872,21 @@ lbl_80178A0C: /* 80178A14 00175954 40 81 00 10 */ ble lbl_80178A24 /* 80178A18 00175958 38 61 01 00 */ addi r3, r1, 0x100 /* 80178A1C 0017595C 38 81 01 40 */ addi r4, r1, 0x140 -/* 80178A20 00175960 48 0F 85 D9 */ bl cSAngle_NS_Val_X1_ +/* 80178A20 00175960 48 0F 85 D9 */ bl Val__7cSAngleFRC7cSAngle lbl_80178A24: /* 80178A24 00175964 38 61 00 10 */ addi r3, r1, 0x10 /* 80178A28 00175968 38 81 01 00 */ addi r4, r1, 0x100 /* 80178A2C 0017596C 3A D8 00 60 */ addi r22, r24, 0x60 /* 80178A30 00175970 7E C5 B3 78 */ mr r5, r22 -/* 80178A34 00175974 48 0F 87 71 */ bl cSAngle_NS___mi_X1_ +/* 80178A34 00175974 48 0F 87 71 */ bl __mi__7cSAngleCFRC7cSAngle /* 80178A38 00175978 38 61 00 0C */ addi r3, r1, 0xc /* 80178A3C 0017597C 38 81 00 10 */ addi r4, r1, 0x10 /* 80178A40 00175980 C0 38 04 5C */ lfs f1, 0x45c(r24) -/* 80178A44 00175984 48 0F 88 21 */ bl cSAngle_NS___ml +/* 80178A44 00175984 48 0F 88 21 */ bl __ml__7cSAngleCFf /* 80178A48 00175988 38 61 00 08 */ addi r3, r1, 8 /* 80178A4C 0017598C 7E C4 B3 78 */ mr r4, r22 /* 80178A50 00175990 38 A1 00 0C */ addi r5, r1, 0xc -/* 80178A54 00175994 48 0F 87 21 */ bl cSAngle_NS___pl +/* 80178A54 00175994 48 0F 87 21 */ bl __pl__7cSAngleCFRC7cSAngle /* 80178A58 00175998 38 78 00 5C */ addi r3, r24, 0x5c /* 80178A5C 0017599C 38 81 00 08 */ addi r4, r1, 8 /* 80178A60 001759A0 4B F1 6F F9 */ bl cSGlobe_NS_V @@ -1948,14 +1948,14 @@ lbl_80178B18: /* 80178B34 00175A74 FC 20 78 90 */ fmr f1, f15 /* 80178B38 00175A78 7E C4 B3 78 */ mr r4, r22 /* 80178B3C 00175A7C 7F 65 DB 78 */ mr r5, r27 -/* 80178B40 00175A80 48 0F 8D 11 */ bl cSGlobe_X3_ +/* 80178B40 00175A80 48 0F 8D 11 */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80178B44 00175A84 38 61 01 AC */ addi r3, r1, 0x1ac /* 80178B48 00175A88 38 81 01 54 */ addi r4, r1, 0x154 -/* 80178B4C 00175A8C 48 0F 8F 69 */ bl cSGlobe_NS_Xyz +/* 80178B4C 00175A8C 48 0F 8F 69 */ bl Xyz__7cSGlobeCFv /* 80178B50 00175A90 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 80178B54 00175A94 38 98 00 64 */ addi r4, r24, 0x64 /* 80178B58 00175A98 38 A1 01 AC */ addi r5, r1, 0x1ac -/* 80178B5C 00175A9C 48 0E DF 89 */ bl cXyz_NS___pl +/* 80178B5C 00175A9C 48 0E DF 89 */ bl __pl__4cXyzCFRC3Vec /* 80178B60 00175AA0 38 61 03 2C */ addi r3, r1, 0x32c /* 80178B64 00175AA4 38 81 01 A0 */ addi r4, r1, 0x1a0 /* 80178B68 00175AA8 4B F1 EC 8D */ bl cXyz_X1_ @@ -1996,11 +1996,11 @@ lbl_80178BD8: /* 80178BEC 00175B2C D0 18 00 5C */ stfs f0, 0x5c(r24) /* 80178BF0 00175B30 38 61 01 94 */ addi r3, r1, 0x194 /* 80178BF4 00175B34 38 98 00 5C */ addi r4, r24, 0x5c -/* 80178BF8 00175B38 48 0F 8E BD */ bl cSGlobe_NS_Xyz +/* 80178BF8 00175B38 48 0F 8E BD */ bl Xyz__7cSGlobeCFv /* 80178BFC 00175B3C 38 61 01 88 */ addi r3, r1, 0x188 /* 80178C00 00175B40 38 98 00 64 */ addi r4, r24, 0x64 /* 80178C04 00175B44 38 A1 01 94 */ addi r5, r1, 0x194 -/* 80178C08 00175B48 48 0E DE DD */ bl cXyz_NS___pl +/* 80178C08 00175B48 48 0E DE DD */ bl __pl__4cXyzCFRC3Vec /* 80178C0C 00175B4C 38 78 00 70 */ addi r3, r24, 0x70 /* 80178C10 00175B50 38 81 01 88 */ addi r4, r1, 0x188 /* 80178C14 00175B54 4B F1 EB C5 */ bl cXyz_NS___as @@ -2023,10 +2023,10 @@ lbl_80178BD8: /* 80178C58 00175B98 38 61 01 7C */ addi r3, r1, 0x17c /* 80178C5C 00175B9C 38 98 00 70 */ addi r4, r24, 0x70 /* 80178C60 00175BA0 38 B8 00 64 */ addi r5, r24, 0x64 -/* 80178C64 00175BA4 48 0E DE D1 */ bl cXyz_NS___mi +/* 80178C64 00175BA4 48 0E DE D1 */ bl __mi__4cXyzCFRC3Vec /* 80178C68 00175BA8 38 78 00 5C */ addi r3, r24, 0x5c /* 80178C6C 00175BAC 38 81 01 7C */ addi r4, r1, 0x17c -/* 80178C70 00175BB0 48 0F 8E 01 */ bl cSGlobe_NS_Val_X3_ +/* 80178C70 00175BB0 48 0F 8E 01 */ bl Val__7cSGlobeFRC4cXyz /* 80178C74 00175BB4 38 61 01 7C */ addi r3, r1, 0x17c /* 80178C78 00175BB8 38 80 FF FF */ li r4, -1 /* 80178C7C 00175BBC 4B E9 05 09 */ bl cXyz_NS_dtor diff --git a/include/d/d_camera/asm/func_80178E50.s b/include/d/d_camera/asm/func_80178E50.s index b204f8ef31..c5369c5947 100644 --- a/include/d/d_camera/asm/func_80178E50.s +++ b/include/d/d_camera/asm/func_80178E50.s @@ -134,7 +134,7 @@ /* 80179064 00175FA4 38 61 00 BC */ addi r3, r1, 0xbc /* 80179068 00175FA8 38 81 01 64 */ addi r4, r1, 0x164 /* 8017906C 00175FAC 38 A1 01 70 */ addi r5, r1, 0x170 -/* 80179070 00175FB0 48 0E DA C5 */ bl cXyz_NS___mi +/* 80179070 00175FB0 48 0E DA C5 */ bl __mi__4cXyzCFRC3Vec /* 80179074 00175FB4 C0 01 00 BC */ lfs f0, 0xbc(r1) /* 80179078 00175FB8 D0 01 01 58 */ stfs f0, 0x158(r1) /* 8017907C 00175FBC C0 01 00 C0 */ lfs f0, 0xc0(r1) @@ -151,7 +151,7 @@ /* 801790A8 00175FE8 41 82 00 30 */ beq lbl_801790D8 /* 801790AC 00175FEC 38 61 00 4C */ addi r3, r1, 0x4c /* 801790B0 00175FF0 38 81 01 58 */ addi r4, r1, 0x158 -/* 801790B4 00175FF4 48 0F 87 CD */ bl cSGlobe_X4_ +/* 801790B4 00175FF4 48 0F 87 CD */ bl __ct__7cSGlobeFRC4cXyz /* 801790B8 00175FF8 A8 01 00 50 */ lha r0, 0x50(r1) /* 801790BC 00175FFC B0 01 00 54 */ sth r0, 0x54(r1) /* 801790C0 00176000 A8 01 00 52 */ lha r0, 0x52(r1) @@ -260,14 +260,14 @@ lbl_801791F8: lbl_8017922C: /* 8017922C 0017616C 38 61 00 44 */ addi r3, r1, 0x44 /* 80179230 00176170 38 81 01 4C */ addi r4, r1, 0x14c -/* 80179234 00176174 48 0F 88 3D */ bl cSGlobe_NS_Val_X3_ +/* 80179234 00176174 48 0F 88 3D */ bl Val__7cSGlobeFRC4cXyz /* 80179238 00176178 38 61 00 34 */ addi r3, r1, 0x34 /* 8017923C 0017617C 7F E4 FB 78 */ mr r4, r31 /* 80179240 00176180 A8 A1 00 56 */ lha r5, 0x56(r1) -/* 80179244 00176184 48 0F 7F B9 */ bl cSAngle_NS___pl_X1_ +/* 80179244 00176184 48 0F 7F B9 */ bl __pl__7cSAngleCFs /* 80179248 00176188 38 61 00 14 */ addi r3, r1, 0x14 /* 8017924C 0017618C A8 81 00 34 */ lha r4, 0x34(r1) -/* 80179250 00176190 48 0F 7D 49 */ bl cSAngle_X2_ +/* 80179250 00176190 48 0F 7D 49 */ bl __ct__7cSAngleFs /* 80179254 00176194 A8 01 00 14 */ lha r0, 0x14(r1) /* 80179258 00176198 B0 01 00 4A */ sth r0, 0x4a(r1) /* 8017925C 0017619C 28 1D 00 00 */ cmplwi r29, 0 @@ -275,20 +275,20 @@ lbl_8017922C: /* 80179264 001761A4 38 61 00 30 */ addi r3, r1, 0x30 /* 80179268 001761A8 7F C4 F3 78 */ mr r4, r30 /* 8017926C 001761AC A8 A1 00 54 */ lha r5, 0x54(r1) -/* 80179270 001761B0 48 0F 7F 8D */ bl cSAngle_NS___pl_X1_ +/* 80179270 001761B0 48 0F 7F 8D */ bl __pl__7cSAngleCFs /* 80179274 001761B4 38 61 00 10 */ addi r3, r1, 0x10 /* 80179278 001761B8 A8 81 00 30 */ lha r4, 0x30(r1) -/* 8017927C 001761BC 48 0F 7D 1D */ bl cSAngle_X2_ +/* 8017927C 001761BC 48 0F 7D 1D */ bl __ct__7cSAngleFs /* 80179280 001761C0 A8 01 00 10 */ lha r0, 0x10(r1) /* 80179284 001761C4 B0 01 00 48 */ sth r0, 0x48(r1) lbl_80179288: /* 80179288 001761C8 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8017928C 001761CC 38 81 00 44 */ addi r4, r1, 0x44 -/* 80179290 001761D0 48 0F 88 25 */ bl cSGlobe_NS_Xyz +/* 80179290 001761D0 48 0F 88 25 */ bl Xyz__7cSGlobeCFv /* 80179294 001761D4 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80179298 001761D8 38 81 01 64 */ addi r4, r1, 0x164 /* 8017929C 001761DC 38 A1 00 B0 */ addi r5, r1, 0xb0 -/* 801792A0 001761E0 48 0E D8 45 */ bl cXyz_NS___pl +/* 801792A0 001761E0 48 0E D8 45 */ bl __pl__4cXyzCFRC3Vec /* 801792A4 001761E4 C0 01 00 A4 */ lfs f0, 0xa4(r1) /* 801792A8 001761E8 D0 1A 03 FC */ stfs f0, 0x3fc(r26) /* 801792AC 001761EC C0 01 00 A8 */ lfs f0, 0xa8(r1) @@ -383,11 +383,11 @@ lbl_801793F8: /* 801793F8 00176338 38 61 00 8C */ addi r3, r1, 0x8c /* 801793FC 0017633C 38 81 01 34 */ addi r4, r1, 0x134 /* 80179400 00176340 38 BA 00 64 */ addi r5, r26, 0x64 -/* 80179404 00176344 48 0E D7 31 */ bl cXyz_NS___mi +/* 80179404 00176344 48 0E D7 31 */ bl __mi__4cXyzCFRC3Vec /* 80179408 00176348 38 61 00 80 */ addi r3, r1, 0x80 /* 8017940C 0017634C 38 81 00 8C */ addi r4, r1, 0x8c /* 80179410 00176350 38 A1 01 40 */ addi r5, r1, 0x140 -/* 80179414 00176354 48 0E D7 BD */ bl cXyz_NS___ml_X1_ +/* 80179414 00176354 48 0E D7 BD */ bl __ml__4cXyzCFRC3Vec /* 80179418 00176358 38 7A 00 64 */ addi r3, r26, 0x64 /* 8017941C 0017635C 38 81 00 80 */ addi r4, r1, 0x80 /* 80179420 00176360 7C 65 1B 78 */ mr r5, r3 @@ -395,10 +395,10 @@ lbl_801793F8: /* 80179428 00176368 38 61 00 74 */ addi r3, r1, 0x74 /* 8017942C 0017636C 38 81 01 88 */ addi r4, r1, 0x188 /* 80179430 00176370 38 BA 00 64 */ addi r5, r26, 0x64 -/* 80179434 00176374 48 0E D7 01 */ bl cXyz_NS___mi +/* 80179434 00176374 48 0E D7 01 */ bl __mi__4cXyzCFRC3Vec /* 80179438 00176378 38 61 00 3C */ addi r3, r1, 0x3c /* 8017943C 0017637C 38 81 00 74 */ addi r4, r1, 0x74 -/* 80179440 00176380 48 0F 84 41 */ bl cSGlobe_X4_ +/* 80179440 00176380 48 0F 84 41 */ bl __ct__7cSGlobeFRC4cXyz /* 80179444 00176384 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 80179448 00176388 FC 00 F0 40 */ fcmpo cr0, f0, f30 /* 8017944C 0017638C 40 80 00 08 */ bge lbl_80179454 @@ -419,45 +419,45 @@ lbl_80179464: /* 80179480 001763C0 38 81 00 40 */ addi r4, r1, 0x40 /* 80179484 001763C4 3B 7A 00 60 */ addi r27, r26, 0x60 /* 80179488 001763C8 7F 65 DB 78 */ mr r5, r27 -/* 8017948C 001763CC 48 0F 7D 19 */ bl cSAngle_NS___mi_X1_ +/* 8017948C 001763CC 48 0F 7D 19 */ bl __mi__7cSAngleCFRC7cSAngle /* 80179490 001763D0 38 61 00 28 */ addi r3, r1, 0x28 /* 80179494 001763D4 38 81 00 2C */ addi r4, r1, 0x2c /* 80179498 001763D8 FC 20 E0 90 */ fmr f1, f28 -/* 8017949C 001763DC 48 0F 7D C9 */ bl cSAngle_NS___ml +/* 8017949C 001763DC 48 0F 7D C9 */ bl __ml__7cSAngleCFf /* 801794A0 001763E0 38 61 00 24 */ addi r3, r1, 0x24 /* 801794A4 001763E4 7F 64 DB 78 */ mr r4, r27 /* 801794A8 001763E8 38 A1 00 28 */ addi r5, r1, 0x28 -/* 801794AC 001763EC 48 0F 7C C9 */ bl cSAngle_NS___pl +/* 801794AC 001763EC 48 0F 7C C9 */ bl __pl__7cSAngleCFRC7cSAngle /* 801794B0 001763F0 38 61 00 0C */ addi r3, r1, 0xc /* 801794B4 001763F4 A8 81 00 24 */ lha r4, 0x24(r1) -/* 801794B8 001763F8 48 0F 7A E1 */ bl cSAngle_X2_ +/* 801794B8 001763F8 48 0F 7A E1 */ bl __ct__7cSAngleFs /* 801794BC 001763FC A8 01 00 0C */ lha r0, 0xc(r1) /* 801794C0 00176400 B0 1A 00 60 */ sth r0, 0x60(r26) /* 801794C4 00176404 38 61 00 20 */ addi r3, r1, 0x20 /* 801794C8 00176408 38 81 00 42 */ addi r4, r1, 0x42 /* 801794CC 0017640C 3B 7A 00 62 */ addi r27, r26, 0x62 /* 801794D0 00176410 7F 65 DB 78 */ mr r5, r27 -/* 801794D4 00176414 48 0F 7C D1 */ bl cSAngle_NS___mi_X1_ +/* 801794D4 00176414 48 0F 7C D1 */ bl __mi__7cSAngleCFRC7cSAngle /* 801794D8 00176418 38 61 00 1C */ addi r3, r1, 0x1c /* 801794DC 0017641C 38 81 00 20 */ addi r4, r1, 0x20 /* 801794E0 00176420 FC 20 E0 90 */ fmr f1, f28 -/* 801794E4 00176424 48 0F 7D 81 */ bl cSAngle_NS___ml +/* 801794E4 00176424 48 0F 7D 81 */ bl __ml__7cSAngleCFf /* 801794E8 00176428 38 61 00 18 */ addi r3, r1, 0x18 /* 801794EC 0017642C 7F 64 DB 78 */ mr r4, r27 /* 801794F0 00176430 38 A1 00 1C */ addi r5, r1, 0x1c -/* 801794F4 00176434 48 0F 7C 81 */ bl cSAngle_NS___pl +/* 801794F4 00176434 48 0F 7C 81 */ bl __pl__7cSAngleCFRC7cSAngle /* 801794F8 00176438 38 61 00 08 */ addi r3, r1, 8 /* 801794FC 0017643C A8 81 00 18 */ lha r4, 0x18(r1) -/* 80179500 00176440 48 0F 7A 99 */ bl cSAngle_X2_ +/* 80179500 00176440 48 0F 7A 99 */ bl __ct__7cSAngleFs /* 80179504 00176444 A8 01 00 08 */ lha r0, 8(r1) /* 80179508 00176448 B0 1A 00 62 */ sth r0, 0x62(r26) /* 8017950C 0017644C 38 61 00 68 */ addi r3, r1, 0x68 /* 80179510 00176450 38 9A 00 5C */ addi r4, r26, 0x5c -/* 80179514 00176454 48 0F 85 A1 */ bl cSGlobe_NS_Xyz +/* 80179514 00176454 48 0F 85 A1 */ bl Xyz__7cSGlobeCFv /* 80179518 00176458 38 61 00 5C */ addi r3, r1, 0x5c /* 8017951C 0017645C 38 9A 00 64 */ addi r4, r26, 0x64 /* 80179520 00176460 38 A1 00 68 */ addi r5, r1, 0x68 -/* 80179524 00176464 48 0E D5 C1 */ bl cXyz_NS___pl +/* 80179524 00176464 48 0E D5 C1 */ bl __pl__4cXyzCFRC3Vec /* 80179528 00176468 C0 01 00 5C */ lfs f0, 0x5c(r1) /* 8017952C 0017646C D0 1A 00 70 */ stfs f0, 0x70(r26) /* 80179530 00176470 C0 01 00 60 */ lfs f0, 0x60(r1) diff --git a/include/d/d_camera/asm/func_80179590.s b/include/d/d_camera/asm/func_80179590.s index 8177fc8862..cbc4dc23b1 100644 --- a/include/d/d_camera/asm/func_80179590.s +++ b/include/d/d_camera/asm/func_80179590.s @@ -341,10 +341,10 @@ lbl_80179A90: /* 80179AA0 001769E0 38 61 01 30 */ addi r3, r1, 0x130 /* 80179AA4 001769E4 38 81 02 20 */ addi r4, r1, 0x220 /* 80179AA8 001769E8 38 A1 01 3C */ addi r5, r1, 0x13c -/* 80179AAC 001769EC 48 0E D0 89 */ bl cXyz_NS___mi +/* 80179AAC 001769EC 48 0E D0 89 */ bl __mi__4cXyzCFRC3Vec /* 80179AB0 001769F0 38 61 00 44 */ addi r3, r1, 0x44 /* 80179AB4 001769F4 38 81 01 30 */ addi r4, r1, 0x130 -/* 80179AB8 001769F8 48 0F 7D C9 */ bl cSGlobe_X4_ +/* 80179AB8 001769F8 48 0F 7D C9 */ bl __ct__7cSGlobeFRC4cXyz /* 80179ABC 001769FC C0 22 9C A8 */ lfs f1, lbl_804536A8-_SDA2_BASE_(r2) /* 80179AC0 00176A00 C0 41 00 44 */ lfs f2, 0x44(r1) /* 80179AC4 00176A04 EC 02 D8 24 */ fdivs f0, f2, f27 @@ -358,7 +358,7 @@ lbl_80179A90: /* 80179AE4 00176A24 90 1C 03 F0 */ stw r0, 0x3f0(r28) /* 80179AE8 00176A28 38 61 00 3C */ addi r3, r1, 0x3c /* 80179AEC 00176A2C 38 9C 00 5C */ addi r4, r28, 0x5c -/* 80179AF0 00176A30 48 0F 7D 01 */ bl cSGlobe_X1_ +/* 80179AF0 00176A30 48 0F 7D 01 */ bl __ct__7cSGlobeFRC7cSGlobe /* 80179AF4 00176A34 FC 00 98 50 */ fneg f0, f19 /* 80179AF8 00176A38 D0 01 00 3C */ stfs f0, 0x3c(r1) /* 80179AFC 00176A3C 38 61 01 24 */ addi r3, r1, 0x124 @@ -367,11 +367,11 @@ lbl_80179A90: /* 80179B08 00176A48 4B F1 DC 15 */ bl dCamera_c_NS_attentionPos /* 80179B0C 00176A4C 38 61 01 18 */ addi r3, r1, 0x118 /* 80179B10 00176A50 38 81 00 3C */ addi r4, r1, 0x3c -/* 80179B14 00176A54 48 0F 7F A1 */ bl cSGlobe_NS_Xyz +/* 80179B14 00176A54 48 0F 7F A1 */ bl Xyz__7cSGlobeCFv /* 80179B18 00176A58 38 61 01 0C */ addi r3, r1, 0x10c /* 80179B1C 00176A5C 38 81 01 24 */ addi r4, r1, 0x124 /* 80179B20 00176A60 38 A1 01 18 */ addi r5, r1, 0x118 -/* 80179B24 00176A64 48 0E CF C1 */ bl cXyz_NS___pl +/* 80179B24 00176A64 48 0E CF C1 */ bl __pl__4cXyzCFRC3Vec /* 80179B28 00176A68 C0 41 01 0C */ lfs f2, 0x10c(r1) /* 80179B2C 00176A6C D0 41 02 14 */ stfs f2, 0x214(r1) /* 80179B30 00176A70 C0 21 01 10 */ lfs f1, 0x110(r1) @@ -427,22 +427,22 @@ lbl_80179BD4: /* 80179BE8 00176B28 54 05 20 36 */ slwi r5, r0, 4 /* 80179BEC 00176B2C 38 A5 00 04 */ addi r5, r5, 4 /* 80179BF0 00176B30 7C A6 2A 14 */ add r5, r6, r5 -/* 80179BF4 00176B34 48 0F 57 29 */ bl cM3dGLin_NS_SetStartEnd_X1_ +/* 80179BF4 00176B34 48 0F 57 29 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec /* 80179BF8 00176B38 38 61 02 80 */ addi r3, r1, 0x280 /* 80179BFC 00176B3C 38 81 02 14 */ addi r4, r1, 0x214 /* 80179C00 00176B40 38 A1 01 E4 */ addi r5, r1, 0x1e4 /* 80179C04 00176B44 38 C1 00 30 */ addi r6, r1, 0x30 -/* 80179C08 00176B48 48 0E EB 09 */ bl cM3d_Len3dSqPntAndSegLine +/* 80179C08 00176B48 48 0E EB 09 */ bl cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf /* 80179C0C 00176B4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80179C10 00176B50 41 82 00 3C */ beq lbl_80179C4C /* 80179C14 00176B54 38 61 01 00 */ addi r3, r1, 0x100 /* 80179C18 00176B58 38 81 02 14 */ addi r4, r1, 0x214 /* 80179C1C 00176B5C 38 A1 01 E4 */ addi r5, r1, 0x1e4 -/* 80179C20 00176B60 48 0E CF 15 */ bl cXyz_NS___mi +/* 80179C20 00176B60 48 0E CF 15 */ bl __mi__4cXyzCFRC3Vec /* 80179C24 00176B64 38 61 00 F4 */ addi r3, r1, 0xf4 /* 80179C28 00176B68 38 81 01 00 */ addi r4, r1, 0x100 /* 80179C2C 00176B6C C0 22 9D 0C */ lfs f1, lbl_8045370C-_SDA2_BASE_(r2) -/* 80179C30 00176B70 48 0E CF 55 */ bl cXyz_NS___ml +/* 80179C30 00176B70 48 0E CF 55 */ bl __ml__4cXyzCFf /* 80179C34 00176B74 38 61 01 E4 */ addi r3, r1, 0x1e4 /* 80179C38 00176B78 38 81 00 F4 */ addi r4, r1, 0xf4 /* 80179C3C 00176B7C 7C 65 1B 78 */ mr r5, r3 @@ -464,11 +464,11 @@ lbl_80179C5C: /* 80179C70 00176BB0 4B F1 DA AD */ bl dCamera_c_NS_attentionPos /* 80179C74 00176BB4 38 61 00 DC */ addi r3, r1, 0xdc /* 80179C78 00176BB8 38 81 00 44 */ addi r4, r1, 0x44 -/* 80179C7C 00176BBC 48 0F 7E 39 */ bl cSGlobe_NS_Xyz +/* 80179C7C 00176BBC 48 0F 7E 39 */ bl Xyz__7cSGlobeCFv /* 80179C80 00176BC0 38 61 00 D0 */ addi r3, r1, 0xd0 /* 80179C84 00176BC4 38 81 00 E8 */ addi r4, r1, 0xe8 /* 80179C88 00176BC8 38 A1 00 DC */ addi r5, r1, 0xdc -/* 80179C8C 00176BCC 48 0E CE 59 */ bl cXyz_NS___pl +/* 80179C8C 00176BCC 48 0E CE 59 */ bl __pl__4cXyzCFRC3Vec /* 80179C90 00176BD0 C0 01 00 D0 */ lfs f0, 0xd0(r1) /* 80179C94 00176BD4 D0 01 01 E4 */ stfs f0, 0x1e4(r1) /* 80179C98 00176BD8 C0 01 00 D4 */ lfs f0, 0xd4(r1) @@ -479,15 +479,15 @@ lbl_80179CA8: /* 80179CA8 00176BE8 38 61 00 C4 */ addi r3, r1, 0xc4 /* 80179CAC 00176BEC 38 81 01 E4 */ addi r4, r1, 0x1e4 /* 80179CB0 00176BF0 38 BC 00 64 */ addi r5, r28, 0x64 -/* 80179CB4 00176BF4 48 0E CE 81 */ bl cXyz_NS___mi +/* 80179CB4 00176BF4 48 0E CE 81 */ bl __mi__4cXyzCFRC3Vec /* 80179CB8 00176BF8 38 61 00 B8 */ addi r3, r1, 0xb8 /* 80179CBC 00176BFC 38 81 00 C4 */ addi r4, r1, 0xc4 /* 80179CC0 00176C00 C0 22 9D 0C */ lfs f1, lbl_8045370C-_SDA2_BASE_(r2) -/* 80179CC4 00176C04 48 0E CE C1 */ bl cXyz_NS___ml +/* 80179CC4 00176C04 48 0E CE C1 */ bl __ml__4cXyzCFf /* 80179CC8 00176C08 38 61 00 AC */ addi r3, r1, 0xac /* 80179CCC 00176C0C 38 9C 00 64 */ addi r4, r28, 0x64 /* 80179CD0 00176C10 38 A1 00 B8 */ addi r5, r1, 0xb8 -/* 80179CD4 00176C14 48 0E CE 11 */ bl cXyz_NS___pl +/* 80179CD4 00176C14 48 0E CE 11 */ bl __pl__4cXyzCFRC3Vec /* 80179CD8 00176C18 C0 01 00 AC */ lfs f0, 0xac(r1) /* 80179CDC 00176C1C D0 01 02 08 */ stfs f0, 0x208(r1) /* 80179CE0 00176C20 C0 01 00 B0 */ lfs f0, 0xb0(r1) @@ -506,11 +506,11 @@ lbl_80179D00: /* 80179D10 00176C50 4B FE B0 5D */ bl dCamera_c_NS_relationalPos /* 80179D14 00176C54 38 61 00 94 */ addi r3, r1, 0x94 /* 80179D18 00176C58 38 81 00 44 */ addi r4, r1, 0x44 -/* 80179D1C 00176C5C 48 0F 7D 99 */ bl cSGlobe_NS_Xyz +/* 80179D1C 00176C5C 48 0F 7D 99 */ bl Xyz__7cSGlobeCFv /* 80179D20 00176C60 38 61 00 88 */ addi r3, r1, 0x88 /* 80179D24 00176C64 38 81 00 A0 */ addi r4, r1, 0xa0 /* 80179D28 00176C68 38 A1 00 94 */ addi r5, r1, 0x94 -/* 80179D2C 00176C6C 48 0E CD B9 */ bl cXyz_NS___pl +/* 80179D2C 00176C6C 48 0E CD B9 */ bl __pl__4cXyzCFRC3Vec /* 80179D30 00176C70 C0 01 00 88 */ lfs f0, 0x88(r1) /* 80179D34 00176C74 D0 01 02 08 */ stfs f0, 0x208(r1) /* 80179D38 00176C78 C0 01 00 8C */ lfs f0, 0x8c(r1) @@ -521,11 +521,11 @@ lbl_80179D48: /* 80179D48 00176C88 38 61 00 7C */ addi r3, r1, 0x7c /* 80179D4C 00176C8C 38 81 02 08 */ addi r4, r1, 0x208 /* 80179D50 00176C90 38 BC 00 64 */ addi r5, r28, 0x64 -/* 80179D54 00176C94 48 0E CD E1 */ bl cXyz_NS___mi +/* 80179D54 00176C94 48 0E CD E1 */ bl __mi__4cXyzCFRC3Vec /* 80179D58 00176C98 38 61 00 70 */ addi r3, r1, 0x70 /* 80179D5C 00176C9C 38 81 00 7C */ addi r4, r1, 0x7c /* 80179D60 00176CA0 38 A1 01 FC */ addi r5, r1, 0x1fc -/* 80179D64 00176CA4 48 0E CE 6D */ bl cXyz_NS___ml_X1_ +/* 80179D64 00176CA4 48 0E CE 6D */ bl __ml__4cXyzCFRC3Vec /* 80179D68 00176CA8 38 7C 00 64 */ addi r3, r28, 0x64 /* 80179D6C 00176CAC 38 81 00 70 */ addi r4, r1, 0x70 /* 80179D70 00176CB0 7C 65 1B 78 */ mr r5, r3 @@ -540,7 +540,7 @@ lbl_80179D48: /* 80179D94 00176CD4 38 61 02 6C */ addi r3, r1, 0x26c /* 80179D98 00176CD8 38 9C 00 64 */ addi r4, r28, 0x64 /* 80179D9C 00176CDC FC 20 98 90 */ fmr f1, f19 -/* 80179DA0 00176CE0 48 0F 58 C5 */ bl cM3dGSph_NS_Set +/* 80179DA0 00176CE0 48 0F 58 C5 */ bl Set__8cM3dGSphFRC4cXyzf /* 80179DA4 00176CE4 C2 62 9C A0 */ lfs f19, lbl_804536A0-_SDA2_BASE_(r2) /* 80179DA8 00176CE8 C0 1C 00 70 */ lfs f0, 0x70(r28) /* 80179DAC 00176CEC D0 01 01 D8 */ stfs f0, 0x1d8(r1) @@ -590,12 +590,12 @@ lbl_80179E08: /* 80179E54 00176D94 38 61 02 50 */ addi r3, r1, 0x250 /* 80179E58 00176D98 38 81 01 CC */ addi r4, r1, 0x1cc /* 80179E5C 00176D9C 38 A1 01 C0 */ addi r5, r1, 0x1c0 -/* 80179E60 00176DA0 48 0F 54 BD */ bl cM3dGLin_NS_SetStartEnd_X1_ +/* 80179E60 00176DA0 48 0F 54 BD */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec /* 80179E64 00176DA4 38 61 02 6C */ addi r3, r1, 0x26c /* 80179E68 00176DA8 38 81 02 50 */ addi r4, r1, 0x250 /* 80179E6C 00176DAC 38 A1 01 B4 */ addi r5, r1, 0x1b4 /* 80179E70 00176DB0 38 C1 01 A8 */ addi r6, r1, 0x1a8 -/* 80179E74 00176DB4 48 0F 16 75 */ bl cM3d_Cross_LinSph_CrossPos +/* 80179E74 00176DB4 48 0F 16 75 */ bl cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec /* 80179E78 00176DB8 2C 03 00 02 */ cmpwi r3, 2 /* 80179E7C 00176DBC 41 82 00 14 */ beq lbl_80179E90 /* 80179E80 00176DC0 40 80 00 A0 */ bge lbl_80179F20 @@ -668,12 +668,12 @@ lbl_80179F28: /* 80179F7C 00176EBC 38 61 02 50 */ addi r3, r1, 0x250 /* 80179F80 00176EC0 38 81 01 CC */ addi r4, r1, 0x1cc /* 80179F84 00176EC4 38 A1 01 C0 */ addi r5, r1, 0x1c0 -/* 80179F88 00176EC8 48 0F 53 95 */ bl cM3dGLin_NS_SetStartEnd_X1_ +/* 80179F88 00176EC8 48 0F 53 95 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec /* 80179F8C 00176ECC 38 61 02 6C */ addi r3, r1, 0x26c /* 80179F90 00176ED0 38 81 02 50 */ addi r4, r1, 0x250 /* 80179F94 00176ED4 38 A1 01 B4 */ addi r5, r1, 0x1b4 /* 80179F98 00176ED8 38 C1 01 A8 */ addi r6, r1, 0x1a8 -/* 80179F9C 00176EDC 48 0F 15 4D */ bl cM3d_Cross_LinSph_CrossPos +/* 80179F9C 00176EDC 48 0F 15 4D */ bl cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec /* 80179FA0 00176EE0 2C 03 00 02 */ cmpwi r3, 2 /* 80179FA4 00176EE4 41 82 00 14 */ beq lbl_80179FB8 /* 80179FA8 00176EE8 40 80 00 9C */ bge lbl_8017A044 @@ -721,25 +721,25 @@ lbl_8017A044: /* 8017A044 00176F84 38 61 00 64 */ addi r3, r1, 0x64 /* 8017A048 00176F88 38 81 01 D8 */ addi r4, r1, 0x1d8 /* 8017A04C 00176F8C 38 BC 00 64 */ addi r5, r28, 0x64 -/* 8017A050 00176F90 48 0E CA E5 */ bl cXyz_NS___mi +/* 8017A050 00176F90 48 0E CA E5 */ bl __mi__4cXyzCFRC3Vec /* 8017A054 00176F94 38 61 00 34 */ addi r3, r1, 0x34 /* 8017A058 00176F98 38 81 00 64 */ addi r4, r1, 0x64 -/* 8017A05C 00176F9C 48 0F 78 25 */ bl cSGlobe_X4_ +/* 8017A05C 00176F9C 48 0F 78 25 */ bl __ct__7cSGlobeFRC4cXyz /* 8017A060 00176FA0 38 61 00 28 */ addi r3, r1, 0x28 /* 8017A064 00176FA4 3B A1 00 3A */ addi r29, r1, 0x3a /* 8017A068 00176FA8 7F A4 EB 78 */ mr r4, r29 /* 8017A06C 00176FAC 3B FC 00 62 */ addi r31, r28, 0x62 /* 8017A070 00176FB0 7F E5 FB 78 */ mr r5, r31 -/* 8017A074 00176FB4 48 0F 71 31 */ bl cSAngle_NS___mi_X1_ +/* 8017A074 00176FB4 48 0F 71 31 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017A078 00176FB8 38 61 00 2C */ addi r3, r1, 0x2c /* 8017A07C 00176FBC 38 81 00 28 */ addi r4, r1, 0x28 -/* 8017A080 00176FC0 48 0F 6E E9 */ bl cSAngle_X1_ +/* 8017A080 00176FC0 48 0F 6E E9 */ bl __ct__7cSAngleFRC7cSAngle /* 8017A084 00176FC4 88 0D 8A BE */ lbz r0, lbl_8045103E-_SDA_BASE_(r13) /* 8017A088 00176FC8 7C 00 07 75 */ extsb. r0, r0 /* 8017A08C 00176FCC 40 82 00 2C */ bne lbl_8017A0B8 /* 8017A090 00176FD0 38 6D 8A C0 */ addi r3, r13, 0x80451040 - 0x80458580 /*SDA HACK; original: lbl_80451040-_SDA_BASE_*/ /* 8017A094 00176FD4 C0 22 9E 58 */ lfs f1, lbl_80453858-_SDA2_BASE_(r2) -/* 8017A098 00176FD8 48 0F 6F 31 */ bl cSAngle_X3_ +/* 8017A098 00176FD8 48 0F 6F 31 */ bl __ct__7cSAngleFf /* 8017A09C 00176FDC 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha /* 8017A0A0 00176FE0 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l /* 8017A0A4 00176FE4 3C A0 80 43 */ lis r5, lbl_8042C9AC@ha @@ -750,7 +750,7 @@ lbl_8017A044: lbl_8017A0B8: /* 8017A0B8 00176FF8 AB 4D 8A C0 */ lha r26, lbl_80451040-_SDA_BASE_(r13) /* 8017A0BC 00176FFC 38 61 00 2C */ addi r3, r1, 0x2c -/* 8017A0C0 00177000 48 0F 70 0D */ bl cSAngle_NS_Abs +/* 8017A0C0 00177000 48 0F 70 0D */ bl Abs__7cSAngleCFv /* 8017A0C4 00177004 7C 63 07 34 */ extsh r3, r3 /* 8017A0C8 00177008 7F 40 07 34 */ extsh r0, r26 /* 8017A0CC 0017700C 7C 03 00 00 */ cmpw r3, r0 @@ -779,45 +779,45 @@ lbl_8017A104: /* 8017A11C 0017705C 38 61 00 24 */ addi r3, r1, 0x24 /* 8017A120 00177060 7F A4 EB 78 */ mr r4, r29 /* 8017A124 00177064 7F E5 FB 78 */ mr r5, r31 -/* 8017A128 00177068 48 0F 70 7D */ bl cSAngle_NS___mi_X1_ +/* 8017A128 00177068 48 0F 70 7D */ bl __mi__7cSAngleCFRC7cSAngle /* 8017A12C 0017706C 38 61 00 20 */ addi r3, r1, 0x20 /* 8017A130 00177070 38 81 00 24 */ addi r4, r1, 0x24 /* 8017A134 00177074 C0 3C 03 F8 */ lfs f1, 0x3f8(r28) -/* 8017A138 00177078 48 0F 71 2D */ bl cSAngle_NS___ml +/* 8017A138 00177078 48 0F 71 2D */ bl __ml__7cSAngleCFf /* 8017A13C 0017707C 38 61 00 1C */ addi r3, r1, 0x1c /* 8017A140 00177080 7F E4 FB 78 */ mr r4, r31 /* 8017A144 00177084 38 A1 00 20 */ addi r5, r1, 0x20 -/* 8017A148 00177088 48 0F 70 2D */ bl cSAngle_NS___pl +/* 8017A148 00177088 48 0F 70 2D */ bl __pl__7cSAngleCFRC7cSAngle /* 8017A14C 0017708C 38 61 00 0C */ addi r3, r1, 0xc /* 8017A150 00177090 A8 81 00 1C */ lha r4, 0x1c(r1) -/* 8017A154 00177094 48 0F 6E 45 */ bl cSAngle_X2_ +/* 8017A154 00177094 48 0F 6E 45 */ bl __ct__7cSAngleFs /* 8017A158 00177098 A8 01 00 0C */ lha r0, 0xc(r1) /* 8017A15C 0017709C B0 1C 00 62 */ sth r0, 0x62(r28) /* 8017A160 001770A0 38 61 00 18 */ addi r3, r1, 0x18 /* 8017A164 001770A4 38 81 00 38 */ addi r4, r1, 0x38 /* 8017A168 001770A8 3B 5C 00 60 */ addi r26, r28, 0x60 /* 8017A16C 001770AC 7F 45 D3 78 */ mr r5, r26 -/* 8017A170 001770B0 48 0F 70 35 */ bl cSAngle_NS___mi_X1_ +/* 8017A170 001770B0 48 0F 70 35 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017A174 001770B4 38 61 00 14 */ addi r3, r1, 0x14 /* 8017A178 001770B8 38 81 00 18 */ addi r4, r1, 0x18 /* 8017A17C 001770BC C0 3C 03 F8 */ lfs f1, 0x3f8(r28) -/* 8017A180 001770C0 48 0F 70 E5 */ bl cSAngle_NS___ml +/* 8017A180 001770C0 48 0F 70 E5 */ bl __ml__7cSAngleCFf /* 8017A184 001770C4 38 61 00 10 */ addi r3, r1, 0x10 /* 8017A188 001770C8 7F 44 D3 78 */ mr r4, r26 /* 8017A18C 001770CC 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8017A190 001770D0 48 0F 6F E5 */ bl cSAngle_NS___pl +/* 8017A190 001770D0 48 0F 6F E5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017A194 001770D4 38 61 00 08 */ addi r3, r1, 8 /* 8017A198 001770D8 A8 81 00 10 */ lha r4, 0x10(r1) -/* 8017A19C 001770DC 48 0F 6D FD */ bl cSAngle_X2_ +/* 8017A19C 001770DC 48 0F 6D FD */ bl __ct__7cSAngleFs /* 8017A1A0 001770E0 A8 01 00 08 */ lha r0, 8(r1) /* 8017A1A4 001770E4 B0 1C 00 60 */ sth r0, 0x60(r28) /* 8017A1A8 001770E8 38 61 00 58 */ addi r3, r1, 0x58 /* 8017A1AC 001770EC 38 9C 00 5C */ addi r4, r28, 0x5c -/* 8017A1B0 001770F0 48 0F 79 05 */ bl cSGlobe_NS_Xyz +/* 8017A1B0 001770F0 48 0F 79 05 */ bl Xyz__7cSGlobeCFv /* 8017A1B4 001770F4 38 61 00 4C */ addi r3, r1, 0x4c /* 8017A1B8 001770F8 38 9C 00 64 */ addi r4, r28, 0x64 /* 8017A1BC 001770FC 38 A1 00 58 */ addi r5, r1, 0x58 -/* 8017A1C0 00177100 48 0E C9 25 */ bl cXyz_NS___pl +/* 8017A1C0 00177100 48 0E C9 25 */ bl __pl__4cXyzCFRC3Vec /* 8017A1C4 00177104 C0 01 00 4C */ lfs f0, 0x4c(r1) /* 8017A1C8 00177108 D0 1C 00 70 */ stfs f0, 0x70(r28) /* 8017A1CC 0017710C C0 01 00 50 */ lfs f0, 0x50(r1) diff --git a/include/d/d_camera/asm/func_8017A2A0.s b/include/d/d_camera/asm/func_8017A2A0.s index 1043556749..aff580700e 100644 --- a/include/d/d_camera/asm/func_8017A2A0.s +++ b/include/d/d_camera/asm/func_8017A2A0.s @@ -165,7 +165,7 @@ lbl_8017A500: /* 8017A508 00177448 90 19 03 F0 */ stw r0, 0x3f0(r25) /* 8017A50C 0017744C 38 61 00 50 */ addi r3, r1, 0x50 /* 8017A510 00177450 38 99 00 5C */ addi r4, r25, 0x5c -/* 8017A514 00177454 48 0F 72 DD */ bl cSGlobe_X1_ +/* 8017A514 00177454 48 0F 72 DD */ bl __ct__7cSGlobeFRC7cSGlobe /* 8017A518 00177458 C0 02 9D 38 */ lfs f0, lbl_80453738-_SDA2_BASE_(r2) /* 8017A51C 0017745C D0 01 00 50 */ stfs f0, 0x50(r1) /* 8017A520 00177460 38 61 01 60 */ addi r3, r1, 0x160 @@ -174,11 +174,11 @@ lbl_8017A500: /* 8017A52C 0017746C 4B F1 D1 F1 */ bl dCamera_c_NS_attentionPos /* 8017A530 00177470 38 61 01 54 */ addi r3, r1, 0x154 /* 8017A534 00177474 38 81 00 50 */ addi r4, r1, 0x50 -/* 8017A538 00177478 48 0F 75 7D */ bl cSGlobe_NS_Xyz +/* 8017A538 00177478 48 0F 75 7D */ bl Xyz__7cSGlobeCFv /* 8017A53C 0017747C 38 61 01 48 */ addi r3, r1, 0x148 /* 8017A540 00177480 38 81 01 60 */ addi r4, r1, 0x160 /* 8017A544 00177484 38 A1 01 54 */ addi r5, r1, 0x154 -/* 8017A548 00177488 48 0E C5 9D */ bl cXyz_NS___pl +/* 8017A548 00177488 48 0E C5 9D */ bl __pl__4cXyzCFRC3Vec /* 8017A54C 0017748C C0 41 01 48 */ lfs f2, 0x148(r1) /* 8017A550 00177490 D0 41 01 E4 */ stfs f2, 0x1e4(r1) /* 8017A554 00177494 C0 21 01 4C */ lfs f1, 0x14c(r1) @@ -196,10 +196,10 @@ lbl_8017A570: /* 8017A580 001774C0 38 61 01 30 */ addi r3, r1, 0x130 /* 8017A584 001774C4 38 81 01 F0 */ addi r4, r1, 0x1f0 /* 8017A588 001774C8 38 A1 01 3C */ addi r5, r1, 0x13c -/* 8017A58C 001774CC 48 0E C5 A9 */ bl cXyz_NS___mi +/* 8017A58C 001774CC 48 0E C5 A9 */ bl __mi__4cXyzCFRC3Vec /* 8017A590 001774D0 38 61 00 48 */ addi r3, r1, 0x48 /* 8017A594 001774D4 38 81 01 30 */ addi r4, r1, 0x130 -/* 8017A598 001774D8 48 0F 72 E9 */ bl cSGlobe_X4_ +/* 8017A598 001774D8 48 0F 72 E9 */ bl __ct__7cSGlobeFRC4cXyz /* 8017A59C 001774DC C0 22 9C A8 */ lfs f1, lbl_804536A8-_SDA2_BASE_(r2) /* 8017A5A0 001774E0 C0 41 00 48 */ lfs f2, 0x48(r1) /* 8017A5A4 001774E4 EC 02 F8 24 */ fdivs f0, f2, f31 @@ -213,7 +213,7 @@ lbl_8017A570: /* 8017A5C4 00177504 90 19 03 F0 */ stw r0, 0x3f0(r25) /* 8017A5C8 00177508 38 61 00 40 */ addi r3, r1, 0x40 /* 8017A5CC 0017750C 38 99 00 5C */ addi r4, r25, 0x5c -/* 8017A5D0 00177510 48 0F 72 21 */ bl cSGlobe_X1_ +/* 8017A5D0 00177510 48 0F 72 21 */ bl __ct__7cSGlobeFRC7cSGlobe /* 8017A5D4 00177514 FC 00 B0 50 */ fneg f0, f22 /* 8017A5D8 00177518 D0 01 00 40 */ stfs f0, 0x40(r1) /* 8017A5DC 0017751C 38 61 01 24 */ addi r3, r1, 0x124 @@ -222,11 +222,11 @@ lbl_8017A570: /* 8017A5E8 00177528 4B F1 D1 35 */ bl dCamera_c_NS_attentionPos /* 8017A5EC 0017752C 38 61 01 18 */ addi r3, r1, 0x118 /* 8017A5F0 00177530 38 81 00 40 */ addi r4, r1, 0x40 -/* 8017A5F4 00177534 48 0F 74 C1 */ bl cSGlobe_NS_Xyz +/* 8017A5F4 00177534 48 0F 74 C1 */ bl Xyz__7cSGlobeCFv /* 8017A5F8 00177538 38 61 01 0C */ addi r3, r1, 0x10c /* 8017A5FC 0017753C 38 81 01 24 */ addi r4, r1, 0x124 /* 8017A600 00177540 38 A1 01 18 */ addi r5, r1, 0x118 -/* 8017A604 00177544 48 0E C4 E1 */ bl cXyz_NS___pl +/* 8017A604 00177544 48 0E C4 E1 */ bl __pl__4cXyzCFRC3Vec /* 8017A608 00177548 C0 41 01 0C */ lfs f2, 0x10c(r1) /* 8017A60C 0017754C D0 41 01 E4 */ stfs f2, 0x1e4(r1) /* 8017A610 00177550 C0 21 01 10 */ lfs f1, 0x110(r1) @@ -282,22 +282,22 @@ lbl_8017A6B4: /* 8017A6C8 00177608 54 05 20 36 */ slwi r5, r0, 4 /* 8017A6CC 0017760C 38 A5 00 04 */ addi r5, r5, 4 /* 8017A6D0 00177610 7C A6 2A 14 */ add r5, r6, r5 -/* 8017A6D4 00177614 48 0F 4C 49 */ bl cM3dGLin_NS_SetStartEnd_X1_ +/* 8017A6D4 00177614 48 0F 4C 49 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec /* 8017A6D8 00177618 38 61 02 20 */ addi r3, r1, 0x220 /* 8017A6DC 0017761C 38 81 01 E4 */ addi r4, r1, 0x1e4 /* 8017A6E0 00177620 38 A1 01 B4 */ addi r5, r1, 0x1b4 /* 8017A6E4 00177624 38 C1 00 30 */ addi r6, r1, 0x30 -/* 8017A6E8 00177628 48 0E E0 29 */ bl cM3d_Len3dSqPntAndSegLine +/* 8017A6E8 00177628 48 0E E0 29 */ bl cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf /* 8017A6EC 0017762C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017A6F0 00177630 41 82 00 3C */ beq lbl_8017A72C /* 8017A6F4 00177634 38 61 01 00 */ addi r3, r1, 0x100 /* 8017A6F8 00177638 38 81 01 E4 */ addi r4, r1, 0x1e4 /* 8017A6FC 0017763C 38 A1 01 B4 */ addi r5, r1, 0x1b4 -/* 8017A700 00177640 48 0E C4 35 */ bl cXyz_NS___mi +/* 8017A700 00177640 48 0E C4 35 */ bl __mi__4cXyzCFRC3Vec /* 8017A704 00177644 38 61 00 F4 */ addi r3, r1, 0xf4 /* 8017A708 00177648 38 81 01 00 */ addi r4, r1, 0x100 /* 8017A70C 0017764C C0 22 9D 0C */ lfs f1, lbl_8045370C-_SDA2_BASE_(r2) -/* 8017A710 00177650 48 0E C4 75 */ bl cXyz_NS___ml +/* 8017A710 00177650 48 0E C4 75 */ bl __ml__4cXyzCFf /* 8017A714 00177654 38 61 01 B4 */ addi r3, r1, 0x1b4 /* 8017A718 00177658 38 81 00 F4 */ addi r4, r1, 0xf4 /* 8017A71C 0017765C 7C 65 1B 78 */ mr r5, r3 @@ -367,11 +367,11 @@ lbl_8017A808: /* 8017A808 00177748 38 61 00 DC */ addi r3, r1, 0xdc /* 8017A80C 0017774C 38 81 01 E4 */ addi r4, r1, 0x1e4 /* 8017A810 00177750 38 A1 01 B4 */ addi r5, r1, 0x1b4 -/* 8017A814 00177754 48 0E C3 21 */ bl cXyz_NS___mi +/* 8017A814 00177754 48 0E C3 21 */ bl __mi__4cXyzCFRC3Vec /* 8017A818 00177758 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8017A81C 0017775C 38 81 00 DC */ addi r4, r1, 0xdc /* 8017A820 00177760 C0 22 9D 0C */ lfs f1, lbl_8045370C-_SDA2_BASE_(r2) -/* 8017A824 00177764 48 0E C3 61 */ bl cXyz_NS___ml +/* 8017A824 00177764 48 0E C3 61 */ bl __ml__4cXyzCFf /* 8017A828 00177768 38 61 01 B4 */ addi r3, r1, 0x1b4 /* 8017A82C 0017776C 38 81 00 D0 */ addi r4, r1, 0xd0 /* 8017A830 00177770 7C 65 1B 78 */ mr r5, r3 @@ -395,11 +395,11 @@ lbl_8017A860: /* 8017A870 001777B0 4B FE A4 FD */ bl dCamera_c_NS_relationalPos /* 8017A874 001777B4 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8017A878 001777B8 38 81 00 48 */ addi r4, r1, 0x48 -/* 8017A87C 001777BC 48 0F 72 39 */ bl cSGlobe_NS_Xyz +/* 8017A87C 001777BC 48 0F 72 39 */ bl Xyz__7cSGlobeCFv /* 8017A880 001777C0 38 61 00 AC */ addi r3, r1, 0xac /* 8017A884 001777C4 38 81 00 C4 */ addi r4, r1, 0xc4 /* 8017A888 001777C8 38 A1 00 B8 */ addi r5, r1, 0xb8 -/* 8017A88C 001777CC 48 0E C2 59 */ bl cXyz_NS___pl +/* 8017A88C 001777CC 48 0E C2 59 */ bl __pl__4cXyzCFRC3Vec /* 8017A890 001777D0 C0 01 00 AC */ lfs f0, 0xac(r1) /* 8017A894 001777D4 D0 01 01 D8 */ stfs f0, 0x1d8(r1) /* 8017A898 001777D8 C0 01 00 B0 */ lfs f0, 0xb0(r1) @@ -410,11 +410,11 @@ lbl_8017A8A8: /* 8017A8A8 001777E8 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8017A8AC 001777EC 38 81 01 D8 */ addi r4, r1, 0x1d8 /* 8017A8B0 001777F0 38 B9 00 64 */ addi r5, r25, 0x64 -/* 8017A8B4 001777F4 48 0E C2 81 */ bl cXyz_NS___mi +/* 8017A8B4 001777F4 48 0E C2 81 */ bl __mi__4cXyzCFRC3Vec /* 8017A8B8 001777F8 38 61 00 94 */ addi r3, r1, 0x94 /* 8017A8BC 001777FC 38 81 00 A0 */ addi r4, r1, 0xa0 /* 8017A8C0 00177800 38 A1 01 CC */ addi r5, r1, 0x1cc -/* 8017A8C4 00177804 48 0E C3 0D */ bl cXyz_NS___ml_X1_ +/* 8017A8C4 00177804 48 0E C3 0D */ bl __ml__4cXyzCFRC3Vec /* 8017A8C8 00177808 38 79 00 64 */ addi r3, r25, 0x64 /* 8017A8CC 0017780C 38 81 00 94 */ addi r4, r1, 0x94 /* 8017A8D0 00177810 7C 65 1B 78 */ mr r5, r3 @@ -458,12 +458,12 @@ lbl_8017A918: /* 8017A964 001778A4 38 61 02 3C */ addi r3, r1, 0x23c /* 8017A968 001778A8 38 81 02 08 */ addi r4, r1, 0x208 /* 8017A96C 001778AC 38 A1 01 FC */ addi r5, r1, 0x1fc -/* 8017A970 001778B0 48 0F 49 AD */ bl cM3dGLin_NS_SetStartEnd_X1_ +/* 8017A970 001778B0 48 0F 49 AD */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec /* 8017A974 001778B4 38 61 02 3C */ addi r3, r1, 0x23c /* 8017A978 001778B8 38 99 00 64 */ addi r4, r25, 0x64 /* 8017A97C 001778BC 38 A1 02 14 */ addi r5, r1, 0x214 /* 8017A980 001778C0 38 C1 00 34 */ addi r6, r1, 0x34 -/* 8017A984 001778C4 48 0E DD 8D */ bl cM3d_Len3dSqPntAndSegLine +/* 8017A984 001778C4 48 0E DD 8D */ bl cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf /* 8017A988 001778C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017A98C 001778CC 41 82 00 30 */ beq lbl_8017A9BC /* 8017A990 001778D0 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -506,12 +506,12 @@ lbl_8017A9C4: /* 8017AA18 00177958 38 61 02 3C */ addi r3, r1, 0x23c /* 8017AA1C 0017795C 38 81 02 08 */ addi r4, r1, 0x208 /* 8017AA20 00177960 38 A1 01 FC */ addi r5, r1, 0x1fc -/* 8017AA24 00177964 48 0F 48 F9 */ bl cM3dGLin_NS_SetStartEnd_X1_ +/* 8017AA24 00177964 48 0F 48 F9 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec /* 8017AA28 00177968 38 61 02 3C */ addi r3, r1, 0x23c /* 8017AA2C 0017796C 38 99 00 64 */ addi r4, r25, 0x64 /* 8017AA30 00177970 38 A1 02 14 */ addi r5, r1, 0x214 /* 8017AA34 00177974 38 C1 00 34 */ addi r6, r1, 0x34 -/* 8017AA38 00177978 48 0E DC D9 */ bl cM3d_Len3dSqPntAndSegLine +/* 8017AA38 00177978 48 0E DC D9 */ bl cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf /* 8017AA3C 0017797C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017AA40 00177980 41 82 00 2C */ beq lbl_8017AA6C /* 8017AA44 00177984 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -588,11 +588,11 @@ lbl_8017AB4C: /* 8017AB4C 00177A8C 38 61 00 88 */ addi r3, r1, 0x88 /* 8017AB50 00177A90 38 81 01 84 */ addi r4, r1, 0x184 /* 8017AB54 00177A94 38 B9 03 F8 */ addi r5, r25, 0x3f8 -/* 8017AB58 00177A98 48 0E BF DD */ bl cXyz_NS___mi +/* 8017AB58 00177A98 48 0E BF DD */ bl __mi__4cXyzCFRC3Vec /* 8017AB5C 00177A9C 38 61 00 7C */ addi r3, r1, 0x7c /* 8017AB60 00177AA0 38 81 00 88 */ addi r4, r1, 0x88 /* 8017AB64 00177AA4 C0 22 9D 0C */ lfs f1, lbl_8045370C-_SDA2_BASE_(r2) -/* 8017AB68 00177AA8 48 0E C0 1D */ bl cXyz_NS___ml +/* 8017AB68 00177AA8 48 0E C0 1D */ bl __ml__4cXyzCFf /* 8017AB6C 00177AAC 38 79 03 F8 */ addi r3, r25, 0x3f8 /* 8017AB70 00177AB0 38 81 00 7C */ addi r4, r1, 0x7c /* 8017AB74 00177AB4 7C 65 1B 78 */ mr r5, r3 @@ -601,25 +601,25 @@ lbl_8017AB7C: /* 8017AB7C 00177ABC 38 61 00 70 */ addi r3, r1, 0x70 /* 8017AB80 00177AC0 38 99 03 F8 */ addi r4, r25, 0x3f8 /* 8017AB84 00177AC4 38 B9 00 64 */ addi r5, r25, 0x64 -/* 8017AB88 00177AC8 48 0E BF AD */ bl cXyz_NS___mi +/* 8017AB88 00177AC8 48 0E BF AD */ bl __mi__4cXyzCFRC3Vec /* 8017AB8C 00177ACC 38 61 00 38 */ addi r3, r1, 0x38 /* 8017AB90 00177AD0 38 81 00 70 */ addi r4, r1, 0x70 -/* 8017AB94 00177AD4 48 0F 6C ED */ bl cSGlobe_X4_ +/* 8017AB94 00177AD4 48 0F 6C ED */ bl __ct__7cSGlobeFRC4cXyz /* 8017AB98 00177AD8 38 61 00 28 */ addi r3, r1, 0x28 /* 8017AB9C 00177ADC 3B A1 00 3E */ addi r29, r1, 0x3e /* 8017ABA0 00177AE0 7F A4 EB 78 */ mr r4, r29 /* 8017ABA4 00177AE4 3B F9 00 62 */ addi r31, r25, 0x62 /* 8017ABA8 00177AE8 7F E5 FB 78 */ mr r5, r31 -/* 8017ABAC 00177AEC 48 0F 65 F9 */ bl cSAngle_NS___mi_X1_ +/* 8017ABAC 00177AEC 48 0F 65 F9 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017ABB0 00177AF0 38 61 00 2C */ addi r3, r1, 0x2c /* 8017ABB4 00177AF4 38 81 00 28 */ addi r4, r1, 0x28 -/* 8017ABB8 00177AF8 48 0F 63 B1 */ bl cSAngle_X1_ +/* 8017ABB8 00177AF8 48 0F 63 B1 */ bl __ct__7cSAngleFRC7cSAngle /* 8017ABBC 00177AFC 88 0D 8A C2 */ lbz r0, lbl_80451042-_SDA_BASE_(r13) /* 8017ABC0 00177B00 7C 00 07 75 */ extsb. r0, r0 /* 8017ABC4 00177B04 40 82 00 2C */ bne lbl_8017ABF0 /* 8017ABC8 00177B08 38 6D 8A C4 */ addi r3, r13, 0x80451044 - 0x80458580 /*SDA HACK; original: lbl_80451044-_SDA_BASE_*/ /* 8017ABCC 00177B0C C0 22 9E 58 */ lfs f1, lbl_80453858-_SDA2_BASE_(r2) -/* 8017ABD0 00177B10 48 0F 63 F9 */ bl cSAngle_X3_ +/* 8017ABD0 00177B10 48 0F 63 F9 */ bl __ct__7cSAngleFf /* 8017ABD4 00177B14 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha /* 8017ABD8 00177B18 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l /* 8017ABDC 00177B1C 3C A0 80 43 */ lis r5, lbl_8042C9B8@ha @@ -630,7 +630,7 @@ lbl_8017AB7C: lbl_8017ABF0: /* 8017ABF0 00177B30 AB 0D 8A C4 */ lha r24, lbl_80451044-_SDA_BASE_(r13) /* 8017ABF4 00177B34 38 61 00 2C */ addi r3, r1, 0x2c -/* 8017ABF8 00177B38 48 0F 64 D5 */ bl cSAngle_NS_Abs +/* 8017ABF8 00177B38 48 0F 64 D5 */ bl Abs__7cSAngleCFv /* 8017ABFC 00177B3C 7C 63 07 34 */ extsh r3, r3 /* 8017AC00 00177B40 7F 00 07 34 */ extsh r0, r24 /* 8017AC04 00177B44 7C 03 00 00 */ cmpw r3, r0 @@ -659,45 +659,45 @@ lbl_8017AC3C: /* 8017AC54 00177B94 38 61 00 24 */ addi r3, r1, 0x24 /* 8017AC58 00177B98 7F A4 EB 78 */ mr r4, r29 /* 8017AC5C 00177B9C 7F E5 FB 78 */ mr r5, r31 -/* 8017AC60 00177BA0 48 0F 65 45 */ bl cSAngle_NS___mi_X1_ +/* 8017AC60 00177BA0 48 0F 65 45 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017AC64 00177BA4 38 61 00 20 */ addi r3, r1, 0x20 /* 8017AC68 00177BA8 38 81 00 24 */ addi r4, r1, 0x24 /* 8017AC6C 00177BAC C0 39 04 04 */ lfs f1, 0x404(r25) -/* 8017AC70 00177BB0 48 0F 65 F5 */ bl cSAngle_NS___ml +/* 8017AC70 00177BB0 48 0F 65 F5 */ bl __ml__7cSAngleCFf /* 8017AC74 00177BB4 38 61 00 1C */ addi r3, r1, 0x1c /* 8017AC78 00177BB8 7F E4 FB 78 */ mr r4, r31 /* 8017AC7C 00177BBC 38 A1 00 20 */ addi r5, r1, 0x20 -/* 8017AC80 00177BC0 48 0F 64 F5 */ bl cSAngle_NS___pl +/* 8017AC80 00177BC0 48 0F 64 F5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017AC84 00177BC4 38 61 00 0C */ addi r3, r1, 0xc /* 8017AC88 00177BC8 A8 81 00 1C */ lha r4, 0x1c(r1) -/* 8017AC8C 00177BCC 48 0F 63 0D */ bl cSAngle_X2_ +/* 8017AC8C 00177BCC 48 0F 63 0D */ bl __ct__7cSAngleFs /* 8017AC90 00177BD0 A8 01 00 0C */ lha r0, 0xc(r1) /* 8017AC94 00177BD4 B0 19 00 62 */ sth r0, 0x62(r25) /* 8017AC98 00177BD8 38 61 00 18 */ addi r3, r1, 0x18 /* 8017AC9C 00177BDC 38 81 00 3C */ addi r4, r1, 0x3c /* 8017ACA0 00177BE0 3B 19 00 60 */ addi r24, r25, 0x60 /* 8017ACA4 00177BE4 7F 05 C3 78 */ mr r5, r24 -/* 8017ACA8 00177BE8 48 0F 64 FD */ bl cSAngle_NS___mi_X1_ +/* 8017ACA8 00177BE8 48 0F 64 FD */ bl __mi__7cSAngleCFRC7cSAngle /* 8017ACAC 00177BEC 38 61 00 14 */ addi r3, r1, 0x14 /* 8017ACB0 00177BF0 38 81 00 18 */ addi r4, r1, 0x18 /* 8017ACB4 00177BF4 C0 39 04 04 */ lfs f1, 0x404(r25) -/* 8017ACB8 00177BF8 48 0F 65 AD */ bl cSAngle_NS___ml +/* 8017ACB8 00177BF8 48 0F 65 AD */ bl __ml__7cSAngleCFf /* 8017ACBC 00177BFC 38 61 00 10 */ addi r3, r1, 0x10 /* 8017ACC0 00177C00 7F 04 C3 78 */ mr r4, r24 /* 8017ACC4 00177C04 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8017ACC8 00177C08 48 0F 64 AD */ bl cSAngle_NS___pl +/* 8017ACC8 00177C08 48 0F 64 AD */ bl __pl__7cSAngleCFRC7cSAngle /* 8017ACCC 00177C0C 38 61 00 08 */ addi r3, r1, 8 /* 8017ACD0 00177C10 A8 81 00 10 */ lha r4, 0x10(r1) -/* 8017ACD4 00177C14 48 0F 62 C5 */ bl cSAngle_X2_ +/* 8017ACD4 00177C14 48 0F 62 C5 */ bl __ct__7cSAngleFs /* 8017ACD8 00177C18 A8 01 00 08 */ lha r0, 8(r1) /* 8017ACDC 00177C1C B0 19 00 60 */ sth r0, 0x60(r25) /* 8017ACE0 00177C20 38 61 00 64 */ addi r3, r1, 0x64 /* 8017ACE4 00177C24 38 99 00 5C */ addi r4, r25, 0x5c -/* 8017ACE8 00177C28 48 0F 6D CD */ bl cSGlobe_NS_Xyz +/* 8017ACE8 00177C28 48 0F 6D CD */ bl Xyz__7cSGlobeCFv /* 8017ACEC 00177C2C 38 61 00 58 */ addi r3, r1, 0x58 /* 8017ACF0 00177C30 38 99 00 64 */ addi r4, r25, 0x64 /* 8017ACF4 00177C34 38 A1 00 64 */ addi r5, r1, 0x64 -/* 8017ACF8 00177C38 48 0E BD ED */ bl cXyz_NS___pl +/* 8017ACF8 00177C38 48 0E BD ED */ bl __pl__4cXyzCFRC3Vec /* 8017ACFC 00177C3C C0 01 00 58 */ lfs f0, 0x58(r1) /* 8017AD00 00177C40 D0 19 00 70 */ stfs f0, 0x70(r25) /* 8017AD04 00177C44 C0 01 00 5C */ lfs f0, 0x5c(r1) diff --git a/include/d/d_camera/asm/func_8017ADC0.s b/include/d/d_camera/asm/func_8017ADC0.s index 475b0f5443..f594c4cf71 100644 --- a/include/d/d_camera/asm/func_8017ADC0.s +++ b/include/d/d_camera/asm/func_8017ADC0.s @@ -48,7 +48,7 @@ /* 8017AE7C 00177DBC 40 82 00 28 */ bne lbl_8017AEA4 /* 8017AE80 00177DC0 38 6D 8A C8 */ addi r3, r13, 0x80451048 - 0x80458580 /*SDA HACK; original: lbl_80451048-_SDA_BASE_*/ /* 8017AE84 00177DC4 C0 22 9D 90 */ lfs f1, lbl_80453790-_SDA2_BASE_(r2) -/* 8017AE88 00177DC8 48 0F 61 41 */ bl cSAngle_X3_ +/* 8017AE88 00177DC8 48 0F 61 41 */ bl __ct__7cSAngleFf /* 8017AE8C 00177DCC 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha /* 8017AE90 00177DD0 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l /* 8017AE94 00177DD4 38 BC 00 CC */ addi r5, r28, 0xcc @@ -61,7 +61,7 @@ lbl_8017AEA4: /* 8017AEAC 00177DEC 40 82 00 28 */ bne lbl_8017AED4 /* 8017AEB0 00177DF0 38 6D 8A CC */ addi r3, r13, 0x8045104C - 0x80458580 /*SDA HACK; original: lbl_8045104C-_SDA_BASE_*/ /* 8017AEB4 00177DF4 C0 22 9D 54 */ lfs f1, lbl_80453754-_SDA2_BASE_(r2) -/* 8017AEB8 00177DF8 48 0F 61 11 */ bl cSAngle_X3_ +/* 8017AEB8 00177DF8 48 0F 61 11 */ bl __ct__7cSAngleFf /* 8017AEBC 00177DFC 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha /* 8017AEC0 00177E00 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l /* 8017AEC4 00177E04 38 BC 00 D8 */ addi r5, r28, 0xd8 @@ -138,7 +138,7 @@ lbl_8017AED4: /* 8017AFDC 00177F1C 38 A0 00 17 */ li r5, 0x17 /* 8017AFE0 00177F20 48 00 7C F1 */ bl dCamParam_c_NS_Val /* 8017AFE4 00177F24 38 61 01 74 */ addi r3, r1, 0x174 -/* 8017AFE8 00177F28 48 0F 5F E1 */ bl cSAngle_X3_ +/* 8017AFE8 00177F28 48 0F 5F E1 */ bl __ct__7cSAngleFf /* 8017AFEC 00177F2C 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AFF0 00177F30 7F C4 F3 78 */ mr r4, r30 /* 8017AFF4 00177F34 38 A0 00 11 */ li r5, 0x11 @@ -197,11 +197,11 @@ lbl_8017B0C0: lbl_8017B0C4: /* 8017B0C4 00178004 38 61 01 70 */ addi r3, r1, 0x170 /* 8017B0C8 00178008 C0 22 9E 08 */ lfs f1, lbl_80453808-_SDA2_BASE_(r2) -/* 8017B0CC 0017800C 48 0F 5E FD */ bl cSAngle_X3_ +/* 8017B0CC 0017800C 48 0F 5E FD */ bl __ct__7cSAngleFf /* 8017B0D0 00178010 C2 02 9D 0C */ lfs f16, lbl_8045370C-_SDA2_BASE_(r2) /* 8017B0D4 00178014 38 61 01 6C */ addi r3, r1, 0x16c /* 8017B0D8 00178018 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 8017B0DC 0017801C 48 0F 5E 8D */ bl cSAngle_X1_ +/* 8017B0DC 0017801C 48 0F 5E 8D */ bl __ct__7cSAngleFRC7cSAngle /* 8017B0E0 00178020 C1 E2 9C A8 */ lfs f15, lbl_804536A8-_SDA2_BASE_(r2) /* 8017B0E4 00178024 48 00 77 95 */ bl daAlink_getAlinkActorClass /* 8017B0E8 00178028 7C 7D 1B 78 */ mr r29, r3 @@ -268,7 +268,7 @@ lbl_8017B17C: /* 8017B1CC 0017810C 38 61 03 BC */ addi r3, r1, 0x3bc /* 8017B1D0 00178110 38 81 03 C8 */ addi r4, r1, 0x3c8 /* 8017B1D4 00178114 38 BF 04 6C */ addi r5, r31, 0x46c -/* 8017B1D8 00178118 48 0E B9 5D */ bl cXyz_NS___mi +/* 8017B1D8 00178118 48 0E B9 5D */ bl __mi__4cXyzCFRC3Vec /* 8017B1DC 0017811C 38 61 03 B0 */ addi r3, r1, 0x3b0 /* 8017B1E0 00178120 38 81 03 BC */ addi r4, r1, 0x3bc /* 8017B1E4 00178124 4B F1 C6 11 */ bl cXyz_X1_ @@ -308,7 +308,7 @@ lbl_8017B24C: /* 8017B260 001781A0 4B F1 C4 D9 */ bl dCamera_c_NS_directionOf /* 8017B264 001781A4 38 7F 04 30 */ addi r3, r31, 0x430 /* 8017B268 001781A8 38 81 01 30 */ addi r4, r1, 0x130 -/* 8017B26C 001781AC 48 0F 5D 8D */ bl cSAngle_NS_Val_X1_ +/* 8017B26C 001781AC 48 0F 5D 8D */ bl Val__7cSAngleFRC7cSAngle /* 8017B270 001781B0 38 61 01 30 */ addi r3, r1, 0x130 /* 8017B274 001781B4 38 80 FF FF */ li r4, -1 /* 8017B278 001781B8 4B EB 52 99 */ bl cSAngle_NS_dtor @@ -346,7 +346,7 @@ lbl_8017B24C: /* 8017B2F8 00178238 D0 1F 04 34 */ stfs f0, 0x434(r31) /* 8017B2FC 0017823C D0 3F 04 38 */ stfs f1, 0x438(r31) /* 8017B300 00178240 38 7F 00 60 */ addi r3, r31, 0x60 -/* 8017B304 00178244 48 0F 5D 2D */ bl cSAngle_NS_Degree +/* 8017B304 00178244 48 0F 5D 2D */ bl Degree__7cSAngleCFv /* 8017B308 00178248 D0 3F 04 3C */ stfs f1, 0x43c(r31) /* 8017B30C 0017824C C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 8017B310 00178250 D0 1F 04 40 */ stfs f0, 0x440(r31) @@ -461,10 +461,10 @@ lbl_8017B4A4: /* 8017B4A4 001783E4 38 61 03 98 */ addi r3, r1, 0x398 /* 8017B4A8 001783E8 38 9F 00 70 */ addi r4, r31, 0x70 /* 8017B4AC 001783EC 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8017B4B0 001783F0 48 0E B6 85 */ bl cXyz_NS___mi +/* 8017B4B0 001783F0 48 0E B6 85 */ bl __mi__4cXyzCFRC3Vec /* 8017B4B4 001783F4 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017B4B8 001783F8 38 81 03 98 */ addi r4, r1, 0x398 -/* 8017B4BC 001783FC 48 0F 65 B5 */ bl cSGlobe_NS_Val_X3_ +/* 8017B4BC 001783FC 48 0F 65 B5 */ bl Val__7cSGlobeFRC4cXyz /* 8017B4C0 00178400 38 61 03 98 */ addi r3, r1, 0x398 /* 8017B4C4 00178404 38 80 FF FF */ li r4, -1 /* 8017B4C8 00178408 4B E8 DC BD */ bl cXyz_NS_dtor @@ -612,7 +612,7 @@ lbl_8017B694: /* 8017B6D0 00178610 38 61 03 74 */ addi r3, r1, 0x374 /* 8017B6D4 00178614 38 81 03 8C */ addi r4, r1, 0x38c /* 8017B6D8 00178618 38 A1 03 80 */ addi r5, r1, 0x380 -/* 8017B6DC 0017861C 48 0E B4 59 */ bl cXyz_NS___mi +/* 8017B6DC 0017861C 48 0E B4 59 */ bl __mi__4cXyzCFRC3Vec /* 8017B6E0 00178620 38 61 04 70 */ addi r3, r1, 0x470 /* 8017B6E4 00178624 38 81 03 74 */ addi r4, r1, 0x374 /* 8017B6E8 00178628 4B F1 C1 0D */ bl cXyz_X1_ @@ -631,16 +631,16 @@ lbl_8017B694: /* 8017B71C 0017865C 38 61 01 2C */ addi r3, r1, 0x12c /* 8017B720 00178660 3B 5F 00 62 */ addi r26, r31, 0x62 /* 8017B724 00178664 7F 44 D3 78 */ mr r4, r26 -/* 8017B728 00178668 48 0F 5A 21 */ bl cSAngle_NS___mi +/* 8017B728 00178668 48 0F 5A 21 */ bl __mi__7cSAngleCFv /* 8017B72C 0017866C 38 61 01 68 */ addi r3, r1, 0x168 /* 8017B730 00178670 38 81 01 2C */ addi r4, r1, 0x12c -/* 8017B734 00178674 48 0F 58 35 */ bl cSAngle_X1_ +/* 8017B734 00178674 48 0F 58 35 */ bl __ct__7cSAngleFRC7cSAngle /* 8017B738 00178678 38 61 01 2C */ addi r3, r1, 0x12c /* 8017B73C 0017867C 38 80 FF FF */ li r4, -1 /* 8017B740 00178680 4B EB 4D D1 */ bl cSAngle_NS_dtor /* 8017B744 00178684 38 61 01 28 */ addi r3, r1, 0x128 /* 8017B748 00178688 38 81 01 68 */ addi r4, r1, 0x168 -/* 8017B74C 0017868C 48 0F 58 1D */ bl cSAngle_X1_ +/* 8017B74C 0017868C 48 0F 58 1D */ bl __ct__7cSAngleFRC7cSAngle /* 8017B750 00178690 38 61 03 68 */ addi r3, r1, 0x368 /* 8017B754 00178694 38 81 04 70 */ addi r4, r1, 0x470 /* 8017B758 00178698 38 A1 01 28 */ addi r5, r1, 0x128 @@ -726,7 +726,7 @@ lbl_8017B838: /* 8017B888 001787C8 38 61 01 20 */ addi r3, r1, 0x120 /* 8017B88C 001787CC 7F 44 D3 78 */ mr r4, r26 /* 8017B890 001787D0 38 A1 01 24 */ addi r5, r1, 0x124 -/* 8017B894 001787D4 48 0F 59 11 */ bl cSAngle_NS___mi_X1_ +/* 8017B894 001787D4 48 0F 59 11 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017B898 001787D8 38 61 01 68 */ addi r3, r1, 0x168 /* 8017B89C 001787DC 38 81 01 20 */ addi r4, r1, 0x120 /* 8017B8A0 001787E0 48 00 74 09 */ bl cSAngle_NS___as @@ -837,7 +837,7 @@ lbl_8017BA10: /* 8017BA30 00178970 38 61 03 2C */ addi r3, r1, 0x32c /* 8017BA34 00178974 38 81 03 44 */ addi r4, r1, 0x344 /* 8017BA38 00178978 38 A1 03 38 */ addi r5, r1, 0x338 -/* 8017BA3C 0017897C 48 0E B0 F9 */ bl cXyz_NS___mi +/* 8017BA3C 0017897C 48 0E B0 F9 */ bl __mi__4cXyzCFRC3Vec /* 8017BA40 00178980 38 61 04 40 */ addi r3, r1, 0x440 /* 8017BA44 00178984 38 81 03 2C */ addi r4, r1, 0x32c /* 8017BA48 00178988 4B F1 BD AD */ bl cXyz_X1_ @@ -852,16 +852,16 @@ lbl_8017BA10: /* 8017BA6C 001789AC 4B E8 D7 19 */ bl cXyz_NS_dtor /* 8017BA70 001789B0 38 61 01 1C */ addi r3, r1, 0x11c /* 8017BA74 001789B4 38 9F 00 62 */ addi r4, r31, 0x62 -/* 8017BA78 001789B8 48 0F 56 D1 */ bl cSAngle_NS___mi +/* 8017BA78 001789B8 48 0F 56 D1 */ bl __mi__7cSAngleCFv /* 8017BA7C 001789BC 38 61 01 64 */ addi r3, r1, 0x164 /* 8017BA80 001789C0 38 81 01 1C */ addi r4, r1, 0x11c -/* 8017BA84 001789C4 48 0F 54 E5 */ bl cSAngle_X1_ +/* 8017BA84 001789C4 48 0F 54 E5 */ bl __ct__7cSAngleFRC7cSAngle /* 8017BA88 001789C8 38 61 01 1C */ addi r3, r1, 0x11c /* 8017BA8C 001789CC 38 80 FF FF */ li r4, -1 /* 8017BA90 001789D0 4B EB 4A 81 */ bl cSAngle_NS_dtor /* 8017BA94 001789D4 38 61 01 18 */ addi r3, r1, 0x118 /* 8017BA98 001789D8 38 81 01 64 */ addi r4, r1, 0x164 -/* 8017BA9C 001789DC 48 0F 54 CD */ bl cSAngle_X1_ +/* 8017BA9C 001789DC 48 0F 54 CD */ bl __ct__7cSAngleFRC7cSAngle /* 8017BAA0 001789E0 38 61 03 20 */ addi r3, r1, 0x320 /* 8017BAA4 001789E4 38 81 04 40 */ addi r4, r1, 0x440 /* 8017BAA8 001789E8 38 A1 01 18 */ addi r5, r1, 0x118 @@ -927,7 +927,7 @@ lbl_8017BB68: /* 8017BB90 00178AD0 38 61 02 FC */ addi r3, r1, 0x2fc /* 8017BB94 00178AD4 38 81 03 14 */ addi r4, r1, 0x314 /* 8017BB98 00178AD8 38 A1 03 08 */ addi r5, r1, 0x308 -/* 8017BB9C 00178ADC 48 0E AF 99 */ bl cXyz_NS___mi +/* 8017BB9C 00178ADC 48 0E AF 99 */ bl __mi__4cXyzCFRC3Vec /* 8017BBA0 00178AE0 38 61 04 28 */ addi r3, r1, 0x428 /* 8017BBA4 00178AE4 38 81 02 FC */ addi r4, r1, 0x2fc /* 8017BBA8 00178AE8 4B F1 BC 4D */ bl cXyz_X1_ @@ -942,16 +942,16 @@ lbl_8017BB68: /* 8017BBCC 00178B0C 4B E8 D5 B9 */ bl cXyz_NS_dtor /* 8017BBD0 00178B10 38 61 01 14 */ addi r3, r1, 0x114 /* 8017BBD4 00178B14 38 9F 00 62 */ addi r4, r31, 0x62 -/* 8017BBD8 00178B18 48 0F 55 71 */ bl cSAngle_NS___mi +/* 8017BBD8 00178B18 48 0F 55 71 */ bl __mi__7cSAngleCFv /* 8017BBDC 00178B1C 38 61 01 60 */ addi r3, r1, 0x160 /* 8017BBE0 00178B20 38 81 01 14 */ addi r4, r1, 0x114 -/* 8017BBE4 00178B24 48 0F 53 85 */ bl cSAngle_X1_ +/* 8017BBE4 00178B24 48 0F 53 85 */ bl __ct__7cSAngleFRC7cSAngle /* 8017BBE8 00178B28 38 61 01 14 */ addi r3, r1, 0x114 /* 8017BBEC 00178B2C 38 80 FF FF */ li r4, -1 /* 8017BBF0 00178B30 4B EB 49 21 */ bl cSAngle_NS_dtor /* 8017BBF4 00178B34 38 61 01 10 */ addi r3, r1, 0x110 /* 8017BBF8 00178B38 38 81 01 60 */ addi r4, r1, 0x160 -/* 8017BBFC 00178B3C 48 0F 53 6D */ bl cSAngle_X1_ +/* 8017BBFC 00178B3C 48 0F 53 6D */ bl __ct__7cSAngleFRC7cSAngle /* 8017BC00 00178B40 38 61 02 F0 */ addi r3, r1, 0x2f0 /* 8017BC04 00178B44 38 81 04 28 */ addi r4, r1, 0x428 /* 8017BC08 00178B48 38 A1 01 10 */ addi r5, r1, 0x110 @@ -1120,7 +1120,7 @@ lbl_8017BE58: /* 8017BE60 00178DA0 D0 01 05 14 */ stfs f0, 0x514(r1) /* 8017BE64 00178DA4 38 61 01 0C */ addi r3, r1, 0x10c /* 8017BE68 00178DA8 C0 22 9C E4 */ lfs f1, lbl_804536E4-_SDA2_BASE_(r2) -/* 8017BE6C 00178DAC 48 0F 51 5D */ bl cSAngle_X3_ +/* 8017BE6C 00178DAC 48 0F 51 5D */ bl __ct__7cSAngleFf /* 8017BE70 00178DB0 A8 1F 00 60 */ lha r0, 0x60(r31) /* 8017BE74 00178DB4 A8 81 01 0C */ lha r4, 0x10c(r1) /* 8017BE78 00178DB8 7C 80 02 78 */ xor r0, r4, r0 @@ -1192,7 +1192,7 @@ lbl_8017BF14: /* 8017BF68 00178EA8 38 61 02 CC */ addi r3, r1, 0x2cc /* 8017BF6C 00178EAC 38 81 02 E4 */ addi r4, r1, 0x2e4 /* 8017BF70 00178EB0 38 A1 02 D8 */ addi r5, r1, 0x2d8 -/* 8017BF74 00178EB4 48 0E AB C1 */ bl cXyz_NS___mi +/* 8017BF74 00178EB4 48 0E AB C1 */ bl __mi__4cXyzCFRC3Vec /* 8017BF78 00178EB8 38 61 04 10 */ addi r3, r1, 0x410 /* 8017BF7C 00178EBC 38 81 02 CC */ addi r4, r1, 0x2cc /* 8017BF80 00178EC0 4B F1 B8 75 */ bl cXyz_X1_ @@ -1221,16 +1221,16 @@ lbl_8017BF14: /* 8017BFDC 00178F1C FE 60 D8 90 */ fmr f19, f27 /* 8017BFE0 00178F20 38 61 01 08 */ addi r3, r1, 0x108 /* 8017BFE4 00178F24 38 9F 00 62 */ addi r4, r31, 0x62 -/* 8017BFE8 00178F28 48 0F 51 61 */ bl cSAngle_NS___mi +/* 8017BFE8 00178F28 48 0F 51 61 */ bl __mi__7cSAngleCFv /* 8017BFEC 00178F2C 38 61 01 5C */ addi r3, r1, 0x15c /* 8017BFF0 00178F30 38 81 01 08 */ addi r4, r1, 0x108 -/* 8017BFF4 00178F34 48 0F 4F 75 */ bl cSAngle_X1_ +/* 8017BFF4 00178F34 48 0F 4F 75 */ bl __ct__7cSAngleFRC7cSAngle /* 8017BFF8 00178F38 38 61 01 08 */ addi r3, r1, 0x108 /* 8017BFFC 00178F3C 38 80 FF FF */ li r4, -1 /* 8017C000 00178F40 4B EB 45 11 */ bl cSAngle_NS_dtor /* 8017C004 00178F44 38 61 01 04 */ addi r3, r1, 0x104 /* 8017C008 00178F48 38 81 01 5C */ addi r4, r1, 0x15c -/* 8017C00C 00178F4C 48 0F 4F 5D */ bl cSAngle_X1_ +/* 8017C00C 00178F4C 48 0F 4F 5D */ bl __ct__7cSAngleFRC7cSAngle /* 8017C010 00178F50 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 8017C014 00178F54 38 81 04 10 */ addi r4, r1, 0x410 /* 8017C018 00178F58 38 A1 01 04 */ addi r5, r1, 0x104 @@ -1252,12 +1252,12 @@ lbl_8017BF14: /* 8017C058 00178F98 48 00 18 DD */ bl _unnamed_d_camera_cpp__NS_sAngleY /* 8017C05C 00178F9C 38 61 01 58 */ addi r3, r1, 0x158 /* 8017C060 00178FA0 38 81 01 00 */ addi r4, r1, 0x100 -/* 8017C064 00178FA4 48 0F 4F 05 */ bl cSAngle_X1_ +/* 8017C064 00178FA4 48 0F 4F 05 */ bl __ct__7cSAngleFRC7cSAngle /* 8017C068 00178FA8 38 61 01 00 */ addi r3, r1, 0x100 /* 8017C06C 00178FAC 38 80 FF FF */ li r4, -1 /* 8017C070 00178FB0 4B EB 44 A1 */ bl cSAngle_NS_dtor /* 8017C074 00178FB4 38 61 01 58 */ addi r3, r1, 0x158 -/* 8017C078 00178FB8 48 0F 50 A9 */ bl cSAngle_NS_Cos +/* 8017C078 00178FB8 48 0F 50 A9 */ bl Cos__7cSAngleCFv /* 8017C07C 00178FBC C0 02 9C B4 */ lfs f0, lbl_804536B4-_SDA2_BASE_(r2) /* 8017C080 00178FC0 EC 00 00 72 */ fmuls f0, f0, f1 /* 8017C084 00178FC4 EF 39 00 2A */ fadds f25, f25, f0 @@ -1459,7 +1459,7 @@ lbl_8017C348: /* 8017C368 001792A8 EC 13 04 32 */ fmuls f0, f19, f16 /* 8017C36C 001792AC EE 74 00 2A */ fadds f19, f20, f0 /* 8017C370 001792B0 38 61 01 80 */ addi r3, r1, 0x180 -/* 8017C374 001792B4 4B FF 20 AD */ bl cSGlobe +/* 8017C374 001792B4 4B FF 20 AD */ bl __ct__7cSGlobeFv /* 8017C378 001792B8 EC 1B 04 32 */ fmuls f0, f27, f16 /* 8017C37C 001792BC EC 1C 00 2A */ fadds f0, f28, f0 /* 8017C380 001792C0 D0 1F 04 54 */ stfs f0, 0x454(r31) @@ -1484,7 +1484,7 @@ lbl_8017C348: /* 8017C3CC 0017930C C0 7F 04 58 */ lfs f3, 0x458(r31) /* 8017C3D0 00179310 4B FC 55 8D */ bl cXyz_X2_ /* 8017C3D4 00179314 38 7F 04 30 */ addi r3, r31, 0x430 -/* 8017C3D8 00179318 48 0F 4D 11 */ bl cSAngle_NS_Inv +/* 8017C3D8 00179318 48 0F 4D 11 */ bl Inv__7cSAngleCFv /* 8017C3DC 0017931C 7C 7A 1B 78 */ mr r26, r3 /* 8017C3E0 00179320 FC 20 B8 90 */ fmr f1, f23 /* 8017C3E4 00179324 48 00 69 45 */ bl cAngle_NS_d2s @@ -1492,7 +1492,7 @@ lbl_8017C348: /* 8017C3EC 0017932C 38 61 01 80 */ addi r3, r1, 0x180 /* 8017C3F0 00179330 FC 20 B0 90 */ fmr f1, f22 /* 8017C3F4 00179334 7F 45 D3 78 */ mr r5, r26 -/* 8017C3F8 00179338 48 0F 55 AD */ bl cSGlobe_NS_Val_X1_ +/* 8017C3F8 00179338 48 0F 55 AD */ bl Val__7cSGlobeFfss /* 8017C3FC 0017933C 7F A3 EB 78 */ mr r3, r29 /* 8017C400 00179340 81 9D 06 28 */ lwz r12, 0x628(r29) /* 8017C404 00179344 81 8C 02 54 */ lwz r12, 0x254(r12) @@ -1505,18 +1505,18 @@ lbl_8017C348: /* 8017C420 00179360 41 82 00 6C */ beq lbl_8017C48C /* 8017C424 00179364 38 61 00 FC */ addi r3, r1, 0xfc /* 8017C428 00179368 38 81 01 70 */ addi r4, r1, 0x170 -/* 8017C42C 0017936C 48 0F 4B 3D */ bl cSAngle_X1_ +/* 8017C42C 0017936C 48 0F 4B 3D */ bl __ct__7cSAngleFRC7cSAngle /* 8017C430 00179370 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8017C434 00179374 7F E4 FB 78 */ mr r4, r31 /* 8017C438 00179378 80 BF 04 84 */ lwz r5, 0x484(r31) /* 8017C43C 0017937C 4B F1 B2 FD */ bl dCamera_c_NS_directionOf /* 8017C440 00179380 38 61 00 F8 */ addi r3, r1, 0xf8 -/* 8017C444 00179384 48 0F 4C A5 */ bl cSAngle_NS_Inv +/* 8017C444 00179384 48 0F 4C A5 */ bl Inv__7cSAngleCFv /* 8017C448 00179388 7C 60 1B 78 */ mr r0, r3 /* 8017C44C 0017938C 38 61 00 F4 */ addi r3, r1, 0xf4 /* 8017C450 00179390 38 81 00 FC */ addi r4, r1, 0xfc /* 8017C454 00179394 7C 05 07 34 */ extsh r5, r0 -/* 8017C458 00179398 48 0F 4D A5 */ bl cSAngle_NS___pl_X1_ +/* 8017C458 00179398 48 0F 4D A5 */ bl __pl__7cSAngleCFs /* 8017C45C 0017939C 38 61 01 80 */ addi r3, r1, 0x180 /* 8017C460 001793A0 38 81 00 F4 */ addi r4, r1, 0xf4 /* 8017C464 001793A4 4B F1 24 31 */ bl cSGlobe_NS_U @@ -1612,11 +1612,11 @@ lbl_8017C58C: /* 8017C5BC 001794FC 38 61 02 9C */ addi r3, r1, 0x29c /* 8017C5C0 00179500 38 81 03 E0 */ addi r4, r1, 0x3e0 /* 8017C5C4 00179504 38 BF 04 24 */ addi r5, r31, 0x424 -/* 8017C5C8 00179508 48 0E A5 6D */ bl cXyz_NS___mi +/* 8017C5C8 00179508 48 0E A5 6D */ bl __mi__4cXyzCFRC3Vec /* 8017C5CC 0017950C 38 61 02 90 */ addi r3, r1, 0x290 /* 8017C5D0 00179510 38 81 02 9C */ addi r4, r1, 0x29c /* 8017C5D4 00179514 C0 3F 04 48 */ lfs f1, 0x448(r31) -/* 8017C5D8 00179518 48 0E A5 AD */ bl cXyz_NS___ml +/* 8017C5D8 00179518 48 0E A5 AD */ bl __ml__4cXyzCFf /* 8017C5DC 0017951C 38 7F 04 24 */ addi r3, r31, 0x424 /* 8017C5E0 00179520 38 81 02 90 */ addi r4, r1, 0x290 /* 8017C5E4 00179524 4B F1 23 21 */ bl cXyz_NS___apl @@ -1662,11 +1662,11 @@ lbl_8017C64C: /* 8017C67C 001795BC 38 61 02 84 */ addi r3, r1, 0x284 /* 8017C680 001795C0 38 9F 04 24 */ addi r4, r31, 0x424 /* 8017C684 001795C4 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8017C688 001795C8 48 0E A4 AD */ bl cXyz_NS___mi +/* 8017C688 001795C8 48 0E A4 AD */ bl __mi__4cXyzCFRC3Vec /* 8017C68C 001795CC 38 61 02 78 */ addi r3, r1, 0x278 /* 8017C690 001795D0 38 81 02 84 */ addi r4, r1, 0x284 /* 8017C694 001795D4 FC 20 78 90 */ fmr f1, f15 -/* 8017C698 001795D8 48 0E A4 ED */ bl cXyz_NS___ml +/* 8017C698 001795D8 48 0E A4 ED */ bl __ml__4cXyzCFf /* 8017C69C 001795DC 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017C6A0 001795E0 38 81 02 78 */ addi r4, r1, 0x278 /* 8017C6A4 001795E4 4B F1 22 61 */ bl cXyz_NS___apl @@ -1682,10 +1682,10 @@ lbl_8017C64C: /* 8017C6CC 0017960C 38 61 02 6C */ addi r3, r1, 0x26c /* 8017C6D0 00179610 38 9F 00 70 */ addi r4, r31, 0x70 /* 8017C6D4 00179614 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8017C6D8 00179618 48 0E A4 5D */ bl cXyz_NS___mi +/* 8017C6D8 00179618 48 0E A4 5D */ bl __mi__4cXyzCFRC3Vec /* 8017C6DC 0017961C 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017C6E0 00179620 38 81 02 6C */ addi r4, r1, 0x26c -/* 8017C6E4 00179624 48 0F 53 8D */ bl cSGlobe_NS_Val_X3_ +/* 8017C6E4 00179624 48 0F 53 8D */ bl Val__7cSGlobeFRC4cXyz /* 8017C6E8 00179628 38 61 02 6C */ addi r3, r1, 0x26c /* 8017C6EC 0017962C 38 80 FF FF */ li r4, -1 /* 8017C6F0 00179630 4B E8 CA 95 */ bl cXyz_NS_dtor @@ -1709,11 +1709,11 @@ lbl_8017C700: /* 8017C730 00179670 4B F1 21 65 */ bl cSGlobe_NS_U /* 8017C734 00179674 38 61 02 60 */ addi r3, r1, 0x260 /* 8017C738 00179678 38 9F 00 5C */ addi r4, r31, 0x5c -/* 8017C73C 0017967C 48 0F 53 79 */ bl cSGlobe_NS_Xyz +/* 8017C73C 0017967C 48 0F 53 79 */ bl Xyz__7cSGlobeCFv /* 8017C740 00179680 38 61 02 54 */ addi r3, r1, 0x254 /* 8017C744 00179684 38 9F 00 64 */ addi r4, r31, 0x64 /* 8017C748 00179688 38 A1 02 60 */ addi r5, r1, 0x260 -/* 8017C74C 0017968C 48 0E A3 99 */ bl cXyz_NS___pl +/* 8017C74C 0017968C 48 0E A3 99 */ bl __pl__4cXyzCFRC3Vec /* 8017C750 00179690 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017C754 00179694 38 81 02 54 */ addi r4, r1, 0x254 /* 8017C758 00179698 4B F1 B0 81 */ bl cXyz_NS___as @@ -1740,11 +1740,11 @@ lbl_8017C778: /* 8017C7A8 001796E8 38 61 02 48 */ addi r3, r1, 0x248 /* 8017C7AC 001796EC 38 9F 04 24 */ addi r4, r31, 0x424 /* 8017C7B0 001796F0 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8017C7B4 001796F4 48 0E A3 81 */ bl cXyz_NS___mi +/* 8017C7B4 001796F4 48 0E A3 81 */ bl __mi__4cXyzCFRC3Vec /* 8017C7B8 001796F8 38 61 02 3C */ addi r3, r1, 0x23c /* 8017C7BC 001796FC 38 81 02 48 */ addi r4, r1, 0x248 /* 8017C7C0 00179700 38 A1 03 D4 */ addi r5, r1, 0x3d4 -/* 8017C7C4 00179704 48 0E A4 0D */ bl cXyz_NS___ml_X1_ +/* 8017C7C4 00179704 48 0E A4 0D */ bl __ml__4cXyzCFRC3Vec /* 8017C7C8 00179708 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017C7CC 0017970C 38 81 02 3C */ addi r4, r1, 0x23c /* 8017C7D0 00179710 4B F1 21 35 */ bl cXyz_NS___apl @@ -1764,15 +1764,15 @@ lbl_8017C778: /* 8017C808 00179748 38 81 01 84 */ addi r4, r1, 0x184 /* 8017C80C 0017974C 3B 5F 00 60 */ addi r26, r31, 0x60 /* 8017C810 00179750 7F 45 D3 78 */ mr r5, r26 -/* 8017C814 00179754 48 0F 49 91 */ bl cSAngle_NS___mi_X1_ +/* 8017C814 00179754 48 0F 49 91 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017C818 00179758 38 61 00 EC */ addi r3, r1, 0xec /* 8017C81C 0017975C 38 81 00 F0 */ addi r4, r1, 0xf0 /* 8017C820 00179760 FC 20 78 90 */ fmr f1, f15 -/* 8017C824 00179764 48 0F 4A 41 */ bl cSAngle_NS___ml +/* 8017C824 00179764 48 0F 4A 41 */ bl __ml__7cSAngleCFf /* 8017C828 00179768 38 61 00 E8 */ addi r3, r1, 0xe8 /* 8017C82C 0017976C 7F 44 D3 78 */ mr r4, r26 /* 8017C830 00179770 38 A1 00 EC */ addi r5, r1, 0xec -/* 8017C834 00179774 48 0F 49 41 */ bl cSAngle_NS___pl +/* 8017C834 00179774 48 0F 49 41 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017C838 00179778 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017C83C 0017977C 38 81 00 E8 */ addi r4, r1, 0xe8 /* 8017C840 00179780 4B F1 32 19 */ bl cSGlobe_NS_V @@ -1789,15 +1789,15 @@ lbl_8017C778: /* 8017C86C 001797AC 38 81 01 86 */ addi r4, r1, 0x186 /* 8017C870 001797B0 3B 5F 00 62 */ addi r26, r31, 0x62 /* 8017C874 001797B4 7F 45 D3 78 */ mr r5, r26 -/* 8017C878 001797B8 48 0F 49 2D */ bl cSAngle_NS___mi_X1_ +/* 8017C878 001797B8 48 0F 49 2D */ bl __mi__7cSAngleCFRC7cSAngle /* 8017C87C 001797BC 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8017C880 001797C0 38 81 00 E4 */ addi r4, r1, 0xe4 /* 8017C884 001797C4 FC 20 78 90 */ fmr f1, f15 -/* 8017C888 001797C8 48 0F 49 DD */ bl cSAngle_NS___ml +/* 8017C888 001797C8 48 0F 49 DD */ bl __ml__7cSAngleCFf /* 8017C88C 001797CC 38 61 00 DC */ addi r3, r1, 0xdc /* 8017C890 001797D0 7F 44 D3 78 */ mr r4, r26 /* 8017C894 001797D4 38 A1 00 E0 */ addi r5, r1, 0xe0 -/* 8017C898 001797D8 48 0F 48 DD */ bl cSAngle_NS___pl +/* 8017C898 001797D8 48 0F 48 DD */ bl __pl__7cSAngleCFRC7cSAngle /* 8017C89C 001797DC 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017C8A0 001797E0 38 81 00 DC */ addi r4, r1, 0xdc /* 8017C8A4 001797E4 4B F1 1F F1 */ bl cSGlobe_NS_U @@ -1812,11 +1812,11 @@ lbl_8017C778: /* 8017C8C8 00179808 4B EB 3C 49 */ bl cSAngle_NS_dtor /* 8017C8CC 0017980C 38 61 02 30 */ addi r3, r1, 0x230 /* 8017C8D0 00179810 38 9F 00 5C */ addi r4, r31, 0x5c -/* 8017C8D4 00179814 48 0F 51 E1 */ bl cSGlobe_NS_Xyz +/* 8017C8D4 00179814 48 0F 51 E1 */ bl Xyz__7cSGlobeCFv /* 8017C8D8 00179818 38 61 02 24 */ addi r3, r1, 0x224 /* 8017C8DC 0017981C 38 9F 00 64 */ addi r4, r31, 0x64 /* 8017C8E0 00179820 38 A1 02 30 */ addi r5, r1, 0x230 -/* 8017C8E4 00179824 48 0E A2 01 */ bl cXyz_NS___pl +/* 8017C8E4 00179824 48 0E A2 01 */ bl __pl__4cXyzCFRC3Vec /* 8017C8E8 00179828 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017C8EC 0017982C 38 81 02 24 */ addi r4, r1, 0x224 /* 8017C8F0 00179830 4B F1 AE E9 */ bl cXyz_NS___as @@ -1846,11 +1846,11 @@ lbl_8017C910: /* 8017C94C 0017988C 38 61 02 18 */ addi r3, r1, 0x218 /* 8017C950 00179890 38 9F 04 24 */ addi r4, r31, 0x424 /* 8017C954 00179894 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8017C958 00179898 48 0E A1 DD */ bl cXyz_NS___mi +/* 8017C958 00179898 48 0E A1 DD */ bl __mi__4cXyzCFRC3Vec /* 8017C95C 0017989C 38 61 02 0C */ addi r3, r1, 0x20c /* 8017C960 001798A0 38 81 02 18 */ addi r4, r1, 0x218 /* 8017C964 001798A4 FC 20 78 90 */ fmr f1, f15 -/* 8017C968 001798A8 48 0E A2 1D */ bl cXyz_NS___ml +/* 8017C968 001798A8 48 0E A2 1D */ bl __ml__4cXyzCFf /* 8017C96C 001798AC 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017C970 001798B0 38 81 02 0C */ addi r4, r1, 0x20c /* 8017C974 001798B4 4B F1 1F 91 */ bl cXyz_NS___apl @@ -1878,7 +1878,7 @@ lbl_8017C910: /* 8017C9CC 0017990C 38 61 01 50 */ addi r3, r1, 0x150 /* 8017C9D0 00179910 80 9F 04 84 */ lwz r4, 0x484(r31) /* 8017C9D4 00179914 A8 84 04 E4 */ lha r4, 0x4e4(r4) -/* 8017C9D8 00179918 48 0F 48 7D */ bl cSAngle_NS___apl_X1_ +/* 8017C9D8 00179918 48 0F 48 7D */ bl __apl__7cSAngleFs lbl_8017C9DC: /* 8017C9DC 0017991C C0 3F 00 5C */ lfs f1, 0x5c(r31) /* 8017C9E0 00179920 C0 01 01 80 */ lfs f0, 0x180(r1) @@ -1890,15 +1890,15 @@ lbl_8017C9DC: /* 8017C9F8 00179938 38 81 01 50 */ addi r4, r1, 0x150 /* 8017C9FC 0017993C 3B 5F 00 60 */ addi r26, r31, 0x60 /* 8017CA00 00179940 7F 45 D3 78 */ mr r5, r26 -/* 8017CA04 00179944 48 0F 47 A1 */ bl cSAngle_NS___mi_X1_ +/* 8017CA04 00179944 48 0F 47 A1 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017CA08 00179948 38 61 00 D4 */ addi r3, r1, 0xd4 /* 8017CA0C 0017994C 38 81 00 D8 */ addi r4, r1, 0xd8 /* 8017CA10 00179950 FC 20 78 90 */ fmr f1, f15 -/* 8017CA14 00179954 48 0F 48 51 */ bl cSAngle_NS___ml +/* 8017CA14 00179954 48 0F 48 51 */ bl __ml__7cSAngleCFf /* 8017CA18 00179958 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8017CA1C 0017995C 7F 44 D3 78 */ mr r4, r26 /* 8017CA20 00179960 38 A1 00 D4 */ addi r5, r1, 0xd4 -/* 8017CA24 00179964 48 0F 47 51 */ bl cSAngle_NS___pl +/* 8017CA24 00179964 48 0F 47 51 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017CA28 00179968 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017CA2C 0017996C 38 81 00 D0 */ addi r4, r1, 0xd0 /* 8017CA30 00179970 4B F1 30 29 */ bl cSGlobe_NS_V @@ -1915,15 +1915,15 @@ lbl_8017C9DC: /* 8017CA5C 0017999C 38 81 01 86 */ addi r4, r1, 0x186 /* 8017CA60 001799A0 3B 5F 00 62 */ addi r26, r31, 0x62 /* 8017CA64 001799A4 7F 45 D3 78 */ mr r5, r26 -/* 8017CA68 001799A8 48 0F 47 3D */ bl cSAngle_NS___mi_X1_ +/* 8017CA68 001799A8 48 0F 47 3D */ bl __mi__7cSAngleCFRC7cSAngle /* 8017CA6C 001799AC 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8017CA70 001799B0 38 81 00 CC */ addi r4, r1, 0xcc /* 8017CA74 001799B4 FC 20 78 90 */ fmr f1, f15 -/* 8017CA78 001799B8 48 0F 47 ED */ bl cSAngle_NS___ml +/* 8017CA78 001799B8 48 0F 47 ED */ bl __ml__7cSAngleCFf /* 8017CA7C 001799BC 38 61 00 C4 */ addi r3, r1, 0xc4 /* 8017CA80 001799C0 7F 44 D3 78 */ mr r4, r26 /* 8017CA84 001799C4 38 A1 00 C8 */ addi r5, r1, 0xc8 -/* 8017CA88 001799C8 48 0F 46 ED */ bl cSAngle_NS___pl +/* 8017CA88 001799C8 48 0F 46 ED */ bl __pl__7cSAngleCFRC7cSAngle /* 8017CA8C 001799CC 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017CA90 001799D0 38 81 00 C4 */ addi r4, r1, 0xc4 /* 8017CA94 001799D4 4B F1 1E 01 */ bl cSGlobe_NS_U @@ -1938,11 +1938,11 @@ lbl_8017C9DC: /* 8017CAB8 001799F8 4B EB 3A 59 */ bl cSAngle_NS_dtor /* 8017CABC 001799FC 38 61 02 00 */ addi r3, r1, 0x200 /* 8017CAC0 00179A00 38 9F 00 5C */ addi r4, r31, 0x5c -/* 8017CAC4 00179A04 48 0F 4F F1 */ bl cSGlobe_NS_Xyz +/* 8017CAC4 00179A04 48 0F 4F F1 */ bl Xyz__7cSGlobeCFv /* 8017CAC8 00179A08 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 8017CACC 00179A0C 38 9F 00 64 */ addi r4, r31, 0x64 /* 8017CAD0 00179A10 38 A1 02 00 */ addi r5, r1, 0x200 -/* 8017CAD4 00179A14 48 0E A0 11 */ bl cXyz_NS___pl +/* 8017CAD4 00179A14 48 0E A0 11 */ bl __pl__4cXyzCFRC3Vec /* 8017CAD8 00179A18 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017CADC 00179A1C 38 81 01 F4 */ addi r4, r1, 0x1f4 /* 8017CAE0 00179A20 4B F1 AC F9 */ bl cXyz_NS___as @@ -1975,11 +1975,11 @@ lbl_8017CB14: /* 8017CB44 00179A84 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 8017CB48 00179A88 38 9F 04 24 */ addi r4, r31, 0x424 /* 8017CB4C 00179A8C 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8017CB50 00179A90 48 0E 9F E5 */ bl cXyz_NS___mi +/* 8017CB50 00179A90 48 0E 9F E5 */ bl __mi__4cXyzCFRC3Vec /* 8017CB54 00179A94 38 61 01 DC */ addi r3, r1, 0x1dc /* 8017CB58 00179A98 38 81 01 E8 */ addi r4, r1, 0x1e8 /* 8017CB5C 00179A9C FC 20 78 90 */ fmr f1, f15 -/* 8017CB60 00179AA0 48 0E A0 25 */ bl cXyz_NS___ml +/* 8017CB60 00179AA0 48 0E A0 25 */ bl __ml__4cXyzCFf /* 8017CB64 00179AA4 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017CB68 00179AA8 38 81 01 DC */ addi r4, r1, 0x1dc /* 8017CB6C 00179AAC 4B F1 1D 99 */ bl cXyz_NS___apl @@ -2007,7 +2007,7 @@ lbl_8017CB14: /* 8017CBC4 00179B04 38 61 01 50 */ addi r3, r1, 0x150 /* 8017CBC8 00179B08 80 9F 04 84 */ lwz r4, 0x484(r31) /* 8017CBCC 00179B0C A8 84 04 E4 */ lha r4, 0x4e4(r4) -/* 8017CBD0 00179B10 48 0F 46 85 */ bl cSAngle_NS___apl_X1_ +/* 8017CBD0 00179B10 48 0F 46 85 */ bl __apl__7cSAngleFs lbl_8017CBD4: /* 8017CBD4 00179B14 C0 3F 00 5C */ lfs f1, 0x5c(r31) /* 8017CBD8 00179B18 C0 01 01 80 */ lfs f0, 0x180(r1) @@ -2019,15 +2019,15 @@ lbl_8017CBD4: /* 8017CBF0 00179B30 38 81 01 50 */ addi r4, r1, 0x150 /* 8017CBF4 00179B34 3B 5F 00 60 */ addi r26, r31, 0x60 /* 8017CBF8 00179B38 7F 45 D3 78 */ mr r5, r26 -/* 8017CBFC 00179B3C 48 0F 45 A9 */ bl cSAngle_NS___mi_X1_ +/* 8017CBFC 00179B3C 48 0F 45 A9 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017CC00 00179B40 38 61 00 BC */ addi r3, r1, 0xbc /* 8017CC04 00179B44 38 81 00 C0 */ addi r4, r1, 0xc0 /* 8017CC08 00179B48 FC 20 78 90 */ fmr f1, f15 -/* 8017CC0C 00179B4C 48 0F 46 59 */ bl cSAngle_NS___ml +/* 8017CC0C 00179B4C 48 0F 46 59 */ bl __ml__7cSAngleCFf /* 8017CC10 00179B50 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8017CC14 00179B54 7F 44 D3 78 */ mr r4, r26 /* 8017CC18 00179B58 38 A1 00 BC */ addi r5, r1, 0xbc -/* 8017CC1C 00179B5C 48 0F 45 59 */ bl cSAngle_NS___pl +/* 8017CC1C 00179B5C 48 0F 45 59 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017CC20 00179B60 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017CC24 00179B64 38 81 00 B8 */ addi r4, r1, 0xb8 /* 8017CC28 00179B68 4B F1 2E 31 */ bl cSGlobe_NS_V @@ -2044,15 +2044,15 @@ lbl_8017CBD4: /* 8017CC54 00179B94 38 81 01 86 */ addi r4, r1, 0x186 /* 8017CC58 00179B98 3B 5F 00 62 */ addi r26, r31, 0x62 /* 8017CC5C 00179B9C 7F 45 D3 78 */ mr r5, r26 -/* 8017CC60 00179BA0 48 0F 45 45 */ bl cSAngle_NS___mi_X1_ +/* 8017CC60 00179BA0 48 0F 45 45 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017CC64 00179BA4 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8017CC68 00179BA8 38 81 00 B4 */ addi r4, r1, 0xb4 /* 8017CC6C 00179BAC FC 20 78 90 */ fmr f1, f15 -/* 8017CC70 00179BB0 48 0F 45 F5 */ bl cSAngle_NS___ml +/* 8017CC70 00179BB0 48 0F 45 F5 */ bl __ml__7cSAngleCFf /* 8017CC74 00179BB4 38 61 00 AC */ addi r3, r1, 0xac /* 8017CC78 00179BB8 7F 44 D3 78 */ mr r4, r26 /* 8017CC7C 00179BBC 38 A1 00 B0 */ addi r5, r1, 0xb0 -/* 8017CC80 00179BC0 48 0F 44 F5 */ bl cSAngle_NS___pl +/* 8017CC80 00179BC0 48 0F 44 F5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017CC84 00179BC4 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017CC88 00179BC8 38 81 00 AC */ addi r4, r1, 0xac /* 8017CC8C 00179BCC 4B F1 1C 09 */ bl cSGlobe_NS_U @@ -2067,11 +2067,11 @@ lbl_8017CBD4: /* 8017CCB0 00179BF0 4B EB 38 61 */ bl cSAngle_NS_dtor /* 8017CCB4 00179BF4 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 8017CCB8 00179BF8 38 9F 00 5C */ addi r4, r31, 0x5c -/* 8017CCBC 00179BFC 48 0F 4D F9 */ bl cSGlobe_NS_Xyz +/* 8017CCBC 00179BFC 48 0F 4D F9 */ bl Xyz__7cSGlobeCFv /* 8017CCC0 00179C00 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 8017CCC4 00179C04 38 9F 00 64 */ addi r4, r31, 0x64 /* 8017CCC8 00179C08 38 A1 01 D0 */ addi r5, r1, 0x1d0 -/* 8017CCCC 00179C0C 48 0E 9E 19 */ bl cXyz_NS___pl +/* 8017CCCC 00179C0C 48 0E 9E 19 */ bl __pl__4cXyzCFRC3Vec /* 8017CCD0 00179C10 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017CCD4 00179C14 38 81 01 C4 */ addi r4, r1, 0x1c4 /* 8017CCD8 00179C18 4B F1 AB 01 */ bl cXyz_NS___as @@ -2146,11 +2146,11 @@ lbl_8017CDDC: /* 8017CDDC 00179D1C 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 8017CDE0 00179D20 38 9F 04 24 */ addi r4, r31, 0x424 /* 8017CDE4 00179D24 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8017CDE8 00179D28 48 0E 9D 4D */ bl cXyz_NS___mi +/* 8017CDE8 00179D28 48 0E 9D 4D */ bl __mi__4cXyzCFRC3Vec /* 8017CDEC 00179D2C 38 61 01 AC */ addi r3, r1, 0x1ac /* 8017CDF0 00179D30 38 81 01 B8 */ addi r4, r1, 0x1b8 /* 8017CDF4 00179D34 38 A1 03 D4 */ addi r5, r1, 0x3d4 -/* 8017CDF8 00179D38 48 0E 9D D9 */ bl cXyz_NS___ml_X1_ +/* 8017CDF8 00179D38 48 0E 9D D9 */ bl __ml__4cXyzCFRC3Vec /* 8017CDFC 00179D3C 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017CE00 00179D40 38 81 01 AC */ addi r4, r1, 0x1ac /* 8017CE04 00179D44 4B F1 1B 01 */ bl cXyz_NS___apl @@ -2214,14 +2214,14 @@ lbl_8017CECC: /* 8017CEE0 00179E20 80 BF 04 84 */ lwz r5, 0x484(r31) /* 8017CEE4 00179E24 4B F1 A8 55 */ bl dCamera_c_NS_directionOf /* 8017CEE8 00179E28 38 61 00 A8 */ addi r3, r1, 0xa8 -/* 8017CEEC 00179E2C 48 0F 41 FD */ bl cSAngle_NS_Inv +/* 8017CEEC 00179E2C 48 0F 41 FD */ bl Inv__7cSAngleCFv /* 8017CEF0 00179E30 7C 64 1B 78 */ mr r4, r3 /* 8017CEF4 00179E34 38 61 00 A4 */ addi r3, r1, 0xa4 /* 8017CEF8 00179E38 38 BF 00 62 */ addi r5, r31, 0x62 -/* 8017CEFC 00179E3C 48 0F 44 25 */ bl cSAngle_NS___mi_short +/* 8017CEFC 00179E3C 48 0F 44 25 */ bl __mi__FsRC7cSAngle /* 8017CF00 00179E40 38 61 01 4C */ addi r3, r1, 0x14c /* 8017CF04 00179E44 38 81 00 A4 */ addi r4, r1, 0xa4 -/* 8017CF08 00179E48 48 0F 40 61 */ bl cSAngle_X1_ +/* 8017CF08 00179E48 48 0F 40 61 */ bl __ct__7cSAngleFRC7cSAngle /* 8017CF0C 00179E4C 38 61 00 A4 */ addi r3, r1, 0xa4 /* 8017CF10 00179E50 38 80 FF FF */ li r4, -1 /* 8017CF14 00179E54 4B EB 35 FD */ bl cSAngle_NS_dtor @@ -2229,7 +2229,7 @@ lbl_8017CECC: /* 8017CF1C 00179E5C 38 80 FF FF */ li r4, -1 /* 8017CF20 00179E60 4B EB 35 F1 */ bl cSAngle_NS_dtor /* 8017CF24 00179E64 38 61 01 4C */ addi r3, r1, 0x14c -/* 8017CF28 00179E68 48 0F 41 D1 */ bl cSAngle_NS_Sin +/* 8017CF28 00179E68 48 0F 41 D1 */ bl Sin__7cSAngleCFv /* 8017CF2C 00179E6C 48 00 5B 11 */ bl std_NS_fabsf /* 8017CF30 00179E70 C8 01 05 20 */ lfd f0, 0x520(r1) /* 8017CF34 00179E74 EE 00 00 72 */ fmuls f16, f0, f1 @@ -2252,14 +2252,14 @@ lbl_8017CF68: /* 8017CF70 00179EB0 80 BF 04 84 */ lwz r5, 0x484(r31) /* 8017CF74 00179EB4 4B F1 A7 C5 */ bl dCamera_c_NS_directionOf /* 8017CF78 00179EB8 38 61 00 A0 */ addi r3, r1, 0xa0 -/* 8017CF7C 00179EBC 48 0F 41 6D */ bl cSAngle_NS_Inv +/* 8017CF7C 00179EBC 48 0F 41 6D */ bl Inv__7cSAngleCFv /* 8017CF80 00179EC0 7C 64 1B 78 */ mr r4, r3 /* 8017CF84 00179EC4 38 61 00 9C */ addi r3, r1, 0x9c /* 8017CF88 00179EC8 38 BF 00 62 */ addi r5, r31, 0x62 -/* 8017CF8C 00179ECC 48 0F 43 95 */ bl cSAngle_NS___mi_short +/* 8017CF8C 00179ECC 48 0F 43 95 */ bl __mi__FsRC7cSAngle /* 8017CF90 00179ED0 38 61 01 48 */ addi r3, r1, 0x148 /* 8017CF94 00179ED4 38 81 00 9C */ addi r4, r1, 0x9c -/* 8017CF98 00179ED8 48 0F 3F D1 */ bl cSAngle_X1_ +/* 8017CF98 00179ED8 48 0F 3F D1 */ bl __ct__7cSAngleFRC7cSAngle /* 8017CF9C 00179EDC 38 61 00 9C */ addi r3, r1, 0x9c /* 8017CFA0 00179EE0 38 80 FF FF */ li r4, -1 /* 8017CFA4 00179EE4 4B EB 35 6D */ bl cSAngle_NS_dtor @@ -2267,7 +2267,7 @@ lbl_8017CF68: /* 8017CFAC 00179EEC 38 80 FF FF */ li r4, -1 /* 8017CFB0 00179EF0 4B EB 35 61 */ bl cSAngle_NS_dtor /* 8017CFB4 00179EF4 38 61 01 48 */ addi r3, r1, 0x148 -/* 8017CFB8 00179EF8 48 0F 41 41 */ bl cSAngle_NS_Sin +/* 8017CFB8 00179EF8 48 0F 41 41 */ bl Sin__7cSAngleCFv /* 8017CFBC 00179EFC 48 00 5A 81 */ bl std_NS_fabsf /* 8017CFC0 00179F00 EC 3D 00 72 */ fmuls f1, f29, f1 /* 8017CFC4 00179F04 C8 01 05 20 */ lfd f0, 0x520(r1) @@ -2306,15 +2306,15 @@ lbl_8017D030: /* 8017D03C 00179F7C C0 02 9D B8 */ lfs f0, lbl_804537B8-_SDA2_BASE_(r2) /* 8017D040 00179F80 EC 20 00 72 */ fmuls f1, f0, f1 /* 8017D044 00179F84 38 61 00 98 */ addi r3, r1, 0x98 -/* 8017D048 00179F88 48 0F 3F 81 */ bl cSAngle_X3_ +/* 8017D048 00179F88 48 0F 3F 81 */ bl __ct__7cSAngleFf /* 8017D04C 00179F8C 38 61 00 94 */ addi r3, r1, 0x94 /* 8017D050 00179F90 3B 7F 00 62 */ addi r27, r31, 0x62 /* 8017D054 00179F94 7F 64 DB 78 */ mr r4, r27 /* 8017D058 00179F98 38 A1 00 98 */ addi r5, r1, 0x98 -/* 8017D05C 00179F9C 48 0F 41 19 */ bl cSAngle_NS___pl +/* 8017D05C 00179F9C 48 0F 41 19 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017D060 00179FA0 38 61 01 3C */ addi r3, r1, 0x13c /* 8017D064 00179FA4 38 81 00 94 */ addi r4, r1, 0x94 -/* 8017D068 00179FA8 48 0F 3F 01 */ bl cSAngle_X1_ +/* 8017D068 00179FA8 48 0F 3F 01 */ bl __ct__7cSAngleFRC7cSAngle /* 8017D06C 00179FAC 38 61 00 94 */ addi r3, r1, 0x94 /* 8017D070 00179FB0 38 80 FF FF */ li r4, -1 /* 8017D074 00179FB4 4B EB 34 9D */ bl cSAngle_NS_dtor @@ -2328,18 +2328,18 @@ lbl_8017D030: /* 8017D094 00179FD4 38 61 00 90 */ addi r3, r1, 0x90 /* 8017D098 00179FD8 38 81 01 3C */ addi r4, r1, 0x13c /* 8017D09C 00179FDC 7F 65 DB 78 */ mr r5, r27 -/* 8017D0A0 00179FE0 48 0F 41 05 */ bl cSAngle_NS___mi_X1_ +/* 8017D0A0 00179FE0 48 0F 41 05 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017D0A4 00179FE4 38 61 00 8C */ addi r3, r1, 0x8c /* 8017D0A8 00179FE8 38 81 00 90 */ addi r4, r1, 0x90 /* 8017D0AC 00179FEC FC 20 70 90 */ fmr f1, f14 -/* 8017D0B0 00179FF0 48 0F 41 B5 */ bl cSAngle_NS___ml +/* 8017D0B0 00179FF0 48 0F 41 B5 */ bl __ml__7cSAngleCFf /* 8017D0B4 00179FF4 38 61 00 88 */ addi r3, r1, 0x88 /* 8017D0B8 00179FF8 7F 64 DB 78 */ mr r4, r27 /* 8017D0BC 00179FFC 38 A1 00 8C */ addi r5, r1, 0x8c -/* 8017D0C0 0017A000 48 0F 40 B5 */ bl cSAngle_NS___pl +/* 8017D0C0 0017A000 48 0F 40 B5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017D0C4 0017A004 38 61 01 44 */ addi r3, r1, 0x144 /* 8017D0C8 0017A008 38 81 00 88 */ addi r4, r1, 0x88 -/* 8017D0CC 0017A00C 48 0F 3F 2D */ bl cSAngle_NS_Val_X1_ +/* 8017D0CC 0017A00C 48 0F 3F 2D */ bl Val__7cSAngleFRC7cSAngle /* 8017D0D0 0017A010 38 61 00 88 */ addi r3, r1, 0x88 /* 8017D0D4 0017A014 38 80 FF FF */ li r4, -1 /* 8017D0D8 0017A018 4B EB 34 39 */ bl cSAngle_NS_dtor @@ -2370,15 +2370,15 @@ lbl_8017D118: /* 8017D138 0017A078 80 BF 04 84 */ lwz r5, 0x484(r31) /* 8017D13C 0017A07C 4B F1 A5 FD */ bl dCamera_c_NS_directionOf /* 8017D140 0017A080 38 61 00 84 */ addi r3, r1, 0x84 -/* 8017D144 0017A084 48 0F 3F A5 */ bl cSAngle_NS_Inv +/* 8017D144 0017A084 48 0F 3F A5 */ bl Inv__7cSAngleCFv /* 8017D148 0017A088 7C 60 1B 78 */ mr r0, r3 /* 8017D14C 0017A08C 38 61 00 80 */ addi r3, r1, 0x80 /* 8017D150 0017A090 38 81 01 6C */ addi r4, r1, 0x16c /* 8017D154 0017A094 7C 05 07 34 */ extsh r5, r0 -/* 8017D158 0017A098 48 0F 40 A5 */ bl cSAngle_NS___pl_X1_ +/* 8017D158 0017A098 48 0F 40 A5 */ bl __pl__7cSAngleCFs /* 8017D15C 0017A09C 38 61 01 38 */ addi r3, r1, 0x138 /* 8017D160 0017A0A0 38 81 00 80 */ addi r4, r1, 0x80 -/* 8017D164 0017A0A4 48 0F 3E 05 */ bl cSAngle_X1_ +/* 8017D164 0017A0A4 48 0F 3E 05 */ bl __ct__7cSAngleFRC7cSAngle /* 8017D168 0017A0A8 38 61 00 80 */ addi r3, r1, 0x80 /* 8017D16C 0017A0AC 38 80 FF FF */ li r4, -1 /* 8017D170 0017A0B0 4B EB 33 A1 */ bl cSAngle_NS_dtor @@ -2389,18 +2389,18 @@ lbl_8017D118: /* 8017D184 0017A0C4 38 81 01 38 */ addi r4, r1, 0x138 /* 8017D188 0017A0C8 3B 7F 00 62 */ addi r27, r31, 0x62 /* 8017D18C 0017A0CC 7F 65 DB 78 */ mr r5, r27 -/* 8017D190 0017A0D0 48 0F 40 15 */ bl cSAngle_NS___mi_X1_ +/* 8017D190 0017A0D0 48 0F 40 15 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017D194 0017A0D4 38 61 00 78 */ addi r3, r1, 0x78 /* 8017D198 0017A0D8 38 81 00 7C */ addi r4, r1, 0x7c /* 8017D19C 0017A0DC FC 20 80 90 */ fmr f1, f16 -/* 8017D1A0 0017A0E0 48 0F 40 C5 */ bl cSAngle_NS___ml +/* 8017D1A0 0017A0E0 48 0F 40 C5 */ bl __ml__7cSAngleCFf /* 8017D1A4 0017A0E4 38 61 00 74 */ addi r3, r1, 0x74 /* 8017D1A8 0017A0E8 7F 64 DB 78 */ mr r4, r27 /* 8017D1AC 0017A0EC 38 A1 00 78 */ addi r5, r1, 0x78 -/* 8017D1B0 0017A0F0 48 0F 3F C5 */ bl cSAngle_NS___pl +/* 8017D1B0 0017A0F0 48 0F 3F C5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017D1B4 0017A0F4 38 61 01 44 */ addi r3, r1, 0x144 /* 8017D1B8 0017A0F8 38 81 00 74 */ addi r4, r1, 0x74 -/* 8017D1BC 0017A0FC 48 0F 3E 3D */ bl cSAngle_NS_Val_X1_ +/* 8017D1BC 0017A0FC 48 0F 3E 3D */ bl Val__7cSAngleFRC7cSAngle /* 8017D1C0 0017A100 38 61 00 74 */ addi r3, r1, 0x74 /* 8017D1C4 0017A104 38 80 FF FF */ li r4, -1 /* 8017D1C8 0017A108 4B EB 33 49 */ bl cSAngle_NS_dtor @@ -2423,25 +2423,25 @@ lbl_8017D1F4: /* 8017D208 0017A148 41 82 00 14 */ beq lbl_8017D21C /* 8017D20C 0017A14C 38 61 01 44 */ addi r3, r1, 0x144 /* 8017D210 0017A150 38 9F 00 62 */ addi r4, r31, 0x62 -/* 8017D214 0017A154 48 0F 3D E5 */ bl cSAngle_NS_Val_X1_ +/* 8017D214 0017A154 48 0F 3D E5 */ bl Val__7cSAngleFRC7cSAngle /* 8017D218 0017A158 48 00 00 D0 */ b lbl_8017D2E8 lbl_8017D21C: /* 8017D21C 0017A15C 38 61 00 70 */ addi r3, r1, 0x70 /* 8017D220 0017A160 38 81 01 86 */ addi r4, r1, 0x186 /* 8017D224 0017A164 3B 7F 00 62 */ addi r27, r31, 0x62 /* 8017D228 0017A168 7F 65 DB 78 */ mr r5, r27 -/* 8017D22C 0017A16C 48 0F 3F 79 */ bl cSAngle_NS___mi_X1_ +/* 8017D22C 0017A16C 48 0F 3F 79 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017D230 0017A170 38 61 00 6C */ addi r3, r1, 0x6c /* 8017D234 0017A174 38 81 00 70 */ addi r4, r1, 0x70 /* 8017D238 0017A178 FC 20 80 90 */ fmr f1, f16 -/* 8017D23C 0017A17C 48 0F 40 29 */ bl cSAngle_NS___ml +/* 8017D23C 0017A17C 48 0F 40 29 */ bl __ml__7cSAngleCFf /* 8017D240 0017A180 38 61 00 68 */ addi r3, r1, 0x68 /* 8017D244 0017A184 7F 64 DB 78 */ mr r4, r27 /* 8017D248 0017A188 38 A1 00 6C */ addi r5, r1, 0x6c -/* 8017D24C 0017A18C 48 0F 3F 29 */ bl cSAngle_NS___pl +/* 8017D24C 0017A18C 48 0F 3F 29 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017D250 0017A190 38 61 01 44 */ addi r3, r1, 0x144 /* 8017D254 0017A194 38 81 00 68 */ addi r4, r1, 0x68 -/* 8017D258 0017A198 48 0F 3D A1 */ bl cSAngle_NS_Val_X1_ +/* 8017D258 0017A198 48 0F 3D A1 */ bl Val__7cSAngleFRC7cSAngle /* 8017D25C 0017A19C 38 61 00 68 */ addi r3, r1, 0x68 /* 8017D260 0017A1A0 38 80 FF FF */ li r4, -1 /* 8017D264 0017A1A4 4B EB 32 AD */ bl cSAngle_NS_dtor @@ -2457,18 +2457,18 @@ lbl_8017D284: /* 8017D288 0017A1C8 38 81 01 86 */ addi r4, r1, 0x186 /* 8017D28C 0017A1CC 3B 7F 00 62 */ addi r27, r31, 0x62 /* 8017D290 0017A1D0 7F 65 DB 78 */ mr r5, r27 -/* 8017D294 0017A1D4 48 0F 3F 11 */ bl cSAngle_NS___mi_X1_ +/* 8017D294 0017A1D4 48 0F 3F 11 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017D298 0017A1D8 38 61 00 60 */ addi r3, r1, 0x60 /* 8017D29C 0017A1DC 38 81 00 64 */ addi r4, r1, 0x64 /* 8017D2A0 0017A1E0 FC 20 80 90 */ fmr f1, f16 -/* 8017D2A4 0017A1E4 48 0F 3F C1 */ bl cSAngle_NS___ml +/* 8017D2A4 0017A1E4 48 0F 3F C1 */ bl __ml__7cSAngleCFf /* 8017D2A8 0017A1E8 38 61 00 5C */ addi r3, r1, 0x5c /* 8017D2AC 0017A1EC 7F 64 DB 78 */ mr r4, r27 /* 8017D2B0 0017A1F0 38 A1 00 60 */ addi r5, r1, 0x60 -/* 8017D2B4 0017A1F4 48 0F 3E C1 */ bl cSAngle_NS___pl +/* 8017D2B4 0017A1F4 48 0F 3E C1 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017D2B8 0017A1F8 38 61 01 44 */ addi r3, r1, 0x144 /* 8017D2BC 0017A1FC 38 81 00 5C */ addi r4, r1, 0x5c -/* 8017D2C0 0017A200 48 0F 3D 39 */ bl cSAngle_NS_Val_X1_ +/* 8017D2C0 0017A200 48 0F 3D 39 */ bl Val__7cSAngleFRC7cSAngle /* 8017D2C4 0017A204 38 61 00 5C */ addi r3, r1, 0x5c /* 8017D2C8 0017A208 38 80 FF FF */ li r4, -1 /* 8017D2CC 0017A20C 4B EB 32 45 */ bl cSAngle_NS_dtor @@ -2492,10 +2492,10 @@ lbl_8017D30C: /* 8017D30C 0017A24C 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 8017D310 0017A250 38 9F 00 70 */ addi r4, r31, 0x70 /* 8017D314 0017A254 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8017D318 0017A258 48 0E 98 1D */ bl cXyz_NS___mi +/* 8017D318 0017A258 48 0E 98 1D */ bl __mi__4cXyzCFRC3Vec /* 8017D31C 0017A25C 38 61 01 78 */ addi r3, r1, 0x178 /* 8017D320 0017A260 38 81 01 A0 */ addi r4, r1, 0x1a0 -/* 8017D324 0017A264 48 0F 45 5D */ bl cSGlobe_X4_ +/* 8017D324 0017A264 48 0F 45 5D */ bl __ct__7cSGlobeFRC4cXyz /* 8017D328 0017A268 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 8017D32C 0017A26C 38 80 FF FF */ li r4, -1 /* 8017D330 0017A270 4B E8 BE 55 */ bl cXyz_NS_dtor @@ -2520,7 +2520,7 @@ lbl_8017D30C: /* 8017D37C 0017A2BC 38 81 01 84 */ addi r4, r1, 0x184 /* 8017D380 0017A2C0 80 BF 04 84 */ lwz r5, 0x484(r31) /* 8017D384 0017A2C4 A8 A5 04 E4 */ lha r5, 0x4e4(r5) -/* 8017D388 0017A2C8 48 0F 3E 75 */ bl cSAngle_NS___pl_X1_ +/* 8017D388 0017A2C8 48 0F 3E 75 */ bl __pl__7cSAngleCFs /* 8017D38C 0017A2CC 38 61 01 78 */ addi r3, r1, 0x178 /* 8017D390 0017A2D0 38 81 00 58 */ addi r4, r1, 0x58 /* 8017D394 0017A2D4 4B F1 26 C5 */ bl cSGlobe_NS_V @@ -2532,7 +2532,7 @@ lbl_8017D3A8: /* 8017D3A8 0017A2E8 38 61 00 54 */ addi r3, r1, 0x54 /* 8017D3AC 0017A2EC 80 9F 04 84 */ lwz r4, 0x484(r31) /* 8017D3B0 0017A2F0 A8 84 04 E4 */ lha r4, 0x4e4(r4) -/* 8017D3B4 0017A2F4 48 0F 3B E5 */ bl cSAngle_X2_ +/* 8017D3B4 0017A2F4 48 0F 3B E5 */ bl __ct__7cSAngleFs /* 8017D3B8 0017A2F8 38 61 01 78 */ addi r3, r1, 0x178 /* 8017D3BC 0017A2FC 38 81 00 54 */ addi r4, r1, 0x54 /* 8017D3C0 0017A300 4B F1 26 99 */ bl cSGlobe_NS_V @@ -2556,12 +2556,12 @@ lbl_8017D3D8: /* 8017D400 0017A340 38 61 00 50 */ addi r3, r1, 0x50 /* 8017D404 0017A344 38 81 01 86 */ addi r4, r1, 0x186 /* 8017D408 0017A348 38 A1 01 44 */ addi r5, r1, 0x144 -/* 8017D40C 0017A34C 48 0F 3D 99 */ bl cSAngle_NS___mi_X1_ +/* 8017D40C 0017A34C 48 0F 3D 99 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017D410 0017A350 38 61 00 4C */ addi r3, r1, 0x4c /* 8017D414 0017A354 38 81 00 50 */ addi r4, r1, 0x50 -/* 8017D418 0017A358 48 0F 3B 51 */ bl cSAngle_X1_ +/* 8017D418 0017A358 48 0F 3B 51 */ bl __ct__7cSAngleFRC7cSAngle /* 8017D41C 0017A35C 38 61 00 4C */ addi r3, r1, 0x4c -/* 8017D420 0017A360 48 0F 3D 01 */ bl cSAngle_NS_Cos +/* 8017D420 0017A360 48 0F 3D 01 */ bl Cos__7cSAngleCFv /* 8017D424 0017A364 FD C0 08 90 */ fmr f14, f1 /* 8017D428 0017A368 38 61 00 4C */ addi r3, r1, 0x4c /* 8017D42C 0017A36C 38 80 FF FF */ li r4, -1 @@ -2572,15 +2572,15 @@ lbl_8017D3D8: /* 8017D440 0017A380 38 61 01 40 */ addi r3, r1, 0x140 /* 8017D444 0017A384 80 9F 04 84 */ lwz r4, 0x484(r31) /* 8017D448 0017A388 A8 84 04 E4 */ lha r4, 0x4e4(r4) -/* 8017D44C 0017A38C 48 0F 3B B9 */ bl cSAngle_NS_Val_X2_ +/* 8017D44C 0017A38C 48 0F 3B B9 */ bl Val__7cSAngleFs /* 8017D450 0017A390 38 61 00 48 */ addi r3, r1, 0x48 /* 8017D454 0017A394 38 81 01 40 */ addi r4, r1, 0x140 /* 8017D458 0017A398 FC 20 70 90 */ fmr f1, f14 -/* 8017D45C 0017A39C 48 0F 3E 09 */ bl cSAngle_NS___ml +/* 8017D45C 0017A39C 48 0F 3E 09 */ bl __ml__7cSAngleCFf /* 8017D460 0017A3A0 38 61 00 44 */ addi r3, r1, 0x44 /* 8017D464 0017A3A4 38 81 01 84 */ addi r4, r1, 0x184 /* 8017D468 0017A3A8 38 A1 00 48 */ addi r5, r1, 0x48 -/* 8017D46C 0017A3AC 48 0F 3D 09 */ bl cSAngle_NS___pl +/* 8017D46C 0017A3AC 48 0F 3D 09 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017D470 0017A3B0 38 61 01 80 */ addi r3, r1, 0x180 /* 8017D474 0017A3B4 38 81 00 44 */ addi r4, r1, 0x44 /* 8017D478 0017A3B8 4B F1 25 E1 */ bl cSGlobe_NS_V @@ -2615,11 +2615,11 @@ lbl_8017D4C8: /* 8017D4E4 0017A424 ED CE 00 2A */ fadds f14, f14, f0 /* 8017D4E8 0017A428 38 61 00 40 */ addi r3, r1, 0x40 /* 8017D4EC 0017A42C C0 22 9C E4 */ lfs f1, lbl_804536E4-_SDA2_BASE_(r2) -/* 8017D4F0 0017A430 48 0F 3A D9 */ bl cSAngle_X3_ +/* 8017D4F0 0017A430 48 0F 3A D9 */ bl __ct__7cSAngleFf /* 8017D4F4 0017A434 38 61 00 3C */ addi r3, r1, 0x3c /* 8017D4F8 0017A438 38 81 01 7C */ addi r4, r1, 0x17c /* 8017D4FC 0017A43C 38 A1 00 40 */ addi r5, r1, 0x40 -/* 8017D500 0017A440 48 0F 3C 75 */ bl cSAngle_NS___pl +/* 8017D500 0017A440 48 0F 3C 75 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017D504 0017A444 38 61 01 78 */ addi r3, r1, 0x178 /* 8017D508 0017A448 38 81 00 3C */ addi r4, r1, 0x3c /* 8017D50C 0017A44C 4B F1 25 4D */ bl cSGlobe_NS_V @@ -2634,15 +2634,15 @@ lbl_8017D528: /* 8017D52C 0017A46C 38 81 01 7C */ addi r4, r1, 0x17c /* 8017D530 0017A470 3B 61 01 84 */ addi r27, r1, 0x184 /* 8017D534 0017A474 7F 65 DB 78 */ mr r5, r27 -/* 8017D538 0017A478 48 0F 3C 6D */ bl cSAngle_NS___mi_X1_ +/* 8017D538 0017A478 48 0F 3C 6D */ bl __mi__7cSAngleCFRC7cSAngle /* 8017D53C 0017A47C 38 61 00 34 */ addi r3, r1, 0x34 /* 8017D540 0017A480 38 81 00 38 */ addi r4, r1, 0x38 /* 8017D544 0017A484 FC 20 70 90 */ fmr f1, f14 -/* 8017D548 0017A488 48 0F 3D 1D */ bl cSAngle_NS___ml +/* 8017D548 0017A488 48 0F 3D 1D */ bl __ml__7cSAngleCFf /* 8017D54C 0017A48C 38 61 00 30 */ addi r3, r1, 0x30 /* 8017D550 0017A490 7F 64 DB 78 */ mr r4, r27 /* 8017D554 0017A494 38 A1 00 34 */ addi r5, r1, 0x34 -/* 8017D558 0017A498 48 0F 3C 1D */ bl cSAngle_NS___pl +/* 8017D558 0017A498 48 0F 3C 1D */ bl __pl__7cSAngleCFRC7cSAngle /* 8017D55C 0017A49C 38 61 01 80 */ addi r3, r1, 0x180 /* 8017D560 0017A4A0 38 81 00 30 */ addi r4, r1, 0x30 /* 8017D564 0017A4A4 4B F1 24 F5 */ bl cSGlobe_NS_V @@ -2659,18 +2659,18 @@ lbl_8017D528: /* 8017D590 0017A4D0 7F 64 DB 78 */ mr r4, r27 /* 8017D594 0017A4D4 3B 7F 00 60 */ addi r27, r31, 0x60 /* 8017D598 0017A4D8 7F 65 DB 78 */ mr r5, r27 -/* 8017D59C 0017A4DC 48 0F 3C 09 */ bl cSAngle_NS___mi_X1_ +/* 8017D59C 0017A4DC 48 0F 3C 09 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017D5A0 0017A4E0 38 61 00 28 */ addi r3, r1, 0x28 /* 8017D5A4 0017A4E4 38 81 00 2C */ addi r4, r1, 0x2c /* 8017D5A8 0017A4E8 C0 3F 04 64 */ lfs f1, 0x464(r31) -/* 8017D5AC 0017A4EC 48 0F 3C B9 */ bl cSAngle_NS___ml +/* 8017D5AC 0017A4EC 48 0F 3C B9 */ bl __ml__7cSAngleCFf /* 8017D5B0 0017A4F0 38 61 00 24 */ addi r3, r1, 0x24 /* 8017D5B4 0017A4F4 7F 64 DB 78 */ mr r4, r27 /* 8017D5B8 0017A4F8 38 A1 00 28 */ addi r5, r1, 0x28 -/* 8017D5BC 0017A4FC 48 0F 3B B9 */ bl cSAngle_NS___pl +/* 8017D5BC 0017A4FC 48 0F 3B B9 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017D5C0 0017A500 38 61 01 34 */ addi r3, r1, 0x134 /* 8017D5C4 0017A504 38 81 00 24 */ addi r4, r1, 0x24 -/* 8017D5C8 0017A508 48 0F 39 A1 */ bl cSAngle_X1_ +/* 8017D5C8 0017A508 48 0F 39 A1 */ bl __ct__7cSAngleFRC7cSAngle /* 8017D5CC 0017A50C 38 61 00 24 */ addi r3, r1, 0x24 /* 8017D5D0 0017A510 38 80 FF FF */ li r4, -1 /* 8017D5D4 0017A514 4B EB 2F 3D */ bl cSAngle_NS_dtor @@ -2686,7 +2686,7 @@ lbl_8017D528: /* 8017D5FC 0017A53C 40 80 00 14 */ bge lbl_8017D610 /* 8017D600 0017A540 38 61 01 34 */ addi r3, r1, 0x134 /* 8017D604 0017A544 38 8D 8A C8 */ addi r4, r13, 0x80451048 - 0x80458580 /*SDA HACK; original: lbl_80451048-_SDA_BASE_*/ -/* 8017D608 0017A548 48 0F 39 F1 */ bl cSAngle_NS_Val_X1_ +/* 8017D608 0017A548 48 0F 39 F1 */ bl Val__7cSAngleFRC7cSAngle /* 8017D60C 0017A54C 48 00 00 1C */ b lbl_8017D628 lbl_8017D610: /* 8017D610 0017A550 A8 0D 8A CC */ lha r0, lbl_8045104C-_SDA_BASE_(r13) @@ -2694,20 +2694,20 @@ lbl_8017D610: /* 8017D618 0017A558 40 81 00 10 */ ble lbl_8017D628 /* 8017D61C 0017A55C 38 61 01 34 */ addi r3, r1, 0x134 /* 8017D620 0017A560 38 8D 8A CC */ addi r4, r13, 0x8045104C - 0x80458580 /*SDA HACK; original: lbl_8045104C-_SDA_BASE_*/ -/* 8017D624 0017A564 48 0F 39 D5 */ bl cSAngle_NS_Val_X1_ +/* 8017D624 0017A564 48 0F 39 D5 */ bl Val__7cSAngleFRC7cSAngle lbl_8017D628: /* 8017D628 0017A568 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017D62C 0017A56C FC 20 78 90 */ fmr f1, f15 /* 8017D630 0017A570 38 81 01 34 */ addi r4, r1, 0x134 /* 8017D634 0017A574 38 A1 01 44 */ addi r5, r1, 0x144 -/* 8017D638 0017A578 48 0F 43 D1 */ bl cSGlobe_NS_Val_X2_ +/* 8017D638 0017A578 48 0F 43 D1 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8017D63C 0017A57C 38 61 01 94 */ addi r3, r1, 0x194 /* 8017D640 0017A580 38 9F 00 5C */ addi r4, r31, 0x5c -/* 8017D644 0017A584 48 0F 44 71 */ bl cSGlobe_NS_Xyz +/* 8017D644 0017A584 48 0F 44 71 */ bl Xyz__7cSGlobeCFv /* 8017D648 0017A588 38 61 01 88 */ addi r3, r1, 0x188 /* 8017D64C 0017A58C 38 9F 00 64 */ addi r4, r31, 0x64 /* 8017D650 0017A590 38 A1 01 94 */ addi r5, r1, 0x194 -/* 8017D654 0017A594 48 0E 94 91 */ bl cXyz_NS___pl +/* 8017D654 0017A594 48 0E 94 91 */ bl __pl__4cXyzCFRC3Vec /* 8017D658 0017A598 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017D65C 0017A59C 38 81 01 88 */ addi r4, r1, 0x188 /* 8017D660 0017A5A0 4B F1 A1 79 */ bl cXyz_NS___as @@ -2757,21 +2757,21 @@ lbl_8017D700: /* 8017D708 0017A648 38 61 00 20 */ addi r3, r1, 0x20 /* 8017D70C 0017A64C 38 81 01 74 */ addi r4, r1, 0x174 /* 8017D710 0017A650 C0 3F 01 BC */ lfs f1, 0x1bc(r31) -/* 8017D714 0017A654 48 0F 3B 51 */ bl cSAngle_NS___ml +/* 8017D714 0017A654 48 0F 3B 51 */ bl __ml__7cSAngleCFf /* 8017D718 0017A658 38 61 00 1C */ addi r3, r1, 0x1c /* 8017D71C 0017A65C 38 81 00 20 */ addi r4, r1, 0x20 /* 8017D720 0017A660 38 BF 00 7C */ addi r5, r31, 0x7c -/* 8017D724 0017A664 48 0F 3A 81 */ bl cSAngle_NS___mi_X1_ +/* 8017D724 0017A664 48 0F 3A 81 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017D728 0017A668 FC 20 E8 90 */ fmr f1, f29 /* 8017D72C 0017A66C 48 00 53 11 */ bl std_NS_fabsf /* 8017D730 0017A670 C0 02 9C E0 */ lfs f0, lbl_804536E0-_SDA2_BASE_(r2) /* 8017D734 0017A674 EC 20 00 72 */ fmuls f1, f0, f1 /* 8017D738 0017A678 38 61 00 18 */ addi r3, r1, 0x18 /* 8017D73C 0017A67C 38 81 00 1C */ addi r4, r1, 0x1c -/* 8017D740 0017A680 48 0F 3B 25 */ bl cSAngle_NS___ml +/* 8017D740 0017A680 48 0F 3B 25 */ bl __ml__7cSAngleCFf /* 8017D744 0017A684 38 7F 00 7C */ addi r3, r31, 0x7c /* 8017D748 0017A688 38 81 00 18 */ addi r4, r1, 0x18 -/* 8017D74C 0017A68C 48 0F 3A 89 */ bl cSAngle_NS___apl +/* 8017D74C 0017A68C 48 0F 3A 89 */ bl __apl__7cSAngleFRC7cSAngle /* 8017D750 0017A690 38 61 00 18 */ addi r3, r1, 0x18 /* 8017D754 0017A694 38 80 FF FF */ li r4, -1 /* 8017D758 0017A698 4B EB 2D B9 */ bl cSAngle_NS_dtor @@ -2789,14 +2789,14 @@ lbl_8017D784: /* 8017D784 0017A6C4 38 61 00 14 */ addi r3, r1, 0x14 /* 8017D788 0017A6C8 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 8017D78C 0017A6CC 38 BF 00 7C */ addi r5, r31, 0x7c -/* 8017D790 0017A6D0 48 0F 3A 15 */ bl cSAngle_NS___mi_X1_ +/* 8017D790 0017A6D0 48 0F 3A 15 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017D794 0017A6D4 38 61 00 10 */ addi r3, r1, 0x10 /* 8017D798 0017A6D8 38 81 00 14 */ addi r4, r1, 0x14 /* 8017D79C 0017A6DC C0 22 9C E8 */ lfs f1, lbl_804536E8-_SDA2_BASE_(r2) -/* 8017D7A0 0017A6E0 48 0F 3A C5 */ bl cSAngle_NS___ml +/* 8017D7A0 0017A6E0 48 0F 3A C5 */ bl __ml__7cSAngleCFf /* 8017D7A4 0017A6E4 38 7F 00 7C */ addi r3, r31, 0x7c /* 8017D7A8 0017A6E8 38 81 00 10 */ addi r4, r1, 0x10 -/* 8017D7AC 0017A6EC 48 0F 3A 29 */ bl cSAngle_NS___apl +/* 8017D7AC 0017A6EC 48 0F 3A 29 */ bl __apl__7cSAngleFRC7cSAngle /* 8017D7B0 0017A6F0 38 61 00 10 */ addi r3, r1, 0x10 /* 8017D7B4 0017A6F4 38 80 FF FF */ li r4, -1 /* 8017D7B8 0017A6F8 4B EB 2D 59 */ bl cSAngle_NS_dtor diff --git a/include/d/d_camera/asm/func_8017D934.s b/include/d/d_camera/asm/func_8017D934.s index 9787937672..3b646e7a32 100644 --- a/include/d/d_camera/asm/func_8017D934.s +++ b/include/d/d_camera/asm/func_8017D934.s @@ -8,7 +8,7 @@ /* 8017D950 0017A890 48 0E 9D 25 */ bl cM_atan2s /* 8017D954 0017A894 7C 64 1B 78 */ mr r4, r3 /* 8017D958 0017A898 7F E3 FB 78 */ mr r3, r31 -/* 8017D95C 0017A89C 48 0F 36 3D */ bl cSAngle_X2_ +/* 8017D95C 0017A89C 48 0F 36 3D */ bl __ct__7cSAngleFs /* 8017D960 0017A8A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8017D964 0017A8A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8017D968 0017A8A8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_camera/asm/func_8017D97C.s b/include/d/d_camera/asm/func_8017D97C.s index a17f6767b5..dbb7fd1912 100644 --- a/include/d/d_camera/asm/func_8017D97C.s +++ b/include/d/d_camera/asm/func_8017D97C.s @@ -21,12 +21,12 @@ /* 8017D9CC 0017A90C C3 A4 00 4C */ lfs f29, 0x4c(r4) /* 8017D9D0 0017A910 38 61 00 58 */ addi r3, r1, 0x58 /* 8017D9D4 0017A914 C0 24 00 48 */ lfs f1, 0x48(r4) -/* 8017D9D8 0017A918 48 0F 35 F1 */ bl cSAngle_X3_ +/* 8017D9D8 0017A918 48 0F 35 F1 */ bl __ct__7cSAngleFf /* 8017D9DC 0017A91C 38 61 00 54 */ addi r3, r1, 0x54 /* 8017D9E0 0017A920 80 1D 0A F4 */ lwz r0, 0xaf4(r29) /* 8017D9E4 0017A924 7C 80 FA 14 */ add r4, r0, r31 /* 8017D9E8 0017A928 C0 24 00 68 */ lfs f1, 0x68(r4) -/* 8017D9EC 0017A92C 48 0F 35 DD */ bl cSAngle_X3_ +/* 8017D9EC 0017A92C 48 0F 35 DD */ bl __ct__7cSAngleFf /* 8017D9F0 0017A930 80 1D 01 74 */ lwz r0, 0x174(r29) /* 8017D9F4 0017A934 28 00 00 00 */ cmplwi r0, 0 /* 8017D9F8 0017A938 40 82 02 54 */ bne lbl_8017DC4C @@ -111,14 +111,14 @@ lbl_8017DAF0: /* 8017DB2C 0017AA6C 7C 00 00 D0 */ neg r0, r0 /* 8017DB30 0017AA70 7C 04 07 34 */ extsh r4, r0 /* 8017DB34 0017AA74 A8 BD 07 D2 */ lha r5, 0x7d2(r29) -/* 8017DB38 0017AA78 48 0F 3C E9 */ bl cSGlobe_X2_ +/* 8017DB38 0017AA78 48 0F 3C E9 */ bl __ct__7cSGlobeFfss /* 8017DB3C 0017AA7C 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8017DB40 0017AA80 38 81 00 64 */ addi r4, r1, 0x64 -/* 8017DB44 0017AA84 48 0F 3F 71 */ bl cSGlobe_NS_Xyz +/* 8017DB44 0017AA84 48 0F 3F 71 */ bl Xyz__7cSGlobeCFv /* 8017DB48 0017AA88 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8017DB4C 0017AA8C 38 9D 03 EC */ addi r4, r29, 0x3ec /* 8017DB50 0017AA90 38 A1 00 B4 */ addi r5, r1, 0xb4 -/* 8017DB54 0017AA94 48 0E 8F 91 */ bl cXyz_NS___pl +/* 8017DB54 0017AA94 48 0E 8F 91 */ bl __pl__4cXyzCFRC3Vec /* 8017DB58 0017AA98 C0 01 00 A8 */ lfs f0, 0xa8(r1) /* 8017DB5C 0017AA9C D0 1D 04 10 */ stfs f0, 0x410(r29) /* 8017DB60 0017AAA0 C0 01 00 AC */ lfs f0, 0xac(r1) @@ -134,22 +134,22 @@ lbl_8017DB74: /* 8017DB84 0017AAC4 C0 1D 00 78 */ lfs f0, 0x78(r29) /* 8017DB88 0017AAC8 D0 1D 03 F4 */ stfs f0, 0x3f4(r29) /* 8017DB8C 0017AACC 38 7D 00 62 */ addi r3, r29, 0x62 -/* 8017DB90 0017AAD0 48 0F 35 59 */ bl cSAngle_NS_Inv +/* 8017DB90 0017AAD0 48 0F 35 59 */ bl Inv__7cSAngleCFv /* 8017DB94 0017AAD4 7C 7E 1B 78 */ mr r30, r3 /* 8017DB98 0017AAD8 38 7D 00 60 */ addi r3, r29, 0x60 -/* 8017DB9C 0017AADC 48 0F 35 4D */ bl cSAngle_NS_Inv +/* 8017DB9C 0017AADC 48 0F 35 4D */ bl Inv__7cSAngleCFv /* 8017DBA0 0017AAE0 7C 64 1B 78 */ mr r4, r3 /* 8017DBA4 0017AAE4 38 61 00 5C */ addi r3, r1, 0x5c /* 8017DBA8 0017AAE8 C0 22 9D 88 */ lfs f1, lbl_80453788-_SDA2_BASE_(r2) /* 8017DBAC 0017AAEC 7F C5 F3 78 */ mr r5, r30 -/* 8017DBB0 0017AAF0 48 0F 3C 71 */ bl cSGlobe_X2_ +/* 8017DBB0 0017AAF0 48 0F 3C 71 */ bl __ct__7cSGlobeFfss /* 8017DBB4 0017AAF4 38 61 00 9C */ addi r3, r1, 0x9c /* 8017DBB8 0017AAF8 38 81 00 5C */ addi r4, r1, 0x5c -/* 8017DBBC 0017AAFC 48 0F 3E F9 */ bl cSGlobe_NS_Xyz +/* 8017DBBC 0017AAFC 48 0F 3E F9 */ bl Xyz__7cSGlobeCFv /* 8017DBC0 0017AB00 38 61 00 90 */ addi r3, r1, 0x90 /* 8017DBC4 0017AB04 38 9D 03 EC */ addi r4, r29, 0x3ec /* 8017DBC8 0017AB08 38 A1 00 9C */ addi r5, r1, 0x9c -/* 8017DBCC 0017AB0C 48 0E 8F 19 */ bl cXyz_NS___pl +/* 8017DBCC 0017AB0C 48 0E 8F 19 */ bl __pl__4cXyzCFRC3Vec /* 8017DBD0 0017AB10 C0 01 00 90 */ lfs f0, 0x90(r1) /* 8017DBD4 0017AB14 D0 1D 04 10 */ stfs f0, 0x410(r29) /* 8017DBD8 0017AB18 C0 01 00 94 */ lfs f0, 0x94(r1) @@ -160,10 +160,10 @@ lbl_8017DBE8: /* 8017DBE8 0017AB28 38 61 00 84 */ addi r3, r1, 0x84 /* 8017DBEC 0017AB2C 38 9D 03 EC */ addi r4, r29, 0x3ec /* 8017DBF0 0017AB30 38 BD 04 10 */ addi r5, r29, 0x410 -/* 8017DBF4 0017AB34 48 0E 8F 41 */ bl cXyz_NS___mi +/* 8017DBF4 0017AB34 48 0E 8F 41 */ bl __mi__4cXyzCFRC3Vec /* 8017DBF8 0017AB38 38 7D 03 F8 */ addi r3, r29, 0x3f8 /* 8017DBFC 0017AB3C 38 81 00 84 */ addi r4, r1, 0x84 -/* 8017DC00 0017AB40 48 0F 3E 71 */ bl cSGlobe_NS_Val_X3_ +/* 8017DC00 0017AB40 48 0F 3E 71 */ bl Val__7cSGlobeFRC4cXyz /* 8017DC04 0017AB44 C0 1D 04 10 */ lfs f0, 0x410(r29) /* 8017DC08 0017AB48 D0 1D 00 64 */ stfs f0, 0x64(r29) /* 8017DC0C 0017AB4C C0 1D 04 14 */ lfs f0, 0x414(r29) @@ -212,7 +212,7 @@ lbl_8017DC8C: /* 8017DCB0 0017ABF0 90 01 00 D0 */ stw r0, 0xd0(r1) /* 8017DCB4 0017ABF4 C8 01 00 D0 */ lfd f0, 0xd0(r1) /* 8017DCB8 0017ABF8 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8017DCBC 0017ABFC 48 0F 33 0D */ bl cSAngle_X3_ +/* 8017DCBC 0017ABFC 48 0F 33 0D */ bl __ct__7cSAngleFf /* 8017DCC0 0017AC00 A8 01 00 44 */ lha r0, 0x44(r1) /* 8017DCC4 0017AC04 B0 01 00 58 */ sth r0, 0x58(r1) lbl_8017DCC8: @@ -228,7 +228,7 @@ lbl_8017DCC8: /* 8017DCEC 0017AC2C 90 01 00 D0 */ stw r0, 0xd0(r1) /* 8017DCF0 0017AC30 C8 01 00 D0 */ lfd f0, 0xd0(r1) /* 8017DCF4 0017AC34 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8017DCF8 0017AC38 48 0F 32 D1 */ bl cSAngle_X3_ +/* 8017DCF8 0017AC38 48 0F 32 D1 */ bl __ct__7cSAngleFf /* 8017DCFC 0017AC3C A8 01 00 40 */ lha r0, 0x40(r1) /* 8017DD00 0017AC40 B0 01 00 54 */ sth r0, 0x54(r1) lbl_8017DD04: @@ -282,19 +282,19 @@ lbl_8017DD90: lbl_8017DDA8: /* 8017DDA8 0017ACE8 38 61 00 3C */ addi r3, r1, 0x3c /* 8017DDAC 0017ACEC EC 3E 00 72 */ fmuls f1, f30, f1 -/* 8017DDB0 0017ACF0 48 0F 32 19 */ bl cSAngle_X3_ +/* 8017DDB0 0017ACF0 48 0F 32 19 */ bl __ct__7cSAngleFf /* 8017DDB4 0017ACF4 38 61 00 38 */ addi r3, r1, 0x38 /* 8017DDB8 0017ACF8 38 9D 00 60 */ addi r4, r29, 0x60 /* 8017DDBC 0017ACFC 38 A1 00 3C */ addi r5, r1, 0x3c -/* 8017DDC0 0017AD00 48 0F 33 B5 */ bl cSAngle_NS___pl +/* 8017DDC0 0017AD00 48 0F 33 B5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017DDC4 0017AD04 38 61 00 4C */ addi r3, r1, 0x4c /* 8017DDC8 0017AD08 38 81 00 38 */ addi r4, r1, 0x38 -/* 8017DDCC 0017AD0C 48 0F 31 9D */ bl cSAngle_X1_ +/* 8017DDCC 0017AD0C 48 0F 31 9D */ bl __ct__7cSAngleFRC7cSAngle /* 8017DDD0 0017AD10 38 61 00 34 */ addi r3, r1, 0x34 /* 8017DDD4 0017AD14 38 81 00 4C */ addi r4, r1, 0x4c /* 8017DDD8 0017AD18 3B DD 03 FC */ addi r30, r29, 0x3fc /* 8017DDDC 0017AD1C 7F C5 F3 78 */ mr r5, r30 -/* 8017DDE0 0017AD20 48 0F 33 C5 */ bl cSAngle_NS___mi_X1_ +/* 8017DDE0 0017AD20 48 0F 33 C5 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017DDE4 0017AD24 A8 01 00 34 */ lha r0, 0x34(r1) /* 8017DDE8 0017AD28 B0 01 00 50 */ sth r0, 0x50(r1) /* 8017DDEC 0017AD2C 7C 03 07 34 */ extsh r3, r0 @@ -304,14 +304,14 @@ lbl_8017DDA8: /* 8017DDFC 0017AD3C 38 61 00 30 */ addi r3, r1, 0x30 /* 8017DE00 0017AD40 7F C4 F3 78 */ mr r4, r30 /* 8017DE04 0017AD44 38 A1 00 58 */ addi r5, r1, 0x58 -/* 8017DE08 0017AD48 48 0F 33 6D */ bl cSAngle_NS___pl +/* 8017DE08 0017AD48 48 0F 33 6D */ bl __pl__7cSAngleCFRC7cSAngle /* 8017DE0C 0017AD4C A8 01 00 30 */ lha r0, 0x30(r1) /* 8017DE10 0017AD50 B0 01 00 4C */ sth r0, 0x4c(r1) /* 8017DE14 0017AD54 48 00 00 48 */ b lbl_8017DE5C lbl_8017DE18: /* 8017DE18 0017AD58 38 61 00 2C */ addi r3, r1, 0x2c /* 8017DE1C 0017AD5C 38 81 00 58 */ addi r4, r1, 0x58 -/* 8017DE20 0017AD60 48 0F 33 29 */ bl cSAngle_NS___mi +/* 8017DE20 0017AD60 48 0F 33 29 */ bl __mi__7cSAngleCFv /* 8017DE24 0017AD64 A8 01 00 50 */ lha r0, 0x50(r1) /* 8017DE28 0017AD68 A8 81 00 2C */ lha r4, 0x2c(r1) /* 8017DE2C 0017AD6C 7C 80 02 78 */ xor r0, r4, r0 @@ -323,30 +323,30 @@ lbl_8017DE18: /* 8017DE44 0017AD84 38 61 00 28 */ addi r3, r1, 0x28 /* 8017DE48 0017AD88 7F C4 F3 78 */ mr r4, r30 /* 8017DE4C 0017AD8C 38 A1 00 58 */ addi r5, r1, 0x58 -/* 8017DE50 0017AD90 48 0F 33 55 */ bl cSAngle_NS___mi_X1_ +/* 8017DE50 0017AD90 48 0F 33 55 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017DE54 0017AD94 A8 01 00 28 */ lha r0, 0x28(r1) /* 8017DE58 0017AD98 B0 01 00 4C */ sth r0, 0x4c(r1) lbl_8017DE5C: /* 8017DE5C 0017AD9C 38 61 00 0C */ addi r3, r1, 0xc /* 8017DE60 0017ADA0 A8 81 00 4C */ lha r4, 0x4c(r1) -/* 8017DE64 0017ADA4 48 0F 31 35 */ bl cSAngle_X2_ +/* 8017DE64 0017ADA4 48 0F 31 35 */ bl __ct__7cSAngleFs /* 8017DE68 0017ADA8 A8 01 00 0C */ lha r0, 0xc(r1) /* 8017DE6C 0017ADAC B0 1D 00 60 */ sth r0, 0x60(r29) /* 8017DE70 0017ADB0 38 61 00 24 */ addi r3, r1, 0x24 /* 8017DE74 0017ADB4 EC 3E 07 32 */ fmuls f1, f30, f28 -/* 8017DE78 0017ADB8 48 0F 31 51 */ bl cSAngle_X3_ +/* 8017DE78 0017ADB8 48 0F 31 51 */ bl __ct__7cSAngleFf /* 8017DE7C 0017ADBC 38 61 00 20 */ addi r3, r1, 0x20 /* 8017DE80 0017ADC0 38 9D 00 62 */ addi r4, r29, 0x62 /* 8017DE84 0017ADC4 38 A1 00 24 */ addi r5, r1, 0x24 -/* 8017DE88 0017ADC8 48 0F 33 1D */ bl cSAngle_NS___mi_X1_ +/* 8017DE88 0017ADC8 48 0F 33 1D */ bl __mi__7cSAngleCFRC7cSAngle /* 8017DE8C 0017ADCC 38 61 00 48 */ addi r3, r1, 0x48 /* 8017DE90 0017ADD0 38 81 00 20 */ addi r4, r1, 0x20 -/* 8017DE94 0017ADD4 48 0F 30 D5 */ bl cSAngle_X1_ +/* 8017DE94 0017ADD4 48 0F 30 D5 */ bl __ct__7cSAngleFRC7cSAngle /* 8017DE98 0017ADD8 38 61 00 1C */ addi r3, r1, 0x1c /* 8017DE9C 0017ADDC 38 81 00 48 */ addi r4, r1, 0x48 /* 8017DEA0 0017ADE0 3B DD 03 FE */ addi r30, r29, 0x3fe /* 8017DEA4 0017ADE4 7F C5 F3 78 */ mr r5, r30 -/* 8017DEA8 0017ADE8 48 0F 32 FD */ bl cSAngle_NS___mi_X1_ +/* 8017DEA8 0017ADE8 48 0F 32 FD */ bl __mi__7cSAngleCFRC7cSAngle /* 8017DEAC 0017ADEC A8 01 00 1C */ lha r0, 0x1c(r1) /* 8017DEB0 0017ADF0 B0 01 00 50 */ sth r0, 0x50(r1) /* 8017DEB4 0017ADF4 7C 03 07 34 */ extsh r3, r0 @@ -356,14 +356,14 @@ lbl_8017DE5C: /* 8017DEC4 0017AE04 38 61 00 18 */ addi r3, r1, 0x18 /* 8017DEC8 0017AE08 7F C4 F3 78 */ mr r4, r30 /* 8017DECC 0017AE0C 38 A1 00 54 */ addi r5, r1, 0x54 -/* 8017DED0 0017AE10 48 0F 32 A5 */ bl cSAngle_NS___pl +/* 8017DED0 0017AE10 48 0F 32 A5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017DED4 0017AE14 A8 01 00 18 */ lha r0, 0x18(r1) /* 8017DED8 0017AE18 B0 01 00 48 */ sth r0, 0x48(r1) /* 8017DEDC 0017AE1C 48 00 00 48 */ b lbl_8017DF24 lbl_8017DEE0: /* 8017DEE0 0017AE20 38 61 00 14 */ addi r3, r1, 0x14 /* 8017DEE4 0017AE24 38 81 00 54 */ addi r4, r1, 0x54 -/* 8017DEE8 0017AE28 48 0F 32 61 */ bl cSAngle_NS___mi +/* 8017DEE8 0017AE28 48 0F 32 61 */ bl __mi__7cSAngleCFv /* 8017DEEC 0017AE2C A8 01 00 50 */ lha r0, 0x50(r1) /* 8017DEF0 0017AE30 A8 81 00 14 */ lha r4, 0x14(r1) /* 8017DEF4 0017AE34 7C 80 02 78 */ xor r0, r4, r0 @@ -375,22 +375,22 @@ lbl_8017DEE0: /* 8017DF0C 0017AE4C 38 61 00 10 */ addi r3, r1, 0x10 /* 8017DF10 0017AE50 7F C4 F3 78 */ mr r4, r30 /* 8017DF14 0017AE54 38 A1 00 54 */ addi r5, r1, 0x54 -/* 8017DF18 0017AE58 48 0F 32 8D */ bl cSAngle_NS___mi_X1_ +/* 8017DF18 0017AE58 48 0F 32 8D */ bl __mi__7cSAngleCFRC7cSAngle /* 8017DF1C 0017AE5C A8 01 00 10 */ lha r0, 0x10(r1) /* 8017DF20 0017AE60 B0 01 00 48 */ sth r0, 0x48(r1) lbl_8017DF24: /* 8017DF24 0017AE64 38 61 00 08 */ addi r3, r1, 8 /* 8017DF28 0017AE68 A8 81 00 48 */ lha r4, 0x48(r1) -/* 8017DF2C 0017AE6C 48 0F 30 6D */ bl cSAngle_X2_ +/* 8017DF2C 0017AE6C 48 0F 30 6D */ bl __ct__7cSAngleFs /* 8017DF30 0017AE70 A8 01 00 08 */ lha r0, 8(r1) /* 8017DF34 0017AE74 B0 1D 00 62 */ sth r0, 0x62(r29) /* 8017DF38 0017AE78 38 61 00 78 */ addi r3, r1, 0x78 /* 8017DF3C 0017AE7C 38 9D 00 5C */ addi r4, r29, 0x5c -/* 8017DF40 0017AE80 48 0F 3B 75 */ bl cSGlobe_NS_Xyz +/* 8017DF40 0017AE80 48 0F 3B 75 */ bl Xyz__7cSGlobeCFv /* 8017DF44 0017AE84 38 61 00 6C */ addi r3, r1, 0x6c /* 8017DF48 0017AE88 38 9D 00 64 */ addi r4, r29, 0x64 /* 8017DF4C 0017AE8C 38 A1 00 78 */ addi r5, r1, 0x78 -/* 8017DF50 0017AE90 48 0E 8B 95 */ bl cXyz_NS___pl +/* 8017DF50 0017AE90 48 0E 8B 95 */ bl __pl__4cXyzCFRC3Vec /* 8017DF54 0017AE94 C0 01 00 6C */ lfs f0, 0x6c(r1) /* 8017DF58 0017AE98 D0 1D 00 70 */ stfs f0, 0x70(r29) /* 8017DF5C 0017AE9C C0 01 00 70 */ lfs f0, 0x70(r1) diff --git a/include/d/d_camera/asm/func_8017DFAC.s b/include/d/d_camera/asm/func_8017DFAC.s index aed7c84b98..3fc50d396d 100644 --- a/include/d/d_camera/asm/func_8017DFAC.s +++ b/include/d/d_camera/asm/func_8017DFAC.s @@ -57,14 +57,14 @@ lbl_8017E038: /* 8017E080 0017AFC0 7C 00 00 D0 */ neg r0, r0 /* 8017E084 0017AFC4 7C 04 07 34 */ extsh r4, r0 /* 8017E088 0017AFC8 A8 BF 07 D2 */ lha r5, 0x7d2(r31) -/* 8017E08C 0017AFCC 48 0F 37 95 */ bl cSGlobe_X2_ +/* 8017E08C 0017AFCC 48 0F 37 95 */ bl __ct__7cSGlobeFfss /* 8017E090 0017AFD0 38 61 00 FC */ addi r3, r1, 0xfc /* 8017E094 0017AFD4 38 81 00 34 */ addi r4, r1, 0x34 -/* 8017E098 0017AFD8 48 0F 3A 1D */ bl cSGlobe_NS_Xyz +/* 8017E098 0017AFD8 48 0F 3A 1D */ bl Xyz__7cSGlobeCFv /* 8017E09C 0017AFDC 38 61 00 F0 */ addi r3, r1, 0xf0 /* 8017E0A0 0017AFE0 38 9F 03 EC */ addi r4, r31, 0x3ec /* 8017E0A4 0017AFE4 38 A1 00 FC */ addi r5, r1, 0xfc -/* 8017E0A8 0017AFE8 48 0E 8A 3D */ bl cXyz_NS___pl +/* 8017E0A8 0017AFE8 48 0E 8A 3D */ bl __pl__4cXyzCFRC3Vec /* 8017E0AC 0017AFEC C0 01 00 F0 */ lfs f0, 0xf0(r1) /* 8017E0B0 0017AFF0 D0 1F 04 20 */ stfs f0, 0x420(r31) /* 8017E0B4 0017AFF4 C0 01 00 F4 */ lfs f0, 0xf4(r1) @@ -80,7 +80,7 @@ lbl_8017E038: /* 8017E0DC 0017B01C 38 61 01 4C */ addi r3, r1, 0x14c /* 8017E0E0 0017B020 38 9F 04 14 */ addi r4, r31, 0x414 /* 8017E0E4 0017B024 38 BF 03 EC */ addi r5, r31, 0x3ec -/* 8017E0E8 0017B028 48 0F 11 C1 */ bl cM3dGLin +/* 8017E0E8 0017B028 48 0F 11 C1 */ bl __ct__8cM3dGLinFRC4cXyzRC4cXyz /* 8017E0EC 0017B02C 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8017E0F0 0017B030 7F E4 FB 78 */ mr r4, r31 /* 8017E0F4 0017B034 80 BF 01 80 */ lwz r5, 0x180(r31) @@ -95,7 +95,7 @@ lbl_8017E038: /* 8017E118 0017B058 38 81 01 2C */ addi r4, r1, 0x12c /* 8017E11C 0017B05C 38 A1 01 20 */ addi r5, r1, 0x120 /* 8017E120 0017B060 38 C1 00 30 */ addi r6, r1, 0x30 -/* 8017E124 0017B064 48 0E A5 ED */ bl cM3d_Len3dSqPntAndSegLine +/* 8017E124 0017B064 48 0E A5 ED */ bl cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf /* 8017E128 0017B068 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017E12C 0017B06C 41 82 00 20 */ beq lbl_8017E14C /* 8017E130 0017B070 C0 01 01 20 */ lfs f0, 0x120(r1) @@ -113,7 +113,7 @@ lbl_8017E14C: /* 8017E15C 0017B09C 38 61 00 CC */ addi r3, r1, 0xcc /* 8017E160 0017B0A0 38 9F 03 EC */ addi r4, r31, 0x3ec /* 8017E164 0017B0A4 38 A1 00 D8 */ addi r5, r1, 0xd8 -/* 8017E168 0017B0A8 48 0E 89 CD */ bl cXyz_NS___mi +/* 8017E168 0017B0A8 48 0E 89 CD */ bl __mi__4cXyzCFRC3Vec /* 8017E16C 0017B0AC C0 01 00 CC */ lfs f0, 0xcc(r1) /* 8017E170 0017B0B0 D0 01 00 C0 */ stfs f0, 0xc0(r1) /* 8017E174 0017B0B4 C0 01 00 D0 */ lfs f0, 0xd0(r1) @@ -193,14 +193,14 @@ lbl_8017E270: /* 8017E278 0017B1B8 7C 00 00 D0 */ neg r0, r0 /* 8017E27C 0017B1BC 7C 04 07 34 */ extsh r4, r0 /* 8017E280 0017B1C0 A8 BF 07 D2 */ lha r5, 0x7d2(r31) -/* 8017E284 0017B1C4 48 0F 37 21 */ bl cSGlobe_NS_Val_X1_ +/* 8017E284 0017B1C4 48 0F 37 21 */ bl Val__7cSGlobeFfss /* 8017E288 0017B1C8 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8017E28C 0017B1CC 38 81 00 34 */ addi r4, r1, 0x34 -/* 8017E290 0017B1D0 48 0F 38 25 */ bl cSGlobe_NS_Xyz +/* 8017E290 0017B1D0 48 0F 38 25 */ bl Xyz__7cSGlobeCFv /* 8017E294 0017B1D4 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8017E298 0017B1D8 38 9F 03 EC */ addi r4, r31, 0x3ec /* 8017E29C 0017B1DC 38 A1 00 B4 */ addi r5, r1, 0xb4 -/* 8017E2A0 0017B1E0 48 0E 88 45 */ bl cXyz_NS___pl +/* 8017E2A0 0017B1E0 48 0E 88 45 */ bl __pl__4cXyzCFRC3Vec /* 8017E2A4 0017B1E4 C0 01 00 A8 */ lfs f0, 0xa8(r1) /* 8017E2A8 0017B1E8 D0 1F 04 14 */ stfs f0, 0x414(r31) /* 8017E2AC 0017B1EC C0 01 00 AC */ lfs f0, 0xac(r1) @@ -236,11 +236,11 @@ lbl_8017E2BC: /* 8017E320 0017B260 38 61 00 9C */ addi r3, r1, 0x9c /* 8017E324 0017B264 38 81 01 38 */ addi r4, r1, 0x138 /* 8017E328 0017B268 C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) -/* 8017E32C 0017B26C 48 0E 88 59 */ bl cXyz_NS___ml +/* 8017E32C 0017B26C 48 0E 88 59 */ bl __ml__4cXyzCFf /* 8017E330 0017B270 38 61 00 90 */ addi r3, r1, 0x90 /* 8017E334 0017B274 38 81 01 14 */ addi r4, r1, 0x114 /* 8017E338 0017B278 38 A1 00 9C */ addi r5, r1, 0x9c -/* 8017E33C 0017B27C 48 0E 87 F9 */ bl cXyz_NS___mi +/* 8017E33C 0017B27C 48 0E 87 F9 */ bl __mi__4cXyzCFRC3Vec /* 8017E340 0017B280 C0 01 00 90 */ lfs f0, 0x90(r1) /* 8017E344 0017B284 D0 1F 04 14 */ stfs f0, 0x414(r31) /* 8017E348 0017B288 C0 01 00 94 */ lfs f0, 0x94(r1) @@ -254,10 +254,10 @@ lbl_8017E364: /* 8017E364 0017B2A4 38 61 00 84 */ addi r3, r1, 0x84 /* 8017E368 0017B2A8 38 9F 03 EC */ addi r4, r31, 0x3ec /* 8017E36C 0017B2AC 38 BF 04 14 */ addi r5, r31, 0x414 -/* 8017E370 0017B2B0 48 0E 87 C5 */ bl cXyz_NS___mi +/* 8017E370 0017B2B0 48 0E 87 C5 */ bl __mi__4cXyzCFRC3Vec /* 8017E374 0017B2B4 38 7F 03 F8 */ addi r3, r31, 0x3f8 /* 8017E378 0017B2B8 38 81 00 84 */ addi r4, r1, 0x84 -/* 8017E37C 0017B2BC 48 0F 36 F5 */ bl cSGlobe_NS_Val_X3_ +/* 8017E37C 0017B2BC 48 0F 36 F5 */ bl Val__7cSGlobeFRC4cXyz /* 8017E380 0017B2C0 88 1F 07 BD */ lbz r0, 0x7bd(r31) /* 8017E384 0017B2C4 28 00 00 FF */ cmplwi r0, 0xff /* 8017E388 0017B2C8 40 82 00 08 */ bne lbl_8017E390 @@ -282,7 +282,7 @@ lbl_8017E3C0: /* 8017E3C8 0017B308 38 61 00 78 */ addi r3, r1, 0x78 /* 8017E3CC 0017B30C 38 9F 03 EC */ addi r4, r31, 0x3ec /* 8017E3D0 0017B310 38 BF 00 3C */ addi r5, r31, 0x3c -/* 8017E3D4 0017B314 48 0E 87 61 */ bl cXyz_NS___mi +/* 8017E3D4 0017B314 48 0E 87 61 */ bl __mi__4cXyzCFRC3Vec /* 8017E3D8 0017B318 C0 01 00 78 */ lfs f0, 0x78(r1) /* 8017E3DC 0017B31C D0 01 00 6C */ stfs f0, 0x6c(r1) /* 8017E3E0 0017B320 C0 01 00 7C */ lfs f0, 0x7c(r1) @@ -424,11 +424,11 @@ lbl_8017E578: /* 8017E5C4 0017B504 38 61 00 60 */ addi r3, r1, 0x60 /* 8017E5C8 0017B508 38 9F 04 14 */ addi r4, r31, 0x414 /* 8017E5CC 0017B50C 38 BF 00 64 */ addi r5, r31, 0x64 -/* 8017E5D0 0017B510 48 0E 85 65 */ bl cXyz_NS___mi +/* 8017E5D0 0017B510 48 0E 85 65 */ bl __mi__4cXyzCFRC3Vec /* 8017E5D4 0017B514 38 61 00 54 */ addi r3, r1, 0x54 /* 8017E5D8 0017B518 38 81 00 60 */ addi r4, r1, 0x60 /* 8017E5DC 0017B51C FC 20 F0 90 */ fmr f1, f30 -/* 8017E5E0 0017B520 48 0E 85 A5 */ bl cXyz_NS___ml +/* 8017E5E0 0017B520 48 0E 85 A5 */ bl __ml__4cXyzCFf /* 8017E5E4 0017B524 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017E5E8 0017B528 38 81 00 54 */ addi r4, r1, 0x54 /* 8017E5EC 0017B52C 7C 65 1B 78 */ mr r5, r3 @@ -443,45 +443,45 @@ lbl_8017E578: /* 8017E610 0017B550 38 9F 03 FC */ addi r4, r31, 0x3fc /* 8017E614 0017B554 3B DF 00 60 */ addi r30, r31, 0x60 /* 8017E618 0017B558 7F C5 F3 78 */ mr r5, r30 -/* 8017E61C 0017B55C 48 0F 2B 89 */ bl cSAngle_NS___mi_X1_ +/* 8017E61C 0017B55C 48 0F 2B 89 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017E620 0017B560 38 61 00 20 */ addi r3, r1, 0x20 /* 8017E624 0017B564 38 81 00 24 */ addi r4, r1, 0x24 /* 8017E628 0017B568 FC 20 F0 90 */ fmr f1, f30 -/* 8017E62C 0017B56C 48 0F 2C 39 */ bl cSAngle_NS___ml +/* 8017E62C 0017B56C 48 0F 2C 39 */ bl __ml__7cSAngleCFf /* 8017E630 0017B570 38 61 00 1C */ addi r3, r1, 0x1c /* 8017E634 0017B574 7F C4 F3 78 */ mr r4, r30 /* 8017E638 0017B578 38 A1 00 20 */ addi r5, r1, 0x20 -/* 8017E63C 0017B57C 48 0F 2B 39 */ bl cSAngle_NS___pl +/* 8017E63C 0017B57C 48 0F 2B 39 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017E640 0017B580 38 61 00 0C */ addi r3, r1, 0xc /* 8017E644 0017B584 A8 81 00 1C */ lha r4, 0x1c(r1) -/* 8017E648 0017B588 48 0F 29 51 */ bl cSAngle_X2_ +/* 8017E648 0017B588 48 0F 29 51 */ bl __ct__7cSAngleFs /* 8017E64C 0017B58C A8 01 00 0C */ lha r0, 0xc(r1) /* 8017E650 0017B590 B0 1F 00 60 */ sth r0, 0x60(r31) /* 8017E654 0017B594 38 61 00 18 */ addi r3, r1, 0x18 /* 8017E658 0017B598 38 9F 03 FE */ addi r4, r31, 0x3fe /* 8017E65C 0017B59C 3B DF 00 62 */ addi r30, r31, 0x62 /* 8017E660 0017B5A0 7F C5 F3 78 */ mr r5, r30 -/* 8017E664 0017B5A4 48 0F 2B 41 */ bl cSAngle_NS___mi_X1_ +/* 8017E664 0017B5A4 48 0F 2B 41 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017E668 0017B5A8 38 61 00 14 */ addi r3, r1, 0x14 /* 8017E66C 0017B5AC 38 81 00 18 */ addi r4, r1, 0x18 /* 8017E670 0017B5B0 FC 20 F0 90 */ fmr f1, f30 -/* 8017E674 0017B5B4 48 0F 2B F1 */ bl cSAngle_NS___ml +/* 8017E674 0017B5B4 48 0F 2B F1 */ bl __ml__7cSAngleCFf /* 8017E678 0017B5B8 38 61 00 10 */ addi r3, r1, 0x10 /* 8017E67C 0017B5BC 7F C4 F3 78 */ mr r4, r30 /* 8017E680 0017B5C0 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8017E684 0017B5C4 48 0F 2A F1 */ bl cSAngle_NS___pl +/* 8017E684 0017B5C4 48 0F 2A F1 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017E688 0017B5C8 38 61 00 08 */ addi r3, r1, 8 /* 8017E68C 0017B5CC A8 81 00 10 */ lha r4, 0x10(r1) -/* 8017E690 0017B5D0 48 0F 29 09 */ bl cSAngle_X2_ +/* 8017E690 0017B5D0 48 0F 29 09 */ bl __ct__7cSAngleFs /* 8017E694 0017B5D4 A8 01 00 08 */ lha r0, 8(r1) /* 8017E698 0017B5D8 B0 1F 00 62 */ sth r0, 0x62(r31) /* 8017E69C 0017B5DC 38 61 00 48 */ addi r3, r1, 0x48 /* 8017E6A0 0017B5E0 38 9F 00 5C */ addi r4, r31, 0x5c -/* 8017E6A4 0017B5E4 48 0F 34 11 */ bl cSGlobe_NS_Xyz +/* 8017E6A4 0017B5E4 48 0F 34 11 */ bl Xyz__7cSGlobeCFv /* 8017E6A8 0017B5E8 38 61 00 3C */ addi r3, r1, 0x3c /* 8017E6AC 0017B5EC 38 9F 00 64 */ addi r4, r31, 0x64 /* 8017E6B0 0017B5F0 38 A1 00 48 */ addi r5, r1, 0x48 -/* 8017E6B4 0017B5F4 48 0E 84 31 */ bl cXyz_NS___pl +/* 8017E6B4 0017B5F4 48 0E 84 31 */ bl __pl__4cXyzCFRC3Vec /* 8017E6B8 0017B5F8 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 8017E6BC 0017B5FC D0 1F 00 70 */ stfs f0, 0x70(r31) /* 8017E6C0 0017B600 C0 01 00 40 */ lfs f0, 0x40(r1) diff --git a/include/d/d_camera/asm/func_8017E730.s b/include/d/d_camera/asm/func_8017E730.s index 939b46b4ef..7cd7aa0780 100644 --- a/include/d/d_camera/asm/func_8017E730.s +++ b/include/d/d_camera/asm/func_8017E730.s @@ -115,7 +115,7 @@ lbl_8017E8D4: /* 8017E8E8 0017B828 D0 01 01 AC */ stfs f0, 0x1ac(r1) /* 8017E8EC 0017B82C 38 7E 04 04 */ addi r3, r30, 0x404 /* 8017E8F0 0017B830 38 81 01 A4 */ addi r4, r1, 0x1a4 -/* 8017E8F4 0017B834 48 0E 87 79 */ bl cXyz_NS___ne +/* 8017E8F4 0017B834 48 0E 87 79 */ bl __ne__4cXyzCFRC3Vec /* 8017E8F8 0017B838 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017E8FC 0017B83C 41 82 00 0C */ beq lbl_8017E908 /* 8017E900 0017B840 7F C3 F3 78 */ mr r3, r30 @@ -193,10 +193,10 @@ lbl_8017E9E4: /* 8017EA08 0017B948 38 61 01 68 */ addi r3, r1, 0x168 /* 8017EA0C 0017B94C 38 81 01 A4 */ addi r4, r1, 0x1a4 /* 8017EA10 0017B950 38 BE 00 64 */ addi r5, r30, 0x64 -/* 8017EA14 0017B954 48 0E 81 21 */ bl cXyz_NS___mi +/* 8017EA14 0017B954 48 0E 81 21 */ bl __mi__4cXyzCFRC3Vec /* 8017EA18 0017B958 38 61 00 70 */ addi r3, r1, 0x70 /* 8017EA1C 0017B95C 38 81 01 68 */ addi r4, r1, 0x168 -/* 8017EA20 0017B960 48 0F 2E 61 */ bl cSGlobe_X4_ +/* 8017EA20 0017B960 48 0F 2E 61 */ bl __ct__7cSGlobeFRC4cXyz /* 8017EA24 0017B964 C0 01 00 70 */ lfs f0, 0x70(r1) /* 8017EA28 0017B968 FC 00 E8 40 */ fcmpo cr0, f0, f29 /* 8017EA2C 0017B96C 40 81 00 08 */ ble lbl_8017EA34 @@ -204,11 +204,11 @@ lbl_8017E9E4: lbl_8017EA34: /* 8017EA34 0017B974 38 61 01 5C */ addi r3, r1, 0x15c /* 8017EA38 0017B978 38 81 00 70 */ addi r4, r1, 0x70 -/* 8017EA3C 0017B97C 48 0F 30 79 */ bl cSGlobe_NS_Xyz +/* 8017EA3C 0017B97C 48 0F 30 79 */ bl Xyz__7cSGlobeCFv /* 8017EA40 0017B980 38 61 01 50 */ addi r3, r1, 0x150 /* 8017EA44 0017B984 38 9E 00 64 */ addi r4, r30, 0x64 /* 8017EA48 0017B988 38 A1 01 5C */ addi r5, r1, 0x15c -/* 8017EA4C 0017B98C 48 0E 80 99 */ bl cXyz_NS___pl +/* 8017EA4C 0017B98C 48 0E 80 99 */ bl __pl__4cXyzCFRC3Vec /* 8017EA50 0017B990 C0 01 01 50 */ lfs f0, 0x150(r1) /* 8017EA54 0017B994 D0 01 01 8C */ stfs f0, 0x18c(r1) /* 8017EA58 0017B998 C0 01 01 54 */ lfs f0, 0x154(r1) @@ -218,7 +218,7 @@ lbl_8017EA34: /* 8017EA68 0017B9A8 38 61 01 44 */ addi r3, r1, 0x144 /* 8017EA6C 0017B9AC 38 81 01 8C */ addi r4, r1, 0x18c /* 8017EA70 0017B9B0 38 BE 00 3C */ addi r5, r30, 0x3c -/* 8017EA74 0017B9B4 48 0E 80 C1 */ bl cXyz_NS___mi +/* 8017EA74 0017B9B4 48 0E 80 C1 */ bl __mi__4cXyzCFRC3Vec /* 8017EA78 0017B9B8 C0 01 01 44 */ lfs f0, 0x144(r1) /* 8017EA7C 0017B9BC D0 01 01 38 */ stfs f0, 0x138(r1) /* 8017EA80 0017B9C0 C0 01 01 48 */ lfs f0, 0x148(r1) @@ -304,7 +304,7 @@ lbl_8017EB84: /* 8017EB98 0017BAD8 38 61 01 20 */ addi r3, r1, 0x120 /* 8017EB9C 0017BADC 38 9E 00 30 */ addi r4, r30, 0x30 /* 8017EBA0 0017BAE0 38 A1 01 2C */ addi r5, r1, 0x12c -/* 8017EBA4 0017BAE4 48 0E 7F 91 */ bl cXyz_NS___mi +/* 8017EBA4 0017BAE4 48 0E 7F 91 */ bl __mi__4cXyzCFRC3Vec /* 8017EBA8 0017BAE8 C0 01 01 20 */ lfs f0, 0x120(r1) /* 8017EBAC 0017BAEC D0 01 01 14 */ stfs f0, 0x114(r1) /* 8017EBB0 0017BAF0 C0 01 01 24 */ lfs f0, 0x124(r1) @@ -507,11 +507,11 @@ lbl_8017EE6C: /* 8017EE6C 0017BDAC 38 61 00 FC */ addi r3, r1, 0xfc /* 8017EE70 0017BDB0 38 81 01 74 */ addi r4, r1, 0x174 /* 8017EE74 0017BDB4 38 BE 03 F8 */ addi r5, r30, 0x3f8 -/* 8017EE78 0017BDB8 48 0E 7C BD */ bl cXyz_NS___mi +/* 8017EE78 0017BDB8 48 0E 7C BD */ bl __mi__4cXyzCFRC3Vec /* 8017EE7C 0017BDBC 38 61 00 F0 */ addi r3, r1, 0xf0 /* 8017EE80 0017BDC0 38 81 00 FC */ addi r4, r1, 0xfc /* 8017EE84 0017BDC4 FC 20 B0 90 */ fmr f1, f22 -/* 8017EE88 0017BDC8 48 0E 7C FD */ bl cXyz_NS___ml +/* 8017EE88 0017BDC8 48 0E 7C FD */ bl __ml__4cXyzCFf /* 8017EE8C 0017BDCC 38 7E 03 F8 */ addi r3, r30, 0x3f8 /* 8017EE90 0017BDD0 38 81 00 F0 */ addi r4, r1, 0xf0 /* 8017EE94 0017BDD4 7C 65 1B 78 */ mr r5, r3 @@ -519,11 +519,11 @@ lbl_8017EE6C: /* 8017EE9C 0017BDDC 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8017EEA0 0017BDE0 38 9E 03 F8 */ addi r4, r30, 0x3f8 /* 8017EEA4 0017BDE4 38 BE 00 64 */ addi r5, r30, 0x64 -/* 8017EEA8 0017BDE8 48 0E 7C 8D */ bl cXyz_NS___mi +/* 8017EEA8 0017BDE8 48 0E 7C 8D */ bl __mi__4cXyzCFRC3Vec /* 8017EEAC 0017BDEC 38 61 00 D8 */ addi r3, r1, 0xd8 /* 8017EEB0 0017BDF0 38 81 00 E4 */ addi r4, r1, 0xe4 /* 8017EEB4 0017BDF4 38 A1 01 80 */ addi r5, r1, 0x180 -/* 8017EEB8 0017BDF8 48 0E 7D 19 */ bl cXyz_NS___ml_X1_ +/* 8017EEB8 0017BDF8 48 0E 7D 19 */ bl __ml__4cXyzCFRC3Vec /* 8017EEBC 0017BDFC 38 7E 00 64 */ addi r3, r30, 0x64 /* 8017EEC0 0017BE00 38 81 00 D8 */ addi r4, r1, 0xd8 /* 8017EEC4 0017BE04 7C 65 1B 78 */ mr r5, r3 @@ -531,10 +531,10 @@ lbl_8017EE6C: /* 8017EECC 0017BE0C 38 61 00 CC */ addi r3, r1, 0xcc /* 8017EED0 0017BE10 38 81 01 A4 */ addi r4, r1, 0x1a4 /* 8017EED4 0017BE14 38 BE 00 64 */ addi r5, r30, 0x64 -/* 8017EED8 0017BE18 48 0E 7C 5D */ bl cXyz_NS___mi +/* 8017EED8 0017BE18 48 0E 7C 5D */ bl __mi__4cXyzCFRC3Vec /* 8017EEDC 0017BE1C 38 61 00 68 */ addi r3, r1, 0x68 /* 8017EEE0 0017BE20 38 81 00 CC */ addi r4, r1, 0xcc -/* 8017EEE4 0017BE24 48 0F 29 9D */ bl cSGlobe_X4_ +/* 8017EEE4 0017BE24 48 0F 29 9D */ bl __ct__7cSGlobeFRC4cXyz /* 8017EEE8 0017BE28 80 1E 0A F4 */ lwz r0, 0xaf4(r30) /* 8017EEEC 0017BE2C 7C 60 FA 14 */ add r3, r0, r31 /* 8017EEF0 0017BE30 A0 03 00 06 */ lhz r0, 6(r3) @@ -544,10 +544,10 @@ lbl_8017EE6C: /* 8017EF00 0017BE40 A8 1E 07 D0 */ lha r0, 0x7d0(r30) /* 8017EF04 0017BE44 7C 00 00 D0 */ neg r0, r0 /* 8017EF08 0017BE48 7C 04 07 34 */ extsh r4, r0 -/* 8017EF0C 0017BE4C 48 0F 20 8D */ bl cSAngle_X2_ +/* 8017EF0C 0017BE4C 48 0F 20 8D */ bl __ct__7cSAngleFs /* 8017EF10 0017BE50 38 61 00 1C */ addi r3, r1, 0x1c /* 8017EF14 0017BE54 A8 81 00 54 */ lha r4, 0x54(r1) -/* 8017EF18 0017BE58 48 0F 20 81 */ bl cSAngle_X2_ +/* 8017EF18 0017BE58 48 0F 20 81 */ bl __ct__7cSAngleFs /* 8017EF1C 0017BE5C A8 01 00 1C */ lha r0, 0x1c(r1) /* 8017EF20 0017BE60 B0 01 00 6C */ sth r0, 0x6c(r1) lbl_8017EF24: @@ -571,45 +571,45 @@ lbl_8017EF44: /* 8017EF60 0017BEA0 38 81 00 6C */ addi r4, r1, 0x6c /* 8017EF64 0017BEA4 3B FE 00 60 */ addi r31, r30, 0x60 /* 8017EF68 0017BEA8 7F E5 FB 78 */ mr r5, r31 -/* 8017EF6C 0017BEAC 48 0F 22 39 */ bl cSAngle_NS___mi_X1_ +/* 8017EF6C 0017BEAC 48 0F 22 39 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017EF70 0017BEB0 38 61 00 4C */ addi r3, r1, 0x4c /* 8017EF74 0017BEB4 38 81 00 50 */ addi r4, r1, 0x50 /* 8017EF78 0017BEB8 FC 20 B0 90 */ fmr f1, f22 -/* 8017EF7C 0017BEBC 48 0F 22 E9 */ bl cSAngle_NS___ml +/* 8017EF7C 0017BEBC 48 0F 22 E9 */ bl __ml__7cSAngleCFf /* 8017EF80 0017BEC0 38 61 00 48 */ addi r3, r1, 0x48 /* 8017EF84 0017BEC4 7F E4 FB 78 */ mr r4, r31 /* 8017EF88 0017BEC8 38 A1 00 4C */ addi r5, r1, 0x4c -/* 8017EF8C 0017BECC 48 0F 21 E9 */ bl cSAngle_NS___pl +/* 8017EF8C 0017BECC 48 0F 21 E9 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017EF90 0017BED0 38 61 00 18 */ addi r3, r1, 0x18 /* 8017EF94 0017BED4 A8 81 00 48 */ lha r4, 0x48(r1) -/* 8017EF98 0017BED8 48 0F 20 01 */ bl cSAngle_X2_ +/* 8017EF98 0017BED8 48 0F 20 01 */ bl __ct__7cSAngleFs /* 8017EF9C 0017BEDC A8 01 00 18 */ lha r0, 0x18(r1) /* 8017EFA0 0017BEE0 B0 1E 00 60 */ sth r0, 0x60(r30) /* 8017EFA4 0017BEE4 38 61 00 44 */ addi r3, r1, 0x44 /* 8017EFA8 0017BEE8 38 81 00 6E */ addi r4, r1, 0x6e /* 8017EFAC 0017BEEC 3B FE 00 62 */ addi r31, r30, 0x62 /* 8017EFB0 0017BEF0 7F E5 FB 78 */ mr r5, r31 -/* 8017EFB4 0017BEF4 48 0F 21 F1 */ bl cSAngle_NS___mi_X1_ +/* 8017EFB4 0017BEF4 48 0F 21 F1 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017EFB8 0017BEF8 38 61 00 40 */ addi r3, r1, 0x40 /* 8017EFBC 0017BEFC 38 81 00 44 */ addi r4, r1, 0x44 /* 8017EFC0 0017BF00 FC 20 B0 90 */ fmr f1, f22 -/* 8017EFC4 0017BF04 48 0F 22 A1 */ bl cSAngle_NS___ml +/* 8017EFC4 0017BF04 48 0F 22 A1 */ bl __ml__7cSAngleCFf /* 8017EFC8 0017BF08 38 61 00 3C */ addi r3, r1, 0x3c /* 8017EFCC 0017BF0C 7F E4 FB 78 */ mr r4, r31 /* 8017EFD0 0017BF10 38 A1 00 40 */ addi r5, r1, 0x40 -/* 8017EFD4 0017BF14 48 0F 21 A1 */ bl cSAngle_NS___pl +/* 8017EFD4 0017BF14 48 0F 21 A1 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017EFD8 0017BF18 38 61 00 14 */ addi r3, r1, 0x14 /* 8017EFDC 0017BF1C A8 81 00 3C */ lha r4, 0x3c(r1) -/* 8017EFE0 0017BF20 48 0F 1F B9 */ bl cSAngle_X2_ +/* 8017EFE0 0017BF20 48 0F 1F B9 */ bl __ct__7cSAngleFs /* 8017EFE4 0017BF24 A8 01 00 14 */ lha r0, 0x14(r1) /* 8017EFE8 0017BF28 B0 1E 00 62 */ sth r0, 0x62(r30) /* 8017EFEC 0017BF2C 38 61 00 C0 */ addi r3, r1, 0xc0 /* 8017EFF0 0017BF30 38 9E 00 5C */ addi r4, r30, 0x5c -/* 8017EFF4 0017BF34 48 0F 2A C1 */ bl cSGlobe_NS_Xyz +/* 8017EFF4 0017BF34 48 0F 2A C1 */ bl Xyz__7cSGlobeCFv /* 8017EFF8 0017BF38 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8017EFFC 0017BF3C 38 9E 00 64 */ addi r4, r30, 0x64 /* 8017F000 0017BF40 38 A1 00 C0 */ addi r5, r1, 0xc0 -/* 8017F004 0017BF44 48 0E 7A E1 */ bl cXyz_NS___pl +/* 8017F004 0017BF44 48 0E 7A E1 */ bl __pl__4cXyzCFRC3Vec /* 8017F008 0017BF48 C0 01 00 B4 */ lfs f0, 0xb4(r1) /* 8017F00C 0017BF4C D0 1E 00 70 */ stfs f0, 0x70(r30) /* 8017F010 0017BF50 C0 01 00 B8 */ lfs f0, 0xb8(r1) @@ -635,11 +635,11 @@ lbl_8017F058: /* 8017F058 0017BF98 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8017F05C 0017BF9C 38 81 01 74 */ addi r4, r1, 0x174 /* 8017F060 0017BFA0 38 BE 00 64 */ addi r5, r30, 0x64 -/* 8017F064 0017BFA4 48 0E 7A D1 */ bl cXyz_NS___mi +/* 8017F064 0017BFA4 48 0E 7A D1 */ bl __mi__4cXyzCFRC3Vec /* 8017F068 0017BFA8 38 61 00 9C */ addi r3, r1, 0x9c /* 8017F06C 0017BFAC 38 81 00 A8 */ addi r4, r1, 0xa8 /* 8017F070 0017BFB0 38 A1 01 80 */ addi r5, r1, 0x180 -/* 8017F074 0017BFB4 48 0E 7B 5D */ bl cXyz_NS___ml_X1_ +/* 8017F074 0017BFB4 48 0E 7B 5D */ bl __ml__4cXyzCFRC3Vec /* 8017F078 0017BFB8 38 7E 00 64 */ addi r3, r30, 0x64 /* 8017F07C 0017BFBC 38 81 00 9C */ addi r4, r1, 0x9c /* 8017F080 0017BFC0 7C 65 1B 78 */ mr r5, r3 @@ -647,10 +647,10 @@ lbl_8017F058: /* 8017F088 0017BFC8 38 61 00 90 */ addi r3, r1, 0x90 /* 8017F08C 0017BFCC 38 81 01 A4 */ addi r4, r1, 0x1a4 /* 8017F090 0017BFD0 38 BE 00 64 */ addi r5, r30, 0x64 -/* 8017F094 0017BFD4 48 0E 7A A1 */ bl cXyz_NS___mi +/* 8017F094 0017BFD4 48 0E 7A A1 */ bl __mi__4cXyzCFRC3Vec /* 8017F098 0017BFD8 38 61 00 60 */ addi r3, r1, 0x60 /* 8017F09C 0017BFDC 38 81 00 90 */ addi r4, r1, 0x90 -/* 8017F0A0 0017BFE0 48 0F 27 E1 */ bl cSGlobe_X4_ +/* 8017F0A0 0017BFE0 48 0F 27 E1 */ bl __ct__7cSGlobeFRC4cXyz /* 8017F0A4 0017BFE4 80 1E 0A F4 */ lwz r0, 0xaf4(r30) /* 8017F0A8 0017BFE8 7C 60 FA 14 */ add r3, r0, r31 /* 8017F0AC 0017BFEC A0 03 00 06 */ lhz r0, 6(r3) @@ -660,10 +660,10 @@ lbl_8017F058: /* 8017F0BC 0017BFFC A8 1E 07 D0 */ lha r0, 0x7d0(r30) /* 8017F0C0 0017C000 7C 00 00 D0 */ neg r0, r0 /* 8017F0C4 0017C004 7C 04 07 34 */ extsh r4, r0 -/* 8017F0C8 0017C008 48 0F 1E D1 */ bl cSAngle_X2_ +/* 8017F0C8 0017C008 48 0F 1E D1 */ bl __ct__7cSAngleFs /* 8017F0CC 0017C00C 38 61 00 10 */ addi r3, r1, 0x10 /* 8017F0D0 0017C010 A8 81 00 38 */ lha r4, 0x38(r1) -/* 8017F0D4 0017C014 48 0F 1E C5 */ bl cSAngle_X2_ +/* 8017F0D4 0017C014 48 0F 1E C5 */ bl __ct__7cSAngleFs /* 8017F0D8 0017C018 A8 01 00 10 */ lha r0, 0x10(r1) /* 8017F0DC 0017C01C B0 01 00 64 */ sth r0, 0x64(r1) lbl_8017F0E0: @@ -687,45 +687,45 @@ lbl_8017F100: /* 8017F11C 0017C05C 38 81 00 64 */ addi r4, r1, 0x64 /* 8017F120 0017C060 3B FE 00 60 */ addi r31, r30, 0x60 /* 8017F124 0017C064 7F E5 FB 78 */ mr r5, r31 -/* 8017F128 0017C068 48 0F 20 7D */ bl cSAngle_NS___mi_X1_ +/* 8017F128 0017C068 48 0F 20 7D */ bl __mi__7cSAngleCFRC7cSAngle /* 8017F12C 0017C06C 38 61 00 30 */ addi r3, r1, 0x30 /* 8017F130 0017C070 38 81 00 34 */ addi r4, r1, 0x34 /* 8017F134 0017C074 FC 20 D0 90 */ fmr f1, f26 -/* 8017F138 0017C078 48 0F 21 2D */ bl cSAngle_NS___ml +/* 8017F138 0017C078 48 0F 21 2D */ bl __ml__7cSAngleCFf /* 8017F13C 0017C07C 38 61 00 2C */ addi r3, r1, 0x2c /* 8017F140 0017C080 7F E4 FB 78 */ mr r4, r31 /* 8017F144 0017C084 38 A1 00 30 */ addi r5, r1, 0x30 -/* 8017F148 0017C088 48 0F 20 2D */ bl cSAngle_NS___pl +/* 8017F148 0017C088 48 0F 20 2D */ bl __pl__7cSAngleCFRC7cSAngle /* 8017F14C 0017C08C 38 61 00 0C */ addi r3, r1, 0xc /* 8017F150 0017C090 A8 81 00 2C */ lha r4, 0x2c(r1) -/* 8017F154 0017C094 48 0F 1E 45 */ bl cSAngle_X2_ +/* 8017F154 0017C094 48 0F 1E 45 */ bl __ct__7cSAngleFs /* 8017F158 0017C098 A8 01 00 0C */ lha r0, 0xc(r1) /* 8017F15C 0017C09C B0 1E 00 60 */ sth r0, 0x60(r30) /* 8017F160 0017C0A0 38 61 00 28 */ addi r3, r1, 0x28 /* 8017F164 0017C0A4 38 81 00 66 */ addi r4, r1, 0x66 /* 8017F168 0017C0A8 3B FE 00 62 */ addi r31, r30, 0x62 /* 8017F16C 0017C0AC 7F E5 FB 78 */ mr r5, r31 -/* 8017F170 0017C0B0 48 0F 20 35 */ bl cSAngle_NS___mi_X1_ +/* 8017F170 0017C0B0 48 0F 20 35 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017F174 0017C0B4 38 61 00 24 */ addi r3, r1, 0x24 /* 8017F178 0017C0B8 38 81 00 28 */ addi r4, r1, 0x28 /* 8017F17C 0017C0BC FC 20 D0 90 */ fmr f1, f26 -/* 8017F180 0017C0C0 48 0F 20 E5 */ bl cSAngle_NS___ml +/* 8017F180 0017C0C0 48 0F 20 E5 */ bl __ml__7cSAngleCFf /* 8017F184 0017C0C4 38 61 00 20 */ addi r3, r1, 0x20 /* 8017F188 0017C0C8 7F E4 FB 78 */ mr r4, r31 /* 8017F18C 0017C0CC 38 A1 00 24 */ addi r5, r1, 0x24 -/* 8017F190 0017C0D0 48 0F 1F E5 */ bl cSAngle_NS___pl +/* 8017F190 0017C0D0 48 0F 1F E5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017F194 0017C0D4 38 61 00 08 */ addi r3, r1, 8 /* 8017F198 0017C0D8 A8 81 00 20 */ lha r4, 0x20(r1) -/* 8017F19C 0017C0DC 48 0F 1D FD */ bl cSAngle_X2_ +/* 8017F19C 0017C0DC 48 0F 1D FD */ bl __ct__7cSAngleFs /* 8017F1A0 0017C0E0 A8 01 00 08 */ lha r0, 8(r1) /* 8017F1A4 0017C0E4 B0 1E 00 62 */ sth r0, 0x62(r30) /* 8017F1A8 0017C0E8 38 61 00 84 */ addi r3, r1, 0x84 /* 8017F1AC 0017C0EC 38 9E 00 5C */ addi r4, r30, 0x5c -/* 8017F1B0 0017C0F0 48 0F 29 05 */ bl cSGlobe_NS_Xyz +/* 8017F1B0 0017C0F0 48 0F 29 05 */ bl Xyz__7cSGlobeCFv /* 8017F1B4 0017C0F4 38 61 00 78 */ addi r3, r1, 0x78 /* 8017F1B8 0017C0F8 38 9E 00 64 */ addi r4, r30, 0x64 /* 8017F1BC 0017C0FC 38 A1 00 84 */ addi r5, r1, 0x84 -/* 8017F1C0 0017C100 48 0E 79 25 */ bl cXyz_NS___pl +/* 8017F1C0 0017C100 48 0E 79 25 */ bl __pl__4cXyzCFRC3Vec /* 8017F1C4 0017C104 C0 01 00 78 */ lfs f0, 0x78(r1) /* 8017F1C8 0017C108 D0 1E 00 70 */ stfs f0, 0x70(r30) /* 8017F1CC 0017C10C C0 01 00 7C */ lfs f0, 0x7c(r1) diff --git a/include/d/d_camera/asm/func_8017F25C.s b/include/d/d_camera/asm/func_8017F25C.s index dc5fc0a532..dd4984ead1 100644 --- a/include/d/d_camera/asm/func_8017F25C.s +++ b/include/d/d_camera/asm/func_8017F25C.s @@ -103,7 +103,7 @@ lbl_8017F3D0: /* 8017F3E4 0017C324 D0 01 00 DC */ stfs f0, 0xdc(r1) /* 8017F3E8 0017C328 38 7E 04 04 */ addi r3, r30, 0x404 /* 8017F3EC 0017C32C 38 81 00 D4 */ addi r4, r1, 0xd4 -/* 8017F3F0 0017C330 48 0E 7C 7D */ bl cXyz_NS___ne +/* 8017F3F0 0017C330 48 0E 7C 7D */ bl __ne__4cXyzCFRC3Vec /* 8017F3F4 0017C334 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017F3F8 0017C338 41 82 00 0C */ beq lbl_8017F404 /* 8017F3FC 0017C33C 7F C3 F3 78 */ mr r3, r30 @@ -138,12 +138,12 @@ lbl_8017F44C: /* 8017F468 0017C3A8 90 01 00 E0 */ stw r0, 0xe0(r1) /* 8017F46C 0017C3AC C8 01 00 E0 */ lfd f0, 0xe0(r1) /* 8017F470 0017C3B0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8017F474 0017C3B4 48 0F 1B 99 */ bl cSAngle_NS_Val_X3_ +/* 8017F474 0017C3B4 48 0F 1B 99 */ bl Val__7cSAngleFf /* 8017F478 0017C3B8 48 00 00 10 */ b lbl_8017F488 lbl_8017F47C: /* 8017F47C 0017C3BC 38 61 00 50 */ addi r3, r1, 0x50 /* 8017F480 0017C3C0 C0 22 9D 84 */ lfs f1, lbl_80453784-_SDA2_BASE_(r2) -/* 8017F484 0017C3C4 48 0F 1B 89 */ bl cSAngle_NS_Val_X3_ +/* 8017F484 0017C3C4 48 0F 1B 89 */ bl Val__7cSAngleFf lbl_8017F488: /* 8017F488 0017C3C8 88 1E 0A EE */ lbz r0, 0xaee(r30) /* 8017F48C 0017C3CC 28 00 00 FF */ cmplwi r0, 0xff @@ -166,7 +166,7 @@ lbl_8017F4B8: /* 8017F4CC 0017C40C D0 01 00 DC */ stfs f0, 0xdc(r1) /* 8017F4D0 0017C410 38 61 00 50 */ addi r3, r1, 0x50 /* 8017F4D4 0017C414 C0 22 9D 84 */ lfs f1, lbl_80453784-_SDA2_BASE_(r2) -/* 8017F4D8 0017C418 48 0F 1B 35 */ bl cSAngle_NS_Val_X3_ +/* 8017F4D8 0017C418 48 0F 1B 35 */ bl Val__7cSAngleFf lbl_8017F4DC: /* 8017F4DC 0017C41C 38 00 00 01 */ li r0, 1 /* 8017F4E0 0017C420 98 1E 01 58 */ stb r0, 0x158(r30) @@ -194,7 +194,7 @@ lbl_8017F4DC: /* 8017F538 0017C478 38 61 00 8C */ addi r3, r1, 0x8c /* 8017F53C 0017C47C 38 81 00 98 */ addi r4, r1, 0x98 /* 8017F540 0017C480 38 A1 00 C8 */ addi r5, r1, 0xc8 -/* 8017F544 0017C484 48 0E 75 A1 */ bl cXyz_NS___pl +/* 8017F544 0017C484 48 0E 75 A1 */ bl __pl__4cXyzCFRC3Vec /* 8017F548 0017C488 C0 01 00 8C */ lfs f0, 0x8c(r1) /* 8017F54C 0017C48C D0 01 00 BC */ stfs f0, 0xbc(r1) /* 8017F550 0017C490 C0 01 00 90 */ lfs f0, 0x90(r1) @@ -204,10 +204,10 @@ lbl_8017F4DC: /* 8017F560 0017C4A0 38 61 00 80 */ addi r3, r1, 0x80 /* 8017F564 0017C4A4 38 81 00 BC */ addi r4, r1, 0xbc /* 8017F568 0017C4A8 38 A1 00 D4 */ addi r5, r1, 0xd4 -/* 8017F56C 0017C4AC 48 0E 75 C9 */ bl cXyz_NS___mi +/* 8017F56C 0017C4AC 48 0E 75 C9 */ bl __mi__4cXyzCFRC3Vec /* 8017F570 0017C4B0 38 61 00 54 */ addi r3, r1, 0x54 /* 8017F574 0017C4B4 38 81 00 80 */ addi r4, r1, 0x80 -/* 8017F578 0017C4B8 48 0F 23 09 */ bl cSGlobe_X4_ +/* 8017F578 0017C4B8 48 0F 23 09 */ bl __ct__7cSGlobeFRC4cXyz /* 8017F57C 0017C4BC C0 21 00 54 */ lfs f1, 0x54(r1) /* 8017F580 0017C4C0 C0 02 9D E8 */ lfs f0, lbl_804537E8-_SDA2_BASE_(r2) /* 8017F584 0017C4C4 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -227,37 +227,37 @@ lbl_8017F59C: /* 8017F5B4 0017C4F4 A8 1E 07 D0 */ lha r0, 0x7d0(r30) /* 8017F5B8 0017C4F8 7C 00 00 D0 */ neg r0, r0 /* 8017F5BC 0017C4FC 7C 04 07 34 */ extsh r4, r0 -/* 8017F5C0 0017C500 48 0F 19 D9 */ bl cSAngle_X2_ +/* 8017F5C0 0017C500 48 0F 19 D9 */ bl __ct__7cSAngleFs /* 8017F5C4 0017C504 38 61 00 0C */ addi r3, r1, 0xc /* 8017F5C8 0017C508 A8 81 00 38 */ lha r4, 0x38(r1) -/* 8017F5CC 0017C50C 48 0F 19 CD */ bl cSAngle_X2_ +/* 8017F5CC 0017C50C 48 0F 19 CD */ bl __ct__7cSAngleFs /* 8017F5D0 0017C510 A8 01 00 0C */ lha r0, 0xc(r1) /* 8017F5D4 0017C514 B0 01 00 58 */ sth r0, 0x58(r1) lbl_8017F5D8: /* 8017F5D8 0017C518 38 61 00 4C */ addi r3, r1, 0x4c /* 8017F5DC 0017C51C A8 9E 07 D2 */ lha r4, 0x7d2(r30) -/* 8017F5E0 0017C520 48 0F 19 B9 */ bl cSAngle_X2_ +/* 8017F5E0 0017C520 48 0F 19 B9 */ bl __ct__7cSAngleFs /* 8017F5E4 0017C524 38 61 00 34 */ addi r3, r1, 0x34 /* 8017F5E8 0017C528 38 81 00 5A */ addi r4, r1, 0x5a /* 8017F5EC 0017C52C 38 A1 00 4C */ addi r5, r1, 0x4c -/* 8017F5F0 0017C530 48 0F 1B B5 */ bl cSAngle_NS___mi_X1_ +/* 8017F5F0 0017C530 48 0F 1B B5 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017F5F4 0017C534 38 61 00 48 */ addi r3, r1, 0x48 /* 8017F5F8 0017C538 38 81 00 34 */ addi r4, r1, 0x34 -/* 8017F5FC 0017C53C 48 0F 19 6D */ bl cSAngle_X1_ +/* 8017F5FC 0017C53C 48 0F 19 6D */ bl __ct__7cSAngleFRC7cSAngle /* 8017F600 0017C540 38 61 00 30 */ addi r3, r1, 0x30 /* 8017F604 0017C544 38 81 00 48 */ addi r4, r1, 0x48 /* 8017F608 0017C548 FC 20 D0 90 */ fmr f1, f26 -/* 8017F60C 0017C54C 48 0F 1C 59 */ bl cSAngle_NS___ml +/* 8017F60C 0017C54C 48 0F 1C 59 */ bl __ml__7cSAngleCFf /* 8017F610 0017C550 38 61 00 40 */ addi r3, r1, 0x40 /* 8017F614 0017C554 38 81 00 30 */ addi r4, r1, 0x30 -/* 8017F618 0017C558 48 0F 19 51 */ bl cSAngle_X1_ +/* 8017F618 0017C558 48 0F 19 51 */ bl __ct__7cSAngleFRC7cSAngle /* 8017F61C 0017C55C A8 61 00 48 */ lha r3, 0x48(r1) /* 8017F620 0017C560 A8 01 00 50 */ lha r0, 0x50(r1) /* 8017F624 0017C564 7C 03 00 00 */ cmpw r3, r0 /* 8017F628 0017C568 40 80 00 30 */ bge lbl_8017F658 /* 8017F62C 0017C56C 38 61 00 2C */ addi r3, r1, 0x2c /* 8017F630 0017C570 38 81 00 50 */ addi r4, r1, 0x50 -/* 8017F634 0017C574 48 0F 1B 15 */ bl cSAngle_NS___mi +/* 8017F634 0017C574 48 0F 1B 15 */ bl __mi__7cSAngleCFv /* 8017F638 0017C578 A8 A1 00 48 */ lha r5, 0x48(r1) /* 8017F63C 0017C57C A8 01 00 2C */ lha r0, 0x2c(r1) /* 8017F640 0017C580 7C 04 FE 70 */ srawi r4, r0, 0x1f @@ -281,14 +281,14 @@ lbl_8017F670: /* 8017F680 0017C5C0 38 61 00 28 */ addi r3, r1, 0x28 /* 8017F684 0017C5C4 38 81 00 4C */ addi r4, r1, 0x4c /* 8017F688 0017C5C8 38 A1 00 50 */ addi r5, r1, 0x50 -/* 8017F68C 0017C5CC 48 0F 1A E9 */ bl cSAngle_NS___pl +/* 8017F68C 0017C5CC 48 0F 1A E9 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017F690 0017C5D0 A8 01 00 28 */ lha r0, 0x28(r1) /* 8017F694 0017C5D4 B0 01 00 44 */ sth r0, 0x44(r1) /* 8017F698 0017C5D8 48 00 00 64 */ b lbl_8017F6FC lbl_8017F69C: /* 8017F69C 0017C5DC 38 61 00 24 */ addi r3, r1, 0x24 /* 8017F6A0 0017C5E0 38 81 00 50 */ addi r4, r1, 0x50 -/* 8017F6A4 0017C5E4 48 0F 1A A5 */ bl cSAngle_NS___mi +/* 8017F6A4 0017C5E4 48 0F 1A A5 */ bl __mi__7cSAngleCFv /* 8017F6A8 0017C5E8 A8 01 00 40 */ lha r0, 0x40(r1) /* 8017F6AC 0017C5EC A8 81 00 24 */ lha r4, 0x24(r1) /* 8017F6B0 0017C5F0 7C 80 02 78 */ xor r0, r4, r0 @@ -300,7 +300,7 @@ lbl_8017F69C: /* 8017F6C8 0017C608 38 61 00 20 */ addi r3, r1, 0x20 /* 8017F6CC 0017C60C 38 81 00 4C */ addi r4, r1, 0x4c /* 8017F6D0 0017C610 38 A1 00 50 */ addi r5, r1, 0x50 -/* 8017F6D4 0017C614 48 0F 1A D1 */ bl cSAngle_NS___mi_X1_ +/* 8017F6D4 0017C614 48 0F 1A D1 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017F6D8 0017C618 A8 01 00 20 */ lha r0, 0x20(r1) /* 8017F6DC 0017C61C B0 01 00 44 */ sth r0, 0x44(r1) /* 8017F6E0 0017C620 48 00 00 1C */ b lbl_8017F6FC @@ -308,7 +308,7 @@ lbl_8017F6E4: /* 8017F6E4 0017C624 38 61 00 1C */ addi r3, r1, 0x1c /* 8017F6E8 0017C628 38 81 00 4C */ addi r4, r1, 0x4c /* 8017F6EC 0017C62C 38 A1 00 40 */ addi r5, r1, 0x40 -/* 8017F6F0 0017C630 48 0F 1A 85 */ bl cSAngle_NS___pl +/* 8017F6F0 0017C630 48 0F 1A 85 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017F6F4 0017C634 A8 01 00 1C */ lha r0, 0x1c(r1) /* 8017F6F8 0017C638 B0 01 00 44 */ sth r0, 0x44(r1) lbl_8017F6FC: @@ -322,31 +322,31 @@ lbl_8017F714: /* 8017F714 0017C654 38 61 00 18 */ addi r3, r1, 0x18 /* 8017F718 0017C658 38 81 00 44 */ addi r4, r1, 0x44 /* 8017F71C 0017C65C 38 BE 04 1A */ addi r5, r30, 0x41a -/* 8017F720 0017C660 48 0F 1A 85 */ bl cSAngle_NS___mi_X1_ +/* 8017F720 0017C660 48 0F 1A 85 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017F724 0017C664 38 61 00 14 */ addi r3, r1, 0x14 /* 8017F728 0017C668 38 81 00 18 */ addi r4, r1, 0x18 /* 8017F72C 0017C66C FC 20 E0 90 */ fmr f1, f28 -/* 8017F730 0017C670 48 0F 1B 35 */ bl cSAngle_NS___ml +/* 8017F730 0017C670 48 0F 1B 35 */ bl __ml__7cSAngleCFf /* 8017F734 0017C674 38 61 00 10 */ addi r3, r1, 0x10 /* 8017F738 0017C678 38 81 00 14 */ addi r4, r1, 0x14 /* 8017F73C 0017C67C FC 20 E8 90 */ fmr f1, f29 -/* 8017F740 0017C680 48 0F 1B 25 */ bl cSAngle_NS___ml +/* 8017F740 0017C680 48 0F 1B 25 */ bl __ml__7cSAngleCFf /* 8017F744 0017C684 38 7E 04 1A */ addi r3, r30, 0x41a /* 8017F748 0017C688 38 81 00 10 */ addi r4, r1, 0x10 -/* 8017F74C 0017C68C 48 0F 1A 89 */ bl cSAngle_NS___apl +/* 8017F74C 0017C68C 48 0F 1A 89 */ bl __apl__7cSAngleFRC7cSAngle lbl_8017F750: /* 8017F750 0017C690 38 61 00 08 */ addi r3, r1, 8 /* 8017F754 0017C694 A8 9E 04 1A */ lha r4, 0x41a(r30) -/* 8017F758 0017C698 48 0F 18 41 */ bl cSAngle_X2_ +/* 8017F758 0017C698 48 0F 18 41 */ bl __ct__7cSAngleFs /* 8017F75C 0017C69C A8 01 00 08 */ lha r0, 8(r1) /* 8017F760 0017C6A0 B0 01 00 5A */ sth r0, 0x5a(r1) /* 8017F764 0017C6A4 38 61 00 74 */ addi r3, r1, 0x74 /* 8017F768 0017C6A8 38 81 00 54 */ addi r4, r1, 0x54 -/* 8017F76C 0017C6AC 48 0F 23 49 */ bl cSGlobe_NS_Xyz +/* 8017F76C 0017C6AC 48 0F 23 49 */ bl Xyz__7cSGlobeCFv /* 8017F770 0017C6B0 38 61 00 68 */ addi r3, r1, 0x68 /* 8017F774 0017C6B4 38 81 00 D4 */ addi r4, r1, 0xd4 /* 8017F778 0017C6B8 38 A1 00 74 */ addi r5, r1, 0x74 -/* 8017F77C 0017C6BC 48 0E 73 69 */ bl cXyz_NS___pl +/* 8017F77C 0017C6BC 48 0E 73 69 */ bl __pl__4cXyzCFRC3Vec /* 8017F780 0017C6C0 C0 41 00 68 */ lfs f2, 0x68(r1) /* 8017F784 0017C6C4 D0 41 00 B0 */ stfs f2, 0xb0(r1) /* 8017F788 0017C6C8 C0 21 00 6C */ lfs f1, 0x6c(r1) @@ -365,10 +365,10 @@ lbl_8017F750: /* 8017F7BC 0017C6FC 38 61 00 5C */ addi r3, r1, 0x5c /* 8017F7C0 0017C700 38 9E 00 70 */ addi r4, r30, 0x70 /* 8017F7C4 0017C704 38 BE 00 64 */ addi r5, r30, 0x64 -/* 8017F7C8 0017C708 48 0E 73 6D */ bl cXyz_NS___mi +/* 8017F7C8 0017C708 48 0E 73 6D */ bl __mi__4cXyzCFRC3Vec /* 8017F7CC 0017C70C 38 7E 00 5C */ addi r3, r30, 0x5c /* 8017F7D0 0017C710 38 81 00 5C */ addi r4, r1, 0x5c -/* 8017F7D4 0017C714 48 0F 22 9D */ bl cSGlobe_NS_Val_X3_ +/* 8017F7D4 0017C714 48 0F 22 9D */ bl Val__7cSGlobeFRC4cXyz /* 8017F7D8 0017C718 D3 7E 00 80 */ stfs f27, 0x80(r30) /* 8017F7DC 0017C71C 38 60 00 01 */ li r3, 1 /* 8017F7E0 0017C720 E3 E1 01 48 */ psq_l f31, 328(r1), 0, 0 diff --git a/include/d/d_camera/asm/func_8017F828.s b/include/d/d_camera/asm/func_8017F828.s index e586fa2285..1b5a292f12 100644 --- a/include/d/d_camera/asm/func_8017F828.s +++ b/include/d/d_camera/asm/func_8017F828.s @@ -502,11 +502,11 @@ lbl_8017FF5C: /* 8017FF98 0017CED8 D0 3D 00 5C */ stfs f1, 0x5c(r29) /* 8017FF9C 0017CEDC 38 61 00 54 */ addi r3, r1, 0x54 /* 8017FFA0 0017CEE0 38 9D 00 5C */ addi r4, r29, 0x5c -/* 8017FFA4 0017CEE4 48 0F 1B 11 */ bl cSGlobe_NS_Xyz +/* 8017FFA4 0017CEE4 48 0F 1B 11 */ bl Xyz__7cSGlobeCFv /* 8017FFA8 0017CEE8 38 61 00 48 */ addi r3, r1, 0x48 /* 8017FFAC 0017CEEC 38 9D 00 64 */ addi r4, r29, 0x64 /* 8017FFB0 0017CEF0 38 A1 00 54 */ addi r5, r1, 0x54 -/* 8017FFB4 0017CEF4 48 0E 6B 31 */ bl cXyz_NS___pl +/* 8017FFB4 0017CEF4 48 0E 6B 31 */ bl __pl__4cXyzCFRC3Vec /* 8017FFB8 0017CEF8 C0 01 00 48 */ lfs f0, 0x48(r1) /* 8017FFBC 0017CEFC D0 1D 00 70 */ stfs f0, 0x70(r29) /* 8017FFC0 0017CF00 C0 01 00 4C */ lfs f0, 0x4c(r1) @@ -517,11 +517,11 @@ lbl_8017FF5C: /* 8017FFD4 0017CF14 D0 1D 00 28 */ stfs f0, 0x28(r29) /* 8017FFD8 0017CF18 38 61 00 3C */ addi r3, r1, 0x3c /* 8017FFDC 0017CF1C 38 9D 00 28 */ addi r4, r29, 0x28 -/* 8017FFE0 0017CF20 48 0F 1A D5 */ bl cSGlobe_NS_Xyz +/* 8017FFE0 0017CF20 48 0F 1A D5 */ bl Xyz__7cSGlobeCFv /* 8017FFE4 0017CF24 38 61 00 30 */ addi r3, r1, 0x30 /* 8017FFE8 0017CF28 38 9D 00 30 */ addi r4, r29, 0x30 /* 8017FFEC 0017CF2C 38 A1 00 3C */ addi r5, r1, 0x3c -/* 8017FFF0 0017CF30 48 0E 6A F5 */ bl cXyz_NS___pl +/* 8017FFF0 0017CF30 48 0E 6A F5 */ bl __pl__4cXyzCFRC3Vec /* 8017FFF4 0017CF34 C0 01 00 30 */ lfs f0, 0x30(r1) /* 8017FFF8 0017CF38 D0 1D 00 3C */ stfs f0, 0x3c(r29) /* 8017FFFC 0017CF3C C0 01 00 34 */ lfs f0, 0x34(r1) @@ -843,7 +843,7 @@ lbl_80180444: /* 80180450 0017D390 38 61 00 84 */ addi r3, r1, 0x84 /* 80180454 0017D394 38 9D 00 64 */ addi r4, r29, 0x64 /* 80180458 0017D398 38 BD 00 70 */ addi r5, r29, 0x70 -/* 8018045C 0017D39C 48 0E EE 4D */ bl cM3dGLin +/* 8018045C 0017D39C 48 0E EE 4D */ bl __ct__8cM3dGLinFRC4cXyzRC4cXyz /* 80180460 0017D3A0 38 61 00 24 */ addi r3, r1, 0x24 /* 80180464 0017D3A4 7F A4 EB 78 */ mr r4, r29 /* 80180468 0017D3A8 80 BD 01 80 */ lwz r5, 0x180(r29) @@ -858,7 +858,7 @@ lbl_80180444: /* 8018048C 0017D3CC 38 81 00 6C */ addi r4, r1, 0x6c /* 80180490 0017D3D0 38 A1 00 60 */ addi r5, r1, 0x60 /* 80180494 0017D3D4 38 C1 00 08 */ addi r6, r1, 8 -/* 80180498 0017D3D8 48 0E 82 79 */ bl cM3d_Len3dSqPntAndSegLine +/* 80180498 0017D3D8 48 0E 82 79 */ bl cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf /* 8018049C 0017D3DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801804A0 0017D3E0 41 82 00 38 */ beq lbl_801804D8 /* 801804A4 0017D3E4 C0 01 00 60 */ lfs f0, 0x60(r1) @@ -870,10 +870,10 @@ lbl_80180444: /* 801804BC 0017D3FC 38 61 00 18 */ addi r3, r1, 0x18 /* 801804C0 0017D400 38 9D 00 70 */ addi r4, r29, 0x70 /* 801804C4 0017D404 38 BD 00 64 */ addi r5, r29, 0x64 -/* 801804C8 0017D408 48 0E 66 6D */ bl cXyz_NS___mi +/* 801804C8 0017D408 48 0E 66 6D */ bl __mi__4cXyzCFRC3Vec /* 801804CC 0017D40C 38 7D 00 5C */ addi r3, r29, 0x5c /* 801804D0 0017D410 38 81 00 18 */ addi r4, r1, 0x18 -/* 801804D4 0017D414 48 0F 15 9D */ bl cSGlobe_NS_Val_X3_ +/* 801804D4 0017D414 48 0F 15 9D */ bl Val__7cSGlobeFRC4cXyz lbl_801804D8: /* 801804D8 0017D418 80 1D 06 0C */ lwz r0, 0x60c(r29) /* 801804DC 0017D41C 54 00 00 80 */ rlwinm r0, r0, 0, 2, 0 diff --git a/include/d/d_camera/asm/func_80180738.s b/include/d/d_camera/asm/func_80180738.s index 7224f465fe..2ee0401ce6 100644 --- a/include/d/d_camera/asm/func_80180738.s +++ b/include/d/d_camera/asm/func_80180738.s @@ -39,15 +39,15 @@ lbl_80180788: /* 801807CC 0017D70C 38 61 00 80 */ addi r3, r1, 0x80 /* 801807D0 0017D710 38 9F 01 18 */ addi r4, r31, 0x118 /* 801807D4 0017D714 38 BF 00 64 */ addi r5, r31, 0x64 -/* 801807D8 0017D718 48 0E 63 5D */ bl cXyz_NS___mi +/* 801807D8 0017D718 48 0E 63 5D */ bl __mi__4cXyzCFRC3Vec /* 801807DC 0017D71C 38 61 00 74 */ addi r3, r1, 0x74 /* 801807E0 0017D720 38 81 00 80 */ addi r4, r1, 0x80 /* 801807E4 0017D724 FC 20 F8 90 */ fmr f1, f31 -/* 801807E8 0017D728 48 0E 63 9D */ bl cXyz_NS___ml +/* 801807E8 0017D728 48 0E 63 9D */ bl __ml__4cXyzCFf /* 801807EC 0017D72C 38 61 00 68 */ addi r3, r1, 0x68 /* 801807F0 0017D730 38 9F 00 64 */ addi r4, r31, 0x64 /* 801807F4 0017D734 38 A1 00 74 */ addi r5, r1, 0x74 -/* 801807F8 0017D738 48 0E 62 ED */ bl cXyz_NS___pl +/* 801807F8 0017D738 48 0E 62 ED */ bl __pl__4cXyzCFRC3Vec /* 801807FC 0017D73C C0 01 00 68 */ lfs f0, 0x68(r1) /* 80180800 0017D740 D0 1F 00 30 */ stfs f0, 0x30(r31) /* 80180804 0017D744 C0 01 00 6C */ lfs f0, 0x6c(r1) @@ -95,7 +95,7 @@ lbl_80180788: /* 801808AC 0017D7EC 38 61 00 50 */ addi r3, r1, 0x50 /* 801808B0 0017D7F0 38 81 00 98 */ addi r4, r1, 0x98 /* 801808B4 0017D7F4 C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) -/* 801808B8 0017D7F8 48 0E 62 CD */ bl cXyz_NS___ml +/* 801808B8 0017D7F8 48 0E 62 CD */ bl __ml__4cXyzCFf /* 801808BC 0017D7FC 38 7F 00 30 */ addi r3, r31, 0x30 /* 801808C0 0017D800 38 81 00 50 */ addi r4, r1, 0x50 /* 801808C4 0017D804 7C 65 1B 78 */ mr r5, r3 @@ -104,15 +104,15 @@ lbl_801808CC: /* 801808CC 0017D80C 38 61 00 44 */ addi r3, r1, 0x44 /* 801808D0 0017D810 38 9F 01 24 */ addi r4, r31, 0x124 /* 801808D4 0017D814 38 BF 00 70 */ addi r5, r31, 0x70 -/* 801808D8 0017D818 48 0E 62 5D */ bl cXyz_NS___mi +/* 801808D8 0017D818 48 0E 62 5D */ bl __mi__4cXyzCFRC3Vec /* 801808DC 0017D81C 38 61 00 38 */ addi r3, r1, 0x38 /* 801808E0 0017D820 38 81 00 44 */ addi r4, r1, 0x44 /* 801808E4 0017D824 FC 20 F8 90 */ fmr f1, f31 -/* 801808E8 0017D828 48 0E 62 9D */ bl cXyz_NS___ml +/* 801808E8 0017D828 48 0E 62 9D */ bl __ml__4cXyzCFf /* 801808EC 0017D82C 38 61 00 2C */ addi r3, r1, 0x2c /* 801808F0 0017D830 38 9F 00 70 */ addi r4, r31, 0x70 /* 801808F4 0017D834 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801808F8 0017D838 48 0E 61 ED */ bl cXyz_NS___pl +/* 801808F8 0017D838 48 0E 61 ED */ bl __pl__4cXyzCFRC3Vec /* 801808FC 0017D83C C0 01 00 2C */ lfs f0, 0x2c(r1) /* 80180900 0017D840 D0 1F 00 3C */ stfs f0, 0x3c(r31) /* 80180904 0017D844 C0 01 00 30 */ lfs f0, 0x30(r1) @@ -145,7 +145,7 @@ lbl_801808CC: /* 80180970 0017D8B0 38 61 00 20 */ addi r3, r1, 0x20 /* 80180974 0017D8B4 38 81 00 98 */ addi r4, r1, 0x98 /* 80180978 0017D8B8 C0 3F 0A B4 */ lfs f1, 0xab4(r31) -/* 8018097C 0017D8BC 48 0E 62 09 */ bl cXyz_NS___ml +/* 8018097C 0017D8BC 48 0E 62 09 */ bl __ml__4cXyzCFf /* 80180980 0017D8C0 38 7F 00 3C */ addi r3, r31, 0x3c /* 80180984 0017D8C4 38 81 00 20 */ addi r4, r1, 0x20 /* 80180988 0017D8C8 7C 65 1B 78 */ mr r5, r3 @@ -154,10 +154,10 @@ lbl_80180990: /* 80180990 0017D8D0 38 61 00 14 */ addi r3, r1, 0x14 /* 80180994 0017D8D4 38 9F 00 3C */ addi r4, r31, 0x3c /* 80180998 0017D8D8 38 BF 00 30 */ addi r5, r31, 0x30 -/* 8018099C 0017D8DC 48 0E 61 99 */ bl cXyz_NS___mi +/* 8018099C 0017D8DC 48 0E 61 99 */ bl __mi__4cXyzCFRC3Vec /* 801809A0 0017D8E0 38 7F 00 28 */ addi r3, r31, 0x28 /* 801809A4 0017D8E4 38 81 00 14 */ addi r4, r1, 0x14 -/* 801809A8 0017D8E8 48 0F 10 C9 */ bl cSGlobe_NS_Val_X3_ +/* 801809A8 0017D8E8 48 0F 10 C9 */ bl Val__7cSGlobeFRC4cXyz /* 801809AC 0017D8EC C0 3F 00 80 */ lfs f1, 0x80(r31) /* 801809B0 0017D8F0 C0 1F 01 30 */ lfs f0, 0x130(r31) /* 801809B4 0017D8F4 EC 00 08 28 */ fsubs f0, f0, f1 @@ -167,15 +167,15 @@ lbl_80180990: /* 801809C4 0017D904 38 61 00 10 */ addi r3, r1, 0x10 /* 801809C8 0017D908 38 9F 01 34 */ addi r4, r31, 0x134 /* 801809CC 0017D90C 38 BF 00 7C */ addi r5, r31, 0x7c -/* 801809D0 0017D910 48 0F 07 D5 */ bl cSAngle_NS___mi_X1_ +/* 801809D0 0017D910 48 0F 07 D5 */ bl __mi__7cSAngleCFRC7cSAngle /* 801809D4 0017D914 38 61 00 0C */ addi r3, r1, 0xc /* 801809D8 0017D918 38 81 00 10 */ addi r4, r1, 0x10 /* 801809DC 0017D91C FC 20 F8 90 */ fmr f1, f31 -/* 801809E0 0017D920 48 0F 08 85 */ bl cSAngle_NS___ml +/* 801809E0 0017D920 48 0F 08 85 */ bl __ml__7cSAngleCFf /* 801809E4 0017D924 38 61 00 08 */ addi r3, r1, 8 /* 801809E8 0017D928 38 9F 00 7C */ addi r4, r31, 0x7c /* 801809EC 0017D92C 38 A1 00 0C */ addi r5, r1, 0xc -/* 801809F0 0017D930 48 0F 07 85 */ bl cSAngle_NS___pl +/* 801809F0 0017D930 48 0F 07 85 */ bl __pl__7cSAngleCFRC7cSAngle /* 801809F4 0017D934 A8 01 00 08 */ lha r0, 8(r1) /* 801809F8 0017D938 B0 1F 00 54 */ sth r0, 0x54(r31) /* 801809FC 0017D93C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha diff --git a/include/d/d_camera/asm/func_80180AE0.s b/include/d/d_camera/asm/func_80180AE0.s index 8108936a63..380a3d5a3f 100644 --- a/include/d/d_camera/asm/func_80180AE0.s +++ b/include/d/d_camera/asm/func_80180AE0.s @@ -16,7 +16,7 @@ /* 80180B1C 0017DA5C D0 23 00 58 */ stfs f1, 0x58(r3) /* 80180B20 0017DA60 7C C4 33 78 */ mr r4, r6 /* 80180B24 0017DA64 38 63 00 54 */ addi r3, r3, 0x54 -/* 80180B28 0017DA68 48 0F 04 DD */ bl cSAngle_NS_Val_X2_ +/* 80180B28 0017DA68 48 0F 04 DD */ bl Val__7cSAngleFs /* 80180B2C 0017DA6C 38 60 00 01 */ li r3, 1 /* 80180B30 0017DA70 80 01 00 14 */ lwz r0, 0x14(r1) /* 80180B34 0017DA74 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_camera/asm/func_80180B40.s b/include/d/d_camera/asm/func_80180B40.s index 3f385c05e2..171b8c8308 100644 --- a/include/d/d_camera/asm/func_80180B40.s +++ b/include/d/d_camera/asm/func_80180B40.s @@ -16,7 +16,7 @@ /* 80180B7C 0017DABC D0 23 00 58 */ stfs f1, 0x58(r3) /* 80180B80 0017DAC0 7C C4 33 78 */ mr r4, r6 /* 80180B84 0017DAC4 38 63 00 54 */ addi r3, r3, 0x54 -/* 80180B88 0017DAC8 48 0F 04 7D */ bl cSAngle_NS_Val_X2_ +/* 80180B88 0017DAC8 48 0F 04 7D */ bl Val__7cSAngleFs /* 80180B8C 0017DACC 38 60 00 01 */ li r3, 1 /* 80180B90 0017DAD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80180B94 0017DAD4 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_camera/asm/func_80180BA0.s b/include/d/d_camera/asm/func_80180BA0.s index 2b246bbd82..4558b847cc 100644 --- a/include/d/d_camera/asm/func_80180BA0.s +++ b/include/d/d_camera/asm/func_80180BA0.s @@ -18,7 +18,7 @@ /* 80180BE4 0017DB24 D0 23 00 58 */ stfs f1, 0x58(r3) /* 80180BE8 0017DB28 38 61 00 08 */ addi r3, r1, 8 /* 80180BEC 0017DB2C 7C C4 33 78 */ mr r4, r6 -/* 80180BF0 0017DB30 48 0F 03 A9 */ bl cSAngle_X2_ +/* 80180BF0 0017DB30 48 0F 03 A9 */ bl __ct__7cSAngleFs /* 80180BF4 0017DB34 A8 01 00 08 */ lha r0, 8(r1) /* 80180BF8 0017DB38 B0 1F 00 54 */ sth r0, 0x54(r31) /* 80180BFC 0017DB3C 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_camera/asm/func_80180C68.s b/include/d/d_camera/asm/func_80180C68.s index ca42f041a1..a61e78255d 100644 --- a/include/d/d_camera/asm/func_80180C68.s +++ b/include/d/d_camera/asm/func_80180C68.s @@ -22,10 +22,10 @@ /* 80180CBC 0017DBFC 38 61 00 0C */ addi r3, r1, 0xc /* 80180CC0 0017DC00 38 9F 00 3C */ addi r4, r31, 0x3c /* 80180CC4 0017DC04 38 BF 00 30 */ addi r5, r31, 0x30 -/* 80180CC8 0017DC08 48 0E 5E 6D */ bl cXyz_NS___mi +/* 80180CC8 0017DC08 48 0E 5E 6D */ bl __mi__4cXyzCFRC3Vec /* 80180CCC 0017DC0C 38 7F 00 28 */ addi r3, r31, 0x28 /* 80180CD0 0017DC10 38 81 00 0C */ addi r4, r1, 0xc -/* 80180CD4 0017DC14 48 0F 0D 9D */ bl cSGlobe_NS_Val_X3_ +/* 80180CD4 0017DC14 48 0F 0D 9D */ bl Val__7cSGlobeFRC4cXyz /* 80180CD8 0017DC18 C0 1F 00 28 */ lfs f0, 0x28(r31) /* 80180CDC 0017DC1C D0 1F 00 5C */ stfs f0, 0x5c(r31) /* 80180CE0 0017DC20 A8 1F 00 2C */ lha r0, 0x2c(r31) @@ -33,10 +33,10 @@ /* 80180CE8 0017DC28 A8 1F 00 2E */ lha r0, 0x2e(r31) /* 80180CEC 0017DC2C B0 1F 00 62 */ sth r0, 0x62(r31) /* 80180CF0 0017DC30 38 7F 00 2E */ addi r3, r31, 0x2e -/* 80180CF4 0017DC34 48 0F 03 F5 */ bl cSAngle_NS_Inv +/* 80180CF4 0017DC34 48 0F 03 F5 */ bl Inv__7cSAngleCFv /* 80180CF8 0017DC38 7C 64 1B 78 */ mr r4, r3 /* 80180CFC 0017DC3C 38 61 00 08 */ addi r3, r1, 8 -/* 80180D00 0017DC40 48 0F 02 99 */ bl cSAngle_X2_ +/* 80180D00 0017DC40 48 0F 02 99 */ bl __ct__7cSAngleFs /* 80180D04 0017DC44 A8 01 00 08 */ lha r0, 8(r1) /* 80180D08 0017DC48 B0 1F 00 8C */ sth r0, 0x8c(r31) /* 80180D0C 0017DC4C 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_camera/asm/func_80180D24.s b/include/d/d_camera/asm/func_80180D24.s index c5833caf12..728260ce26 100644 --- a/include/d/d_camera/asm/func_80180D24.s +++ b/include/d/d_camera/asm/func_80180D24.s @@ -75,7 +75,7 @@ lbl_80180DFC: /* 80180E3C 0017DD7C 38 61 00 40 */ addi r3, r1, 0x40 /* 80180E40 0017DD80 38 81 00 4C */ addi r4, r1, 0x4c /* 80180E44 0017DD84 FC 20 F8 90 */ fmr f1, f31 -/* 80180E48 0017DD88 48 0E 5D 3D */ bl cXyz_NS___ml +/* 80180E48 0017DD88 48 0E 5D 3D */ bl __ml__4cXyzCFf /* 80180E4C 0017DD8C C0 01 00 40 */ lfs f0, 0x40(r1) /* 80180E50 0017DD90 D0 01 00 4C */ stfs f0, 0x4c(r1) /* 80180E54 0017DD94 C0 01 00 44 */ lfs f0, 0x44(r1) @@ -88,7 +88,7 @@ lbl_80180DFC: /* 80180E70 0017DDB0 38 61 00 34 */ addi r3, r1, 0x34 /* 80180E74 0017DDB4 38 81 00 4C */ addi r4, r1, 0x4c /* 80180E78 0017DDB8 C0 22 9C A8 */ lfs f1, lbl_804536A8-_SDA2_BASE_(r2) -/* 80180E7C 0017DDBC 48 0E 5D 09 */ bl cXyz_NS___ml +/* 80180E7C 0017DDBC 48 0E 5D 09 */ bl __ml__4cXyzCFf /* 80180E80 0017DDC0 C0 01 00 34 */ lfs f0, 0x34(r1) /* 80180E84 0017DDC4 D0 1F 06 E8 */ stfs f0, 0x6e8(r31) /* 80180E88 0017DDC8 C0 01 00 38 */ lfs f0, 0x38(r1) @@ -108,7 +108,7 @@ lbl_80180EB0: /* 80180EBC 0017DDFC 38 61 00 28 */ addi r3, r1, 0x28 /* 80180EC0 0017DE00 38 81 00 4C */ addi r4, r1, 0x4c /* 80180EC4 0017DE04 C0 22 9C E4 */ lfs f1, lbl_804536E4-_SDA2_BASE_(r2) -/* 80180EC8 0017DE08 48 0E 5C BD */ bl cXyz_NS___ml +/* 80180EC8 0017DE08 48 0E 5C BD */ bl __ml__4cXyzCFf /* 80180ECC 0017DE0C C0 01 00 28 */ lfs f0, 0x28(r1) /* 80180ED0 0017DE10 D0 1F 06 E8 */ stfs f0, 0x6e8(r31) /* 80180ED4 0017DE14 C0 01 00 2C */ lfs f0, 0x2c(r1) @@ -137,7 +137,7 @@ lbl_80180F18: /* 80180F28 0017DE68 48 0E 6A 65 */ bl cM_rndFX /* 80180F2C 0017DE6C EC 3F 00 72 */ fmuls f1, f31, f1 /* 80180F30 0017DE70 38 61 00 0C */ addi r3, r1, 0xc -/* 80180F34 0017DE74 48 0F 00 95 */ bl cSAngle_X3_ +/* 80180F34 0017DE74 48 0F 00 95 */ bl __ct__7cSAngleFf /* 80180F38 0017DE78 A8 01 00 0C */ lha r0, 0xc(r1) /* 80180F3C 0017DE7C B0 1F 06 F8 */ sth r0, 0x6f8(r31) lbl_80180F40: @@ -156,7 +156,7 @@ lbl_80180F6C: /* 80180F6C 0017DEAC 38 61 00 1C */ addi r3, r1, 0x1c /* 80180F70 0017DEB0 38 9F 06 DC */ addi r4, r31, 0x6dc /* 80180F74 0017DEB4 C0 22 9D 0C */ lfs f1, lbl_8045370C-_SDA2_BASE_(r2) -/* 80180F78 0017DEB8 48 0E 5C 0D */ bl cXyz_NS___ml +/* 80180F78 0017DEB8 48 0E 5C 0D */ bl __ml__4cXyzCFf /* 80180F7C 0017DEBC 38 7F 06 DC */ addi r3, r31, 0x6dc /* 80180F80 0017DEC0 38 81 00 1C */ addi r4, r1, 0x1c /* 80180F84 0017DEC4 7C 65 1B 78 */ mr r5, r3 @@ -164,7 +164,7 @@ lbl_80180F6C: /* 80180F8C 0017DECC 38 61 00 10 */ addi r3, r1, 0x10 /* 80180F90 0017DED0 38 9F 06 E8 */ addi r4, r31, 0x6e8 /* 80180F94 0017DED4 C0 22 9D 0C */ lfs f1, lbl_8045370C-_SDA2_BASE_(r2) -/* 80180F98 0017DED8 48 0E 5B ED */ bl cXyz_NS___ml +/* 80180F98 0017DED8 48 0E 5B ED */ bl __ml__4cXyzCFf /* 80180F9C 0017DEDC 38 7F 06 E8 */ addi r3, r31, 0x6e8 /* 80180FA0 0017DEE0 38 81 00 10 */ addi r4, r1, 0x10 /* 80180FA4 0017DEE4 7C 65 1B 78 */ mr r5, r3 @@ -176,10 +176,10 @@ lbl_80180F6C: /* 80180FBC 0017DEFC D0 1F 06 F4 */ stfs f0, 0x6f4(r31) /* 80180FC0 0017DF00 38 61 00 08 */ addi r3, r1, 8 /* 80180FC4 0017DF04 38 9F 06 F8 */ addi r4, r31, 0x6f8 -/* 80180FC8 0017DF08 48 0F 02 9D */ bl cSAngle_NS___ml +/* 80180FC8 0017DF08 48 0F 02 9D */ bl __ml__7cSAngleCFf /* 80180FCC 0017DF0C 38 7F 06 F8 */ addi r3, r31, 0x6f8 /* 80180FD0 0017DF10 38 81 00 08 */ addi r4, r1, 8 -/* 80180FD4 0017DF14 48 0F 02 15 */ bl cSAngle_NS___ami +/* 80180FD4 0017DF14 48 0F 02 15 */ bl __ami__7cSAngleFRC7cSAngle lbl_80180FD8: /* 80180FD8 0017DF18 FC 20 F8 90 */ fmr f1, f31 /* 80180FDC 0017DF1C E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 diff --git a/include/d/d_camera/asm/func_80181000.s b/include/d/d_camera/asm/func_80181000.s index e9a9f0795f..149ad20880 100644 --- a/include/d/d_camera/asm/func_80181000.s +++ b/include/d/d_camera/asm/func_80181000.s @@ -76,7 +76,7 @@ lbl_80181104: lbl_8018110C: /* 8018110C 0017E04C 38 61 00 08 */ addi r3, r1, 8 /* 80181110 0017E050 7C E4 3B 78 */ mr r4, r7 -/* 80181114 0017E054 48 0E 5B D1 */ bl cXyz_NS_norm +/* 80181114 0017E054 48 0E 5B D1 */ bl norm__4cXyzCFv /* 80181118 0017E058 C0 01 00 08 */ lfs f0, 8(r1) /* 8018111C 0017E05C D0 1E 06 D0 */ stfs f0, 0x6d0(r30) /* 80181120 0017E060 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_camera/asm/func_80181804.s b/include/d/d_camera/asm/func_80181804.s index 37bda2ffb6..2fab16992e 100644 --- a/include/d/d_camera/asm/func_80181804.s +++ b/include/d/d_camera/asm/func_80181804.s @@ -32,7 +32,7 @@ /* 80181880 0017E7C0 D0 01 00 70 */ stfs f0, 0x70(r1) /* 80181884 0017E7C4 38 61 00 10 */ addi r3, r1, 0x10 /* 80181888 0017E7C8 A8 9B 00 FC */ lha r4, 0xfc(r27) -/* 8018188C 0017E7CC 48 0E F7 0D */ bl cSAngle_X2_ +/* 8018188C 0017E7CC 48 0E F7 0D */ bl __ct__7cSAngleFs /* 80181890 0017E7D0 C3 FB 00 D0 */ lfs f31, 0xd0(r27) /* 80181894 0017E7D4 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) /* 80181898 0017E7D8 4B EB 78 91 */ bl dDemo_object_c_NS_getActiveCamera @@ -82,7 +82,7 @@ lbl_8018191C: /* 8018193C 0017E87C D8 01 00 90 */ stfd f0, 0x90(r1) /* 80181940 0017E880 80 81 00 94 */ lwz r4, 0x94(r1) /* 80181944 0017E884 38 61 00 0C */ addi r3, r1, 0xc -/* 80181948 0017E888 48 0E F6 51 */ bl cSAngle_X2_ +/* 80181948 0017E888 48 0E F6 51 */ bl __ct__7cSAngleFs /* 8018194C 0017E88C A8 01 00 0C */ lha r0, 0xc(r1) /* 80181950 0017E890 B0 01 00 10 */ sth r0, 0x10(r1) lbl_80181954: @@ -431,12 +431,12 @@ lbl_80181DD0: /* 80181DD0 0017ED10 38 61 00 38 */ addi r3, r1, 0x38 /* 80181DD4 0017ED14 38 81 00 74 */ addi r4, r1, 0x74 /* 80181DD8 0017ED18 38 A1 00 80 */ addi r5, r1, 0x80 -/* 80181DDC 0017ED1C 48 0E 4D 59 */ bl cXyz_NS___mi +/* 80181DDC 0017ED1C 48 0E 4D 59 */ bl __mi__4cXyzCFRC3Vec /* 80181DE0 0017ED20 38 61 00 30 */ addi r3, r1, 0x30 /* 80181DE4 0017ED24 38 81 00 38 */ addi r4, r1, 0x38 -/* 80181DE8 0017ED28 48 0E FA 99 */ bl cSGlobe_X4_ +/* 80181DE8 0017ED28 48 0E FA 99 */ bl __ct__7cSGlobeFRC4cXyz /* 80181DEC 0017ED2C 38 61 00 36 */ addi r3, r1, 0x36 -/* 80181DF0 0017ED30 48 0E F2 F9 */ bl cSAngle_NS_Inv +/* 80181DF0 0017ED30 48 0E F2 F9 */ bl Inv__7cSAngleCFv /* 80181DF4 0017ED34 B0 7B 02 32 */ sth r3, 0x232(r27) /* 80181DF8 0017ED38 A8 01 00 34 */ lha r0, 0x34(r1) /* 80181DFC 0017ED3C B0 1B 02 30 */ sth r0, 0x230(r27) diff --git a/include/d/d_camera/asm/func_80181E64.s b/include/d/d_camera/asm/func_80181E64.s index a309cb870d..befc6b9d68 100644 --- a/include/d/d_camera/asm/func_80181E64.s +++ b/include/d/d_camera/asm/func_80181E64.s @@ -5,7 +5,7 @@ /* 80181E74 0017EDB4 7C 85 23 78 */ mr r5, r4 /* 80181E78 0017EDB8 38 85 00 3C */ addi r4, r5, 0x3c /* 80181E7C 0017EDBC 38 A5 06 E8 */ addi r5, r5, 0x6e8 -/* 80181E80 0017EDC0 48 0E 4C 65 */ bl cXyz_NS___pl +/* 80181E80 0017EDC0 48 0E 4C 65 */ bl __pl__4cXyzCFRC3Vec /* 80181E84 0017EDC4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80181E88 0017EDC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80181E8C 0017EDCC 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_camera/asm/func_80181E98.s b/include/d/d_camera/asm/func_80181E98.s index a6940cfa21..6e97b1edf6 100644 --- a/include/d/d_camera/asm/func_80181E98.s +++ b/include/d/d_camera/asm/func_80181E98.s @@ -5,7 +5,7 @@ /* 80181EA8 0017EDE8 7C 85 23 78 */ mr r5, r4 /* 80181EAC 0017EDEC 38 85 00 30 */ addi r4, r5, 0x30 /* 80181EB0 0017EDF0 38 A5 06 DC */ addi r5, r5, 0x6dc -/* 80181EB4 0017EDF4 48 0E 4C 31 */ bl cXyz_NS___pl +/* 80181EB4 0017EDF4 48 0E 4C 31 */ bl __pl__4cXyzCFRC3Vec /* 80181EB8 0017EDF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80181EBC 0017EDFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80181EC0 0017EE00 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_camera/asm/func_80181F70.s b/include/d/d_camera/asm/func_80181F70.s index 9e85bb4a1f..f3df1941f6 100644 --- a/include/d/d_camera/asm/func_80181F70.s +++ b/include/d/d_camera/asm/func_80181F70.s @@ -84,7 +84,7 @@ /* 801820BC 0017EFFC 90 01 00 64 */ stw r0, 0x64(r1) /* 801820C0 0017F000 38 61 00 14 */ addi r3, r1, 0x14 /* 801820C4 0017F004 38 9D 00 D8 */ addi r4, r29, 0xd8 -/* 801820C8 0017F008 48 0E 5C 61 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 801820C8 0017F008 48 0E 5C 61 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 801820CC 0017F00C 7F E3 FB 78 */ mr r3, r31 /* 801820D0 0017F010 38 81 00 14 */ addi r4, r1, 0x14 /* 801820D4 0017F014 4B EF 23 CD */ bl cBgS_NS_GroundCross diff --git a/include/d/d_camera/asm/func_80182260.s b/include/d/d_camera/asm/func_80182260.s index aed734b4cc..0c0c39ac8a 100644 --- a/include/d/d_camera/asm/func_80182260.s +++ b/include/d/d_camera/asm/func_80182260.s @@ -41,7 +41,7 @@ lbl_801822D4: /* 801822FC 0017F23C D0 01 00 0C */ stfs f0, 0xc(r1) /* 80182300 0017F240 38 61 00 14 */ addi r3, r1, 0x14 /* 80182304 0017F244 38 81 00 08 */ addi r4, r1, 8 -/* 80182308 0017F248 48 0E 5A 21 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 80182308 0017F248 48 0E 5A 21 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8018230C 0017F24C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80182310 0017F250 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80182314 0017F254 3B A3 0F 38 */ addi r29, r3, 0xf38 diff --git a/include/d/d_camera/asm/func_801829AC.s b/include/d/d_camera/asm/func_801829AC.s index 09c208d8f0..500840a1c2 100644 --- a/include/d/d_camera/asm/func_801829AC.s +++ b/include/d/d_camera/asm/func_801829AC.s @@ -5,7 +5,7 @@ /* 801829BC 0017F8FC 7C 85 23 78 */ mr r5, r4 /* 801829C0 0017F900 38 85 00 54 */ addi r4, r5, 0x54 /* 801829C4 0017F904 38 A5 06 F8 */ addi r5, r5, 0x6f8 -/* 801829C8 0017F908 48 0E E7 AD */ bl cSAngle_NS___pl +/* 801829C8 0017F908 48 0E E7 AD */ bl __pl__7cSAngleCFRC7cSAngle /* 801829CC 0017F90C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801829D0 0017F910 80 01 00 14 */ lwz r0, 0x14(r1) /* 801829D4 0017F914 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_kankyo/asm/func_8019CE5C.s b/include/d/d_kankyo/asm/func_8019CE5C.s index eea107555b..cb5ffb7eca 100644 --- a/include/d/d_kankyo/asm/func_8019CE5C.s +++ b/include/d/d_kankyo/asm/func_8019CE5C.s @@ -10,7 +10,7 @@ /* 8019CE80 00199DC0 38 61 00 18 */ addi r3, r1, 0x18 /* 8019CE84 00199DC4 7C E4 3B 78 */ mr r4, r7 /* 8019CE88 00199DC8 7C 05 03 78 */ mr r5, r0 -/* 8019CE8C 00199DCC 48 0C 9C A9 */ bl cXyz_NS___mi +/* 8019CE8C 00199DCC 48 0C 9C A9 */ bl __mi__4cXyzCFRC3Vec /* 8019CE90 00199DD0 C0 41 00 18 */ lfs f2, 0x18(r1) /* 8019CE94 00199DD4 D0 41 00 24 */ stfs f2, 0x24(r1) /* 8019CE98 00199DD8 C0 01 00 1C */ lfs f0, 0x1c(r1) diff --git a/include/d/d_kankyo/asm/func_8019D8CC.s b/include/d/d_kankyo/asm/func_8019D8CC.s index ede563fade..8bbe49e2e2 100644 --- a/include/d/d_kankyo/asm/func_8019D8CC.s +++ b/include/d/d_kankyo/asm/func_8019D8CC.s @@ -50,7 +50,7 @@ lbl_8019D984: /* 8019D98C 0019A8CC C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 8019D990 0019A8D0 C0 62 A2 64 */ lfs f3, lbl_80453C64-_SDA2_BASE_(r2) /* 8019D994 0019A8D4 C0 82 A2 68 */ lfs f4, lbl_80453C68-_SDA2_BASE_(r2) -/* 8019D998 0019A8D8 48 0D 1F E5 */ bl cLib_addCalc +/* 8019D998 0019A8D8 48 0D 1F E5 */ bl cLib_addCalc__FPfffff /* 8019D99C 0019A8DC 48 00 00 88 */ b lbl_8019DA24 lbl_8019D9A0: /* 8019D9A0 0019A8E0 C0 5F 0F 40 */ lfs f2, 0xf40(r31) @@ -85,7 +85,7 @@ lbl_8019DA08: /* 8019DA10 0019A950 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 8019DA14 0019A954 C0 62 A2 64 */ lfs f3, lbl_80453C64-_SDA2_BASE_(r2) /* 8019DA18 0019A958 C0 82 A2 68 */ lfs f4, lbl_80453C68-_SDA2_BASE_(r2) -/* 8019DA1C 0019A95C 48 0D 1F 61 */ bl cLib_addCalc +/* 8019DA1C 0019A95C 48 0D 1F 61 */ bl cLib_addCalc__FPfffff /* 8019DA20 0019A960 3B C0 00 01 */ li r30, 1 lbl_8019DA24: /* 8019DA24 0019A964 88 1F 0F 3C */ lbz r0, 0xf3c(r31) diff --git a/include/d/d_kankyo/asm/func_801A040C.s b/include/d/d_kankyo/asm/func_801A040C.s index 9f22a6ec92..557fa66180 100644 --- a/include/d/d_kankyo/asm/func_801A040C.s +++ b/include/d/d_kankyo/asm/func_801A040C.s @@ -48,7 +48,7 @@ lbl_801A04A4: /* 801A04C4 0019D404 D0 01 00 6C */ stfs f0, 0x6c(r1) /* 801A04C8 0019D408 38 61 00 74 */ addi r3, r1, 0x74 /* 801A04CC 0019D40C 38 81 00 68 */ addi r4, r1, 0x68 -/* 801A04D0 0019D410 48 0C 78 59 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 801A04D0 0019D410 48 0C 78 59 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 801A04D4 0019D414 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801A04D8 0019D418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A04DC 0019D41C 38 63 0F 38 */ addi r3, r3, 0xf38 @@ -61,7 +61,7 @@ lbl_801A04A4: /* 801A04F8 0019D438 C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A04FC 0019D43C C0 62 A2 68 */ lfs f3, lbl_80453C68-_SDA2_BASE_(r2) /* 801A0500 0019D440 C0 82 A2 F0 */ lfs f4, lbl_80453CF0-_SDA2_BASE_(r2) -/* 801A0504 0019D444 48 0C F4 79 */ bl cLib_addCalc +/* 801A0504 0019D444 48 0C F4 79 */ bl cLib_addCalc__FPfffff /* 801A0508 0019D448 38 61 00 74 */ addi r3, r1, 0x74 /* 801A050C 0019D44C 38 80 FF FF */ li r4, -1 /* 801A0510 0019D450 4B ED 75 89 */ bl dBgS_CamGndChk_Wtr_NS_dtor @@ -701,7 +701,7 @@ lbl_801A0E70: /* 801A0E78 0019DDB8 C0 42 A3 08 */ lfs f2, lbl_80453D08-_SDA2_BASE_(r2) /* 801A0E7C 0019DDBC C0 62 A3 0C */ lfs f3, lbl_80453D0C-_SDA2_BASE_(r2) /* 801A0E80 0019DDC0 C0 82 A3 10 */ lfs f4, lbl_80453D10-_SDA2_BASE_(r2) -/* 801A0E84 0019DDC4 48 0C EA F9 */ bl cLib_addCalc +/* 801A0E84 0019DDC4 48 0C EA F9 */ bl cLib_addCalc__FPfffff lbl_801A0E88: /* 801A0E88 0019DDC8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A0E8C 0019DDCC 39 C3 CA 54 */ addi r14, r3, lbl_8042CA54@l diff --git a/include/d/d_kankyo/asm/func_801A1D64.s b/include/d/d_kankyo/asm/func_801A1D64.s index eb8a99a085..fc3daf8d78 100644 --- a/include/d/d_kankyo/asm/func_801A1D64.s +++ b/include/d/d_kankyo/asm/func_801A1D64.s @@ -29,7 +29,7 @@ /* 801A1DD4 0019ED14 C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A1DD8 0019ED18 C0 62 A3 08 */ lfs f3, lbl_80453D08-_SDA2_BASE_(r2) /* 801A1DDC 0019ED1C C0 82 A3 10 */ lfs f4, lbl_80453D10-_SDA2_BASE_(r2) -/* 801A1DE0 0019ED20 48 0C DB 9D */ bl cLib_addCalc +/* 801A1DE0 0019ED20 48 0C DB 9D */ bl cLib_addCalc__FPfffff /* 801A1DE4 0019ED24 48 00 00 4C */ b lbl_801A1E30 lbl_801A1DE8: /* 801A1DE8 0019ED28 88 7B 03 80 */ lbz r3, 0x380(r27) @@ -46,7 +46,7 @@ lbl_801A1DE8: /* 801A1E14 0019ED54 C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A1E18 0019ED58 C0 62 A3 08 */ lfs f3, lbl_80453D08-_SDA2_BASE_(r2) /* 801A1E1C 0019ED5C C0 82 A3 10 */ lfs f4, lbl_80453D10-_SDA2_BASE_(r2) -/* 801A1E20 0019ED60 48 0C DB 5D */ bl cLib_addCalc +/* 801A1E20 0019ED60 48 0C DB 5D */ bl cLib_addCalc__FPfffff /* 801A1E24 0019ED64 48 00 00 0C */ b lbl_801A1E30 lbl_801A1E28: /* 801A1E28 0019ED68 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_kankyo/asm/func_801A1F58.s b/include/d/d_kankyo/asm/func_801A1F58.s index 9e8481f477..e9b86bb83a 100644 --- a/include/d/d_kankyo/asm/func_801A1F58.s +++ b/include/d/d_kankyo/asm/func_801A1F58.s @@ -23,7 +23,7 @@ /* 801A1FB0 0019EEF0 C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A1FB4 0019EEF4 C0 62 A3 08 */ lfs f3, lbl_80453D08-_SDA2_BASE_(r2) /* 801A1FB8 0019EEF8 C0 82 A3 10 */ lfs f4, lbl_80453D10-_SDA2_BASE_(r2) -/* 801A1FBC 0019EEFC 48 0C D9 C1 */ bl cLib_addCalc +/* 801A1FBC 0019EEFC 48 0C D9 C1 */ bl cLib_addCalc__FPfffff /* 801A1FC0 0019EF00 48 00 00 40 */ b lbl_801A2000 lbl_801A1FC4: /* 801A1FC4 0019EF04 88 7F 03 80 */ lbz r3, 0x380(r31) @@ -40,7 +40,7 @@ lbl_801A1FC4: /* 801A1FF0 0019EF30 C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A1FF4 0019EF34 C0 62 A3 08 */ lfs f3, lbl_80453D08-_SDA2_BASE_(r2) /* 801A1FF8 0019EF38 C0 82 A3 10 */ lfs f4, lbl_80453D10-_SDA2_BASE_(r2) -/* 801A1FFC 0019EF3C 48 0C D9 81 */ bl cLib_addCalc +/* 801A1FFC 0019EF3C 48 0C D9 81 */ bl cLib_addCalc__FPfffff lbl_801A2000: /* 801A2000 0019EF40 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A2004 0019EF44 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l diff --git a/include/d/d_kankyo/asm/func_801A2128.s b/include/d/d_kankyo/asm/func_801A2128.s index fae9c4bc35..83f9affbb6 100644 --- a/include/d/d_kankyo/asm/func_801A2128.s +++ b/include/d/d_kankyo/asm/func_801A2128.s @@ -209,11 +209,11 @@ lbl_801A2400: /* 801A2420 0019F360 38 61 00 5C */ addi r3, r1, 0x5c /* 801A2424 0019F364 38 81 00 98 */ addi r4, r1, 0x98 /* 801A2428 0019F368 C0 22 A1 D8 */ lfs f1, lbl_80453BD8-_SDA2_BASE_(r2) -/* 801A242C 0019F36C 48 0C 47 59 */ bl cXyz_NS___ml +/* 801A242C 0019F36C 48 0C 47 59 */ bl __ml__4cXyzCFf /* 801A2430 0019F370 38 61 00 50 */ addi r3, r1, 0x50 /* 801A2434 0019F374 7E A4 AB 78 */ mr r4, r21 /* 801A2438 0019F378 38 A1 00 5C */ addi r5, r1, 0x5c -/* 801A243C 0019F37C 48 0C 46 A9 */ bl cXyz_NS___pl +/* 801A243C 0019F37C 48 0C 46 A9 */ bl __pl__4cXyzCFRC3Vec /* 801A2440 0019F380 C0 01 00 50 */ lfs f0, 0x50(r1) /* 801A2444 0019F384 D0 01 00 B0 */ stfs f0, 0xb0(r1) /* 801A2448 0019F388 C0 21 00 54 */ lfs f1, 0x54(r1) @@ -235,11 +235,11 @@ lbl_801A2400: /* 801A2488 0019F3C8 38 61 00 44 */ addi r3, r1, 0x44 /* 801A248C 0019F3CC 38 81 00 98 */ addi r4, r1, 0x98 /* 801A2490 0019F3D0 C0 22 A2 40 */ lfs f1, lbl_80453C40-_SDA2_BASE_(r2) -/* 801A2494 0019F3D4 48 0C 46 F1 */ bl cXyz_NS___ml +/* 801A2494 0019F3D4 48 0C 46 F1 */ bl __ml__4cXyzCFf /* 801A2498 0019F3D8 38 61 00 38 */ addi r3, r1, 0x38 /* 801A249C 0019F3DC 38 93 00 D8 */ addi r4, r19, 0xd8 /* 801A24A0 0019F3E0 38 A1 00 44 */ addi r5, r1, 0x44 -/* 801A24A4 0019F3E4 48 0C 46 41 */ bl cXyz_NS___pl +/* 801A24A4 0019F3E4 48 0C 46 41 */ bl __pl__4cXyzCFRC3Vec /* 801A24A8 0019F3E8 C0 01 00 38 */ lfs f0, 0x38(r1) /* 801A24AC 0019F3EC D0 01 00 B0 */ stfs f0, 0xb0(r1) /* 801A24B0 0019F3F0 C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -889,19 +889,19 @@ lbl_801A2DDC: /* 801A2E10 0019FD50 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A2E14 0019FD54 FC 60 E8 90 */ fmr f3, f29 /* 801A2E18 0019FD58 C0 82 A2 9C */ lfs f4, lbl_80453C9C-_SDA2_BASE_(r2) -/* 801A2E1C 0019FD5C 48 0C CB 61 */ bl cLib_addCalc +/* 801A2E1C 0019FD5C 48 0C CB 61 */ bl cLib_addCalc__FPfffff /* 801A2E20 0019FD60 38 76 03 30 */ addi r3, r22, 0x330 /* 801A2E24 0019FD64 C0 21 00 B4 */ lfs f1, 0xb4(r1) /* 801A2E28 0019FD68 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A2E2C 0019FD6C FC 60 E8 90 */ fmr f3, f29 /* 801A2E30 0019FD70 C0 82 A2 9C */ lfs f4, lbl_80453C9C-_SDA2_BASE_(r2) -/* 801A2E34 0019FD74 48 0C CB 49 */ bl cLib_addCalc +/* 801A2E34 0019FD74 48 0C CB 49 */ bl cLib_addCalc__FPfffff /* 801A2E38 0019FD78 38 76 03 34 */ addi r3, r22, 0x334 /* 801A2E3C 0019FD7C C0 21 00 B8 */ lfs f1, 0xb8(r1) /* 801A2E40 0019FD80 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A2E44 0019FD84 FC 60 E8 90 */ fmr f3, f29 /* 801A2E48 0019FD88 C0 82 A2 9C */ lfs f4, lbl_80453C9C-_SDA2_BASE_(r2) -/* 801A2E4C 0019FD8C 48 0C CB 31 */ bl cLib_addCalc +/* 801A2E4C 0019FD8C 48 0C CB 31 */ bl cLib_addCalc__FPfffff lbl_801A2E50: /* 801A2E50 0019FD90 C0 16 03 2C */ lfs f0, 0x32c(r22) /* 801A2E54 0019FD94 D0 01 00 8C */ stfs f0, 0x8c(r1) @@ -950,7 +950,7 @@ lbl_801A2EF0: /* 801A2EF8 0019FE38 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A2EFC 0019FE3C C0 62 A1 C8 */ lfs f3, lbl_80453BC8-_SDA2_BASE_(r2) /* 801A2F00 0019FE40 C0 82 A2 64 */ lfs f4, lbl_80453C64-_SDA2_BASE_(r2) -/* 801A2F04 0019FE44 48 0C CA 79 */ bl cLib_addCalc +/* 801A2F04 0019FE44 48 0C CA 79 */ bl cLib_addCalc__FPfffff /* 801A2F08 0019FE48 38 76 03 3C */ addi r3, r22, 0x33c /* 801A2F0C 0019FE4C C0 22 A1 E0 */ lfs f1, lbl_80453BE0-_SDA2_BASE_(r2) /* 801A2F10 0019FE50 C0 15 00 04 */ lfs f0, 4(r21) @@ -958,13 +958,13 @@ lbl_801A2EF0: /* 801A2F18 0019FE58 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A2F1C 0019FE5C C0 62 A1 C8 */ lfs f3, lbl_80453BC8-_SDA2_BASE_(r2) /* 801A2F20 0019FE60 C0 82 A2 64 */ lfs f4, lbl_80453C64-_SDA2_BASE_(r2) -/* 801A2F24 0019FE64 48 0C CA 59 */ bl cLib_addCalc +/* 801A2F24 0019FE64 48 0C CA 59 */ bl cLib_addCalc__FPfffff /* 801A2F28 0019FE68 38 76 03 40 */ addi r3, r22, 0x340 /* 801A2F2C 0019FE6C C0 35 00 08 */ lfs f1, 8(r21) /* 801A2F30 0019FE70 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A2F34 0019FE74 C0 62 A1 C8 */ lfs f3, lbl_80453BC8-_SDA2_BASE_(r2) /* 801A2F38 0019FE78 C0 82 A2 64 */ lfs f4, lbl_80453C64-_SDA2_BASE_(r2) -/* 801A2F3C 0019FE7C 48 0C CA 41 */ bl cLib_addCalc +/* 801A2F3C 0019FE7C 48 0C CA 41 */ bl cLib_addCalc__FPfffff /* 801A2F40 0019FE80 48 00 06 8C */ b lbl_801A35CC lbl_801A2F44: /* 801A2F44 0019FE84 88 7F 12 D7 */ lbz r3, 0x12d7(r31) @@ -980,7 +980,7 @@ lbl_801A2F58: /* 801A2F68 0019FEA8 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A2F6C 0019FEAC C0 62 A1 C8 */ lfs f3, lbl_80453BC8-_SDA2_BASE_(r2) /* 801A2F70 0019FEB0 C0 82 A2 64 */ lfs f4, lbl_80453C64-_SDA2_BASE_(r2) -/* 801A2F74 0019FEB4 48 0C CA 09 */ bl cLib_addCalc +/* 801A2F74 0019FEB4 48 0C CA 09 */ bl cLib_addCalc__FPfffff /* 801A2F78 0019FEB8 38 76 03 3C */ addi r3, r22, 0x33c /* 801A2F7C 0019FEBC 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 801A2F80 0019FEC0 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l @@ -988,7 +988,7 @@ lbl_801A2F58: /* 801A2F88 0019FEC8 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A2F8C 0019FECC C0 62 A1 C8 */ lfs f3, lbl_80453BC8-_SDA2_BASE_(r2) /* 801A2F90 0019FED0 C0 82 A2 64 */ lfs f4, lbl_80453C64-_SDA2_BASE_(r2) -/* 801A2F94 0019FED4 48 0C C9 E9 */ bl cLib_addCalc +/* 801A2F94 0019FED4 48 0C C9 E9 */ bl cLib_addCalc__FPfffff /* 801A2F98 0019FED8 38 76 03 40 */ addi r3, r22, 0x340 /* 801A2F9C 0019FEDC 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 801A2FA0 0019FEE0 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l @@ -996,7 +996,7 @@ lbl_801A2F58: /* 801A2FA8 0019FEE8 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A2FAC 0019FEEC C0 62 A1 C8 */ lfs f3, lbl_80453BC8-_SDA2_BASE_(r2) /* 801A2FB0 0019FEF0 C0 82 A2 64 */ lfs f4, lbl_80453C64-_SDA2_BASE_(r2) -/* 801A2FB4 0019FEF4 48 0C C9 C9 */ bl cLib_addCalc +/* 801A2FB4 0019FEF4 48 0C C9 C9 */ bl cLib_addCalc__FPfffff /* 801A2FB8 0019FEF8 48 00 06 14 */ b lbl_801A35CC lbl_801A2FBC: /* 801A2FBC 0019FEFC 57 20 06 3F */ clrlwi. r0, r25, 0x18 @@ -1020,19 +1020,19 @@ lbl_801A2FF4: /* 801A2FFC 0019FF3C C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A3000 0019FF40 C0 62 A1 E0 */ lfs f3, lbl_80453BE0-_SDA2_BASE_(r2) /* 801A3004 0019FF44 C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801A3008 0019FF48 48 0C C9 75 */ bl cLib_addCalc +/* 801A3008 0019FF48 48 0C C9 75 */ bl cLib_addCalc__FPfffff /* 801A300C 0019FF4C 38 76 03 3C */ addi r3, r22, 0x33c /* 801A3010 0019FF50 C0 3F 00 1C */ lfs f1, 0x1c(r31) /* 801A3014 0019FF54 C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A3018 0019FF58 C0 62 A1 E0 */ lfs f3, lbl_80453BE0-_SDA2_BASE_(r2) /* 801A301C 0019FF5C C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801A3020 0019FF60 48 0C C9 5D */ bl cLib_addCalc +/* 801A3020 0019FF60 48 0C C9 5D */ bl cLib_addCalc__FPfffff /* 801A3024 0019FF64 38 76 03 40 */ addi r3, r22, 0x340 /* 801A3028 0019FF68 C0 3F 00 20 */ lfs f1, 0x20(r31) /* 801A302C 0019FF6C C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A3030 0019FF70 C0 62 A1 E0 */ lfs f3, lbl_80453BE0-_SDA2_BASE_(r2) /* 801A3034 0019FF74 C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801A3038 0019FF78 48 0C C9 45 */ bl cLib_addCalc +/* 801A3038 0019FF78 48 0C C9 45 */ bl cLib_addCalc__FPfffff /* 801A303C 0019FF7C 48 00 05 90 */ b lbl_801A35CC lbl_801A3040: /* 801A3040 0019FF80 3B 20 00 00 */ li r25, 0 @@ -1299,19 +1299,19 @@ lbl_801A33CC: /* 801A33D4 001A0314 C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A33D8 001A0318 C0 62 A1 E0 */ lfs f3, lbl_80453BE0-_SDA2_BASE_(r2) /* 801A33DC 001A031C C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801A33E0 001A0320 48 0C C5 9D */ bl cLib_addCalc +/* 801A33E0 001A0320 48 0C C5 9D */ bl cLib_addCalc__FPfffff /* 801A33E4 001A0324 38 76 03 3C */ addi r3, r22, 0x33c /* 801A33E8 001A0328 C0 36 03 30 */ lfs f1, 0x330(r22) /* 801A33EC 001A032C C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A33F0 001A0330 C0 62 A1 E0 */ lfs f3, lbl_80453BE0-_SDA2_BASE_(r2) /* 801A33F4 001A0334 C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801A33F8 001A0338 48 0C C5 85 */ bl cLib_addCalc +/* 801A33F8 001A0338 48 0C C5 85 */ bl cLib_addCalc__FPfffff /* 801A33FC 001A033C 38 76 03 40 */ addi r3, r22, 0x340 /* 801A3400 001A0340 C0 36 03 34 */ lfs f1, 0x334(r22) /* 801A3404 001A0344 C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A3408 001A0348 C0 62 A1 E0 */ lfs f3, lbl_80453BE0-_SDA2_BASE_(r2) /* 801A340C 001A034C C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801A3410 001A0350 48 0C C5 6D */ bl cLib_addCalc +/* 801A3410 001A0350 48 0C C5 6D */ bl cLib_addCalc__FPfffff /* 801A3414 001A0354 48 00 01 B8 */ b lbl_801A35CC lbl_801A3418: /* 801A3418 001A0358 57 00 06 3F */ clrlwi. r0, r24, 0x18 @@ -1338,21 +1338,21 @@ lbl_801A3454: /* 801A3464 001A03A4 C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A3468 001A03A8 C0 62 A1 E0 */ lfs f3, lbl_80453BE0-_SDA2_BASE_(r2) /* 801A346C 001A03AC C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801A3470 001A03B0 48 0C C5 0D */ bl cLib_addCalc +/* 801A3470 001A03B0 48 0C C5 0D */ bl cLib_addCalc__FPfffff /* 801A3474 001A03B4 38 76 03 3C */ addi r3, r22, 0x33c /* 801A3478 001A03B8 7C 9F A2 14 */ add r4, r31, r20 /* 801A347C 001A03BC C0 24 0B F4 */ lfs f1, 0xbf4(r4) /* 801A3480 001A03C0 C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A3484 001A03C4 C0 62 A1 E0 */ lfs f3, lbl_80453BE0-_SDA2_BASE_(r2) /* 801A3488 001A03C8 C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801A348C 001A03CC 48 0C C4 F1 */ bl cLib_addCalc +/* 801A348C 001A03CC 48 0C C4 F1 */ bl cLib_addCalc__FPfffff /* 801A3490 001A03D0 38 76 03 40 */ addi r3, r22, 0x340 /* 801A3494 001A03D4 7C 9F A2 14 */ add r4, r31, r20 /* 801A3498 001A03D8 C0 24 0B F8 */ lfs f1, 0xbf8(r4) /* 801A349C 001A03DC C0 42 A2 EC */ lfs f2, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A34A0 001A03E0 C0 62 A1 E0 */ lfs f3, lbl_80453BE0-_SDA2_BASE_(r2) /* 801A34A4 001A03E4 C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801A34A8 001A03E8 48 0C C4 D5 */ bl cLib_addCalc +/* 801A34A8 001A03E8 48 0C C4 D5 */ bl cLib_addCalc__FPfffff lbl_801A34AC: /* 801A34AC 001A03EC 57 23 06 3E */ clrlwi r3, r25, 0x18 /* 801A34B0 001A03F0 38 03 FF FF */ addi r0, r3, -1 @@ -1469,7 +1469,7 @@ lbl_801A3630: /* 801A3638 001A0578 C0 42 A3 34 */ lfs f2, lbl_80453D34-_SDA2_BASE_(r2) /* 801A363C 001A057C C0 62 A3 38 */ lfs f3, lbl_80453D38-_SDA2_BASE_(r2) /* 801A3640 001A0580 C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801A3644 001A0584 48 0C C3 39 */ bl cLib_addCalc +/* 801A3644 001A0584 48 0C C3 39 */ bl cLib_addCalc__FPfffff /* 801A3648 001A0588 48 00 00 E0 */ b lbl_801A3728 lbl_801A364C: /* 801A364C 001A058C 88 16 03 7A */ lbz r0, 0x37a(r22) @@ -1488,7 +1488,7 @@ lbl_801A364C: /* 801A3680 001A05C0 C0 42 A2 64 */ lfs f2, lbl_80453C64-_SDA2_BASE_(r2) /* 801A3684 001A05C4 C0 62 A2 68 */ lfs f3, lbl_80453C68-_SDA2_BASE_(r2) /* 801A3688 001A05C8 C0 82 A3 40 */ lfs f4, lbl_80453D40-_SDA2_BASE_(r2) -/* 801A368C 001A05CC 48 0C C2 F1 */ bl cLib_addCalc +/* 801A368C 001A05CC 48 0C C2 F1 */ bl cLib_addCalc__FPfffff /* 801A3690 001A05D0 48 00 00 98 */ b lbl_801A3728 lbl_801A3694: /* 801A3694 001A05D4 88 16 03 7A */ lbz r0, 0x37a(r22) @@ -1507,7 +1507,7 @@ lbl_801A3694: /* 801A36C8 001A0608 C0 42 A2 64 */ lfs f2, lbl_80453C64-_SDA2_BASE_(r2) /* 801A36CC 001A060C C0 62 A2 68 */ lfs f3, lbl_80453C68-_SDA2_BASE_(r2) /* 801A36D0 001A0610 C0 82 A3 40 */ lfs f4, lbl_80453D40-_SDA2_BASE_(r2) -/* 801A36D4 001A0614 48 0C C2 A9 */ bl cLib_addCalc +/* 801A36D4 001A0614 48 0C C2 A9 */ bl cLib_addCalc__FPfffff /* 801A36D8 001A0618 48 00 00 50 */ b lbl_801A3728 lbl_801A36DC: /* 801A36DC 001A061C 57 00 06 3F */ clrlwi. r0, r24, 0x18 @@ -1529,7 +1529,7 @@ lbl_801A3700: /* 801A3718 001A0658 C0 42 A3 34 */ lfs f2, lbl_80453D34-_SDA2_BASE_(r2) /* 801A371C 001A065C C0 62 A3 48 */ lfs f3, lbl_80453D48-_SDA2_BASE_(r2) /* 801A3720 001A0660 C0 82 A3 10 */ lfs f4, lbl_80453D10-_SDA2_BASE_(r2) -/* 801A3724 001A0664 48 0C C2 59 */ bl cLib_addCalc +/* 801A3724 001A0664 48 0C C2 59 */ bl cLib_addCalc__FPfffff lbl_801A3728: /* 801A3728 001A0668 C0 36 03 44 */ lfs f1, 0x344(r22) /* 801A372C 001A066C C0 02 A2 48 */ lfs f0, lbl_80453C48-_SDA2_BASE_(r2) diff --git a/include/d/d_kankyo/asm/func_801A516C.s b/include/d/d_kankyo/asm/func_801A516C.s index 7e785b472c..b921f16c88 100644 --- a/include/d/d_kankyo/asm/func_801A516C.s +++ b/include/d/d_kankyo/asm/func_801A516C.s @@ -34,7 +34,7 @@ lbl_801A51E4: /* 801A51EC 001A212C 38 61 00 08 */ addi r3, r1, 8 /* 801A51F0 001A2130 38 9E 00 D8 */ addi r4, r30, 0xd8 /* 801A51F4 001A2134 38 BF 10 94 */ addi r5, r31, 0x1094 -/* 801A51F8 001A2138 48 0C 18 ED */ bl cXyz_NS___pl +/* 801A51F8 001A2138 48 0C 18 ED */ bl __pl__4cXyzCFRC3Vec /* 801A51FC 001A213C C0 01 00 08 */ lfs f0, 8(r1) /* 801A5200 001A2140 D0 1D 00 18 */ stfs f0, 0x18(r29) /* 801A5204 001A2144 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_kankyo/asm/func_801A5288.s b/include/d/d_kankyo/asm/func_801A5288.s index 620e5ed02f..29f5e95bcc 100644 --- a/include/d/d_kankyo/asm/func_801A5288.s +++ b/include/d/d_kankyo/asm/func_801A5288.s @@ -130,7 +130,7 @@ lbl_801A544C: /* 801A5464 001A23A4 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A5468 001A23A8 C0 62 A2 EC */ lfs f3, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A546C 001A23AC C0 82 A2 68 */ lfs f4, lbl_80453C68-_SDA2_BASE_(r2) -/* 801A5470 001A23B0 48 0C A5 0D */ bl cLib_addCalc +/* 801A5470 001A23B0 48 0C A5 0D */ bl cLib_addCalc__FPfffff /* 801A5474 001A23B4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A5478 001A23B8 3B 43 CA 54 */ addi r26, r3, lbl_8042CA54@l /* 801A547C 001A23BC 38 7A 11 FC */ addi r3, r26, 0x11fc @@ -138,7 +138,7 @@ lbl_801A544C: /* 801A5484 001A23C4 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A5488 001A23C8 C0 62 A2 EC */ lfs f3, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A548C 001A23CC C0 82 A2 68 */ lfs f4, lbl_80453C68-_SDA2_BASE_(r2) -/* 801A5490 001A23D0 48 0C A4 ED */ bl cLib_addCalc +/* 801A5490 001A23D0 48 0C A4 ED */ bl cLib_addCalc__FPfffff /* 801A5494 001A23D4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A5498 001A23D8 3B 63 CA 54 */ addi r27, r3, lbl_8042CA54@l /* 801A549C 001A23DC 38 7B 12 00 */ addi r3, r27, 0x1200 @@ -148,7 +148,7 @@ lbl_801A544C: /* 801A54AC 001A23EC C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A54B0 001A23F0 C0 62 A2 EC */ lfs f3, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A54B4 001A23F4 C0 82 A2 68 */ lfs f4, lbl_80453C68-_SDA2_BASE_(r2) -/* 801A54B8 001A23F8 48 0C A4 C5 */ bl cLib_addCalc +/* 801A54B8 001A23F8 48 0C A4 C5 */ bl cLib_addCalc__FPfffff /* 801A54BC 001A23FC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A54C0 001A2400 3B 83 CA 54 */ addi r28, r3, lbl_8042CA54@l /* 801A54C4 001A2404 38 7C 12 04 */ addi r3, r28, 0x1204 @@ -158,7 +158,7 @@ lbl_801A544C: /* 801A54D4 001A2414 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A54D8 001A2418 C0 62 A2 EC */ lfs f3, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A54DC 001A241C C0 82 A2 68 */ lfs f4, lbl_80453C68-_SDA2_BASE_(r2) -/* 801A54E0 001A2420 48 0C A4 9D */ bl cLib_addCalc +/* 801A54E0 001A2420 48 0C A4 9D */ bl cLib_addCalc__FPfffff /* 801A54E4 001A2424 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A54E8 001A2428 3B A3 CA 54 */ addi r29, r3, lbl_8042CA54@l /* 801A54EC 001A242C 38 7D 12 08 */ addi r3, r29, 0x1208 @@ -168,7 +168,7 @@ lbl_801A544C: /* 801A54FC 001A243C C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A5500 001A2440 C0 62 A2 EC */ lfs f3, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A5504 001A2444 C0 82 A2 68 */ lfs f4, lbl_80453C68-_SDA2_BASE_(r2) -/* 801A5508 001A2448 48 0C A4 75 */ bl cLib_addCalc +/* 801A5508 001A2448 48 0C A4 75 */ bl cLib_addCalc__FPfffff /* 801A550C 001A244C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A5510 001A2450 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l /* 801A5514 001A2454 38 7E 12 0C */ addi r3, r30, 0x120c @@ -178,7 +178,7 @@ lbl_801A544C: /* 801A5524 001A2464 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A5528 001A2468 C0 62 A2 EC */ lfs f3, lbl_80453CEC-_SDA2_BASE_(r2) /* 801A552C 001A246C C0 82 A2 68 */ lfs f4, lbl_80453C68-_SDA2_BASE_(r2) -/* 801A5530 001A2470 48 0C A4 4D */ bl cLib_addCalc +/* 801A5530 001A2470 48 0C A4 4D */ bl cLib_addCalc__FPfffff /* 801A5534 001A2474 C0 02 A2 48 */ lfs f0, lbl_80453C48-_SDA2_BASE_(r2) /* 801A5538 001A2478 D0 19 12 14 */ stfs f0, 0x1214(r25) /* 801A553C 001A247C D0 1A 12 18 */ stfs f0, 0x1218(r26) @@ -273,7 +273,7 @@ lbl_801A5674: /* 801A5690 001A25D0 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A5694 001A25D4 C0 62 A2 64 */ lfs f3, lbl_80453C64-_SDA2_BASE_(r2) /* 801A5698 001A25D8 C0 82 A3 40 */ lfs f4, lbl_80453D40-_SDA2_BASE_(r2) -/* 801A569C 001A25DC 48 0C A2 E1 */ bl cLib_addCalc +/* 801A569C 001A25DC 48 0C A2 E1 */ bl cLib_addCalc__FPfffff /* 801A56A0 001A25E0 48 00 00 24 */ b lbl_801A56C4 lbl_801A56A4: /* 801A56A4 001A25E4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -283,7 +283,7 @@ lbl_801A56A4: /* 801A56B4 001A25F4 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A56B8 001A25F8 C0 62 A2 64 */ lfs f3, lbl_80453C64-_SDA2_BASE_(r2) /* 801A56BC 001A25FC C0 82 A3 40 */ lfs f4, lbl_80453D40-_SDA2_BASE_(r2) -/* 801A56C0 001A2600 48 0C A2 BD */ bl cLib_addCalc +/* 801A56C0 001A2600 48 0C A2 BD */ bl cLib_addCalc__FPfffff lbl_801A56C4: /* 801A56C4 001A2604 39 61 00 30 */ addi r11, r1, 0x30 /* 801A56C8 001A2608 48 1B CB 51 */ bl _restgpr_25 diff --git a/include/d/d_kankyo/asm/func_801A572C.s b/include/d/d_kankyo/asm/func_801A572C.s index 14cc70bd0a..de9b248441 100644 --- a/include/d/d_kankyo/asm/func_801A572C.s +++ b/include/d/d_kankyo/asm/func_801A572C.s @@ -127,7 +127,7 @@ lbl_801A58D0: /* 801A58F4 001A2834 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A58F8 001A2838 C0 62 A3 08 */ lfs f3, lbl_80453D08-_SDA2_BASE_(r2) /* 801A58FC 001A283C C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801A5900 001A2840 48 0C A0 7D */ bl cLib_addCalc +/* 801A5900 001A2840 48 0C A0 7D */ bl cLib_addCalc__FPfffff lbl_801A5904: /* 801A5904 001A2844 38 7D 00 E4 */ addi r3, r29, 0xe4 /* 801A5908 001A2848 38 9F 1D 98 */ addi r4, r31, 0x1d98 @@ -214,7 +214,7 @@ lbl_801A5A04: /* 801A5A24 001A2964 C0 42 A2 60 */ lfs f2, lbl_80453C60-_SDA2_BASE_(r2) /* 801A5A28 001A2968 C0 62 A3 08 */ lfs f3, lbl_80453D08-_SDA2_BASE_(r2) /* 801A5A2C 001A296C C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801A5A30 001A2970 48 0C 9F 4D */ bl cLib_addCalc +/* 801A5A30 001A2970 48 0C 9F 4D */ bl cLib_addCalc__FPfffff lbl_801A5A34: /* 801A5A34 001A2974 C0 1D 00 D8 */ lfs f0, 0xd8(r29) /* 801A5A38 001A2978 D0 1F 1D 80 */ stfs f0, 0x1d80(r31) diff --git a/include/d/d_kankyo/asm/func_801A6278.s b/include/d/d_kankyo/asm/func_801A6278.s index 567ad5e896..3b0eb5f4c8 100644 --- a/include/d/d_kankyo/asm/func_801A6278.s +++ b/include/d/d_kankyo/asm/func_801A6278.s @@ -371,7 +371,7 @@ lbl_801A67E4: /* 801A67EC 001A372C 38 61 00 14 */ addi r3, r1, 0x14 /* 801A67F0 001A3730 38 99 00 D8 */ addi r4, r25, 0xd8 /* 801A67F4 001A3734 38 BD 10 94 */ addi r5, r29, 0x1094 -/* 801A67F8 001A3738 48 0C 02 ED */ bl cXyz_NS___pl +/* 801A67F8 001A3738 48 0C 02 ED */ bl __pl__4cXyzCFRC3Vec /* 801A67FC 001A373C 80 0D 81 84 */ lwz r0, lbl_80450704-_SDA_BASE_(r13) /* 801A6800 001A3740 38 72 01 D0 */ addi r3, r18, 0x1d0 /* 801A6804 001A3744 7C 60 1A 14 */ add r3, r0, r3 diff --git a/include/d/d_kankyo/asm/func_801AAD50.s b/include/d/d_kankyo/asm/func_801AAD50.s index 1b1fe646c9..4db6c4c005 100644 --- a/include/d/d_kankyo/asm/func_801AAD50.s +++ b/include/d/d_kankyo/asm/func_801AAD50.s @@ -104,7 +104,7 @@ lbl_801AAE9C: /* 801AAECC 001A7E0C C0 42 A2 F4 */ lfs f2, lbl_80453CF4-_SDA2_BASE_(r2) /* 801AAED0 001A7E10 C0 62 A3 28 */ lfs f3, lbl_80453D28-_SDA2_BASE_(r2) /* 801AAED4 001A7E14 C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801AAED8 001A7E18 48 0C 4A A5 */ bl cLib_addCalc +/* 801AAED8 001A7E18 48 0C 4A A5 */ bl cLib_addCalc__FPfffff /* 801AAEDC 001A7E1C C0 02 A2 2C */ lfs f0, lbl_80453C2C-_SDA2_BASE_(r2) /* 801AAEE0 001A7E20 7C 7F DA 14 */ add r3, r31, r27 /* 801AAEE4 001A7E24 D0 03 0C 30 */ stfs f0, 0xc30(r3) @@ -125,7 +125,7 @@ lbl_801AAEEC: /* 801AAF1C 001A7E5C C0 42 A2 F4 */ lfs f2, lbl_80453CF4-_SDA2_BASE_(r2) /* 801AAF20 001A7E60 C0 62 A3 28 */ lfs f3, lbl_80453D28-_SDA2_BASE_(r2) /* 801AAF24 001A7E64 C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801AAF28 001A7E68 48 0C 4A 55 */ bl cLib_addCalc +/* 801AAF28 001A7E68 48 0C 4A 55 */ bl cLib_addCalc__FPfffff /* 801AAF2C 001A7E6C C0 02 A3 DC */ lfs f0, lbl_80453DDC-_SDA2_BASE_(r2) /* 801AAF30 001A7E70 7C 7F DA 14 */ add r3, r31, r27 /* 801AAF34 001A7E74 D0 03 0C 30 */ stfs f0, 0xc30(r3) @@ -146,7 +146,7 @@ lbl_801AAF3C: /* 801AAF6C 001A7EAC C0 42 A2 F4 */ lfs f2, lbl_80453CF4-_SDA2_BASE_(r2) /* 801AAF70 001A7EB0 C0 62 A3 28 */ lfs f3, lbl_80453D28-_SDA2_BASE_(r2) /* 801AAF74 001A7EB4 C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801AAF78 001A7EB8 48 0C 4A 05 */ bl cLib_addCalc +/* 801AAF78 001A7EB8 48 0C 4A 05 */ bl cLib_addCalc__FPfffff /* 801AAF7C 001A7EBC C0 02 A3 DC */ lfs f0, lbl_80453DDC-_SDA2_BASE_(r2) /* 801AAF80 001A7EC0 7C 7F DA 14 */ add r3, r31, r27 /* 801AAF84 001A7EC4 D0 03 0C 30 */ stfs f0, 0xc30(r3) @@ -167,7 +167,7 @@ lbl_801AAF8C: /* 801AAFBC 001A7EFC C0 42 A2 F4 */ lfs f2, lbl_80453CF4-_SDA2_BASE_(r2) /* 801AAFC0 001A7F00 C0 62 A3 28 */ lfs f3, lbl_80453D28-_SDA2_BASE_(r2) /* 801AAFC4 001A7F04 C0 82 A3 30 */ lfs f4, lbl_80453D30-_SDA2_BASE_(r2) -/* 801AAFC8 001A7F08 48 0C 49 B5 */ bl cLib_addCalc +/* 801AAFC8 001A7F08 48 0C 49 B5 */ bl cLib_addCalc__FPfffff /* 801AAFCC 001A7F0C C0 02 A3 E8 */ lfs f0, lbl_80453DE8-_SDA2_BASE_(r2) /* 801AAFD0 001A7F10 7C 7F DA 14 */ add r3, r31, r27 /* 801AAFD4 001A7F14 D0 03 0C 30 */ stfs f0, 0xc30(r3) diff --git a/include/d/d_kankyo/asm/func_801AB01C.s b/include/d/d_kankyo/asm/func_801AB01C.s index 867ba23fd5..d4d913c24c 100644 --- a/include/d/d_kankyo/asm/func_801AB01C.s +++ b/include/d/d_kankyo/asm/func_801AB01C.s @@ -102,7 +102,7 @@ lbl_801AB118: /* 801AB19C 001A80DC D0 01 00 0C */ stfs f0, 0xc(r1) /* 801AB1A0 001A80E0 38 61 00 14 */ addi r3, r1, 0x14 /* 801AB1A4 001A80E4 38 81 00 08 */ addi r4, r1, 8 -/* 801AB1A8 001A80E8 48 0B CB 81 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 801AB1A8 001A80E8 48 0B CB 81 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 801AB1AC 001A80EC 7F 83 E3 78 */ mr r3, r28 /* 801AB1B0 001A80F0 38 81 00 14 */ addi r4, r1, 0x14 /* 801AB1B4 001A80F4 4B EC 92 ED */ bl cBgS_NS_GroundCross diff --git a/include/d/d_kankyo/asm/func_801ACD24.s b/include/d/d_kankyo/asm/func_801ACD24.s index ce62950d14..d068e9eb53 100644 --- a/include/d/d_kankyo/asm/func_801ACD24.s +++ b/include/d/d_kankyo/asm/func_801ACD24.s @@ -924,7 +924,7 @@ lbl_801ADAA0: /* 801ADAEC 001AAA2C C0 82 A4 4C */ lfs f4, lbl_80453E4C-_SDA2_BASE_(r2) /* 801ADAF0 001AAA30 C0 A1 00 68 */ lfs f5, 0x68(r1) /* 801ADAF4 001AAA34 C0 C1 00 70 */ lfs f6, 0x70(r1) -/* 801ADAF8 001AAA38 48 0B AD 9D */ bl cM3d_VectorProduct2d +/* 801ADAF8 001AAA38 48 0B AD 9D */ bl cM3d_VectorProduct2d__Fffffff /* 801ADAFC 001AAA3C C0 82 A2 F4 */ lfs f4, lbl_80453CF4-_SDA2_BASE_(r2) /* 801ADB00 001AAA40 FC 01 20 40 */ fcmpo cr0, f1, f4 /* 801ADB04 001AAA44 40 80 00 10 */ bge lbl_801ADB14 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s index 53ccb59391..0e34484270 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s @@ -147,7 +147,7 @@ lbl_8005C0B8: /* 8005C134 00059074 C0 42 88 1C */ lfs f2, lbl_8045221C-_SDA2_BASE_(r2) /* 8005C138 00059078 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 8005C13C 0005907C C0 82 88 24 */ lfs f4, lbl_80452224-_SDA2_BASE_(r2) -/* 8005C140 00059080 48 21 38 3D */ bl cLib_addCalc +/* 8005C140 00059080 48 21 38 3D */ bl cLib_addCalc__FPfffff /* 8005C144 00059084 28 1A 00 00 */ cmplwi r26, 0 /* 8005C148 00059088 41 82 00 08 */ beq lbl_8005C150 /* 8005C14C 0005908C C3 9A 0B 68 */ lfs f28, 0xb68(r26) @@ -350,7 +350,7 @@ lbl_8005C40C: /* 8005C414 00059354 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 8005C418 00059358 C0 62 88 1C */ lfs f3, lbl_8045221C-_SDA2_BASE_(r2) /* 8005C41C 0005935C C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8005C420 00059360 48 21 35 5D */ bl cLib_addCalc +/* 8005C420 00059360 48 21 35 5D */ bl cLib_addCalc__FPfffff /* 8005C424 00059364 3A C0 00 00 */ li r22, 0 /* 8005C428 00059368 38 00 00 00 */ li r0, 0 /* 8005C42C 0005936C 98 18 00 28 */ stb r0, 0x28(r24) @@ -383,7 +383,7 @@ lbl_8005C46C: /* 8005C488 000593C8 C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 8005C48C 000593CC FC 60 10 90 */ fmr f3, f2 /* 8005C490 000593D0 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8005C494 000593D4 48 21 34 E9 */ bl cLib_addCalc +/* 8005C494 000593D4 48 21 34 E9 */ bl cLib_addCalc__FPfffff /* 8005C498 000593D8 48 00 00 60 */ b lbl_8005C4F8 lbl_8005C49C: /* 8005C49C 000593DC 38 78 00 5C */ addi r3, r24, 0x5c @@ -391,7 +391,7 @@ lbl_8005C49C: /* 8005C4A4 000593E4 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005C4A8 000593E8 C0 62 88 44 */ lfs f3, lbl_80452244-_SDA2_BASE_(r2) /* 8005C4AC 000593EC C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8005C4B0 000593F0 48 21 34 CD */ bl cLib_addCalc +/* 8005C4B0 000593F0 48 21 34 CD */ bl cLib_addCalc__FPfffff /* 8005C4B4 000593F4 48 00 00 44 */ b lbl_8005C4F8 lbl_8005C4B8: /* 8005C4B8 000593F8 56 C0 06 3E */ clrlwi r0, r22, 0x18 @@ -402,7 +402,7 @@ lbl_8005C4B8: /* 8005C4CC 0005940C C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 8005C4D0 00059410 FC 60 10 90 */ fmr f3, f2 /* 8005C4D4 00059414 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8005C4D8 00059418 48 21 34 A5 */ bl cLib_addCalc +/* 8005C4D8 00059418 48 21 34 A5 */ bl cLib_addCalc__FPfffff /* 8005C4DC 0005941C 48 00 00 1C */ b lbl_8005C4F8 lbl_8005C4E0: /* 8005C4E0 00059420 38 78 00 5C */ addi r3, r24, 0x5c @@ -410,7 +410,7 @@ lbl_8005C4E0: /* 8005C4E8 00059428 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005C4EC 0005942C C0 62 88 44 */ lfs f3, lbl_80452244-_SDA2_BASE_(r2) /* 8005C4F0 00059430 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8005C4F4 00059434 48 21 34 89 */ bl cLib_addCalc +/* 8005C4F4 00059434 48 21 34 89 */ bl cLib_addCalc__FPfffff lbl_8005C4F8: /* 8005C4F8 00059438 C0 38 00 5C */ lfs f1, 0x5c(r24) /* 8005C4FC 0005943C C0 02 87 B8 */ lfs f0, lbl_804521B8-_SDA2_BASE_(r2) @@ -492,7 +492,7 @@ lbl_8005C5F0: /* 8005C614 00059554 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 8005C618 00059558 C0 62 87 C4 */ lfs f3, lbl_804521C4-_SDA2_BASE_(r2) /* 8005C61C 0005955C C0 82 87 D0 */ lfs f4, lbl_804521D0-_SDA2_BASE_(r2) -/* 8005C620 00059560 48 21 33 5D */ bl cLib_addCalc +/* 8005C620 00059560 48 21 33 5D */ bl cLib_addCalc__FPfffff /* 8005C624 00059564 48 00 00 1C */ b lbl_8005C640 lbl_8005C628: /* 8005C628 00059568 38 78 00 6C */ addi r3, r24, 0x6c @@ -500,7 +500,7 @@ lbl_8005C628: /* 8005C630 00059570 C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 8005C634 00059574 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 8005C638 00059578 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8005C63C 0005957C 48 21 33 41 */ bl cLib_addCalc +/* 8005C63C 0005957C 48 21 33 41 */ bl cLib_addCalc__FPfffff lbl_8005C640: /* 8005C640 00059580 C0 7E 12 44 */ lfs f3, 0x1244(r30) /* 8005C644 00059584 C0 02 87 E4 */ lfs f0, lbl_804521E4-_SDA2_BASE_(r2) @@ -821,7 +821,7 @@ lbl_8005CB08: /* 8005CB0C 00059A4C C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005CB10 00059A50 C0 62 87 C4 */ lfs f3, lbl_804521C4-_SDA2_BASE_(r2) /* 8005CB14 00059A54 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8005CB18 00059A58 48 21 2E 65 */ bl cLib_addCalc +/* 8005CB18 00059A58 48 21 2E 65 */ bl cLib_addCalc__FPfffff /* 8005CB1C 00059A5C 48 00 00 1C */ b lbl_8005CB38 lbl_8005CB20: /* 8005CB20 00059A60 38 78 00 68 */ addi r3, r24, 0x68 @@ -829,7 +829,7 @@ lbl_8005CB20: /* 8005CB28 00059A68 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005CB2C 00059A6C C0 62 87 C4 */ lfs f3, lbl_804521C4-_SDA2_BASE_(r2) /* 8005CB30 00059A70 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8005CB34 00059A74 48 21 2E 49 */ bl cLib_addCalc +/* 8005CB34 00059A74 48 21 2E 49 */ bl cLib_addCalc__FPfffff lbl_8005CB38: /* 8005CB38 00059A78 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005CB3C 00059A7C 38 83 CA 54 */ addi r4, r3, lbl_8042CA54@l diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s index e07a0b9c88..8fa4bdd9b0 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s @@ -82,7 +82,7 @@ lbl_8005CF04: /* 8005CF10 00059E50 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8005CF14 00059E54 38 61 00 64 */ addi r3, r1, 0x64 /* 8005CF18 00059E58 38 81 00 08 */ addi r4, r1, 8 -/* 8005CF1C 00059E5C 48 20 AE 0D */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8005CF1C 00059E5C 48 20 AE 0D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8005CF20 00059E60 7F A3 EB 78 */ mr r3, r29 /* 8005CF24 00059E64 38 81 00 64 */ addi r4, r1, 0x64 /* 8005CF28 00059E68 48 01 75 79 */ bl cBgS_NS_GroundCross diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s index e7032be833..c80bf34d7a 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s @@ -107,7 +107,7 @@ lbl_8005D110: /* 8005D11C 0005A05C D0 01 00 18 */ stfs f0, 0x18(r1) /* 8005D120 0005A060 38 61 00 70 */ addi r3, r1, 0x70 /* 8005D124 0005A064 38 81 00 14 */ addi r4, r1, 0x14 -/* 8005D128 0005A068 48 20 AC 01 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8005D128 0005A068 48 20 AC 01 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8005D12C 0005A06C 7F A3 EB 78 */ mr r3, r29 /* 8005D130 0005A070 38 81 00 70 */ addi r4, r1, 0x70 /* 8005D134 0005A074 48 01 73 6D */ bl cBgS_NS_GroundCross diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s index 1390149c08..01a1a61291 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s @@ -315,7 +315,7 @@ lbl_8005D5E8: /* 8005D5F0 0005A530 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005D5F4 0005A534 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 8005D5F8 0005A538 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8005D5FC 0005A53C 48 21 23 81 */ bl cLib_addCalc +/* 8005D5FC 0005A53C 48 21 23 81 */ bl cLib_addCalc__FPfffff /* 8005D600 0005A540 C0 3A 36 FC */ lfs f1, 0x36fc(r26) /* 8005D604 0005A544 C0 02 88 44 */ lfs f0, lbl_80452244-_SDA2_BASE_(r2) /* 8005D608 0005A548 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -327,19 +327,19 @@ lbl_8005D614: /* 8005D61C 0005A55C C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005D620 0005A560 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 8005D624 0005A564 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8005D628 0005A568 48 21 23 55 */ bl cLib_addCalc +/* 8005D628 0005A568 48 21 23 55 */ bl cLib_addCalc__FPfffff /* 8005D62C 0005A56C 38 7A 36 F4 */ addi r3, r26, 0x36f4 /* 8005D630 0005A570 C0 21 00 B4 */ lfs f1, 0xb4(r1) /* 8005D634 0005A574 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005D638 0005A578 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 8005D63C 0005A57C C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8005D640 0005A580 48 21 23 3D */ bl cLib_addCalc +/* 8005D640 0005A580 48 21 23 3D */ bl cLib_addCalc__FPfffff /* 8005D644 0005A584 38 7A 36 F8 */ addi r3, r26, 0x36f8 /* 8005D648 0005A588 C0 21 00 B8 */ lfs f1, 0xb8(r1) /* 8005D64C 0005A58C C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005D650 0005A590 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 8005D654 0005A594 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8005D658 0005A598 48 21 23 25 */ bl cLib_addCalc +/* 8005D658 0005A598 48 21 23 25 */ bl cLib_addCalc__FPfffff /* 8005D65C 0005A59C C0 19 00 E4 */ lfs f0, 0xe4(r25) /* 8005D660 0005A5A0 D0 1A 36 E4 */ stfs f0, 0x36e4(r26) /* 8005D664 0005A5A4 C0 19 00 E8 */ lfs f0, 0xe8(r25) @@ -443,7 +443,7 @@ lbl_8005D7C0: /* 8005D7D0 0005A710 C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 8005D7D4 0005A714 C0 62 88 40 */ lfs f3, lbl_80452240-_SDA2_BASE_(r2) /* 8005D7D8 0005A718 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8005D7DC 0005A71C 48 21 21 A1 */ bl cLib_addCalc +/* 8005D7DC 0005A71C 48 21 21 A1 */ bl cLib_addCalc__FPfffff /* 8005D7E0 0005A720 48 00 00 1C */ b lbl_8005D7FC lbl_8005D7E4: /* 8005D7E4 0005A724 38 7A 37 08 */ addi r3, r26, 0x3708 @@ -451,7 +451,7 @@ lbl_8005D7E4: /* 8005D7EC 0005A72C C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 8005D7F0 0005A730 FC 60 10 90 */ fmr f3, f2 /* 8005D7F4 0005A734 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8005D7F8 0005A738 48 21 21 85 */ bl cLib_addCalc +/* 8005D7F8 0005A738 48 21 21 85 */ bl cLib_addCalc__FPfffff lbl_8005D7FC: /* 8005D7FC 0005A73C 2C 17 00 00 */ cmpwi r23, 0 /* 8005D800 0005A740 41 82 00 20 */ beq lbl_8005D820 @@ -460,7 +460,7 @@ lbl_8005D7FC: /* 8005D80C 0005A74C C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 8005D810 0005A750 C0 62 88 40 */ lfs f3, lbl_80452240-_SDA2_BASE_(r2) /* 8005D814 0005A754 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8005D818 0005A758 48 21 21 65 */ bl cLib_addCalc +/* 8005D818 0005A758 48 21 21 65 */ bl cLib_addCalc__FPfffff /* 8005D81C 0005A75C 48 00 00 1C */ b lbl_8005D838 lbl_8005D820: /* 8005D820 0005A760 38 7A 37 0C */ addi r3, r26, 0x370c @@ -468,7 +468,7 @@ lbl_8005D820: /* 8005D828 0005A768 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 8005D82C 0005A76C FC 60 10 90 */ fmr f3, f2 /* 8005D830 0005A770 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8005D834 0005A774 48 21 21 49 */ bl cLib_addCalc +/* 8005D834 0005A774 48 21 21 49 */ bl cLib_addCalc__FPfffff lbl_8005D838: /* 8005D838 0005A778 2C 16 00 00 */ cmpwi r22, 0 /* 8005D83C 0005A77C 41 82 00 20 */ beq lbl_8005D85C @@ -477,7 +477,7 @@ lbl_8005D838: /* 8005D848 0005A788 C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 8005D84C 0005A78C C0 62 88 40 */ lfs f3, lbl_80452240-_SDA2_BASE_(r2) /* 8005D850 0005A790 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8005D854 0005A794 48 21 21 29 */ bl cLib_addCalc +/* 8005D854 0005A794 48 21 21 29 */ bl cLib_addCalc__FPfffff /* 8005D858 0005A798 48 00 00 1C */ b lbl_8005D874 lbl_8005D85C: /* 8005D85C 0005A79C 38 7A 37 10 */ addi r3, r26, 0x3710 @@ -485,7 +485,7 @@ lbl_8005D85C: /* 8005D864 0005A7A4 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 8005D868 0005A7A8 FC 60 10 90 */ fmr f3, f2 /* 8005D86C 0005A7AC C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8005D870 0005A7B0 48 21 21 0D */ bl cLib_addCalc +/* 8005D870 0005A7B0 48 21 21 0D */ bl cLib_addCalc__FPfffff lbl_8005D874: /* 8005D874 0005A7B4 A8 7A 36 D0 */ lha r3, 0x36d0(r26) /* 8005D878 0005A7B8 3A 63 FF FF */ addi r19, r3, -1 @@ -552,7 +552,7 @@ lbl_8005D948: /* 8005D960 0005A8A0 C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 8005D964 0005A8A4 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 8005D968 0005A8A8 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8005D96C 0005A8AC 48 21 20 11 */ bl cLib_addCalc +/* 8005D96C 0005A8AC 48 21 20 11 */ bl cLib_addCalc__FPfffff /* 8005D970 0005A8B0 C0 FC 00 1C */ lfs f7, 0x1c(r28) /* 8005D974 0005A8B4 C0 62 88 8C */ lfs f3, lbl_8045228C-_SDA2_BASE_(r2) /* 8005D978 0005A8B8 C0 81 00 C8 */ lfs f4, 0xc8(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s index c0fcba4bb4..fb25cc5eaa 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s @@ -72,7 +72,7 @@ lbl_8005E9DC: /* 8005EA10 0005B950 D0 01 00 58 */ stfs f0, 0x58(r1) /* 8005EA14 0005B954 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8005EA18 0005B958 38 81 00 54 */ addi r4, r1, 0x54 -/* 8005EA1C 0005B95C 48 20 93 0D */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8005EA1C 0005B95C 48 20 93 0D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8005EA20 0005B960 7F E3 FB 78 */ mr r3, r31 /* 8005EA24 0005B964 38 81 00 E4 */ addi r4, r1, 0xe4 /* 8005EA28 0005B968 48 01 5A 79 */ bl cBgS_NS_GroundCross @@ -123,7 +123,7 @@ lbl_8005EAB0: /* 8005EAC4 0005BA04 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005EAC8 0005BA08 C0 62 88 1C */ lfs f3, lbl_8045221C-_SDA2_BASE_(r2) /* 8005EACC 0005BA0C C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8005EAD0 0005BA10 48 21 0E AD */ bl cLib_addCalc +/* 8005EAD0 0005BA10 48 21 0E AD */ bl cLib_addCalc__FPfffff /* 8005EAD4 0005BA14 48 00 00 1C */ b lbl_8005EAF0 lbl_8005EAD8: /* 8005EAD8 0005BA18 38 7A 5D E8 */ addi r3, r26, 0x5de8 @@ -131,7 +131,7 @@ lbl_8005EAD8: /* 8005EAE0 0005BA20 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005EAE4 0005BA24 C0 62 88 1C */ lfs f3, lbl_8045221C-_SDA2_BASE_(r2) /* 8005EAE8 0005BA28 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8005EAEC 0005BA2C 48 21 0E 91 */ bl cLib_addCalc +/* 8005EAEC 0005BA2C 48 21 0E 91 */ bl cLib_addCalc__FPfffff lbl_8005EAF0: /* 8005EAF0 0005BA30 A8 1A 5D EC */ lha r0, 0x5dec(r26) /* 8005EAF4 0005BA34 2C 00 00 00 */ cmpwi r0, 0 @@ -253,7 +253,7 @@ lbl_8005EC2C: /* 8005EC98 0005BBD8 D0 01 00 4C */ stfs f0, 0x4c(r1) /* 8005EC9C 0005BBDC 38 61 00 90 */ addi r3, r1, 0x90 /* 8005ECA0 0005BBE0 38 81 00 48 */ addi r4, r1, 0x48 -/* 8005ECA4 0005BBE4 48 20 90 85 */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8005ECA4 0005BBE4 48 20 90 85 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8005ECA8 0005BBE8 7F E3 FB 78 */ mr r3, r31 /* 8005ECAC 0005BBEC 38 81 00 90 */ addi r4, r1, 0x90 /* 8005ECB0 0005BBF0 48 01 57 F1 */ bl cBgS_NS_GroundCross @@ -779,19 +779,19 @@ lbl_8005F418: /* 8005F420 0005C360 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005F424 0005C364 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 8005F428 0005C368 C0 82 88 24 */ lfs f4, lbl_80452224-_SDA2_BASE_(r2) -/* 8005F42C 0005C36C 48 21 05 51 */ bl cLib_addCalc +/* 8005F42C 0005C36C 48 21 05 51 */ bl cLib_addCalc__FPfffff /* 8005F430 0005C370 38 7B 00 40 */ addi r3, r27, 0x40 /* 8005F434 0005C374 C0 22 87 B8 */ lfs f1, lbl_804521B8-_SDA2_BASE_(r2) /* 8005F438 0005C378 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005F43C 0005C37C C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 8005F440 0005C380 C0 82 88 24 */ lfs f4, lbl_80452224-_SDA2_BASE_(r2) -/* 8005F444 0005C384 48 21 05 39 */ bl cLib_addCalc +/* 8005F444 0005C384 48 21 05 39 */ bl cLib_addCalc__FPfffff /* 8005F448 0005C388 38 7B 00 44 */ addi r3, r27, 0x44 /* 8005F44C 0005C38C C0 22 87 B8 */ lfs f1, lbl_804521B8-_SDA2_BASE_(r2) /* 8005F450 0005C390 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8005F454 0005C394 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 8005F458 0005C398 C0 82 88 24 */ lfs f4, lbl_80452224-_SDA2_BASE_(r2) -/* 8005F45C 0005C39C 48 21 05 21 */ bl cLib_addCalc +/* 8005F45C 0005C39C 48 21 05 21 */ bl cLib_addCalc__FPfffff /* 8005F460 0005C3A0 C0 3B 00 24 */ lfs f1, 0x24(r27) /* 8005F464 0005C3A4 C0 1B 00 3C */ lfs f0, 0x3c(r27) /* 8005F468 0005C3A8 EC 01 00 2A */ fadds f0, f1, f0 @@ -1116,7 +1116,7 @@ lbl_8005F8DC: /* 8005F8E4 0005C824 C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 8005F8E8 0005C828 C0 62 89 68 */ lfs f3, lbl_80452368-_SDA2_BASE_(r2) /* 8005F8EC 0005C82C C0 82 88 24 */ lfs f4, lbl_80452224-_SDA2_BASE_(r2) -/* 8005F8F0 0005C830 48 21 00 8D */ bl cLib_addCalc +/* 8005F8F0 0005C830 48 21 00 8D */ bl cLib_addCalc__FPfffff /* 8005F8F4 0005C834 C0 1B 00 60 */ lfs f0, 0x60(r27) /* 8005F8F8 0005C838 EC 00 07 F2 */ fmuls f0, f0, f31 /* 8005F8FC 0005C83C D0 1B 00 60 */ stfs f0, 0x60(r27) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s index fabd559caf..7b0ea7941e 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s @@ -105,7 +105,7 @@ lbl_8005FEC0: /* 8005FEE0 0005CE20 D0 01 00 68 */ stfs f0, 0x68(r1) /* 8005FEE4 0005CE24 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8005FEE8 0005CE28 38 81 00 64 */ addi r4, r1, 0x64 -/* 8005FEEC 0005CE2C 48 20 7E 3D */ bl cBgS_GndChk_NS_SetPos_X1_ +/* 8005FEEC 0005CE2C 48 20 7E 3D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8005FEF0 0005CE30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8005FEF4 0005CE34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005FEF8 0005CE38 3B C3 0F 38 */ addi r30, r3, 0xf38 @@ -256,7 +256,7 @@ lbl_800600C4: /* 8006010C 0005D04C FC 80 00 50 */ fneg f4, f0 /* 80060110 0005D050 C0 A1 00 58 */ lfs f5, 0x58(r1) /* 80060114 0005D054 C0 C1 00 60 */ lfs f6, 0x60(r1) -/* 80060118 0005D058 48 20 87 7D */ bl cM3d_VectorProduct2d +/* 80060118 0005D058 48 20 87 7D */ bl cM3d_VectorProduct2d__Fffffff /* 8006011C 0005D05C D0 38 6D 84 */ stfs f1, 0x6d84(r24) /* 80060120 0005D060 C0 35 00 00 */ lfs f1, 0(r21) /* 80060124 0005D064 C0 01 00 58 */ lfs f0, 0x58(r1) @@ -378,7 +378,7 @@ lbl_800602D0: /* 800602E8 0005D228 C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 800602EC 0005D22C C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 800602F0 0005D230 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 800602F4 0005D234 48 20 F6 89 */ bl cLib_addCalc +/* 800602F4 0005D234 48 20 F6 89 */ bl cLib_addCalc__FPfffff /* 800602F8 0005D238 C0 01 00 94 */ lfs f0, 0x94(r1) /* 800602FC 0005D23C D0 01 00 88 */ stfs f0, 0x88(r1) /* 80060300 0005D240 C0 01 00 98 */ lfs f0, 0x98(r1) @@ -666,7 +666,7 @@ lbl_8006066C: /* 80060710 0005D650 C0 42 89 4C */ lfs f2, lbl_8045234C-_SDA2_BASE_(r2) /* 80060714 0005D654 C0 62 88 EC */ lfs f3, lbl_804522EC-_SDA2_BASE_(r2) /* 80060718 0005D658 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8006071C 0005D65C 48 20 F2 61 */ bl cLib_addCalc +/* 8006071C 0005D65C 48 20 F2 61 */ bl cLib_addCalc__FPfffff /* 80060720 0005D660 C0 22 89 BC */ lfs f1, lbl_804523BC-_SDA2_BASE_(r2) /* 80060724 0005D664 48 20 72 31 */ bl cM_rndF /* 80060728 0005D668 C0 1B 00 34 */ lfs f0, 0x34(r27) @@ -675,7 +675,7 @@ lbl_8006066C: /* 80060734 0005D674 C0 42 89 4C */ lfs f2, lbl_8045234C-_SDA2_BASE_(r2) /* 80060738 0005D678 C0 62 88 EC */ lfs f3, lbl_804522EC-_SDA2_BASE_(r2) /* 8006073C 0005D67C C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 80060740 0005D680 48 20 F2 3D */ bl cLib_addCalc +/* 80060740 0005D680 48 20 F2 3D */ bl cLib_addCalc__FPfffff /* 80060744 0005D684 C0 1B 00 18 */ lfs f0, 0x18(r27) /* 80060748 0005D688 D0 01 00 7C */ stfs f0, 0x7c(r1) /* 8006074C 0005D68C C0 1B 00 1C */ lfs f0, 0x1c(r27) @@ -1241,7 +1241,7 @@ lbl_80060EFC: /* 80060F14 0005DE54 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 80060F18 0005DE58 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 80060F1C 0005DE5C C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 80060F20 0005DE60 48 20 EA 5D */ bl cLib_addCalc +/* 80060F20 0005DE60 48 20 EA 5D */ bl cLib_addCalc__FPfffff /* 80060F24 0005DE64 48 00 00 08 */ b lbl_80060F2C lbl_80060F28: /* 80060F28 0005DE68 D3 5B 00 40 */ stfs f26, 0x40(r27) @@ -1457,7 +1457,7 @@ lbl_800611F4: /* 8006120C 0005E14C C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 80061210 0005E150 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 80061214 0005E154 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 80061218 0005E158 48 20 E7 65 */ bl cLib_addCalc +/* 80061218 0005E158 48 20 E7 65 */ bl cLib_addCalc__FPfffff /* 8006121C 0005E15C 48 00 00 08 */ b lbl_80061224 lbl_80061220: /* 80061220 0005E160 D3 5B 00 44 */ stfs f26, 0x44(r27) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s index 0f7d3bf7f3..3f3a4c8560 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s @@ -86,7 +86,7 @@ lbl_80061554: /* 80061580 0005E4C0 C0 22 88 14 */ lfs f1, lbl_80452214-_SDA2_BASE_(r2) /* 80061584 0005E4C4 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 80061588 0005E4C8 C0 82 89 E8 */ lfs f4, lbl_804523E8-_SDA2_BASE_(r2) -/* 8006158C 0005E4CC 48 20 E3 F1 */ bl cLib_addCalc +/* 8006158C 0005E4CC 48 20 E3 F1 */ bl cLib_addCalc__FPfffff /* 80061590 0005E4D0 48 00 00 24 */ b lbl_800615B4 lbl_80061594: /* 80061594 0005E4D4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -96,7 +96,7 @@ lbl_80061594: /* 800615A4 0005E4E4 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 800615A8 0005E4E8 C0 62 87 C4 */ lfs f3, lbl_804521C4-_SDA2_BASE_(r2) /* 800615AC 0005E4EC C0 82 89 E8 */ lfs f4, lbl_804523E8-_SDA2_BASE_(r2) -/* 800615B0 0005E4F0 48 20 E3 CD */ bl cLib_addCalc +/* 800615B0 0005E4F0 48 20 E3 CD */ bl cLib_addCalc__FPfffff lbl_800615B4: /* 800615B4 0005E4F4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800615B8 0005E4F8 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -108,7 +108,7 @@ lbl_800615B4: /* 800615D0 0005E510 C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 800615D4 0005E514 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 800615D8 0005E518 C0 82 89 E8 */ lfs f4, lbl_804523E8-_SDA2_BASE_(r2) -/* 800615DC 0005E51C 48 20 E3 A1 */ bl cLib_addCalc +/* 800615DC 0005E51C 48 20 E3 A1 */ bl cLib_addCalc__FPfffff lbl_800615E0: /* 800615E0 0005E520 88 1E 0E B5 */ lbz r0, 0xeb5(r30) /* 800615E4 0005E524 28 00 00 04 */ cmplwi r0, 4 @@ -550,7 +550,7 @@ lbl_80061C24: /* 80061C2C 0005EB6C C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 80061C30 0005EB70 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 80061C34 0005EB74 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 80061C38 0005EB78 48 20 DD 45 */ bl cLib_addCalc +/* 80061C38 0005EB78 48 20 DD 45 */ bl cLib_addCalc__FPfffff /* 80061C3C 0005EB7C C0 39 00 48 */ lfs f1, 0x48(r25) /* 80061C40 0005EB80 C0 02 87 C4 */ lfs f0, lbl_804521C4-_SDA2_BASE_(r2) /* 80061C44 0005EB84 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -837,7 +837,7 @@ lbl_80062018: /* 80062020 0005EF60 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 80062024 0005EF64 FC 60 10 90 */ fmr f3, f2 /* 80062028 0005EF68 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8006202C 0005EF6C 48 20 D9 51 */ bl cLib_addCalc +/* 8006202C 0005EF6C 48 20 D9 51 */ bl cLib_addCalc__FPfffff /* 80062030 0005EF70 3A D6 00 01 */ addi r22, r22, 1 /* 80062034 0005EF74 3A B5 00 38 */ addi r21, r21, 0x38 lbl_80062038: diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s index ada42cd2b5..4fd6a9ca2c 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s @@ -673,7 +673,7 @@ lbl_80062A3C: /* 80062A44 0005F984 C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 80062A48 0005F988 FC 60 C8 90 */ fmr f3, f25 /* 80062A4C 0005F98C C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 80062A50 0005F990 48 20 CF 2D */ bl cLib_addCalc +/* 80062A50 0005F990 48 20 CF 2D */ bl cLib_addCalc__FPfffff /* 80062A54 0005F994 3B 5A 00 01 */ addi r26, r26, 1 /* 80062A58 0005F998 2C 1A 00 64 */ cmpwi r26, 0x64 /* 80062A5C 0005F99C 3B 39 00 2C */ addi r25, r25, 0x2c diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s index 82d062c375..7346a7f4a5 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s @@ -36,7 +36,7 @@ /* 80062BD8 0005FB18 38 61 00 24 */ addi r3, r1, 0x24 /* 80062BDC 0005FB1C 38 9E 00 D8 */ addi r4, r30, 0xd8 /* 80062BE0 0005FB20 38 A5 10 94 */ addi r5, r5, 0x1094 -/* 80062BE4 0005FB24 48 20 3F 01 */ bl cXyz_NS___pl +/* 80062BE4 0005FB24 48 20 3F 01 */ bl __pl__4cXyzCFRC3Vec /* 80062BE8 0005FB28 C0 81 00 24 */ lfs f4, 0x24(r1) /* 80062BEC 0005FB2C D0 81 00 60 */ stfs f4, 0x60(r1) /* 80062BF0 0005FB30 C0 01 00 28 */ lfs f0, 0x28(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s index d3505bed8a..84a0d2e26a 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s @@ -128,7 +128,7 @@ lbl_80063850: /* 80063850 00060790 38 61 00 24 */ addi r3, r1, 0x24 /* 80063854 00060794 38 97 00 D8 */ addi r4, r23, 0xd8 /* 80063858 00060798 38 BA 10 94 */ addi r5, r26, 0x1094 -/* 8006385C 0006079C 48 20 32 89 */ bl cXyz_NS___pl +/* 8006385C 0006079C 48 20 32 89 */ bl __pl__4cXyzCFRC3Vec /* 80063860 000607A0 C0 61 00 24 */ lfs f3, 0x24(r1) /* 80063864 000607A4 D0 61 00 60 */ stfs f3, 0x60(r1) /* 80063868 000607A8 C0 41 00 28 */ lfs f2, 0x28(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80066048.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80066048.s index f1de4f38f7..9c0db8db0e 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80066048.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80066048.s @@ -84,7 +84,7 @@ lbl_8006617C: /* 80066180 000630C0 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 80066184 000630C4 C0 62 89 80 */ lfs f3, lbl_80452380-_SDA2_BASE_(r2) /* 80066188 000630C8 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8006618C 000630CC 48 20 97 F1 */ bl cLib_addCalc +/* 8006618C 000630CC 48 20 97 F1 */ bl cLib_addCalc__FPfffff /* 80066190 000630D0 7F C3 F3 78 */ mr r3, r30 /* 80066194 000630D4 38 81 00 2C */ addi r4, r1, 0x2c /* 80066198 000630D8 C0 22 8A C4 */ lfs f1, lbl_804524C4-_SDA2_BASE_(r2) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s index 089430844f..a49867d988 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s @@ -804,7 +804,7 @@ lbl_80067120: /* 80067138 00064078 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 8006713C 0006407C C0 62 88 E0 */ lfs f3, lbl_804522E0-_SDA2_BASE_(r2) /* 80067140 00064080 C0 82 87 D0 */ lfs f4, lbl_804521D0-_SDA2_BASE_(r2) -/* 80067144 00064084 48 20 88 39 */ bl cLib_addCalc +/* 80067144 00064084 48 20 88 39 */ bl cLib_addCalc__FPfffff /* 80067148 00064088 48 00 00 1C */ b lbl_80067164 lbl_8006714C: /* 8006714C 0006408C 7E C3 B3 78 */ mr r3, r22 @@ -812,7 +812,7 @@ lbl_8006714C: /* 80067154 00064094 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 80067158 00064098 C0 62 88 E0 */ lfs f3, lbl_804522E0-_SDA2_BASE_(r2) /* 8006715C 0006409C C0 82 87 D0 */ lfs f4, lbl_804521D0-_SDA2_BASE_(r2) -/* 80067160 000640A0 48 20 88 1D */ bl cLib_addCalc +/* 80067160 000640A0 48 20 88 1D */ bl cLib_addCalc__FPfffff lbl_80067164: /* 80067164 000640A4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80067168 000640A8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s index e6166e4723..1bf63189cc 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s @@ -371,7 +371,7 @@ lbl_800679E8: /* 80067A30 00064970 C0 42 89 4C */ lfs f2, lbl_8045234C-_SDA2_BASE_(r2) /* 80067A34 00064974 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 80067A38 00064978 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 80067A3C 0006497C 48 20 7F 41 */ bl cLib_addCalc +/* 80067A3C 0006497C 48 20 7F 41 */ bl cLib_addCalc__FPfffff /* 80067A40 00064980 C0 2D 89 90 */ lfs f1, lbl_80450F10-_SDA_BASE_(r13) /* 80067A44 00064984 C0 02 87 B8 */ lfs f0, lbl_804521B8-_SDA2_BASE_(r2) /* 80067A48 00064988 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -388,7 +388,7 @@ lbl_80067A64: /* 80067A6C 000649AC C0 42 89 4C */ lfs f2, lbl_8045234C-_SDA2_BASE_(r2) /* 80067A70 000649B0 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 80067A74 000649B4 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 80067A78 000649B8 48 20 7F 05 */ bl cLib_addCalc +/* 80067A78 000649B8 48 20 7F 05 */ bl cLib_addCalc__FPfffff lbl_80067A7C: /* 80067A7C 000649BC 80 6E 61 B0 */ lwz r3, 0x61b0(r14) /* 80067A80 000649C0 28 03 00 00 */ cmplwi r3, 0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s index 949b1c97ee..a217708fcc 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s @@ -56,7 +56,7 @@ lbl_80068698: /* 800686B4 000655F4 38 80 3B B3 */ li r4, 0x3bb3 /* 800686B8 000655F8 38 A0 79 1D */ li r5, 0x791d /* 800686BC 000655FC 38 C0 BA 01 */ li r6, -17919 -/* 800686C0 00065600 48 1F ED 35 */ bl csXyz_X1_ +/* 800686C0 00065600 48 1F ED 35 */ bl __ct__5csXyzFsss /* 800686C4 00065604 80 01 00 78 */ lwz r0, 0x78(r1) /* 800686C8 00065608 90 1F 01 5C */ stw r0, 0x15c(r31) /* 800686CC 0006560C A0 01 00 7C */ lhz r0, 0x7c(r1) @@ -72,7 +72,7 @@ lbl_80068698: /* 800686EC 0006562C 38 80 34 D5 */ li r4, 0x34d5 /* 800686F0 00065630 38 A0 6E D1 */ li r5, 0x6ed1 /* 800686F4 00065634 38 C0 A9 07 */ li r6, -22265 -/* 800686F8 00065638 48 1F EC FD */ bl csXyz_X1_ +/* 800686F8 00065638 48 1F EC FD */ bl __ct__5csXyzFsss /* 800686FC 0006563C 38 7F 01 5C */ addi r3, r31, 0x15c /* 80068700 00065640 80 01 00 70 */ lwz r0, 0x70(r1) /* 80068704 00065644 90 03 00 06 */ stw r0, 6(r3) @@ -89,7 +89,7 @@ lbl_80068698: /* 80068728 00065668 38 80 20 6C */ li r4, 0x206c /* 8006872C 0006566C 38 A0 7C 8C */ li r5, 0x7c8c /* 80068730 00065670 38 C0 AF E5 */ li r6, -20507 -/* 80068734 00065674 48 1F EC C1 */ bl csXyz_X1_ +/* 80068734 00065674 48 1F EC C1 */ bl __ct__5csXyzFsss /* 80068738 00065678 38 7F 01 5C */ addi r3, r31, 0x15c /* 8006873C 0006567C 80 01 00 68 */ lwz r0, 0x68(r1) /* 80068740 00065680 90 03 00 0C */ stw r0, 0xc(r3) @@ -106,7 +106,7 @@ lbl_80068698: /* 80068764 000656A4 38 80 0F 42 */ li r4, 0xf42 /* 80068768 000656A8 38 A0 79 1D */ li r5, 0x791d /* 8006876C 000656AC 38 C0 A5 98 */ li r6, -23144 -/* 80068770 000656B0 48 1F EC 85 */ bl csXyz_X1_ +/* 80068770 000656B0 48 1F EC 85 */ bl __ct__5csXyzFsss /* 80068774 000656B4 38 7F 01 5C */ addi r3, r31, 0x15c /* 80068778 000656B8 80 01 00 60 */ lwz r0, 0x60(r1) /* 8006877C 000656BC 90 03 00 12 */ stw r0, 0x12(r3) @@ -123,7 +123,7 @@ lbl_80068698: /* 800687A0 000656E0 38 80 FE 49 */ li r4, -439 /* 800687A4 000656E4 38 A0 75 AF */ li r5, 0x75af /* 800687A8 000656E8 38 C0 BA 01 */ li r6, -17919 -/* 800687AC 000656EC 48 1F EC 49 */ bl csXyz_X1_ +/* 800687AC 000656EC 48 1F EC 49 */ bl __ct__5csXyzFsss /* 800687B0 000656F0 38 7F 01 5C */ addi r3, r31, 0x15c /* 800687B4 000656F4 80 01 00 58 */ lwz r0, 0x58(r1) /* 800687B8 000656F8 90 03 00 18 */ stw r0, 0x18(r3) @@ -140,7 +140,7 @@ lbl_80068698: /* 800687DC 0006571C 38 80 E3 03 */ li r4, -7421 /* 800687E0 00065720 38 A0 79 1D */ li r5, 0x791d /* 800687E4 00065724 38 C0 49 6E */ li r6, 0x496e -/* 800687E8 00065728 48 1F EC 0D */ bl csXyz_X1_ +/* 800687E8 00065728 48 1F EC 0D */ bl __ct__5csXyzFsss /* 800687EC 0006572C 38 7F 01 5C */ addi r3, r31, 0x15c /* 800687F0 00065730 80 01 00 50 */ lwz r0, 0x50(r1) /* 800687F4 00065734 90 03 00 1E */ stw r0, 0x1e(r3) @@ -157,7 +157,7 @@ lbl_80068698: /* 80068818 00065758 38 80 D5 47 */ li r4, -10937 /* 8006881C 0006575C 38 A0 6D 60 */ li r5, 0x6d60 /* 80068820 00065760 38 C0 3A 98 */ li r6, 0x3a98 -/* 80068824 00065764 48 1F EB D1 */ bl csXyz_X1_ +/* 80068824 00065764 48 1F EB D1 */ bl __ct__5csXyzFsss /* 80068828 00065768 38 7F 01 5C */ addi r3, r31, 0x15c /* 8006882C 0006576C 80 01 00 48 */ lwz r0, 0x48(r1) /* 80068830 00065770 90 03 00 24 */ stw r0, 0x24(r3) @@ -174,7 +174,7 @@ lbl_80068698: /* 80068854 00065794 38 80 D8 F0 */ li r4, -10000 /* 80068858 00065798 38 A0 61 46 */ li r5, 0x6146 /* 8006885C 0006579C 38 C0 47 E0 */ li r6, 0x47e0 -/* 80068860 000657A0 48 1F EB 95 */ bl csXyz_X1_ +/* 80068860 000657A0 48 1F EB 95 */ bl __ct__5csXyzFsss /* 80068864 000657A4 38 7F 01 5C */ addi r3, r31, 0x15c /* 80068868 000657A8 80 01 00 40 */ lwz r0, 0x40(r1) /* 8006886C 000657AC 90 03 00 2A */ stw r0, 0x2a(r3) @@ -191,7 +191,7 @@ lbl_80068698: /* 80068890 000657D0 38 80 DB 48 */ li r4, -9400 /* 80068894 000657D4 38 A0 57 E4 */ li r5, 0x57e4 /* 80068898 000657D8 38 C0 3E 1C */ li r6, 0x3e1c -/* 8006889C 000657DC 48 1F EB 59 */ bl csXyz_X1_ +/* 8006889C 000657DC 48 1F EB 59 */ bl __ct__5csXyzFsss /* 800688A0 000657E0 38 7F 01 5C */ addi r3, r31, 0x15c /* 800688A4 000657E4 80 01 00 38 */ lwz r0, 0x38(r1) /* 800688A8 000657E8 90 03 00 30 */ stw r0, 0x30(r3) @@ -208,7 +208,7 @@ lbl_80068698: /* 800688CC 0006580C 38 80 DC 25 */ li r4, -9179 /* 800688D0 00065810 38 A0 53 34 */ li r5, 0x5334 /* 800688D4 00065814 38 C0 37 DC */ li r6, 0x37dc -/* 800688D8 00065818 48 1F EB 1D */ bl csXyz_X1_ +/* 800688D8 00065818 48 1F EB 1D */ bl __ct__5csXyzFsss /* 800688DC 0006581C 38 7F 01 5C */ addi r3, r31, 0x15c /* 800688E0 00065820 80 01 00 30 */ lwz r0, 0x30(r1) /* 800688E4 00065824 90 03 00 36 */ stw r0, 0x36(r3) @@ -225,7 +225,7 @@ lbl_80068698: /* 80068908 00065848 38 80 D7 C4 */ li r4, -10300 /* 8006890C 0006584C 38 A0 55 F0 */ li r5, 0x55f0 /* 80068910 00065850 38 C0 52 08 */ li r6, 0x5208 -/* 80068914 00065854 48 1F EA E1 */ bl csXyz_X1_ +/* 80068914 00065854 48 1F EA E1 */ bl __ct__5csXyzFsss /* 80068918 00065858 38 7F 01 5C */ addi r3, r31, 0x15c /* 8006891C 0006585C 80 01 00 28 */ lwz r0, 0x28(r1) /* 80068920 00065860 90 03 00 3C */ stw r0, 0x3c(r3) @@ -242,7 +242,7 @@ lbl_80068698: /* 80068944 00065884 38 80 C1 80 */ li r4, -16000 /* 80068948 00065888 38 A0 63 9C */ li r5, 0x639c /* 8006894C 0006588C 38 C0 4E 20 */ li r6, 0x4e20 -/* 80068950 00065890 48 1F EA A5 */ bl csXyz_X1_ +/* 80068950 00065890 48 1F EA A5 */ bl __ct__5csXyzFsss /* 80068954 00065894 38 7F 01 5C */ addi r3, r31, 0x15c /* 80068958 00065898 80 01 00 20 */ lwz r0, 0x20(r1) /* 8006895C 0006589C 90 03 00 42 */ stw r0, 0x42(r3) @@ -259,7 +259,7 @@ lbl_80068698: /* 80068980 000658C0 38 80 00 00 */ li r4, 0 /* 80068984 000658C4 38 A0 75 30 */ li r5, 0x7530 /* 80068988 000658C8 38 C0 4A 38 */ li r6, 0x4a38 -/* 8006898C 000658CC 48 1F EA 69 */ bl csXyz_X1_ +/* 8006898C 000658CC 48 1F EA 69 */ bl __ct__5csXyzFsss /* 80068990 000658D0 38 7F 01 5C */ addi r3, r31, 0x15c /* 80068994 000658D4 80 01 00 18 */ lwz r0, 0x18(r1) /* 80068998 000658D8 90 03 00 48 */ stw r0, 0x48(r3) @@ -365,7 +365,7 @@ lbl_80068B04: /* 80068B04 00065A44 38 61 00 80 */ addi r3, r1, 0x80 /* 80068B08 00065A48 38 9E 00 D8 */ addi r4, r30, 0xd8 /* 80068B0C 00065A4C 38 BC 10 94 */ addi r5, r28, 0x1094 -/* 80068B10 00065A50 48 1F DF D5 */ bl cXyz_NS___pl +/* 80068B10 00065A50 48 1F DF D5 */ bl __pl__4cXyzCFRC3Vec /* 80068B14 00065A54 C0 01 00 80 */ lfs f0, 0x80(r1) /* 80068B18 00065A58 D0 01 00 B0 */ stfs f0, 0xb0(r1) /* 80068B1C 00065A5C C0 01 00 84 */ lfs f0, 0x84(r1) 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 9e2caede72..0c6a997fc5 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 @@ -229,7 +229,7 @@ lbl_8006B510: /* 8006B518 00068458 C0 42 88 44 */ lfs f2, lbl_80452244-_SDA2_BASE_(r2) /* 8006B51C 0006845C C0 62 88 40 */ lfs f3, lbl_80452240-_SDA2_BASE_(r2) /* 8006B520 00068460 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8006B524 00068464 48 20 44 59 */ bl cLib_addCalc +/* 8006B524 00068464 48 20 44 59 */ bl cLib_addCalc__FPfffff /* 8006B528 00068468 C0 3F 0E DC */ lfs f1, 0xedc(r31) /* 8006B52C 0006846C C0 1F 0E F0 */ lfs f0, 0xef0(r31) /* 8006B530 00068470 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -253,7 +253,7 @@ lbl_8006B568: /* 8006B570 000684B0 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 8006B574 000684B4 C0 62 88 1C */ lfs f3, lbl_8045221C-_SDA2_BASE_(r2) /* 8006B578 000684B8 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8006B57C 000684BC 48 20 44 01 */ bl cLib_addCalc +/* 8006B57C 000684BC 48 20 44 01 */ bl cLib_addCalc__FPfffff /* 8006B580 000684C0 C0 3F 0E DC */ lfs f1, 0xedc(r31) /* 8006B584 000684C4 C0 02 87 B8 */ lfs f0, lbl_804521B8-_SDA2_BASE_(r2) /* 8006B588 000684C8 FC 01 00 40 */ fcmpo cr0, f1, f0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B924.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B924.s index 38042fa3b5..d58a6d87c0 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B924.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B924.s @@ -290,7 +290,7 @@ lbl_8006BD5C: /* 8006BD64 00068CA4 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 8006BD68 00068CA8 C0 62 88 40 */ lfs f3, lbl_80452240-_SDA2_BASE_(r2) /* 8006BD6C 00068CAC C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8006BD70 00068CB0 48 20 3C 0D */ bl cLib_addCalc +/* 8006BD70 00068CB0 48 20 3C 0D */ bl cLib_addCalc__FPfffff /* 8006BD74 00068CB4 C0 3D 00 24 */ lfs f1, 0x24(r29) /* 8006BD78 00068CB8 C0 02 88 14 */ lfs f0, lbl_80452214-_SDA2_BASE_(r2) /* 8006BD7C 00068CBC FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -311,7 +311,7 @@ lbl_8006BDA8: /* 8006BDB0 00068CF0 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 8006BDB4 00068CF4 C0 62 8B D0 */ lfs f3, lbl_804525D0-_SDA2_BASE_(r2) /* 8006BDB8 00068CF8 C0 82 88 38 */ lfs f4, lbl_80452238-_SDA2_BASE_(r2) -/* 8006BDBC 00068CFC 48 20 3B C1 */ bl cLib_addCalc +/* 8006BDBC 00068CFC 48 20 3B C1 */ bl cLib_addCalc__FPfffff /* 8006BDC0 00068D00 C0 3D 00 24 */ lfs f1, 0x24(r29) /* 8006BDC4 00068D04 C0 02 88 20 */ lfs f0, lbl_80452220-_SDA2_BASE_(r2) /* 8006BDC8 00068D08 FC 01 00 40 */ fcmpo cr0, f1, f0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s index e34ed9042b..4098c68ed1 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s @@ -352,7 +352,7 @@ lbl_8006C330: /* 8006C35C 0006929C 38 61 00 20 */ addi r3, r1, 0x20 /* 8006C360 000692A0 38 9A 00 10 */ addi r4, r26, 0x10 /* 8006C364 000692A4 38 BA 00 04 */ addi r5, r26, 4 -/* 8006C368 000692A8 48 1F A7 7D */ bl cXyz_NS___pl +/* 8006C368 000692A8 48 1F A7 7D */ bl __pl__4cXyzCFRC3Vec /* 8006C36C 000692AC C0 01 00 20 */ lfs f0, 0x20(r1) /* 8006C370 000692B0 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 8006C374 000692B4 C0 01 00 24 */ lfs f0, 0x24(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s index 06258bf177..ac1c0c6910 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s @@ -66,7 +66,7 @@ lbl_8006C904: /* 8006C958 00069898 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) /* 8006C95C 0006989C C0 62 88 38 */ lfs f3, lbl_80452238-_SDA2_BASE_(r2) /* 8006C960 000698A0 C0 82 89 E8 */ lfs f4, lbl_804523E8-_SDA2_BASE_(r2) -/* 8006C964 000698A4 48 20 30 19 */ bl cLib_addCalc +/* 8006C964 000698A4 48 20 30 19 */ bl cLib_addCalc__FPfffff /* 8006C968 000698A8 48 00 00 38 */ b lbl_8006C9A0 lbl_8006C96C: /* 8006C96C 000698AC 38 7E 1C 3C */ addi r3, r30, 0x1c3c @@ -74,7 +74,7 @@ lbl_8006C96C: /* 8006C974 000698B4 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8006C978 000698B8 C0 62 88 1C */ lfs f3, lbl_8045221C-_SDA2_BASE_(r2) /* 8006C97C 000698BC C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8006C980 000698C0 48 20 2F FD */ bl cLib_addCalc +/* 8006C980 000698C0 48 20 2F FD */ bl cLib_addCalc__FPfffff /* 8006C984 000698C4 48 00 00 1C */ b lbl_8006C9A0 lbl_8006C988: /* 8006C988 000698C8 38 7E 1C 3C */ addi r3, r30, 0x1c3c @@ -82,7 +82,7 @@ lbl_8006C988: /* 8006C990 000698D0 C0 42 88 40 */ lfs f2, lbl_80452240-_SDA2_BASE_(r2) /* 8006C994 000698D4 C0 62 88 1C */ lfs f3, lbl_8045221C-_SDA2_BASE_(r2) /* 8006C998 000698D8 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8006C99C 000698DC 48 20 2F E1 */ bl cLib_addCalc +/* 8006C99C 000698DC 48 20 2F E1 */ bl cLib_addCalc__FPfffff lbl_8006C9A0: /* 8006C9A0 000698E0 80 1E 00 10 */ lwz r0, 0x10(r30) /* 8006C9A4 000698E4 2C 00 00 00 */ cmpwi r0, 0 @@ -429,7 +429,7 @@ lbl_8006CE84: /* 8006CE90 00069DD0 C0 42 89 4C */ lfs f2, lbl_8045234C-_SDA2_BASE_(r2) /* 8006CE94 00069DD4 C0 62 88 1C */ lfs f3, lbl_8045221C-_SDA2_BASE_(r2) /* 8006CE98 00069DD8 C0 82 89 E8 */ lfs f4, lbl_804523E8-_SDA2_BASE_(r2) -/* 8006CE9C 00069DDC 48 20 2A E1 */ bl cLib_addCalc +/* 8006CE9C 00069DDC 48 20 2A E1 */ bl cLib_addCalc__FPfffff /* 8006CEA0 00069DE0 C0 3F 00 28 */ lfs f1, 0x28(r31) /* 8006CEA4 00069DE4 C0 1F 00 1C */ lfs f0, 0x1c(r31) /* 8006CEA8 00069DE8 EC 01 00 2A */ fadds f0, f1, f0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s index 1a21d299d3..8fb09cf13d 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s @@ -240,7 +240,7 @@ lbl_8006DDDC: /* 8006DE2C 0006AD6C 38 61 00 24 */ addi r3, r1, 0x24 /* 8006DE30 0006AD70 38 99 00 10 */ addi r4, r25, 0x10 /* 8006DE34 0006AD74 38 B9 00 04 */ addi r5, r25, 4 -/* 8006DE38 0006AD78 48 1F 8C AD */ bl cXyz_NS___pl +/* 8006DE38 0006AD78 48 1F 8C AD */ bl __pl__4cXyzCFRC3Vec /* 8006DE3C 0006AD7C C0 01 00 24 */ lfs f0, 0x24(r1) /* 8006DE40 0006AD80 D0 01 00 3C */ stfs f0, 0x3c(r1) /* 8006DE44 0006AD84 C0 01 00 28 */ lfs f0, 0x28(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s index 93bec20ece..0347c8afb9 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s @@ -216,7 +216,7 @@ lbl_8006E9E4: /* 8006EA00 0006B940 38 61 00 30 */ addi r3, r1, 0x30 /* 8006EA04 0006B944 38 9A 00 10 */ addi r4, r26, 0x10 /* 8006EA08 0006B948 38 BA 00 04 */ addi r5, r26, 4 -/* 8006EA0C 0006B94C 48 1F 80 D9 */ bl cXyz_NS___pl +/* 8006EA0C 0006B94C 48 1F 80 D9 */ bl __pl__4cXyzCFRC3Vec /* 8006EA10 0006B950 C0 01 00 30 */ lfs f0, 0x30(r1) /* 8006EA14 0006B954 D0 01 00 48 */ stfs f0, 0x48(r1) /* 8006EA18 0006B958 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -400,7 +400,7 @@ lbl_8006EC98: /* 8006EC9C 0006BBDC C0 42 88 3C */ lfs f2, lbl_8045223C-_SDA2_BASE_(r2) /* 8006ECA0 0006BBE0 C0 62 88 20 */ lfs f3, lbl_80452220-_SDA2_BASE_(r2) /* 8006ECA4 0006BBE4 C0 82 87 C4 */ lfs f4, lbl_804521C4-_SDA2_BASE_(r2) -/* 8006ECA8 0006BBE8 48 20 0C D5 */ bl cLib_addCalc +/* 8006ECA8 0006BBE8 48 20 0C D5 */ bl cLib_addCalc__FPfffff /* 8006ECAC 0006BBEC 80 7E 5D AC */ lwz r3, 0x5dac(r30) /* 8006ECB0 0006BBF0 28 03 00 00 */ cmplwi r3, 0 /* 8006ECB4 0006BBF4 41 82 00 6C */ beq lbl_8006ED20 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058B8C.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058B8C.s index e7c1bdecd5..02325fca76 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058B8C.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058B8C.s @@ -147,7 +147,7 @@ lbl_80058D8C: /* 80058DA0 00055CE0 C0 42 87 1C */ lfs f2, lbl_8045211C-_SDA2_BASE_(r2) /* 80058DA4 00055CE4 C0 62 87 20 */ lfs f3, lbl_80452120-_SDA2_BASE_(r2) /* 80058DA8 00055CE8 C0 82 87 24 */ lfs f4, lbl_80452124-_SDA2_BASE_(r2) -/* 80058DAC 00055CEC 48 21 6B D1 */ bl cLib_addCalc +/* 80058DAC 00055CEC 48 21 6B D1 */ bl cLib_addCalc__FPfffff /* 80058DB0 00055CF0 C0 22 87 28 */ lfs f1, lbl_80452128-_SDA2_BASE_(r2) /* 80058DB4 00055CF4 C0 1E 00 00 */ lfs f0, 0(r30) /* 80058DB8 00055CF8 EC 01 00 32 */ fmuls f0, f1, f0 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80059728.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80059728.s index b3973cecdd..2f1671db34 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80059728.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80059728.s @@ -83,7 +83,7 @@ lbl_80059858: /* 80059868 000567A8 C0 42 87 1C */ lfs f2, lbl_8045211C-_SDA2_BASE_(r2) /* 8005986C 000567AC C0 62 87 3C */ lfs f3, lbl_8045213C-_SDA2_BASE_(r2) /* 80059870 000567B0 C0 82 87 40 */ lfs f4, lbl_80452140-_SDA2_BASE_(r2) -/* 80059874 000567B4 48 21 61 09 */ bl cLib_addCalc +/* 80059874 000567B4 48 21 61 09 */ bl cLib_addCalc__FPfffff /* 80059878 000567B8 48 00 01 48 */ b lbl_800599C0 lbl_8005987C: /* 8005987C 000567BC 7F 83 E3 78 */ mr r3, r28 @@ -107,7 +107,7 @@ lbl_8005987C: /* 800598C4 00056804 C0 42 87 1C */ lfs f2, lbl_8045211C-_SDA2_BASE_(r2) /* 800598C8 00056808 C0 62 87 3C */ lfs f3, lbl_8045213C-_SDA2_BASE_(r2) /* 800598CC 0005680C C0 82 87 40 */ lfs f4, lbl_80452140-_SDA2_BASE_(r2) -/* 800598D0 00056810 48 21 60 AD */ bl cLib_addCalc +/* 800598D0 00056810 48 21 60 AD */ bl cLib_addCalc__FPfffff /* 800598D4 00056814 48 00 00 EC */ b lbl_800599C0 lbl_800598D8: /* 800598D8 00056818 38 63 0E CC */ addi r3, r3, 0xecc @@ -115,7 +115,7 @@ lbl_800598D8: /* 800598E0 00056820 C0 42 87 44 */ lfs f2, lbl_80452144-_SDA2_BASE_(r2) /* 800598E4 00056824 C0 62 87 48 */ lfs f3, lbl_80452148-_SDA2_BASE_(r2) /* 800598E8 00056828 C0 82 87 4C */ lfs f4, lbl_8045214C-_SDA2_BASE_(r2) -/* 800598EC 0005682C 48 21 60 91 */ bl cLib_addCalc +/* 800598EC 0005682C 48 21 60 91 */ bl cLib_addCalc__FPfffff /* 800598F0 00056830 48 00 00 D0 */ b lbl_800599C0 lbl_800598F4: /* 800598F4 00056834 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -163,7 +163,7 @@ lbl_8005997C: /* 8005998C 000568CC C0 42 87 1C */ lfs f2, lbl_8045211C-_SDA2_BASE_(r2) /* 80059990 000568D0 C0 62 87 3C */ lfs f3, lbl_8045213C-_SDA2_BASE_(r2) /* 80059994 000568D4 C0 82 87 40 */ lfs f4, lbl_80452140-_SDA2_BASE_(r2) -/* 80059998 000568D8 48 21 5F E5 */ bl cLib_addCalc +/* 80059998 000568D8 48 21 5F E5 */ bl cLib_addCalc__FPfffff /* 8005999C 000568DC 48 00 00 24 */ b lbl_800599C0 lbl_800599A0: /* 800599A0 000568E0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -173,7 +173,7 @@ lbl_800599A0: /* 800599B0 000568F0 C0 42 87 44 */ lfs f2, lbl_80452144-_SDA2_BASE_(r2) /* 800599B4 000568F4 C0 62 87 48 */ lfs f3, lbl_80452148-_SDA2_BASE_(r2) /* 800599B8 000568F8 C0 82 87 4C */ lfs f4, lbl_8045214C-_SDA2_BASE_(r2) -/* 800599BC 000568FC 48 21 5F C1 */ bl cLib_addCalc +/* 800599BC 000568FC 48 21 5F C1 */ bl cLib_addCalc__FPfffff lbl_800599C0: /* 800599C0 00056900 C0 42 87 50 */ lfs f2, lbl_80452150-_SDA2_BASE_(r2) /* 800599C4 00056904 C0 22 87 54 */ lfs f1, lbl_80452154-_SDA2_BASE_(r2) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A340.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A340.s index 00dea3d8e1..de68d24c3f 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A340.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A340.s @@ -79,7 +79,7 @@ lbl_8005A45C: /* 8005A46C 000573AC C0 42 87 68 */ lfs f2, lbl_80452168-_SDA2_BASE_(r2) /* 8005A470 000573B0 C0 62 87 6C */ lfs f3, lbl_8045216C-_SDA2_BASE_(r2) /* 8005A474 000573B4 C0 82 87 24 */ lfs f4, lbl_80452124-_SDA2_BASE_(r2) -/* 8005A478 000573B8 48 21 55 05 */ bl cLib_addCalc +/* 8005A478 000573B8 48 21 55 05 */ bl cLib_addCalc__FPfffff /* 8005A47C 000573BC 38 00 00 07 */ li r0, 7 /* 8005A480 000573C0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A484 000573C4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -96,7 +96,7 @@ lbl_8005A498: /* 8005A4AC 000573EC C0 42 87 68 */ lfs f2, lbl_80452168-_SDA2_BASE_(r2) /* 8005A4B0 000573F0 C0 62 87 6C */ lfs f3, lbl_8045216C-_SDA2_BASE_(r2) /* 8005A4B4 000573F4 C0 82 87 70 */ lfs f4, lbl_80452170-_SDA2_BASE_(r2) -/* 8005A4B8 000573F8 48 21 54 C5 */ bl cLib_addCalc +/* 8005A4B8 000573F8 48 21 54 C5 */ bl cLib_addCalc__FPfffff /* 8005A4BC 000573FC C0 3E 00 00 */ lfs f1, 0(r30) /* 8005A4C0 00057400 C0 02 87 20 */ lfs f0, lbl_80452120-_SDA2_BASE_(r2) /* 8005A4C4 00057404 FC 01 00 40 */ fcmpo cr0, f1, f0 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s index 4b27ae4971..9646d278c2 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s @@ -328,7 +328,7 @@ lbl_8005AA48: /* 8005AA50 00057990 C0 42 87 68 */ lfs f2, lbl_80452168-_SDA2_BASE_(r2) /* 8005AA54 00057994 C0 62 87 98 */ lfs f3, lbl_80452198-_SDA2_BASE_(r2) /* 8005AA58 00057998 C0 82 87 9C */ lfs f4, lbl_8045219C-_SDA2_BASE_(r2) -/* 8005AA5C 0005799C 48 21 4F 21 */ bl cLib_addCalc +/* 8005AA5C 0005799C 48 21 4F 21 */ bl cLib_addCalc__FPfffff /* 8005AA60 000579A0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005AA64 000579A4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005AA68 000579A8 38 63 0E 4C */ addi r3, r3, 0xe4c @@ -336,7 +336,7 @@ lbl_8005AA48: /* 8005AA70 000579B0 C0 42 87 68 */ lfs f2, lbl_80452168-_SDA2_BASE_(r2) /* 8005AA74 000579B4 C0 62 87 98 */ lfs f3, lbl_80452198-_SDA2_BASE_(r2) /* 8005AA78 000579B8 C0 82 87 9C */ lfs f4, lbl_8045219C-_SDA2_BASE_(r2) -/* 8005AA7C 000579BC 48 21 4F 01 */ bl cLib_addCalc +/* 8005AA7C 000579BC 48 21 4F 01 */ bl cLib_addCalc__FPfffff /* 8005AA80 000579C0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005AA84 000579C4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005AA88 000579C8 38 63 0E 50 */ addi r3, r3, 0xe50 @@ -344,7 +344,7 @@ lbl_8005AA48: /* 8005AA90 000579D0 C0 42 87 68 */ lfs f2, lbl_80452168-_SDA2_BASE_(r2) /* 8005AA94 000579D4 C0 62 87 98 */ lfs f3, lbl_80452198-_SDA2_BASE_(r2) /* 8005AA98 000579D8 C0 82 87 9C */ lfs f4, lbl_8045219C-_SDA2_BASE_(r2) -/* 8005AA9C 000579DC 48 21 4E E1 */ bl cLib_addCalc +/* 8005AA9C 000579DC 48 21 4E E1 */ bl cLib_addCalc__FPfffff /* 8005AAA0 000579E0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005AAA4 000579E4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005AAA8 000579E8 38 63 0E 58 */ addi r3, r3, 0xe58 @@ -352,7 +352,7 @@ lbl_8005AA48: /* 8005AAB0 000579F0 C0 42 87 68 */ lfs f2, lbl_80452168-_SDA2_BASE_(r2) /* 8005AAB4 000579F4 C0 62 86 E4 */ lfs f3, lbl_804520E4-_SDA2_BASE_(r2) /* 8005AAB8 000579F8 C0 82 87 A0 */ lfs f4, lbl_804521A0-_SDA2_BASE_(r2) -/* 8005AABC 000579FC 48 21 4E C1 */ bl cLib_addCalc +/* 8005AABC 000579FC 48 21 4E C1 */ bl cLib_addCalc__FPfffff lbl_8005AAC0: /* 8005AAC0 00057A00 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* 8005AAC4 00057A04 CB E1 00 50 */ lfd f31, 0x50(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AB00.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AB00.s index feb896affd..81828a3bdc 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AB00.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AB00.s @@ -8,7 +8,7 @@ /* 8005AB1C 00057A5C 38 A4 CA 54 */ addi r5, r4, lbl_8042CA54@l /* 8005AB20 00057A60 38 85 0E 48 */ addi r4, r5, 0xe48 /* 8005AB24 00057A64 C0 25 0E 58 */ lfs f1, 0xe58(r5) -/* 8005AB28 00057A68 48 20 C0 5D */ bl cXyz_NS___ml +/* 8005AB28 00057A68 48 20 C0 5D */ bl __ml__4cXyzCFf /* 8005AB2C 00057A6C C0 41 00 08 */ lfs f2, 8(r1) /* 8005AB30 00057A70 D0 41 00 14 */ stfs f2, 0x14(r1) /* 8005AB34 00057A74 C0 21 00 0C */ lfs f1, 0xc(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AC30.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AC30.s index d4ce0d7840..79a284ea03 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AC30.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AC30.s @@ -40,7 +40,7 @@ lbl_8005AC74: /* 8005ACC4 00057C04 C0 42 87 A4 */ lfs f2, lbl_804521A4-_SDA2_BASE_(r2) /* 8005ACC8 00057C08 C0 7D 08 54 */ lfs f3, 0x854(r29) /* 8005ACCC 00057C0C C0 82 87 9C */ lfs f4, lbl_8045219C-_SDA2_BASE_(r2) -/* 8005ACD0 00057C10 48 21 4C AD */ bl cLib_addCalc +/* 8005ACD0 00057C10 48 21 4C AD */ bl cLib_addCalc__FPfffff /* 8005ACD4 00057C14 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) /* 8005ACD8 00057C18 C0 1B 00 1C */ lfs f0, 0x1c(r27) /* 8005ACDC 00057C1C EC 41 00 28 */ fsubs f2, f1, f0 @@ -50,7 +50,7 @@ lbl_8005AC74: /* 8005ACEC 00057C2C EC 02 00 72 */ fmuls f0, f2, f1 /* 8005ACF0 00057C30 EC 63 00 32 */ fmuls f3, f3, f0 /* 8005ACF4 00057C34 C0 82 87 20 */ lfs f4, lbl_80452120-_SDA2_BASE_(r2) -/* 8005ACF8 00057C38 48 21 4C 85 */ bl cLib_addCalc +/* 8005ACF8 00057C38 48 21 4C 85 */ bl cLib_addCalc__FPfffff /* 8005ACFC 00057C3C C0 3B 00 1C */ lfs f1, 0x1c(r27) /* 8005AD00 00057C40 C0 02 87 20 */ lfs f0, lbl_80452120-_SDA2_BASE_(r2) /* 8005AD04 00057C44 FC 01 00 40 */ fcmpo cr0, f1, f0 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B284.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B284.s index 11981c3e73..c6070e03cd 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B284.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B284.s @@ -10,7 +10,7 @@ /* 8005B2A8 000581E8 38 61 00 0C */ addi r3, r1, 0xc /* 8005B2AC 000581EC 38 81 00 18 */ addi r4, r1, 0x18 /* 8005B2B0 000581F0 C0 21 00 08 */ lfs f1, 8(r1) -/* 8005B2B4 000581F4 48 20 B8 D1 */ bl cXyz_NS___ml +/* 8005B2B4 000581F4 48 20 B8 D1 */ bl __ml__4cXyzCFf /* 8005B2B8 000581F8 C0 21 00 0C */ lfs f1, 0xc(r1) /* 8005B2BC 000581FC D0 21 00 18 */ stfs f1, 0x18(r1) /* 8005B2C0 00058200 C0 01 00 10 */ lfs f0, 0x10(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B2F8.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B2F8.s index 617b56945d..c3a68c92d4 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B2F8.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B2F8.s @@ -17,7 +17,7 @@ /* 8005B338 00058278 C0 1D 00 00 */ lfs f0, 0(r29) /* 8005B33C 0005827C EC 01 00 28 */ fsubs f0, f1, f0 /* 8005B340 00058280 EC 22 00 32 */ fmuls f1, f2, f0 -/* 8005B344 00058284 48 20 B8 41 */ bl cXyz_NS___ml +/* 8005B344 00058284 48 20 B8 41 */ bl __ml__4cXyzCFf /* 8005B348 00058288 C0 01 00 30 */ lfs f0, 0x30(r1) /* 8005B34C 0005828C D0 01 00 48 */ stfs f0, 0x48(r1) /* 8005B350 00058290 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -29,7 +29,7 @@ /* 8005B368 000582A8 C0 22 87 A8 */ lfs f1, lbl_804521A8-_SDA2_BASE_(r2) /* 8005B36C 000582AC C0 1D 00 00 */ lfs f0, 0(r29) /* 8005B370 000582B0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8005B374 000582B4 48 20 B8 11 */ bl cXyz_NS___ml +/* 8005B374 000582B4 48 20 B8 11 */ bl __ml__4cXyzCFf /* 8005B378 000582B8 C0 01 00 24 */ lfs f0, 0x24(r1) /* 8005B37C 000582BC D0 01 00 3C */ stfs f0, 0x3c(r1) /* 8005B380 000582C0 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -39,7 +39,7 @@ /* 8005B390 000582D0 38 61 00 18 */ addi r3, r1, 0x18 /* 8005B394 000582D4 38 81 00 48 */ addi r4, r1, 0x48 /* 8005B398 000582D8 38 A1 00 3C */ addi r5, r1, 0x3c -/* 8005B39C 000582DC 48 20 B7 49 */ bl cXyz_NS___pl +/* 8005B39C 000582DC 48 20 B7 49 */ bl __pl__4cXyzCFRC3Vec /* 8005B3A0 000582E0 C0 01 00 18 */ lfs f0, 0x18(r1) /* 8005B3A4 000582E4 D0 01 00 54 */ stfs f0, 0x54(r1) /* 8005B3A8 000582E8 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -117,7 +117,7 @@ lbl_8005B4A4: /* 8005B4A4 000583E4 D0 3D 00 00 */ stfs f1, 0(r29) /* 8005B4A8 000583E8 38 61 00 0C */ addi r3, r1, 0xc /* 8005B4AC 000583EC 38 81 00 54 */ addi r4, r1, 0x54 -/* 8005B4B0 000583F0 48 20 B8 81 */ bl cXyz_NS_normZP +/* 8005B4B0 000583F0 48 20 B8 81 */ bl normZP__4cXyzCFv /* 8005B4B4 000583F4 C0 01 00 0C */ lfs f0, 0xc(r1) /* 8005B4B8 000583F8 D0 01 00 54 */ stfs f0, 0x54(r1) /* 8005B4BC 000583FC C0 01 00 10 */ lfs f0, 0x10(r1) @@ -127,7 +127,7 @@ lbl_8005B4A4: /* 8005B4CC 0005840C 38 61 00 54 */ addi r3, r1, 0x54 /* 8005B4D0 00058410 3C 80 80 43 */ lis r4, lbl_80430CF4@ha /* 8005B4D4 00058414 38 84 0C F4 */ addi r4, r4, lbl_80430CF4@l -/* 8005B4D8 00058418 48 20 BB 95 */ bl cXyz_NS___ne +/* 8005B4D8 00058418 48 20 BB 95 */ bl __ne__4cXyzCFRC3Vec /* 8005B4DC 0005841C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8005B4E0 00058420 41 82 00 20 */ beq lbl_8005B500 /* 8005B4E4 00058424 C0 01 00 54 */ lfs f0, 0x54(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B530.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B530.s index 5521290068..60952be44f 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B530.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B530.s @@ -16,7 +16,7 @@ /* 8005B56C 000584AC C0 01 00 08 */ lfs f0, 8(r1) /* 8005B570 000584B0 EC 01 00 28 */ fsubs f0, f1, f0 /* 8005B574 000584B4 EC 22 00 32 */ fmuls f1, f2, f0 -/* 8005B578 000584B8 48 20 B6 0D */ bl cXyz_NS___ml +/* 8005B578 000584B8 48 20 B6 0D */ bl __ml__4cXyzCFf /* 8005B57C 000584BC C0 01 00 24 */ lfs f0, 0x24(r1) /* 8005B580 000584C0 D0 01 00 48 */ stfs f0, 0x48(r1) /* 8005B584 000584C4 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -28,7 +28,7 @@ /* 8005B59C 000584DC C0 22 87 A8 */ lfs f1, lbl_804521A8-_SDA2_BASE_(r2) /* 8005B5A0 000584E0 C0 01 00 08 */ lfs f0, 8(r1) /* 8005B5A4 000584E4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8005B5A8 000584E8 48 20 B5 DD */ bl cXyz_NS___ml +/* 8005B5A8 000584E8 48 20 B5 DD */ bl __ml__4cXyzCFf /* 8005B5AC 000584EC C0 01 00 18 */ lfs f0, 0x18(r1) /* 8005B5B0 000584F0 D0 01 00 3C */ stfs f0, 0x3c(r1) /* 8005B5B4 000584F4 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -38,7 +38,7 @@ /* 8005B5C4 00058504 38 61 00 0C */ addi r3, r1, 0xc /* 8005B5C8 00058508 38 81 00 48 */ addi r4, r1, 0x48 /* 8005B5CC 0005850C 38 A1 00 3C */ addi r5, r1, 0x3c -/* 8005B5D0 00058510 48 20 B5 15 */ bl cXyz_NS___pl +/* 8005B5D0 00058510 48 20 B5 15 */ bl __pl__4cXyzCFRC3Vec /* 8005B5D4 00058514 C0 41 00 0C */ lfs f2, 0xc(r1) /* 8005B5D8 00058518 D0 41 00 54 */ stfs f2, 0x54(r1) /* 8005B5DC 0005851C C0 21 00 10 */ lfs f1, 0x10(r1) diff --git a/include/d/d_lib/asm/dLib_checkActorInRectangle.s b/include/d/d_lib/asm/dLib_checkActorInRectangle.s index f9019a0f38..9a98d15b7c 100644 --- a/include/d/d_lib/asm/dLib_checkActorInRectangle.s +++ b/include/d/d_lib/asm/dLib_checkActorInRectangle.s @@ -10,7 +10,7 @@ /* 80032678 0002F5B8 38 61 00 08 */ addi r3, r1, 8 /* 8003267C 0002F5BC 38 87 04 D0 */ addi r4, r7, 0x4d0 /* 80032680 0002F5C0 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80032684 0002F5C4 48 23 44 B1 */ bl cXyz_NS___mi +/* 80032684 0002F5C4 48 23 44 B1 */ bl __mi__4cXyzCFRC3Vec /* 80032688 0002F5C8 C0 01 00 08 */ lfs f0, 8(r1) /* 8003268C 0002F5CC D0 01 00 14 */ stfs f0, 0x14(r1) /* 80032690 0002F5D0 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_meter/d_meter_button/asm/func_80201404.s b/include/d/d_meter/d_meter_button/asm/func_80201404.s index 7c0856b6f4..c5b669f08f 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80201404.s +++ b/include/d/d_meter/d_meter_button/asm/func_80201404.s @@ -952,7 +952,7 @@ lbl_802021C8: /* 802021C8 001FF108 38 70 02 FC */ addi r3, r16, 0x2fc /* 802021CC 001FF10C C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802021D0 001FF110 C0 62 AD 50 */ lfs f3, lbl_80454750-_SDA2_BASE_(r2) -/* 802021D4 001FF114 48 06 D8 69 */ bl cLib_addCalc2 +/* 802021D4 001FF114 48 06 D8 69 */ bl cLib_addCalc2__FPffff /* 802021D8 001FF118 C0 10 02 FC */ lfs f0, 0x2fc(r16) /* 802021DC 001FF11C C0 30 02 F4 */ lfs f1, 0x2f4(r16) /* 802021E0 001FF120 EC 00 08 28 */ fsubs f0, f0, f1 diff --git a/include/d/d_meter/d_meter_map/asm/func_8020DCE4.s b/include/d/d_meter/d_meter_map/asm/func_8020DCE4.s index a4d671abab..b3af8ec895 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020DCE4.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020DCE4.s @@ -90,7 +90,7 @@ lbl_8020DE04: /* 8020DE38 0020AD78 38 A0 00 02 */ li r5, 2 /* 8020DE3C 0020AD7C 38 C0 00 3C */ li r6, 0x3c /* 8020DE40 0020AD80 38 E0 00 0A */ li r7, 0xa -/* 8020DE44 0020AD84 48 06 26 FD */ bl cLib_addCalcAngleS +/* 8020DE44 0020AD84 48 06 26 FD */ bl cLib_addCalcAngleS__FPsssss /* 8020DE48 0020AD88 48 00 00 24 */ b lbl_8020DE6C lbl_8020DE4C: /* 8020DE4C 0020AD8C 7F C3 F3 78 */ mr r3, r30 @@ -100,7 +100,7 @@ lbl_8020DE4C: /* 8020DE5C 0020AD9C 38 A0 00 02 */ li r5, 2 /* 8020DE60 0020ADA0 38 C0 00 3C */ li r6, 0x3c /* 8020DE64 0020ADA4 38 E0 00 0A */ li r7, 0xa -/* 8020DE68 0020ADA8 48 06 26 D9 */ bl cLib_addCalcAngleS +/* 8020DE68 0020ADA8 48 06 26 D9 */ bl cLib_addCalcAngleS__FPsssss lbl_8020DE6C: /* 8020DE6C 0020ADAC 38 61 00 08 */ addi r3, r1, 8 /* 8020DE70 0020ADB0 4B E3 0F ED */ bl dMapInfo_n_NS_getMapPlayerPos diff --git a/include/d/d_meter2/d_meter2/asm/func_80220888.s b/include/d/d_meter2/d_meter2/asm/func_80220888.s index 66e8bff2a5..003232d274 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80220888.s +++ b/include/d/d_meter2/d_meter2/asm/func_80220888.s @@ -151,7 +151,7 @@ lbl_80220AB0: /* 80220AC0 0021DA00 FC 20 E8 90 */ fmr f1, f29 /* 80220AC4 0021DA04 C0 42 AF CC */ lfs f2, lbl_804549CC-_SDA2_BASE_(r2) /* 80220AC8 0021DA08 C0 62 AF F0 */ lfs f3, lbl_804549F0-_SDA2_BASE_(r2) -/* 80220ACC 0021DA0C 48 04 EF 71 */ bl cLib_addCalc2 +/* 80220ACC 0021DA0C 48 04 EF 71 */ bl cLib_addCalc2__FPffff /* 80220AD0 0021DA10 3B A0 00 01 */ li r29, 1 /* 80220AD4 0021DA14 C0 1B 04 20 */ lfs f0, 0x420(r27) /* 80220AD8 0021DA18 EC 00 E8 28 */ fsubs f0, f0, f29 @@ -169,7 +169,7 @@ lbl_80220AF4: /* 80220B04 0021DA44 FC 20 E0 90 */ fmr f1, f28 /* 80220B08 0021DA48 C0 42 AF CC */ lfs f2, lbl_804549CC-_SDA2_BASE_(r2) /* 80220B0C 0021DA4C C0 62 AF F0 */ lfs f3, lbl_804549F0-_SDA2_BASE_(r2) -/* 80220B10 0021DA50 48 04 EF 2D */ bl cLib_addCalc2 +/* 80220B10 0021DA50 48 04 EF 2D */ bl cLib_addCalc2__FPffff /* 80220B14 0021DA54 3B A0 00 01 */ li r29, 1 /* 80220B18 0021DA58 C0 1B 04 24 */ lfs f0, 0x424(r27) /* 80220B1C 0021DA5C EC 00 E0 28 */ fsubs f0, f0, f28 @@ -187,7 +187,7 @@ lbl_80220B38: /* 80220B48 0021DA88 FC 20 F8 90 */ fmr f1, f31 /* 80220B4C 0021DA8C C0 42 AF F4 */ lfs f2, lbl_804549F4-_SDA2_BASE_(r2) /* 80220B50 0021DA90 C0 62 AF CC */ lfs f3, lbl_804549CC-_SDA2_BASE_(r2) -/* 80220B54 0021DA94 48 04 EE E9 */ bl cLib_addCalc2 +/* 80220B54 0021DA94 48 04 EE E9 */ bl cLib_addCalc2__FPffff /* 80220B58 0021DA98 3B A0 00 01 */ li r29, 1 /* 80220B5C 0021DA9C C0 1B 04 28 */ lfs f0, 0x428(r27) /* 80220B60 0021DAA0 EC 00 F8 28 */ fsubs f0, f0, f31 @@ -205,7 +205,7 @@ lbl_80220B7C: /* 80220B8C 0021DACC FC 20 F0 90 */ fmr f1, f30 /* 80220B90 0021DAD0 C0 42 AF F4 */ lfs f2, lbl_804549F4-_SDA2_BASE_(r2) /* 80220B94 0021DAD4 C0 62 AF CC */ lfs f3, lbl_804549CC-_SDA2_BASE_(r2) -/* 80220B98 0021DAD8 48 04 EE A5 */ bl cLib_addCalc2 +/* 80220B98 0021DAD8 48 04 EE A5 */ bl cLib_addCalc2__FPffff /* 80220B9C 0021DADC 3B A0 00 01 */ li r29, 1 /* 80220BA0 0021DAE0 C0 1B 04 2C */ lfs f0, 0x42c(r27) /* 80220BA4 0021DAE4 EC 00 F0 28 */ fsubs f0, f0, f30 diff --git a/include/d/d_meter2/d_meter2/asm/func_80221244.s b/include/d/d_meter2/d_meter2/asm/func_80221244.s index 91670f2381..d67b855acf 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80221244.s +++ b/include/d/d_meter2/d_meter2/asm/func_80221244.s @@ -274,7 +274,7 @@ lbl_80221604: /* 80221620 0021E560 FC 20 F0 90 */ fmr f1, f30 /* 80221624 0021E564 C0 42 AF CC */ lfs f2, lbl_804549CC-_SDA2_BASE_(r2) /* 80221628 0021E568 C0 62 AF F0 */ lfs f3, lbl_804549F0-_SDA2_BASE_(r2) -/* 8022162C 0021E56C 48 04 E4 11 */ bl cLib_addCalc2 +/* 8022162C 0021E56C 48 04 E4 11 */ bl cLib_addCalc2__FPffff /* 80221630 0021E570 3B C0 00 01 */ li r30, 1 /* 80221634 0021E574 C0 16 00 00 */ lfs f0, 0(r22) /* 80221638 0021E578 EC 00 F0 28 */ fsubs f0, f0, f30 @@ -294,7 +294,7 @@ lbl_80221654: /* 8022166C 0021E5AC FC 20 F0 90 */ fmr f1, f30 /* 80221670 0021E5B0 C0 42 AF CC */ lfs f2, lbl_804549CC-_SDA2_BASE_(r2) /* 80221674 0021E5B4 C0 62 AF F0 */ lfs f3, lbl_804549F0-_SDA2_BASE_(r2) -/* 80221678 0021E5B8 48 04 E3 C5 */ bl cLib_addCalc2 +/* 80221678 0021E5B8 48 04 E3 C5 */ bl cLib_addCalc2__FPffff /* 8022167C 0021E5BC 3B C0 00 01 */ li r30, 1 /* 80221680 0021E5C0 C0 16 00 00 */ lfs f0, 0(r22) /* 80221684 0021E5C4 EC 00 F0 28 */ fsubs f0, f0, f30 @@ -316,7 +316,7 @@ lbl_802216A0: /* 802216C0 0021E600 FC 20 F8 90 */ fmr f1, f31 /* 802216C4 0021E604 C0 42 AF CC */ lfs f2, lbl_804549CC-_SDA2_BASE_(r2) /* 802216C8 0021E608 C0 62 AF F0 */ lfs f3, lbl_804549F0-_SDA2_BASE_(r2) -/* 802216CC 0021E60C 48 04 E3 71 */ bl cLib_addCalc2 +/* 802216CC 0021E60C 48 04 E3 71 */ bl cLib_addCalc2__FPffff /* 802216D0 0021E610 3B C0 00 01 */ li r30, 1 /* 802216D4 0021E614 C0 1B 01 44 */ lfs f0, 0x144(r27) /* 802216D8 0021E618 EC 00 F8 28 */ fsubs f0, f0, f31 diff --git a/include/d/d_meter2/d_meter2/asm/func_802217F4.s b/include/d/d_meter2/d_meter2/asm/func_802217F4.s index 423c424370..88cca2d8dd 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802217F4.s +++ b/include/d/d_meter2/d_meter2/asm/func_802217F4.s @@ -367,7 +367,7 @@ lbl_80221CFC: /* 80221D18 0021EC58 FC 20 F0 90 */ fmr f1, f30 /* 80221D1C 0021EC5C C0 42 AF CC */ lfs f2, lbl_804549CC-_SDA2_BASE_(r2) /* 80221D20 0021EC60 C0 62 AF F0 */ lfs f3, lbl_804549F0-_SDA2_BASE_(r2) -/* 80221D24 0021EC64 48 04 DD 19 */ bl cLib_addCalc2 +/* 80221D24 0021EC64 48 04 DD 19 */ bl cLib_addCalc2__FPffff /* 80221D28 0021EC68 3B C0 00 01 */ li r30, 1 /* 80221D2C 0021EC6C C0 16 00 00 */ lfs f0, 0(r22) /* 80221D30 0021EC70 EC 00 F0 28 */ fsubs f0, f0, f30 @@ -387,7 +387,7 @@ lbl_80221D4C: /* 80221D64 0021ECA4 FC 20 F0 90 */ fmr f1, f30 /* 80221D68 0021ECA8 C0 42 AF CC */ lfs f2, lbl_804549CC-_SDA2_BASE_(r2) /* 80221D6C 0021ECAC C0 62 AF F0 */ lfs f3, lbl_804549F0-_SDA2_BASE_(r2) -/* 80221D70 0021ECB0 48 04 DC CD */ bl cLib_addCalc2 +/* 80221D70 0021ECB0 48 04 DC CD */ bl cLib_addCalc2__FPffff /* 80221D74 0021ECB4 3B C0 00 01 */ li r30, 1 /* 80221D78 0021ECB8 C0 16 00 00 */ lfs f0, 0(r22) /* 80221D7C 0021ECBC EC 00 F0 28 */ fsubs f0, f0, f30 @@ -409,7 +409,7 @@ lbl_80221D98: /* 80221DB8 0021ECF8 FC 20 F8 90 */ fmr f1, f31 /* 80221DBC 0021ECFC C0 42 AF CC */ lfs f2, lbl_804549CC-_SDA2_BASE_(r2) /* 80221DC0 0021ED00 C0 62 AF F0 */ lfs f3, lbl_804549F0-_SDA2_BASE_(r2) -/* 80221DC4 0021ED04 48 04 DC 79 */ bl cLib_addCalc2 +/* 80221DC4 0021ED04 48 04 DC 79 */ bl cLib_addCalc2__FPffff /* 80221DC8 0021ED08 3B C0 00 01 */ li r30, 1 /* 80221DCC 0021ED0C C0 1B 01 58 */ lfs f0, 0x158(r27) /* 80221DD0 0021ED10 EC 00 F8 28 */ fsubs f0, f0, f31 diff --git a/include/d/d_meter2/d_meter2/asm/func_80222E88.s b/include/d/d_meter2/d_meter2/asm/func_80222E88.s index 779565dc95..e9d16b4921 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80222E88.s +++ b/include/d/d_meter2/d_meter2/asm/func_80222E88.s @@ -137,7 +137,7 @@ lbl_80223010: /* 80223078 0021FFB8 FC 20 F8 90 */ fmr f1, f31 /* 8022307C 0021FFBC C0 42 AF EC */ lfs f2, lbl_804549EC-_SDA2_BASE_(r2) /* 80223080 0021FFC0 C0 62 B0 00 */ lfs f3, lbl_80454A00-_SDA2_BASE_(r2) -/* 80223084 0021FFC4 48 04 C9 B9 */ bl cLib_addCalc2 +/* 80223084 0021FFC4 48 04 C9 B9 */ bl cLib_addCalc2__FPffff /* 80223088 0021FFC8 C0 1E 01 5C */ lfs f0, 0x15c(r30) /* 8022308C 0021FFCC EC 00 F8 28 */ fsubs f0, f0, f31 /* 80223090 0021FFD0 FC 00 02 10 */ fabs f0, f0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219A84.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219A84.s index 7b9a4548b9..24c37fee0f 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219A84.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219A84.s @@ -162,7 +162,7 @@ lbl_80219CD4: /* 80219CE4 00216C24 FC 20 E8 90 */ fmr f1, f29 /* 80219CE8 00216C28 C0 42 AE D0 */ lfs f2, lbl_804548D0-_SDA2_BASE_(r2) /* 80219CEC 00216C2C C0 62 AE 94 */ lfs f3, lbl_80454894-_SDA2_BASE_(r2) -/* 80219CF0 00216C30 48 05 5D 4D */ bl cLib_addCalc2 +/* 80219CF0 00216C30 48 05 5D 4D */ bl cLib_addCalc2__FPffff /* 80219CF4 00216C34 C0 1D 07 20 */ lfs f0, 0x720(r29) /* 80219CF8 00216C38 EC 00 E8 28 */ fsubs f0, f0, f29 /* 80219CFC 00216C3C FC 00 02 10 */ fabs f0, f0 @@ -240,7 +240,7 @@ lbl_80219DF8: /* 80219E08 00216D48 FC 20 E8 90 */ fmr f1, f29 /* 80219E0C 00216D4C C0 42 AE D0 */ lfs f2, lbl_804548D0-_SDA2_BASE_(r2) /* 80219E10 00216D50 C0 62 AE 94 */ lfs f3, lbl_80454894-_SDA2_BASE_(r2) -/* 80219E14 00216D54 48 05 5C 29 */ bl cLib_addCalc2 +/* 80219E14 00216D54 48 05 5C 29 */ bl cLib_addCalc2__FPffff /* 80219E18 00216D58 C0 1D 07 24 */ lfs f0, 0x724(r29) /* 80219E1C 00216D5C EC 00 E8 28 */ fsubs f0, f0, f29 /* 80219E20 00216D60 FC 00 02 10 */ fabs f0, f0 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021CA70.s b/include/d/d_meter2/d_meter2_info/asm/func_8021CA70.s index 5d8455ae22..40f33b35a2 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021CA70.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021CA70.s @@ -25,7 +25,7 @@ /* 8021CAD0 00219A10 38 80 00 00 */ li r4, 0 /* 8021CAD4 00219A14 A8 BF 0D BA */ lha r5, 0xdba(r31) /* 8021CAD8 00219A18 38 C0 00 00 */ li r6, 0 -/* 8021CADC 00219A1C 48 04 A9 19 */ bl csXyz_X1_ +/* 8021CADC 00219A1C 48 04 A9 19 */ bl __ct__5csXyzFsss /* 8021CAE0 00219A20 88 1F 0D B4 */ lbz r0, 0xdb4(r31) /* 8021CAE4 00219A24 7C 1F 07 74 */ extsb r31, r0 /* 8021CAE8 00219A28 3B DE 4E 00 */ addi r30, r30, 0x4e00 diff --git a/include/f/f_pc/f_pc_create_req/asm/func_80020BA0.s b/include/f/f_pc/f_pc_create_req/asm/func_80020BA0.s index 64385768df..2eef38ee87 100644 --- a/include/f/f_pc/f_pc_create_req/asm/func_80020BA0.s +++ b/include/f/f_pc/f_pc_create_req/asm/func_80020BA0.s @@ -22,7 +22,7 @@ lbl_80020BE0 : /* 80020BF0 0001DB30 90 03 00 14 */ stw r0,0x14(r3) lbl_80020BF4 : /* 80020BF4 0001DB34 7F E3 FB 78 */ mr r3,r31 -/* 80020BF8 0001DB38 48 24 26 69 */ bl cMl_NS_free +/* 80020BF8 0001DB38 48 24 26 69 */ bl free__3cMlFPv /* 80020BFC 0001DB3C 38 60 00 01 */ li r3,1 lbl_80020C00 : /* 80020C00 0001DB40 83 E1 00 0C */ lwz r31,0xc(r1) diff --git a/include/functions.h b/include/functions.h index e4f9b5c3ff..3a855ee916 100644 --- a/include/functions.h +++ b/include/functions.h @@ -215,7 +215,7 @@ void checkCallback__19JUTGamePadLongPressFlUl(void); void checkResetCallback__10JUTGamePadFx(void); void searchMapEventData__14dEvt_control_cFUc(void); void mDoMtx_YrotS(void); -void cXyz_NS___mi(void); +void __mi__4cXyzCFRC3Vec(void); void Yinit__9STControlFv(void); void Xinit__9STControlFv(void); void J2DScreen_NS_draw(void); @@ -412,12 +412,11 @@ void dLib_time_c_NS_stopTime(void); void dLib_time_c_NS_startTime(void); class dComIfG_play_c; void dComIfG_play_c_NS_drawSimpleModel(dComIfG_play_c*); -void cAPIGph_Painter(void); bool dDvdErrorMsg_c_NS_execute(void); bool dShutdownErrorMsg_c_NS_execute(void); class dDlst_peekZ_c; void dDlst_peekZ_c_NS_peekData(dDlst_peekZ_c*); -void MtxInit(void); +void MtxInit__Fv(void); void mDoDvdErr_ThdCleanup(void); void initiate__6JUTXfbFUsUsP7JKRHeapl(void); @@ -426,7 +425,7 @@ void common_init__6JUTXfbFl(void); class mDoCPd_c; extern "C" { -void mDoCPd_c_NS_recalibrate(void); +void cAPICPad_recalibrate__Fv(void); } // JSystem/JSupport/JSUList @@ -1099,7 +1098,8 @@ void mDoRst_resetCallBack__FiPv(void); // additional symbols needed for d_attention.cpp // autogenerated by split.py v0.3 at 2020-12-27 23:10:29.338588 extern "C" { -void func_8036C668(void); +// tan +double func_8036C668(double); void dAttCatch_c_NS_init(void); void mDoExt_createSolidHeapFromGameToCurrent_X1_(void); void dAttention_c_NS_stockAttention(void); @@ -1123,7 +1123,7 @@ void select_attention(void); void dAttention_c_NS_EnemyDistance(void); void dAttention_c_NS_Run(void); void dAttention_c_NS_nextAttention(void); -void cXyz_NS___mi(void); +void __mi__4cXyzCFRC3Vec(void); void dAttDrawParam_c(void); void func_80361CE8(void); void mDoExt_bckAnm_NS_init(void); @@ -1131,12 +1131,12 @@ void mDoExt_btkAnm_NS_entry(void); void dAttList_c_NS_getActor(void); void mDoExt_restoreCurrentHeap(void); void mDoExt_modelUpdateDL(void); -void cSGlobe_X4_(void); +void __ct__7cSGlobeFRC4cXyz(void); void dAttention_c_NS_setList(void); void dAttLook_c_NS_convPId(void); void dAttention_c_NS_lostCheck(void); void dAttention_c_NS_getActionBtnXY(void); -void cSAngle_X2_(void); +void __ct__7cSAngleFs(void); void fopAcIt_Judge(void); void dAttHint_c_NS_convPId(void); void dAttCatch_c_NS_proc(void); @@ -1160,7 +1160,7 @@ void dAttention_c_NS_CheckObjectTarget(void); void dAttention_c_NS_chkAttMask(void); void dAttention_c_NS_triggerProc(void); void dAttention_c_NS_ActionTarget(void); -void cSAngle_NS___mi_X2_(void); +void __mi__7cSAngleCFs(void); void dAttention_c_NS_GetLockonList(void); void dAttHint_c_NS_init(void); // void dAttention_c(void); @@ -1170,7 +1170,7 @@ void func_800738FC(void); void mDoExt_brkAnm_NS_entry(void); void dAttention_c_NS_judgementStatus4Switch(void); void check_event_condition(void); -void cSAngle_X1_(void); +void __ct__7cSAngleFRC7cSAngle(void); void daPy_py_c_NS_getAttentionOffsetY(void); void mDoExt_baseAnm_NS_play(void); void _unnamed_d_attention_cpp__NS_padLockButton(void); @@ -1179,7 +1179,7 @@ void dAttention_c_NS_SelectAttention(void); void dAttLook_c_NS_init(void); void mDoExt_adjustSolidHeap(void); void mDoExt_destroySolidHeap(void); -void cSAngle_NS_Inv(void); +void Inv__7cSAngleCFv(void); void mDoExt_brkAnm_NS_init(void); void dAttDrawParam_c_NS_dtor(void); void dAttDraw_c_NS_alphaAnm(void); @@ -1321,7 +1321,7 @@ void dBgS_AcchCir(void); void daAlink_c_NS_getBoomFlyMax(void); void daAlink_c_NS_setSmellSave(void); void daAlink_c_NS_checkLv2MiddleBossBgRide(void); -void cM3d_3PlaneCrossPos(void); +void cM3d_3PlaneCrossPos__FRC8cM3dGPlaRC8cM3dGPlaRC8cM3dGPlaP3Vec(void); void daAlink_c_NS_checkUpperItemAction(void); void daAlink_c_NS_checkGrabTalkActor(void); void func_800D9E88(void); @@ -1352,9 +1352,9 @@ void daAlink_c_NS_getRoofHangSMoveAnmSpeed(void); void func_8011DB9C(void); void func_8014156C(void); void func_801416B8(void); -void cM3dGCyl_NS_SetC(void); +void SetC__8cM3dGCylFRC4cXyz(void); void daAlink_c_NS_procWolfLieAutoMoveInit(void); -void cM_rndFX(void); +void cM_rndFX__Ff(void); void daAlink_c_NS_procBossBodyHangInit(void); void func_8010DA34(void); void cBgS_NS_GroundCross(void); @@ -1379,7 +1379,7 @@ void J3DModel_NS_calcWeightEnvelopeMtx(void); void dKy_WolfEyeLight_set(void); void daAlink_c_NS_setHookshotModel(void); void func_801417E0(void); -void cXyz_NS_normZP(void); +void normZP__4cXyzCFv(void); void daAlink_c_NS_checkEquipAnime(void); void daAlink_c_NS_concatMagneBootInvMtx(void); void dComIfGp_getRStatus(void); @@ -1481,7 +1481,7 @@ void daAlink_c_NS_setMetamorphoseModel(void); void daAlink_c_NS_procCoLargeDamageInit(void); void func_80141810(void); void func_80141864(void); -void cBgS_GndChk_NS_SetPos_X1_(void); +void SetPos__11cBgS_GndChkFPC4cXyz(void); void func_8014184C(void); void dEvent_manager_c_NS_cutEnd(void); void daAlink_c_NS_initModel(void); @@ -1506,9 +1506,9 @@ void JPAParticleCallBack_NS_dtor(void); void func_801417D4(void); void func_8011E960(void); void setLinkBootsType__14Z2CreatureLinkFl(void); -void cM_atan2s(void); +void cM_atan2s__Fff(void); void daAlink_c_NS_setLastSceneMode(void); -void cBgS_PolyInfo_NS_dtor(void); +void __dt__13cBgS_PolyInfoFv(void); void daAlink_c_getDemoIDData(void); void func_8011EC60(void); void daAlink_c_NS_resetAtCollision(void); @@ -1583,7 +1583,7 @@ void daAlink_c_NS_checkLandAction(void); void daAlink_c_NS_setHeavyBoots(void); void func_800C5484(void); void func_8013DC5C(void); -void cXyz_NS_atan2sY_XZ(void); +void atan2sY_XZ__4cXyzCFv(void); void daAlink_c_NS_procMoveTurnInit(void); void func_800FB790(void); void daAlink_c_NS_setUpperAnimeBase(void); @@ -1631,7 +1631,7 @@ void func_801415B4(void); void daAlink_c_NS_setBowSight(void); void daAlink_c_NS_checkGrabLineCheck(void); void daAlink_c_NS_dtor(void); -void cLib_addCalcPos(void); +void cLib_addCalcPos__FP4cXyzRC4cXyzfff(void); void func_8013C7A4(void); void func_800FC240(void); void dCamera_c_NS_Stop(void); @@ -1693,7 +1693,7 @@ void func_800F2898(void); void daAlink_c_NS_procCopyRodSwingInit(void); void daPy_addCalcShort(void); void daAlink_c_NS_setSyncBoarPos(void); -void cM3d_Len2dSqPntAndSegLine(void); +void cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf(void); void daAlink_c_NS_itemTriggerCheck(void); void daAlink_c_NS_checkClimbRoof(void); void daAlink_c_NS_checkUpperItemActionFly(void); @@ -1724,7 +1724,7 @@ void daAlink_c_NS_checkWolfGroundSpecialMode(void); void func_800F0CE4(void); void getLightDropNum__16dSv_light_drop_cCFUc(void); void func_800CFDF4(void); -void cLib_addCalc(void); +void cLib_addCalc__FPfffff(void); void daAlink_c_NS_setIronBallBaseAnime(void); void daAlink_c_NS_procCutFinishJumpUpInit(void); void daPy_py_c_NS_checkTradeItem(void); @@ -1927,7 +1927,7 @@ void daAlink_c_NS_setFrontWallType(void); void daAlink_c_NS_setHangGroundY(void); void dBgS_Acch_NS_Set_X1_(void); void daAlink_c_NS_setWolfLockAttackEffect(void); -void cLib_distanceAngleS(void); +void cLib_distanceAngleS__Fss(void); void dPa_control_c_NS_setWaterRipple(void); void dBgS_Acch_NS_ChkRoofHit(void); void daAlink_c_NS_procCanoeFishingGetInit(void); @@ -1955,7 +1955,7 @@ void func_800D0468(void); void func_800FB1A4(void); void daAlink_c_NS_setSyncBoarRunPos(void); void func_800E1248(void); -void cM3dGPla_NS_crossInfLin(void); +void crossInfLin__8cM3dGPlaCFRC4cXyzRC4cXyzR4cXyz(void); void GXSetZMode(void); void J3DModel_NS_getAnmMtx(void); void func_800F6394(void); @@ -1978,14 +1978,14 @@ void daAlink_c_NS_checkHangFootWall(void); void func_8010BCA4(void); void daAlink_c_NS_checkCutLandDamage(void); void func_80141914(void); -void cCcS_NS_Set(void); +void Set__4cCcSFP8cCcD_Obj(void); void daAlink_c_NS_setFaceBasicAnime(void); void daAlink_c_NS_setCommonBoardAnime(void); void daAlink_c_NS_setWolfCollisionPos(void); void func_800D05FC(void); void func_800F3F38(void); void daAlink_c_NS_procCanoePaddlePutInit(void); -void cM3dGCyl_NS_SetR(void); +void SetR__8cM3dGCylFf(void); void daAlink_c_NS_checkSwordTwirlAnime(void); void daAlink_c_NS_checkWindSpeedOnAngle(void); void daAlink_c_NS_setDoubleAnime(void); @@ -2018,10 +2018,10 @@ void daAlink_c_NS_checkHorseServiceWaitAnime(void); void dBgS_RopeLinChk_NS_dtor(void); void func_800C6D20(void); void daAlink_c_NS_setHorseTurnUpperAnime(void); -void cXyz_NS_normalize(void); +void normalize__4cXyzFv(void); void daAlink_c_NS_procGuardBreakInit(void); void daAlink_c_NS_procWolfStepMoveInit(void); -void cXyz_NS___mi(void); +void __mi__4cXyzCFRC3Vec(void); void daAlink_c_NS_changeCrawlAutoMoveProc(void); void daAlink_c_NS_createHeap(void); void daAlink_c_NS_getBoardRowAnmSpeed(void); @@ -2036,7 +2036,7 @@ void daAlink_c_NS_procSumouReadyInit(void); void func_800D0688(void); void daAlink_c_NS_checkHangStartSideWall(void); void daAlink_c_NS_setDrawHand(void); -void cM_rnd(void); +void cM_rnd__Fv(void); void dCcD_GObjInf_NS_GetAtHitGObj(void); void dBgS_RoofChk(void); void daAlink_c_NS_getCutDirection(void); @@ -2075,7 +2075,7 @@ void func_800E21FC(void); void func_800D6A38(void); void daAlink_c_NS_procHorseBowSubjectInit(void); void daAlink_c_NS_setDemoMoveData(void); -void cM_rndF(void); +void cM_rndF__Ff(void); void daAlink_c_NS_statusWindowExecute(void); void func_800E08C4(void); void func_800D06D8(void); @@ -2097,7 +2097,7 @@ void func_800F6874(void); void daAlink_c_NS_procCoGetReadySitInit(void); void GXLoadPosMtxImm(void); void daAlink_c_NS_transAnimeProc(void); -void cLib_chaseUC(void); +void cLib_chaseUC__FPUcUcUc(void); void mDoMtx_XrotS(void); void daAlink_c_NS_commonInitForceRideRein(void); void func_8013E80C(void); @@ -2265,7 +2265,7 @@ void dBgS_BoomerangLinChk(void); void func_800D03F0(void); void daPy_py_c_NS_offNoResetFlg2(void); void daAlink_c_NS_getMoveBGActorName(void); -void cXyz_NS___pl(void); +void __pl__4cXyzCFRC3Vec(void); void dCcD_GObjInf_NS_ResetAtHit(void); void J3DModel_NS_setBaseTRMtx(void); void daAlink_c_NS_checkRestartRoom(void); @@ -2314,7 +2314,7 @@ void dCcD_GObjInf_NS_getHitSeID(void); void func_80138644(void); void daAlink_c_NS_setClimbStartNotGround(void); void daAlink_c_NS_procHangWallCatchInit(void); -void cLib_addCalcAngleS(void); +void cLib_addCalcAngleS__FPsssss(void); void daTagMagne_c_NS_checkMagnetCode(void); void daAlink_c_NS_procLadderMoveInit(void); void func_800FC390(void); @@ -2325,7 +2325,7 @@ void func_800F2628(void); void daAlink_c_NS_setUnderAnime(void); void func_80112304(void); void daAlink_c_NS_setOldRootQuaternion(void); -void cXyz_NS_atan2sX_Z(void); +void atan2sX_Z__4cXyzCFv(void); void daAlink_c_NS_getCopyRodCameraActor(void); void dBgS_PolyPassChk_NS_ClrLink(void); void daAlink_c_NS_resetFacePriAnime(void); @@ -2383,7 +2383,7 @@ void func_8011C62C(void); void daPy_py_c_NS_onNoResetFlg0(void); void daAlink_c_NS_setSpeedAndAngleWolfAtn(void); void func_800E3760(void); -void cM3dGLin_NS_SetStartEnd(void); +void SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz(void); void GXSetNumIndStages(void); void daAlink_c_NS_getCanoeMaxSpeed(void); void mDoExt_destroyExpHeap(void); @@ -2502,7 +2502,7 @@ void daPy_frameCtrl_c_NS_setFrameCtrl(void); void daPy_anmHeap_c_NS___defctor(void); void daAlink_matAnm_c_NS_offSetFlg(void); void daAlink_c_NS_checkNextActionHookshot(void); -void cXyz_NS___ml(void); +void __ml__4cXyzCFf(void); void daAlink_c_NS_checkWolfWaitSlipPolygon(void); void daAlink_c_NS_checkLadderFall(void); void func_8011243C(void); @@ -2584,7 +2584,7 @@ void daPy_sightPacket_c_NS_setSight(void); void func_800F7684(void); void daAlink_c_NS_decSwordBlur(void); void func_800D04B8(void); -void cLib_chasePos(void); +void cLib_chasePos__FP4cXyzRC4cXyzf(void); void GXSetCullMode(void); void daAlink_c_NS_bottleModelCallBack(void); void daAlink_c_NS_simpleAnmPlay(void); @@ -2653,7 +2653,7 @@ void func_8013A8A0(void); void func_80110518(void); void fopOvlpM_IsPeek(void); void daAlink_c_NS_setShieldModel(void); -void cM3d_SignedLenPlaAndPos(void); +void cM3d_SignedLenPlaAndPos__FPC8cM3dGPlaPC3Vec(void); void daAlink_c_NS_checkNotCrawlStand_X1_(void); void mDoExt_setCurrentHeap(void); void daAlink_c_NS_checkMiddleBossGoronRoom(void); @@ -2704,7 +2704,7 @@ void daAlink_c_NS_setCrawlAutoMoveAimPos(void); void daAlink_c_NS_checkDungeon(void); void dEvt_control_c_NS_setPtI_Id(void); void func_801115CC(void); -void cBgS_PolyInfo_NS_SetPolyInfo(void); +void SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo(void); void daAlink_c_NS_resetFacePriBtp(void); void daAlink_c_NS_procTurnMoveInit(void); void daAlink_c_NS_setHighModelFaceBtk(void); @@ -2788,7 +2788,7 @@ void daAlinkHIO_cut_c_NS_dtor(void); void daPy_demo_c_NS_setSpecialDemoType(void); void func_800D05C0(void); void daAlink_c_NS_initHookshotUpperAnimeSpeed(void); -void cBgS_PolyInfo_NS_ctor(void); +void __ct__13cBgS_PolyInfoFv(void); void J3DDrawBuffer_NS_entryImm(void); void daAlink_c_NS_checkZeroSpeedF(void); void daAlink_c_NS_resetStatusWindow(void); @@ -2798,7 +2798,7 @@ void func_800BF124(void); void func_8011BDF0(void); void func_800EA3AC(void); void dEvt_info_c_NS_onCondition(void); -void cM_rad2s(void); +void cM_rad2s__Ff(void); void daAlink_c_NS_checkServiceWaitMode(void); void dMsgObject_c_NS_getStatus(void); void func_8012EFB8(void); @@ -2883,7 +2883,7 @@ void daAlink_c_NS_checkUpSwimButtonAccept(void); void func_80133930(void); void daAlink_c_NS_procCutReverseInit(void); void daAlink_c_NS_procWolfMoveInit(void); -void cM3dGSph_NS_SetR(void); +void SetR__8cM3dGSphFf(void); void dBgS_NS_GetWallCode(void); void dBgS_ObjLinChk_NS_dtor(void); void func_800A87D8(void); @@ -2958,7 +2958,7 @@ void dPaPoF_c_NS_clearFourAllID(void); void func_800C3504(void); void daAlink_c_NS_checkCrawlInHoll(void); void cLib_calcTimer(void); -void cCcD_Stts_NS_ClrCcMove(void); +void ClrCcMove__9cCcD_SttsFv(void); void func_80126354(void); void daAlink_c_NS_setUpperAnime(void); void daAlink_c_NS_setItemHeap(void); @@ -3044,10 +3044,10 @@ void setRunRideMode__10e_wb_classFv(void); void daAlink_c_NS_setDemoLeftHandIndex(void); void daAlink_c_NS_setSlingModel(void); void daAlink_c_NS_setIronBallReadyAnime(void); -void cM3dGSph_NS_SetC(void); +void SetC__8cM3dGSphFRC4cXyz(void); void dPa_control_c_NS_level_c_NS_getEmitter(void); void daAlink_c_NS_procSmallJumpInit(void); -void cM3dGCyl_NS_SetH(void); +void SetH__8cM3dGCylFf(void); void func_8011EAE8(void); void func_80131408(void); void dBgS_NS_GetMagnetCode(void); @@ -3238,12 +3238,12 @@ void daAlink_c_NS_checkNextActionCanoe(void); void func_801124FC(void); void func_800F6188(void); void daAlink_c_NS_setBowOrSlingStatus(void); -void cLib_targetAngleY(void); +void cLib_targetAngleY__FPC3VecPC3Vec(void); void daAlink_c_NS_procHorseRunInit(void); void func_8011DF68(void); void daAlink_c_NS_subjectCancelTrigger(void); void func_801415DC(void); -void csXyz_X1_(void); +void __ct__5csXyzFsss(void); void func_800E5EC8(void); void daAlink_c_NS_procBackJumpInit(void); void func_801417C0(void); @@ -3275,7 +3275,7 @@ void setMagnetized__14Z2CreatureLinkFb(void); void func_8011EB8C(void); void func_80141730(void); void daAlink_c_NS_checkZoraSwimMove(void); -void cLib_chaseF(void); +void cLib_chaseF__FPfff(void); void daAlink_c_NS_damageMagnification(void); void daAlink_c_NS_setSyncHorse(void); void daAlink_c_NS_procGoronRideWaitInit(void); @@ -3290,7 +3290,7 @@ void func_800DE990(void); void func_80141694(void); void func_800D084C(void); void daAlink_c_NS_checkIronBallReturnChange(void); -void cCcD_ObjCo_NS_SetVsGrp(void); +void SetVsGrp__10cCcD_ObjCoFUl(void); void daAlink_c_NS_setDoubleAnimeBlendRatio(void); void func_80141824(void); void func_801416A8(void); @@ -3332,12 +3332,12 @@ void daAlink_c_NS_procCanoeFishingReelInit(void); void dPaneClass_showNullPane(void); void daAlink_c_NS_checkUnderMove0BckNoArc(void); void func_801417E8(void); -void cXyz_NS_outprod(void); +void outprod__4cXyzCFRC3Vec(void); void func_800CF344(void); void daAlink_c_NS_setSwordPushAnime(void); void dRes_control_c_NS_getRes_X1_(void); void func_800F194C(void); -void cLib_memCpy(void); +void cLib_memCpy__FPvPCvUl(void); void func_800D07D4(void); void func_800DDF2C(void); void dComIfGd_setShadow(void); @@ -3345,7 +3345,7 @@ void cXyz_NS_dtor(void); void daAlink_c_NS_checkUpperItemActionBoomerangFly(void); void daAlink_c_NS_checkPolyDamage(void); void func_8013B424(void); -void cLib_chaseAngleS(void); +void cLib_chaseAngleS__FPsss(void); void dBgS_RoofChk_NS_SetPos(void); void daAlink_c_NS_procFrontRollInit(void); void daAlink_c_NS_checkNextActionCopyRod(void); @@ -3429,7 +3429,7 @@ void daAlink_c_NS_checkCutTurnInput(void); void dAttention_c_NS_LockonTarget(void); void func_801446E4(void); void daAlink_c_NS_checkHorseZeldaBowMode(void); -void cXyz_NS___dv(void); +void __dv__4cXyzCFf(void); void daAlink_c_NS_setWolfWaitSlip(void); void daAlink_c_NS_setRoofHangSwitch(void); void daAlink_c_NS_sumouPunchTrigger(void); @@ -3472,7 +3472,7 @@ void daAlink_c_NS_procCoLavaReturnInit(void); void daAlink_c_NS_iceSlipBgCheck(void); void func_800D02B8(void); void func_801417D8(void); -void cM3dGCps_NS_dtor(void); +void __dt__8cM3dGCpsFv(void); void GXSetChanMatColor(void); void daAlink_c_NS_checkWolfLieCode(void); void func_800CF018(void); @@ -3484,7 +3484,7 @@ void daAlink_c_NS_getDemoLookActor(void); void dScnKy_env_light_c_NS_setLightTevColorType_MAJI(void); void daAlink_c_NS_commonGrabPutInit(void); void func_800F5FEC(void); -void cLib_chaseS(void); +void cLib_chaseS__FPsss(void); void daPy_actorKeep_c_NS_setData(void); void func_800D04A4(void); void daAlink_c_NS_setFaceBck(void); @@ -3627,7 +3627,7 @@ void dEvent_manager_c_NS_getMyStaffId(void); void daAlink_c_NS_checkRoofHangMovePos(void); void daAlink_c_NS_setFootSpeed(void); void daPy_frameCtrl_c_NS_updateFrame(void); -void cCcD_ObjCo_NS_SetIGrp(void); +void SetIGrp__10cCcD_ObjCoFUl(void); void daAlink_c_NS_checkAtnRightAnime(void); void mDoExt_bckAnm_NS_changeBckOnly(void); void func_800C3338(void); @@ -3690,7 +3690,7 @@ void func_8012FD2C(void); void dKy_Sound_set(void); void dMsgObject_c_NS_setSmellType(void); void daAlink_c_NS_getCopyRodControllActor(void); -void cBgS_PolyInfo_NS_ClearPi(void); +void ClearPi__13cBgS_PolyInfoFv(void); void func_800D3ECC(void); void daAlink_c_NS_checkBowGrabLeftHand(void); void daAlink_c_NS_setBaseRideAnime(void); @@ -3705,7 +3705,7 @@ void daAlink_c_NS_getMoveGroundAngleSpeedRate(void); void func_800EFDC4(void); void func_801387A0(void); void daAlink_c_NS_checkCutTurnInputTrigger(void); -void cM_atan2f(void); +void cM_atan2f__Fff(void); void fopAcM_delete(void); void func_800CF25C(void); void daAlink_c_NS_procCutDownLandInit(void); @@ -3725,7 +3725,7 @@ void daAlink_c_NS_checkSumouVsActor(void); void daAlink_c_NS_footBgCheck(void); void daAlink_c_NS_checkNextHookPoint(void); void func_8011BD6C(void); -void cXyz_NS_normalizeZP(void); +void normalizeZP__4cXyzFv(void); void func_800D3CCC(void); void func_8013DA8C(void); void dCamera_c_NS_StartEventCamera(void); @@ -3779,7 +3779,7 @@ void dVibration_c_NS_StartShock(void); void daAlink_c_NS_setHorseCutTurnEffect(void); void func_80141814(void); void func_80130138(void); -void cM3dGPla_X1_(void); +void __ct__8cM3dGPlaFPC4cXyzf(void); void func_800D5FC8(void); void daAlink_c_NS_setBottleModel(void); void dCcD_Sph_NS_Set(void); @@ -3877,6 +3877,461 @@ void J3DGXColorS10(void); u32 dEv_noFinishSkipProc(void); } +// additional symbols needed for c_math.cpp +// autogenerated by split.py v0.3 at 2020-12-31 13:20:59.345428 +extern "C" { +double func_8036C760(double, double); +void func_80267B04(void); +void func_80267ACC(void); +void cM_initRnd__Fiii(void); +void U_GetAtanTable__Fff(void); +void cM_rnd2__Fv(void); +void func_802679D4(void); +} + +// additional symbols needed for c_angle.cpp +// autogenerated by split.py v0.3 at 2020-12-31 13:27:46.812932 +extern "C" { +void Val__7cSGlobeFfss(void); +void Cos__7cSAngleCFv(void); +void Globe__7cSPolarCFP7cSGlobe(void); +// MSL_C.PPCEABI.bare.H::sin +double func_8036C590(double); +void __amu__7cSAngleFf(void); +void Val__7cSPolarFRC4cXyz(void); +void __pl__7cSAngleCFs(void); +void __ct__7cSGlobeFfRC7cSAngleRC7cSAngle(void); +void Abs__7cSAngleCFv(void); +void Val__7cSPolarFfss(void); +void Tan__7cDegreeCFv(void); +void Val__7cSGlobeFRC7cSGlobe(void); +void Xyz__7cSGlobeCFv(void); +void __mi__7cSAngleCFRC7cSAngle(void); +void Val__7cSAngleFRC7cSAngle(void); +void Degree__7cSAngleCFv(void); +void Polar__7cSGlobeCFP7cSPolar(void); +void Radian__7cSAngleCFv(void); +void Val__7cSGlobeFfRC7cSAngleRC7cSAngle(void); +void Formal__7cSGlobeFv(void); +void __ml__7cSAngleCFf(void); +void Xyz__7cSPolarCFv(void); +void __ami__7cSAngleFRC7cSAngle(void); +void Val__7cDegreeFf(void); +void __ct__7cSGlobeFRC7cSGlobe(void); +void Val__7cSGlobeFRC4cXyz(void); +void Invert__7cSGlobeFv(void); +void __apl__7cSAngleFRC7cSAngle(void); +void __apl__7cSAngleFs(void); +void Val__7cSAngleFs(void); +void __ct__7cSPolarFRC4cXyz(void); +void Sin__7cSAngleCFv(void); +void __ct__7cDegreeFf(void); +double func_8036CA54(double); +void Val__7cSAngleFf(void); +void Norm__7cSAngleCFv(void); +void Formal__7cSPolarFv(void); +void Radian__7cDegreeCFv(void); +// MSL_C.PPCEABI.bare.H::cos +double func_8036C028(double); +void __ct__7cSGlobeFfss(void); +void Sin__7cDegreeCFv(void); +void Cos__7cDegreeCFv(void); +void func_80271BD4(void); +void __pl__7cSAngleCFRC7cSAngle(void); +void Formal__7cDegreeFv(void); +void __ct__7cSAngleFf(void); +void Norm__7cSGlobeCFv(void); +void cSAngle_NS_dtor(void); +void __mi__7cSAngleCFv(void); +} + +// additional symbols needed for c_API_controller_pad.cpp +// autogenerated by split.py v0.3 at 2020-12-31 13:48:48.938863 +extern "C" { +void cAPICPad_ANY_BUTTON__FUl(void); +void mDoCPd_c_NS_recalibrate(void); +} + +// additional symbols needed for c_API_graphic.cpp +// autogenerated by split.py v0.3 at 2020-12-31 13:52:43.580987 +extern "C" { +void cAPIGph_BeforeOfDraw__Fv(void); +void cAPIGph_AfterOfDraw__Fv(void); +} + +// additional symbols needed for c_bg_s_chk.cpp +// autogenerated by split.py v0.3 at 2020-12-31 13:59:04.394780 +extern "C" { +void ChkSameActorPid__8cBgS_ChkCFUi(void); +void __ct__8cBgS_ChkFv(void); +void SetExtChk__8cBgS_ChkFR8cBgS_Chk(void); +void __dt__8cBgS_ChkFv(void); +} + +// additional symbols needed for c_bg_s_gnd_chk.cpp +// autogenerated by split.py v0.3 at 2020-12-31 14:10:48.798982 +extern "C" { +void func_80267D54(void); +void __dt__11cBgS_GndChkFv(void); +void PreCheck__11cBgS_GndChkFv(void); +void SetPos__11cBgS_GndChkFPC3Vec(void); +} + +// additional symbols needed for c_bg_s_lin_chk.cpp +// autogenerated by split.py v0.3 at 2021-01-01 12:56:44.690422 +extern "C" { +void Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi(void); +void __dt__11cBgS_LinChkFv(void); +void ct__11cBgS_LinChkFv(void); +void PreCalc__11cBgS_LinChkFv(void); +void __ct__11cBgS_LinChkFv(void); +void func_80267F80(void); +} + +// additional symbols needed for c_bg_s_poly_info.cpp +// autogenerated by split.py v0.3 at 2021-01-01 12:59:59.592477 +extern "C" { +void SetActorInfo__13cBgS_PolyInfoFiPvUi(void); +void SetPolyIndex__13cBgS_PolyInfoFi(void); +void ChkBgIndex__13cBgS_PolyInfoCFv(void); +void ChkSafe__13cBgS_PolyInfoCFPCvUi(void); +void ChkSetInfo__13cBgS_PolyInfoCFv(void); +} + +// additional symbols needed for c_bg_s_shdw_draw.cpp +// autogenerated by split.py v0.3 at 2021-01-01 13:07:28.491346 +extern "C" { +void Set__8cM3dGAabFPC4cXyzPC4cXyz(void); +void SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i(void); +void __ct__13cBgS_ShdwDrawFv(void); +void __dt__13cBgS_ShdwDrawFv(void); +void Set__13cBgS_ShdwDrawFR4cXyzR4cXyz(void); +} + +// additional symbols needed for c_cc_d.cpp +// autogenerated by split.py v0.3 at 2021-01-01 13:13:18.270964 +extern "C" { +void CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CpsAttrP4cXyz(void); +void CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CylAttrP4cXyz(void); +void getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape(void); +void Set__8cCcD_ObjFRC11cCcD_SrcObj(void); +void CrossAtTg__12cCcD_SphAttrCFRC12cCcD_TriAttrP4cXyz(void); +void func_80264A54(void); +void PlusR__8cM3dGAabFf(void); +void Init__9cCcD_SttsFiiPvUi(void); +void CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CpsAttrP4cXyz(void); +void GetGStts__9cCcD_SttsCFv(void); +void cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec(void); +void CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CylAttrP4cXyz(void); +void ct__18cCcD_ObjCommonBaseFv(void); +void func_80264A4C(void); +void ClrHit__10cCcD_ObjCoFv(void); +void ClrHit__10cCcD_ObjAtFv(void); +void CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz(void); +void CrossCo__12cCcD_CpsAttrCFRC12cCcD_SphAttrPf(void); +void cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylPf(void); +void ClearForMinMax__8cM3dGAabFv(void); +void ct__8cCcD_ObjFv(void); +void CrossCo__12cCcD_SphAttrCFRC12cCcD_CpsAttrPf(void); +void GetNVec__12cCcD_SphAttrCFRC4cXyzP4cXyz(void); +void CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl(void); +void cCcD_CpsAttr_NS_dtor(void); +void ClrAt__9cCcD_SttsFv(void); +void CrossAtTg__12cCcD_SphAttrCFRC12cCcD_SphAttrP4cXyz(void); +void cCcD_Stts_NS_PlusDmg(void); +void CalcAabBox__12cCcD_TriAttrFv(void); +void SetHit__10cCcD_ObjCoFP8cCcD_Obj(void); +void CrossAtTg__12cCcD_CylAttrCFRC12cCcD_TriAttrP4cXyz(void); +void CrossCo__12cCcD_CylAttrCFRC12cCcD_CpsAttrPf(void); +void cCcD_CylAttr_NS_dtor(void); +void CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_TriAttrP4cXyz(void); +void cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec(void); +void func_80264A64(void); +void CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CylAttrP4cXyz(void); +void CrossAtTg__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrP4cXyz(void); +void CrossCo__12cCcD_SphAttrCFRC12cCcD_SphAttrPf(void); +void CrossCo__12cCcD_CpsAttrCFRC12cCcD_CylAttrPf(void); +void Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt(void); +void CalcAabBox__12cCcD_SphAttrFv(void); +void cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec(void); +void getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape(void); +void cross__8cM3dGCylCFPC8cM3dGCylP4cXyz(void); +void CrossAtTg__12cCcD_TriAttrCFRC12cCcD_TriAttrP4cXyz(void); +void CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab(void); +void SetHit__10cCcD_ObjAtFP8cCcD_Obj(void); +void Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo(void); +void Set__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf(void); +void cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec(void); +void CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CylAttrP4cXyz(void); +void CrossAtTg__12cCcD_CylAttrCFRC12cCcD_SphAttrP4cXyz(void); +void GetGStts__9cCcD_SttsFv(void); +void cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPf(void); +void cross__8cM3dGSphCFPC8cM3dGSphP4cXyz(void); +void cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec(void); +void cCcD_SphAttr_NS_dtor(void); +void SetHit__10cCcD_ObjTgFP8cCcD_Obj(void); +void getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape(void); +void ClrTg__9cCcD_SttsFv(void); +void cross__8cM3dGTriCFPC8cM3dGCylP3Vec(void); +void CrossAtTg__12cCcD_TriAttrCFRC12cCcD_SphAttrP4cXyz(void); +void Ct__9cCcD_SttsFv(void); +void SetGrp__10cCcD_ObjTgFUl(void); +void CrossCo__12cCcD_CpsAttrCFRC12cCcD_CpsAttrPf(void); +void func_80264A5C(void); +void CalcAabBox__12cCcD_CpsAttrFv(void); +void SetArea__15cCcD_DivideAreaFRC8cM3dGAab(void); +void CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CpsAttrP4cXyz(void); +void SetMinMax__8cM3dGAabFRC4cXyz(void); +void PlusCcMove__9cCcD_SttsFfff(void); +void GetNVec__12cCcD_CpsAttrCFRC4cXyzP4cXyz(void); +void CalcAabBox__12cCcD_CylAttrFv(void); +void cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec(void); +void GetWeightF__9cCcD_SttsCFv(void); +void CrossCo__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrPf(void); +void cross__8cM3dGCylCFPC8cM3dGSphP4cXyz(void); +void __sinit_c_cc_d_cpp(void); +void CrossCo__12cCcD_SphAttrCFRC12cCcD_CylAttrPf(void); +void ClrHit__10cCcD_ObjTgFv(void); +void Set__15cCcD_DivideInfoFUlUlUl(void); +void cross__8cM3dGSphCFPC8cM3dGCylP4cXyz(void); +void GetNVec__12cCcD_TriAttrCFRC4cXyzP4cXyz(void); +void GetNVec__12cCcD_CylAttrCFRC4cXyzP4cXyz(void); +void __dt__12cCcD_TriAttrFv(void); +void GetAc__8cCcD_ObjFv(void); +void CrossCo__12cCcD_CylAttrCFRC12cCcD_CylAttrPf(void); +void CrossCo__12cCcD_CylAttrCFRC12cCcD_SphAttrPf(void); +void cM3d_Cross_TriTri__FRC8cM3dGTriRC8cM3dGTriP3Vec(void); +void CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_SphAttrP4cXyz(void); +void cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf(void); +void Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg(void); +} + +// additional symbols needed for c_cc_s.cpp +// autogenerated by split.py v0.3 at 2021-01-01 13:55:15.722404 +extern "C" { +void Move__4cCcSFv(void); +void ChkNoHitGAtTg__4cCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts(void); +void SetCoGObjInf__4cCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts( + void); +void ChkCo__4cCcSFv(void); +void ChkNoHitCo__4cCcSFP8cCcD_ObjP8cCcD_Obj(void); +void DrawClear__4cCcSFv(void); +void SetMinMax__8cM3dGAabFRC8cM3dGAab(void); +void SetAtTgGObjInf__4cCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz( + void); +void SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf(void); +void ChkAtTgHitAfterCross__4cCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts( + void); +void ClrCoHitInf__4cCcSFv(void); +void SetPosCorrect__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf(void); +void CalcTgPlusDmg__4cCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts(void); +void SetCoGCorrectProc__4cCcSFP8cCcD_ObjP8cCcD_Obj(void); +void MoveAfterCheck__4cCcSFv(void); +void CalcCenter__8cM3dGAabCFP4cXyz(void); +void ClrAtHitInf__4cCcSFv(void); +void ChkNoHitGCo__4cCcSFP8cCcD_ObjP8cCcD_Obj(void); +void GetWt__4cCcSCFUc(void); +void SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz(void); +void ChkAtTg__4cCcSFv(void); +void ClrTgHitInf__4cCcSFv(void); +void CalcArea__4cCcSFv(void); +void Ct__4cCcSFv(void); +void ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj(void); +void Dt__4cCcSFv(void); +} + +// additional symbols needed for c_lib.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:12:11.765814 +extern "C" { +void cLib_addCalcPosXZ__FP4cXyzRC4cXyzfff(void); +void cLib_targetAngleY__FRC3VecRC3Vec(void); +void cLib_addCalc0__FPfff(void); +void __eq__4cXyzCFRC3Vec(void); +void cLib_memSet__FPviUl(void); +void MtxPush__Fv(void); +void cLib_offsetPos__FP4cXyzPC4cXyzsPC4cXyz(void); +void MtxTrans__FfffUc(void); +void MtxScale__FfffUc(void); +void MtxPull__Fv(void); +void cLib_chasePosXZ__FP4cXyzRC4cXyzf(void); +void cLib_addCalc2__FPffff(void); +void cLib_targetAngleX__FPC4cXyzPC4cXyz(void); +void __ne__4cXyzCFRC3Vec(void); +void MtxPosition__FP4cXyzP4cXyz(void); +void cLib_addCalcPos2__FP4cXyzRC4cXyzff(void); +void cLib_addCalcPosXZ2__FP4cXyzRC4cXyzff(void); +void cLib_addCalcAngleS2__FPssss(void); +} + +// additional symbols needed for c_m2d.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:23:08.024598 +extern "C" { +void cM2d_CrossCirLin__FR8cM2dGCirffffPfPf(void); +} + +// additional symbols needed for c_m3d_g_aab.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:25:53.397929 +extern "C" { +void SetMax__8cM3dGAabFRC4cXyz(void); +void CrossY__8cM3dGAabCFPC4cXyz(void); +void TopPlaneYUnder__8cM3dGAabCFf(void); +void UnderPlaneYUnder__8cM3dGAabCFf(void); +void SetMin__8cM3dGAabFRC4cXyz(void); +} + +// additional symbols needed for c_m3d_g_cir.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:33:18.200707 +extern "C" { +void __ct__8cM3dGCirFv(void); +void __dt__8cM3dGCirFv(void); +void Set__8cM3dGCirFffff(void); +void __dt__8cM2dGCirFv(void); +} + +// additional symbols needed for c_m3d_g_cps.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:41:13.420999 +extern "C" { +void Set__8cM3dGCpsFRC4cXyzRC4cXyzf(void); +void Set__8cM3dGCpsFRC9cM3dGCpsS(void); +void SetCps__8cM3dGCpsFRC8cM3dGCps(void); +void SetStartEnd__8cM3dGLinFRC3VecRC3Vec(void); +} + +// additional symbols needed for c_m3d_g_cyl.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:45:46.600418 +extern "C" { +void calcMinMax__8cM3dGCylFP4cXyzP4cXyz(void); +void cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylP3Vec(void); +void cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf(void); +void Set__8cM3dGCylFRC4cXyzff(void); +} + +// additional symbols needed for c_m3d_g_lin.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:48:45.519386 +extern "C" { +void SetEnd__8cM3dGLinFRC4cXyz(void); +void CalcPos__8cM3dGLinCFP3Vecf(void); +} + +// additional symbols needed for c_m3d_g_pla.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:50:54.809865 +extern "C" { +void SetupNP__8cM3dGPlaFRC3VecRC3Vec(void); +void getCrossY__8cM3dGPlaCFRC4cXyzPf(void); +void SetupNP0__8cM3dGPlaFRC3VecRC3Vec(void); +void Set__8cM3dGPlaFPC8cM3dGPla(void); +void cM3d_InDivPos2__FPC3VecPC3VecfP3Vec(void); +void getCrossYLessD__8cM3dGPlaCFRC3VecPf(void); +} + +// additional symbols needed for c_m3d_g_sph.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:53:31.074671 +extern "C" { +void GetMinMaxCube__8cM3dGSphCFR4cXyzR4cXyz(void); +void Set__8cM3dGSphFRC9cM3dGSphS(void); +void cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphP3Vec(void); +} + +// additional symbols needed for c_m3d_g_tri.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:55:53.593433 +extern "C" { +void cM3d_CalcPla__FPC3VecPC3VecPC3VecP3VecPf(void); +void setBg__8cM3dGTriFPC3VecPC3VecPC3VecPC8cM3dGPla(void); +void set__8cM3dGTriFPC3VecPC3VecPC3VecPC3Vec(void); +void setPos__8cM3dGTriFPC3VecPC3VecPC3Vec(void); +} + +// additional symbols needed for c_m3d.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:58:46.459273 +extern "C" { +void cM3d_CalcVecAngle__FRC3VecPsPs(void); +void cM3d_Cross_SphPnt__FPC8cM3dGSphPC3Vec(void); +void cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb(void); +void cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPf(void); +void cM3d_lineVsPosSuisenCross__FPC8cM3dGLinPC3VecP3Vec(void); +void __sinit_c_m3d_cpp(void); +void cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec(void); +void cM3d_Cross_LinTri_Easy__FPC8cM3dGTriPC3Vec(void); +void cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec(void); +void cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf(void); +void cM3d_Cross_AabAab__FPC8cM3dGAabPC8cM3dGAab(void); +void cM3d_VectorProduct2d__Fffffff(void); +void cM3d_PlaneCrossLineProcWork__FfffffffPfPf(void); +void __ct__8cM3dGLinFRC4cXyzRC4cXyz(void); +void cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vec(void); +void cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin(void); +void cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec(void); +void cM3d_CrossZ_LinTri_proc__FPC8cM3dGTriPC3Vec(void); +void cM3d_CrawVec__FRC3VecRC3VecP3Vec(void); +void cM3d_CrossY_Tri__FRC3VecRC3VecRC3VecRC8cM3dGPlaPC3Vec(void); +void cM3d_InDivPos1__FPC3VecPC3VecfP3Vec(void); +void cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vecf(void); +void cM3d_lineVsPosSuisenCross__FRC3VecRC3VecRC3VecP3Vec(void); +void cM3d_InclusionCheckPosIn3PosBox3d__FPC3VecPC3VecPC3VecPC3Vecf(void); +void cM3d_Cross_MinMaxBoxLine__FPC3VecPC3VecPC3VecPC3Vec(void); +void cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff(void); +void cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf(void); +void cM3d_Cross_LinSph__FPC8cM3dGLinPC8cM3dGSphP3Vec(void); +void cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf(void); +void cM3d_CrossY_Tri_Front__FRC3VecRC3VecRC3VecPC3Vec(void); +void cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vecf(void); +void cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPC10cM3d_RangePf(void); +void cM3d_Cross_AabCyl__FPC8cM3dGAabPC8cM3dGCyl(void); +void cM3d_CrossY_LinTri_proc__FPC8cM3dGTriPC3Vec(void); +void cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec(void); +void cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec(void); +void cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb(void); +void cM3d_CrossX_LinTri_proc__FPC8cM3dGTriPC3Vec(void); +void cM3d_2PlaneLinePosNearPos__FRC8cM3dGPlaRC8cM3dGPlaPC3VecP3Vec(void); +void cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec(void); +void cM3d_VectorProduct__FPC4cXyzPC4cXyzPC4cXyzP4cXyz(void); +void cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec(void); +void cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vec(void); +void cM3d_CalcVecZAngle__FRC3VecP5csXyz(void); +void cM3d_Cross_AabSph__FPC8cM3dGAabPC8cM3dGSph(void); +void cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf(void); +void cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vec(void); +void cM3d_Len2dSq__Fffff(void); +} + +// additional symbols needed for c_malloc.cpp +// autogenerated by split.py v0.3 at 2021-01-01 15:18:22.738527 +extern "C" { +void init__3cMlFP7JKRHeap(void); +void free__3cMlFPv(void* pPtr); +void* memalignB__3cMlFiUl(int pAlign, u32 pSize); +} + +// additional symbols needed for c_request.cpp +// autogenerated by split.py v0.3 at 2021-01-01 15:27:56.858531 +extern "C" { +void cReq_Is_Done__FP18request_base_class(void); +void cReq_Done__FP18request_base_class(void); +void cReq_Create__FP18request_base_classUc(void); +void cReq_Command__FP18request_base_classUc(void); +} + +// additional symbols needed for c_sxyz.cpp +// autogenerated by split.py v0.3 at 2021-01-01 15:36:38.121567 +extern "C" { +void __ml__5csXyzFf(void); +void __sinit_c_sxyz_cpp(void); +void __mi__5csXyzFR5csXyz(void); +void __pl__5csXyzFR5csXyz(void); +void __apl__5csXyzFR5csXyz(void); +} + +// additional symbols needed for c_xyz.cpp +// autogenerated by split.py v0.3 at 2021-01-01 15:42:30.569970 +extern "C" { +void __sinit_c_xyz_cpp(void); +void normZC__4cXyzCFv(void); +void isZero__4cXyzCFv(void); +void __ml__4cXyzCFRC3Vec(void); +void getCrossProduct__4cXyzCFRC3Vec(void); +void normalizeRS__4cXyzFv(void); +} + // additional symbols needed for d_meter2_draw.cpp // autogenerated by split.py v0.3 at 2021-01-02 00:12:18.355359 extern "C" { @@ -3984,7 +4439,7 @@ void J2DPicture_X3_(void); void dMeter2Draw_c_NS_init(void); void dMeter2Draw_c_NS_drawLife(void); void dMeter2Info_c_NS_getStringKana(void); -void cLib_addCalc2(void); +void cLib_addCalc2__FPffff(void); void dMeter2Draw_c_NS_initLightDrop(void); void dMsgObject_c_NS_isHowlMessage(void); void J2DPane_NS_getGlbVtx(void); @@ -4446,7 +4901,7 @@ void SNOW_EFF(void); void dKyw_Sunlenz_Draw(void); void dKyw_Star_Draw(void); void dKyw_wether_delete(void); -void cXyz_NS___ne(void); +void __ne__4cXyzCFRC3Vec(void); void cloud_shadow_move(void); void dKyr_shstar_move(void); void func_800570AC(void); @@ -4600,7 +5055,6 @@ void dKy_GxFog_set(void); void GXSetZCompLoc(void); void dKyr_moon_arrival_check(void); void dKy_set_vrboxcol_ratio(void); -void func_8036C590(void); void dBgS_CamGndChk_Wtr_NS_dtor(void); void func_8006F160(void); void dBgS_ObjGndChk_All_NS_dtor(void); @@ -4633,12 +5087,10 @@ void dKy_daynight_check(void); void GXLoadTexMtxImm(void); void dKy_addcol_fog_set(void); void dKy_bg1_addcol_amb_set(void); -void func_8036CA54(void); void rain_bg_chk(void); void Z2EnvSeMgr_NS_startNearThunderSe(void); void dKr_cullVtx_Set(void); void overhead_bg_chk(void); -void func_8036C028(void); void cM3d_VectorProduct2d(void); void dCcMassS_Mng_NS_Prepare(void); } @@ -4826,13 +5278,13 @@ void cSGlobe_NS_U(void); void dCamera_c_NS_jutOutCheck(void); void std_NS_fabsf(void); void dBgS_NS_GetRoomCamId(void); -void cSAngle_NS_Norm(void); +void Norm__7cSAngleCFv(void); void cSAngle_NS_dtor(void); void dCamParam_c_NS_Change(void); void cSAngle_NS___as(void); void func_8016E4F4(void); void cXyz_NS___apl(void); -void cSAngle_NS___ami(void); +void __ami__7cSAngleFRC7cSAngle(void); void dCamera_c_NS_setUSOAngle(void); void dCamera_c_NS_infoReport(void); void dCamMath_NS_xyzHorizontalDistance(void); @@ -4858,11 +5310,11 @@ void dCamMath_NS_xyzRotateX(void); void dCamera_c_NS_onHorseDush(void); void dCamParam_c_NS_Val(void); void dComIfG_Bgsp(void); -void cSGlobe_X3_(void); +void __ct__7cSGlobeFfRC7cSAngleRC7cSAngle(void); void dCamera_c_NS_GetForceLockOnActor(void); void dCamera_c_NS_popInfo(void); void dCcS_NS_chkCameraPoint(void); -void cM3d_2PlaneLinePosNearPos(void); +void cM3d_2PlaneLinePosNearPos__FRC8cM3dGPlaRC8cM3dGPlaPC3VecP3Vec(void); void dCamera_c_NS_radiusActorInSight(void); void func_801824C0(void); void dCamera_c_NS_blureCamera(void); @@ -4873,7 +5325,7 @@ void daPy_py_c_NS_checkThrowDamage(void); void std_NS_fabs(void); void dCamera_c_NS_Bank(void); void dCamera_c_NS_clrFlag(void); -void cSAngle_NS_Cos(void); +void Cos__7cSAngleCFv(void); void dDlst_window_c_NS_setViewPort(void); void dCcMassS_Mng_NS_SetCam(void); void dCamera_c_NS_getUSOAngle(void); @@ -4894,11 +5346,11 @@ void func_80176E00(void); void dCamera_c_NS_setEventRecoveryTrans(void); void func_80181F70(void); void cSAngle_NS___lt(void); -void cSAngle_NS_Val_X2_(void); +void Val__7cSAngleFs(void); void dCamera_c_NS_checkGroundInfo(void); void cCcD_ShapeAttr_NS_Shape_NS_dtor(void); void dCamera_c_NS_V(void); -void cSGlobe_NS_Val_X1_(void); +void Val__7cSGlobeFRC7cSGlobe(void); // void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(void); void mDoGph_gInf_c_NS_onBlure(void); void func_80182454(void); @@ -4907,25 +5359,25 @@ void dAttention_c_NS_keepLock(void); void d2DBSplinePath_NS_Spot(void); void func_80181ECC(void); void dCamera_c_NS_getMsgCmdCut(void); -void cDegree_NS_Cos(void); +void Cos__7cDegreeCFv(void); void dEvent_manager_c_NS_getMyActIdx(void); void dCamera_c_NS_StartShake(void); void dCamSetup_c_NS_ThrowVAngle(void); -void cM3d_Cross_CylLin(void); +void cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec(void); void mDoMtx_stack_c_NS_scaleM_X1_(void); -void cSAngle_X3_(void); +void __ct__7cSAngleFf(void); void _unnamed_d_camera_cpp__NS_defaultRadius(void); void dCamera_c_NS__class_3665d_camera_cpp(void); void dCamera_c_NS_getEvFloatData(void); void dCamera_c_NS_pointInSight(void); void func_80180C18(void); -void cDegree_NS_Tan(void); +void Tan__7cDegreeCFv(void); void dCamera_c_NS_talkEyePos(void); void dCamera_c_NS_tooNearEscape(void); void dCamera_c_NS_nextType(void); void fopAcM_GetParam(void); void dCamera_c_NS_chaseCamera(void); -void cSGlobe_NS_Val_X2_(void); +void Val__7cSGlobeFfss(void); void dCamera_c_NS_Set_X1_(void); void dBgS_PolyPassChk_NS_SetUnderwaterRoof(void); void dCamera_c_NS_initialize(void); @@ -4934,9 +5386,9 @@ void dCamera_c_NS_setView(void); void _unnamed_d_camera_cpp__NS_check_owner_action(void); void dDlst_effectLine_c_NS_update(void); void dCamSetup_c(void); -void cXyz_NS___ml_X1_(void); +void __ml__4cXyzCFRC3Vec(void); void dCamParam_c_NS_Arg1(void); -void cSGlobe_NS_Xyz(void); +void Xyz__7cSGlobeCFv(void); void dCamera_c_NS_heightOf(void); void dCamera_c_NS_onRoomChange(void); void dCcMassS_Mng_NS_GetCamTopPos(void); @@ -4947,14 +5399,14 @@ void dCamForcusLine_NS_Draw(void); void daTagMwait_c_NS_checkEndMessage(void); void dAttention_c_NS_LockEdge(void); void view_setup(void); -void cSAngle_NS___ml(void); +void __ml__7cSAngleCFf(void); void dCamSetup_c_NS_ChargeBRatio(void); void func_801815F0(void); void dCamera_c_NS_dCamInfo_c(void); void dCamera_c_NS_shakeCamera(void); void func_801827EC(void); void daTagMhint_c_NS_checkNoAttention(void); -void cM3dGLin_NS_SetStartEnd_X1_(void); +void SetStartEnd__8cM3dGLinFRC3VecRC3Vec(void); void dCamMapToolData_NS_Set(void); void dCamera_c_NS_bumpCheck(void); void dCamForcusLine_NS_Init(void); @@ -4985,7 +5437,7 @@ void dBgS_SphChk(void); void _unnamed_d_camera_cpp__NS_sAngleY(void); void dComIfGp_evmng_cameraPlay(void); void dCamera_c_NS_getEvIntData_X1_(void); -void cSGlobe_X2_(void); +void __ct__7cSGlobeFfss(void); void dCamera_c_NS_eventCamera(void); void func_801811B8(void); void _unnamed_d_camera_cpp__NS_posInLine2D(void); @@ -5006,7 +5458,7 @@ void cSGlobe_NS_U_X1_(void); void dComIfGp_getRoomArrow(void); void dCamera_c_NS_Up(void); void dCamera_c_NS_compWallMargin(void); -void cSAngle_NS_Degree(void); +void Degree__7cSAngleCFv(void); void cSAngle_NS___gt(void); void dCamera_c_NS_SetBlureScale(void); void mDoMtx_lookAt_X1_(void); @@ -5019,8 +5471,8 @@ void dCamMath_NS_rationalBezierRatio(void); void dCamera_c_NS_getEvIntData(void); void dCamera_c_NS_GetCameraTypeFromMapToolID(void); void cAngle_NS_d2s(void); -void cSAngle_NS_Sin(void); -void cSAngle_NS_Val_X3_(void); +void Sin__7cSAngleCFv(void); +void Val__7cSAngleFf(void); void daPy_py_c_NS_getThrowBoomerangActor(void); void daPy_py_c_NS_checkCopyRodThrowAfter(void); void func_80176074(void); @@ -5036,14 +5488,13 @@ void dCamera_c_NS__class_3665d_camera_cpp_NS_dtor(void); void func_80182484(void); void dCamForcusLine_NS_Off(void); void func_801767F8(void); -void cSAngle_NS_Abs(void); +void Abs__7cSAngleCFv(void); void dCamera_c_NS_getEvActor_X1_(void); void dCamera_c_NS_getMsgCmdSpeaker(void); void func_80174ED4(void); void func_8017ADC0(void); void dCamera_c_NS_Reset(void); -void cSAngle_NS___apl(void); -void cDegree(void); +void __apl__7cSAngleFRC7cSAngle(void); void dCamSetup_c_NS_dtor(void); void daAlink_getAlinkActorClass(void); void dCamera_c_NS_U(void); @@ -5052,7 +5503,7 @@ void dCamera_c_NS_directionOf(void); void daPy_py_c_NS_getRightFootPosP(void); void _unnamed_d_camera_cpp__NS_isPlayerFlying(void); void _unnamed_d_camera_cpp__NS_is_player(void); -void cSAngle_NS___pl(void); +void __pl__7cSAngleCFRC7cSAngle(void); void cM3dGPla_NS_GetNP(void); void dCamera_c_NS_forwardCheckAngle(void); void dCamParam_c_NS_Fovy_X1_(void); @@ -5063,7 +5514,7 @@ void dCam_getCamera(void); void func_80180B40(void); void func_8017DFAC(void); void dCamera_c_NS_updateMonitor(void); -void cSPolar_NS_Xyz(void); +void Xyz__7cSPolarCFv(void); void func_8017D974(void); void cSGlobe_NS_R(void); void _unnamed_d_camera_cpp__NS_isPlayerCharging(void); @@ -5084,7 +5535,7 @@ void dComIfGs_isTmpBit(void); void fopAcM_GetID(void); void func_8018050C(void); void dCamera_c_NS_pushInfo(void); -void cSAngle_NS___apl_X1_(void); +void __apl__7cSAngleFs(void); void dCamera_c_NS_onStyleChange(void); void dCamSetup_c_NS_WaitRollTimer(void); void daHorse_c_NS_checkJump(void); @@ -5092,7 +5543,7 @@ void _unnamed_d_camera_cpp__NS_check_owner_action1(void); void func_8017A2A0(void); void dCstick_c_NS_Shift(void); void dCamParam_c_NS_Arg2(void); -void cSAngle_NS___amu(void); +void __amu__7cSAngleFf(void); void cXyz_NS___ami(void); void dBgS_CamLinChk_NS_dtor(void); void dCamera_c_NS_SetBlureActor(void); @@ -5111,19 +5562,19 @@ void func_8017E730(void); void func_80178E50(void); void dCamera_c_NS_SetBlurePosition(void); void dCcMassS_Mng_NS_GetResultCam(void); -void cSAngle_NS_Val_X1_(void); -void cSAngle_NS___mi_X1_(void); +void Val__7cSAngleFRC7cSAngle(void); +void __mi__7cSAngleCFRC7cSAngle(void); void dCamera_c_NS_onTypeChange(void); void func_80174EAC(void); void mDoGph_gInf_c_NS_onBlure_X1_(void); -void cM3dGCps_NS_Set(void); +void Set__8cM3dGCpsFRC4cXyzRC4cXyzf(void); void dCamParam_c_NS_Flag(void); void dCamera_c_NS_initMonitor(void); void dCamera_c_NS_setStageMapToolData(void); void dCamera_c_NS_push_any_key(void); void dCamParam_c_NS_Arg1_X1_(void); -void cSGlobe_NS_Val_X3_(void); -void cSGlobe_X1_(void); +void Val__7cSGlobeFfRC7cSAngleRC7cSAngle(void); +void __ct__7cSGlobeFRC7cSGlobe(void); void cXyz_NS_set(void); void fopCamM_GetParam(void); void dCamera_c_NS_lineBGCheck_X2_(void); @@ -5134,11 +5585,11 @@ void daPy_py_c_NS_getLeftFootPosP(void); void func_8017F25C(void); void daHorse_c_NS_checkTurnStandCamera(void); void fopAcM_searchFromName4Event(void); -void cSAngle_NS___pl_X1_(void); +void __pl__7cSAngleCFs(void); void mDoLib_clipper_NS_setup(void); void cSGlobe_NS_V_X1_(void); void dCamera_c_NS_Run(void); -void cM3d_Len3dSqPntAndSegLine(void); +void cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf(void); void dCamera_c_NS_lineBGCheck(void); void dCamera_c_NS_onModeChange(void); void d2DBSplinePath_NS_Init(void); @@ -5151,7 +5602,7 @@ void sph_chk_callback(void); void daAlink_c_NS_checkCokkoGlide(void); void dCamera_c_NS_chkFlag(void); void _unnamed_d_camera_cpp__NS_relationalPos2(void); -void cSGlobe_NS_Invert(void); +void Invert__7cSGlobeFv(void); void dCamera_c_NS_getWaterSurfaceHeight(void); void dCamParam_c_NS_Arg0_X1_(void); void dCamera_c_NS_Eye(void); @@ -5164,22 +5615,27 @@ void dCamMath_NS_zoomFovy(void); void func_801821E0(void); void dBgS_PolyPassChk_NS_ClrCam(void); void cM_rnd_c_NS_init(void); -void cM3d_Cross_LinSph_CrossPos(void); +void cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec(void); // manual -void cXyz_NS_norm(void); -void cM3dGLin(void); -void cM3dGSph_NS_Set(void); -void cSAngle_NS___mi(void); +void norm__4cXyzCFv(void); +void __ct__8cM3dGLinFRC4cXyzRC4cXyz(void); +void Set__8cM3dGSphFRC9cM3dGSphS(void); +void __mi__7cSAngleCFRC7cSAngle(void); void __ct__8cM3dGCylFPC4cXyzff(void); void __ct__7cSAngleFv(void); -void cXyz_NS___pl(void); -void cSAngle_NS___pl_short(void); // c_angle.o -void cSAngle_NS___mi_short(void); -void cSGlobe(void); +void __pl__4cXyzCFRC3Vec(void); +void __pl__7cSAngleCFs(void); // c_angle.o +void __mi__7cSAngleCFs(void); +void __ct__7cSGlobeFRC7cSGlobe(void); +void __ct__7cSGlobeFv(void); void mDoMtx_stack_c_NS_transM(float, float, float); void setCameraPolygonPos__11Z2StatusMgrFP3Vec(Vec*); void setCameraGroupInfo__11Z2StatusMgrFUc(u8); -}
\ No newline at end of file + +void Set__8cM3dGSphFRC4cXyzf(void); +void __pl__FsRC7cSAngle(void); +void __mi__FsRC7cSAngle(void); +} diff --git a/include/global.h b/include/global.h index 502aa054b4..c413f10e9b 100644 --- a/include/global.h +++ b/include/global.h @@ -11,6 +11,18 @@ #define JUT_ASSERT(...) #define ASSERT(...) +extern float __fabsf(float); + +inline double fabsf(double d) { + return __fabsf(d); +} + +extern float __fsqrte(float); + +inline double sqrt(double d) { + return __fsqrte(d); +} + #include "dolphin/types.h" #include "ar/ARQ.h" diff --git a/include/mtx_vec.h b/include/mtx_vec.h index 394f49ed6e..af9ac0f74a 100644 --- a/include/mtx_vec.h +++ b/include/mtx_vec.h @@ -17,45 +17,45 @@ struct Mtx { extern "C" { void PSMTXIdentity(Mtx* matrix); -void PSMTXCopy(Mtx* src, Mtx* dst); -void PSMTXConcat(Mtx* src_a, Mtx* src_b, Mtx* dst); -u32 PSMTXInverse(Mtx* src, Mtx* dst); +void PSMTXCopy(const Mtx* src, Mtx* dst); +void PSMTXConcat(const Mtx* src_a, const Mtx* src_b, Mtx* dst); +u32 PSMTXInverse(const Mtx* src, Mtx* dst); void PSMTXRotRad(Mtx* matrix, u8 axis, float rad); void PSMTXRotTrig(Mtx* matrix, u8 axis, float sin, float cos); double __PSMTXRotAxisRadInternal(double param_1, double param_2, int param_3, int param_4); -void PSMTXRotAxisRad(Mtx* matrix, Vec* axis, float rad); +void PSMTXRotAxisRad(Mtx* matrix, const Vec* axis, float rad); void PSMTXTrans(Mtx* matrix, float x_trans, float y_trans, float z_trans); -void PSMTXTransApply(Mtx* src, Mtx* dst, float x, float y, float z); +void PSMTXTransApply(const Mtx* src, Mtx* dst, float x, float y, float z); void PSMTXScale(Mtx* matrix, float x_scale, float y_scale, float z_scale); -void PSMTXScaleApply(Mtx* src, Mtx* dst, float x_scale, float y_scale, float z_scale); -void PSMTXQuat(Mtx* matrix, Quaternion* quat); -void C_MTXLookAt(float* param_1, float* param_2, Vec* param_3, float* param_4); +void PSMTXScaleApply(const Mtx* src, Mtx* dst, float x_scale, float y_scale, float z_scale); +void PSMTXQuat(Mtx* matrix, const Quaternion* quat); +void C_MTXLookAt(Mtx* param_1, const Vec* param_2, const Vec* param_3, const Vec* param_4); void C_MTXLightPerspective(Mtx* matrix, float fov_y, float aspect, float scale_s, float scale_t, float trans_s, float trans_t); void C_MTXLightOrtho(Mtx* matrix, float top, float bottom, float left, float right, float scale_s, float scale_t, float trans_s, float trans_t); -void PSMTXMultVec(Mtx* matrix, Vec* src, Vec* dst); -void PSMTXMultVecArray(Mtx* matrix, Vec* src, Vec* dst, u32 count); -void PSMTXMultVecSR(Mtx* matrix, Vec* src, Vec* dst); -void PSMTXMultVecArraySR(Mtx* matrix, Vec* src, Vec* dst, u32 count); +void PSMTXMultVec(const Mtx* matrix, const Vec* src, Vec* dst); +void PSMTXMultVecArray(const Mtx* matrix, const Vec* src, Vec* dst, u32 count); +void PSMTXMultVecSR(const Mtx* matrix, const Vec* src, Vec* dst); +void PSMTXMultVecArraySR(const Mtx* matrix, const Vec* src, Vec* dst, u32 count); void C_MTXPerspective(Mtx* matrix, float fov_y, float aspect, float near, float far); void C_MTXOrtho(Mtx* matrix, float top, float bottom, float left, float right, float near, float far); -void PSVECAdd(Vec* src_a, Vec* src_b, Vec* dst); -void PSVECSubtract(Vec* a, Vec* b, Vec* dst); -void PSVECScale(Vec* src, Vec* dst, float scale); -void PSVECNormalize(Vec* src, Vec* dst); -float PSVECSquareMag(Vec* vec); -float PSVECMag(Vec* data); -float PSVECDotProduct(Vec* a, Vec* b); -void PSVECCrossProduct(Vec* src_a, Vec* src_b, Vec* dst); -void C_VECHalfAngle(Vec* incident, Vec* line_of_sight, Vec* out_half); -void C_VECReflect(Vec* src, Vec* surface_normal, Vec* dst); -float PSVECSquareDistance(Vec* a, Vec* b); -float PSVECDistance(Vec* a, Vec* b); -void PSQUATMultiply(Quaternion* src_a, Quaternion* src_b, Quaternion* dst); -void C_QUATRotAxisRad(Quaternion* quat, Vec* axis, float rad); -void C_QUATSlerp(Quaternion* p, Quaternion* q, Quaternion* r, float t); +void PSVECAdd(const Vec* src_a, const Vec* src_b, Vec* dst); +void PSVECSubtract(const Vec* a, const Vec* b, Vec* dst); +void PSVECScale(const Vec* src, Vec* dst, float scale); +void PSVECNormalize(const Vec* src, Vec* dst); +float PSVECSquareMag(const Vec* vec); +float PSVECMag(const Vec* data); +float PSVECDotProduct(const Vec* a, const Vec* b); +void PSVECCrossProduct(const Vec* src_a, const Vec* src_b, Vec* dst); +void C_VECHalfAngle(const Vec* incident, const Vec* line_of_sight, Vec* out_half); +void C_VECReflect(const Vec* src, const Vec* surface_normal, Vec* dst); +float PSVECSquareDistance(const Vec* a, const Vec* b); +float PSVECDistance(const Vec* a, const Vec* b); +void PSQUATMultiply(const Quaternion* src_a, const Quaternion* src_b, Quaternion* dst); +void C_QUATRotAxisRad(Quaternion* quat, const Vec* axis, float rad); +void C_QUATSlerp(const Quaternion* p, const Quaternion* q, Quaternion* r, float t); } #endif
\ No newline at end of file diff --git a/include/variables.h b/include/variables.h index fc26b4957c..6e2831d994 100644 --- a/include/variables.h +++ b/include/variables.h @@ -566,7 +566,6 @@ extern u8 lbl_80453154; extern u8 lbl_8045101C; extern u8 lbl_80453320; extern u8 lbl_804532E4; -extern u8 lbl_80451160; extern u8 lbl_8038E1E0; extern u8 lbl_80453268; extern u8 lbl_80452FD0; @@ -1114,6 +1113,145 @@ extern u8 lbl_804526B0; extern u8 lbl_804526B4; extern u8 lbl_80424B00; +// additional symbols needed for c_bg_s_chk.cpp +// autogenerated by split.py v0.3 at 2020-12-31 13:59:04.376186 +extern u8 lbl_803C3F80; + +// additional symbols needed for c_bg_s_gnd_chk.cpp +// autogenerated by split.py v0.3 at 2020-12-31 14:10:48.795807 +extern u8 lbl_803C3F90; + +// additional symbols needed for c_bg_s_lin_chk.cpp +// autogenerated by split.py v0.3 at 2021-01-01 12:56:44.686018 +extern u8 lbl_803A78F8; +extern u8 lbl_803C3FA8; + +// additional symbols needed for c_bg_s_poly_info.cpp +// autogenerated by split.py v0.3 at 2021-01-01 12:59:59.584225 +extern u8 lbl_803C3FD0; + +// additional symbols needed for c_bg_s_shdw_draw.cpp +// autogenerated by split.py v0.3 at 2021-01-01 13:07:28.433195 +extern u8 lbl_803C3FC0; + +// additional symbols needed for c_cc_d.cpp +// autogenerated by split.py v0.3 at 2021-01-01 13:13:17.720846 +extern u8 lbl_80455020; +extern u8 lbl_8039A7E8; +extern u8 lbl_80455030; +extern u8 lbl_8045501C; +extern u8 lbl_80430CB4; +extern u8 lbl_803ABB84; +extern u8 lbl_80455018; +extern u8 lbl_80430CA8; +extern u8 lbl_80455028; +extern u8 lbl_803C366C; + +// additional symbols needed for c_cc_s.cpp +// autogenerated by split.py v0.3 at 2021-01-01 13:55:15.696568 +extern u8 lbl_80451158; +extern u8 lbl_80455060; +extern u8 lbl_80455048; +extern u8 lbl_80455050; +extern u8 lbl_803A7200; +extern u8 lbl_8045503C; +extern u8 lbl_80430CC0; +extern u8 lbl_80430CCC; +extern u8 lbl_80455068; +extern u8 lbl_80455040; +extern u8 lbl_80455044; +extern u8 lbl_80455038; +extern u8 lbl_803C3748; +extern u8 lbl_80455058; + +// additional symbols needed for c_lib.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:12:11.743911 +extern u8 lbl_804551E8; +extern u8 lbl_80430DB8; +extern u8 lbl_804551F0; +extern u8 lbl_80450768; +extern u8 lbl_804551E0; +extern u8 lbl_804551F8; +extern u8 lbl_80439A20[65536]; // JMath::JMath::sincosTable_ +extern u8 lbl_80455200; + +// additional symbols needed for c_m2d.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:23:08.023070 +extern u8 lbl_80455110; +extern u8 lbl_80455100; +extern u8 lbl_80455108; +extern u8 lbl_804550FC; +extern u8 lbl_804550F8; +extern u8 lbl_804550F4; +extern u8 lbl_804550F0; + +// additional symbols needed for c_m3d_g_aab.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:25:53.390342 +extern u8 lbl_804551D4; +extern u8 lbl_804551D0; +extern u8 lbl_804551D8; + +// additional symbols needed for c_m3d_g_cir.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:33:18.197884 +extern u8 lbl_803C3FEC; +extern u8 lbl_803C3FE0; + +// additional symbols needed for c_m3d_g_cps.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:41:13.414762 +extern u8 lbl_803C3FF8; + +// additional symbols needed for c_m3d.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:58:45.990799 +extern u8 lbl_80455158; +extern u8 lbl_8045513C; +extern u8 lbl_80455180; +extern u8 lbl_80455128; +extern u8 lbl_80455190; +extern u8 lbl_804551BC; +extern u8 lbl_80455168; +extern u8 lbl_804551C8; +extern u8 lbl_804551B8; +extern u8 lbl_80455148; +extern u8 lbl_804551C4; +extern u8 lbl_80455170; +extern u8 lbl_80455150; +extern u8 lbl_80455118; +extern u8 lbl_80455198; +extern u8 lbl_8045519C; +extern u8 lbl_8045515C; +extern u8 lbl_804551A0; +extern u8 lbl_80455174; +extern u8 lbl_80455178; +extern u8 lbl_804551CC; +extern u8 lbl_80450AEC; +extern u8 lbl_8045516C; +extern u8 lbl_80455194; +extern u8 lbl_804551C0; +extern u8 lbl_80455188; +extern u8 lbl_80455164; +extern u8 lbl_804551AC; +extern u8 lbl_8045517C; +extern u8 lbl_80455130; +extern u8 lbl_804551A4; +extern u8 lbl_8045514C; +extern u8 lbl_80455120; +extern u8 lbl_804551B4; +extern u8 lbl_804551A8; +extern u8 lbl_80455138; +extern u8 lbl_80455184; +extern u8 lbl_80455144; +extern u8 lbl_80455140; +extern u8 lbl_8045518C; +extern u8 lbl_80455154; +extern u8 lbl_804551B0; +extern u8 lbl_80455160; + +// additional symbols needed for c_sxyz.cpp +// autogenerated by split.py v0.3 at 2021-01-01 15:36:38.100807 +extern u8 lbl_804550A0; +extern u8 lbl_80451164; +extern u8 lbl_80430DA8; + // additional symbols needed for d_meter2_draw.cpp // autogenerated by split.py v0.3 at 2021-01-02 00:12:18.254960 extern u8 lbl_80454890; |