summaryrefslogtreecommitdiff
path: root/src/d
diff options
context:
space:
mode:
authorSuperDude88 <82904174+SuperDude88@users.noreply.github.com>2023-10-07 13:56:06 -0400
committerGitHub <noreply@github.com>2023-10-07 13:56:06 -0400
commitfd133e37574bf8ecb54a7cb99fdcb8f69c71e485 (patch)
treea50d84049395b48ce674064f7f1819ca5b836cf8 /src/d
parentc1cf48eca35c6626de7510fbd7dbc682ad4a0889 (diff)
parenta36337a285202530737e280d5788385425146b1b (diff)
Merge branch 'main' into main
Diffstat (limited to 'src/d')
-rw-r--r--src/d/actor/d_a_agbsw0.cpp2
-rw-r--r--src/d/actor/d_a_alldie.cpp2
-rw-r--r--src/d/actor/d_a_am.cpp2
-rw-r--r--src/d/actor/d_a_andsw0.cpp2
-rw-r--r--src/d/actor/d_a_andsw2.cpp2
-rw-r--r--src/d/actor/d_a_arrow.cpp8
-rw-r--r--src/d/actor/d_a_boss_item.cpp2
-rw-r--r--src/d/actor/d_a_branch.cpp2
-rw-r--r--src/d/actor/d_a_disappear.cpp2
-rw-r--r--src/d/actor/d_a_item.cpp2
-rw-r--r--src/d/actor/d_a_kaji.cpp2
-rw-r--r--src/d/actor/d_a_kytag04.cpp2
-rw-r--r--src/d/actor/d_a_kytag05.cpp176
-rw-r--r--src/d/actor/d_a_kytag06.cpp2
-rw-r--r--src/d/actor/d_a_magma.cpp2
-rw-r--r--src/d/actor/d_a_mbdoor.cpp2
-rw-r--r--src/d/actor/d_a_mozo.cpp2
-rw-r--r--src/d/actor/d_a_nh.cpp2
-rw-r--r--src/d/actor/d_a_obj_Ygush00.cpp2
-rw-r--r--src/d/actor/d_a_obj_barrier.cpp2
-rw-r--r--src/d/actor/d_a_obj_mknjd.cpp2
-rw-r--r--src/d/actor/d_a_obj_movebox.cpp2
-rw-r--r--src/d/actor/d_a_obj_paper.cpp8
-rw-r--r--src/d/actor/d_a_obj_toripost.cpp2
-rw-r--r--src/d/actor/d_a_rectangle.cpp2
-rw-r--r--src/d/actor/d_a_scene_change.cpp2
-rw-r--r--src/d/actor/d_a_shop_item.cpp2
-rw-r--r--src/d/actor/d_a_spotbox.cpp1
-rw-r--r--src/d/actor/d_a_swc00.cpp2
-rw-r--r--src/d/actor/d_a_tag_kb_item.cpp2
-rw-r--r--src/d/actor/d_a_tag_ret.cpp28
-rw-r--r--src/d/d_throwstone.cpp2
32 files changed, 209 insertions, 66 deletions
diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp
index 6821e74c..fe64b5b4 100644
--- a/src/d/actor/d_a_agbsw0.cpp
+++ b/src/d/actor/d_a_agbsw0.cpp
@@ -2526,7 +2526,7 @@ extern actor_process_profile_definition g_profile_AGBSW0 = {
&g_fopAc_Method.base,
0x000D,
&l_daAgbsw0_Method,
- 0x00040000,
+ fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp
index 35a965fa..49995f02 100644
--- a/src/d/actor/d_a_alldie.cpp
+++ b/src/d/actor/d_a_alldie.cpp
@@ -143,7 +143,7 @@ extern actor_process_profile_definition g_profile_ALLDIE = {
&g_fopAc_Method.base,
0x011D,
&l_daAlldie_Method,
- 0x00044000,
+ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
};
diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index e5f20cc4..42196bb9 100644
--- a/src/d/actor/d_a_am.cpp
+++ b/src/d/actor/d_a_am.cpp
@@ -1469,7 +1469,7 @@ extern actor_process_profile_definition g_profile_AM = {
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ 0x00BD,
/* Actor SubMtd */ &l_daAM_Method,
- /* Status */ 0x00040120,
+ /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
};
diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp
index 73764432..81983cea 100644
--- a/src/d/actor/d_a_andsw0.cpp
+++ b/src/d/actor/d_a_andsw0.cpp
@@ -366,7 +366,7 @@ extern actor_process_profile_definition g_profile_ANDSW0 = {
&g_fopAc_Method.base,
0x0135,
&l_daAndsw0_Method,
- 0x00040000,
+ fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp
index 7c60064f..8d7c9e11 100644
--- a/src/d/actor/d_a_andsw2.cpp
+++ b/src/d/actor/d_a_andsw2.cpp
@@ -294,7 +294,7 @@ extern actor_process_profile_definition g_profile_ANDSW2 = {
&g_fopAc_Method.base,
0x0136,
&l_daAndsw2_Method,
- 0x00044000,
+ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
};
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index 576dd6fa..672cd6eb 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -679,7 +679,7 @@ BOOL daArrow_c::procMove() {
}
mCurrProcFunc = &procStop_BG;
- fopAcM_OnStatus(this, 0x4000);
+ fopAcM_OnStatus(this, fopAcStts_UNK4000_e);
fopAcM_SetParam(this, 2);
field_0x604 = 0x28;
@@ -721,7 +721,7 @@ BOOL daArrow_c::procMove() {
if (hitType > 0) {
field_0x604 = 0x28;
- fopAcM_OnStatus(this, 0x4000);
+ fopAcM_OnStatus(this, fopAcStts_UNK4000_e);
if (mPtclFollowCb.mpEmitter) {
mPtclFollowCb.end();
@@ -780,7 +780,7 @@ BOOL daArrow_c::procMove() {
}
mCurrProcFunc = &procStop_BG;
- fopAcM_OnStatus(this, 0x4000);
+ fopAcM_OnStatus(this, fopAcStts_UNK4000_e);
fopAcM_SetParam(this, 2);
field_0x604 = 0x28;
cM3dGPla* triPla = dComIfG_Bgsp()->i_GetTriPla(mLinChk);
@@ -1302,7 +1302,7 @@ extern actor_process_profile_definition g_profile_ARROW = {
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ 0x01BF,
/* Actor SubMtd */ &daArrowMethodTable,
- /* Status */ 0x00044000,
+ /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
};
diff --git a/src/d/actor/d_a_boss_item.cpp b/src/d/actor/d_a_boss_item.cpp
index 92692c69..3b8d4453 100644
--- a/src/d/actor/d_a_boss_item.cpp
+++ b/src/d/actor/d_a_boss_item.cpp
@@ -70,7 +70,7 @@ extern actor_process_profile_definition g_profile_BOSSITEM = {
&g_fopAc_Method.base,
0x00FB,
&daBossItem_METHODS,
- 0x00040000,
+ fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp
index 7d71368c..ce516706 100644
--- a/src/d/actor/d_a_branch.cpp
+++ b/src/d/actor/d_a_branch.cpp
@@ -271,7 +271,7 @@ extern actor_process_profile_definition g_profile_BRANCH = {
&g_fopAc_Method.base,
0x0193,
&l_daBranch_Method,
- 0x00044000,
+ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp
index b666600c..f329452e 100644
--- a/src/d/actor/d_a_disappear.cpp
+++ b/src/d/actor/d_a_disappear.cpp
@@ -142,7 +142,7 @@ extern actor_process_profile_definition g_profile_DISAPPEAR = {
&g_fopAc_Method.base,
0x0188,
&l_daDisappear_Method,
- 0x00044000,
+ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index 19413944..90487602 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -1083,7 +1083,7 @@ extern actor_process_profile_definition g_profile_ITEM = {
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ 0x00F5,
/* Actor SubMtd */ &l_daItem_Method,
- /* Status */ 0x000C0100,
+ /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
};
diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp
index 86048444..cf1cd76c 100644
--- a/src/d/actor/d_a_kaji.cpp
+++ b/src/d/actor/d_a_kaji.cpp
@@ -164,7 +164,7 @@ extern actor_process_profile_definition g_profile_Kaji = {
&g_fopAc_Method.base,
0x01AC,
&daKajiMethodTable,
- 0x00040100,
+ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp
index 6b68e404..2d875e55 100644
--- a/src/d/actor/d_a_kytag04.cpp
+++ b/src/d/actor/d_a_kytag04.cpp
@@ -89,7 +89,7 @@ extern actor_process_profile_definition g_profile_KYTAG04 = {
&g_fopAc_Method.base,
0xA4,
&l_daKytag04_Method,
- 0x00044000,
+ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp
index a07ab196..db68603c 100644
--- a/src/d/actor/d_a_kytag05.cpp
+++ b/src/d/actor/d_a_kytag05.cpp
@@ -2,32 +2,176 @@
// Generated by dtk
// Translation Unit: d_a_kytag05.cpp
//
+#include "JSystem/JKernel/JKRHeap.h"
+#include "JAZelAudio/JAIZelBasic.h"
+#include "d/actor/d_a_player.h"
+#include "d/actor/d_a_player_link.h"
+#include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_camera_mng.h"
+#include "d/d_com_inf_game.h"
+#include "d/d_kankyo_wether.h"
+#include "d/actor/d_a_ykgr.h"
+#include "m_Do/m_Do_audio.h"
+#include "d/d_procname.h"
-#include "d_a_kytag05.h"
-#include "dolphin/types.h"
-/* 00000078-00000080 .text daKytag05_Draw__FP13kytag05_class */
-void daKytag05_Draw(kytag05_class*) {
- /* Nonmatching */
+class kytag05_class : public fopAc_ac_c {
+public:
+ /* 0x00 */ u8 mIndex;
+ /* 0x04 */ int field_0x294;
+ /* 0x08 */ int field_0x298;
+}; /* size = 0x29C */
+
+BOOL daKytag05_Draw(kytag05_class*) {
+ return true;
}
+static const s16 wind_table[] = {
+ 0,
+ 90,
+ 180,
+ 270
+};
+
+static const s16 mufuu_timer[] = {
+ 0x0A,
+ 0xA,
+ 0x00,
+ 0x5A
+};
+
+static const s16 fuu_timer[] = {
+ 0x0096,
+ 0x0096,
+ 0x0096,
+ 0x0096,
+};
+
+
/* 00000080-000003F4 .text daKytag05_Execute__FP13kytag05_class */
-void daKytag05_Execute(kytag05_class*) {
- /* Nonmatching */
+int daKytag05_Execute(kytag05_class* a_this) {
+ /* Nonmatching - 92% matching */
+ daPy_py_c *playerActor;
+ camera_class *mpCamera;
+ f32 cameraEyeZ;
+ f32 i_blend;
+ f32 windPow;
+ u32 demoField;
+ mpCamera = dComIfGp_getCamera(0);
+ playerActor = daPy_getPlayerActorClass();
+ windPow = dKyw_get_wind_pow();
+ i_blend = 1.0f;
+
+ if (g_env_light.mWind.mEvtWindSet == 0xFF) {
+ return 1;
+ }
+ if (g_dComIfG_gameInfo.play.mEvtCtrl.mMode != 0 &&
+ dComIfGp_getEventManager().startCheckOld("demo41") != 0 &&
+ g_dComIfG_gameInfo.play.getDemo() != NULL) {
+ demoField = g_dComIfG_gameInfo.play.getDemo()->field_0xd4;
+ if(demoField >= 0x186) {
+ f32 fVar7 = ((f32)demoField - 390.0f) / 100.0f;
+ if(fVar7 > i_blend) {
+ fVar7 = i_blend;
+ }
+ i_blend = 1.0f - fVar7;
+ g_env_light.mSnowCount = (int)(200.0f * i_blend);
+ } else if (demoField == 0x187 && daYkgr_c::m_emitter != 0) {
+ daYkgr_c::m_alpha_flag = 0;
+ }
+ }
+ dKy_custom_colset(0, 7, i_blend);
+ if((a_this->mIndex & 1) == 0) {
+ if (a_this->field_0x294 >= fuu_timer[a_this->mIndex >> 1]) {
+ a_this->field_0x294 = 0;
+ a_this->mIndex += 1;
+ g_env_light.mWind.mEvtWindSet = 2;
+ } else {
+ a_this->field_0x294 += 1;
+ }
+ } else {
+ if (a_this->field_0x294 >= mufuu_timer[(a_this->mIndex) >> 1]) {
+ a_this->mIndex += 1;
+ if(a_this->mIndex >> 1 >= 4) {
+ a_this->mIndex = 0;
+ }
+ dKyw_evt_wind_set(0, wind_table[a_this->mIndex >> 1]);
+ a_this->field_0x294 = 0;
+ g_env_light.mWind.mEvtWindSet = 1;
+ } else {
+ a_this->field_0x294 += 1;
+ }
+ }
+ /* Numbers in this sections aren't necessarily right */
+ cameraEyeZ = mpCamera->mLookat.mEye.z;
+ if(cameraEyeZ > 360.0f|| playerActor->current.pos.z > 360.0f &&
+ mpCamera->mLookat.mEye.x > 450 || playerActor->current.pos.x > 450.0f){
+ if(cameraEyeZ > 540.0f || playerActor->current.pos.z < 540.0f) {
+ dKyw_evt_wind_set(0, 0x61A8);
+ } else if(cameraEyeZ > 630.0f || playerActor->current.pos.z > 630.0f) {
+ dKyw_evt_wind_set(0, 0x4E20);
+ } else {
+ dKyw_evt_wind_set(0,0x4650);
+ }
+ } else if(mpCamera->mLookat.mEye.z < 720 || playerActor->current.pos.x < 720) {
+ dKyw_evt_wind_set(0, -0x3E80);
+ } else if(mpCamera->mLookat.mEye.z < 810 || playerActor->current.pos.x < 810 ) {
+ dKyw_evt_wind_set(0, -0x4B00);
+ } else if(mpCamera->mLookat.mEye.z < 900 || playerActor->current.pos.x < 900) {
+ dKyw_evt_wind_set(0, -0x32C8);
+ }
+
+ mDoAud_seStart(0x106A, 0, (u32)(windPow * 180), 0);
+ return 1;
}
-/* 000003F4-000003FC .text daKytag05_IsDelete__FP13kytag05_class */
-void daKytag05_IsDelete(kytag05_class*) {
- /* Nonmatching */
+BOOL daKytag05_IsDelete(kytag05_class*) {
+ return true;
}
-/* 000003FC-00000404 .text daKytag05_Delete__FP13kytag05_class */
-void daKytag05_Delete(kytag05_class*) {
- /* Nonmatching */
+BOOL daKytag05_Delete(kytag05_class*) {
+ return true;
}
-/* 00000404-000004C0 .text daKytag05_Create__FP10fopAc_ac_c */
-void daKytag05_Create(fopAc_ac_c*) {
- /* Nonmatching */
+int daKytag05_Create(fopAc_ac_c* i_this) {
+ fopAcM_SetupActor(i_this, kytag05_class);
+ kytag05_class *a_this = (kytag05_class*)i_this;
+ if (dComIfGs_isSymbol(1) != 0) {
+ return 3;
+ }
+ a_this->mIndex = 0;
+ a_this->field_0x294 = 0;
+ a_this->field_0x298 = i_this->mBase.mParameters & 0xff;
+ dKyw_evt_wind_set_go();
+ dKyw_evt_wind_set(0,0);
+ g_env_light.mSnowCount = 200;
+ g_env_light.mMoyaMode = 0;
+ g_env_light.mMoyaCount = 100;
+
+ return 4;
}
+static actor_method_class l_daKytag05_Method = {
+ (process_method_func)daKytag05_Create,
+ (process_method_func)daKytag05_Delete,
+ (process_method_func)daKytag05_Execute,
+ (process_method_func)daKytag05_IsDelete,
+ (process_method_func)daKytag05_Draw,
+};
+
+extern actor_process_profile_definition g_profile_KYTAG06 = {
+ fpcLy_CURRENT_e,
+ 7,
+ fpcLy_CURRENT_e,
+ PROC_KYTAG05,
+ &g_fpcLf_Method.mBase,
+ sizeof(kytag05_class),
+ 0,
+ 0,
+ &g_fopAc_Method.base,
+ 0xA5,
+ &l_daKytag05_Method,
+ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
+ fopAc_ACTOR_e,
+ fopAc_CULLBOX_0_e,
+}; \ No newline at end of file
diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp
index 25ffecec..1743abcf 100644
--- a/src/d/actor/d_a_kytag06.cpp
+++ b/src/d/actor/d_a_kytag06.cpp
@@ -93,7 +93,7 @@ extern actor_process_profile_definition g_profile_KYTAG06 = {
&g_fopAc_Method.base,
0xA6,
&l_daKytag06_Method,
- 0x00044000,
+ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
}; \ No newline at end of file
diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp
index cf428ba2..b26e2144 100644
--- a/src/d/actor/d_a_magma.cpp
+++ b/src/d/actor/d_a_magma.cpp
@@ -74,7 +74,7 @@ extern actor_process_profile_definition g_profile_MAGMA = {
&g_fopAc_Method.base,
0x01BC,
&l_daMagma_Method,
- 0x00040180,
+ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e
};
diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp
index c0152902..0db41691 100644
--- a/src/d/actor/d_a_mbdoor.cpp
+++ b/src/d/actor/d_a_mbdoor.cpp
@@ -634,7 +634,7 @@ extern actor_process_profile_definition g_profile_MBDOOR = {
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ 0x0132,
/* Actor SubMtd */ &l_daMbdoor_Method,
- /* Status */ 0x00044000,
+ /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_6_e,
};
diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp
index d2e3775e..925abd1f 100644
--- a/src/d/actor/d_a_mozo.cpp
+++ b/src/d/actor/d_a_mozo.cpp
@@ -372,7 +372,7 @@ extern actor_process_profile_definition g_profile_MOZO = {
&g_fopAc_Method.base,
0x00D1,
&l_daMozo_Method,
- 0x00040100,
+ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp
index b436f08a..c8691a40 100644
--- a/src/d/actor/d_a_nh.cpp
+++ b/src/d/actor/d_a_nh.cpp
@@ -628,7 +628,7 @@ extern actor_process_profile_definition g_profile_NH = {
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ 0x013C,
/* Actor SubMtd */ &l_daNh_Method,
- /* Status */ 0x00040100,
+ /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
};
diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp
index 107a0955..5ddf2d63 100644
--- a/src/d/actor/d_a_obj_Ygush00.cpp
+++ b/src/d/actor/d_a_obj_Ygush00.cpp
@@ -197,7 +197,7 @@ extern actor_process_profile_definition g_profile_Obj_Ygush00 = {
&g_fopAc_Method.base,
0x005E,
&l_daObjYgush00_Method,
- 0x00040100,
+ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp
index 702dd7e8..65cc39c8 100644
--- a/src/d/actor/d_a_obj_barrier.cpp
+++ b/src/d/actor/d_a_obj_barrier.cpp
@@ -727,7 +727,7 @@ extern actor_process_profile_definition g_profile_Obj_Barrier = {
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ 131,
/* Actor SubMtd */ &l_daObjBarrier_Method,
- /* Status */ 0x40000,
+ /* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
};
diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp
index 7be6a4a9..759f6b1c 100644
--- a/src/d/actor/d_a_obj_mknjd.cpp
+++ b/src/d/actor/d_a_obj_mknjd.cpp
@@ -1131,7 +1131,7 @@ extern actor_process_profile_definition g_profile_Obj_MknjD = {
&g_fopAc_Method.base,
0x01C6,
&daObjMknjD::Mthd_Table,
- 0x00044100,
+ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp
index c3af525d..b4077adb 100644
--- a/src/d/actor/d_a_obj_movebox.cpp
+++ b/src/d/actor/d_a_obj_movebox.cpp
@@ -870,7 +870,7 @@ extern actor_process_profile_definition g_profile_Obj_Movebox = {
&g_fopAc_Method.base,
0x0015,
&daObjMovebox::Mthd_Table,
- 0x00040524,
+ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp
index 7a391fd4..fcd838a3 100644
--- a/src/d/actor/d_a_obj_paper.cpp
+++ b/src/d/actor/d_a_obj_paper.cpp
@@ -226,7 +226,7 @@ namespace daObjPaper {
/* 00000730-00000748 .text mode_wait_init__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_wait_init() {
- mStatus |= fopAcStts_NOEXEC_e;
+ mStatus |= fopAcStts_NOCULLEXEC_e;
mMode = ActMode_WAIT_e;
}
@@ -242,7 +242,7 @@ namespace daObjPaper {
/* 00000784-000007A4 .text mode_talk0_init__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk0_init() {
- mStatus &= ~fopAcStts_NOEXEC_e;
+ mStatus &= ~fopAcStts_NOCULLEXEC_e;
mMsgId = -1;
mMode = ActMode_TALKBEGIN_e;
}
@@ -402,8 +402,8 @@ namespace daObjPaper {
&g_fopAc_Method.base,
0x0108,
&Mthd_Table,
- 0x00040180,
+ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
- fopAc_CULLSPHERE_8_e,
+ fopAc_CULLSPHERE_CUSTOM_e,
};
}
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index bcaa0340..df7c64d5 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -1104,7 +1104,7 @@ extern actor_process_profile_definition g_profile_OBJ_TORIPOST = {
&g_fopAc_Method.base,
0x01B3,
&daObjTpostMethodTable,
- 0x00240138,
+ 0x18 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_4_e,
};
diff --git a/src/d/actor/d_a_rectangle.cpp b/src/d/actor/d_a_rectangle.cpp
index 0da36052..02519502 100644
--- a/src/d/actor/d_a_rectangle.cpp
+++ b/src/d/actor/d_a_rectangle.cpp
@@ -52,7 +52,7 @@ extern actor_process_profile_definition g_profile_RECTANGLE = {
&g_fopAc_Method.base,
0x9F,
&l_daRct_Method,
- 0x00040000,
+ fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
diff --git a/src/d/actor/d_a_scene_change.cpp b/src/d/actor/d_a_scene_change.cpp
index c5c27798..96654528 100644
--- a/src/d/actor/d_a_scene_change.cpp
+++ b/src/d/actor/d_a_scene_change.cpp
@@ -93,7 +93,7 @@ extern actor_process_profile_definition g_profile_SCENECHG = {
&g_fopAc_Method.base,
0x01A1,
&daSceneChgMethodTable,
- 0x00040000,
+ fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_4_e,
};
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index 190153c4..e989a1f4 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -261,7 +261,7 @@ extern actor_process_profile_definition g_profile_ShopItem = {
&g_fopAc_Method.base,
0x00FE,
&daShopItemMethodTable,
- 0x00044100,
+ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
diff --git a/src/d/actor/d_a_spotbox.cpp b/src/d/actor/d_a_spotbox.cpp
index 3b8ca169..ba8522bc 100644
--- a/src/d/actor/d_a_spotbox.cpp
+++ b/src/d/actor/d_a_spotbox.cpp
@@ -52,7 +52,6 @@ u32 daSpotbox_c::getType() {
return fopAcM_GetParam(this) & 1;
}
-
/* 00000078-000000C4 .text daSpotbox_Draw__FP11daSpotbox_c */
static int daSpotbox_Draw(daSpotbox_c* i_this) {
return ((daSpotbox_c*)i_this)->draw();
diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp
index 0bbc99bf..846e41bc 100644
--- a/src/d/actor/d_a_swc00.cpp
+++ b/src/d/actor/d_a_swc00.cpp
@@ -87,7 +87,7 @@ extern actor_process_profile_definition g_profile_SWC00 = {
&g_fopAc_Method.base,
0x011A,
&l_daSwc00_Method,
- 0x00040000,
+ fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
diff --git a/src/d/actor/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp
index 42a616b7..076c64a0 100644
--- a/src/d/actor/d_a_tag_kb_item.cpp
+++ b/src/d/actor/d_a_tag_kb_item.cpp
@@ -125,7 +125,7 @@ extern actor_process_profile_definition g_profile_TAG_KB_ITEM = {
&g_fopAc_Method.base,
0x0127,
&daTagKbItemMethodTable,
- 0x00040000,
+ fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp
index 8817fb7f..46666de6 100644
--- a/src/d/actor/d_a_tag_ret.cpp
+++ b/src/d/actor/d_a_tag_ret.cpp
@@ -147,18 +147,18 @@ namespace daTagRet {
};
extern actor_process_profile_definition g_profile_Tag_Ret = {
- fpcLy_CURRENT_e,
- 3,
- fpcLy_CURRENT_e,
- PROC_Tag_Ret,
- &g_fpcLf_Method.mBase,
- sizeof(daTagRet::Act_c),
- 0,
- 0,
- &g_fopAc_Method.base,
- 0x005F,
- &daTagRet::Mthd_Table,
- 0x00040000,
- fopAc_ACTOR_e,
- fopAc_CULLBOX_0_e,
+ /* LayerID */ fpcLy_CURRENT_e,
+ /* ListID */ 3,
+ /* ListPrio */ fpcLy_CURRENT_e,
+ /* ProcName */ PROC_Tag_Ret,
+ /* Proc SubMtd */ &g_fpcLf_Method.mBase,
+ /* Size */ sizeof(daTagRet::Act_c),
+ /* SizeOther */ 0,
+ /* Parameters */ 0,
+ /* Leaf SubMtd */ &g_fopAc_Method.base,
+ /* Priority */ 0x005F,
+ /* Actor SubMtd */ &daTagRet::Mthd_Table,
+ /* Status */ fopAcStts_UNK40000_e,
+ /* Group */ fopAc_ACTOR_e,
+ /* CullType */ fopAc_CULLBOX_0_e,
};
diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp
index cf7dde4e..9d1cf007 100644
--- a/src/d/d_throwstone.cpp
+++ b/src/d/d_throwstone.cpp
@@ -141,7 +141,7 @@ actor_process_profile_definition g_profile_THROWSTONE = {
&g_fopAc_Method.base,
0x01CE,
&l_daThrowstone_Method,
- 0x00040100,
+ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};