mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-19 13:24:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add cPhs_State typedef and use it everywhere

Browse Source
This commit is contained in:
LagoLunatic
2025-03-17 22:26:56 -04:00
parent 455ff4a571
commit 822b13e57a
887 changed files with 2448 additions and 2470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_ebomzo.cpp
+10 -11
View File
@@ -8,6 +8,7 @@
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
#include "d/res/res_ebomzo.h"
#include "d/d_procname.h"
typedef enum {
/*0*/ Ebomzo_Mode_Check = 0,
@@ -49,7 +50,7 @@ dCcD_SrcSph sph_check_src = {
};
/* 00000078-0000012C .text CreateHeap__Q211daObjEbomzo5Act_cFv */
int daObjEbomzo::Act_c::CreateHeap() {
BOOL daObjEbomzo::Act_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, EBOMZO_BDL_EBOMZO);
JUT_ASSERT(140, model_data != NULL);
mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203);
@@ -57,7 +58,7 @@ int daObjEbomzo::Act_c::CreateHeap() {
}
/* 0000012C-0000021C .text Create__Q211daObjEbomzo5Act_cFv */
int daObjEbomzo::Act_c::Create() {
BOOL daObjEbomzo::Act_c::Create() {
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
init_mtx();
@@ -80,12 +81,10 @@ int daObjEbomzo::Act_c::Create() {
}
/* 0000021C-000003A0 .text Mthd_Create__Q211daObjEbomzo5Act_cFv */
int daObjEbomzo::Act_c::Mthd_Create() {
int phase_state;
cPhs_State daObjEbomzo::Act_c::Mthd_Create() {
fopAcM_SetupActor(this, daObjEbomzo::Act_c);
phase_state = dComIfG_resLoad(&mPhs, M_arcname);
cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname);
if (phase_state == cPhs_COMPLEATE_e) {
phase_state = MoveBGCreate(M_arcname, EBOMZO_DZB_EBOMZO, NULL, 0x1200);
JUT_ASSERT(194, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e));
@@ -94,12 +93,12 @@ int daObjEbomzo::Act_c::Mthd_Create() {
}
/* 00000558-00000560 .text Delete__Q211daObjEbomzo5Act_cFv */
int daObjEbomzo::Act_c::Delete() {
BOOL daObjEbomzo::Act_c::Delete() {
return TRUE;
}
/* 00000560-000005AC .text Mthd_Delete__Q211daObjEbomzo5Act_cFv */
int daObjEbomzo::Act_c::Mthd_Delete() {
BOOL daObjEbomzo::Act_c::Mthd_Delete() {
u32 result = MoveBGDelete();
dComIfG_resDelete(&mPhs, M_arcname);
return result;
@@ -178,7 +177,7 @@ void daObjEbomzo::Act_c::demo() {
void daObjEbomzo::Act_c::fall() {}
/* 000009C0-00000AFC .text Execute__Q211daObjEbomzo5Act_cFPPA3_A4_f */
int daObjEbomzo::Act_c::Execute(Mtx** matrix) {
BOOL daObjEbomzo::Act_c::Execute(Mtx** matrix) {
cXyz offset;
offset.x = cM_ssin(current.angle.y) * 50.0f;
@@ -202,7 +201,7 @@ int daObjEbomzo::Act_c::Execute(Mtx** matrix) {
}
/* 00000AFC-00000B9C .text Draw__Q211daObjEbomzo5Act_cFv */
int daObjEbomzo::Act_c::Draw() {
BOOL daObjEbomzo::Act_c::Draw() {
g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
g_env_light.setLightTevColorType(mpModel, &tevStr);
dComIfGd_setListBG();
@@ -215,7 +214,7 @@ int daObjEbomzo::Act_c::Draw() {
namespace daObjEbomzo {
namespace {
/* 00000B9C-00000BBC .text Mthd_Create__Q211daObjEbomzo28@unnamed@d_a_obj_ebomzo_cpp@FPv */
s32 Mthd_Create(void* i_this) {
cPhs_State Mthd_Create(void* i_this) {
return static_cast<Act_c*>(i_this)->Mthd_Create();
}