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

Update all code to use the new enum formats

Browse Source
This commit is contained in:
LagoLunatic
2026-05-29 15:45:57 -04:00
parent 5ac87a6885
commit bae595b973
299 changed files with 5151 additions and 5134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_himo3.cpp
+9 -9
View File
@@ -6,12 +6,12 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_himo3.h"
#include "d/actor/d_a_player.h"
#include "d/res/res_always.h"
#include "res/Object/Always.h"
#if VERSION > VERSION_DEMO
#include "d/res/res_bgn.h"
#include "res/Object/Bgn.h"
#endif
#include "d/res/res_link.h"
#include "d/res/res_himo3.h"
#include "res/Object/Link.h"
#include "res/Object/Himo3.h"
#include "d/d_s_play.h"
#include "d/d_com_inf_game.h"
#include "d/d_kankyo_wether.h"
@@ -614,18 +614,18 @@ static BOOL daHimo3_Delete(himo3_class* i_this) {
/* 00001AE0-00001DD4 .text useHeapInit__FP11himo3_class */
cPhs_State useHeapInit(himo3_class* i_this) {
fopAc_ac_c* actor = &i_this->actor;
static int hook_bmd[] = {HIMO3_BMD_SLAMP_00, LINK_BDL_ROPEEND, HIMO3_BMD_SLAMP_00, HIMO3_BMD_SLAMP_00, HIMO3_BMD_SLAMP_00};
static int hook_bmd[] = {dRes_INDEX_HIMO3_BMD_SLAMP_00_e, dRes_INDEX_LINK_BDL_ROPEEND_e, dRes_INDEX_HIMO3_BMD_SLAMP_00_e, dRes_INDEX_HIMO3_BMD_SLAMP_00_e, dRes_INDEX_HIMO3_BMD_SLAMP_00_e};
#if VERSION == VERSION_DEMO
if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Always", i_this->m0298 == 0xf ? ALWAYS_BTI_TXM_ROPE1 : ALWAYS_BTI_ROPE), 0)) {
if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Always", i_this->m0298 == 0xf ? dRes_INDEX_ALWAYS_BTI_TXM_ROPE1_e : dRes_INDEX_ALWAYS_BTI_ROPE_e), 0)) {
return cPhs_ERROR_e;
}
#else
if (i_this->m0298 == 0xf) {
if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Bgn", BGN_BTI_NOT_CUT1), 0)) {
if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e), 0)) {
return cPhs_ERROR_e;
}
} else if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE), 0)) {
} else if (!i_this->mLineMat.init(1, 200, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 0)) {
return cPhs_ERROR_e;
}
#endif
@@ -647,7 +647,7 @@ cPhs_State useHeapInit(himo3_class* i_this) {
}
if (i_this->m0298 == 0) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Himo3", HIMO3_BMD_H3_GA);
modelData = (J3DModelData*)dComIfG_getObjectRes("Himo3", dRes_INDEX_HIMO3_BMD_H3_GA_e);
JUT_ASSERT(DEMO_SELECT(1264, 1298), modelData != NULL);
s32 tmp = 0;