Use resource enums for all other old actors

This commit is contained in:
LagoLunatic
2024-04-25 12:36:12 -04:00
parent ae0bc3ff95
commit e235db5379
30 changed files with 729 additions and 542 deletions
+4 -3
View File
@@ -4,6 +4,7 @@
//
#include "d/actor/d_a_obj_pbco.h"
#include "d/res/res_pbco.h"
#include "d/d_com_inf_game.h"
#include "d/d_item.h"
#include "d/d_procname.h"
@@ -34,16 +35,16 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) {
BOOL daObj_Pbco_c::CreateHeap() {
J3DModelData* modelData;
if (dComIfGs_isEventBit(0x0a02) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) {
modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, 0x04));
modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBCO));
} else {
modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, 0x05));
modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBC2));
}
JUT_ASSERT(0xa9, modelData != 0);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (dComIfGs_isEventBit(0x0a02) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) {
mpBgW = NULL;
} else {
mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, 0x08), cBgW::MOVE_BG_e,
mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, PBCO_INDEX_DZB_PBCO), cBgW::MOVE_BG_e,
&mpModel->getBaseTRMtx());
if (mpBgW == NULL) {
return FALSE;