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

obj_tide OK

Browse Source
This commit is contained in:
LagoLunatic
2025-08-07 15:29:11 -04:00
parent 60fb257646
commit ce5c1bd40c
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1429,7 +1429,7 @@ config.libs = [
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_swpush", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_obj_table"),
ActorRel(Matching, "d_a_obj_tenmado"),
ActorRel(Equivalent, "d_a_obj_tide"),
ActorRel(Matching, "d_a_obj_tide"),
ActorRel(Matching, "d_a_obj_timer"),
ActorRel(Equivalent, "d_a_obj_toripost", extra_cflags=['-pragma "nosyminline on"']), # weak func order
ActorRel(NonMatching, "d_a_obj_tousekiki"),
src/d/actor/d_a_obj_gryw00.cpp
+1 -1
View File
@@ -156,7 +156,7 @@ cPhs_State daObjGryw00_c::Mthd_Create() {
cPhs_State phase_state = dComIfG_resLoad(&mPhs, l_arcname);
if (phase_state == cPhs_COMPLEATE_e) {
phase_state = MoveBGCreate(l_arcname, 0xf, dBgS_MoveBGProc_Trans, 0x9a0);
phase_state = MoveBGCreate(l_arcname, GRYW00_DZB_EWATER, dBgS_MoveBGProc_Trans, 0x9a0);
JUT_ASSERT(519, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e));
}
return phase_state;
src/d/actor/d_a_obj_tide.cpp
+7 -7
View File
@@ -57,7 +57,7 @@ Mtx Act_c::M_tmp_mtx;
BOOL Act_c::CreateHeap() {
const char* arcname = attr(M_type).arcName;
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(arcname, attr(M_type).m04);
J3DModelData* model_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(arcname, attr(M_type).m04));
JUT_ASSERT(438, model_data != NULL);
if (attr(M_type).m10 != 0) {
@@ -71,7 +71,7 @@ BOOL Act_c::CreateHeap() {
bool bVar4 = true;
if (attr(M_type).m08 >= 0) {
J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(arcname, attr(M_type).m08);
J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(arcname, attr(M_type).m08));
JUT_ASSERT(455, bck != NULL);
mBck1 = new mDoExt_bckAnm();
@@ -81,7 +81,7 @@ BOOL Act_c::CreateHeap() {
}
if (attr(M_type).m0A >= 0) {
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(arcname, attr(M_type).m0A);
J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(arcname, attr(M_type).m0A));
JUT_ASSERT(474, brk != NULL);
mBrk1 = new mDoExt_brkAnm();
@@ -91,7 +91,7 @@ BOOL Act_c::CreateHeap() {
}
if (attr(M_type).m0C >= 0) {
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(arcname, attr(M_type).m0C);
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(arcname, attr(M_type).m0C));
JUT_ASSERT(487, btk != NULL);
mBtk = new mDoExt_btkAnm();
@@ -104,7 +104,7 @@ BOOL Act_c::CreateHeap() {
bool bVar5 = true;
if (attr(M_type).m14 >= 0 && attr(M_type).m16 >= 0) {
J3DModelData* mdl_nure_data = (J3DModelData*)dComIfG_getObjectRes(arcname, attr(M_type).m14);
J3DModelData* mdl_nure_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(arcname, attr(M_type).m14));
JUT_ASSERT(504, mdl_nure_data != NULL);
mModel2 = mDoExt_J3DModel__create(mdl_nure_data, 0x80000, attr(M_type).m18);
@@ -112,7 +112,7 @@ BOOL Act_c::CreateHeap() {
bVar1 = false;
}
J3DAnmTevRegKey* brk_nure = (J3DAnmTevRegKey*)dComIfG_getObjectRes(arcname, attr(M_type).m16);
J3DAnmTevRegKey* brk_nure = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(arcname, attr(M_type).m16));
JUT_ASSERT(515, brk_nure != NULL);
mBrk2 = new mDoExt_brkAnm();
@@ -683,7 +683,7 @@ BOOL Mthd_Execute(void* i_this) {
/* 00001E30-00001E5C .text Mthd_Draw__Q29daObjTide26@unnamed@d_a_obj_tide_cpp@FPv */
BOOL Mthd_Draw(void* i_this) {
return ((Act_c*)i_this)->Draw();
return ((Act_c*)i_this)->MoveBGDraw();
}
/* 00001E5C-00001E88 .text Mthd_IsDelete__Q29daObjTide26@unnamed@d_a_obj_tide_cpp@FPv */
src/d/actor/d_a_player_main.cpp
+1 -1
View File
@@ -678,7 +678,7 @@ u16 daPy_lk_c::checkNormalFace() {
if (checkUpperAnime(LKANM_BCK_GRABWAIT)) {
return daPyFace_TMABAE;
}
if ((daPy_dmEcallBack_c::checkCurse()) || checkRestHPAnime()) {
if (daPy_dmEcallBack_c::checkCurse() || checkRestHPAnime()) {
return daPyFace_TMABAF;
}
if (checkNoDamageMode()) {