mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-18 05:08:57 -04:00
Update all code to use the new enum formats
This commit is contained in:
@@ -5,9 +5,9 @@
|
||||
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
#include "d/actor/d_a_obj_mtest.h"
|
||||
#include "d/res/res_mtest.h"
|
||||
#include "d/res/res_owater.h"
|
||||
#include "d/res/res_astop.h"
|
||||
#include "res/Object/Mtest.h"
|
||||
#include "res/Object/Owater.h"
|
||||
#include "res/Object/Astop.h"
|
||||
#include "JSystem/J3DGraphAnimator/J3DModel.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "m_Do/m_Do_mtx.h"
|
||||
@@ -80,10 +80,10 @@ bool daObjMtest::Act_c::chk_appear() {
|
||||
/* 00000198-00000284 .text CreateHeap__Q210daObjMtest5Act_cFv */
|
||||
BOOL daObjMtest::Act_c::CreateHeap() {
|
||||
static s16 bmd_data[Type_Max] = {
|
||||
MTEST_BMD_MCUBE,
|
||||
MTEST_BMD_MCYLN,
|
||||
MTEST_BMD_MCUBE,
|
||||
MTEST_BMD_MCYLN,
|
||||
dRes_INDEX_MTEST_BMD_MCUBE_e,
|
||||
dRes_INDEX_MTEST_BMD_MCYLN_e,
|
||||
dRes_INDEX_MTEST_BMD_MCUBE_e,
|
||||
dRes_INDEX_MTEST_BMD_MCYLN_e,
|
||||
-1,
|
||||
-1,
|
||||
-1,
|
||||
@@ -136,54 +136,54 @@ BOOL daObjMtest::Act_c::Create() {
|
||||
cPhs_State daObjMtest::Act_c::Mthd_Create() {
|
||||
static s16 dzb_data[5][Type_Max] = {
|
||||
{
|
||||
MTEST_DZB_MCUBE,
|
||||
MTEST_DZB_MCYLN,
|
||||
MTEST_DZB_MCUBE,
|
||||
MTEST_DZB_MCYLN,
|
||||
MTEST_DZB_MWTRSB,
|
||||
MTEST_DZB_MYGNSB,
|
||||
OWATER_DZB_OWATER,
|
||||
ASTOP_DZB_ASLOW,
|
||||
dRes_INDEX_MTEST_DZB_MCUBE_e,
|
||||
dRes_INDEX_MTEST_DZB_MCYLN_e,
|
||||
dRes_INDEX_MTEST_DZB_MCUBE_e,
|
||||
dRes_INDEX_MTEST_DZB_MCYLN_e,
|
||||
dRes_INDEX_MTEST_DZB_MWTRSB_e,
|
||||
dRes_INDEX_MTEST_DZB_MYGNSB_e,
|
||||
dRes_INDEX_OWATER_DZB_OWATER_e,
|
||||
dRes_INDEX_ASTOP_DZB_ASLOW_e,
|
||||
},
|
||||
{
|
||||
MTEST_DZB_MCUBEHG,
|
||||
MTEST_DZB_MCYLNHG,
|
||||
MTEST_DZB_MCUBEHG,
|
||||
MTEST_DZB_MCYLNHG,
|
||||
MTEST_DZB_MWTRSB,
|
||||
MTEST_DZB_MYGNSB,
|
||||
OWATER_DZB_OWATER,
|
||||
ASTOP_DZB_ASLOW00,
|
||||
dRes_INDEX_MTEST_DZB_MCUBEHG_e,
|
||||
dRes_INDEX_MTEST_DZB_MCYLNHG_e,
|
||||
dRes_INDEX_MTEST_DZB_MCUBEHG_e,
|
||||
dRes_INDEX_MTEST_DZB_MCYLNHG_e,
|
||||
dRes_INDEX_MTEST_DZB_MWTRSB_e,
|
||||
dRes_INDEX_MTEST_DZB_MYGNSB_e,
|
||||
dRes_INDEX_OWATER_DZB_OWATER_e,
|
||||
dRes_INDEX_ASTOP_DZB_ASLOW00_e,
|
||||
},
|
||||
{
|
||||
MTEST_DZB_MCUBENC,
|
||||
MTEST_DZB_MCYLNNC,
|
||||
MTEST_DZB_MCUBENC,
|
||||
MTEST_DZB_MCYLNNC,
|
||||
MTEST_DZB_MWTRSB,
|
||||
MTEST_DZB_MYGNSB,
|
||||
OWATER_DZB_OWATER,
|
||||
ASTOP_DZB_ASTOP,
|
||||
dRes_INDEX_MTEST_DZB_MCUBENC_e,
|
||||
dRes_INDEX_MTEST_DZB_MCYLNNC_e,
|
||||
dRes_INDEX_MTEST_DZB_MCUBENC_e,
|
||||
dRes_INDEX_MTEST_DZB_MCYLNNC_e,
|
||||
dRes_INDEX_MTEST_DZB_MWTRSB_e,
|
||||
dRes_INDEX_MTEST_DZB_MYGNSB_e,
|
||||
dRes_INDEX_OWATER_DZB_OWATER_e,
|
||||
dRes_INDEX_ASTOP_DZB_ASTOP_e,
|
||||
},
|
||||
{
|
||||
MTEST_DZB_MCUBELK,
|
||||
MTEST_DZB_MCYLN,
|
||||
MTEST_DZB_MCUBELK,
|
||||
MTEST_DZB_MCYLN,
|
||||
MTEST_DZB_MWTRSB,
|
||||
MTEST_DZB_MYGNSB,
|
||||
OWATER_DZB_OWATER,
|
||||
ASTOP_DZB_ASTOP00,
|
||||
dRes_INDEX_MTEST_DZB_MCUBELK_e,
|
||||
dRes_INDEX_MTEST_DZB_MCYLN_e,
|
||||
dRes_INDEX_MTEST_DZB_MCUBELK_e,
|
||||
dRes_INDEX_MTEST_DZB_MCYLN_e,
|
||||
dRes_INDEX_MTEST_DZB_MWTRSB_e,
|
||||
dRes_INDEX_MTEST_DZB_MYGNSB_e,
|
||||
dRes_INDEX_OWATER_DZB_OWATER_e,
|
||||
dRes_INDEX_ASTOP_DZB_ASTOP00_e,
|
||||
},
|
||||
{
|
||||
MTEST_DZB_MCUBE,
|
||||
MTEST_DZB_MCYLN,
|
||||
MTEST_DZB_MCUBE,
|
||||
MTEST_DZB_MCYLN,
|
||||
MTEST_DZB_MWTRSB,
|
||||
MTEST_DZB_MYGNSB,
|
||||
OWATER_DZB_OWATER,
|
||||
ASTOP_DZB_A00,
|
||||
dRes_INDEX_MTEST_DZB_MCUBE_e,
|
||||
dRes_INDEX_MTEST_DZB_MCYLN_e,
|
||||
dRes_INDEX_MTEST_DZB_MCUBE_e,
|
||||
dRes_INDEX_MTEST_DZB_MCYLN_e,
|
||||
dRes_INDEX_MTEST_DZB_MWTRSB_e,
|
||||
dRes_INDEX_MTEST_DZB_MYGNSB_e,
|
||||
dRes_INDEX_OWATER_DZB_OWATER_e,
|
||||
dRes_INDEX_ASTOP_DZB_A00_e,
|
||||
},
|
||||
};
|
||||
static u32 heap_size[5][Type_Max] = {
|
||||
|
||||
Reference in New Issue
Block a user