mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-08-27 00:13:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompiling KURI (#141)

Browse Source 
* feat: begin curry decompiling

* fix: create a cpp type for VecFx32

* fix: build issue

* fix: jp as well

* feat: improve ctor & dtor

* feat: improve matching

* fix: wrong value in animation tag

* feat: add matching bytes

* fix: change signature of Mityno's inline ctor

* fix: change signature of ANOTHER Mityno's inline ctor

* fix: match back function in CANS

* feat: more matching

* fix: build

* feat: increase overall matching

* feat: increase overall matching

* fix: commit to stop infinite task

* fix: better matching

* feat: chagne jp symbols

* feat: delink data and bss of KURI

* fix: use VecFx32 constructor

* fix: build issues
This commit is contained in:
Alessevan
2026-08-24 11:42:52 -04:00
committed by GitHub
parent 473e1e102b
commit f595c06b8d
32 changed files with 1317 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/031_Land/Actor/ActorBomb.cpp
+4 -4
View File
@@ -263,8 +263,8 @@ void ActorBomb::func_ov031_020e1b1c() {
this->mUnk_0F4.func_ov000_020577a4(param1, 0x0, param3);
this->mUnk_0F4.mUnk_08 = 0x1000;
this->mUnk_0F4.mUnk_04 = data_ov031_02112be8.unknown;
this->mUnk_0F4.mUnk_04.mUnk_04 = 0x1000;
this->mUnk_0F4.mUnk_04.mUnk_00 = data_ov031_02112be8.unknown;
this->mUnk_094.func_ov000_02057cf4();
@@ -288,8 +288,8 @@ void ActorBomb::func_ov031_020e1b7c() {
this->func_ov031_020e1b1c();
return;
}
fx32 delta = this->mUnk_1EC - this->mUnk_1EA;
this->mUnk_0F4.mUnk_08 = FLOAT_TO_FX32(1.5f) - delta * FLOAT_TO_FX32(0.01985f);
fx32 delta = this->mUnk_1EC - this->mUnk_1EA;
this->mUnk_0F4.mUnk_04.mUnk_04 = FLOAT_TO_FX32(1.5f) - delta * FLOAT_TO_FX32(0.01985f);
this->mUnk_0F4.func_01ffc3b4();
if (delta > 0x0) {
src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp
+2 -2
View File
@@ -36,7 +36,7 @@ extern "C" void func_020169d4(VecFx32 *, VecFx32 *, unk16 *, const char *);
extern "C" bool func_02016c68(VecFx32 *, VecFx32 *, ActorRef);
extern "C" Actor *func_02016fbc(ActorId, VecFx32 *, unk32);
extern "C" void func_ov000_020578a4(unk32);
extern "C" void func_ov000_020578a4(UnkSystem5 *);
extern "C" void func_ov000_02057c98(ModelRender *, UnkSystem5 *);
static char data_ov031_021135f0[0x4] = "\x00 ";
@@ -1424,7 +1424,7 @@ void ActorUnkZLSL_27CC::vfunc_3C() {
}
void ActorUnkZLSL_27CC::vfunc_38(unk32 param1, unk32 param2) {
func_ov000_020578a4((unk32) this->mUnk_04);
func_ov000_020578a4(this->mUnk_04);
}
s8 ActorUnkZLSL_27CC::vfunc_30() {
src/032_MapA1/Actor/ActorUnkKURI.cpp
+925 -57
View File
@@ -1,7 +1,71 @@
//! TODO: This file was generated automatically and might contain errors
#define VECFX32_CTORS
#include "Actor/ActorUnkKURI.hpp"
#include "Actor/ActorManager.hpp"
#include "Actor/Actor_Derived1.hpp"
#include "System/Random.hpp"
#include "System/SysNew.hpp"
#include "Unknown/UnkStruct_027e09a8.hpp"
#include "Unknown/UnkStruct_027e09c0.hpp"
#include "Unknown/UnkStruct_027e0cec.hpp"
#include "Unknown/UnkStruct_027e0d38.hpp"
#include "nitro/os.h"
extern "C" u16 data_ov000_020aecf4[];
extern "C" unk32 data_ov000_020aecf8;
extern "C" bool func_01ff916c(void *, int, int);
extern "C" unk32 func_01ff9258(fx32, fx32);
extern "C" unk32 func_01ff930c(s16 *, s16, unk32);
extern "C" void func_01ff9318(void *, unk32, unk32);
extern "C" void func_01ff941c(VecFx32 *, VecFx32 *);
extern "C" fx32 func_01ffb428(unk32, unk32);
extern "C" unk32 func_01ffb464(unk32 param1);
extern "C" fx32 func_01ffb66c(unk32, unk32);
extern "C" fx16 func_01ffbbe0(fx32, fx32);
extern "C" void func_01ffc634(ModelRender *, VecFx32 *, UnkAngleStruct, VecFx32 *);
extern "C" bool func_02016ae0(VecFx32 *, VecFx32 *, UnkAngleStruct, unk32, unk32);
extern "C" Actor *func_02016fbc(ActorId, VecFx32 *, unk32);
extern "C" bool func_ov000_0205adfc(VecFx32 *, VecFx32 *);
extern "C" void func_ov000_020986b4(s16 *param1, Actor_Derived2 *param2, unk32 param3);
extern "C" void func_ov017_020c2438(unk32 *, unk32, VecFx32 *, unk32, unk32);
extern "C" void func_ov017_020c26f8(unk32, VecFx32 *, unk32, unk32);
static const VecFx32 data_ov032_02122160(FLOAT_TO_FX32(1.7f), FLOAT_TO_FX32(0.5f), FLOAT_TO_FX32(1.7f));
static ActorUnkZLSL_AnimationTag data_ov032_02122184 = {.index = 0, .name = "walk", .unknown = 0x0};
static ActorUnkZLSL_AnimationTag data_ov032_0212219c = {.index = 1, .name = "discover", .unknown = 0x1};
static ActorUnkZLSL_AnimationTag data_ov032_0212216c = {.index = 0, .name = "KURI", .unknown = 0x1};
static PTMF<ActorUnkKURI> data_ov032_02122288[ActorUnkKURIState_Max] = {
ActorUnkKURI::func_ov032_02119a0c, // ActorUnkKURIState_0
ActorUnkKURI::func_ov032_02119c80, // ActorUnkKURIState_1
ActorUnkKURI::func_ov032_02119df4, // ActorUnkKURIState_2
ActorUnkKURI::func_ov032_02119f40, // ActorUnkKURIState_3
ActorUnkKURI::func_ov032_0211a20c, // ActorUnkKURIState_4
ActorUnkKURI::func_ov032_0211a52c, // ActorUnkKURIState_5
ActorUnkKURI::func_ov032_0211a86c, // ActorUnkKURIState_6
ActorUnkKURI::func_ov032_0211aac8, // ActorUnkKURIState_7
ActorUnkKURI::func_ov032_0211abc0, // ActorUnkKURIState_8
ActorUnkKURI::func_ov032_0211a9c8, // ActorUnkKURIState_9
ActorUnkKURI::func_ov032_0211ac94, // ActorUnkKURIState_10
ActorUnkKURI::func_ov032_0211adf4 // ActorUnkKURIState_11
};
static PTMF<ActorUnkKURI> data_ov032_02122348[ActorUnkKURIState_Max] = {
ActorUnkKURI::func_ov032_02119990, // ActorUnkKURIState_0
ActorUnkKURI::func_ov032_02119be8, // ActorUnkKURIState_1
ActorUnkKURI::func_ov032_02119d7c, // ActorUnkKURIState_2
ActorUnkKURI::func_ov032_02119e90, // ActorUnkKURIState_3
ActorUnkKURI::func_ov032_0211a140, // ActorUnkKURIState_4
ActorUnkKURI::func_ov032_0211a484, // ActorUnkKURIState_5
ActorUnkKURI::func_ov032_0211a7b8, // ActorUnkKURIState_6
ActorUnkKURI::func_ov032_0211aa40, // ActorUnkKURIState_7
ActorUnkKURI::func_ov032_0211ab20, // ActorUnkKURIState_8
ActorUnkKURI::func_ov032_0211a950, // ActorUnkKURIState_9
ActorUnkKURI::func_ov032_0211ac20, // ActorUnkKURIState_10
ActorUnkKURI::func_ov032_0211ad40 // ActorUnkKURIState_11
};
DECL_PROFILE(ActorProfileUnkKURI);
@@ -10,63 +74,867 @@ Actor *ActorProfileUnkKURI::Create() {
}
ActorProfileUnkKURI::ActorProfileUnkKURI() :
ActorProfile_Derived1(ActorId_KURI) {}
ActorProfile_Derived1(ActorId_KURI) {
this->mUnk_04.Init(FLOAT_TO_FX32(0.4f));
this->vfunc_04()->mUnk_15 = true;
}
ActorUnkKURI::ActorUnkKURI() {}
// non-matching
ActorUnkKURI::ActorUnkKURI() :
mUnk_0B0(G3d_GetModelPtr(GET_PROFILE(ActorProfileUnkKURI)->vfunc_04()->mUnk_50)),
mUnk_110(&this->mUnk_0B0, GET_PROFILE(ActorProfileUnkKURI)->vfunc_04()),
mUnk_1BC(&this->mUnk_0B0, GET_PROFILE(ActorProfileUnkKURI)->vfunc_04()),
mUnk_218(0x0),
mUnk_21C(0x0),
mUnk_220(0x7B),
mUnk_224(0x0),
mUnk_264(0x3800) {
SET_FLAG(this->mFlags, ActorFlag_6);
SET_FLAG(this->mFlags, ActorFlag_13);
void ActorUnkKURI::func_ov032_02119248(void) {}
void ActorUnkKURI::func_ov032_0211925c(void) {}
void ActorUnkKURI::func_ov032_02119270(void) {}
void ActorUnkKURI::func_ov032_02119390(void) {}
void ActorUnkKURI::func_ov032_02119458(void) {}
void ActorUnkKURI::func_ov032_021194dc(void) {}
void ActorUnkKURI::func_ov032_0211953c(void) {}
void ActorUnkKURI::func_ov032_02119584(void) {}
void ActorUnkKURI::func_ov032_021198dc(void) {}
void ActorUnkKURI::func_ov032_02119990(void) {}
void ActorUnkKURI::func_ov032_02119a0c(void) {}
void ActorUnkKURI::func_ov032_02119be8(void) {}
void ActorUnkKURI::func_ov032_02119c80(void) {}
void ActorUnkKURI::func_ov032_02119d7c(void) {}
void ActorUnkKURI::func_ov032_02119df4(void) {}
void ActorUnkKURI::func_ov032_02119e90(void) {}
void ActorUnkKURI::func_ov032_02119f40(void) {}
void ActorUnkKURI::func_ov032_0211a140(void) {}
void ActorUnkKURI::func_ov032_0211a20c(void) {}
void ActorUnkKURI::func_ov032_0211a484(void) {}
void ActorUnkKURI::func_ov032_0211a52c(void) {}
void ActorUnkKURI::func_ov032_0211a7b8(void) {}
void ActorUnkKURI::func_ov032_0211a86c(void) {}
void ActorUnkKURI::func_ov032_0211a950(void) {}
void ActorUnkKURI::func_ov032_0211a9c8(void) {}
void ActorUnkKURI::func_ov032_0211aa40(void) {}
void ActorUnkKURI::func_ov032_0211aac8(void) {}
void ActorUnkKURI::func_ov032_0211ab20(void) {}
void ActorUnkKURI::func_ov032_0211abc0(void) {}
void ActorUnkKURI::func_ov032_0211ac20(void) {}
void ActorUnkKURI::func_ov032_0211ac94(void) {}
void ActorUnkKURI::func_ov032_0211ad40(void) {}
void ActorUnkKURI::func_ov032_0211adf4(void) {}
void ActorUnkKURI::func_ov032_0211b024(void) {}
void ActorUnkKURI::func_ov032_0211b064(void) {}
void ActorUnkKURI::func_ov032_0211b114(void) {}
void ActorUnkKURI::func_ov032_0211b17c(void) {}
void ActorUnkKURI::func_ov032_0211b190(void) {}
void ActorUnkKURI::func_ov032_0211b1e0(void) {}
void ActorUnkKURI::func_ov032_0211b298(void) {}
void ActorUnkKURI::func_ov032_0211b37c(void) {}
void ActorUnkKURI::func_ov032_0211b3b0(void) {}
void ActorUnkKURI::func_ov032_0211b408(void) {}
void ActorUnkKURI::func_ov032_0211b570(void) {}
void ActorUnkKURI::func_ov032_0211b5b4(void) {}
void ActorUnkKURI::func_ov032_0211b5d0(void) {}
void ActorUnkKURI::func_ov032_0211b5f4(void) {}
void ActorUnkKURI::func_ov032_0211b618(void) {}
void ActorUnkKURI::func_ov032_0211b628(void) {}
void ActorUnkKURI::func_ov032_0211b630(void) {}
void ActorUnkKURI::func_ov032_0211b654(void) {}
void ActorUnkKURI::func_ov032_0211b680(void) {}
void ActorUnkKURI::func_ov032_0211b69c(void) {}
this->mUnk_228.mUnk_04 |= 0x8000;
this->mUnk_294 = true;
VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mUnk_288);
Actor_38 *actor_38 = &this->mUnk_258.mUnk_00;
actor_38->mUnk_08 = 0x1;
this->mUnk_38 = actor_38;
this->mUnk_296 = 0x0;
this->mUnk_298 = 0x0;
VecFx32_Init(FLOAT_TO_FX32(1.0f), FLOAT_TO_FX32(1.0f), FLOAT_TO_FX32(1.0f), &this->mUnk_27C);
this->func_ov000_0209862c(0x4);
SET_FLAG(this->mFlags, ActorFlag_9);
this->mUnk_A4 = &data_ov032_02122160;
}
ActorUnkKURI::~ActorUnkKURI() {}
ActorProfileUnkKURI::~ActorProfileUnkKURI() {}
bool ActorUnkKURI::vfunc_18(unk32 param1) {
if (this->Actor::func_ov000_02098a60(0x1)) {
this->func_ov000_020984d0();
return true;
}
if (this->mUnk_5C.mParams[0] == 0x1) {
this->mUnk_1BC.func_ov000_02099ddc(data_ov032_0212216c, 0x1000, 0x1000);
this->mUnk_48 = 0xC;
} else {
this->mUnk_1BC.func_ov000_02099ddc(data_ov032_0212216c, 0x1000, 0x0);
this->mUnk_48 = 0x6;
}
return true;
}
// non-matching
void ActorUnkKURI::vfunc_1C() {
if (this->mUnk_5C.mParams[0] == 0x2) {
this->mUnk_294 = false;
Actor *actor = func_02016fbc(ActorId_Soldier, &this->mPos, 0x0);
if (actor == NULL) {
this->SetState(ActorUnkKURIState_0);
return;
}
fx32 deltaZ = actor->mPos.z - this->mPos.z;
fx32 deltaX = actor->mPos.x - this->mPos.x;
this->mAngle = func_01ffbbe0(deltaX, deltaZ);
this->SetState(ActorUnkKURIState_11);
return;
}
this->SetState(ActorUnkKURIState_0);
}
void ActorUnkKURI::func_ov032_021194dc(ActorState state) {
this->mUnk_2C = data_ov000_020aecf8;
this->mUnk_218 = 0x0;
if (this->mState != ActorUnkKURIState_11) {
return;
}
unk32 param2 = 0xA;
if (state == ActorUnkKURIState_1) {
param2 = 0x10;
}
if (this->mUnk_294) {
return;
}
gpActorManager->func_01fff2fc((void (*)(Actor *, u16)) &ActorUnkKURI::func_ov032_0211b37c, param2);
}
void ActorUnkKURI::SetState(ActorState state) {
this->func_ov032_021194dc(state);
this->mState = state;
CALL_PTMF(PTMF<ActorUnkKURI>, data_ov032_02122348[this->mState]);
}
void ActorUnkKURI::vfunc_20() {
if (!this->Actor_Derived2::func_ov017_020bef4c(0x4000) && mUnk_48 != 0) {
bool var_r1 = true;
bool var_r2 = true;
if (this->mState != ActorUnkKURIState_8 && this->mState != ActorUnkKURIState_7) {
var_r2 = false;
}
if (var_r2 == 0 && this->mUnk_5C.mParams[0] != 2) {
var_r1 = false;
}
if (var_r1 == 0) {
return;
}
}
this->mUnk_3C = &this->mUnk_228;
CALL_PTMF(PTMF<ActorUnkKURI>, data_ov032_02122288[this->mState]);
this->Actor_Derived2::func_ov017_020bf894(&this->mUnk_248);
this->Actor::func_ov000_02098838();
this->func_ov032_0211b298();
VecFx32_Copy(&this->mPos, &this->mPrevPos);
VecFx32_Add(&this->mPos, &this->mVel, &this->mPos);
this->Actor::func_ov000_02098b8c(0x1, &this->mUnk_268);
if (this->mUnk_46 & 0x1) {
this->mVel.y = FLOAT_TO_FX32(0.0f);
}
if (this->func_ov032_0211b17c()) {
return;
}
this->Actor::func_ov000_020989e0();
bool var = true;
if (this->mUnk_228.mUnk_08 & 0x3FFFF) {
var = false;
switch (this->mUnk_228.mUnk_1C) {
case 0xE:
if (!this->Actor::func_ov000_020986fc(0) && !this->Actor::func_ov000_020986fc(1)) {
var = true;
break;
}
case 0xF:
this->Actor_Derived2::func_ov000_020990c0(&this->mUnk_228, 0, 0);
this->SetState(ActorUnkKURIState_6);
break;
case 0xC:
this->Actor_Derived2::func_ov017_020bf178(&this->mUnk_228, 1);
data_027e09a8->func_ov000_02071b30(0x983C, &this->mPos, 0x0);
this->mUnk_248.func_ov000_02099a0c();
this->SetState(ActorUnkKURIState_7);
break;
case 0x4:
if (data_027e0d38->func_ov031_020d9c04(0x1, 0x0, 0x0)) {
this->SetState(ActorUnkKURIState_8);
}
break;
default:
this->mUnk_48 -= this->mUnk_228.mUnk_1E;
this->Actor_Derived2::func_ov000_020990c0(&this->mUnk_228, 0x0, 0x0);
data_027e09a8->func_ov000_02071b30(0x983C, &this->mPos, 0x0);
this->SetState(ActorUnkKURIState_6);
break;
}
}
if (var && (this->Actor::func_ov000_02098ab4(0x2, 0x0, 0x1, NULL) & 1) && (this->mState == ActorUnkKURIState_3)) {
this->SetState(ActorUnkKURIState_5);
}
if (GET_FLAG(this->mFlags, ActorFlag_14)) {
this->mUnk_110.vfunc_34();
}
if (!GET_FLAG(this->mFlags, ActorFlag_Alive)) {
return;
}
if (this->func_ov032_0211b17c()) {
return;
}
VecFx32 vec = this->mPos;
UnkStruct_ov000_0207de98 stack;
VecFx32_Copy(&vec, &stack.vec);
stack.param1 = 0x548;
stack.param2 = 0x1000;
data_027e09c0->func_ov000_0207de98(this->mRef, &stack, this->mUnk_38);
}
void ActorUnkKURI::vfunc_2C(unk32 param1) {
if (!this->Actor::func_01fff5d0(param1, 0x0)) {
return;
}
this->func_ov017_020bf5c4(&this->mPos, 0x548, 0x548, 0x1F, 0x0);
VecFx32 sp14;
VecFx32_Copy(&this->mUnk_27C, &sp14);
func_01ff941c(&sp14, &this->mUnk_98);
VecFx32 sp08 = this->mPos;
sp08.y += this->mUnk_288.y;
func_01ffc634(&this->mUnk_0B0, &sp14, this->mAngleStruct, &sp08);
}
void ActorUnkKURI::func_ov032_02119990() {
this->mVel.x = FLOAT_TO_FX32(0.0f);
this->mVel.z = FLOAT_TO_FX32(0.0f);
this->mUnk_264 = 0x3800;
this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
this->mUnk_220 = 0x7B;
}
// non-matching (regalloc)
void ActorUnkKURI::func_ov032_02119a0c() {
switch (this->mUnk_218) {
case 0x0:
unk32 var;
if (gRandom.Next32(0) & 0x80000000) {
var = 0x1;
} else {
var = -0x1;
}
this->mUnk_21C = var;
this->mUnk_52 = gRandom.Next32(0x15) + 0x1E;
this->mUnk_50 = 0x00;
++this->mUnk_218;
break;
case 0x1:
this->mUnk_224 = this->mUnk_21C * gRandom.Next32(0x38E) + this->mAngle;
if (func_01ff930c(&this->mAngle, this->mUnk_224, 0x71C)) {
u16 angle = this->mAngle;
this->mVel.x = MUL_FX32(SIN(angle), this->mUnk_220);
this->mVel.z = MUL_FX32(COS(angle), this->mUnk_220);
if (this->func_ov032_0211b064(0x0)) {
this->SetState(ActorUnkKURIState_1);
break;
}
if (this->IsTimerOut()) {
this->SetState(ActorUnkKURIState_0);
}
}
break;
default:
break;
}
this->func_ov032_0211b1e0();
}
void ActorUnkKURI::func_ov032_02119be8() {
this->mUnk_264 = 0x4800;
this->mUnk_110.vfunc_1C(data_ov032_0212219c, 0x14CD, 0x19A, 0x0);
data_027e09a8->func_ov000_02071b30(0x9836, &this->mPos, 0x0);
this->mVel.x = FLOAT_TO_FX32(0.0f);
this->mVel.z = FLOAT_TO_FX32(0.0f);
}
// non-matching
void ActorUnkKURI::func_ov032_02119c80() {
UnkStruct_PlayerGet_50 *playerGet50 = this->mUnk_110.vfunc_28();
fx32 val = func_01ffb428(playerGet50->mUnk_10 - playerGet50->mUnk_08, 0x14CD);
val >>= 0xC;
s16 var;
func_ov000_020986b4(&var, this, 0x0);
if (val > 0x0) {
unk32 param2 = func_01ffb464(val << 0xC);
func_01ff9318(&this->mAngle, var, param2);
}
if (this->mUnk_110.vfunc_28()->func_01ff8fa8() == 0x0) {
return;
}
data_027e0cec->func_ov000_0209feac(0x880, &this->mPos, 0x2, 0x0, 0x0);
if (this->mUnk_5C.mParams[0] == 0x1 && !this->func_ov032_0211b114()) {
this->SetState(ActorUnkKURIState_4);
return;
}
this->SetState(ActorUnkKURIState_3);
}
void ActorUnkKURI::func_ov032_02119d7c() {
this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
this->mUnk_52 = 0x14;
this->mUnk_50 = 0x00;
this->mVel.x = FLOAT_TO_FX32(0.0f);
this->mVel.z = FLOAT_TO_FX32(0.0f);
}
// non-matching
void ActorUnkKURI::func_ov032_02119df4() {
s16 var;
s16 delta = this->mUnk_52 - this->mUnk_50;
func_ov000_020986b4(&var, this, 0x0);
s16 val = var;
if (delta > 0x0) {
func_01ff9318(&this->mAngle, val, func_01ffb464(delta << 0xC));
}
if (this->IsTimerOut()) {
this->SetState(ActorUnkKURIState_3);
}
this->func_ov032_0211b1e0();
}
// non-matching
void ActorUnkKURI::func_ov032_02119e90() {
this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
this->mUnk_288.x = func_01ffb66c(0x1800, func_01ffb428(0x148, 0x14) >> 0xC);
this->mUnk_50 = 0x0;
this->mUnk_52 = 0xB4;
if (this->mUnk_5C.mParams[0] == 0x2) {
this->mUnk_264 = 0x14000;
} else {
this->mUnk_264 = 0x4800;
}
this->mUnk_220 = 0x0;
this->mVel.x = FLOAT_TO_FX32(0.0f);
this->mVel.z = FLOAT_TO_FX32(0.0f);
}
// non-matching (case 1)
void ActorUnkKURI::func_ov032_02119f40() {
if (this->IsTimerOut()) {
this->mUnk_218 = 0x2;
}
switch (this->mUnk_218) {
case 0x0:
this->mUnk_220 += 0x14;
fx32 newValAdd = this->mUnk_110.vfunc_28()->mUnk_04 + this->mUnk_288.x;
this->mUnk_110.vfunc_28()->mUnk_04 = newValAdd;
if (this->mUnk_220 < 0x148) {
break;
}
this->mUnk_220 = 0x148;
this->mUnk_110.vfunc_28()->mUnk_04 = FLOAT_TO_FX32(2.5f);
++this->mUnk_218;
break;
case 0x1:
s16 var;
s16 *r5 = &var;
func_ov000_020986b4(r5, this, 0x0);
func_01ff930c(&this->mAngle, *r5, 0x2D8);
if (!this->func_ov032_0211b064(0x1)) {
++this->mUnk_218;
}
break;
case 0x2:
fx32 newValSub = this->mUnk_110.vfunc_28()->mUnk_04 - this->mUnk_288.x;
this->mUnk_110.vfunc_28()->mUnk_04 = newValSub;
this->mUnk_220 -= 0x14;
if (this->mUnk_220 > 0x0) {
break;
}
this->mUnk_220 = 0x0;
this->mUnk_110.vfunc_28()->mUnk_04 = FLOAT_TO_FX32(1.0f);
this->SetState(ActorUnkKURIState_9);
break;
default:
_OS_Panic();
break;
}
u16 angle = this->mAngle;
this->mVel.x = MUL_FX32(SIN(angle), this->mUnk_220);
this->mVel.z = MUL_FX32(COS(angle), this->mUnk_220);
this->func_ov032_0211b1e0();
}
void ActorUnkKURI::func_ov032_0211a140() {
this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x2000, 0x19A, 0x0);
this->mUnk_220 = 0x11F;
this->mUnk_264 = 0x4800;
unk32 var;
if (gRandom.Next32(0) & 0x80000000) {
var = 1;
} else {
var = -1;
}
this->mUnk_21C = var;
this->mVel.x = FLOAT_TO_FX32(0.0f);
this->mVel.z = FLOAT_TO_FX32(0.0f);
this->mUnk_52 = 0x1E;
this->mUnk_50 = 0x00;
}
// non-matching
void ActorUnkKURI::func_ov032_0211a20c() {}
void ActorUnkKURI::func_ov032_0211a484() {
this->mUnk_110.vfunc_1C(data_ov032_02122184, this->mUnk_110.vfunc_28()->mUnk_04, 0x19A, 0x0);
fx32 val = func_01ffb428(this->mUnk_220, 0x14);
this->mUnk_288.x = func_01ffb66c(0x1000 - this->mUnk_110.vfunc_28()->mUnk_04, val >> 0xC);
}
// non-matching
void ActorUnkKURI::func_ov032_0211a52c() {
switch (this->mUnk_218) {
case 0x0:
this->mUnk_110.vfunc_28()->mUnk_04 = this->mUnk_110.vfunc_28()->mUnk_04 + this->mUnk_288.x;
unk32 val = this->mUnk_220 - 0x14;
fx32 sinValue = SIN((u16) this->mAngle);
fx32 cosValue = COS((u16) this->mAngle);
this->mUnk_220 = val;
this->mVel.x = MUL_FX32(sinValue, val);
this->mVel.z = MUL_FX32(cosValue, val);
if (val > 0x0) {
return;
}
this->mVel.x = FLOAT_TO_FX32(0.0f);
this->mVel.z = FLOAT_TO_FX32(0.0f);
this->mUnk_220 = 0x0;
this->mUnk_110.vfunc_28()->mUnk_04 = FLOAT_TO_FX32(1.0f);
++this->mUnk_218;
break;
case 0x1:
this->mUnk_110.vfunc_1C(data_ov032_0212219c, 0x1000, 0x19A, 0x0);
data_027e09a8->func_ov000_02071b30(0x9836, &this->mPos, 0x0);
++this->mUnk_218;
break;
case 0x2:
if (!this->mUnk_110.vfunc_28()->func_01ff8fa8()) {
return;
}
data_027e0cec->func_ov000_0209feac(0x880, &this->mPos, 0x2, 0x0, 0x0);
this->mUnk_110.vfunc_28()->mUnk_02 = 0x0;
this->mUnk_110.vfunc_28()->mUnk_08 = FLOAT_TO_FX32(0.0f);
data_027e09a8->func_ov000_02071b30(0x9836, &this->mPos, 0x0);
++this->mUnk_218;
break;
case 0x3:
if (!this->mUnk_110.vfunc_28()->func_01ff8fa8()) {
return;
}
data_027e0cec->func_ov000_0209feac(0x880, &this->mPos, 0x2, 0x0, 0x0);
this->func_ov032_0211b024();
break;
default:
break;
}
}
void ActorUnkKURI::func_ov032_0211a7b8() {
this->mUnk_110.vfunc_1C(data_ov032_02122184, this->mUnk_110.vfunc_28()->mUnk_04, 0x19A, 0x0);
this->mUnk_288.x = func_01ffb66c(0x1000 - this->mUnk_110.vfunc_28()->mUnk_04, data_ov000_020aecf4[0]);
this->mUnk_228.func_ov000_02097bec();
this->mUnk_38->mUnk_08 = 0x3;
}
// non-matching
void ActorUnkKURI::func_ov032_0211a86c() {
fx32 sum = this->mUnk_110.vfunc_28()->mUnk_04 + this->mUnk_288.x;
this->mUnk_110.vfunc_28()->mUnk_04 = sum;
this->func_ov000_020992dc();
if (!GET_FLAG(this->mFlags, ActorFlag_5)) {
return;
}
Actor_38 *actor38 = this->mUnk_38;
actor38->mUnk_08 = 0x1;
if (this->mUnk_48 <= 0x0) {
this->vfunc_54(0x0);
return;
}
if (this->mUnk_248.mUnk_08 < this->mUnk_248.mUnk_0A) {
this->SetState(ActorUnkKURIState_7);
return;
}
if (this->func_ov032_0211b064(0x0) || this->mUnk_5C.mParams[0] == 0x2) {
this->func_ov032_0211b024();
return;
}
this->SetState(ActorUnkKURIState_0);
}
void ActorUnkKURI::func_ov032_0211a950() {
this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
this->mUnk_52 = 0x14;
this->mUnk_50 = 0x00;
this->mVel.x = FLOAT_TO_FX32(0.0f);
this->mVel.z = FLOAT_TO_FX32(0.0f);
}
void ActorUnkKURI::func_ov032_0211a9c8() {
if (this->IsTimerOut()) {
if (this->func_ov032_0211b064(0x0) || this->mUnk_5C.mParams[0] == 0x2) {
this->SetState(ActorUnkKURIState_1);
} else {
this->SetState(ActorUnkKURIState_0);
}
}
this->func_ov032_0211b1e0();
}
extern "C" u16 data_ov000_020aecf0;
void ActorUnkKURI::func_ov032_0211aa40() {
this->Actor_Derived2::func_ov000_02099450(&this->mUnk_248, &this->mUnk_228.mUnk_10, 0x0, data_ov000_020aecf0);
this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x0, 0x19A, 0x0);
this->mUnk_228.func_ov000_02097bec();
}
void ActorUnkKURI::func_ov032_0211aac8() {
this->Actor_Derived2::func_ov000_020994a0();
if (!GET_FLAG(this->mFlags, ActorFlag_5)) {
return;
}
if (this->func_ov032_0211b064(0x0) || this->mUnk_5C.mParams[0] == 0x2) {
this->func_ov032_0211b024();
return;
}
this->SetState(ActorUnkKURIState_0);
}
void ActorUnkKURI::func_ov032_0211ab20() {
this->Actor_Derived2::func_ov000_02098f34(&this->mUnk_228.mUnk_10);
this->vfunc_40();
*((s16 *) &this->mUnk_44) &= ~0x20;
this->mUnk_2C = 0x0;
this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
this->mUnk_38->mUnk_08 = 0x3;
this->mUnk_228.func_ov000_02097bec();
}
void ActorUnkKURI::func_ov032_0211abc0() {
this->vfunc_44();
if (!GET_FLAG(this->mFlags, ActorFlag_5)) {
return;
}
this->mUnk_38->mUnk_08 = 0x1;
VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mUnk_228.mUnk_10);
this->mUnk_248.func_ov000_02099a0c();
this->SetState(ActorUnkKURIState_7);
*((s16 *) &this->mUnk_44) |= 0x20;
}
void ActorUnkKURI::func_ov032_0211ac20() {
this->mVel.x = FLOAT_TO_FX32(0.0f);
this->mVel.z = FLOAT_TO_FX32(0.0f);
this->mUnk_52 = 0xA;
this->mUnk_50 = 0x0;
this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
}
void ActorUnkKURI::func_ov032_0211ac94() {
this->mUnk_27C.y -= 0x199;
if (!this->IsTimerOut()) {
return;
}
data_027e09a8->func_ov000_02071b30(0x983D, &this->mPos, 0x0);
this->Actor::func_ov000_020984d0();
if (this->mUnk_5C.mParams[0] == 0x2) {
this->func_ov000_02098a88(0x0, 0x1);
}
this->func_ov017_020bf3e0(0x1, 0x0);
this->Actor_Derived2::func_ov000_020997c4(0x0);
}
void ActorUnkKURI::func_ov032_0211ad40() {
this->mVel.x = FLOAT_TO_FX32(0.0f);
this->mVel.z = FLOAT_TO_FX32(0.0f);
this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
this->mUnk_298 = gRandom.Next32(0xE);
this->mUnk_296 = 0x0;
}
// non-matching
void ActorUnkKURI::func_ov032_0211adf4() {
this->IsTimerOut();
switch (this->mUnk_218) {
case 0x0:
if (!this->IsInternalTimerOut()) {
break;
}
++this->mUnk_218;
this->mUnk_110.vfunc_1C(data_ov032_0212219c, 0x1000, 0x19A, 0x0);
data_027e09a8->func_ov000_02071b30(0x9836, &this->mPos, 0x0);
break;
case 0x1:
if (this->mUnk_110.vfunc_28()->func_01ff8fa8() == 0x0) {
break;
}
data_027e0cec->func_ov000_0209feac(0x880, &this->mPos, 0x2, 0x0, 0x0);
this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
if (this->func_ov032_0211b064(0x0) || (this->mUnk_294 && this->mUnk_50 >= this->mUnk_52)) {
this->SetState(ActorUnkKURIState_1);
return;
}
u16 random = gRandom.Next32(0);
this->mUnk_298 = random + 0xA;
this->mUnk_296 = 0x0;
this->mUnk_218 = 0x0;
break;
default:
break;
}
}
void ActorUnkKURI::func_ov032_0211b024() {
if (this->mUnk_5C.mParams[0] == 0x1 && !this->func_ov032_0211b114()) {
this->SetState(ActorUnkKURIState_4);
return;
}
this->SetState(ActorUnkKURIState_2);
}
// non-matching
bool ActorUnkKURI::func_ov032_0211b064(unk32 param1) {
VecFx32 *vec = data_027e0ce0->func_01fff148(0x0);
bool ret = false;
if (func_ov000_0205adfc(vec, &this->mPos) &&
func_01ff9258(vec->x - this->mPos.x, vec->z - this->mPos.z) < this->mUnk_264) {
ret = true;
}
if (param1 != 0x0) {
if (!ret || !func_02016ae0(&this->mPos, vec, this->mAngleStruct, 0x4E39, 0x1) == 0x0) {
ret = true;
} else {
ret = false;
}
}
return ret;
}
// non-matching
bool ActorUnkKURI::func_ov032_0211b114() {}
bool ActorUnkKURI::func_ov032_0211b17c() {
return this->mState == ActorUnkKURIState_10;
}
// non-matching
void ActorUnkKURI::func_ov032_0211b190(s32 param1, s32 param2) {}
void ActorUnkKURI::func_ov032_0211b1e0() {
if (this->mUnk_110.vfunc_30() != 0x0 || !GET_FLAG(this->mFlags, ActorFlag_14)) {
return;
}
if (this->mUnk_110.vfunc_10()->mUnk_04.func_02015080(0x1000) != 0x0) {
data_027e09a8->func_ov000_02071b30(0x9838, &this->mPos, 0x0);
return;
}
if (this->mUnk_110.vfunc_10()->mUnk_04.func_02015080(0xF000) != 0x0) {
data_027e09a8->func_ov000_02071b30(0x9839, &this->mPos, 0x0);
return;
}
}
// non-matching
void ActorUnkKURI::func_ov032_0211b298() {
if (this->mUnk_110.vfunc_30() != 0x1) {
if (this->mUnk_288.y <= FLOAT_TO_FX32(0.0f)) {
this->mUnk_288.z = FLOAT_TO_FX32(0.0f);
return;
}
this->mUnk_288.z -= this->mUnk_2C;
func_01ff916c(&this->mUnk_288.y, 0x0, this->mUnk_288.z);
return;
}
fx32 value = this->mUnk_110.vfunc_28()->mUnk_08;
if (value > FLOAT_TO_FX32(1.0f) && value < FLOAT_TO_FX32(16.0f)) {
value -= FLOAT_TO_FX32(1.0f);
this->mUnk_288.y = MUL_FX32(value + MUL_FX32(-MUL_FX32(value, value), 0x92492493), 0x3B4);
return;
}
this->mUnk_288.y = FLOAT_TO_FX32(0.0f);
}
void ActorUnkKURI::func_ov032_0211b37c(ActorUnkKURI *thisx, u16 param1) {
if (thisx->GetActorId() == ActorId_KURI) {
thisx->mUnk_294 = true;
thisx->mUnk_52 = param1;
thisx->mUnk_50 = 0x0;
}
}
void ActorUnkKURI::func_ov032_0211b3b0() {
if (this->mUnk_5C.mUnk_1A[1] != 0x0) {
UNSET_FLAG(this->mFlags, ActorFlag_Alive);
} else {
this->Actor::func_ov000_020984d0();
}
if (this->mUnk_5C.mParams[0] == 0x2) {
this->Actor::func_ov000_02098a88(0x0, 0x1);
UNSET_FLAG(this->mFlags, ActorFlag_Alive);
return;
}
this->Actor::func_ov000_020984d0();
}
void ActorUnkKURI::vfunc_54(unk32 param1) {
switch (param1) {
case 0x0:
data_027e09a8->func_ov000_02071b30(0x983D, &this->mPos, 0x0);
this->func_ov017_020bf3e0(this->mUnk_A8->mUnk_00, 0x0);
this->func_ov000_020997c4(this->mUnk_A8->mUnk_04);
this->func_ov032_0211b3b0();
break;
case 0x1:
data_027e09a8->func_ov000_02071b30(0xE8, &this->mPos, 0x0);
this->func_ov032_0211b3b0();
break;
case 0x3:
unk32 sp04;
func_ov017_020c2438(&sp04, this->mUnk_A8->mUnk_08, &this->mPos, 0x1, 0x1);
data_027e09a8->func_ov000_02071b30(0xEA, &this->mPos, 0x0);
this->func_ov032_0211b3b0();
break;
case 0x2:
data_027e09a8->func_ov000_02071b30(0x983D, &this->mPos, 0x0);
func_ov017_020c26f8(this->mUnk_A8->mUnk_0C, &this->mPos, 0x1, 0x1);
data_027e09a8->func_ov000_02071b30(0xED, &this->mPos, 0x0);
this->func_ov017_020bf3e0(this->mUnk_A8->mUnk_00, 0x0);
this->func_ov000_020997c4(this->mUnk_A8->mUnk_04);
this->func_ov032_0211b3b0();
break;
default:
break;
}
}
ActorUnkKURI_268::ActorUnkKURI_268() {
VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mUnk_08);
}
ActorUnkKURI_268::~ActorUnkKURI_268() {}
// non-matching
bool ActorUnkKURI_268::vfunc_08(const UnkStruct_ov031_020f3310 *param1) {
VecFx16_Copy2VecFx32(&param1->mUnk_08, &this->mUnk_08);
this->UnkStruct_ov031_Items_00::vfunc_08(param1);
}
void ActorUnkKURI_1BC::vfunc_3C() {
this->mUnk_08->func_ov000_02057c98(this->vfunc_10());
}
void ActorUnkKURI_1BC::vfunc_38(unk32 param1, unk32 param2) {
this->mUnk_04->func_ov000_020578a4(param1, param2);
}
s8 ActorUnkKURI_1BC::vfunc_30() {
return this->mUnk_18;
}
void ActorUnkKURI_110::vfunc_3C() {
this->mUnk_08->func_ov000_02057c98(this->mUnk_04);
this->mUnk_08->func_ov000_02057c98(this->mUnk_1C);
}
void ActorUnkKURI_110::vfunc_38(unk32 param1, unk32 param2) {
this->mUnk_04->func_ov000_020578a4(param1, param2);
this->mUnk_1C->func_ov000_020578a4(param1, param2);
}
src/063_Shrine/Actor/ActorUnkCANS.cpp
+16 -25
View File
@@ -50,7 +50,7 @@ extern "C" fx32 func_01ff9a5c(VecFx32 *, VecFx32 *, VecFx32 *);
extern "C" void func_01ffad5c(Mat4x3p *, Mat4x3p *, Mat4x3p *);
extern "C" fx32 func_01ffb428(unk32, unk32);
extern "C" void func_01ffb714(VecFx32 *, VecFx32 *, VecFx32 *);
extern "C" unk32 func_01ffbbe0(unk32 param1, unk32 param2);
extern "C" unk32 func_01ffbbe0(fx32 param1, fx32 param2);
extern "C" void func_01ffc6d4(ModelRender *param1, UnkAngleStruct param2, VecFx32 *param3);
extern "C" void func_0200eab0(G3d_Model *, unk32, u8);
@@ -66,20 +66,13 @@ extern "C" void func_ov000_02057c98(ModelRender *param1, UnkSystem5 *param2);
extern "C" unk32 func_ov000_0205c384(VecFx32 *param1, VecFx32 *param2);
#endif
extern "C" void func_ov000_0208bd20(UnkStruct_027e0ce0 *param1, unk32 param2, unk32 param3, unk32 param4);
extern "C" void func_ov000_020986b4(s16 *param1, ActorUnkCANS *param2, unk32 param3);
extern "C" void func_ov000_02098f34(ActorUnkCANS *param1, unk16 *param2);
extern "C" void func_ov000_020986b4(s16 *param1, Actor_Derived2 *param2, unk32 param3);
extern "C" unk32 func_ov000_02098d7c(ActorUnkCANS *param1, UnkStruct_ov063_02162e88 *param2);
extern "C" unk32 func_ov000_02099450(ActorUnkCANS *param1, void *param2, VecFx32 *param3, unk32 param4, u16 param5);
extern "C" void func_ov000_020994a0(ActorUnkCANS *);
extern "C" unk32 func_ov000_02099a0c(void *param1);
// Overlay 17
extern "C" void func_ov017_020bf050(ActorUnkCANS *param1, UnkStruct_ov063_02162e88 *param2, unk32 param3);
extern "C" void func_ov017_020bf178(ActorUnkCANS *param1, UnkStruct_ov063_02162e88 *param2, unk32 param3);
extern "C" void func_ov017_020bf634(ActorUnkCANS *param1, unk16 *param2, unk32 param3, unk32 param4);
extern "C" void func_ov017_020bf688(ActorUnkCANS *param1);
extern "C" void func_ov017_020bf894(ActorUnkCANS *param1, void *param2);
extern "C" unk32 func_ov017_020bef4c(ActorUnkCANS *param1, unk32 param2);
// Overlay 26
#if IS_JP
@@ -257,14 +250,14 @@ void ActorUnkCANS::vfunc_20(void) {
mUnk_238++;
}
if (!func_ov017_020bef4c(this, 0x4000) && mUnk_48 != 0 && mState != 4) {
if (!this->func_ov017_020bef4c(0x4000) && mUnk_48 != 0 && mState != 4) {
return;
}
mUnk_3C = (Actor_9C *) &mUnk_200;
CALL_PTMF(PTMF<ActorUnkCANS>, data_ov063_02162fb0[mState]);
func_ov017_020bf894(this, &mUnk_224);
this->func_ov017_020bf894(&mUnk_224);
this->func_ov000_02098838();
VecFx32_Copy(&mPos, &mPrevPos);
@@ -316,21 +309,21 @@ void ActorUnkCANS::vfunc_20(void) {
mUnk_236 = func_ov000_02098d7c(this, &mUnk_200);
mUnk_234 = 0;
iVar5 = this->func_ov063_0215a56c((unk16) func_01ffbbe0(*(u32 *) &mUnk_200.mUnk_10, mUnk_200.mUnk_18));
iVar5 = this->func_ov063_0215a56c((unk16) func_01ffbbe0(mUnk_200.mUnk_10.x, mUnk_200.mUnk_10.z));
switch (mUnk_200.mUnk_1C) {
case 12:
if (iVar5 != 0) {
Actor *iVar6 = gpActorManager->func_01fff3b4(mUnk_200.mUnk_0C.data);
if (iVar6 != 0) {
if (iVar6 != NULL) {
((ActorItemBoomerang *) iVar6)->func_ov031_020e49b0(0x8D70);
}
if (mState != 4) {
this->func_ov063_02158448(5);
}
} else {
func_ov017_020bf178(this, &mUnk_200, 1);
func_ov000_02099a0c(&mUnk_224);
this->Actor_Derived2::func_ov017_020bf178(&mUnk_200, 1);
mUnk_224.func_ov000_02099a0c();
this->func_ov063_02158448(4);
}
break;
@@ -598,7 +591,7 @@ void ActorUnkCANS::func_ov063_02159100(void) {
return;
}
u16 *tmpArr = (u16 *) &mUnk_22C;
u16 *tmpArr = (u16 *) &mUnk_224.mUnk_08;
if (tmpArr[0] < tmpArr[1]) {
this->func_ov063_02158448(4);
return;
@@ -659,13 +652,13 @@ void ActorUnkCANS::func_ov063_02159258(void) {
}
void ActorUnkCANS::func_ov063_02159408(void) {
func_ov000_02099450(this, &mUnk_224, &data_027e07d4, 0, data_ov000_020aecf0[0]);
this->func_ov000_02099450(&mUnk_224, &data_027e07d4, 0, data_ov000_020aecf0[0]);
mUnk_128.vfunc_1C(data_ov063_02163068, 0, 0x19A, 0);
((Actor_9C *) &mUnk_200)->func_ov000_02097bec();
}
void ActorUnkCANS::func_ov063_02159494(void) {
func_ov000_020994a0(this);
this->func_ov000_020994a0();
if (GET_FLAG(mFlags, ActorFlag_5) == 0) {
return;
@@ -734,7 +727,7 @@ void ActorUnkCANS::func_ov063_02159784(void) {
data_027e09a8->func_ov000_02071b30(0x9862, &mPos, 0);
}
if (0x7000 <= *(int *) (mUnk_128.vfunc_28() + 8) && *(int *) (mUnk_128.vfunc_28() + 8) <= 0xF000) {
if (0x7000 <= mUnk_128.vfunc_28()->mUnk_08 && mUnk_128.vfunc_28()->mUnk_08 <= 0xF000) {
#if IS_JP
fx32 yDiff = data_027e0ce0->func_01fff148(0)->y - mPos.y;
fx32 yDiffAbs = ABS(yDiff);
@@ -872,7 +865,7 @@ void ActorUnkCANS::func_ov063_02159dfc(void) {
void ActorUnkCANS::func_ov063_02159e1c(void) {}
void ActorUnkCANS::func_ov063_02159e20(void) {
func_ov000_02098f34(this, (unk16 *) &mUnk_200.mUnk_10);
this->func_ov000_02098f34(&mUnk_200.mUnk_10);
vfunc_40();
@@ -897,11 +890,9 @@ void ActorUnkCANS::func_ov063_02159ec0(void) {
mUnk_2C = data_ov000_020aecf8[0];
mAngle = mUnk_26C;
func_ov000_02099a0c(&mUnk_224);
mUnk_224.func_ov000_02099a0c();
mUnk_200.mUnk_10 = 0;
mUnk_200.mUnk_14 = 0;
mUnk_200.mUnk_18 = 0;
VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &mUnk_200.mUnk_10);
this->func_ov063_02158448(4);
@@ -1045,7 +1036,7 @@ unk32 ActorUnkCANS::func_ov063_0215a2c0(void) {
void ActorUnkCANS::func_ov063_0215a428(void) {
// A not very clean code to access 22C and 22E matching the asm
u16 *values = (u16 *) &mUnk_22C;
u16 *values = (u16 *) &mUnk_224.mUnk_08;
if (values[0] < values[1]) {
this->func_ov063_02158448(4);
} else if (mUnk_268 == NULL) {
src/063_Shrine/Actor/ActorUnkCASE.cpp
+4 -8
View File
@@ -21,7 +21,7 @@
#include "nitro/math.h"
#include "nns/g3d/g3d.h"
extern const void *data_ov063_02162558;
extern const Actor_Derived2_A8_PTR data_ov063_02162558;
extern const void *data_ov063_02162568;
extern Mat4x3p data_027e0964;
@@ -35,10 +35,6 @@ extern "C" u16 func_01ffbbe0(fx32 x, fx32 z);
extern unk32 data_ov000_020aecf8[0x2]; //! INFO: Unsure about the size and type
extern u16 data_ov000_020aed00;
extern "C" void func_ov000_0207b70c(ActorUnkCASE_174 *param1, Actor *param2);
extern "C" void func_ov000_020990c0(ActorUnkCASE *param1, ActorShotArrow_140 *param2, unk32 param3, unk32 param4);
// Overlay 17
extern "C" unk32 func_ov017_020bef4c(ActorUnkCASE *param1, unk32 param2);
// Other
extern "C" void G3d_GetCurrentMtx(Mat4x3p *mtx1, Mat3p *mtx2);
@@ -163,7 +159,7 @@ ActorUnkCASE::ActorUnkCASE() :
mUnk_124.mUnk_24 = 1;
mUnk_38 = (Actor_38 *) &mUnk_1E8;
mUnk_38->mUnk_08 = 4;
mUnk_A8 = &data_ov063_02162558;
mUnk_A8 = (Actor_Derived2_A8_PTR *) &data_ov063_02162558;
}
bool ActorUnkCASE::vfunc_18(unk32 param1) {
@@ -319,7 +315,7 @@ void ActorUnkCASE::vfunc_24() {
void ActorUnkCASE::vfunc_20() {
mUnk_150.mUnk_1C = 1;
if (!func_ov017_020bef4c(this, 0x4000) && mUnk_48 != 0) {
if (!this->func_ov017_020bef4c(0x4000) && mUnk_48 != 0) {
bool cond = true;
if (mState != 1 && mState != 2) {
cond = false;
@@ -415,7 +411,7 @@ post:
case 13:
break;
default:
func_ov000_020990c0(this, &mUnk_124, 1, 0);
this->Actor_Derived2::func_ov000_020990c0(&mUnk_124, 1, 0);
break;
}
}
src/071_Tower/Actor/ActorTearLight.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ ActorTearLight::ActorTearLight() :
mUnk_120(&this->mUnk_140, NULL),
mUnk_160(*(ActorTearLight_UnkStruct *) &data_020431b8),
mUnk_188(0x0),
mUnk_18C(0x1),
mUnk_18C(true),
mUnk_18D(false),
mUnk_190(0x0),
mUnk_194(this),