From ad63244f06faaf566506dfbba2c8c8e71226180c Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 2 Nov 2020 11:05:00 -0500 Subject: start decompiling code_801DD8C0.o --- src/code_801DD5C8.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/code_801DD5C8.cpp') diff --git a/src/code_801DD5C8.cpp b/src/code_801DD5C8.cpp index f91832a..77c8ae3 100644 --- a/src/code_801DD5C8.cpp +++ b/src/code_801DD5C8.cpp @@ -3,6 +3,9 @@ static ctorStruct gUnk8063F348(1, 4, 0); +// gUnkClass7.cpp +// TODO: convert to C++ member functions? + extern "C" { void func_801DD5C8(gUnkClass7* p1, float p2) @@ -69,7 +72,7 @@ void func_801DD5C8(gUnkClass7* p1, float p2) p1->unk6 |= 0x2; } -void func_801DD7FC(gUnkClass7* p1, u32 p2, u32 p3) +void func_801DD7FC(gUnkClass7* p1, void* p2, u32 p3) { if (!p1->unk0 || !(p1->unk6 & 0x2)) return; -- cgit v1.2.3 From 60cfed1d6cfa6e6d0270994e9b8b8fb97468a490 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 5 Nov 2020 23:28:38 -0500 Subject: add two nonmatching ifdefs to code_801DD8C0 --- src/code_801DD5C8.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/code_801DD5C8.cpp') diff --git a/src/code_801DD5C8.cpp b/src/code_801DD5C8.cpp index 77c8ae3..7181c7e 100644 --- a/src/code_801DD5C8.cpp +++ b/src/code_801DD5C8.cpp @@ -12,8 +12,7 @@ void func_801DD5C8(gUnkClass7* p1, float p2) { if (!p1->unk0 || !(p1->unk6 & 0x1) || (p1->unk6 & 0x8)) return; - float f3 = p1->unk8; - p1->unkC += p2 * f3; + p1->unkC += p2 * p1->unk8; if (p1->unkC < 0.0f) { p1->unk6 |= 0x4; switch (p1->unk4) { @@ -32,10 +31,10 @@ void func_801DD5C8(gUnkClass7* p1, float p2) p1->unkC = f2 * (1.0f - f4); } else { p1->unkC = f2 * f4; - p1->unk8 = -f3; + p1->unk8 = -p1->unk8; } } else { - p1->unk8 = -f3; + p1->unk8 = -p1->unk8; } break; default: @@ -57,7 +56,7 @@ void func_801DD5C8(gUnkClass7* p1, float p2) f4 -= r5; if (((r5 & 0x1) ^ ((u32)r5 >> 31 & 0x1)) - ((u32)r5 >> 31 & 0x1) != 0) { float temp = f2 * (1.0f - f4); - p1->unk8 = -f3; + p1->unk8 = -p1->unk8; p1->unkC = temp; } else { p1->unkC = f2 * f4; -- cgit v1.2.3 From 3e5884629d7d078c791a2c8bae9d93042f06dcab Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 6 Nov 2020 20:52:45 -0500 Subject: comments --- src/code_801DD5C8.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/code_801DD5C8.cpp') diff --git a/src/code_801DD5C8.cpp b/src/code_801DD5C8.cpp index 7181c7e..7fb6cc4 100644 --- a/src/code_801DD5C8.cpp +++ b/src/code_801DD5C8.cpp @@ -3,8 +3,7 @@ static ctorStruct gUnk8063F348(1, 4, 0); -// gUnkClass7.cpp -// TODO: convert to C++ member functions? +// gUnkClass7 implementation extern "C" { -- cgit v1.2.3