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_canon.cpp
+11 -11
View File
@@ -9,7 +9,7 @@
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_bomb.h"
#include "d/actor/d_a_sea.h"
#include "d/res/res_bomber.h"
#include "res/Object/Bomber.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_2dnumber.h"
#include "d/d_kankyo.h"
@@ -496,7 +496,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) {
/* 00001A38-00001E04 .text CreateHeap__9daCanon_cFv */
BOOL daCanon_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, BOMBER_INDEX_BDL_VCANK);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_BOMBER_BDL_VCANK_e);
JUT_ASSERT(823, modelData != NULL);
mpModel1 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -504,7 +504,7 @@ BOOL daCanon_c::CreateHeap() {
return FALSE;
}
J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(M_arcname, BOMBER_INDEX_BMD_AISI);
J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(M_arcname, dRes_INDEX_BOMBER_BMD_AISI_e);
JUT_ASSERT(831, modelData2 != NULL);
s8 cVar10 = modelData->getJointName()->getIndex("canon");
@@ -515,8 +515,8 @@ BOOL daCanon_c::CreateHeap() {
return FALSE;
}
ResTIMG* pRVar3 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_BOMB_01);
ResTIMG* pRVar4 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_BOMB_02);
ResTIMG* pRVar3 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_BOMB_01_e);
ResTIMG* pRVar4 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_BOMB_02_e);
for (s32 i = 0; i < ARRAY_SSIZE(m584); i++) {
m584[i] = new dDlst_2DObject_c();
@@ -529,8 +529,8 @@ BOOL daCanon_c::CreateHeap() {
}
}
ResTIMG* pRVar5 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_SHIP_NODAMAGE);
ResTIMG* pRVar6 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_HUNE_DAMAGE);
ResTIMG* pRVar5 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_SHIP_NODAMAGE_e);
ResTIMG* pRVar6 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_HUNE_DAMAGE_e);
// Bug: m5AC only has 5 elements, copy-paste mistake.
for (s32 i = 0; i < ARRAY_SSIZE(m584); i++) {
@@ -544,10 +544,10 @@ BOOL daCanon_c::CreateHeap() {
}
}
ResTIMG* pRVar7 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_RULE);
ResTIMG* pRVar8 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_BATTERY);
ResTIMG* pRVar9 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_GAME_BATTERY_BASE);
ResTIMG* pRVar10 = (ResTIMG*)dComIfG_getObjectRes("Bomber", BOMBER_INDEX_BTI_RUPY_NUM_DEGREE);
ResTIMG* pRVar7 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_RULE_e);
ResTIMG* pRVar8 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_BATTERY_e);
ResTIMG* pRVar9 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_GAME_BATTERY_BASE_e);
ResTIMG* pRVar10 = (ResTIMG*)dComIfG_getObjectRes("Bomber", dRes_INDEX_BOMBER_BTI_RUPY_NUM_DEGREE_e);
m5C0 = new dDlst_2DBattery_c();
if (m5C0 == NULL) {