summaryrefslogtreecommitdiff
path: root/rel
diff options
context:
space:
mode:
authorHuitzi <mwernerhernandez@ufl.edu>2023-07-23 14:51:13 -0400
committerHuitzi <mwernerhernandez@ufl.edu>2023-07-23 14:51:13 -0400
commitfefcdfcd53d6651faaccc6a11a6172be66ec8b56 (patch)
tree1a5de68b145df57944dd2516a10c1f52fa2d550d /rel
parent70104dd4769a5e029a5d8b80512f7c9af489deca (diff)
d_a_tag_waterfall matching
Diffstat (limited to 'rel')
-rw-r--r--rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp479
1 files changed, 222 insertions, 257 deletions
diff --git a/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp b/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp
index 0769851d33..48456f2f0a 100644
--- a/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp
+++ b/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp
@@ -1,155 +1,67 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tag_waterfall
-//
+/**
+/* Translation Unit: d_a_tag_waterfall
+/*
+ */
#include "rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.h"
-#include "dol2asm.h"
-#include "dolphin/types.h"
-
-//
-// Types:
-//
-
-struct mDoMtx_stack_c {
- /* 8000CD9C */ void transM(f32, f32, f32);
-
- static u8 now[48];
-};
-
-struct fopAc_ac_c {
- /* 80018B64 */ fopAc_ac_c();
-};
-
-struct cXyz {};
-
-struct daTagWaterFall_c {
- /* 80D64680 */ bool draw();
- /* 80D64724 */ void getEllipseY(f32);
- /* 80D64768 */ void checkHitWaterFall(cXyz);
- /* 80D6486C */ void checkHitWaterFallCamera();
- /* 80D648B4 */ void execute();
- /* 80D64AE0 */ void _delete();
- /* 80D64B20 */ void create();
-};
-
-struct daTagWaterFall_HIO_c {
- /* 80D6462C */ daTagWaterFall_HIO_c();
- /* 80D64CDC */ ~daTagWaterFall_HIO_c();
-};
+#include "JSystem/JKernel/JKRHeap.h"
+#include "JSystem/JMath/JMath.h"
+#include "SSystem/SComponent/c_xyz.h"
+#include "d/com/d_com_inf_game.h"
+#include "d/d_procname.h"
//
// Forward References:
//
-extern "C" void __ct__20daTagWaterFall_HIO_cFv();
-extern "C" bool draw__16daTagWaterFall_cFv();
-extern "C" static void daTagWaterFall_Draw__FP16daTagWaterFall_c();
-extern "C" static void s_waterfall__FPvPv();
-extern "C" void getEllipseY__16daTagWaterFall_cFf();
-extern "C" void checkHitWaterFall__16daTagWaterFall_cF4cXyz();
-extern "C" void checkHitWaterFallCamera__16daTagWaterFall_cFv();
-extern "C" void execute__16daTagWaterFall_cFv();
-extern "C" static void daTagWaterFall_Execute__FP16daTagWaterFall_c();
-extern "C" static bool daTagWaterFall_IsDelete__FP16daTagWaterFall_c();
-extern "C" void _delete__16daTagWaterFall_cFv();
-extern "C" static void daTagWaterFall_Delete__FP16daTagWaterFall_c();
-extern "C" void create__16daTagWaterFall_cFv();
-extern "C" static void daTagWaterFall_Create__FP16daTagWaterFall_c();
-extern "C" void __dt__20daTagWaterFall_HIO_cFv();
-extern "C" void __sinit_d_a_tag_waterfall_cpp();
-
-//
-// External References:
-//
-
-extern "C" void mDoMtx_YrotS__FPA4_fs();
-extern "C" void transM__14mDoMtx_stack_cFfff();
-extern "C" void __ct__10fopAc_ac_cFv();
-extern "C" void fopAc_IsActor__FPv();
-extern "C" void fpcEx_Search__FPFPvPv_PvPv();
-extern "C" void fpcM_IsCreating__FUi();
-extern "C" void dKy_fog_startendz_set__Ffff();
-extern "C" void dKy_custom_colset__FUcUcf();
-extern "C" void cLib_chaseF__FPfff();
-extern "C" void __dl__FPv();
-extern "C" void PSMTXMultVec();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
-extern "C" u8 now__14mDoMtx_stack_c[48];
-extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
-extern "C" void __register_global_object();
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 80D64D74-80D64D78 000000 0004+00 4/4 0/0 0/0 .rodata @3758 */
-SECTION_RODATA static u8 const lit_3758[4] = {
- 0x00,
- 0x00,
- 0x00,
- 0x00,
-};
-COMPILER_STRIP_GATE(0x80D64D74, &lit_3758);
-
-/* 80D64D78-80D64D7C 000004 0004+00 0/1 0/0 0/0 .rodata @3759 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3759 = 10000.0f;
-COMPILER_STRIP_GATE(0x80D64D78, &lit_3759);
-#pragma pop
-
-/* 80D64D7C-80D64D80 000008 0004+00 0/1 0/0 0/0 .rodata @3760 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3760 = 3.0f;
-COMPILER_STRIP_GATE(0x80D64D7C, &lit_3760);
-#pragma pop
+static void daTagWaterFall_Draw(daTagWaterFall_c*);
+static void* s_waterfall(void*, void*);
+static void daTagWaterFall_Execute(daTagWaterFall_c*);
+static bool daTagWaterFall_IsDelete(daTagWaterFall_c*);
+static void daTagWaterFall_Delete(daTagWaterFall_c*);
+static void daTagWaterFall_Create(daTagWaterFall_c*);
/* 80D64D94-80D64D98 000000 0004+00 2/2 0/0 0/0 .data m_master_id */
-SECTION_DATA static u32 m_master_id = 0xFFFFFFFF;
+static u32 m_master_id = static_cast<u32>(0xFFFFFFFF);
/* 80D64D98-80D64DB8 -00001 0020+00 1/0 0/0 0/0 .data l_daTagWaterFall_Method */
-SECTION_DATA static void* l_daTagWaterFall_Method[8] = {
- (void*)daTagWaterFall_Create__FP16daTagWaterFall_c,
- (void*)daTagWaterFall_Delete__FP16daTagWaterFall_c,
- (void*)daTagWaterFall_Execute__FP16daTagWaterFall_c,
- (void*)daTagWaterFall_IsDelete__FP16daTagWaterFall_c,
- (void*)daTagWaterFall_Draw__FP16daTagWaterFall_c,
- (void*)NULL,
- (void*)NULL,
- (void*)NULL,
+static actor_method_class l_daTagWaterFall_Method = {
+ (process_method_func)daTagWaterFall_Create, (process_method_func)daTagWaterFall_Delete,
+ (process_method_func)daTagWaterFall_Execute, (process_method_func)daTagWaterFall_IsDelete,
+ (process_method_func)daTagWaterFall_Draw
};
/* 80D64DB8-80D64DE8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_WaterFall */
-SECTION_DATA extern void* g_profile_Tag_WaterFall[12] = {
- (void*)0xFFFFFFFD, (void*)0x0007FFFD,
- (void*)0x01F80000, (void*)&g_fpcLf_Method,
- (void*)0x00000584, (void*)NULL,
- (void*)NULL, (void*)&g_fopAc_Method,
- (void*)0x00C60000, (void*)&l_daTagWaterFall_Method,
- (void*)0x00044000, (void*)NULL,
-};
-
-/* 80D64DE8-80D64DF4 000054 000C+00 2/2 0/0 0/0 .data __vt__20daTagWaterFall_HIO_c */
-SECTION_DATA extern void* __vt__20daTagWaterFall_HIO_c[3] = {
- (void*)NULL /* RTTI */,
- (void*)NULL,
- (void*)__dt__20daTagWaterFall_HIO_cFv,
+extern actor_process_profile_definition g_profile_Tag_WaterFall = {
+ -3,
+ 7,
+ 0xFFFD,
+ PROC_Tag_WaterFall,
+ &g_fpcLf_Method.mBase,
+ sizeof(daTagWaterFall_c),
+ 0,
+ 0,
+ &g_fopAc_Method.base,
+ 0x00C6,
+ &l_daTagWaterFall_Method,
+ 0x00044000,
+ 0,
+ 0
};
/* 80D6462C-80D64680 0000EC 0054+00 1/1 0/0 0/0 .text __ct__20daTagWaterFall_HIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm daTagWaterFall_HIO_c::daTagWaterFall_HIO_c() {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/__ct__20daTagWaterFall_HIO_cFv.s"
+daTagWaterFall_HIO_c::daTagWaterFall_HIO_c() {
+ this->field_0x04 = -1;
+ this->mBaseFogNear = 0.0f;
+ this->mBaseFogFar = 10000.0f;
+ this->mColorBlendStepDivisor = 3.0f;
+ this->mShouldModifyFog = false;
+ this->field_0x14 = 0;
+ this->field_0x15 = 0;
+ this->field_0x18 = 0.0f;
+ this->field_0x1C = 0.0f;
+ this->field_0x20 = 0.0f;
}
-#pragma pop
/* 80D64680-80D64688 000140 0008+00 1/1 0/0 0/0 .text draw__16daTagWaterFall_cFv */
bool daTagWaterFall_c::draw() {
@@ -157,176 +69,229 @@ bool daTagWaterFall_c::draw() {
}
/* 80D64688-80D646A8 000148 0020+00 1/0 0/0 0/0 .text daTagWaterFall_Draw__FP16daTagWaterFall_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagWaterFall_Draw(daTagWaterFall_c* param_0) {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/daTagWaterFall_Draw__FP16daTagWaterFall_c.s"
+static void daTagWaterFall_Draw(daTagWaterFall_c* i_this) {
+ i_this->draw();
}
-#pragma pop
/* 80D646A8-80D64724 000168 007C+00 1/1 0/0 0/0 .text s_waterfall__FPvPv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void s_waterfall(void* param_0, void* param_1) {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/s_waterfall__FPvPv.s"
+void* s_waterfall(void* pProc, void* unused) {
+ if (fopAc_IsActor(pProc)) {
+ if (fopAcM_GetName(pProc) == PROC_Tag_WaterFall) {
+ daTagWaterFall_c* pProcWaterfallTag = static_cast<daTagWaterFall_c*>(pProc);
+
+ s32 id = fpcM_GetID(pProc);
+ if (!fpcM_IsCreating(id)) {
+ if (pProcWaterfallTag->checkHitWaterFallCamera()) {
+ return pProc;
+ }
+ }
+ }
+ }
+
+ return NULL;
}
-#pragma pop
-
-/* ############################################################################################## */
-/* 80D64D80-80D64D84 00000C 0004+00 2/2 0/0 0/0 .rodata @3803 */
-SECTION_RODATA static f32 const lit_3803 = 1.0f;
-COMPILER_STRIP_GATE(0x80D64D80, &lit_3803);
/* 80D64724-80D64768 0001E4 0044+00 1/1 0/0 0/0 .text getEllipseY__16daTagWaterFall_cFf
*/
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagWaterFall_c::getEllipseY(f32 param_0) {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/getEllipseY__16daTagWaterFall_cFf.s"
+f32 daTagWaterFall_c::getEllipseY(f32 x) {
+ // Ellipse is in standard form;
+ // x,y-plane of ellipse is the horizontal world plane
+
+ f32 ellipseRadiusB = this->mCylinderRadiusB;
+ f32 ellipseRadiusA = this->mCylinderRadiusA;
+ f32 ellipseRadiusBSquared = ellipseRadiusB * ellipseRadiusB;
+ f32 ellipseRadiusASquared = ellipseRadiusA * ellipseRadiusA;
+
+ f32 ellipseYSquared_OverBSquared = (1.0f - ((x * x) / (ellipseRadiusASquared)));
+ f32 ellipseYSquared = (ellipseRadiusBSquared)*ellipseYSquared_OverBSquared;
+
+ return JMAFastSqrt(ellipseYSquared);
}
-#pragma pop
/* 80D64768-80D6486C 000228 0104+00 1/1 0/0 2/2 .text checkHitWaterFall__16daTagWaterFall_cF4cXyz
*/
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagWaterFall_c::checkHitWaterFall(cXyz param_0) {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/checkHitWaterFall__16daTagWaterFall_cF4cXyz.s"
+bool daTagWaterFall_c::checkHitWaterFall(cXyz objPos) {
+ Vec dst;
+
+ f32 ellipseRadiusA = this->mCylinderRadiusA;
+
+ // Instructions are reordered if GetY() is used
+ mDoMtx_stack_c::YrotS(-fopAcM_GetShapeAngle_p(this).y);
+
+ const cXyz& waterfallTagPos = fopAcM_GetPosition(this);
+ mDoMtx_stack_c::transM(-waterfallTagPos.x, -waterfallTagPos.y, -waterfallTagPos.z);
+
+ mDoMtx_stack_c::multVec(&objPos, &dst);
+
+ if (fabsf(dst.x) < ellipseRadiusA) {
+ const f32 absEllipseY = fabsf(this->getEllipseY(dst.x));
+ if (fabsf(dst.z) < absEllipseY) {
+ if (waterfallTagPos.y < objPos.y) {
+ // Instruction reordering occurs when mCylinderHeight == 0.0f is used
+ if (!this->mCylinderHeight || (waterfallTagPos.y + this->mCylinderHeight) > objPos.y)
+ {
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
}
-#pragma pop
/* 80D6486C-80D648B4 00032C 0048+00 1/1 0/0 0/0 .text
* checkHitWaterFallCamera__16daTagWaterFall_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagWaterFall_c::checkHitWaterFallCamera() {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/checkHitWaterFallCamera__16daTagWaterFall_cFv.s"
+bool daTagWaterFall_c::checkHitWaterFallCamera() {
+ const camera_class* camera = dComIfGp_getCamera(0);
+ return this->checkHitWaterFall(camera->mLookat.mEye);
}
-#pragma pop
/* ############################################################################################## */
/* 80D64E00-80D64E04 000008 0004+00 2/2 0/0 0/0 .bss None */
-static u8 data_80D64E00[4];
-
-/* 80D64E04-80D64E10 00000C 000C+00 1/1 0/0 0/0 .bss @3753 */
-static u8 lit_3753[12];
+static bool masterWaterfallTagExists;
/* 80D64E10-80D64E34 000018 0024+00 3/3 0/0 0/0 .bss l_HIO */
-static u8 l_HIO[36];
+static daTagWaterFall_HIO_c l_HIO;
/* 80D648B4-80D64AB8 000374 0204+00 1/1 0/0 0/0 .text execute__16daTagWaterFall_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagWaterFall_c::execute() {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/execute__16daTagWaterFall_cFv.s"
+bool daTagWaterFall_c::execute() {
+ u32 masterId = m_master_id;
+ u32 waterfallId = fpcM_GetID(this);
+
+ if (masterId == waterfallId) {
+ if (this->mFrameCountdown) {
+ const dScnKy_env_light_c* const envLight = i_dKy_getEnvlight();
+ this->mFogNear = envLight->mFogNear;
+ this->mFogFar = envLight->mFogFar;
+ this->mFrameCountdown--;
+ this->mColpat = envLight->mColpatWeather;
+ this->mColorBlend = 1.0f;
+ } else {
+ bool currCameraInWaterfall = false;
+ if (fpcEx_Search(s_waterfall, this)) {
+ currCameraInWaterfall = true;
+ }
+
+ if (!currCameraInWaterfall) {
+ if (!this->mPrevCameraInWaterfall && this->mColorBlend == 1.0f) {
+ return true;
+ }
+ }
+
+ if ((!this->mPrevCameraInWaterfall && currCameraInWaterfall) || (this->mPrevCameraInWaterfall && !currCameraInWaterfall)) {
+ this->mColorBlend = 1.0f - this->mColorBlend;
+ this->mPrevCameraInWaterfall = currCameraInWaterfall;
+ }
+
+ cLib_chaseF(&this->mColorBlend, 1.0f, 1.0f / l_HIO.mColorBlendStepDivisor);
+
+ if (!this->mPrevCameraInWaterfall) {
+ dKy_custom_colset(7, this->mColpat, this->mColorBlend);
+ } else {
+ dKy_custom_colset(this->mColpat, 7, this->mColorBlend);
+ }
+
+ f32 instanceFogMultiplier;
+ f32 HIOFogMultiplier;
+
+ if (l_HIO.mShouldModifyFog) {
+ if (this->mPrevCameraInWaterfall) {
+ instanceFogMultiplier = 1.0f - this->mColorBlend;
+ HIOFogMultiplier = this->mColorBlend;
+ } else {
+ instanceFogMultiplier = this->mColorBlend;
+ HIOFogMultiplier = 1.0f - this->mColorBlend;
+ };
+
+ f32 fogParam0 = (this->mFogNear * instanceFogMultiplier) + (l_HIO.mBaseFogNear * HIOFogMultiplier);
+ f32 fogParam1 = (this->mFogFar * instanceFogMultiplier) + (l_HIO.mBaseFogFar * HIOFogMultiplier);
+
+ dKy_fog_startendz_set(fogParam0, fogParam1, 1.0f);
+ }
+ }
+ }
+
+ return true;
}
-#pragma pop
/* 80D64AB8-80D64AD8 000578 0020+00 1/0 0/0 0/0 .text daTagWaterFall_Execute__FP16daTagWaterFall_c
*/
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagWaterFall_Execute(daTagWaterFall_c* param_0) {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/daTagWaterFall_Execute__FP16daTagWaterFall_c.s"
+
+static void daTagWaterFall_Execute(daTagWaterFall_c* i_this) {
+ i_this->execute();
}
-#pragma pop
/* 80D64AD8-80D64AE0 000598 0008+00 1/0 0/0 0/0 .text
* daTagWaterFall_IsDelete__FP16daTagWaterFall_c */
-static bool daTagWaterFall_IsDelete(daTagWaterFall_c* param_0) {
+static bool daTagWaterFall_IsDelete(daTagWaterFall_c* i_this) {
return true;
}
/* 80D64AE0-80D64B00 0005A0 0020+00 1/1 0/0 0/0 .text _delete__16daTagWaterFall_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagWaterFall_c::_delete() {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/_delete__16daTagWaterFall_cFv.s"
+bool daTagWaterFall_c::_delete() {
+ if (this->mIsMasterWaterfallTag) {
+ masterWaterfallTagExists = false;
+ }
+ return true;
}
-#pragma pop
/* 80D64B00-80D64B20 0005C0 0020+00 1/0 0/0 0/0 .text daTagWaterFall_Delete__FP16daTagWaterFall_c
*/
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagWaterFall_Delete(daTagWaterFall_c* param_0) {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/daTagWaterFall_Delete__FP16daTagWaterFall_c.s"
+static void daTagWaterFall_Delete(daTagWaterFall_c* i_this) {
+ i_this->_delete();
}
-#pragma pop
-/* ############################################################################################## */
-/* 80D64D84-80D64D8C 000010 0008+00 1/1 0/0 0/0 .rodata @3959 */
-SECTION_RODATA static u8 const lit_3959[8] = {
- 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80D64D84, &lit_3959);
+/* 80D64B20-80D64CBC 0005E0 019C+00 1/1 0/0 0/0 .text create__16daTagWaterFall_cFv */
+cPhs__Step daTagWaterFall_c::create() {
+ if (!fopAcM_CheckCondition(this, 8)) {
+ new (this) daTagWaterFall_c();
+ fopAcM_OnCondition(this, 8);
+ }
-/* 80D64D8C-80D64D94 000018 0008+00 1/1 0/0 0/0 .rodata @3960 */
-SECTION_RODATA static u8 const lit_3960[8] = {
- 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80D64D8C, &lit_3960);
+ if (masterWaterfallTagExists == false) {
+ masterWaterfallTagExists = true;
+ this->mIsMasterWaterfallTag = 1;
+ l_HIO.field_0x04 = -1;
+ }
-/* 80D64B20-80D64CBC 0005E0 019C+00 1/1 0/0 0/0 .text create__16daTagWaterFall_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagWaterFall_c::create() {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/create__16daTagWaterFall_cFv.s"
+ this->mCylinderRadiusA = static_cast<f32>(fpcM_GetParam(this) & 0x0000FFFF);
+
+ if (this->mCylinderRadiusA < 0.0f) {
+ this->mCylinderRadiusB = 0.0f;
+ }
+
+ this->mCylinderHeight = static_cast<f32>((fpcM_GetParam(this) & 0xFFFF0000) >> 16);
+
+ if (this->mCylinderHeight < 0.0f) {
+ this->mCylinderHeight = 0.0f;
+ }
+
+ this->mCylinderRadiusB = static_cast<f32>((fopAcM_GetAngle_p(this).GetX() & 0x0000FFFF));
+
+ if (this->mCylinderRadiusB <= 0.0f) {
+ this->mCylinderRadiusB = this->mCylinderRadiusA;
+ }
+
+ fopAcM_GetShapeAngle_p(this).x = 0;
+ fopAcM_GetAngle_p(this).x = 0;
+
+ if (m_master_id + (1 << 16) == 0xFFFF) {
+ u32 id = fopAcM_GetID(this);
+
+ m_master_id = id;
+
+ this->mColorBlend = 0.0f;
+ this->mFrameCountdown = 30;
+ }
+
+ return cPhs_COMPLEATE_e;
}
-#pragma pop
/* 80D64CBC-80D64CDC 00077C 0020+00 1/0 0/0 0/0 .text daTagWaterFall_Create__FP16daTagWaterFall_c
*/
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagWaterFall_Create(daTagWaterFall_c* param_0) {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/daTagWaterFall_Create__FP16daTagWaterFall_c.s"
+static void daTagWaterFall_Create(daTagWaterFall_c* i_this) {
+ i_this->create();
}
-#pragma pop
/* 80D64CDC-80D64D24 00079C 0048+00 2/1 0/0 0/0 .text __dt__20daTagWaterFall_HIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm daTagWaterFall_HIO_c::~daTagWaterFall_HIO_c() {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/__dt__20daTagWaterFall_HIO_cFv.s"
-}
-#pragma pop
-
-/* 80D64D24-80D64D60 0007E4 003C+00 0/0 1/0 0/0 .text __sinit_d_a_tag_waterfall_cpp */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void __sinit_d_a_tag_waterfall_cpp() {
- nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall/__sinit_d_a_tag_waterfall_cpp.s"
-}
-#pragma pop
-
-#pragma push
-#pragma force_active on
-REGISTER_CTORS(0x80D64D24, __sinit_d_a_tag_waterfall_cpp);
-#pragma pop
+daTagWaterFall_HIO_c::~daTagWaterFall_HIO_c() {} \ No newline at end of file