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

use enums for file indexes in a few more actors

Browse Source
This commit is contained in:
LagoLunatic
2023-12-18 19:55:24 -05:00
parent 457a32d3b8
commit 2498d687eb
6 changed files with 83 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_ghostship.cpp
+17 -5
View File
@@ -12,6 +12,18 @@
#include "d/d_s_play.h"
#include "d/d_kankyo_wether.h"
enum AYUSH_RES_FILE_ID { // IDs and indexes are synced
/* BDLM */
AYUSH_BDL_AYUSH=0x5,
/* BTK */
AYUSH_BTK_AYUSH=0x8,
/* TEX */
AYUSH_BTI_B_GSHIP_HATA=0xB,
AYUSH_BTI_B_GSHIP_HO=0xC,
};
// Needed for .data to match.
static f32 dummy1[3] = {1.0f, 1.0f, 1.0f};
static f32 dummy2[3] = {1.0f, 1.0f, 1.0f};
@@ -36,7 +48,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
/* 00000118-0000032C .text _createHeap__13daGhostship_cFv */
BOOL daGhostship_c::_createHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, 5));
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BDL_AYUSH));
JUT_ASSERT(88, modelData != 0);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -44,16 +56,16 @@ BOOL daGhostship_c::_createHeap() {
return false;
}
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, 8));
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTK_AYUSH));
JUT_ASSERT(95, btk != 0);
if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
return false;
}
ResTIMG* res1 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, 0xB));
ResTIMG* res2 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, 0xC));
ResTIMG* res3 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_cloth_arc_name, 0x3));
ResTIMG* res1 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTI_B_GSHIP_HATA));
ResTIMG* res2 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTI_B_GSHIP_HO));
ResTIMG* res3 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_cloth_arc_name, CLOTH_BTI_CLOTHTOON));
mpCloth = dCloth_packetXlu_create(res1, res3, 5, 5, 700.0f, 350.0f, &mTevStr, 0);
mpCloth2 = dCloth_packetXlu_create(res2, res3, 6, 6, 1800.0f, 1000.0f, &mTevStr, 0);