d_a_obj_snow_soup OK (#1986)

1 files changed, 165 insertions, 366 deletions

diff --git a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp
index b07f756ae7..944fbf672e 100644
--- a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp
+++ b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp
@@ -4,429 +4,228 @@
 //
 
 #include "rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h"
-#include "dol2asm.h"
-
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct mDoMtx_stack_c {
-    static u8 now[48];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-    /* 80018C8C */ ~fopAc_ac_c();
-};
-
-struct daObjSnowSoup_c {
-    /* 80CDF878 */ daObjSnowSoup_c();
-    /* 80CDF910 */ ~daObjSnowSoup_c();
-    /* 80CDF990 */ void createHeap();
-    /* 80CDFA3C */ void create();
-    /* 80CDFB70 */ void Delete();
-    /* 80CDFBC4 */ void draw();
-    /* 80CDFC40 */ void execute();
-    /* 80CDFE14 */ void init();
-    /* 80CDFEA4 */ void setModelMtx();
-    /* 80CDFF14 */ void createSmkEmtCommon();
-    /* 80CDFFF8 */ void deleteSmkEmtCommon();
-    /* 80CE003C */ void createSmkEmtChange(int);
-    /* 80CE0134 */ void deleteSmkEmtChange(int);
-};
-
-struct dSv_event_flag_c {
-    static u8 saveBitLabels[1644 + 4 /* padding */];
-};
-
-struct dSv_event_c {
-    /* 800349BC */ void isEventBit(u16) const;
-};
-
-struct dKy_tevstr_c {};
-
-struct J3DModelData {};
-
-struct cXyz {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct csXyz {
-    /* 802673F4 */ csXyz(s16, s16, s16);
-};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-};
-
-struct JAISoundID {};
-
-struct Vec {};
-
-struct Z2SeMgr {
-    /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct J3DModel {};
-
-//
-// Forward References:
-//
-
-extern "C" static void daObjSnowSoup_c_createHeap__FP10fopAc_ac_c();
-extern "C" void __ct__15daObjSnowSoup_cFv();
-extern "C" void __dt__15daObjSnowSoup_cFv();
-extern "C" void createHeap__15daObjSnowSoup_cFv();
-extern "C" void create__15daObjSnowSoup_cFv();
-extern "C" void Delete__15daObjSnowSoup_cFv();
-extern "C" void draw__15daObjSnowSoup_cFv();
-extern "C" void execute__15daObjSnowSoup_cFv();
-extern "C" void init__15daObjSnowSoup_cFv();
-extern "C" void setModelMtx__15daObjSnowSoup_cFv();
-extern "C" void createSmkEmtCommon__15daObjSnowSoup_cFv();
-extern "C" void deleteSmkEmtCommon__15daObjSnowSoup_cFv();
-extern "C" void createSmkEmtChange__15daObjSnowSoup_cFi();
-extern "C" void deleteSmkEmtChange__15daObjSnowSoup_cFi();
-extern "C" static void daObjSnowSoup_create__FP15daObjSnowSoup_c();
-extern "C" static void daObjSnowSoup_Delete__FP15daObjSnowSoup_c();
-extern "C" static void daObjSnowSoup_execute__FP15daObjSnowSoup_c();
-extern "C" static void daObjSnowSoup_draw__FP15daObjSnowSoup_c();
-extern "C" extern char const* const d_a_obj_snow_soup__stringBase0;
-
-//
-// External References:
-//
-
-SECTION_INIT void memset();
-extern "C" void mDoMtx_YrotM__FPA4_fs();
-extern "C" void mDoExt_modelUpdate__FP8J3DModel();
-extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
-extern "C" void __ct__10fopAc_ac_cFv();
-extern "C" void __dt__10fopAc_ac_cFv();
-extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
-extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData();
-extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
-extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
-extern "C" void dComIfGp_getReverb__Fi();
-extern "C" void isEventBit__11dSv_event_cCFUs();
-extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
-extern "C" void
-set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
-extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
-extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
-extern "C" void __ct__5csXyzFsss();
-extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
-extern "C" void __dl__FPv();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
-extern "C" void _savegpr_24();
-extern "C" void _savegpr_25();
-extern "C" void _restgpr_24();
-extern "C" void _restgpr_25();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
-extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* 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" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
-
-//
-// Declarations:
-//
+#include "MSL_C/MSL_Common/Src/string.h"
+#include "JSystem/JKernel/JKRHeap.h"
+#include "d/com/d_com_inf_game.h"
+#include "f_op/f_op_actor.h"
+#include "f_op/f_op_actor_mng.h"
+#include "d/d_procname.h"
 
 /* 80CDF858-80CDF878 000078 0020+00 1/1 0/0 0/0 .text daObjSnowSoup_c_createHeap__FP10fopAc_ac_c
  */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjSnowSoup_c_createHeap(fopAc_ac_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_c_createHeap__FP10fopAc_ac_c.s"
+static int daObjSnowSoup_c_createHeap(fopAc_ac_c* i_this) {
+    return static_cast<daObjSnowSoup_c*>(i_this)->createHeap();
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 80CE0274-80CE0274 000038 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_80CE0274 = "SnowSoup";
-#pragma pop
 
 /* 80CE0280-80CE0284 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
-SECTION_DATA static void* l_arcName = (void*)&d_a_obj_snow_soup__stringBase0;
+static char* l_arcName = "SnowSoup";
 
-/* 80CE0284-80CE02A4 -00001 0020+00 1/0 0/0 0/0 .data            daObjSnowSoup_METHODS */
-SECTION_DATA static void* daObjSnowSoup_METHODS[8] = {
-    (void*)daObjSnowSoup_create__FP15daObjSnowSoup_c,
-    (void*)daObjSnowSoup_Delete__FP15daObjSnowSoup_c,
-    (void*)daObjSnowSoup_execute__FP15daObjSnowSoup_c,
-    (void*)NULL,
-    (void*)daObjSnowSoup_draw__FP15daObjSnowSoup_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-};
-
-/* 80CE02A4-80CE02D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SnowSoup */
-SECTION_DATA extern void* g_profile_Obj_SnowSoup[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x019B0000, (void*)&g_fpcLf_Method,
-    (void*)0x000005C4, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02E20000, (void*)&daObjSnowSoup_METHODS,
-    (void*)0x00044100, (void*)0x030E0000,
-};
-
-/* 80CE02D4-80CE02E0 000054 000C+00 2/2 0/0 0/0 .data            __vt__15daObjSnowSoup_c */
-SECTION_DATA extern void* __vt__15daObjSnowSoup_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__15daObjSnowSoup_cFv,
-};
+/* 80CE023C-80CE0248 000000 000C+00 3/3 0/0 0/0 .rodata          SOUP_MODEL_OFFSET */
+static Vec const SOUP_MODEL_OFFSET = {3317.86f, 214.73f, 323.3f};
 
 /* 80CDF878-80CDF910 000098 0098+00 2/2 0/0 0/0 .text            __ct__15daObjSnowSoup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm daObjSnowSoup_c::daObjSnowSoup_c() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/__ct__15daObjSnowSoup_cFv.s"
+daObjSnowSoup_c::daObjSnowSoup_c() {
+    for (int i = 0; i < 3; i++) {
+        for (int j = 0; j < 2; j++) {
+            mpSmkEmtChange[i][j] = NULL;
+        }
+    }
+    memset(mpSmkEmtCommon, 0, 0x10);
+    memset(mpModel, 0, 0xc);
 }
-#pragma pop
 
 /* 80CDF910-80CDF990 000130 0080+00 1/0 0/0 0/0 .text            __dt__15daObjSnowSoup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm daObjSnowSoup_c::~daObjSnowSoup_c() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/__dt__15daObjSnowSoup_cFv.s"
+daObjSnowSoup_c::~daObjSnowSoup_c() {
+    dComIfG_resDelete(this, l_arcName);
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 80CE023C-80CE0248 000000 000C+00 3/3 0/0 0/0 .rodata          SOUP_MODEL_OFFSET */
-SECTION_RODATA static u8 const SOUP_MODEL_OFFSET[12] = {
-    0x45, 0x4F, 0x5D, 0xC3, 0x43, 0x56, 0xBA, 0xE1, 0x43, 0xA1, 0xA6, 0x66,
-};
-COMPILER_STRIP_GATE(0x80CE023C, &SOUP_MODEL_OFFSET);
-
-/* 80CE0248-80CE0254 00000C 000C+00 1/1 0/0 0/0 .rodata          BMD_IDX$3657 */
-SECTION_RODATA static u8 const BMD_IDX[12] = {
-    0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05,
-};
-COMPILER_STRIP_GATE(0x80CE0248, &BMD_IDX);
 
 /* 80CDF990-80CDFA3C 0001B0 00AC+00 1/1 0/0 0/0 .text            createHeap__15daObjSnowSoup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjSnowSoup_c::createHeap() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createHeap__15daObjSnowSoup_cFv.s"
+int daObjSnowSoup_c::createHeap() {
+    static u32 const BMD_IDX[3] = {3, 4, 5};
+    for (int i = 0; i < 3; i++) {
+        J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMD_IDX[i]);
+        mpModel[i] = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
+        if (mpModel[i] == NULL) {
+            return false;
+        }
+    }
+    return true;
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 80CE0254-80CE0258 000018 0004+00 1/3 0/0 0/0 .rodata          @3706 */
-SECTION_RODATA static u8 const lit_3706[4] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-COMPILER_STRIP_GATE(0x80CE0254, &lit_3706);
 
 /* 80CDFA3C-80CDFB70 00025C 0134+00 1/1 0/0 0/0 .text            create__15daObjSnowSoup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjSnowSoup_c::create() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/create__15daObjSnowSoup_cFv.s"
+cPhs__Step daObjSnowSoup_c::create() {
+    fopAcM_SetupActor(this, daObjSnowSoup_c);
+    cPhs__Step step = (cPhs__Step)dComIfG_resLoad(this, l_arcName);
+    if (step == cPhs_COMPLEATE_e) {
+        if (!fopAcM_entrySolidHeap(this, daObjSnowSoup_c_createHeap, 0x6500)) {
+            return cPhs_ERROR_e;
+        }
+        init();
+        setModelMtx();
+        fopAcM_SetMtx(this, mpModel[mState]->getBaseTRMtx());
+        fopAcM_setCullSizeBox2(this, mpModel[mState]->getModelData());
+        createSmkEmtCommon();
+        createSmkEmtChange(mState);
+        mBubblePos.set(SOUP_MODEL_OFFSET.x, SOUP_MODEL_OFFSET.y, SOUP_MODEL_OFFSET.z);
+        mFirewoodPos.set(SOUP_MODEL_OFFSET.x, 0.0f, SOUP_MODEL_OFFSET.z);
+    }
+    return step;
 }
-#pragma pop
 
 /* 80CDFB70-80CDFBC4 000390 0054+00 1/1 0/0 0/0 .text            Delete__15daObjSnowSoup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjSnowSoup_c::Delete() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/Delete__15daObjSnowSoup_cFv.s"
+int daObjSnowSoup_c::Delete() {
+    deleteSmkEmtCommon();
+    deleteSmkEmtChange(mState);
+    this->~daObjSnowSoup_c();
+    return 1;
 }
-#pragma pop
 
 /* 80CDFBC4-80CDFC40 0003E4 007C+00 1/1 0/0 0/0 .text            draw__15daObjSnowSoup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjSnowSoup_c::draw() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/draw__15daObjSnowSoup_cFv.s"
+int daObjSnowSoup_c::draw() {
+    g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
+    g_env_light.setLightTevColorType_MAJI(mpModel[mState]->mModelData, &mTevStr);
+    mDoExt_modelUpdate(mpModel[mState]);
+    return 1;
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 80CE0258-80CE025C 00001C 0004+00 1/3 0/0 0/0 .rodata          @3757 */
-SECTION_RODATA static f32 const lit_3757 = 1.0f;
-COMPILER_STRIP_GATE(0x80CE0258, &lit_3757);
-
-/* 80CE025C-80CE0260 000020 0004+00 1/1 0/0 0/0 .rodata          @3758 */
-SECTION_RODATA static f32 const lit_3758 = -1.0f;
-COMPILER_STRIP_GATE(0x80CE025C, &lit_3758);
 
 /* 80CDFC40-80CDFE14 000460 01D4+00 1/1 0/0 0/0 .text            execute__15daObjSnowSoup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjSnowSoup_c::execute() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/execute__15daObjSnowSoup_cFv.s"
+int daObjSnowSoup_c::execute() {
+    i_mDoAud_seStartLevel(Z2SE_OBJ_NABE_BUBBLE, &mBubblePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+    i_mDoAud_seStartLevel(Z2SE_OBJ_FIREWOOD_BURNING, &mFirewoodPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+    switch (mState) {
+    case 0:
+        if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[7])) {
+            deleteSmkEmtChange(mState);
+            mState = 1;
+            createSmkEmtChange(mState);
+            setModelMtx();
+            fopAcM_SetMtx(this, mpModel[mState]->getBaseTRMtx());
+            return 1;
+        }
+        break;
+    case 1:
+        if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[8])) {
+            deleteSmkEmtChange(mState);
+            mState = 2;
+            createSmkEmtChange(mState);
+            setModelMtx();
+            fopAcM_SetMtx(this, mpModel[mState]->getBaseTRMtx());
+            return 1;
+        }
+        break;
+    case 2:
+        break;
+    }
+    setModelMtx();
+    return 1;
 }
-#pragma pop
 
 /* 80CDFE14-80CDFEA4 000634 0090+00 1/1 0/0 0/0 .text            init__15daObjSnowSoup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjSnowSoup_c::init() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/init__15daObjSnowSoup_cFv.s"
+void daObjSnowSoup_c::init() {
+    mState = 0;
+    if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[8])) {
+        mState = 2;
+    } else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[7])) {
+        mState = 1;
+    }
 }
-#pragma pop
 
 /* 80CDFEA4-80CDFF14 0006C4 0070+00 2/2 0/0 0/0 .text            setModelMtx__15daObjSnowSoup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjSnowSoup_c::setModelMtx() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/setModelMtx__15daObjSnowSoup_cFv.s"
+void daObjSnowSoup_c::setModelMtx() {
+    mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
+    mDoMtx_stack_c::YrotM(shape_angle.y);
+    mpModel[mState]->i_setBaseTRMtx(mDoMtx_stack_c::get());
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 80CE0260-80CE0268 000024 0008+00 0/1 0/0 0/0 .rodata          PARTICLE_NAME$3789 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const PARTICLE_NAME_3789[8] = {
-    0x87, 0xE1, 0x87, 0xE2, 0x87, 0xE3, 0x87, 0xE6,
-};
-COMPILER_STRIP_GATE(0x80CE0260, &PARTICLE_NAME_3789);
-#pragma pop
 
 /* 80CDFF14-80CDFFF8 000734 00E4+00 1/1 0/0 0/0 .text createSmkEmtCommon__15daObjSnowSoup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjSnowSoup_c::createSmkEmtCommon() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createSmkEmtCommon__15daObjSnowSoup_cFv.s"
+void daObjSnowSoup_c::createSmkEmtCommon() {
+    static u16 const PARTICLE_NAME[4] = {0x87E1, 0x87E2, 0x87E3, 0x87E6};
+    cXyz vec1(0.0f, 0.0f, 0.0f);
+    csXyz vec2(0, 0, 0);
+    cXyz vec3(1.0f, 1.0f, 1.0f);
+    for (int i = 0; i < 4; i++) {
+        mpSmkEmtCommon[i] = dComIfGp_particle_set(PARTICLE_NAME[i], &vec1, &vec2, &vec3);
+    }
 }
-#pragma pop
 
 /* 80CDFFF8-80CE003C 000818 0044+00 1/1 0/0 0/0 .text deleteSmkEmtCommon__15daObjSnowSoup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjSnowSoup_c::deleteSmkEmtCommon() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/deleteSmkEmtCommon__15daObjSnowSoup_cFv.s"
+void daObjSnowSoup_c::deleteSmkEmtCommon() {
+    for (int i = 0; i < 4; i++) {
+        if (mpSmkEmtCommon[i] != NULL) {
+            mpSmkEmtCommon[i]->becomeInvalidEmitter();
+            mpSmkEmtCommon[i] = NULL;
+        }
+    }
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 80CE0268-80CE0274 00002C 000C+00 0/1 0/0 0/0 .rodata          PARTICLE_NAME$3834 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const PARTICLE_NAME_3834[12] = {
-    0x89, 0x84, 0x89, 0x85, 0x8A, 0x8B, 0x8A, 0x8D, 0x8A, 0x8C, 0x8A, 0x8E,
-};
-COMPILER_STRIP_GATE(0x80CE0268, &PARTICLE_NAME_3834);
-#pragma pop
 
 /* 80CE003C-80CE0134 00085C 00F8+00 2/2 0/0 0/0 .text createSmkEmtChange__15daObjSnowSoup_cFi */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjSnowSoup_c::createSmkEmtChange(int param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createSmkEmtChange__15daObjSnowSoup_cFi.s"
+void daObjSnowSoup_c::createSmkEmtChange(int i_state) {
+    static u16 const PARTICLE_NAME[3][2] = {{0x8984, 0x8985}, {0x8A8B, 0x8A8D}, {0x8A8C, 0x8A8E}};
+    cXyz vec1(0.0f, 0.0f, 0.0f);
+    csXyz vec2(0, 0, 0);
+    cXyz vec3(1.0f, 1.0f, 1.0f);
+    for (int i = 0; i < 2; i++) {
+        mpSmkEmtChange[i_state][i] =
+            dComIfGp_particle_set(PARTICLE_NAME[i_state][i], &vec1, &vec2, &vec3);
+    }
 }
-#pragma pop
 
 /* 80CE0134-80CE0180 000954 004C+00 2/2 0/0 0/0 .text deleteSmkEmtChange__15daObjSnowSoup_cFi */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjSnowSoup_c::deleteSmkEmtChange(int param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/deleteSmkEmtChange__15daObjSnowSoup_cFi.s"
+void daObjSnowSoup_c::deleteSmkEmtChange(int i_state) {
+    for (int i = 0; i < 2; i++) {
+        if (mpSmkEmtChange[i_state][i] != NULL) {
+            mpSmkEmtChange[i_state][i]->becomeInvalidEmitter();
+            mpSmkEmtChange[i_state][i] = NULL;
+        }
+    }
 }
-#pragma pop
 
 /* 80CE0180-80CE01D4 0009A0 0054+00 1/0 0/0 0/0 .text daObjSnowSoup_create__FP15daObjSnowSoup_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjSnowSoup_create(daObjSnowSoup_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_create__FP15daObjSnowSoup_c.s"
+
+static cPhs__Step daObjSnowSoup_create(daObjSnowSoup_c* i_this) {
+    fopAcM_SetupActor(i_this, daObjSnowSoup_c);
+    return i_this->create();
 }
-#pragma pop
 
 /* 80CE01D4-80CE01F4 0009F4 0020+00 1/0 0/0 0/0 .text daObjSnowSoup_Delete__FP15daObjSnowSoup_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjSnowSoup_Delete(daObjSnowSoup_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_Delete__FP15daObjSnowSoup_c.s"
+static int daObjSnowSoup_Delete(daObjSnowSoup_c* i_this) {
+    return i_this->Delete();
 }
-#pragma pop
 
 /* 80CE01F4-80CE0214 000A14 0020+00 1/0 0/0 0/0 .text daObjSnowSoup_execute__FP15daObjSnowSoup_c
  */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjSnowSoup_execute(daObjSnowSoup_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_execute__FP15daObjSnowSoup_c.s"
+static int daObjSnowSoup_execute(daObjSnowSoup_c* i_this) {
+    return i_this->execute();
 }
-#pragma pop
 
 /* 80CE0214-80CE0234 000A34 0020+00 1/0 0/0 0/0 .text daObjSnowSoup_draw__FP15daObjSnowSoup_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjSnowSoup_draw(daObjSnowSoup_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_draw__FP15daObjSnowSoup_c.s"
+static int daObjSnowSoup_draw(daObjSnowSoup_c* i_this) {
+    return i_this->draw();
 }
-#pragma pop
 
-/* 80CE0274-80CE0274 000038 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+/* 80CE0284-80CE02A4 -00001 0020+00 1/0 0/0 0/0 .data            daObjSnowSoup_METHODS */
+static actor_method_class daObjSnowSoup_METHODS = {
+    (process_method_func)daObjSnowSoup_create,
+    (process_method_func)daObjSnowSoup_Delete,
+    (process_method_func)daObjSnowSoup_execute,
+    (process_method_func)NULL,
+    (process_method_func)daObjSnowSoup_draw,
+};
+
+/* 80CE02A4-80CE02D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SnowSoup */
+extern actor_process_profile_definition g_profile_Obj_SnowSoup = {
+    fpcLy_CURRENT_e,
+    7,
+    fpcPi_CURRENT_e,
+    PROC_Obj_SnowSoup,
+    &g_fpcLf_Method.mBase,
+    sizeof(daObjSnowSoup_c),
+    0,
+    0,
+    &g_fopAc_Method.base,
+    0x2E2,
+    &daObjSnowSoup_METHODS,
+    0x44100,
+    fopAc_ENV_e,
+    fopAc_CULLBOX_CUSTOM_e,
+};