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

Clean up resource enums, more inline work

Browse Source
This commit is contained in:
LagoLunatic
2024-02-03 15:41:55 -05:00
parent 129400c801
commit 74f571ff97
23 changed files with 1053 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_bomb2.cpp
+1
View File
@@ -12,6 +12,7 @@
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_sea.h"
#include "d/actor/d_a_player.h"
#include "d/res/res_vbakh.h"
// Needed for the .data section to match.
static f32 dummy1[3] = {1.0f, 1.0f, 1.0f};
src/d/actor/d_a_bomb3.inc
+1
View File
@@ -13,6 +13,7 @@
#include "f_op/f_op_kankyo_mng.h"
#include "m_Do/m_Do_mtx.h"
#include "m_Do/m_Do_lib.h"
#include "d/res/res_vbakh.h"
// Needed for the .data section to match.
static f32 dummy1[3] = {1.0f, 1.0f, 1.0f};
src/d/actor/d_a_ghostship.cpp
+1
View File
@@ -10,6 +10,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "d/d_kankyo_wether.h"
#include "d/res/res_cloth.h"
enum AYUSH_RES_FILE_ID { // IDs and indexes are synced
/* BDLM */
src/d/actor/d_a_kytag05.cpp
+1 -2
View File
@@ -50,8 +50,7 @@ static BOOL daKytag05_Execute(kytag05_class* a_this) {
return TRUE;
}
if (dComIfGp_event_runCheck() && dComIfGp_evmng_startCheck("demo41") &&
g_dComIfG_gameInfo.play.getDemo()) {
if (dComIfGp_event_runCheck() && dComIfGp_evmng_startCheck("demo41") && dComIfGp_demo_get()) {
u32 demoFrame = dComIfGp_demo_get()->getFrame();
if(demoFrame >= 0x186) {
f32 fVar7 = ((f32)demoFrame - 390.0f) / 100.0f;
src/d/actor/d_a_shop_item.cpp
+1
View File
@@ -13,6 +13,7 @@
#include "d/actor/d_a_item.h"
#include "m_Do/m_Do_mtx.h"
#include "m_Do/m_Do_lib.h"
#include "d/res/res_cloth.h"
enum FDAI_RES_FILE_ID { // IDs and indexes are synced
/* BCK */
src/d/actor/d_a_swhit0.cpp
+3 -3
View File
@@ -102,7 +102,7 @@ s32 daSwhit0_c::getSwNo2() {
/* 000000C4-00000230 .text CreateHeap__10daSwhit0_cFv */
BOOL daSwhit0_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", 0x35);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_OBM_SYOUGEKISW);
JUT_ASSERT(0xD5, modelData != 0);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202);
@@ -110,12 +110,12 @@ BOOL daSwhit0_c::CreateHeap() {
return FALSE;
}
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Always", 0x0D);
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Always", ALWAYS_BCK_OBM_SYOUGEKISW);
if (mAnm.init(modelData, anm, true, 0x02, 1.0f, 0, -1, false) == 0) {
return FALSE;
}
J3DAnmTextureSRTKey* texAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", 0x58);
J3DAnmTextureSRTKey* texAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", ALWAYS_BTK_OBM_SYOUGEKISW);
if (mTexAnm.init(modelData, texAnm, true, 0x02, 1.0f, 0, -1, false, 0) == 0) {
return FALSE;
}