mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-17 21:03:35 -04:00
Update all code to use the new enum formats
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
#include "d/actor/d_a_npc_kamome.h"
|
||||
#include "d/res/res_kamome.h"
|
||||
#include "res/Object/Kamome.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "m_Do/m_Do_hostIO.h"
|
||||
#include "d/d_item_data.h"
|
||||
@@ -274,13 +274,13 @@ static int headNodeCallBack(J3DNode* node, int calcTiming) {
|
||||
|
||||
/* 00000CD0-00000EB8 .text createHeap__11daNpc_kam_cFv */
|
||||
BOOL daNpc_kam_c::createHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kamome", KAMOME_BDL_KA_HYOI);
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BDL_KA_HYOI_e);
|
||||
JUT_ASSERT(DEMO_SELECT(762, 763), modelData != NULL);
|
||||
|
||||
mpMorf = new mDoExt_McaMorf(
|
||||
modelData,
|
||||
NULL, NULL,
|
||||
(J3DAnmTransformKey*)dComIfG_getObjectRes("Kamome", KAMOME_BCK_KA_WAIT1),
|
||||
(J3DAnmTransformKey*)dComIfG_getObjectRes("Kamome", dRes_INDEX_KAMOME_BCK_KA_WAIT1_e),
|
||||
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1,
|
||||
NULL,
|
||||
0x00080000,
|
||||
@@ -1183,9 +1183,9 @@ struct anmTbl_c {
|
||||
/* 000039E8-00003B14 .text setAnm__11daNpc_kam_cFi */
|
||||
void daNpc_kam_c::setAnm(int anmIdx) {
|
||||
static anmTbl_c l_anmTbl[] = {
|
||||
{KAMOME_BCK_KA_WAIT1, KAMOME_BAS_KA_WAIT1},
|
||||
{KAMOME_BCK_KA_WAIT2, KAMOME_BAS_KA_WAIT2},
|
||||
{KAMOME_BCK_KA_SING1, -1},
|
||||
{dRes_INDEX_KAMOME_BCK_KA_WAIT1_e, dRes_INDEX_KAMOME_BAS_KA_WAIT1_e},
|
||||
{dRes_INDEX_KAMOME_BCK_KA_WAIT2_e, dRes_INDEX_KAMOME_BAS_KA_WAIT2_e},
|
||||
{dRes_INDEX_KAMOME_BCK_KA_SING1_e, -1},
|
||||
};
|
||||
static anmPrm_c l_anmPrm[] = {
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user