mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 13:13:29 -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_title.cpp
+10 -10
View File
@@ -16,13 +16,13 @@
#include "stdio.h"
#if VERSION <= VERSION_JPN
#include "d/res/res_tlogo.h"
#include "res/Object/Tlogo.h"
#endif
#if VERSION == VERSION_USA
#include "d/res/res_tlogoe.h"
#include "res/Object/TlogoE.h"
#endif
#if VERSION == VERSION_PAL
#include "d/res/res_tlogoe0.h"
#include "res/Object/TlogoE0.h"
#endif
// Note: For VERSION_PAL the "TlogoE0" string literal is modified at runtime.
@@ -80,31 +80,31 @@ namespace {
void daTitle_proc_c::proc_init3D() {
m_solid_heap = mDoExt_createSolidHeapFromGameToCurrent(0x40000U, 0x20);
J3DModelData* modelData_ship = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BDL_TITLE_SHIP, TLOGO_BDL_TITLE_SHIP, TLOGOE_BDL_TITLE_SHIP, TLOGOE0_BDL_TITLE_SHIP));
J3DModelData* modelData_ship = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BDL_TITLE_SHIP_e, dRes_INDEX_TLOGO_BDL_TITLE_SHIP_e, dRes_INDEX_TLOGOE_BDL_TITLE_SHIP_e, dRes_INDEX_TLOGOE0_BDL_TITLE_SHIP_e));
JUT_ASSERT(VERSION_SELECT(0xD1, 0xD1, 0xFC, 0xFC), modelData_ship != NULL);
mModel_ship = mDoExt_J3DModel__create(modelData_ship, 0x80000U, 0x37441423U);
JUT_ASSERT(VERSION_SELECT(0xD6, 0xD6, 0x101, 0x101), mModel_ship != NULL);
J3DModelData* modelData_sub = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BDL_SUBTITLE_START_ANIM, TLOGO_BDL_SUBTITLE_START_ANIM, TLOGOE_BDL_SUBTITLE_START_ANIM_E, TLOGOE0_BDL_SUBTITLE_START_ANIM_E));
J3DModelData* modelData_sub = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BDL_SUBTITLE_START_ANIM_e, dRes_INDEX_TLOGO_BDL_SUBTITLE_START_ANIM_e, dRes_INDEX_TLOGOE_BDL_SUBTITLE_START_ANIM_E_e, dRes_INDEX_TLOGOE0_BDL_SUBTITLE_START_ANIM_E_e));
JUT_ASSERT(VERSION_SELECT(0xDA, 0xDA, 0x105, 0x105), modelData_sub != NULL);
mModel_subtitle = mDoExt_J3DModel__create(modelData_sub, 0x80000U, 0x37441422U);
JUT_ASSERT(VERSION_SELECT(0xDF, 0xDF, 0x10A, 0x10A), mModel_subtitle != NULL);
J3DModelData* modelData_kirari = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BDL_SUBTITLE_KIRARI, TLOGO_BDL_SUBTITLE_KIRARI, TLOGOE_BDL_SUBTITLE_KIRARI_E, TLOGOE0_BDL_SUBTITLE_KIRARI_E));
J3DModelData* modelData_kirari = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BDL_SUBTITLE_KIRARI_e, dRes_INDEX_TLOGO_BDL_SUBTITLE_KIRARI_e, dRes_INDEX_TLOGOE_BDL_SUBTITLE_KIRARI_E_e, dRes_INDEX_TLOGOE0_BDL_SUBTITLE_KIRARI_E_e));
JUT_ASSERT(VERSION_SELECT(0xE3, 0xE3, 0x10E, 0x10E), modelData_kirari != NULL);
mModel_kirari = mDoExt_J3DModel__create(modelData_kirari, 0x80000U, 0x37441422U);
JUT_ASSERT(VERSION_SELECT(0xE8, 0xE8, 0x113, 0x113), mModel_kirari != NULL);
J3DAnmTransform* bck_ship = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BCK_TITLE_SHIP, TLOGO_BCK_TITLE_SHIP, TLOGOE_BCK_TITLE_SHIP, TLOGOE0_BCK_TITLE_SHIP)));
J3DAnmTransform* bck_ship = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BCK_TITLE_SHIP_e, dRes_INDEX_TLOGO_BCK_TITLE_SHIP_e, dRes_INDEX_TLOGOE_BCK_TITLE_SHIP_e, dRes_INDEX_TLOGOE0_BCK_TITLE_SHIP_e)));
JUT_ASSERT(VERSION_SELECT(0xED, 0xED, 0x118, 0x118), bck_ship != NULL);
BOOL ok_bck = mBckShip.init(modelData_ship, bck_ship, TRUE, J3DFrameCtrl::EMode_LOOP);
JUT_ASSERT(VERSION_SELECT(0xF4, 0xF4, 0x11F, 0x11F), ok_bck != FALSE);
J3DAnmColor* bpk_ship = static_cast<J3DAnmColor*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BPK_TITLE_SHIP, TLOGO_BPK_TITLE_SHIP, TLOGOE_BPK_TITLE_SHIP, TLOGOE0_BPK_TITLE_SHIP)));
J3DAnmColor* bpk_ship = static_cast<J3DAnmColor*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BPK_TITLE_SHIP_e, dRes_INDEX_TLOGO_BPK_TITLE_SHIP_e, dRes_INDEX_TLOGOE_BPK_TITLE_SHIP_e, dRes_INDEX_TLOGOE0_BPK_TITLE_SHIP_e)));
JUT_ASSERT(VERSION_SELECT(0xF9, 0xF9, 0x124, 0x124), bpk_ship != NULL);
BOOL ok_bpk = mBpkShip.init(modelData_ship, bpk_ship, TRUE, J3DFrameCtrl::EMode_LOOP);
@@ -113,13 +113,13 @@ void daTitle_proc_c::proc_init3D() {
mBpkShip.setFrame(0.0f);
mBpkShip.setPlaySpeed(1.0f);
J3DAnmTextureSRTKey* btk_sub = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BTK_SUBTITLE_START_ANIM, TLOGO_BTK_SUBTITLE_START_ANIM, TLOGOE_BTK_SUBTITLE_START_ANIM_E, TLOGOE0_BTK_SUBTITLE_START_ANIM_E)));
J3DAnmTextureSRTKey* btk_sub = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BTK_SUBTITLE_START_ANIM_e, dRes_INDEX_TLOGO_BTK_SUBTITLE_START_ANIM_e, dRes_INDEX_TLOGOE_BTK_SUBTITLE_START_ANIM_E_e, dRes_INDEX_TLOGOE0_BTK_SUBTITLE_START_ANIM_E_e)));
JUT_ASSERT(VERSION_SELECT(0x106, 0x106, 0x131, 0x131), btk_sub != NULL);
BOOL ok_btk_subtitle = mBtkSub.init(modelData_sub, btk_sub, TRUE, J3DFrameCtrl::EMode_NONE);
JUT_ASSERT(VERSION_SELECT(0x10D, 0x10D, 0x138, 0x138), ok_btk_subtitle != FALSE);
J3DAnmTextureSRTKey* btk_kirari = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BTK_SUBTITLE_KIRARI, TLOGO_BTK_SUBTITLE_KIRARI, TLOGOE_BTK_SUBTITLE_KIRARI_E, TLOGOE0_BTK_SUBTITLE_KIRARI_E)));
J3DAnmTextureSRTKey* btk_kirari = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(dRes_INDEX_TLOGO_BTK_SUBTITLE_KIRARI_e, dRes_INDEX_TLOGO_BTK_SUBTITLE_KIRARI_e, dRes_INDEX_TLOGOE_BTK_SUBTITLE_KIRARI_E_e, dRes_INDEX_TLOGOE0_BTK_SUBTITLE_KIRARI_E_e)));
JUT_ASSERT(VERSION_SELECT(0x112, 0x112, 0x13D, 0x13D), btk_kirari != NULL);
BOOL ok_btk_kirari = mBtkKirari.init(modelData_kirari, btk_kirari, TRUE, J3DFrameCtrl::EMode_LOOP);