mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-24 07:41:29 -04:00
d_a_dmidna OK / f_op + misc cleanup (#276)
* some f_op / d_insect cleanup * rename some vars according to tww * d_a_dmidna OK * remove asm
This commit is contained in:
@@ -3164,10 +3164,10 @@ static u8 struct_80450FC4[4];
|
||||
|
||||
/* 80450FC8-80450FCC -00001 0004+00 5/5 0/0 0/0 .sbss None */
|
||||
/* 80450FC8 0001+00 data_80450FC8 None */
|
||||
static bool struct_80450FC8; // sEyeMoveFlg
|
||||
static bool m_eye_move_flg;
|
||||
|
||||
/* 80450FC9 0003+00 data_80450FC9 None */
|
||||
static u8 sMorfFrame;
|
||||
static u8 m_morf_frame;
|
||||
|
||||
/* 80452C98-80452C9C 001298 0004+00 102/102 0/0 0/0 .sdata2 @5943 */
|
||||
SECTION_SDATA2 static f32 lit_5943 = 0.5f;
|
||||
@@ -3215,8 +3215,8 @@ void daAlink_matAnm_c::init() {
|
||||
field_0xf8 = tmp_0;
|
||||
mNowOffsetX = tmp_0;
|
||||
mNowOffsetY = tmp_0;
|
||||
struct_80450FC8 = false; // sEyeMoveFlg
|
||||
sMorfFrame = 0;
|
||||
m_eye_move_flg = false;
|
||||
m_morf_frame = 0;
|
||||
mSetFlag = 0;
|
||||
}
|
||||
|
||||
@@ -3237,9 +3237,9 @@ asm void daAlink_matAnm_c::calc(J3DMaterial* param_0) const {
|
||||
for (u32 i = 0; i < 8; i++) {
|
||||
if (getTexMtxAnm(i).getAnmFlag()) {
|
||||
J3DTexMtxInfo* info = ¶m_0->getTexGenBlock()->getTexMtx(i)->getTexMtxInfo();
|
||||
if (sMorfFrame != 0) {
|
||||
if (m_morf_frame != 0) {
|
||||
if (mSetFlag == 0) {
|
||||
f32 tmp = 1.0f / sMorfFrame;
|
||||
f32 tmp = 1.0f / m_morf_frame;
|
||||
info->field_0x10.field_0xc = field_0xf4 * (1.0f - tmp) +
|
||||
info->field_0x10.field_0xc * tmp; info->field_0x10.mCheckFrame = field_0xf8 * (1.0f - tmp) +
|
||||
info->field_0x10.field_0xc * tmp;
|
||||
@@ -3250,7 +3250,7 @@ info->field_0x10.field_0xc * tmp;
|
||||
}
|
||||
}
|
||||
|
||||
if (struct_80450FC8) {
|
||||
if (m_eye_move_flg) {
|
||||
info->field_0x10.field_0xc = mNowOffsetX;
|
||||
info->field_0x10.mCheckFrame = mNowOffsetY;
|
||||
}
|
||||
@@ -12617,7 +12617,7 @@ static s32 bgWaitFlg;
|
||||
/* 80450FD0-80450FD8 -00001 0008+00 2/2 0/0 0/0 .sbss None */
|
||||
/* 80450FD0 0001+00 data_80450FD0 None */
|
||||
/* 80450FD1 0007+00 data_80450FD1 None */
|
||||
static s8 struct_80450FD0;
|
||||
static s8 struct_80450FD0; // init$
|
||||
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
|
||||
@@ -446,8 +446,14 @@ SECTION_DEAD static char const* const stringBase_803790B8 = "@bg%04x";
|
||||
|
||||
/* 80450D8C-80450D90 -00001 0004+00 0/0 1/1 3/3 .sbss None */
|
||||
/* 80450D8C 0001+00 data_80450D8C None */
|
||||
// u8 daYkgr_c::m_flag;
|
||||
|
||||
/* 80450D8D 0001+00 data_80450D8D None */
|
||||
// u8 daYkgr_c::m_alpha_flag;
|
||||
|
||||
/* 80450D8E 0002+00 data_80450D8E None */
|
||||
// u8 daYkgr_c::m_alpha;
|
||||
|
||||
extern u8 struct_80450D8C[4];
|
||||
u8 struct_80450D8C[4];
|
||||
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
|
||||
#include "d/d_bomb.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
bool dBomb_c::checkStateCarry() {
|
||||
|
||||
+4647
-18586
File diff suppressed because it is too large
Load Diff
+36
-67
@@ -1,111 +1,80 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: d/d_insect
|
||||
//
|
||||
/**
|
||||
* d_insect.cpp
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/d_insect.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "d/com/d_com_inf_game.h"
|
||||
#include "d/menu/d_menu_insect.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "m_Do/m_Do_lib.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void Insect_Release__9dInsect_cFv();
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
inline int dComIfGs_isEventBit(u16 event) {
|
||||
return g_dComIfG_gameInfo.info.getSavedata().getEvent().isEventBit(event);
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
SECTION_DATA extern void* __vt__9dInsect_c[3 + 1 /* padding */] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
(void*)NULL,
|
||||
(void*)Insect_Release__9dInsect_cFv,
|
||||
/* padding */
|
||||
NULL,
|
||||
};
|
||||
|
||||
/* 8015E010-8015E078 158950 0068+00 0/0 0/0 13/13 .text __ct__9dInsect_cFv */
|
||||
dInsect_c::dInsect_c() {
|
||||
field_0x588 = -1;
|
||||
m_itemId = -1;
|
||||
field_0x56C = 0;
|
||||
field_0x56D = 1;
|
||||
field_0x58C = 0;
|
||||
field_0x580 = 0xD6;
|
||||
m_mode = 0;
|
||||
m_itemNo = M_MAYFLY;
|
||||
field_0x584 = 0;
|
||||
field_0x585 = 0;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
|
||||
/* 8015E078-8015E26C 1589B8 01F4+00 0/0 0/0 24/24 .text Insect_GetDemoMain__9dInsect_cFv
|
||||
*/
|
||||
void dInsect_c::Insect_GetDemoMain() {
|
||||
switch (field_0x58C) {
|
||||
switch (m_mode) {
|
||||
case 0:
|
||||
if (fopAcM_checkCarryNow(this)) {
|
||||
cLib_offBit(mAttentionInfo.mFlags,0x10);
|
||||
cLib_offBit(mAttentionInfo.mFlags, 0x10);
|
||||
fopAcM_cancelCarryNow(this);
|
||||
fopAcM_orderItemEvent(this,0,0);
|
||||
fopAcM_orderItemEvent(this, 0, 0);
|
||||
mEvtInfo.i_onCondition(8);
|
||||
|
||||
field_0x588 = fopAcM_createItemForTrBoxDemo(¤t.pos,field_0x580,-1,fopAcM_GetRoomNo(this),0,0);
|
||||
field_0x58C = 1;
|
||||
m_itemId = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1,
|
||||
fopAcM_GetRoomNo(this), NULL, NULL);
|
||||
m_mode = 1;
|
||||
|
||||
if (dMenu_Insect_c::isCatchNotGiveInsect(field_0x580) != 0) {
|
||||
if (dMenu_Insect_c::isCatchNotGiveInsect(m_itemNo) != 0) {
|
||||
field_0x585 = 1;
|
||||
}
|
||||
} else {
|
||||
cLib_onBit(mAttentionInfo.mFlags,0x10);
|
||||
cLib_onBit(mAttentionInfo.mFlags, 0x10);
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
if (mEvtInfo.checkCommandItem()) {
|
||||
if (field_0x588 != -1) {
|
||||
dComIfGp_event_setItemPartnerId(field_0x588);
|
||||
if (m_itemId != fpcM_ERROR_PROCESS_ID_e) {
|
||||
dComIfGp_event_setItemPartnerId(m_itemId);
|
||||
}
|
||||
|
||||
field_0x56D = 0;
|
||||
field_0x58C = 2;
|
||||
m_mode = 2;
|
||||
} else {
|
||||
fopAcM_orderItemEvent(this,0,0);
|
||||
fopAcM_orderItemEvent(this, 0, 0);
|
||||
mEvtInfo.i_onCondition(8);
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
|
||||
if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
|
||||
i_dComIfGp_event_reset();
|
||||
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x582]) || field_0x585 != 0) {
|
||||
if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[m_saveBitNo]) ||
|
||||
field_0x585 != 0)
|
||||
{
|
||||
field_0x56D = 1;
|
||||
field_0x58C = 0;
|
||||
m_mode = 0;
|
||||
if (field_0x584 == 0) {
|
||||
fopAcM_createItem(¤t.pos,0,-1,-1,0,0,0);
|
||||
fopAcM_createItem(¤t.pos, HEART, -1, -1, NULL, NULL, 0);
|
||||
field_0x584 = 1;
|
||||
}
|
||||
} else {
|
||||
fopAcM_delete(this);
|
||||
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
|
||||
/* 8015E26C-8015E3F8 158BAC 018C+00 0/0 0/0 3/3 .text CalcZBuffer__9dInsect_cFf */
|
||||
void dInsect_c::CalcZBuffer(f32 param_0) {
|
||||
f32 camera_trim_height;
|
||||
@@ -114,20 +83,19 @@ void dInsect_c::CalcZBuffer(f32 param_0) {
|
||||
|
||||
pos = current.pos;
|
||||
pos.y += 20.0f;
|
||||
|
||||
|
||||
mDoLib_project(&pos, &pos_projected);
|
||||
|
||||
if (dComIfGp_getCamera(0)) {
|
||||
camera_trim_height = *(f32*)&dComIfGp_getCamera(0)->mCamera.mCamSetup.mTypeTable;
|
||||
camera_trim_height = dComIfGp_getCamera(0)->mCamera.mTrimHeight;
|
||||
} else {
|
||||
camera_trim_height = 0.0f;
|
||||
}
|
||||
|
||||
if (pos_projected.x > 0.0f &&
|
||||
pos_projected.x < 608.0f &&
|
||||
pos_projected.y > camera_trim_height &&
|
||||
pos_projected.y < 448.0f - camera_trim_height) {
|
||||
dComIfGd_peekZ(pos_projected.x,pos_projected.y,&field_0x578);
|
||||
if (pos_projected.x > 0.0f && pos_projected.x < 608.0f &&
|
||||
pos_projected.y > camera_trim_height && pos_projected.y < 448.0f - camera_trim_height)
|
||||
{
|
||||
dComIfGd_peekZ(pos_projected.x, pos_projected.y, &field_0x578);
|
||||
} else {
|
||||
field_0x578 = 0;
|
||||
}
|
||||
@@ -141,7 +109,8 @@ void dInsect_c::CalcZBuffer(f32 param_0) {
|
||||
pos_projected.z = -10.0f;
|
||||
}
|
||||
|
||||
field_0x57C = (((view_near + ((view_far * view_near) / pos_projected.z)) / (view_far - view_near)) + 1.0f) * 16777215.0f;
|
||||
field_0x57C =
|
||||
(((view_near + ((view_far * view_near) / pos_projected.z)) / (view_far - view_near)) +
|
||||
1.0f) *
|
||||
16777215.0f;
|
||||
}
|
||||
|
||||
/* 80393D98-80393D98 0203F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
+10
-24
@@ -93,48 +93,33 @@ dJntCol_c::dJntCol_c() {
|
||||
* init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli */
|
||||
int dJntCol_c::init(fopAc_ac_c* i_actorP, dJntColData_c const* i_jntColP, J3DModel* i_modelP,
|
||||
int param_3) {
|
||||
mData = (dJntColData_c*)i_jntColP;
|
||||
mData = i_jntColP;
|
||||
mModel = i_modelP;
|
||||
field_0x8 = param_3;
|
||||
field_0xc = 0;
|
||||
|
||||
if (i_actorP) {
|
||||
fopAcM_SetJntCol(i_actorP, this);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80451D60-80451D64 000360 0004+00 1/1 0/0 0/0 .sdata2 @3655 */
|
||||
SECTION_SDATA2 static f32 lit_3655 = 500.0f;
|
||||
|
||||
/* 80035CC8-80035DC8 030608 0100+00 2/2 0/0 0/0 .text
|
||||
* setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz */
|
||||
#ifdef NONMATCHING
|
||||
// regalloc, parameters are loading in wrong?
|
||||
void dJntCol_c::setNowLine(cM3dGLin* param_0, cXyz const* param_1, csXyz const* param_2,
|
||||
void dJntCol_c::setNowLine(cM3dGLin* i_line, cXyz const* param_1, csXyz const* param_2,
|
||||
cXyz* param_3) {
|
||||
if (param_2) {
|
||||
if (param_2 != NULL) {
|
||||
mDoMtx_stack_c::ZXYrotS(*param_2);
|
||||
mDoMtx_stack_c::multVec(&cXyz::BaseZ, param_3);
|
||||
} else {
|
||||
*param_3 = cXyz::BaseZ;
|
||||
}
|
||||
|
||||
cXyz start_pos = *param_1 - *param_3 * FLOAT_LABEL(lit_3655);
|
||||
cXyz end_pos = *param_1 + *param_3 * FLOAT_LABEL(lit_3655);
|
||||
param_0->SetStartEnd(start_pos, end_pos);
|
||||
cXyz start_pos = *param_1 - *param_3 * 500.0f;
|
||||
cXyz end_pos = *param_1 + *param_3 * 500.0f;
|
||||
i_line->SetStartEnd(start_pos, end_pos);
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dJntCol_c::setNowLine(cM3dGLin* param_0, cXyz const* param_1, csXyz const* param_2,
|
||||
cXyz* param_3) {
|
||||
nofralloc
|
||||
#include "asm/d/d_jnt_col/setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 803A78F8-803A7904 004A18 000C+00 4/4 21/21 0/0 .data __vt__8cM3dGLin */
|
||||
@@ -234,7 +219,7 @@ asm void dJntCol_c::getArrowOffsetPosAndAngle(cXyz const* param_0, csXyz const*
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm int dJntCol_c::getHitmarkPosAndAngle(cXyz const* param_0, csXyz const* param_1, cXyz* param_2,
|
||||
csXyz* param_3, int param_4) const {
|
||||
csXyz* param_3, int param_4) const {
|
||||
nofralloc
|
||||
#include "asm/d/d_jnt_col/getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi.s"
|
||||
}
|
||||
@@ -246,6 +231,7 @@ void dJntCol_c::setArrowPosAndAngle(cXyz const* param_0, cXyz const* i_srcPos, i
|
||||
cXyz* param_3, csXyz* i_arrowPosP) {
|
||||
cXyz dst_pos;
|
||||
mDoMtx_multVecSR(mModel->i_getAnmMtx(i_anmMtxIdx), i_srcPos, &dst_pos);
|
||||
|
||||
i_arrowPosP->x = dst_pos.atan2sY_XZ();
|
||||
i_arrowPosP->y = dst_pos.atan2sX_Z();
|
||||
mDoMtx_multVec(mModel->i_getAnmMtx(i_anmMtxIdx), param_0, param_3);
|
||||
|
||||
+30
-66
@@ -1,58 +1,24 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: d/d_kyeff
|
||||
//
|
||||
/**
|
||||
* d_kyeff.cpp
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/d_kyeff.h"
|
||||
|
||||
#include "Z2AudioLib/Z2EnvSeMgr.h"
|
||||
#include "d/com/d_com_inf_game.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
#include "f_op/f_op_kankyo.h"
|
||||
#include "os/OSTime.h"
|
||||
#include "d/kankyo/d_kankyo.h"
|
||||
#include "d/kankyo/d_kankyo_wether.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" static void dKyeff_Draw__FP8dKyeff_c();
|
||||
extern "C" void execute__8dKyeff_cFv();
|
||||
extern "C" static void dKyeff_Execute__FP8dKyeff_c();
|
||||
extern "C" static bool dKyeff_IsDelete__FP8dKyeff_c();
|
||||
extern "C" static void dKyeff_Delete__FP8dKyeff_c();
|
||||
extern "C" static void dKyeff_Create__FP12kankyo_class();
|
||||
extern "C" extern char const* const d_d_kyeff__stringBase0;
|
||||
extern "C" extern void* g_profile_KYEFF[10 + 1 /* padding */];
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void dKyw_wether_init__Fv();
|
||||
extern "C" void dKyw_wether_delete__Fv();
|
||||
extern "C" void dKyw_wether_move__Fv();
|
||||
extern "C" void dKyw_wether_move_draw__Fv();
|
||||
extern "C" void dKyw_wether_draw__Fv();
|
||||
extern "C" void dKy_FiveSenses_fullthrottle_dark__Fv();
|
||||
extern "C" void framework__10Z2EnvSeMgrFv();
|
||||
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
|
||||
extern "C" extern dScnKy_env_light_c g_env_light;
|
||||
extern "C" extern Z2EnvSeMgr g_mEnvSeMgr;
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* 801ADD00-801ADD38 1A8640 0038+00 2/2 0/0 0/0 .text dKankyo_DayProc__Fv */
|
||||
void dKankyo_DayProc() {
|
||||
dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[91]);
|
||||
}
|
||||
|
||||
static int dKyeff_Draw(dKyeff_c* ptr) {
|
||||
static int dKyeff_Draw(dKyeff_c* i_this) {
|
||||
dKyw_wether_draw();
|
||||
return 1;
|
||||
}
|
||||
@@ -62,21 +28,22 @@ int dKyeff_c::execute() {
|
||||
if (strcmp(dComIfGp_getStartStageName(), "Name")) {
|
||||
dKyw_wether_move();
|
||||
}
|
||||
|
||||
dKyw_wether_move_draw();
|
||||
dKy_FiveSenses_fullthrottle_dark();
|
||||
mDoAud_mEnvse_framework();
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int dKyeff_Execute(dKyeff_c* ptr) {
|
||||
return ptr->execute();
|
||||
static int dKyeff_Execute(dKyeff_c* i_this) {
|
||||
return i_this->execute();
|
||||
}
|
||||
|
||||
static int dKyeff_IsDelete(dKyeff_c* ptr) {
|
||||
static int dKyeff_IsDelete(dKyeff_c* i_this) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int dKyeff_Delete(dKyeff_c* ptr) {
|
||||
static int dKyeff_Delete(dKyeff_c* i_this) {
|
||||
dKyw_wether_delete();
|
||||
return 1;
|
||||
}
|
||||
@@ -105,7 +72,7 @@ SECTION_SDATA2 static f32 lit_3844 = 15.0f;
|
||||
/* 801ADE00-801ADEA0 1A8740 00A0+00 1/0 0/0 0/0 .text dKyeff_Create__FP12kankyo_class */
|
||||
// float data
|
||||
#ifdef NONMATCHING
|
||||
static int dKyeff_Create(kankyo_class* kankyo) {
|
||||
static int dKyeff_Create(kankyo_class* i_this) {
|
||||
OSCalendarTime time;
|
||||
|
||||
dKyw_wether_init();
|
||||
@@ -115,13 +82,14 @@ static int dKyeff_Create(kankyo_class* kankyo) {
|
||||
g_env_light.mWind.pow = 0.7f;
|
||||
g_env_light.mDaytime = time.hours * 15.0f;
|
||||
}
|
||||
|
||||
return cPhs_COMPLEATE_e;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm int dKyeff_Create(kankyo_class* param_0) {
|
||||
static asm int dKyeff_Create(kankyo_class* i_this) {
|
||||
nofralloc
|
||||
#include "asm/d/d_kyeff/dKyeff_Create__FP12kankyo_class.s"
|
||||
}
|
||||
@@ -131,29 +99,25 @@ static asm int dKyeff_Create(kankyo_class* param_0) {
|
||||
/* ############################################################################################## */
|
||||
/* 803BC158-803BC16C -00001 0014+00 1/0 0/0 0/0 .data l_dKyeff_Method */
|
||||
static leafdraw_method_class l_dKyeff_Method = {
|
||||
(process_method_func)dKyeff_Create,
|
||||
(process_method_func)dKyeff_Delete,
|
||||
(process_method_func)dKyeff_Execute,
|
||||
(process_method_func)dKyeff_IsDelete,
|
||||
(process_method_func)dKyeff_Create, (process_method_func)dKyeff_Delete,
|
||||
(process_method_func)dKyeff_Execute, (process_method_func)dKyeff_IsDelete,
|
||||
(process_method_func)dKyeff_Draw,
|
||||
};
|
||||
|
||||
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
|
||||
|
||||
/* 803BC16C-803BC198 -00001 0028+04 0/0 0/0 1/0 .data g_profile_KYEFF */
|
||||
SECTION_DATA extern void* g_profile_KYEFF[10 + 1 /* padding */] = {
|
||||
(void*)0xFFFFFFFD,
|
||||
(void*)0x000CFFFD,
|
||||
(void*)0x03110000,
|
||||
(void*)&g_fpcLf_Method,
|
||||
(void*)0x000000F8,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)&g_fopKy_Method,
|
||||
(void*)0x00050000,
|
||||
(void*)&l_dKyeff_Method,
|
||||
/* padding */
|
||||
NULL,
|
||||
extern kankyo_process_profile_definition g_profile_KYEFF = {
|
||||
-3,
|
||||
12,
|
||||
0xFFFD,
|
||||
PROC_KYEFF,
|
||||
0,
|
||||
&g_fpcLf_Method.mBase,
|
||||
sizeof(dKyeff_c),
|
||||
0,
|
||||
0,
|
||||
&g_fopKy_Method,
|
||||
0x0005,
|
||||
0,
|
||||
0,
|
||||
&l_dKyeff_Method,
|
||||
};
|
||||
|
||||
/* 80394F38-80394F38 021598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
+33
-37
@@ -1,38 +1,36 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: d/d_kyeff2
|
||||
//
|
||||
/**
|
||||
* d_kyeff2.cpp
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/d_kyeff2.h"
|
||||
#include "f_op/f_op_kankyo.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/kankyo/d_kankyo_wether.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
static bool dKyeff2_Draw(dKyeff2_c* ptr) {
|
||||
static int dKyeff2_Draw(dKyeff2_c* i_this) {
|
||||
dKyw_wether_draw2();
|
||||
return true;
|
||||
return 1;
|
||||
}
|
||||
|
||||
bool dKyeff2_c::execute() {
|
||||
int dKyeff2_c::execute() {
|
||||
dKyw_wether_move_draw2();
|
||||
return true;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static bool dKyeff2_Execute(dKyeff2_c* ptr) {
|
||||
return ptr->execute();
|
||||
static int dKyeff2_Execute(dKyeff2_c* i_this) {
|
||||
return i_this->execute();
|
||||
}
|
||||
|
||||
static bool dKyeff2_IsDelete(dKyeff2_c* ptr) {
|
||||
return true;
|
||||
static int dKyeff2_IsDelete(dKyeff2_c* i_this) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
static bool dKyeff2_Delete(dKyeff2_c* ptr) {
|
||||
static int dKyeff2_Delete(dKyeff2_c* i_this) {
|
||||
dKyw_wether_delete2();
|
||||
return true;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int dKyeff2_Create(kankyo_class* ptr) {
|
||||
static int dKyeff2_Create(kankyo_class* i_this) {
|
||||
dKyw_wether_init2();
|
||||
return cPhs_COMPLEATE_e;
|
||||
}
|
||||
@@ -40,27 +38,25 @@ static int dKyeff2_Create(kankyo_class* ptr) {
|
||||
/* ############################################################################################## */
|
||||
/* 803BC198-803BC1AC -00001 0014+00 1/0 0/0 0/0 .data l_dKyeff2_Method */
|
||||
static leafdraw_method_class l_dKyeff2_Method = {
|
||||
(process_method_func)dKyeff2_Create,
|
||||
(process_method_func)dKyeff2_Delete,
|
||||
(process_method_func)dKyeff2_Execute,
|
||||
(process_method_func)dKyeff2_IsDelete,
|
||||
(process_method_func)dKyeff2_Create, (process_method_func)dKyeff2_Delete,
|
||||
(process_method_func)dKyeff2_Execute, (process_method_func)dKyeff2_IsDelete,
|
||||
(process_method_func)dKyeff2_Draw,
|
||||
};
|
||||
|
||||
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
|
||||
|
||||
/* 803BC1AC-803BC1D8 -00001 0028+04 0/0 0/0 1/0 .data g_profile_KYEFF2 */
|
||||
SECTION_DATA extern void* g_profile_KYEFF2[10 + 1 /* padding */] = {
|
||||
(void*)0xFFFFFFFD,
|
||||
(void*)0x000CFFFD,
|
||||
(void*)0x03120000,
|
||||
(void*)&g_fpcLf_Method,
|
||||
(void*)0x000000F8,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)&g_fopKy_Method,
|
||||
(void*)0x00030000,
|
||||
(void*)&l_dKyeff2_Method,
|
||||
/* padding */
|
||||
NULL,
|
||||
extern kankyo_process_profile_definition g_profile_KYEFF2 = {
|
||||
-3,
|
||||
12,
|
||||
0xFFFD,
|
||||
PROC_KYEFF2,
|
||||
0,
|
||||
&g_fpcLf_Method.mBase,
|
||||
sizeof(dKyeff2_c),
|
||||
0,
|
||||
0,
|
||||
&g_fopKy_Method,
|
||||
0x0003,
|
||||
0,
|
||||
0,
|
||||
&l_dKyeff2_Method,
|
||||
};
|
||||
|
||||
@@ -8,14 +8,10 @@
|
||||
#include "SSystem/SComponent/c_malloc.h"
|
||||
#include "d/com/d_com_inf_game.h"
|
||||
#include "d/com/d_com_static.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/save/d_save_HIO.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_kankyo_mng.h"
|
||||
#include "f_op/f_op_msg_mng.h"
|
||||
#include "m_Do/m_Do_Reset.h"
|
||||
#include "m_Do/m_Do_ext.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
|
||||
@@ -2058,7 +2058,7 @@ static asm void dKy_calc_color_set(_GXColorS10* param_0, color_RGB_class* param_
|
||||
/* 80451068 0002+00 data_80451068 S_fuwan_sin$5904 */
|
||||
/* 8045106A 0001+00 data_8045106A None */
|
||||
/* 8045106B 0005+00 data_8045106B None */
|
||||
static u8 struct_80451068[8];
|
||||
static u8 S_fuwan_sin[8];
|
||||
|
||||
/* 80453CE8-80453CEC 0022E8 0004+00 3/3 0/0 0/0 .sdata2 @6032 */
|
||||
SECTION_SDATA2 static f32 lit_6032 = 100000.0f;
|
||||
|
||||
Reference in New Issue
Block a user