diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-05-21 14:44:25 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-05-21 14:44:25 -0400 |
| commit | c625992a77c017d31807c00529effbd9cff05f4a (patch) | |
| tree | 9b0b2319128d486233b75bd4ac8ad351ab146ba9 /src | |
| parent | 86c96002bc1afee55138ab058dda088d72d032af (diff) | |
Add enum for actor priority
Diffstat (limited to 'src')
441 files changed, 897 insertions, 456 deletions
diff --git a/src/d/actor/d_a_acorn_leaf.cpp b/src/d/actor/d_a_acorn_leaf.cpp index cb53b72f..6ea15890 100644 --- a/src/d/actor/d_a_acorn_leaf.cpp +++ b/src/d/actor/d_a_acorn_leaf.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_acorn_leaf.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000010C .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -94,7 +95,7 @@ actor_process_profile_definition g_profile_ACORN_LEAF = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0118, + /* Priority */ PRIO_ACORN_LEAF, /* Actor SubMtd */ &daAleafMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index a195fa37..d6b3d74e 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -14,6 +14,7 @@ #include "d/d_item_data.h" #include "d/d_meter.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_kankyo_wether.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_dvd_thread.h" @@ -1801,7 +1802,7 @@ actor_process_profile_definition g_profile_AGB = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x000C, + /* Priority */ PRIO_AGB, /* Actor SubMtd */ &l_daAgb_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index 9b2d29a5..c8f486e5 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -5,6 +5,7 @@ #include "global.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "weak_data_1811.h" // IWYU pragma: keep @@ -2595,7 +2596,7 @@ actor_process_profile_definition g_profile_AGBSW0 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x000D, + /* Priority */ PRIO_AGBSW0, /* Actor SubMtd */ &l_daAgbsw0_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 030789fc..7dc518c3 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_alldie.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" enum { @@ -126,7 +127,7 @@ actor_process_profile_definition g_profile_ALLDIE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x011D, + /* Priority */ PRIO_ALLDIE, /* Actor SubMtd */ &l_daAlldie_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 6eb844f3..bcd54e39 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -9,6 +9,7 @@ #include "JSystem/J3DGraphAnimator/J3DNode.h" #include "SSystem/SComponent/c_xyz.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_bg_s_acch.h" #include "d/d_bg_s_lin_chk.h" @@ -1348,7 +1349,7 @@ actor_process_profile_definition g_profile_AM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00BD, + /* Priority */ PRIO_AM, /* Actor SubMtd */ &l_daAM_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 2d26f152..0275a84f 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -7,6 +7,7 @@ #include "d/res/res_am2.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_s_play.h" #include "d/d_com_inf_game.h" @@ -1483,7 +1484,7 @@ actor_process_profile_definition g_profile_AM2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00BE, + /* Priority */ PRIO_AM2, /* Actor SubMtd */ &l_daAM2_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_amiprop.cpp b/src/d/actor/d_a_amiprop.cpp index 48028494..4d23305c 100644 --- a/src/d/actor/d_a_amiprop.cpp +++ b/src/d/actor/d_a_amiprop.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_amiprop.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000D4 .text _delete__11daAmiProp_cFv */ bool daAmiProp_c::_delete() { @@ -94,7 +95,7 @@ actor_process_profile_definition g_profile_AMI_PROP = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0090, + /* Priority */ PRIO_AMI_PROP, /* Actor SubMtd */ &daAmiPropMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp index f11f2e7a..30ce003f 100644 --- a/src/d/actor/d_a_andsw0.cpp +++ b/src/d/actor/d_a_andsw0.cpp @@ -7,6 +7,7 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_bk.h" #include "d/actor/d_a_bb.h" @@ -356,7 +357,7 @@ actor_process_profile_definition g_profile_ANDSW0 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0135, + /* Priority */ PRIO_ANDSW0, /* Actor SubMtd */ &l_daAndsw0_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index 7c03efb8..0ec1a739 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -7,6 +7,7 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" enum Action { ACT_ON_ALL, @@ -271,7 +272,7 @@ actor_process_profile_definition g_profile_ANDSW2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0136, + /* Priority */ PRIO_ANDSW2, /* Actor SubMtd */ &l_daAndsw2_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 31c826aa..bfd8dd98 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -7,6 +7,7 @@ #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_item_data.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_player_main.h" @@ -1294,7 +1295,7 @@ actor_process_profile_definition g_profile_ARROW = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01BF, + /* Priority */ PRIO_ARROW, /* Actor SubMtd */ &daArrowMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index bceb2228..39bc2fa3 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/src/d/actor/d_a_arrow_iceeff.cpp @@ -8,6 +8,7 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_arrow.h" @@ -311,7 +312,7 @@ actor_process_profile_definition g_profile_ARROW_ICEEFF = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01C0, + /* Priority */ PRIO_ARROW_ICEEFF, /* Actor SubMtd */ &daArrow_IceeffMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index f9bf8fea..80b9ac29 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/src/d/actor/d_a_arrow_lighteff.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_arrow.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_graphic.h" #include "SSystem/SComponent/c_lib.h" @@ -417,7 +418,7 @@ actor_process_profile_definition g_profile_ARROW_LIGHTEFF = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01C1, + /* Priority */ PRIO_ARROW_LIGHTEFF, /* Actor SubMtd */ &daArrow_LighteffMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_atdoor.cpp b/src/d/actor/d_a_atdoor.cpp index 864c94d5..d0a2d134 100644 --- a/src/d/actor/d_a_atdoor.cpp +++ b/src/d/actor/d_a_atdoor.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_atdoor.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000084 .text getSwbit__10daAtdoor_cFv */ void daAtdoor_c::getSwbit() { @@ -104,7 +105,7 @@ actor_process_profile_definition g_profile_ATDOOR = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x012F, + /* Priority */ PRIO_ATDOOR, /* Actor SubMtd */ &l_daAtdoor_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_att.cpp b/src/d/actor/d_a_att.cpp index c65d269a..44d9e1eb 100644 --- a/src/d/actor/d_a_att.cpp +++ b/src/d/actor/d_a_att.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_att.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "d/actor/d_a_bgn.h" @@ -250,7 +251,7 @@ actor_process_profile_definition g_profile_ATT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x019C, + /* Priority */ PRIO_ATT, /* Actor SubMtd */ &l_daAtt_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index 74493783..04c7aa77 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_player_main.h" #include "d/d_camera.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_controller_pad.h" #include "weak_bss_936_to_1036.h" // IWYU pragma: keep @@ -1661,7 +1662,7 @@ actor_process_profile_definition g_profile_AUCTION = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01E0, + /* Priority */ PRIO_AUCTION, /* Actor SubMtd */ &daAuctionMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index c24dfec9..fe7b439d 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/src/d/actor/d_a_bb.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_bb.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000003C8 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -185,7 +186,7 @@ actor_process_profile_definition g_profile_BB = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x000E, + /* Priority */ PRIO_BB, /* Actor SubMtd */ &l_daBb_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index 18820d53..6452efac 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/src/d/actor/d_a_bdk.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_bdk.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000015C .text __ct__11daBdk_HIO_cFv */ daBdk_HIO_c::daBdk_HIO_c() { @@ -330,7 +331,7 @@ actor_process_profile_definition g_profile_BDK = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00E3, + /* Priority */ PRIO_BDK, /* Actor SubMtd */ &l_daBdk_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bdkobj.cpp b/src/d/actor/d_a_bdkobj.cpp index 3bbd5f61..aa12c9bf 100644 --- a/src/d/actor/d_a_bdkobj.cpp +++ b/src/d/actor/d_a_bdkobj.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_bdkobj.h" #include "d/d_bg_w.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000104 .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { @@ -85,7 +86,7 @@ actor_process_profile_definition g_profile_BDKOBJ = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00E4, + /* Priority */ PRIO_BDKOBJ, /* Actor SubMtd */ &l_daBdkobj_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp index 50fb9ce5..6ce0f132 100644 --- a/src/d/actor/d_a_beam.cpp +++ b/src/d/actor/d_a_beam.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_beam.h" #include "d/d_cc_d.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000118 .text __ct__12daBeam_HIO_cFv */ daBeam_HIO_c::daBeam_HIO_c() { @@ -125,7 +126,7 @@ actor_process_profile_definition g_profile_Beam = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00DC, + /* Priority */ PRIO_Beam, /* Actor SubMtd */ &daBeamMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_bflower.cpp b/src/d/actor/d_a_bflower.cpp index 3ced7efb..4313d564 100644 --- a/src/d/actor/d_a_bflower.cpp +++ b/src/d/actor/d_a_bflower.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_bflower.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_vbakh.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player_main.h" @@ -531,7 +532,7 @@ actor_process_profile_definition g_profile_BOMB_FLOWER = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0117, + /* Priority */ PRIO_BOMB_FLOWER, /* Actor SubMtd */ &daBFlowerMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp index f8048fa6..acee5428 100644 --- a/src/d/actor/d_a_bgn.cpp +++ b/src/d/actor/d_a_bgn.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_bgn2.h" #include "d/actor/d_a_bgn3.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" /* 000000EC-000003F0 .text __ct__11daBgn_HIO_cFv */ @@ -293,7 +294,7 @@ actor_process_profile_definition g_profile_BGN = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00E8, + /* Priority */ PRIO_BGN, /* Actor SubMtd */ &l_daBgn_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bgn2.cpp b/src/d/actor/d_a_bgn2.cpp index dd4f1c8d..ad7d85c6 100644 --- a/src/d/actor/d_a_bgn2.cpp +++ b/src/d/actor/d_a_bgn2.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_bgn2.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000194 .text __ct__12daBgn2_HIO_cFv */ daBgn2_HIO_c::daBgn2_HIO_c() { @@ -164,7 +165,7 @@ actor_process_profile_definition g_profile_BGN2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00E9, + /* Priority */ PRIO_BGN2, /* Actor SubMtd */ &l_daBgn2_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bgn3.cpp b/src/d/actor/d_a_bgn3.cpp index 13ed2bff..43652868 100644 --- a/src/d/actor/d_a_bgn3.cpp +++ b/src/d/actor/d_a_bgn3.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_bgn3.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001F4 .text __ct__12daBgn3_HIO_cFv */ daBgn3_HIO_c::daBgn3_HIO_c() { @@ -164,7 +165,7 @@ actor_process_profile_definition g_profile_BGN3 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00EA, + /* Priority */ PRIO_BGN3, /* Actor SubMtd */ &l_daBgn3_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bigelf.cpp b/src/d/actor/d_a_bigelf.cpp index 36ba9f0d..7f5f71ef 100644 --- a/src/d/actor/d_a_bigelf.cpp +++ b/src/d/actor/d_a_bigelf.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_bigelf.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000016C .text oct_delete__10daBigelf_cFv */ void daBigelf_c::oct_delete() { @@ -374,7 +375,7 @@ actor_process_profile_definition g_profile_BIGELF = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x012B, + /* Priority */ PRIO_BIGELF, /* Actor SubMtd */ &l_daBigelf_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index 6086b8c1..31b4fcde 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/src/d/actor/d_a_bita.cpp @@ -11,6 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_btd.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -290,7 +291,7 @@ actor_process_profile_definition g_profile_BITA = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0096, + /* Priority */ PRIO_BITA, /* Actor SubMtd */ &l_daBita_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index d4e3511d..8deea0e4 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -9,6 +9,7 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_obj_search.h" #include "d/actor/d_a_bridge.h" @@ -5106,7 +5107,7 @@ actor_process_profile_definition g_profile_BK = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00B0, + /* Priority */ PRIO_BK, /* Actor SubMtd */ &l_daBk_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bl.cpp b/src/d/actor/d_a_bl.cpp index 1e7b597b..a0a4f360 100644 --- a/src/d/actor/d_a_bl.cpp +++ b/src/d/actor/d_a_bl.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_bl.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000178 .text draw_SUB__FP8bl_class */ void draw_SUB(bl_class*) { @@ -174,7 +175,7 @@ actor_process_profile_definition g_profile_BL = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00C2, + /* Priority */ PRIO_BL, /* Actor SubMtd */ &l_daBL_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp index 60ba4c38..03bfde86 100644 --- a/src/d/actor/d_a_bmd.cpp +++ b/src/d/actor/d_a_bmd.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_bmd.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000134 .text __ct__11daBmd_HIO_cFv */ daBmd_HIO_c::daBmd_HIO_c() { @@ -169,7 +170,7 @@ actor_process_profile_definition g_profile_BMD = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00DF, + /* Priority */ PRIO_BMD, /* Actor SubMtd */ &l_daBmd_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp index b5ce6790..b5241390 100644 --- a/src/d/actor/d_a_bmdfoot.cpp +++ b/src/d/actor/d_a_bmdfoot.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_bmdfoot.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000114 .text __ct__15daBmdfoot_HIO_cFv */ daBmdfoot_HIO_c::daBmdfoot_HIO_c() { @@ -125,7 +126,7 @@ actor_process_profile_definition g_profile_BMDFOOT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00E1, + /* Priority */ PRIO_BMDFOOT, /* Actor SubMtd */ &l_daBmdfoot_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bmdhand.cpp b/src/d/actor/d_a_bmdhand.cpp index 299ff1e4..93718036 100644 --- a/src/d/actor/d_a_bmdhand.cpp +++ b/src/d/actor/d_a_bmdhand.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_bmdhand.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000118 .text __ct__15daBmdhand_HIO_cFv */ daBmdhand_HIO_c::daBmdhand_HIO_c() { @@ -139,7 +140,7 @@ actor_process_profile_definition g_profile_BMDHAND = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00E0, + /* Priority */ PRIO_BMDHAND, /* Actor SubMtd */ &l_daBmdhand_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bo.cpp b/src/d/actor/d_a_bo.cpp index 41a96f4e..36ffaf5d 100644 --- a/src/d/actor/d_a_bo.cpp +++ b/src/d/actor/d_a_bo.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_bo.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001E8 .text smoke_set__FP8bo_class */ void smoke_set(bo_class*) { @@ -154,7 +155,7 @@ actor_process_profile_definition g_profile_BO = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00C9, + /* Priority */ PRIO_BO, /* Actor SubMtd */ &l_daBO_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp index bb43491b..fc78b4f7 100644 --- a/src/d/actor/d_a_boko.cpp +++ b/src/d/actor/d_a_boko.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_boko.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_bg_s_lin_chk.h" #include "weak_bss_936_to_1036.h" // IWYU pragma: keep @@ -283,7 +284,7 @@ actor_process_profile_definition g_profile_BOKO = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01A0, + /* Priority */ PRIO_BOKO, /* Actor SubMtd */ &l_daBoko_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 38b68171..1f697e9b 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_player.h" #include "d/d_a_obj.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_kankyo_wether.h" #include "d/d_com_inf_game.h" #include "d/res/res_vbakh.h" @@ -1350,7 +1351,7 @@ actor_process_profile_definition g_profile_Bomb2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0116, + /* Priority */ PRIO_Bomb2, /* Actor SubMtd */ &daBomb2::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index efd437ae..8afe12d8 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -7,6 +7,7 @@ #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_sea.h" #include "d/d_kankyo_wether.h" @@ -1487,7 +1488,7 @@ actor_process_profile_definition g_profile_BOMB = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0115, + /* Priority */ PRIO_BOMB, /* Actor SubMtd */ &l_daBomb_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 22bd3e13..acbe8367 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_boomerang.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "assets/l_sightMatDL.h" #include "assets/l_sightDL__d_a_boomerang.h" @@ -167,7 +168,7 @@ actor_process_profile_definition g_profile_BOOMERANG = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x019F, + /* Priority */ PRIO_BOOMERANG, /* Actor SubMtd */ &l_daBoomerang_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_boss_item.cpp b/src/d/actor/d_a_boss_item.cpp index ba010aad..aec37c92 100644 --- a/src/d/actor/d_a_boss_item.cpp +++ b/src/d/actor/d_a_boss_item.cpp @@ -7,6 +7,7 @@ #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" /* 00000078-00000080 .text daBossItem_IsDelete__FP14bossitem_class */ @@ -56,7 +57,7 @@ actor_process_profile_definition g_profile_BOSSITEM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00FB, + /* Priority */ PRIO_BOSSITEM, /* Actor SubMtd */ &daBossItem_METHODS, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp index db051b80..e0f5c3cd 100644 --- a/src/d/actor/d_a_bpw.cpp +++ b/src/d/actor/d_a_bpw.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_bpw.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000258 .text body_nodeCallBack__FP7J3DNodei */ static BOOL body_nodeCallBack(J3DNode*, int) { @@ -304,7 +305,7 @@ actor_process_profile_definition g_profile_BPW = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00C6, + /* Priority */ PRIO_BPW, /* Actor SubMtd */ &l_daBPW_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index 19bae8d6..1536f9c2 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -8,6 +8,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "d/d_kankyo.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -233,7 +234,7 @@ actor_process_profile_definition g_profile_BRANCH = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0193, + /* Priority */ PRIO_BRANCH, /* Actor SubMtd */ &l_daBranch_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_bridge.cpp b/src/d/actor/d_a_bridge.cpp index f8f84826..c460d6fb 100644 --- a/src/d/actor/d_a_bridge.cpp +++ b/src/d/actor/d_a_bridge.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_bridge.h" #include "d/d_bg_w.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000504 .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { @@ -115,7 +116,7 @@ actor_process_profile_definition g_profile_BRIDGE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0089, + /* Priority */ PRIO_BRIDGE, /* Actor SubMtd */ &l_daBridge_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp index ae65e08d..95deea4d 100644 --- a/src/d/actor/d_a_bst.cpp +++ b/src/d/actor/d_a_bst.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_bst.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000110 .text __ct__11daBst_HIO_cFv */ daBst_HIO_c::daBst_HIO_c() { @@ -230,7 +231,7 @@ actor_process_profile_definition g_profile_BST = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00E5, + /* Priority */ PRIO_BST, /* Actor SubMtd */ &l_daBst_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp index f8c27ea3..3b22597f 100644 --- a/src/d/actor/d_a_btd.cpp +++ b/src/d/actor/d_a_btd.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_btd.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001C8 .text __ct__11daBtd_HIO_cFv */ daBtd_HIO_c::daBtd_HIO_c() { @@ -240,7 +241,7 @@ actor_process_profile_definition g_profile_BTD = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00DE, + /* Priority */ PRIO_BTD, /* Actor SubMtd */ &l_daBtd_Method, /* Status */ fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bwd.cpp b/src/d/actor/d_a_bwd.cpp index b102928c..978ef1fa 100644 --- a/src/d/actor/d_a_bwd.cpp +++ b/src/d/actor/d_a_bwd.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_bwd.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000019C .text __ct__11daBwd_HIO_cFv */ daBwd_HIO_c::daBwd_HIO_c() { @@ -174,7 +175,7 @@ actor_process_profile_definition g_profile_BWD = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00CC, + /* Priority */ PRIO_BWD, /* Actor SubMtd */ &l_daBwd_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp index 1a617e09..86d97044 100644 --- a/src/d/actor/d_a_bwdg.cpp +++ b/src/d/actor/d_a_bwdg.cpp @@ -8,6 +8,7 @@ #include "d/d_bg_w_hf.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_bwd.h" #include "f_op/f_op_actor_mng.h" #include "dolphin/gf/GFGeometry.h" @@ -276,7 +277,7 @@ actor_process_profile_definition g_profile_BWDG = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00CE, + /* Priority */ PRIO_BWDG, /* Actor SubMtd */ &l_daBwdg_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_bwds.cpp b/src/d/actor/d_a_bwds.cpp index 6ae19226..5fa338ce 100644 --- a/src/d/actor/d_a_bwds.cpp +++ b/src/d/actor/d_a_bwds.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_bwds.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000144 .text __ct__12daBwds_HIO_cFv */ daBwds_HIO_c::daBwds_HIO_c() { @@ -114,7 +115,7 @@ actor_process_profile_definition g_profile_BWDS = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00CD, + /* Priority */ PRIO_BWDS, /* Actor SubMtd */ &l_daBwds_Method, /* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_canon.cpp b/src/d/actor/d_a_canon.cpp index f074af1d..c713c0b0 100644 --- a/src/d/actor/d_a_canon.cpp +++ b/src/d/actor/d_a_canon.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_canon.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000002C8 .text set_mtx__9daCanon_cFv */ void daCanon_c::set_mtx() { @@ -190,7 +191,7 @@ actor_process_profile_definition g_profile_Canon = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01AD, + /* Priority */ PRIO_Canon, /* Actor SubMtd */ &daCanonMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_cc.cpp b/src/d/actor/d_a_cc.cpp index ebf5744e..0f6e922e 100644 --- a/src/d/actor/d_a_cc.cpp +++ b/src/d/actor/d_a_cc.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_cc.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000002AC .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -184,7 +185,7 @@ actor_process_profile_definition g_profile_CC = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00C1, + /* Priority */ PRIO_CC, /* Actor SubMtd */ &l_daCC_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_coming2.cpp b/src/d/actor/d_a_coming2.cpp index 3e100104..7019dd5a 100644 --- a/src/d/actor/d_a_coming2.cpp +++ b/src/d/actor/d_a_coming2.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_coming2.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000164 .text chase_ship__Q29daComing25Act_cFv */ void daComing2::Act_c::chase_ship() { @@ -228,7 +229,7 @@ actor_process_profile_definition g_profile_Coming2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0028, + /* Priority */ PRIO_Coming2, /* Actor SubMtd */ &daComing2::Mthd_Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_coming3.cpp b/src/d/actor/d_a_coming3.cpp index e0f67ded..ba11de28 100644 --- a/src/d/actor/d_a_coming3.cpp +++ b/src/d/actor/d_a_coming3.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_coming3.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000404 .text get_water_height__Q29daComing35Act_cFPfPiPC4cXyz */ void daComing3::Act_c::get_water_height(float*, int*, const cXyz*) { @@ -168,7 +169,7 @@ actor_process_profile_definition g_profile_Coming3 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0029, + /* Priority */ PRIO_Coming3, /* Actor SubMtd */ &daComing3::Mthd_Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_dai.cpp b/src/d/actor/d_a_dai.cpp index 04930adc..f856bde0 100644 --- a/src/d/actor/d_a_dai.cpp +++ b/src/d/actor/d_a_dai.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_dai.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000C4 .text _delete__7daDai_cFv */ bool daDai_c::_delete() { @@ -134,7 +135,7 @@ actor_process_profile_definition g_profile_DAI = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0138, + /* Priority */ PRIO_DAI, /* Actor SubMtd */ &daDaiMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp index a22a07c5..f4e70ae7 100644 --- a/src/d/actor/d_a_dai_item.cpp +++ b/src/d/actor/d_a_dai_item.cpp @@ -7,6 +7,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/d_kankyo_wether.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/res/res_fdai.h" #include "d/res/res_cloth.h" @@ -816,7 +817,7 @@ actor_process_profile_definition g_profile_STANDITEM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0101, + /* Priority */ PRIO_STANDITEM, /* Actor SubMtd */ &daStandItemMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp index d02eadcd..bfeab9d3 100644 --- a/src/d/actor/d_a_daiocta.cpp +++ b/src/d/actor/d_a_daiocta.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_daiocta.h" #include "d/d_cc_d.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000002B0 .text __ct__15daDaiocta_HIO_cFv */ daDaiocta_HIO_c::daDaiocta_HIO_c() { @@ -305,7 +306,7 @@ actor_process_profile_definition g_profile_DAIOCTA = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00D5, + /* Priority */ PRIO_DAIOCTA, /* Actor SubMtd */ &daDaioctaMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp index e83bcb85..ac70ac3d 100644 --- a/src/d/actor/d_a_daiocta_eye.cpp +++ b/src/d/actor/d_a_daiocta_eye.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_daiocta_eye.h" #include "d/d_cc_d.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001B0 .text __ct__19daDaiocta_Eye_HIO_cFv */ daDaiocta_Eye_HIO_c::daDaiocta_Eye_HIO_c() { @@ -155,7 +156,7 @@ actor_process_profile_definition g_profile_DAIOCTA_EYE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00D6, + /* Priority */ PRIO_DAIOCTA_EYE, /* Actor SubMtd */ &daDaiocta_EyeMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index 50b780ee..370cf9a4 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -7,6 +7,7 @@ #include "d/res/res_deku.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "weak_data_1811.h" // IWYU pragma: keep @@ -291,7 +292,7 @@ actor_process_profile_definition g_profile_DEKU_ITEM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00FF, + /* Priority */ PRIO_DEKU_ITEM, /* Actor SubMtd */ &daDekuItemMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index 40565136..7094ec58 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -14,6 +14,7 @@ #include "d/d_kankyo.h" #include "d/d_kankyo_demo.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_graphic.h" @@ -234,7 +235,7 @@ actor_process_profile_definition g_profile_DEMO00 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x018D, + /* Priority */ PRIO_DEMO00, /* Actor SubMtd */ &l_daDemo00_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_demo_dk.cpp b/src/d/actor/d_a_demo_dk.cpp index 1d43e259..a00332d6 100644 --- a/src/d/actor/d_a_demo_dk.cpp +++ b/src/d/actor/d_a_demo_dk.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_demo_dk.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000E8 .text daDEMO_DK_Draw__FP13demo_dk_class */ static BOOL daDEMO_DK_Draw(demo_dk_class*) { @@ -69,7 +70,7 @@ actor_process_profile_definition g_profile_DEMO_DK = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00BC, + /* Priority */ PRIO_DEMO_DK, /* Actor SubMtd */ &l_daDEMO_DK_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 32d6d38f..8655c3ab 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_demo_item.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_drawlist.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_actor_mng.h" @@ -549,7 +550,7 @@ actor_process_profile_definition g_profile_Demo_Item = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00FC, + /* Priority */ PRIO_Demo_Item, /* Actor SubMtd */ &l_daDitem_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_demo_kmm.cpp b/src/d/actor/d_a_demo_kmm.cpp index 6ebda6fc..388a1a90 100644 --- a/src/d/actor/d_a_demo_kmm.cpp +++ b/src/d/actor/d_a_demo_kmm.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_demo_kmm.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -84,7 +85,7 @@ actor_process_profile_definition g_profile_DEMO_KMM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00B8, + /* Priority */ PRIO_DEMO_KMM, /* Actor SubMtd */ &l_daDemo_Kmm_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 9fdb963f..0f443c1e 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -7,6 +7,7 @@ #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -132,7 +133,7 @@ actor_process_profile_definition g_profile_DISAPPEAR = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0188, + /* Priority */ PRIO_DISAPPEAR, /* Actor SubMtd */ &l_daDisappear_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_dk.cpp b/src/d/actor/d_a_dk.cpp index f3960917..144412f6 100644 --- a/src/d/actor/d_a_dk.cpp +++ b/src/d/actor/d_a_dk.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_dk.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000130 .text __ct__10daDk_HIO_cFv */ daDk_HIO_c::daDk_HIO_c() { @@ -95,7 +96,7 @@ actor_process_profile_definition g_profile_DK = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00E2, + /* Priority */ PRIO_DK, /* Actor SubMtd */ &l_daDk_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_door10.cpp b/src/d/actor/d_a_door10.cpp index ee2d4ae9..a9279a65 100644 --- a/src/d/actor/d_a_door10.cpp +++ b/src/d/actor/d_a_door10.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_door10.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000C8 .text chkMakeKey__10daDoor10_cFv */ void daDoor10_c::chkMakeKey() { @@ -204,7 +205,7 @@ actor_process_profile_definition g_profile_DOOR10 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x012D, + /* Priority */ PRIO_DOOR10, /* Actor SubMtd */ &l_daDoor10_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_door12.cpp b/src/d/actor/d_a_door12.cpp index 825c26b6..6587d8cd 100644 --- a/src/d/actor/d_a_door12.cpp +++ b/src/d/actor/d_a_door12.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_door12.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000C0 .text chkMakeKey__10daDoor12_cFv */ void daDoor12_c::chkMakeKey() { @@ -214,7 +215,7 @@ actor_process_profile_definition g_profile_DOOR12 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x012E, + /* Priority */ PRIO_DOOR12, /* Actor SubMtd */ &l_daDoor12_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp index 6b42d1cc..71e0e762 100644 --- a/src/d/actor/d_a_dr.cpp +++ b/src/d/actor/d_a_dr.cpp @@ -7,6 +7,7 @@ #include "d/res/res_dr.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_hostIO.h" @@ -271,7 +272,7 @@ actor_process_profile_definition g_profile_DR = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00D2, + /* Priority */ PRIO_DR, /* Actor SubMtd */ &l_daDr_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp index 06877cce..0a809e11 100644 --- a/src/d/actor/d_a_dr2.cpp +++ b/src/d/actor/d_a_dr2.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_dr2.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000110 .text __ct__11daDr2_HIO_cFv */ daDr2_HIO_c::daDr2_HIO_c() { @@ -115,7 +116,7 @@ actor_process_profile_definition g_profile_DR2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00D3, + /* Priority */ PRIO_DR2, /* Actor SubMtd */ &l_daDr2_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_dummy.cpp b/src/d/actor/d_a_dummy.cpp index bae55f33..d917ffc7 100644 --- a/src/d/actor/d_a_dummy.cpp +++ b/src/d/actor/d_a_dummy.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_dummy.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" @@ -94,7 +95,7 @@ actor_process_profile_definition g_profile_Dummy = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0060, + /* Priority */ PRIO_Dummy, /* Actor SubMtd */ &daDummy::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index decbb399..c4c7f036 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_ep.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000158 .text ga_draw__FP8ep_class */ void ga_draw(ep_class*) { @@ -99,7 +100,7 @@ actor_process_profile_definition g_profile_EP = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00AD, + /* Priority */ PRIO_EP, /* Actor SubMtd */ &l_daEp_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp index 4657d475..dda1fdee 100644 --- a/src/d/actor/d_a_esa.cpp +++ b/src/d/actor/d_a_esa.cpp @@ -11,6 +11,7 @@ #include "d/d_s_play.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_bg_s_func.h" #include "d/res/res_link.h" #include "f_op/f_op_actor_mng.h" @@ -300,7 +301,7 @@ actor_process_profile_definition g_profile_ESA = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00D0, + /* Priority */ PRIO_ESA, /* Actor SubMtd */ &l_daEsa_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_fallrock.cpp b/src/d/actor/d_a_fallrock.cpp index aa490194..a675eba9 100644 --- a/src/d/actor/d_a_fallrock.cpp +++ b/src/d/actor/d_a_fallrock.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_fallrock.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -79,7 +80,7 @@ actor_process_profile_definition g_profile_FallRock = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0190, + /* Priority */ PRIO_FallRock, /* Actor SubMtd */ &l_daFallRock_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_fallrock_tag.cpp b/src/d/actor/d_a_fallrock_tag.cpp index 8652bf72..093a07f0 100644 --- a/src/d/actor/d_a_fallrock_tag.cpp +++ b/src/d/actor/d_a_fallrock_tag.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_fallrock_tag.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000080 .text daFallRockTag_Draw__FP15daFallRockTag_c */ static BOOL daFallRockTag_Draw(daFallRockTag_c*) { @@ -59,7 +60,7 @@ actor_process_profile_definition g_profile_TagRock = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x018F, + /* Priority */ PRIO_TagRock, /* Actor SubMtd */ &l_daFallRockTag_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index 92ea8d97..91a07719 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -11,6 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_level_se.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "JSystem/JUtility/JUTAssert.h" @@ -303,7 +304,7 @@ actor_process_profile_definition g_profile_FAN = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x011B, + /* Priority */ PRIO_FAN, /* Actor SubMtd */ &daFanMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_ff.cpp b/src/d/actor/d_a_ff.cpp index edbcbb78..ffeeb64c 100644 --- a/src/d/actor/d_a_ff.cpp +++ b/src/d/actor/d_a_ff.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_ff.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000001E4 .text fire_fly_draw__FP8ff_class */ void fire_fly_draw(ff_class*) { @@ -69,7 +70,7 @@ actor_process_profile_definition g_profile_FF = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00EE, + /* Priority */ PRIO_FF, /* Actor SubMtd */ &l_daFf_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index 27317c7d..0468d3c2 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_fganon.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "JSystem/JUtility/JUTReport.h" #include "d/actor/d_a_boko.h" #include "d/actor/d_a_mant.h" @@ -2877,7 +2878,7 @@ actor_process_profile_definition g_profile_FGANON = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00E6, + /* Priority */ PRIO_FGANON, /* Actor SubMtd */ &l_daFganon_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_fgmahou.cpp b/src/d/actor/d_a_fgmahou.cpp index 7a217ea8..5d9ff523 100644 --- a/src/d/actor/d_a_fgmahou.cpp +++ b/src/d/actor/d_a_fgmahou.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_fgmahou.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000E4 .text daFgmahou_Draw__FP13fgmahou_class */ static BOOL daFgmahou_Draw(fgmahou_class*) { @@ -64,7 +65,7 @@ actor_process_profile_definition g_profile_FGMAHOU = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00E7, + /* Priority */ PRIO_FGMAHOU, /* Actor SubMtd */ &l_daFgmahou_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_fire.cpp b/src/d/actor/d_a_fire.cpp index a8ee90ad..8abf0584 100644 --- a/src/d/actor/d_a_fire.cpp +++ b/src/d/actor/d_a_fire.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_fire.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000F8 .text _delete__8daFire_cFv */ bool daFire_c::_delete() { @@ -129,7 +130,7 @@ actor_process_profile_definition g_profile_Fire = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0192, + /* Priority */ PRIO_Fire, /* Actor SubMtd */ &daFireMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp index 656f4bfb..d89b5d23 100644 --- a/src/d/actor/d_a_floor.cpp +++ b/src/d/actor/d_a_floor.cpp @@ -8,6 +8,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" namespace daFloor_prm { @@ -159,7 +160,7 @@ actor_process_profile_definition g_profile_FLOOR = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0092, + /* Priority */ PRIO_FLOOR, /* Actor SubMtd */ &daFloorMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index dd8e0274..189e3bcf 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/src/d/actor/d_a_fm.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_fm.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000003EC .text __ct__10daFm_HIO_cFv */ daFm_HIO_c::daFm_HIO_c() { @@ -584,7 +585,7 @@ actor_process_profile_definition g_profile_FM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0067, + /* Priority */ PRIO_FM, /* Actor SubMtd */ &daFmMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index 4b39f84c..4a65df30 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -8,6 +8,7 @@ #include "SSystem/SComponent/c_math.h" #include "m_Do/m_Do_mtx.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/d_kankyo_wether.h" @@ -456,7 +457,7 @@ actor_process_profile_definition g_profile_AYUSH = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x009E, + /* Priority */ PRIO_AYUSH, /* Actor SubMtd */ &daGhostshipMethodTable, /* Status */ 0x03 | fopAcStts_SHOWMAP_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_gm.cpp b/src/d/actor/d_a_gm.cpp index d0ede962..7e20dc00 100644 --- a/src/d/actor/d_a_gm.cpp +++ b/src/d/actor/d_a_gm.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_gm.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000032C .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -150,7 +151,7 @@ actor_process_profile_definition g_profile_GM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00BF, + /* Priority */ PRIO_GM, /* Actor SubMtd */ &l_daGM_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_gnd.cpp b/src/d/actor/d_a_gnd.cpp index aa43b86b..ba5fe486 100644 --- a/src/d/actor/d_a_gnd.cpp +++ b/src/d/actor/d_a_gnd.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_gnd.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000023C .text __ct__11daGnd_HIO_cFv */ daGnd_HIO_c::daGnd_HIO_c() { @@ -214,7 +215,7 @@ actor_process_profile_definition g_profile_GND = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00EB, + /* Priority */ PRIO_GND, /* Actor SubMtd */ &l_daGnd_Method, /* Status */ fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_goal_flag.cpp b/src/d/actor/d_a_goal_flag.cpp index 78c05e61..c8aed991 100644 --- a/src/d/actor/d_a_goal_flag.cpp +++ b/src/d/actor/d_a_goal_flag.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_goal_flag.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000210 .text setTexObj__16daGFlag_packet_cFUc */ void daGFlag_packet_c::setTexObj(unsigned char) { @@ -144,7 +145,7 @@ actor_process_profile_definition g_profile_Goal_Flag = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x010E, + /* Priority */ PRIO_Goal_Flag, /* Actor SubMtd */ &daGoal_FlagMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index a167ae9f..72ee151b 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -10,6 +10,7 @@ #include "d/d_flower.h" #include "d/d_grass.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_tree.h" #include "SSystem/SComponent/c_sxyz.h" @@ -212,7 +213,7 @@ actor_process_profile_definition g_profile_GRASS = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01BD, + /* Priority */ PRIO_GRASS, /* Actor SubMtd */ &daGrass_METHODS, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_grid.cpp b/src/d/actor/d_a_grid.cpp index 37b32a0c..1cd06e16 100644 --- a/src/d/actor/d_a_grid.cpp +++ b/src/d/actor/d_a_grid.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_grid.h" #include "JSystem/J3DGraphBase/J3DPacket.h" #include "d/d_procname.h" +#include "d/d_priority.h" static daHo_HIO_c l_HIO; @@ -102,7 +103,7 @@ actor_process_profile_definition g_profile_GRID = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0102, + /* Priority */ PRIO_GRID, /* Actor SubMtd */ &l_daGrid_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_gy.cpp b/src/d/actor/d_a_gy.cpp index 93012b15..035d2258 100644 --- a/src/d/actor/d_a_gy.cpp +++ b/src/d/actor/d_a_gy.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_gy.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000003CC .text __ct__10daGy_HIO_cFv */ daGy_HIO_c::daGy_HIO_c() { @@ -259,7 +260,7 @@ actor_process_profile_definition g_profile_GY = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00D8, + /* Priority */ PRIO_GY, /* Actor SubMtd */ &daGyMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_gy_ctrl.cpp b/src/d/actor/d_a_gy_ctrl.cpp index 5533d58e..aeee74bf 100644 --- a/src/d/actor/d_a_gy_ctrl.cpp +++ b/src/d/actor/d_a_gy_ctrl.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_gy_ctrl.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000170 .text __ct__15daGy_Ctrl_HIO_cFv */ daGy_Ctrl_HIO_c::daGy_Ctrl_HIO_c() { @@ -189,7 +190,7 @@ actor_process_profile_definition g_profile_GY_CTRL = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00D9, + /* Priority */ PRIO_GY_CTRL, /* Actor SubMtd */ &daGy_CtrlMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, @@ -206,7 +207,7 @@ actor_process_profile_definition g_profile_GY_CTRLB = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00DA, + /* Priority */ PRIO_GY_CTRLB, /* Actor SubMtd */ &daGy_CtrlMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp index ef7dd4d2..c9b4771e 100644 --- a/src/d/actor/d_a_himo2.cpp +++ b/src/d/actor/d_a_himo2.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_himo2.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 800EB60C-800EBABC .text spin_draw__FP11himo2_class */ void spin_draw(himo2_class*) { @@ -129,7 +130,7 @@ actor_process_profile_definition g_profile_HIMO2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x019A, + /* Priority */ PRIO_HIMO2, /* Actor SubMtd */ &l_daHimo2_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_himo3.cpp b/src/d/actor/d_a_himo3.cpp index 3bb266de..d93abbef 100644 --- a/src/d/actor/d_a_himo3.cpp +++ b/src/d/actor/d_a_himo3.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_himo3.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000C58 .text himo3_control__FP11himo3_classP7himo3_s */ void himo3_control(himo3_class*, himo3_s*) { @@ -79,7 +80,7 @@ actor_process_profile_definition g_profile_HIMO3 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x019B, + /* Priority */ PRIO_HIMO3, /* Actor SubMtd */ &l_daHimo3_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index dcf3b329..eccbc1e3 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -9,6 +9,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000080 .text daHitobj_Draw__FP12hitobj_class */ static BOOL daHitobj_Draw(hitobj_class* i_this) { @@ -105,7 +106,7 @@ actor_process_profile_definition g_profile_HITOBJ = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00AB, + /* Priority */ PRIO_HITOBJ, /* Actor SubMtd */ &l_daHitobj_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_hmlif.cpp b/src/d/actor/d_a_hmlif.cpp index a44a7e73..a4b91434 100644 --- a/src/d/actor/d_a_hmlif.cpp +++ b/src/d/actor/d_a_hmlif.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_hmlif.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000080 .text Delete__9daHmlif_cFv */ BOOL daHmlif_c::Delete() { @@ -134,7 +135,7 @@ actor_process_profile_definition g_profile_Hmlif = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x008D, + /* Priority */ PRIO_Hmlif, /* Actor SubMtd */ &daHmlifMethodTable, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index e579cfed..8388ffb6 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_ship.h" // IWYU pragma: keep #include "d/d_procname.h" +#include "d/d_priority.h" #include "weak_data_1811.h" // IWYU pragma: keep @@ -573,7 +574,7 @@ actor_process_profile_definition g_profile_HOOKSHOT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x019E, + /* Priority */ PRIO_HOOKSHOT, /* Actor SubMtd */ &l_daHookshot_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp index 3712fa01..17ec2088 100644 --- a/src/d/actor/d_a_hot_floor.cpp +++ b/src/d/actor/d_a_hot_floor.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -138,7 +139,7 @@ actor_process_profile_definition g_profile_Hot_Floor = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00DB, + /* Priority */ PRIO_Hot_Floor, /* Actor SubMtd */ &daHot_FloorMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_hys.cpp b/src/d/actor/d_a_hys.cpp index b92f6652..bd84d9d2 100644 --- a/src/d/actor/d_a_hys.cpp +++ b/src/d/actor/d_a_hys.cpp @@ -8,6 +8,7 @@ #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "weak_data_1811.h" // IWYU pragma: keep @@ -253,7 +254,7 @@ actor_process_profile_definition g_profile_Hys = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0137, + /* Priority */ PRIO_Hys, /* Actor SubMtd */ &daHysMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index b21cd1b7..ed6a547f 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_ib.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -529,7 +530,7 @@ actor_process_profile_definition g_profile_Iball = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0187, + /* Priority */ PRIO_Iball, /* Actor SubMtd */ &l_daIball_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_icelift.cpp b/src/d/actor/d_a_icelift.cpp index cece518b..ac6254ef 100644 --- a/src/d/actor/d_a_icelift.cpp +++ b/src/d/actor/d_a_icelift.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_icelift.h" #include "d/d_bg_w.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000E0 .text _delete__9daIlift_cFv */ bool daIlift_c::_delete() { @@ -115,7 +116,7 @@ actor_process_profile_definition g_profile_ICE_LIFT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x008F, + /* Priority */ PRIO_ICE_LIFT, /* Actor SubMtd */ &daIliftMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp index 63aa6389..a86ef561 100644 --- a/src/d/actor/d_a_ikari.cpp +++ b/src/d/actor/d_a_ikari.cpp @@ -7,6 +7,7 @@ #include "d/res/res_ikari.h" #include "d/d_kankyo_wether.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_s_play.h" #include "m_Do/m_Do_mtx.h" @@ -192,7 +193,7 @@ actor_process_profile_definition g_profile_IKARI = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x019D, + /* Priority */ PRIO_IKARI, /* Actor SubMtd */ &daIkariMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index ccb7e7ca..5d284dbd 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_sea.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_camera.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_controller_pad.h" @@ -1511,7 +1512,7 @@ actor_process_profile_definition g_profile_ITEM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00F5, + /* Priority */ PRIO_ITEM, /* Actor SubMtd */ &l_daItem_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_jbo.cpp b/src/d/actor/d_a_jbo.cpp index f5b961ce..6e2e0b0f 100644 --- a/src/d/actor/d_a_jbo.cpp +++ b/src/d/actor/d_a_jbo.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_jbo.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000108 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -70,7 +71,7 @@ actor_process_profile_definition g_profile_JBO = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00C8, + /* Priority */ PRIO_JBO, /* Actor SubMtd */ &l_daJBO_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp index a921b67f..cd1c1d6c 100644 --- a/src/d/actor/d_a_kaji.cpp +++ b/src/d/actor/d_a_kaji.cpp @@ -12,6 +12,7 @@ #include "d/d_s_play.h" #include "d/actor/d_a_obj_pirateship.h" #include "d/d_procname.h" +#include "d/d_priority.h" static daObjPirateship::Act_c* l_p_ship; @@ -141,7 +142,7 @@ actor_process_profile_definition g_profile_Kaji = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01AC, + /* Priority */ PRIO_Kaji, /* Actor SubMtd */ &daKajiMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kamome.cpp b/src/d/actor/d_a_kamome.cpp index c3d6974b..56fb2582 100644 --- a/src/d/actor/d_a_kamome.cpp +++ b/src/d/actor/d_a_kamome.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_kamome.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001E4 .text anm_init__FP12kamome_classifUcfi */ void anm_init(kamome_class*, int, float, unsigned char, float, int) { @@ -155,7 +156,7 @@ actor_process_profile_definition g_profile_KAMOME = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00B5, + /* Priority */ PRIO_KAMOME, /* Actor SubMtd */ &l_daKamome_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kamome2.cpp b/src/d/actor/d_a_kamome2.cpp index 0652f3dc..3b0949d9 100644 --- a/src/d/actor/d_a_kamome2.cpp +++ b/src/d/actor/d_a_kamome2.cpp @@ -1,6 +1,7 @@ #include "d/actor/d_a_kamome2.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" static void anm_init(kamome2_class*, int, f32, u8, f32, int) { /* Nonmatching */ @@ -56,7 +57,7 @@ actor_process_profile_definition g_profile_KAMOME2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00B6, + /* Priority */ PRIO_KAMOME2, /* Actor SubMtd */ &l_daKamome2_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kanban.cpp b/src/d/actor/d_a_kanban.cpp index b3644ffd..ef1cc041 100644 --- a/src/d/actor/d_a_kanban.cpp +++ b/src/d/actor/d_a_kanban.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_kanban.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000012C .text __ct__14daKanban_HIO_cFv */ daKanban_HIO_c::daKanban_HIO_c() { @@ -125,7 +126,7 @@ actor_process_profile_definition g_profile_KANBAN = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00AA, + /* Priority */ PRIO_KANBAN, /* Actor SubMtd */ &l_daKanban_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kantera.cpp b/src/d/actor/d_a_kantera.cpp index 4bfdc63f..ae6ec4fc 100644 --- a/src/d/actor/d_a_kantera.cpp +++ b/src/d/actor/d_a_kantera.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_kantera.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001E8 .text kantera_nodeCallBack__FP7J3DNodei */ static BOOL kantera_nodeCallBack(J3DNode*, int) { @@ -79,7 +80,7 @@ actor_process_profile_definition g_profile_KANTERA = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00B4, + /* Priority */ PRIO_KANTERA, /* Actor SubMtd */ &l_daKantera_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kb.cpp b/src/d/actor/d_a_kb.cpp index 9d9f3ec6..ce8c26bc 100644 --- a/src/d/actor/d_a_kb.cpp +++ b/src/d/actor/d_a_kb.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_kb.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000001A4 .text anm_init__FP8kb_classifUcfi */ void anm_init(kb_class*, int, float, unsigned char, float, int) { @@ -200,7 +201,7 @@ actor_process_profile_definition g_profile_KB = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00CF, + /* Priority */ PRIO_KB, /* Actor SubMtd */ &l_daKb_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, diff --git a/src/d/actor/d_a_kddoor.cpp b/src/d/actor/d_a_kddoor.cpp index f1e6fcd7..7bd77328 100644 --- a/src/d/actor/d_a_kddoor.cpp +++ b/src/d/actor/d_a_kddoor.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_kddoor.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000A8 .text chkMakeKey__10daKddoor_cFv */ void daKddoor_c::chkMakeKey() { @@ -304,7 +305,7 @@ actor_process_profile_definition g_profile_KDDOOR = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0131, + /* Priority */ PRIO_KDDOOR, /* Actor SubMtd */ &l_daKddoor_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index 53531992..21f31d12 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/src/d/actor/d_a_ki.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_ki.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001B4 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -135,7 +136,7 @@ actor_process_profile_definition g_profile_KI = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00CA, + /* Priority */ PRIO_KI, /* Actor SubMtd */ &l_daKi_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_kita.cpp b/src/d/actor/d_a_kita.cpp index 81d91648..0ab82b54 100644 --- a/src/d/actor/d_a_kita.cpp +++ b/src/d/actor/d_a_kita.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/res/res_kita.h" #include "dolphin/types.h" @@ -481,7 +482,7 @@ actor_process_profile_definition g_profile_KITA = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0093, + /* Priority */ PRIO_KITA, /* Actor SubMtd */ &l_daKita_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_klft.cpp b/src/d/actor/d_a_klft.cpp index 2c9d999c..1af6d2b5 100644 --- a/src/d/actor/d_a_klft.cpp +++ b/src/d/actor/d_a_klft.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_klft.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000374 .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { @@ -85,7 +86,7 @@ actor_process_profile_definition g_profile_KLFT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x008C, + /* Priority */ PRIO_KLFT, /* Actor SubMtd */ &l_daKlft_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kmon.cpp b/src/d/actor/d_a_kmon.cpp index 01fa2781..86b4e532 100644 --- a/src/d/actor/d_a_kmon.cpp +++ b/src/d/actor/d_a_kmon.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_kmon.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000118 .text set_mtx__8daKmon_cFv */ void daKmon_c::set_mtx() { @@ -74,7 +75,7 @@ actor_process_profile_definition g_profile_Kmon = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x018B, + /* Priority */ PRIO_Kmon, /* Actor SubMtd */ &daKmonMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kn.cpp b/src/d/actor/d_a_kn.cpp index f5fa8e3a..3c77cf00 100644 --- a/src/d/actor/d_a_kn.cpp +++ b/src/d/actor/d_a_kn.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_kn.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000120 .text daKN_Draw__FP8kn_class */ static BOOL daKN_Draw(kn_class*) { @@ -79,7 +80,7 @@ actor_process_profile_definition g_profile_KN = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00BB, + /* Priority */ PRIO_KN, /* Actor SubMtd */ &l_daKN_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, diff --git a/src/d/actor/d_a_knob00.cpp b/src/d/actor/d_a_knob00.cpp index 817f2f28..0d13cdf5 100644 --- a/src/d/actor/d_a_knob00.cpp +++ b/src/d/actor/d_a_knob00.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_knob00.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000B4 .text daKnob00_charactorExchange__FPc */ void daKnob00_charactorExchange(char*) { @@ -204,7 +205,7 @@ actor_process_profile_definition g_profile_KNOB00 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0133, + /* Priority */ PRIO_KNOB00, /* Actor SubMtd */ &l_daKnob00_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kokiie.cpp b/src/d/actor/d_a_kokiie.cpp index 08d12016..148d777c 100644 --- a/src/d/actor/d_a_kokiie.cpp +++ b/src/d/actor/d_a_kokiie.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_kokiie.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000B4-00000154 .text daKokiie_Draw__FP12kokiie_class */ static BOOL daKokiie_Draw(kokiie_class*) { @@ -69,7 +70,7 @@ actor_process_profile_definition g_profile_KOKIIE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0094, + /* Priority */ PRIO_KOKIIE, /* Actor SubMtd */ &l_daKokiie_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_komore.cpp b/src/d/actor/d_a_komore.cpp index 824b9781..17164542 100644 --- a/src/d/actor/d_a_komore.cpp +++ b/src/d/actor/d_a_komore.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_komore.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" const char daKomore::Act_c::M_arcname[] = "frLt"; @@ -134,7 +135,7 @@ actor_process_profile_definition g_profile_Komore = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00F7, + /* Priority */ PRIO_Komore, /* Actor SubMtd */ &daKomore::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_ks.cpp b/src/d/actor/d_a_ks.cpp index 7c9ed5c3..c925977f 100644 --- a/src/d/actor/d_a_ks.cpp +++ b/src/d/actor/d_a_ks.cpp @@ -10,6 +10,7 @@ #pragma sym off #include "d/actor/d_a_ks.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "f_op/f_op_camera.h" @@ -1659,7 +1660,7 @@ actor_process_profile_definition g_profile_KS = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00C0, + /* Priority */ PRIO_KS, /* Actor SubMtd */ &l_daKS_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, diff --git a/src/d/actor/d_a_kt.cpp b/src/d/actor/d_a_kt.cpp index d0c1608f..3bdf6c01 100644 --- a/src/d/actor/d_a_kt.cpp +++ b/src/d/actor/d_a_kt.cpp @@ -8,6 +8,7 @@ #include "d/d_bg_s_gnd_chk.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/actor/d_a_player.h" #include "f_op/f_op_actor_mng.h" @@ -376,7 +377,7 @@ actor_process_profile_definition g_profile_KT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00AC, + /* Priority */ PRIO_KT, /* Actor SubMtd */ &l_daKt_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kui.cpp b/src/d/actor/d_a_kui.cpp index f8553d3a..b926ee07 100644 --- a/src/d/actor/d_a_kui.cpp +++ b/src/d/actor/d_a_kui.cpp @@ -11,6 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/res/res_kui.h" #include "f_op/f_op_camera.h" @@ -557,7 +558,7 @@ actor_process_profile_definition g_profile_KUI = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00F0, + /* Priority */ PRIO_KUI, /* Actor SubMtd */ &l_daKui_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 8703a436..fef14ece 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -8,6 +8,7 @@ #include "f_op/f_op_camera.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_kankyo.h" #include "SSystem/SComponent/c_lib.h" @@ -414,7 +415,7 @@ actor_process_profile_definition g_profile_KYTAG00 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00A0, + /* Priority */ PRIO_KYTAG00, /* Actor SubMtd */ &l_daKytag00_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index 8eea092b..5520d2c7 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_kytag01.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" /* 00000078-0000007C .text wether_tag_move__FP13kytag01_class */ @@ -113,7 +114,7 @@ actor_process_profile_definition g_profile_KYTAG01 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00A1, + /* Priority */ PRIO_KYTAG01, /* Actor SubMtd */ &l_daKytag01_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index b4f24ebe..86048d7c 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -7,6 +7,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" /* 00000078-000000C0 .text set_path_info__FP10fopAc_ac_c */ @@ -132,7 +133,7 @@ actor_process_profile_definition g_profile_KYTAG02 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00A2, + /* Priority */ PRIO_KYTAG02, /* Actor SubMtd */ &l_daKytag02_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index f00163f0..390b5a88 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -7,6 +7,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_m_door.h" /* 00000078-0000015C .text useHeapInit__FP10fopAc_ac_c */ @@ -161,7 +162,7 @@ actor_process_profile_definition g_profile_KYTAG03 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00A3, + /* Priority */ PRIO_KYTAG03, /* Actor SubMtd */ &l_daKytag03_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 228d4c47..348330f4 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -7,6 +7,7 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000080 .text daKytag04_Draw__FP13kytag04_class */ static BOOL daKytag04_Draw(kytag04_class*) { @@ -77,7 +78,7 @@ actor_process_profile_definition g_profile_KYTAG04 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00A4, + /* Priority */ PRIO_KYTAG04, /* Actor SubMtd */ &l_daKytag04_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index 15bead47..15d094f9 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -12,6 +12,7 @@ #include "f_op/f_op_camera.h" #include "m_Do/m_Do_audio.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000080 .text daKytag05_Draw__FP13kytag05_class */ static BOOL daKytag05_Draw(kytag05_class*) { @@ -158,7 +159,7 @@ actor_process_profile_definition g_profile_KYTAG05 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00A5, + /* Priority */ PRIO_KYTAG05, /* Actor SubMtd */ &l_daKytag05_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 45efc7ee..544e0fd5 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -10,6 +10,7 @@ #include "d/d_kankyo.h" #include "d/d_kankyo_wether.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000080 .text daKytag06_Draw__FP13kytag06_class */ static BOOL daKytag06_Draw(kytag06_class*) { @@ -90,7 +91,7 @@ actor_process_profile_definition g_profile_KYTAG06 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00A6, + /* Priority */ PRIO_KYTAG06, /* Actor SubMtd */ &l_daKytag06_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index b48e54d0..50f98a40 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_kytag07.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000080 .text daKytag07_Draw__FP13kytag07_class */ static BOOL daKytag07_Draw(kytag07_class*) { @@ -106,7 +107,7 @@ actor_process_profile_definition g_profile_KYTAG07 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00A7, + /* Priority */ PRIO_KYTAG07, /* Actor SubMtd */ &l_daKytag07_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index 14818ff1..75e72ce8 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/src/d/actor/d_a_lamp.cpp @@ -7,6 +7,7 @@ #include "d/res/res_lamp.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "weak_bss_936_to_1036.h" // IWYU pragma: keep @@ -220,7 +221,7 @@ actor_process_profile_definition g_profile_LAMP = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00AE, + /* Priority */ PRIO_LAMP, /* Actor SubMtd */ &l_daLamp_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp index ff8792aa..9e86f316 100644 --- a/src/d/actor/d_a_lbridge.cpp +++ b/src/d/actor/d_a_lbridge.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_lbridge.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_gbrg00.h" const char daLbridge_c::m_arcname[] = "Gbrg00"; @@ -350,7 +351,7 @@ actor_process_profile_definition g_profile_LIGHTBRIDGE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0196, + /* Priority */ PRIO_LIGHTBRIDGE, /* Actor SubMtd */ &daLbridgeMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp index 5a09029d..d7b43193 100644 --- a/src/d/actor/d_a_leaflift.cpp +++ b/src/d/actor/d_a_leaflift.cpp @@ -9,6 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_olift.h" #include "m_Do/m_Do_ext.h" @@ -364,7 +365,7 @@ actor_process_profile_definition g_profile_LEAF_LIFT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x008E, + /* Priority */ PRIO_LEAF_LIFT, /* Actor SubMtd */ &daLliftMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_lod_bg.cpp b/src/d/actor/d_a_lod_bg.cpp index 053c5989..d4d91311 100644 --- a/src/d/actor/d_a_lod_bg.cpp +++ b/src/d/actor/d_a_lod_bg.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_lod_bg.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_obj_light.h" #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_lib.h" @@ -422,7 +423,7 @@ actor_process_profile_definition g_profile_LODBG = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01C3, + /* Priority */ PRIO_LODBG, /* Actor SubMtd */ &l_daLodbg_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_lstair.cpp b/src/d/actor/d_a_lstair.cpp index 788312a3..db7bf224 100644 --- a/src/d/actor/d_a_lstair.cpp +++ b/src/d/actor/d_a_lstair.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_lstair.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000D4 .text _delete__10daLStair_cFv */ bool daLStair_c::_delete() { @@ -124,7 +125,7 @@ actor_process_profile_definition g_profile_LIGHTSTAIR = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0197, + /* Priority */ PRIO_LIGHTSTAIR, /* Actor SubMtd */ &daLStairMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_lwood.cpp b/src/d/actor/d_a_lwood.cpp index 17d03b9d..d5ea8d86 100644 --- a/src/d/actor/d_a_lwood.cpp +++ b/src/d/actor/d_a_lwood.cpp @@ -7,6 +7,7 @@ #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_lwood.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_graphic.h" @@ -191,7 +192,7 @@ actor_process_profile_definition g_profile_Lwood = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x018E, + /* Priority */ PRIO_Lwood, /* Actor SubMtd */ &daLwoodMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_machine.cpp b/src/d/actor/d_a_machine.cpp index f6567323..4f6affb4 100644 --- a/src/d/actor/d_a_machine.cpp +++ b/src/d/actor/d_a_machine.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_machine.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000A8 .text _delete__11daMachine_cFv */ bool daMachine_c::_delete() { @@ -135,7 +136,7 @@ actor_process_profile_definition g_profile_MACHINE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00F4, + /* Priority */ PRIO_MACHINE, /* Actor SubMtd */ &daMachineMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp index e4a5e661..2ab98649 100644 --- a/src/d/actor/d_a_magma.cpp +++ b/src/d/actor/d_a_magma.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_magma.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_magma.h" @@ -67,7 +68,7 @@ actor_process_profile_definition g_profile_MAGMA = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01BC, + /* Priority */ PRIO_MAGMA, /* Actor SubMtd */ &l_daMagma_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_majuu_flag.cpp b/src/d/actor/d_a_majuu_flag.cpp index 1c973b80..f843da74 100644 --- a/src/d/actor/d_a_majuu_flag.cpp +++ b/src/d/actor/d_a_majuu_flag.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_majuu_flag.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000374 .text set_mtx__FP14daMajuu_Flag_c */ void set_mtx(daMajuu_Flag_c*) { @@ -89,7 +90,7 @@ actor_process_profile_definition g_profile_MAJUU_FLAG = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x006B, + /* Priority */ PRIO_MAJUU_FLAG, /* Actor SubMtd */ &l_daMajuu_Flag_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index 9e317503..e2699876 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_mant.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000003EC .text draw__15daMant_packet_cFv */ void daMant_packet_c::draw() { @@ -74,7 +75,7 @@ actor_process_profile_definition g_profile_MANT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00B3, + /* Priority */ PRIO_MANT, /* Actor SubMtd */ &l_daMant_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp index b7d4c2b0..b97c0e5f 100644 --- a/src/d/actor/d_a_mbdoor.cpp +++ b/src/d/actor/d_a_mbdoor.cpp @@ -8,6 +8,7 @@ #include "d/res/res_gbdoor.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -594,7 +595,7 @@ actor_process_profile_definition g_profile_MBDOOR = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0132, + /* Priority */ PRIO_MBDOOR, /* Actor SubMtd */ &l_daMbdoor_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_mdoor.cpp b/src/d/actor/d_a_mdoor.cpp index 22ca0937..ba63148a 100644 --- a/src/d/actor/d_a_mdoor.cpp +++ b/src/d/actor/d_a_mdoor.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_mdoor.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000084 .text getSwbit__9daMdoor_cFv */ void daMdoor_c::getSwbit() { @@ -154,7 +155,7 @@ actor_process_profile_definition g_profile_MDOOR = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0130, + /* Priority */ PRIO_MDOOR, /* Actor SubMtd */ &l_daMdoor_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_mflft.cpp b/src/d/actor/d_a_mflft.cpp index e0d3518f..8849fe66 100644 --- a/src/d/actor/d_a_mflft.cpp +++ b/src/d/actor/d_a_mflft.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_mflft.h" #include "d/d_bg_w.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000170 .text setLiftUp__11mflft_classF4cXyz */ void mflft_class::setLiftUp(cXyz) { @@ -95,7 +96,7 @@ actor_process_profile_definition g_profile_MFLFT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x008B, + /* Priority */ PRIO_MFLFT, /* Actor SubMtd */ &l_daMflft_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_mgameboard.cpp b/src/d/actor/d_a_mgameboard.cpp index d56b10b8..67dd7ac4 100644 --- a/src/d/actor/d_a_mgameboard.cpp +++ b/src/d/actor/d_a_mgameboard.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_mgameboard.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000010C .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -109,7 +110,7 @@ actor_process_profile_definition g_profile_MGBOARD = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01AE, + /* Priority */ PRIO_MGBOARD, /* Actor SubMtd */ &daMgBoardMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp index ccc5ae06..8cfc911f 100644 --- a/src/d/actor/d_a_mmusic.cpp +++ b/src/d/actor/d_a_mmusic.cpp @@ -7,6 +7,7 @@ #include "d/d_com_inf_game.h" #include "d/d_item_data.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" namespace daMmusic { @@ -191,7 +192,7 @@ actor_process_profile_definition g_profile_Mmusic = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00F6, + /* Priority */ PRIO_Mmusic, /* Actor SubMtd */ &daMmusic::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp index 0cc8cec5..dc190ab3 100644 --- a/src/d/actor/d_a_mo2.cpp +++ b/src/d/actor/d_a_mo2.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_mo2.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001E8 .text tex_anm_set__FP9mo2_classUs */ void tex_anm_set(mo2_class*, unsigned short) { @@ -359,7 +360,7 @@ actor_process_profile_definition g_profile_MO2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00AF, + /* Priority */ PRIO_MO2, /* Actor SubMtd */ &l_daMo2_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index ec87f31b..5afd0b7b 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_movie_player.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_graphic.h" #include "dolphin/os/OSMessage.h" @@ -3117,7 +3118,7 @@ actor_process_profile_definition g_profile_MP = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x000B, + /* Priority */ PRIO_MP, /* Actor SubMtd */ &daMP_METHODS, /* Status */ fopAcStts_NOPAUSE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index 2d10c860..99a21ea7 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_lib.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_ext.h" @@ -311,7 +312,7 @@ actor_process_profile_definition g_profile_MOZO = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00D1, + /* Priority */ PRIO_MOZO, /* Actor SubMtd */ &l_daMozo_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_msw.cpp b/src/d/actor/d_a_msw.cpp index df7479b1..87403ccf 100644 --- a/src/d/actor/d_a_msw.cpp +++ b/src/d/actor/d_a_msw.cpp @@ -7,6 +7,7 @@ #include "d/res/res_msw.h" #include "d/d_bg_s_movebg_actor.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -360,7 +361,7 @@ actor_process_profile_definition g_profile_MSW = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x008A, + /* Priority */ PRIO_MSW, /* Actor SubMtd */ &l_daMsw_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_mt.cpp b/src/d/actor/d_a_mt.cpp index b135eca1..653abb51 100644 --- a/src/d/actor/d_a_mt.cpp +++ b/src/d/actor/d_a_mt.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_mt.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001E8 .text __ct__10daMt_HIO_cFv */ daMt_HIO_c::daMt_HIO_c() { @@ -180,7 +181,7 @@ actor_process_profile_definition g_profile_MT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00CB, + /* Priority */ PRIO_MT, /* Actor SubMtd */ &l_daMt_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e | fopAcStts_UNK8000000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_mtoge.cpp b/src/d/actor/d_a_mtoge.cpp index 7c6fb2e1..c3dfbddf 100644 --- a/src/d/actor/d_a_mtoge.cpp +++ b/src/d/actor/d_a_mtoge.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_mtoge.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_mtoge.h" #include "f_op/f_op_actor_mng.h" @@ -248,7 +249,7 @@ actor_process_profile_definition g_profile_MTOGE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0134, + /* Priority */ PRIO_MTOGE, /* Actor SubMtd */ &l_daMtoge_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index 0b7ea115..8c2b37ed 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -7,6 +7,7 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_bg_s_acch.h" #include "d/d_bg_s_gnd_chk.h" @@ -516,7 +517,7 @@ actor_process_profile_definition g_profile_NH = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x013C, + /* Priority */ PRIO_NH, /* Actor SubMtd */ &l_daNh_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_ac1.cpp b/src/d/actor/d_a_npc_ac1.cpp index 1aeac63b..2dd7022e 100644 --- a/src/d/actor/d_a_npc_ac1.cpp +++ b/src/d/actor/d_a_npc_ac1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_ac1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Ac1_HIO_cFv */ daNpc_Ac1_HIO_c::daNpc_Ac1_HIO_c() { @@ -349,7 +350,7 @@ actor_process_profile_definition g_profile_NPC_AC1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x017E, + /* Priority */ PRIO_NPC_AC1, /* Actor SubMtd */ &l_daNpc_Ac1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_ah.cpp b/src/d/actor/d_a_npc_ah.cpp index aa3f6aa0..0bfe2c04 100644 --- a/src/d/actor/d_a_npc_ah.cpp +++ b/src/d/actor/d_a_npc_ah.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_ah.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000210 .text __ct__9daNpcAh_cFv */ daNpcAh_c::daNpcAh_c() { @@ -260,7 +261,7 @@ actor_process_profile_definition g_profile_NPC_AH = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0183, + /* Priority */ PRIO_NPC_AH, /* Actor SubMtd */ &daNpc_AhMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_aj1.cpp b/src/d/actor/d_a_npc_aj1.cpp index 76f944a1..0f182080 100644 --- a/src/d/actor/d_a_npc_aj1.cpp +++ b/src/d/actor/d_a_npc_aj1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_aj1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Aj1_HIO_cFv */ daNpc_Aj1_HIO_c::daNpc_Aj1_HIO_c() { @@ -494,7 +495,7 @@ actor_process_profile_definition g_profile_NPC_AJ1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0151, + /* Priority */ PRIO_NPC_AJ1, /* Actor SubMtd */ &l_daNpc_Aj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_auction.cpp b/src/d/actor/d_a_npc_auction.cpp index 800559ee..c2515c95 100644 --- a/src/d/actor/d_a_npc_auction.cpp +++ b/src/d/actor/d_a_npc_auction.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_auction.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000268 .text __ct__14daNpcAuction_cFv */ daNpcAuction_c::daNpcAuction_c() { @@ -235,7 +236,7 @@ actor_process_profile_definition g_profile_NPC_AUCTION = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x016F, + /* Priority */ PRIO_NPC_AUCTION, /* Actor SubMtd */ &daNpc_AuctionMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_ba1.cpp b/src/d/actor/d_a_npc_ba1.cpp index 69d88d63..d3236547 100644 --- a/src/d/actor/d_a_npc_ba1.cpp +++ b/src/d/actor/d_a_npc_ba1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_ba1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Ba1_HIO_cFv */ daNpc_Ba1_HIO_c::daNpc_Ba1_HIO_c() { @@ -539,7 +540,7 @@ actor_process_profile_definition g_profile_NPC_BA1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0154, + /* Priority */ PRIO_NPC_BA1, /* Actor SubMtd */ &l_daNpc_Ba1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_bj1.cpp b/src/d/actor/d_a_npc_bj1.cpp index 1bc88a1d..9f7561ff 100644 --- a/src/d/actor/d_a_npc_bj1.cpp +++ b/src/d/actor/d_a_npc_bj1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_bj1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000108 .text __ct__20daNpc_Bj1_childHIO_cFv */ daNpc_Bj1_childHIO_c::daNpc_Bj1_childHIO_c() { @@ -644,7 +645,7 @@ actor_process_profile_definition g_profile_NPC_BJ1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0155, + /* Priority */ PRIO_NPC_BJ1, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -661,7 +662,7 @@ actor_process_profile_definition g_profile_NPC_BJ2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0156, + /* Priority */ PRIO_NPC_BJ2, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -678,7 +679,7 @@ actor_process_profile_definition g_profile_NPC_BJ3 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0157, + /* Priority */ PRIO_NPC_BJ3, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -695,7 +696,7 @@ actor_process_profile_definition g_profile_NPC_BJ4 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0158, + /* Priority */ PRIO_NPC_BJ4, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -712,7 +713,7 @@ actor_process_profile_definition g_profile_NPC_BJ5 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0159, + /* Priority */ PRIO_NPC_BJ5, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -729,7 +730,7 @@ actor_process_profile_definition g_profile_NPC_BJ6 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x015A, + /* Priority */ PRIO_NPC_BJ6, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -746,7 +747,7 @@ actor_process_profile_definition g_profile_NPC_BJ7 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x015B, + /* Priority */ PRIO_NPC_BJ7, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -763,7 +764,7 @@ actor_process_profile_definition g_profile_NPC_BJ8 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x015C, + /* Priority */ PRIO_NPC_BJ8, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -780,7 +781,7 @@ actor_process_profile_definition g_profile_NPC_BJ9 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x015D, + /* Priority */ PRIO_NPC_BJ9, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_bm1.cpp b/src/d/actor/d_a_npc_bm1.cpp index 623d8160..3c903d2a 100644 --- a/src/d/actor/d_a_npc_bm1.cpp +++ b/src/d/actor/d_a_npc_bm1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_bm1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000108 .text __ct__20daNpc_Bm1_childHIO_cFv */ daNpc_Bm1_childHIO_c::daNpc_Bm1_childHIO_c() { @@ -854,7 +855,7 @@ actor_process_profile_definition g_profile_NPC_BM1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x014B, + /* Priority */ PRIO_NPC_BM1, /* Actor SubMtd */ &l_daNpc_Bm1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -871,7 +872,7 @@ actor_process_profile_definition g_profile_NPC_BM2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x014C, + /* Priority */ PRIO_NPC_BM2, /* Actor SubMtd */ &l_daNpc_Bm1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -888,7 +889,7 @@ actor_process_profile_definition g_profile_NPC_BM3 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x014D, + /* Priority */ PRIO_NPC_BM3, /* Actor SubMtd */ &l_daNpc_Bm1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -905,7 +906,7 @@ actor_process_profile_definition g_profile_NPC_BM4 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x014E, + /* Priority */ PRIO_NPC_BM4, /* Actor SubMtd */ &l_daNpc_Bm1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -922,7 +923,7 @@ actor_process_profile_definition g_profile_NPC_BM5 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x014F, + /* Priority */ PRIO_NPC_BM5, /* Actor SubMtd */ &l_daNpc_Bm1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_bmcon1.cpp b/src/d/actor/d_a_npc_bmcon1.cpp index 3b3b0c33..6b79aabd 100644 --- a/src/d/actor/d_a_npc_bmcon1.cpp +++ b/src/d/actor/d_a_npc_bmcon1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_bmcon1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000002A4 .text __ct__12daNpcBmcon_cFv */ daNpcBmcon_c::daNpcBmcon_c() { @@ -319,7 +320,7 @@ actor_process_profile_definition g_profile_NPC_BMCON1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x015F, + /* Priority */ PRIO_NPC_BMCON1, /* Actor SubMtd */ &daNpc_BmconMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_bms1.cpp b/src/d/actor/d_a_npc_bms1.cpp index cb7cc4d2..d972bcec 100644 --- a/src/d/actor/d_a_npc_bms1.cpp +++ b/src/d/actor/d_a_npc_bms1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_bms1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000108 .text __ct__21daNpc_Bms1_childHIO_cFv */ daNpc_Bms1_childHIO_c::daNpc_Bms1_childHIO_c() { @@ -289,7 +290,7 @@ actor_process_profile_definition g_profile_NPC_BMS1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0160, + /* Priority */ PRIO_NPC_BMS1, /* Actor SubMtd */ &l_daNpc_Bms1_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_bmsw.cpp b/src/d/actor/d_a_npc_bmsw.cpp index 5b6b8500..7c91ebd9 100644 --- a/src/d/actor/d_a_npc_bmsw.cpp +++ b/src/d/actor/d_a_npc_bmsw.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_bmsw.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001E4 .text __ct__16daNpc_Bmsw_HIO_cFv */ daNpc_Bmsw_HIO_c::daNpc_Bmsw_HIO_c() { @@ -294,7 +295,7 @@ actor_process_profile_definition g_profile_NPC_BMSW = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0161, + /* Priority */ PRIO_NPC_BMSW, /* Actor SubMtd */ &l_daNpc_Bmsw_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index 133910b9..7077a791 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -15,6 +15,7 @@ #include "d/d_snap.h" #include "d/d_letter.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_hostIO.h" @@ -2266,7 +2267,7 @@ actor_process_profile_definition g_profile_NPC_BS1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x015E, + /* Priority */ PRIO_NPC_BS1, /* Actor SubMtd */ &l_daNpc_Bs1_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp index 8558a79b..e035c4f7 100644 --- a/src/d/actor/d_a_npc_btsw.cpp +++ b/src/d/actor/d_a_npc_btsw.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_btsw.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001E8 .text __ct__16daNpc_Btsw_HIO_cFv */ daNpc_Btsw_HIO_c::daNpc_Btsw_HIO_c() { @@ -300,7 +301,7 @@ actor_process_profile_definition g_profile_NPC_BTSW = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0162, + /* Priority */ PRIO_NPC_BTSW, /* Actor SubMtd */ &l_daNpc_Btsw_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index 68a9c9fc..dd42c673 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -8,6 +8,7 @@ #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_snap.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" @@ -660,7 +661,7 @@ actor_process_profile_definition g_profile_NPC_BTSW2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0163, + /* Priority */ PRIO_NPC_BTSW2, /* Actor SubMtd */ &l_daNpc_Btsw2_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp index 32f2d721..61308ea5 100644 --- a/src/d/actor/d_a_npc_cb1.cpp +++ b/src/d/actor/d_a_npc_cb1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_cb1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000031C .text __ct__15daNpc_Cb1_HIO_cFv */ daNpc_Cb1_HIO_c::daNpc_Cb1_HIO_c() { @@ -579,7 +580,7 @@ actor_process_profile_definition g_profile_NPC_CB1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0153, + /* Priority */ PRIO_NPC_CB1, /* Actor SubMtd */ &l_daNpc_Cb1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK2000000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_co1.cpp b/src/d/actor/d_a_npc_co1.cpp index 64061005..297ad181 100644 --- a/src/d/actor/d_a_npc_co1.cpp +++ b/src/d/actor/d_a_npc_co1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_co1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Co1_HIO_cFv */ daNpc_Co1_HIO_c::daNpc_Co1_HIO_c() { @@ -384,7 +385,7 @@ actor_process_profile_definition g_profile_NPC_CO1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0178, + /* Priority */ PRIO_NPC_CO1, /* Actor SubMtd */ &l_daNpc_Co1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_de1.cpp b/src/d/actor/d_a_npc_de1.cpp index 6c55a64d..bc195081 100644 --- a/src/d/actor/d_a_npc_de1.cpp +++ b/src/d/actor/d_a_npc_de1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_de1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000144 .text __ct__15daNpc_De1_HIO_cFv */ daNpc_De1_HIO_c::daNpc_De1_HIO_c() { @@ -309,7 +310,7 @@ actor_process_profile_definition g_profile_NPC_DE1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x016D, + /* Priority */ PRIO_NPC_DE1, /* Actor SubMtd */ &l_daNpc_De1_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_ds1.cpp b/src/d/actor/d_a_npc_ds1.cpp index af0afa7e..90a763c3 100644 --- a/src/d/actor/d_a_npc_ds1.cpp +++ b/src/d/actor/d_a_npc_ds1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_ds1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000108 .text __ct__20daNpc_Ds1_childHIO_cFv */ daNpc_Ds1_childHIO_c::daNpc_Ds1_childHIO_c() { @@ -314,7 +315,7 @@ actor_process_profile_definition g_profile_NPC_DS1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0164, + /* Priority */ PRIO_NPC_DS1, /* Actor SubMtd */ &l_daNpc_Ds1_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_fa1.cpp b/src/d/actor/d_a_npc_fa1.cpp index 99a7a212..51ad09c7 100644 --- a/src/d/actor/d_a_npc_fa1.cpp +++ b/src/d/actor/d_a_npc_fa1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_fa1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 800FAFC0-800FB004 .text __ct__16daNpc_Fa1_HIO3_cFv */ daNpc_Fa1_HIO3_c::daNpc_Fa1_HIO3_c() { @@ -334,7 +335,7 @@ actor_process_profile_definition g_profile_NPC_FA1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x016E, + /* Priority */ PRIO_NPC_FA1, /* Actor SubMtd */ &l_daNpc_Fa1_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_gk1.cpp b/src/d/actor/d_a_npc_gk1.cpp index ba88a1e2..7b8e7375 100644 --- a/src/d/actor/d_a_npc_gk1.cpp +++ b/src/d/actor/d_a_npc_gk1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_gk1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Gk1_HIO_cFv */ daNpc_Gk1_HIO_c::daNpc_Gk1_HIO_c() { @@ -334,7 +335,7 @@ actor_process_profile_definition g_profile_NPC_GK1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x017C, + /* Priority */ PRIO_NPC_GK1, /* Actor SubMtd */ &l_daNpc_Gk1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_gp1.cpp b/src/d/actor/d_a_npc_gp1.cpp index d8c5d3ad..166f35eb 100644 --- a/src/d/actor/d_a_npc_gp1.cpp +++ b/src/d/actor/d_a_npc_gp1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_gp1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Gp1_HIO_cFv */ daNpc_Gp1_HIO_c::daNpc_Gp1_HIO_c() { @@ -379,7 +380,7 @@ actor_process_profile_definition g_profile_NPC_GP1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x016A, + /* Priority */ PRIO_NPC_GP1, /* Actor SubMtd */ &l_daNpc_Gp1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp index 019c067b..b6c7fece 100644 --- a/src/d/actor/d_a_npc_hi1.cpp +++ b/src/d/actor/d_a_npc_hi1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_hi1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Hi1_HIO_cFv */ daNpc_Hi1_HIO_c::daNpc_Hi1_HIO_c() { @@ -329,7 +330,7 @@ actor_process_profile_definition g_profile_NPC_HI1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x017F, + /* Priority */ PRIO_NPC_HI1, /* Actor SubMtd */ &l_daNpc_Hi1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_ho.cpp b/src/d/actor/d_a_npc_ho.cpp index 4a1dacdb..d8973dd8 100644 --- a/src/d/actor/d_a_npc_ho.cpp +++ b/src/d/actor/d_a_npc_ho.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_ho.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000022C .text nodeCallBack_Ho__FP7J3DNodei */ static BOOL nodeCallBack_Ho(J3DNode*, int) { @@ -234,7 +235,7 @@ actor_process_profile_definition g_profile_NPC_HO = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0173, + /* Priority */ PRIO_NPC_HO, /* Actor SubMtd */ &l_daNpc_Ho_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_hr.cpp b/src/d/actor/d_a_npc_hr.cpp index fc56f49f..f656ac22 100644 --- a/src/d/actor/d_a_npc_hr.cpp +++ b/src/d/actor/d_a_npc_hr.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_hr.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000A0 .text init__14daNpc_Wind_EffFv */ void daNpc_Wind_Eff::init() { @@ -504,7 +505,7 @@ actor_process_profile_definition g_profile_NPC_HR = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0172, + /* Priority */ PRIO_NPC_HR, /* Actor SubMtd */ &l_daNpc_Hr_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_jb1.cpp b/src/d/actor/d_a_npc_jb1.cpp index 38e37d65..85981c87 100644 --- a/src/d/actor/d_a_npc_jb1.cpp +++ b/src/d/actor/d_a_npc_jb1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_jb1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000144 .text __ct__15daNpc_Jb1_HIO_cFv */ daNpc_Jb1_HIO_c::daNpc_Jb1_HIO_c() { @@ -249,7 +250,7 @@ actor_process_profile_definition g_profile_NPC_JB1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x016B, + /* Priority */ PRIO_NPC_JB1, /* Actor SubMtd */ &l_daNpc_Jb1_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 7ebed8b0..fb5a05f4 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -9,6 +9,7 @@ #include "d/res/res_ji.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_snap.h" #include "d/d_lib.h" #include "f_op/f_op_msg.h" @@ -3810,7 +3811,7 @@ actor_process_profile_definition g_profile_NPC_JI1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0141, + /* Priority */ PRIO_NPC_JI1, /* Actor SubMtd */ &l_daNpc_Ji1_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 7b987ccd..a3ae1b53 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -7,6 +7,7 @@ #include "d/res/res_kamome.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_hostIO.h" #include "d/d_item_data.h" #include "d/actor/d_a_player_main.h" @@ -1426,7 +1427,7 @@ actor_process_profile_definition g_profile_NPC_KAM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00B6, + /* Priority */ PRIO_NPC_KAM, /* Actor SubMtd */ &l_daNpc_kam_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_kf1.cpp b/src/d/actor/d_a_npc_kf1.cpp index 2ee17f10..ebb003db 100644 --- a/src/d/actor/d_a_npc_kf1.cpp +++ b/src/d/actor/d_a_npc_kf1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_kf1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Kf1_HIO_cFv */ daNpc_Kf1_HIO_c::daNpc_Kf1_HIO_c() { @@ -499,7 +500,7 @@ actor_process_profile_definition g_profile_NPC_KF1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x016C, + /* Priority */ PRIO_NPC_KF1, /* Actor SubMtd */ &l_daNpc_Kf1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_kg1.cpp b/src/d/actor/d_a_npc_kg1.cpp index c8777502..098e0193 100644 --- a/src/d/actor/d_a_npc_kg1.cpp +++ b/src/d/actor/d_a_npc_kg1.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_kg1.h" #include "d/d_lib.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001E0 .text __ct__15daNpc_Kg1_HIO_cFv */ daNpc_Kg1_HIO_c::daNpc_Kg1_HIO_c() { @@ -160,7 +161,7 @@ actor_process_profile_definition g_profile_NPC_KG1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0170, + /* Priority */ PRIO_NPC_KG1, /* Actor SubMtd */ &daNpc_Kg1MethodTable, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_kg2.cpp b/src/d/actor/d_a_npc_kg2.cpp index b5cad490..02148a89 100644 --- a/src/d/actor/d_a_npc_kg2.cpp +++ b/src/d/actor/d_a_npc_kg2.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_kg2.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000194 .text __ct__15daNpc_Kg2_HIO_cFv */ daNpc_Kg2_HIO_c::daNpc_Kg2_HIO_c() { @@ -220,7 +221,7 @@ actor_process_profile_definition g_profile_NPC_KG2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0171, + /* Priority */ PRIO_NPC_KG2, /* Actor SubMtd */ &l_daNpc_Kg2_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_kk1.cpp b/src/d/actor/d_a_npc_kk1.cpp index fc012180..9aa6392b 100644 --- a/src/d/actor/d_a_npc_kk1.cpp +++ b/src/d/actor/d_a_npc_kk1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_kk1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Kk1_HIO_cFv */ daNpc_Kk1_HIO_c::daNpc_Kk1_HIO_c() { @@ -609,7 +610,7 @@ actor_process_profile_definition g_profile_NPC_KK1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0166, + /* Priority */ PRIO_NPC_KK1, /* Actor SubMtd */ &l_daNpc_Kk1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp index f43fa944..81fa54bd 100644 --- a/src/d/actor/d_a_npc_km1.cpp +++ b/src/d/actor/d_a_npc_km1.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_km1.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000144 .text __ct__15daNpc_Km1_HIO_cFv */ daNpc_Km1_HIO_c::daNpc_Km1_HIO_c() { @@ -265,7 +266,7 @@ actor_process_profile_definition g_profile_NPC_KM1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0152, + /* Priority */ PRIO_NPC_KM1, /* Actor SubMtd */ &l_daNpc_Km1_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_ko1.cpp b/src/d/actor/d_a_npc_ko1.cpp index e72e28a7..440ed734 100644 --- a/src/d/actor/d_a_npc_ko1.cpp +++ b/src/d/actor/d_a_npc_ko1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_ko1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000108 .text __ct__20daNpc_Ko1_childHIO_cFv */ daNpc_Ko1_childHIO_c::daNpc_Ko1_childHIO_c() { @@ -719,7 +720,7 @@ actor_process_profile_definition g_profile_NPC_KO1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0142, + /* Priority */ PRIO_NPC_KO1, /* Actor SubMtd */ &l_daNpc_Ko1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, @@ -736,7 +737,7 @@ actor_process_profile_definition g_profile_NPC_KO2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0143, + /* Priority */ PRIO_NPC_KO2, /* Actor SubMtd */ &l_daNpc_Ko1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_kp1.cpp b/src/d/actor/d_a_npc_kp1.cpp index bf0b69b5..8ed5a830 100644 --- a/src/d/actor/d_a_npc_kp1.cpp +++ b/src/d/actor/d_a_npc_kp1.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_kp1.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Kp1_HIO_cFv */ daNpc_Kp1_HIO_c::daNpc_Kp1_HIO_c() { @@ -280,7 +281,7 @@ actor_process_profile_definition g_profile_NPC_KP1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0168, + /* Priority */ PRIO_NPC_KP1, /* Actor SubMtd */ &l_daNpc_Kp1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp index 754593b2..fa419535 100644 --- a/src/d/actor/d_a_npc_ls1.cpp +++ b/src/d/actor/d_a_npc_ls1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_ls1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Ls1_HIO_cFv */ daNpc_Ls1_HIO_c::daNpc_Ls1_HIO_c() { @@ -544,7 +545,7 @@ actor_process_profile_definition g_profile_NPC_LS1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0144, + /* Priority */ PRIO_NPC_LS1, /* Actor SubMtd */ &l_daNpc_Ls1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index 3682f3af..246ea6db 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_md.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_item_data.h" #include "m_Do/m_Do_controller_pad.h" @@ -3372,7 +3373,7 @@ actor_process_profile_definition g_profile_NPC_MD = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0175, + /* Priority */ PRIO_NPC_MD, /* Actor SubMtd */ &l_daNpc_Md_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK2000000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index 0bd35c0b..c3f3d158 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_mk.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000230 .text nodeCallBack_Mk__FP7J3DNodei */ static BOOL nodeCallBack_Mk(J3DNode*, int) { @@ -345,7 +346,7 @@ actor_process_profile_definition g_profile_NPC_MK = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0176, + /* Priority */ PRIO_NPC_MK, /* Actor SubMtd */ &l_daNpc_Mk_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_mn.cpp b/src/d/actor/d_a_npc_mn.cpp index 61688a7b..1fbc75ba 100644 --- a/src/d/actor/d_a_npc_mn.cpp +++ b/src/d/actor/d_a_npc_mn.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_mn.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000230 .text __ct__9daNpcMn_cFv */ daNpcMn_c::daNpcMn_c() { @@ -420,7 +421,7 @@ actor_process_profile_definition g_profile_NPC_MN = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0182, + /* Priority */ PRIO_NPC_MN, /* Actor SubMtd */ &daNpc_MnMethodTable, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_mt.cpp b/src/d/actor/d_a_npc_mt.cpp index 2223e003..43417e93 100644 --- a/src/d/actor/d_a_npc_mt.cpp +++ b/src/d/actor/d_a_npc_mt.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_mt.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #define TOTAL_FIGURE_COUNT 0x86 @@ -335,7 +336,7 @@ actor_process_profile_definition g_profile_NPC_MT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0181, + /* Priority */ PRIO_NPC_MT, /* Actor SubMtd */ &daNpc_MtMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index f198a912..80e90500 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -11,6 +11,7 @@ #include "d/d_lib.h" #include "d/d_item.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "weak_bss_936_to_1036.h" // IWYU pragma: keep #include "weak_data_1811.h" // IWYU pragma: keep @@ -993,7 +994,7 @@ actor_process_profile_definition g_profile_NPC_NZ = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x014A, + /* Priority */ PRIO_NPC_NZ, /* Actor SubMtd */ &daNpc_NzMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_ob1.cpp b/src/d/actor/d_a_npc_ob1.cpp index 348d9412..f6a47646 100644 --- a/src/d/actor/d_a_npc_ob1.cpp +++ b/src/d/actor/d_a_npc_ob1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_ob1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Ob1_HIO_cFv */ daNpc_Ob1_HIO_c::daNpc_Ob1_HIO_c() { @@ -414,7 +415,7 @@ actor_process_profile_definition g_profile_NPC_OB1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0150, + /* Priority */ PRIO_NPC_OB1, /* Actor SubMtd */ &l_daNpc_Ob1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 602c5983..1bc5aeb4 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_os.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_pedestal.h" #include "d/res/res_os.h" @@ -2424,7 +2425,7 @@ actor_process_profile_definition g_profile_NPC_OS = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x013D, + /* Priority */ PRIO_NPC_OS, /* Actor SubMtd */ &l_daNpc_Os_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK2000000_e | fopAcStts_UNK8000000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_p1.cpp b/src/d/actor/d_a_npc_p1.cpp index f9a9708a..ba6b3d49 100644 --- a/src/d/actor/d_a_npc_p1.cpp +++ b/src/d/actor/d_a_npc_p1.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_p1.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000264 .text __ct__14daNpc_P1_HIO_cFv */ daNpc_P1_HIO_c::daNpc_P1_HIO_c() { @@ -205,7 +206,7 @@ actor_process_profile_definition g_profile_NPC_P1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0145, + /* Priority */ PRIO_NPC_P1, /* Actor SubMtd */ &l_daNpc_P1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index 2d0c10b7..18f8d7a6 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_p2.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000020C .text __ct__19daNpc_P2_childHIO_cFv */ daNpc_P2_childHIO_c::daNpc_P2_childHIO_c() { @@ -510,7 +511,7 @@ actor_process_profile_definition g_profile_NPC_P2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0146, + /* Priority */ PRIO_NPC_P2, /* Actor SubMtd */ &daNpc_P2MethodTable, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index faf922f8..e2cbeea5 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_ship.h" #include "d/actor/d_a_dai.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_lib_game.h" #include "d/d_com_inf_game.h" #include "d/d_camera.h" @@ -8369,7 +8370,7 @@ actor_process_profile_definition g_profile_NPC_PEOPLE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x017B, + /* Priority */ PRIO_NPC_PEOPLE, /* Actor SubMtd */ &daNpc_PeopleMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_pf1.cpp b/src/d/actor/d_a_npc_pf1.cpp index 491cb336..08830f89 100644 --- a/src/d/actor/d_a_npc_pf1.cpp +++ b/src/d/actor/d_a_npc_pf1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_pf1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Pf1_HIO_cFv */ daNpc_Pf1_HIO_c::daNpc_Pf1_HIO_c() { @@ -379,7 +380,7 @@ actor_process_profile_definition g_profile_NPC_PF1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0169, + /* Priority */ PRIO_NPC_PF1, /* Actor SubMtd */ &l_daNpc_Pf1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp index 13c605fb..914bfce0 100644 --- a/src/d/actor/d_a_npc_photo.cpp +++ b/src/d/actor/d_a_npc_photo.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_photo.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000002D0 .text __ct__12daNpcPhoto_cFv */ daNpcPhoto_c::daNpcPhoto_c() { @@ -355,7 +356,7 @@ actor_process_profile_definition g_profile_NPC_PHOTO = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x017D, + /* Priority */ PRIO_NPC_PHOTO, /* Actor SubMtd */ &daNpc_PhotoMethodTable, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_pm1.cpp b/src/d/actor/d_a_npc_pm1.cpp index 35405378..6a4bac2f 100644 --- a/src/d/actor/d_a_npc_pm1.cpp +++ b/src/d/actor/d_a_npc_pm1.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_pm1.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000144 .text __ct__15daNpc_Pm1_HIO_cFv */ daNpc_Pm1_HIO_c::daNpc_Pm1_HIO_c() { @@ -265,7 +266,7 @@ actor_process_profile_definition g_profile_NPC_PM1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0167, + /* Priority */ PRIO_NPC_PM1, /* Actor SubMtd */ &l_daNpc_Pm1_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index aa760b3c..3fab4b7f 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_demo_item.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_com_lib_game.h" #include "d/d_a_obj.h" @@ -2923,7 +2924,7 @@ actor_process_profile_definition g_profile_NPC_ROTEN = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x017A, + /* Priority */ PRIO_NPC_ROTEN, /* Actor SubMtd */ &daNpc_RotenMethodTable, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp index fb650416..eb104b17 100644 --- a/src/d/actor/d_a_npc_rsh1.cpp +++ b/src/d/actor/d_a_npc_rsh1.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_rsh1.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000021C .text __ct__16daNpc_Rsh1_HIO_cFv */ daNpc_Rsh1_HIO_c::daNpc_Rsh1_HIO_c() { @@ -315,7 +316,7 @@ actor_process_profile_definition g_profile_NPC_RSH1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0165, + /* Priority */ PRIO_NPC_RSH1, /* Actor SubMtd */ &l_daNpc_Rsh1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_sarace.cpp b/src/d/actor/d_a_npc_sarace.cpp index b48caece..9d853b7a 100644 --- a/src/d/actor/d_a_npc_sarace.cpp +++ b/src/d/actor/d_a_npc_sarace.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_sarace.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000198 .text __ct__18daNpc_Sarace_HIO_cFv */ daNpc_Sarace_HIO_c::daNpc_Sarace_HIO_c() { @@ -180,7 +181,7 @@ actor_process_profile_definition g_profile_NPC_SARACE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0147, + /* Priority */ PRIO_NPC_SARACE, /* Actor SubMtd */ &l_daNpc_Sarace_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_so.cpp b/src/d/actor/d_a_npc_so.cpp index e12cec7a..4f39fcb6 100644 --- a/src/d/actor/d_a_npc_so.cpp +++ b/src/d/actor/d_a_npc_so.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_so.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000002A4 .text __ct__14daNpc_So_HIO_cFv */ daNpc_So_HIO_c::daNpc_So_HIO_c() { @@ -411,7 +412,7 @@ actor_process_profile_definition g_profile_NPC_SO = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0149, + /* Priority */ PRIO_NPC_SO, /* Actor SubMtd */ &daNpc_SoMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_sv.cpp b/src/d/actor/d_a_npc_sv.cpp index 8babae36..6c86711a 100644 --- a/src/d/actor/d_a_npc_sv.cpp +++ b/src/d/actor/d_a_npc_sv.cpp @@ -7,6 +7,7 @@ #include "m_Do/m_Do_ext.h" #include "d/actor/d_a_obj_ikada.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000021C .text __ct__9daNpcSv_cFv */ daNpcSv_c::daNpcSv_c() { @@ -271,7 +272,7 @@ actor_process_profile_definition g_profile_NPC_SV = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0180, + /* Priority */ PRIO_NPC_SV, /* Actor SubMtd */ &daNpc_PeopleMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp index c3811cd2..ebd45f8e 100644 --- a/src/d/actor/d_a_npc_tc.cpp +++ b/src/d/actor/d_a_npc_tc.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_tc.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000394 .text __ct__14daNpc_Tc_HIO_cFv */ daNpc_Tc_HIO_c::daNpc_Tc_HIO_c() { @@ -515,7 +516,7 @@ actor_process_profile_definition g_profile_NPC_TC = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0148, + /* Priority */ PRIO_NPC_TC, /* Actor SubMtd */ &l_daNpc_Tc_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp index f218b0c5..c810327d 100644 --- a/src/d/actor/d_a_npc_tt.cpp +++ b/src/d/actor/d_a_npc_tt.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_tt.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text daNpc_tt_XyCheckCB__FPvi */ static s16 daNpc_tt_XyCheckCB(void*, int) { @@ -272,7 +273,7 @@ actor_process_profile_definition g_profile_NPC_TT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0174, + /* Priority */ PRIO_NPC_TT, /* Actor SubMtd */ &l_daNpc_Tt_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_uk.cpp b/src/d/actor/d_a_npc_uk.cpp index 6d456d34..a7cd96bc 100644 --- a/src/d/actor/d_a_npc_uk.cpp +++ b/src/d/actor/d_a_npc_uk.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_uk.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000000F8 .text getType__10daNpc_Uk_cFv */ void daNpc_Uk_c::getType() { @@ -375,7 +376,7 @@ actor_process_profile_definition g_profile_NPC_UK = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0177, + /* Priority */ PRIO_NPC_UK, /* Actor SubMtd */ &l_daNpc_Uk_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, diff --git a/src/d/actor/d_a_npc_ym1.cpp b/src/d/actor/d_a_npc_ym1.cpp index 524bd52a..1847bd7f 100644 --- a/src/d/actor/d_a_npc_ym1.cpp +++ b/src/d/actor/d_a_npc_ym1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_ym1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000108 .text __ct__20daNpc_Ym1_childHIO_cFv */ daNpc_Ym1_childHIO_c::daNpc_Ym1_childHIO_c() { @@ -454,7 +455,7 @@ actor_process_profile_definition g_profile_NPC_YM1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x013E, + /* Priority */ PRIO_NPC_YM1, /* Actor SubMtd */ &l_daNpc_Ym1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, @@ -471,7 +472,7 @@ actor_process_profile_definition g_profile_NPC_YM2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x013F, + /* Priority */ PRIO_NPC_YM2, /* Actor SubMtd */ &l_daNpc_Ym1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_yw1.cpp b/src/d/actor/d_a_npc_yw1.cpp index 0e5cd76e..ad75eb19 100644 --- a/src/d/actor/d_a_npc_yw1.cpp +++ b/src/d/actor/d_a_npc_yw1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_yw1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000108 .text __ct__20daNpc_Yw1_childHIO_cFv */ daNpc_Yw1_childHIO_c::daNpc_Yw1_childHIO_c() { @@ -434,7 +435,7 @@ actor_process_profile_definition g_profile_NPC_YW1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0140, + /* Priority */ PRIO_NPC_YW1, /* Actor SubMtd */ &l_daNpc_Yw1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_zk1.cpp b/src/d/actor/d_a_npc_zk1.cpp index decec3e9..a6b9c974 100644 --- a/src/d/actor/d_a_npc_zk1.cpp +++ b/src/d/actor/d_a_npc_zk1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_zk1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Zk1_HIO_cFv */ daNpc_Zk1_HIO_c::daNpc_Zk1_HIO_c() { @@ -309,7 +310,7 @@ actor_process_profile_definition g_profile_NPC_ZK1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0179, + /* Priority */ PRIO_NPC_ZK1, /* Actor SubMtd */ &l_daNpc_Zk1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp index f7753071..53a0972e 100644 --- a/src/d/actor/d_a_npc_zl1.cpp +++ b/src/d/actor/d_a_npc_zl1.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_npc_zl1.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Zl1_HIO_cFv */ daNpc_Zl1_HIO_c::daNpc_Zl1_HIO_c() { @@ -695,7 +696,7 @@ actor_process_profile_definition g_profile_NPC_ZL1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0194, + /* Priority */ PRIO_NPC_ZL1, /* Actor SubMtd */ &l_daNpc_Zl1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_nz.cpp b/src/d/actor/d_a_nz.cpp index 342222b4..539166c1 100644 --- a/src/d/actor/d_a_nz.cpp +++ b/src/d/actor/d_a_nz.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_nz.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000138 .text __ct__10daNZ_HIO_cFv */ daNZ_HIO_c::daNZ_HIO_c() { @@ -195,7 +196,7 @@ actor_process_profile_definition g_profile_NZ = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00B9, + /* Priority */ PRIO_NZ, /* Actor SubMtd */ &l_daNZ_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_nzg.cpp b/src/d/actor/d_a_nzg.cpp index c892750b..1a2d1e4e 100644 --- a/src/d/actor/d_a_nzg.cpp +++ b/src/d/actor/d_a_nzg.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_nzg.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000E4 .text daNZG_Draw__FP9nzg_class */ static BOOL daNZG_Draw(nzg_class*) { @@ -64,7 +65,7 @@ actor_process_profile_definition g_profile_NZG = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00BA, + /* Priority */ PRIO_NZG, /* Actor SubMtd */ &l_daNZG_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp index 90b316ef..3e26d708 100644 --- a/src/d/actor/d_a_obj_AjavW.cpp +++ b/src/d/actor/d_a_obj_AjavW.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -144,7 +145,7 @@ actor_process_profile_definition g_profile_Obj_AjavW = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0056, + /* Priority */ PRIO_Obj_AjavW, /* Actor SubMtd */ &l_daObjAjavW_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_Itnak.cpp b/src/d/actor/d_a_obj_Itnak.cpp index e151bbff..b3722846 100644 --- a/src/d/actor/d_a_obj_Itnak.cpp +++ b/src/d/actor/d_a_obj_Itnak.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_Itnak.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000009C .text solidHeapCB__Q210daObjItnak5Act_cFP10fopAc_ac_c */ void daObjItnak::Act_c::solidHeapCB(fopAc_ac_c*) { @@ -103,7 +104,7 @@ actor_process_profile_definition g_profile_Obj_Itnak = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00F9, + /* Priority */ PRIO_Obj_Itnak, /* Actor SubMtd */ &daObjItnak::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_Vds.cpp b/src/d/actor/d_a_obj_Vds.cpp index 26f6e990..4cd876ab 100644 --- a/src/d/actor/d_a_obj_Vds.cpp +++ b/src/d/actor/d_a_obj_Vds.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_Vds.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000134 .text SetLoopJointAnimation__Q28daObjVds5Act_cFP18J3DAnmTransformKeyP18J3DAnmTransformKeyff */ void daObjVds::Act_c::SetLoopJointAnimation(J3DAnmTransformKey*, J3DAnmTransformKey*, float, float) { @@ -173,7 +174,7 @@ actor_process_profile_definition g_profile_Obj_Vds = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0045, + /* Priority */ PRIO_Obj_Vds, /* Actor SubMtd */ &daObjVds::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp index 7b2eb827..cdd72ca7 100644 --- a/src/d/actor/d_a_obj_Vteng.cpp +++ b/src/d/actor/d_a_obj_Vteng.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -173,7 +174,7 @@ actor_process_profile_definition g_profile_Obj_Vteng = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x005A, + /* Priority */ PRIO_Obj_Vteng, /* Actor SubMtd */ &l_daObjVteng_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_YLzou.cpp b/src/d/actor/d_a_obj_YLzou.cpp index 7b348824..6b271582 100644 --- a/src/d/actor/d_a_obj_YLzou.cpp +++ b/src/d/actor/d_a_obj_YLzou.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_YLzou.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000002B8 .text set_start_type__12daObjYLzou_cFv */ void daObjYLzou_c::set_start_type() { @@ -219,7 +220,7 @@ actor_process_profile_definition g_profile_Obj_YLzou = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0058, + /* Priority */ PRIO_Obj_YLzou, /* Actor SubMtd */ &l_daObjYLzou_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp index acec437d..419aec58 100644 --- a/src/d/actor/d_a_obj_Yboil.cpp +++ b/src/d/actor/d_a_obj_Yboil.cpp @@ -11,6 +11,7 @@ #include "m_Do/m_Do_mtx.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { @@ -213,7 +214,7 @@ actor_process_profile_definition g_profile_Obj_Yboil = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0073, + /* Priority */ PRIO_Obj_Yboil, /* Actor SubMtd */ &daObj_YboilMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index 9675eebe..342b8889 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_obj_gryw00.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -198,7 +199,7 @@ actor_process_profile_definition g_profile_Obj_Ygush00 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x005E, + /* Priority */ PRIO_Obj_Ygush00, /* Actor SubMtd */ &l_daObjYgush00_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp index 2fd00de1..39a6ca9c 100644 --- a/src/d/actor/d_a_obj_adnno.cpp +++ b/src/d/actor/d_a_obj_adnno.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -165,7 +166,7 @@ actor_process_profile_definition g_profile_Obj_Adnno = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x007E, + /* Priority */ PRIO_Obj_Adnno, /* Actor SubMtd */ &daObj_AdnnoMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ajav.cpp b/src/d/actor/d_a_obj_ajav.cpp index a58eac62..380e5a28 100644 --- a/src/d/actor/d_a_obj_ajav.cpp +++ b/src/d/actor/d_a_obj_ajav.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_ajav.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000170 .text daObjAjav_make_splash__9daObjAjavF4cXyzf */ void daObjAjav::daObjAjav_make_splash(cXyz, float) { @@ -233,7 +234,7 @@ actor_process_profile_definition g_profile_Obj_Ajav = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0047, + /* Priority */ PRIO_Obj_Ajav, /* Actor SubMtd */ &daObjAjav::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp index 3af56f97..73675aed 100644 --- a/src/d/actor/d_a_obj_akabe.cpp +++ b/src/d/actor/d_a_obj_akabe.cpp @@ -9,6 +9,7 @@ #include "d/res/res_akabek.h" #include "d/res/res_nbox.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -197,7 +198,7 @@ actor_process_profile_definition g_profile_Obj_Akabe = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0033, + /* Priority */ PRIO_Obj_Akabe, /* Actor SubMtd */ &daObjAkabe::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_apzl.cpp b/src/d/actor/d_a_obj_apzl.cpp index d6b61aca..2b2612b6 100644 --- a/src/d/actor/d_a_obj_apzl.cpp +++ b/src/d/actor/d_a_obj_apzl.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_apzl.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000025C .text move_piece__11daObjApzl_cFv */ void daObjApzl_c::move_piece() { @@ -134,7 +135,7 @@ actor_process_profile_definition g_profile_Obj_Apzl = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x007D, + /* Priority */ PRIO_Obj_Apzl, /* Actor SubMtd */ &daObj_ApzlMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ashut.cpp b/src/d/actor/d_a_obj_ashut.cpp index fade1890..ab763ee3 100644 --- a/src/d/actor/d_a_obj_ashut.cpp +++ b/src/d/actor/d_a_obj_ashut.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_ashut.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000012C .text CreateHeap__Q210daObjAshut5Act_cFv */ BOOL daObjAshut::Act_c::CreateHeap() { @@ -153,7 +154,7 @@ actor_process_profile_definition g_profile_Obj_Ashut = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0034, + /* Priority */ PRIO_Obj_Ashut, /* Actor SubMtd */ &daObjAshut::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_auzu.cpp b/src/d/actor/d_a_obj_auzu.cpp index 23b788a1..cbeacbb8 100644 --- a/src/d/actor/d_a_obj_auzu.cpp +++ b/src/d/actor/d_a_obj_auzu.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_auzu.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000009C .text solidHeapCB__Q29daObjAuzu5Act_cFP10fopAc_ac_c */ void daObjAuzu::Act_c::solidHeapCB(fopAc_ac_c*) { @@ -118,7 +119,7 @@ actor_process_profile_definition g_profile_Obj_Auzu = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x007F, + /* Priority */ PRIO_Obj_Auzu, /* Actor SubMtd */ &daObjAuzu::Mthd_Table, /* Status */ 0x06 | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_aygr.cpp b/src/d/actor/d_a_obj_aygr.cpp index 4b3efc83..7ca03ec6 100644 --- a/src/d/actor/d_a_obj_aygr.cpp +++ b/src/d/actor/d_a_obj_aygr.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_aygr.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000002A4 .text CreateHeap__Q29daObjAygr5Act_cFv */ BOOL daObjAygr::Act_c::CreateHeap() { @@ -98,7 +99,7 @@ actor_process_profile_definition g_profile_Obj_Aygr = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0080, + /* Priority */ PRIO_Obj_Aygr, /* Actor SubMtd */ &daObjAygr::Mthd_Aygr, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_balancelift.cpp b/src/d/actor/d_a_obj_balancelift.cpp index 19ef4263..e9c4bb66 100644 --- a/src/d/actor/d_a_obj_balancelift.cpp +++ b/src/d/actor/d_a_obj_balancelift.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_balancelift.h" #include "d/d_bg_w.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000160 .text __ct__19daBalancelift_HIO_cFv */ daBalancelift_HIO_c::daBalancelift_HIO_c() { @@ -100,7 +101,7 @@ actor_process_profile_definition g_profile_Balancelift = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01B8, + /* Priority */ PRIO_Balancelift, /* Actor SubMtd */ &daBalanceliftMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_barrel.cpp b/src/d/actor/d_a_obj_barrel.cpp index 048cae3e..dd46e807 100644 --- a/src/d/actor/d_a_obj_barrel.cpp +++ b/src/d/actor/d_a_obj_barrel.cpp @@ -9,6 +9,7 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "weak_data_1811.h" // IWYU pragma: keep @@ -776,7 +777,7 @@ actor_process_profile_definition g_profile_Obj_Barrel = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0109, + /* Priority */ PRIO_Obj_Barrel, /* Actor SubMtd */ &daObjBarrel::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e | fopAcStts_UNK8000000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_barrel2.cpp b/src/d/actor/d_a_obj_barrel2.cpp index 2d0f1b06..a2d69aa1 100644 --- a/src/d/actor/d_a_obj_barrel2.cpp +++ b/src/d/actor/d_a_obj_barrel2.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_barrel2.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000110 .text solidHeapCB__Q212daObjBarrel25Act_cFP10fopAc_ac_c */ void daObjBarrel2::Act_c::solidHeapCB(fopAc_ac_c*) { @@ -289,7 +290,7 @@ actor_process_profile_definition g_profile_Obj_Barrel2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x010A, + /* Priority */ PRIO_Obj_Barrel2, /* Actor SubMtd */ &daObjBarrel2::Method::Table, /* Status */ 0x05 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 96bcb904..a82b66ff 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_item_data.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_mtx.h" @@ -627,7 +628,7 @@ actor_process_profile_definition g_profile_Obj_Barrier = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0083, + /* Priority */ PRIO_Obj_Barrier, /* Actor SubMtd */ &l_daObjBarrier_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 5f56fba3..d7e4e266 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_bemos.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000194 .text __ct__13daBemos_HIO_cFv */ daBemos_HIO_c::daBemos_HIO_c() { @@ -234,7 +235,7 @@ actor_process_profile_definition g_profile_Bemos = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00DD, + /* Priority */ PRIO_Bemos, /* Actor SubMtd */ &daBemosMethodTable, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp index 5c3a8a31..f341922d 100644 --- a/src/d/actor/d_a_obj_bscurtain.cpp +++ b/src/d/actor/d_a_obj_bscurtain.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -138,7 +139,7 @@ actor_process_profile_definition g_profile_Obj_Bscurtain = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01BE, + /* Priority */ PRIO_Obj_Bscurtain, /* Actor SubMtd */ &daObj_BscurtainMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_buoyflag.cpp b/src/d/actor/d_a_obj_buoyflag.cpp index bee89dcd..53e152d9 100644 --- a/src/d/actor/d_a_obj_buoyflag.cpp +++ b/src/d/actor/d_a_obj_buoyflag.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_buoyflag.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001BC .text hasi_nrm_init__Q213daObjBuoyflag8Packet_cFv */ void daObjBuoyflag::Packet_c::hasi_nrm_init() { @@ -133,7 +134,7 @@ actor_process_profile_definition g_profile_Obj_Buoyflag = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x010D, + /* Priority */ PRIO_Obj_Buoyflag, /* Actor SubMtd */ &daObjBuoyflag::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_buoyrace.cpp b/src/d/actor/d_a_obj_buoyrace.cpp index a7639e82..5cee98f3 100644 --- a/src/d/actor/d_a_obj_buoyrace.cpp +++ b/src/d/actor/d_a_obj_buoyrace.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_buoyrace.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000009C .text solidHeapCB__Q213daObjBuoyrace5Act_cFP10fopAc_ac_c */ void daObjBuoyrace::Act_c::solidHeapCB(fopAc_ac_c*) { @@ -118,7 +119,7 @@ actor_process_profile_definition g_profile_Obj_Buoyrace = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x010C, + /* Priority */ PRIO_Obj_Buoyrace, /* Actor SubMtd */ &daObjBuoyrace::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp index 5515fae1..25a87358 100644 --- a/src/d/actor/d_a_obj_cafelmp.cpp +++ b/src/d/actor/d_a_obj_cafelmp.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -124,7 +125,7 @@ actor_process_profile_definition g_profile_Obj_Cafelmp = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0077, + /* Priority */ PRIO_Obj_Cafelmp, /* Actor SubMtd */ &daObj_CafelmpMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_canon.cpp b/src/d/actor/d_a_obj_canon.cpp index 7842558b..2addeadb 100644 --- a/src/d/actor/d_a_obj_canon.cpp +++ b/src/d/actor/d_a_obj_canon.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_canon.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001A0 .text __ct__17daObj_Canon_HIO_cFv */ daObj_Canon_HIO_c::daObj_Canon_HIO_c() { @@ -199,7 +200,7 @@ actor_process_profile_definition g_profile_OBJ_CANON = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01AF, + /* Priority */ PRIO_OBJ_CANON, /* Actor SubMtd */ &daObj_CanonMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_coming.cpp b/src/d/actor/d_a_obj_coming.cpp index bac45912..ad2bb842 100644 --- a/src/d/actor/d_a_obj_coming.cpp +++ b/src/d/actor/d_a_obj_coming.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_coming.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000128 .text init__Q211daObjComing6Ctrl_cFPCQ211daObjComing5Act_c */ void daObjComing::Ctrl_c::init(const daObjComing::Act_c*) { @@ -188,7 +189,7 @@ actor_process_profile_definition g_profile_Obj_Coming = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0027, + /* Priority */ PRIO_Obj_Coming, /* Actor SubMtd */ &daObjComing::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_correct.cpp b/src/d/actor/d_a_obj_correct.cpp index 735a4a66..537a8c3b 100644 --- a/src/d/actor/d_a_obj_correct.cpp +++ b/src/d/actor/d_a_obj_correct.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_correct.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000001B0 .text _create__Q212daObjCorrect5Act_cFv */ cPhs_State daObjCorrect::Act_c::_create() { @@ -173,7 +174,7 @@ actor_process_profile_definition g_profile_Obj_Correct = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0026, + /* Priority */ PRIO_Obj_Correct, /* Actor SubMtd */ &daObjCorrect::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_demo_barrel.cpp b/src/d/actor/d_a_obj_demo_barrel.cpp index 67760987..c5be2b88 100644 --- a/src/d/actor/d_a_obj_demo_barrel.cpp +++ b/src/d/actor/d_a_obj_demo_barrel.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_demo_barrel.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000144 .text setParticleHahen__19daObj_Demo_Barrel_cFv */ void daObj_Demo_Barrel_c::setParticleHahen() { @@ -69,7 +70,7 @@ actor_process_profile_definition g_profile_Obj_Demo_Barrel = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x010F, + /* Priority */ PRIO_Obj_Demo_Barrel, /* Actor SubMtd */ &daObj_Demo_BarrelMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp index 995e7ef5..31787c70 100644 --- a/src/d/actor/d_a_obj_dmgroom.cpp +++ b/src/d/actor/d_a_obj_dmgroom.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -135,7 +136,7 @@ actor_process_profile_definition g_profile_Obj_Dmgroom = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x001D, + /* Priority */ PRIO_Obj_Dmgroom, /* Actor SubMtd */ &daObj_DmgroomMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp index 27d21c8a..26f24628 100644 --- a/src/d/actor/d_a_obj_doguu.cpp +++ b/src/d/actor/d_a_obj_doguu.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_doguu.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "d/res/res_doguu.h" @@ -820,7 +821,7 @@ actor_process_profile_definition g_profile_Obj_Doguu = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x001E, + /* Priority */ PRIO_Obj_Doguu, /* Actor SubMtd */ &daObj_DoguuMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_doguu_demo.cpp b/src/d/actor/d_a_obj_doguu_demo.cpp index 8b94a319..d104641c 100644 --- a/src/d/actor/d_a_obj_doguu_demo.cpp +++ b/src/d/actor/d_a_obj_doguu_demo.cpp @@ -8,6 +8,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" @@ -148,7 +149,7 @@ actor_process_profile_definition g_profile_Obj_DoguuD = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01C5, + /* Priority */ PRIO_Obj_DoguuD, /* Actor SubMtd */ &daObj_DoguuDMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp index 89181025..a3bba03c 100644 --- a/src/d/actor/d_a_obj_dragonhead.cpp +++ b/src/d/actor/d_a_obj_dragonhead.cpp @@ -11,6 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_cc_d.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -239,7 +240,7 @@ actor_process_profile_definition g_profile_Obj_Dragonhead = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0025, + /* Priority */ PRIO_Obj_Dragonhead, /* Actor SubMtd */ &daObj_DragonheadMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_drift.cpp b/src/d/actor/d_a_obj_drift.cpp index bfdbfd82..7b11e1d8 100644 --- a/src/d/actor/d_a_obj_drift.cpp +++ b/src/d/actor/d_a_obj_drift.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_drift.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001A0 .text CreateHeap__Q210daObjDrift5Act_cFv */ BOOL daObjDrift::Act_c::CreateHeap() { @@ -143,7 +144,7 @@ actor_process_profile_definition g_profile_Obj_Drift = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x002E, + /* Priority */ PRIO_Obj_Drift, /* Actor SubMtd */ &daObjDrift::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp index a5e2fbb8..be75128e 100644 --- a/src/d/actor/d_a_obj_eayogn.cpp +++ b/src/d/actor/d_a_obj_eayogn.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -151,7 +152,7 @@ actor_process_profile_definition g_profile_Obj_Eayogn = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x004C, + /* Priority */ PRIO_Obj_Eayogn, /* Actor SubMtd */ &Eayogn_Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ebomzo.cpp b/src/d/actor/d_a_obj_ebomzo.cpp index a713967a..bf985fca 100644 --- a/src/d/actor/d_a_obj_ebomzo.cpp +++ b/src/d/actor/d_a_obj_ebomzo.cpp @@ -9,6 +9,7 @@ #include "f_op/f_op_actor_mng.h" #include "d/res/res_ebomzo.h" #include "d/d_procname.h" +#include "d/d_priority.h" typedef enum { /*0*/ Ebomzo_Mode_Check = 0, @@ -252,7 +253,7 @@ actor_process_profile_definition g_profile_Obj_Ebomzo = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x007C, + /* Priority */ PRIO_Obj_Ebomzo, /* Actor SubMtd */ &daObjEbomzo::Mthd_Ebomzo, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index 31e74c0e..94d81a00 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/src/d/actor/d_a_obj_eff.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_eff.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000140 .text __ct__Q28daObjEff13BarrelSmokeCBFv */ daObjEff::BarrelSmokeCB::BarrelSmokeCB() { @@ -268,7 +269,7 @@ actor_process_profile_definition g_profile_Obj_Eff = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x010B, + /* Priority */ PRIO_Obj_Eff, /* Actor SubMtd */ &daObjEff::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ekskz.cpp b/src/d/actor/d_a_obj_ekskz.cpp index 421d529a..2eb40296 100644 --- a/src/d/actor/d_a_obj_ekskz.cpp +++ b/src/d/actor/d_a_obj_ekskz.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_ekskz.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000368 .text CreateHeap__Q210daObjEkskz5Act_cFv */ BOOL daObjEkskz::Act_c::CreateHeap() { @@ -98,7 +99,7 @@ actor_process_profile_definition g_profile_Obj_Ekskz = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x007B, + /* Priority */ PRIO_Obj_Ekskz, /* Actor SubMtd */ &daObjEkskz::Mthd_Ekskz, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp index fd4d8f73..ad9f4437 100644 --- a/src/d/actor/d_a_obj_eskban.cpp +++ b/src/d/actor/d_a_obj_eskban.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_eskban.h" #include "d/res/res_eskban.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -436,7 +437,7 @@ actor_process_profile_definition g_profile_Obj_Eskban = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x007A, + /* Priority */ PRIO_Obj_Eskban, /* Actor SubMtd */ &daObjEskban::Mthd_Eskban, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ferris.cpp b/src/d/actor/d_a_obj_ferris.cpp index 05ffd087..c4cf092d 100644 --- a/src/d/actor/d_a_obj_ferris.cpp +++ b/src/d/actor/d_a_obj_ferris.cpp @@ -8,6 +8,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_skanran.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -566,7 +567,7 @@ actor_process_profile_definition g_profile_Obj_Ferris = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x003C, + /* Priority */ PRIO_Obj_Ferris, /* Actor SubMtd */ &daObjFerris::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp index 363337ad..99a95cf2 100644 --- a/src/d/actor/d_a_obj_figure.cpp +++ b/src/d/actor/d_a_obj_figure.cpp @@ -13,6 +13,7 @@ #include "d/d_camera.h" #include "d/d_a_obj.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_player_main.h" #include "m_Do/m_Do_controller_pad.h" @@ -1625,7 +1626,7 @@ actor_process_profile_definition g_profile_OBJ_FIGURE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01C7, + /* Priority */ PRIO_OBJ_FIGURE, /* Actor SubMtd */ &daSampleMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_firewall.cpp b/src/d/actor/d_a_obj_firewall.cpp index e0fda215..e7fc6353 100644 --- a/src/d/actor/d_a_obj_firewall.cpp +++ b/src/d/actor/d_a_obj_firewall.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_firewall.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000EC .text init_mtx__15daObjFirewall_cFv */ void daObjFirewall_c::init_mtx() { @@ -169,7 +170,7 @@ actor_process_profile_definition g_profile_Obj_Firewall = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0084, + /* Priority */ PRIO_Obj_Firewall, /* Actor SubMtd */ &l_daObjFirewall_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_flame.cpp b/src/d/actor/d_a_obj_flame.cpp index 9f95ece2..8b1ff8dc 100644 --- a/src/d/actor/d_a_obj_flame.cpp +++ b/src/d/actor/d_a_obj_flame.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_flame.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000110 .text set_switch__Q210daObjFlame5Act_cFv */ void daObjFlame::Act_c::set_switch() { @@ -179,7 +180,7 @@ actor_process_profile_definition g_profile_Obj_Flame = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0111, + /* Priority */ PRIO_Obj_Flame, /* Actor SubMtd */ &daObjFlame::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ftree.cpp b/src/d/actor/d_a_obj_ftree.cpp index 8b36b996..fa51a773 100644 --- a/src/d/actor/d_a_obj_ftree.cpp +++ b/src/d/actor/d_a_obj_ftree.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_ftree.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000DC .text search_heart_part__Q210daObjFtree5Act_cFv */ void daObjFtree::Act_c::search_heart_part() { @@ -393,7 +394,7 @@ actor_process_profile_definition g_profile_Obj_Ftree = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0044, + /* Priority */ PRIO_Obj_Ftree, /* Actor SubMtd */ &daObjFtree::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp index 4ed017e5..28325bc3 100644 --- a/src/d/actor/d_a_obj_ganonbed.cpp +++ b/src/d/actor/d_a_obj_ganonbed.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -145,7 +146,7 @@ actor_process_profile_definition g_profile_Obj_Gbed = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0059, + /* Priority */ PRIO_Obj_Gbed, /* Actor SubMtd */ &l_daObjGbed_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_gaship.cpp b/src/d/actor/d_a_obj_gaship.cpp index 7d448d76..e2a3cd28 100644 --- a/src/d/actor/d_a_obj_gaship.cpp +++ b/src/d/actor/d_a_obj_gaship.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_gaship.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" #include "d/res/res_gaship.h" @@ -149,7 +150,7 @@ actor_process_profile_definition g_profile_Obj_Gaship = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x003F, + /* Priority */ PRIO_Obj_Gaship, /* Actor SubMtd */ &daObjGaship::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_gaship2.cpp b/src/d/actor/d_a_obj_gaship2.cpp index b016643a..683e0d8d 100644 --- a/src/d/actor/d_a_obj_gaship2.cpp +++ b/src/d/actor/d_a_obj_gaship2.cpp @@ -9,6 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" const char daObjGaship2::Act_c::M_arcname[] = "YakeRom"; @@ -138,7 +139,7 @@ actor_process_profile_definition g_profile_Obj_Gaship2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0040, + /* Priority */ PRIO_Obj_Gaship2, /* Actor SubMtd */ &daObjGaship2::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_gnnbtltaki.cpp b/src/d/actor/d_a_obj_gnnbtltaki.cpp index 7b412667..41f0c674 100644 --- a/src/d/actor/d_a_obj_gnnbtltaki.cpp +++ b/src/d/actor/d_a_obj_gnnbtltaki.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_gnnbtltaki.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text solidHeapCB__15daObjGnnbtaki_cFP10fopAc_ac_c */ void daObjGnnbtaki_c::solidHeapCB(fopAc_ac_c*) { @@ -86,7 +87,7 @@ actor_process_profile_definition g_profile_Obj_Gnnbtaki = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0053, + /* Priority */ PRIO_Obj_Gnnbtaki, /* Actor SubMtd */ &Gnnbtaki_Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_gnndemotakie.cpp b/src/d/actor/d_a_obj_gnndemotakie.cpp index 87ba9049..b975acad 100644 --- a/src/d/actor/d_a_obj_gnndemotakie.cpp +++ b/src/d/actor/d_a_obj_gnndemotakie.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_gnndemotakie.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text solidHeapCB__15daObjGnntakie_cFP10fopAc_ac_c */ void daObjGnntakie_c::solidHeapCB(fopAc_ac_c*) { @@ -86,7 +87,7 @@ actor_process_profile_definition g_profile_Obj_Gnntakie = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0052, + /* Priority */ PRIO_Obj_Gnntakie, /* Actor SubMtd */ &Gnntakie_Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_gnndemotakis.cpp b/src/d/actor/d_a_obj_gnndemotakis.cpp index a898cc39..9e2e5ca8 100644 --- a/src/d/actor/d_a_obj_gnndemotakis.cpp +++ b/src/d/actor/d_a_obj_gnndemotakis.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_gnndemotakis.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text solidHeapCB__15daObjGnntakis_cFP10fopAc_ac_c */ void daObjGnntakis_c::solidHeapCB(fopAc_ac_c*) { @@ -86,7 +87,7 @@ actor_process_profile_definition g_profile_Obj_Gnntakis = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0051, + /* Priority */ PRIO_Obj_Gnntakis, /* Actor SubMtd */ &Gnntakis_Mthd_Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp index 86c9920d..9168b840 100644 --- a/src/d/actor/d_a_obj_gong.cpp +++ b/src/d/actor/d_a_obj_gong.cpp @@ -12,6 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/d_drawlist.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -178,7 +179,7 @@ actor_process_profile_definition g_profile_Obj_Gong = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0081, + /* Priority */ PRIO_Obj_Gong, /* Actor SubMtd */ &daObjGong::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp index ee4049c3..1ed8aa0c 100644 --- a/src/d/actor/d_a_obj_gryw00.cpp +++ b/src/d/actor/d_a_obj_gryw00.cpp @@ -6,6 +6,7 @@ #include "d/d_com_inf_game.h" #include "d/d_particle.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_obj_gryw00.h" #include "d/res/res_gryw00.h" @@ -312,7 +313,7 @@ actor_process_profile_definition g_profile_Obj_Gryw00 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0055, + /* Priority */ PRIO_Obj_Gryw00, /* Actor SubMtd */ &l_daObjGryw00_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_gtaki.cpp b/src/d/actor/d_a_obj_gtaki.cpp index 4189b91f..2dfb1fac 100644 --- a/src/d/actor/d_a_obj_gtaki.cpp +++ b/src/d/actor/d_a_obj_gtaki.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_gtaki.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -79,7 +80,7 @@ actor_process_profile_definition g_profile_Obj_Gtaki = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0072, + /* Priority */ PRIO_Obj_Gtaki, /* Actor SubMtd */ &daObj_GtakiMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_hami2.cpp b/src/d/actor/d_a_obj_hami2.cpp index 4f938944..e5139dfc 100644 --- a/src/d/actor/d_a_obj_hami2.cpp +++ b/src/d/actor/d_a_obj_hami2.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_hami2.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000012C .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -134,7 +135,7 @@ actor_process_profile_definition g_profile_Obj_Hami2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0019, + /* Priority */ PRIO_Obj_Hami2, /* Actor SubMtd */ &daObjHami2::Mthd_Hami2, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_hami3.cpp b/src/d/actor/d_a_obj_hami3.cpp index ff4ef176..9246c564 100644 --- a/src/d/actor/d_a_obj_hami3.cpp +++ b/src/d/actor/d_a_obj_hami3.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_hami3.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000012C .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -134,7 +135,7 @@ actor_process_profile_definition g_profile_Obj_Hami3 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x001A, + /* Priority */ PRIO_Obj_Hami3, /* Actor SubMtd */ &daObjHami3::Mthd_Hami3, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_hami4.cpp b/src/d/actor/d_a_obj_hami4.cpp index 723e8741..5cc5eedc 100644 --- a/src/d/actor/d_a_obj_hami4.cpp +++ b/src/d/actor/d_a_obj_hami4.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_hami4.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -89,7 +90,7 @@ actor_process_profile_definition g_profile_Obj_Hami4 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x001B, + /* Priority */ PRIO_Obj_Hami4, /* Actor SubMtd */ &daObj_Hami4MethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_hat.cpp b/src/d/actor/d_a_obj_hat.cpp index 5a56ca6a..80b0bacb 100644 --- a/src/d/actor/d_a_obj_hat.cpp +++ b/src/d/actor/d_a_obj_hat.cpp @@ -9,6 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_ro.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" @@ -253,7 +254,7 @@ actor_process_profile_definition g_profile_OBJ_HAT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01C8, + /* Priority */ PRIO_OBJ_HAT, /* Actor SubMtd */ &daSampleMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_hbrf1.cpp b/src/d/actor/d_a_obj_hbrf1.cpp index 2a6e9bcf..b069c494 100644 --- a/src/d/actor/d_a_obj_hbrf1.cpp +++ b/src/d/actor/d_a_obj_hbrf1.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_hbrf1.h" #include "d/res/res_hbrf1.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" Mtx daObjHbrf1::Act_c::M_tmp_mtx; @@ -304,7 +305,7 @@ actor_process_profile_definition g_profile_Obj_Hbrf1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x001C, + /* Priority */ PRIO_Obj_Hbrf1, /* Actor SubMtd */ &daObjHbrf1::Mthd_Hbrf1, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_hcbh.cpp b/src/d/actor/d_a_obj_hcbh.cpp index 4557c6fd..ca5bcbaa 100644 --- a/src/d/actor/d_a_obj_hcbh.cpp +++ b/src/d/actor/d_a_obj_hcbh.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_hcbh.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000D8 .text chk_appear__11daObjHcbh_cFv */ void daObjHcbh_c::chk_appear() { @@ -129,7 +130,7 @@ actor_process_profile_definition g_profile_Obj_Hcbh = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x005D, + /* Priority */ PRIO_Obj_Hcbh, /* Actor SubMtd */ &l_daObjHcbh_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp index 9c6dcd8a..4a3cffb8 100644 --- a/src/d/actor/d_a_obj_hfuck1.cpp +++ b/src/d/actor/d_a_obj_hfuck1.cpp @@ -10,6 +10,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_player.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -214,7 +215,7 @@ actor_process_profile_definition g_profile_Obj_Hfuck1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x005B, + /* Priority */ PRIO_Obj_Hfuck1, /* Actor SubMtd */ &l_daObjHfuck1_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp index d4a56c05..930535b5 100644 --- a/src/d/actor/d_a_obj_hha.cpp +++ b/src/d/actor/d_a_obj_hha.cpp @@ -9,6 +9,7 @@ #include "d/d_bg_s_wtr_chk.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_hha.h" const dCcD_SrcCyl daObjHha_c::M_cyl_data = { @@ -712,7 +713,7 @@ actor_process_profile_definition g_profile_Obj_Hha = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0049, + /* Priority */ PRIO_Obj_Hha, /* Actor SubMtd */ &Hha_Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_hlift.cpp b/src/d/actor/d_a_obj_hlift.cpp index 7ac556ee..041ea6f5 100644 --- a/src/d/actor/d_a_obj_hlift.cpp +++ b/src/d/actor/d_a_obj_hlift.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_hlift.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000001BC .text CreateHeap__Q210daObjHlift5Act_cFv */ BOOL daObjHlift::Act_c::CreateHeap() { @@ -173,7 +174,7 @@ actor_process_profile_definition g_profile_Obj_Hlift = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0018, + /* Priority */ PRIO_Obj_Hlift, /* Actor SubMtd */ &daObjHlift::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index ab9dcc3d..1645f174 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" #include "JSystem/JUtility/JUTAssert.h" @@ -319,7 +320,7 @@ actor_process_profile_definition g_profile_OBJ_HOLE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01B7, + /* Priority */ PRIO_OBJ_HOLE, /* Actor SubMtd */ &daObj_HoleMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_homen.cpp b/src/d/actor/d_a_obj_homen.cpp index 085fbb5f..2e44f1a1 100644 --- a/src/d/actor/d_a_obj_homen.cpp +++ b/src/d/actor/d_a_obj_homen.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_homen.h" #include "f_op/f_op_actor_mng.h" @@ -864,7 +865,7 @@ actor_process_profile_definition g_profile_Obj_Homen = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0042, + /* Priority */ PRIO_Obj_Homen, /* Actor SubMtd */ &daObjHomen::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_homensmoke.cpp b/src/d/actor/d_a_obj_homensmoke.cpp index c12eb2b2..ca3ab8de 100644 --- a/src/d/actor/d_a_obj_homensmoke.cpp +++ b/src/d/actor/d_a_obj_homensmoke.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_homensmoke.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_particle.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" @@ -170,7 +171,7 @@ actor_process_profile_definition g_profile_Obj_Homensmk = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0043, + /* Priority */ PRIO_Obj_Homensmk, /* Actor SubMtd */ &daObjHomensmoke::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_hsehi1.cpp b/src/d/actor/d_a_obj_hsehi1.cpp index 77ea3e65..956221f7 100644 --- a/src/d/actor/d_a_obj_hsehi1.cpp +++ b/src/d/actor/d_a_obj_hsehi1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_hsehi1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000130 .text __ct__15daObj_hsh_HIO_cFv */ daObj_hsh_HIO_c::daObj_hsh_HIO_c() { @@ -294,7 +295,7 @@ actor_process_profile_definition g_profile_Obj_HSH = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0088, + /* Priority */ PRIO_Obj_HSH, /* Actor SubMtd */ &l_daObj_hsh_Method, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_htetu1.cpp b/src/d/actor/d_a_obj_htetu1.cpp index 80a67706..47242e6c 100644 --- a/src/d/actor/d_a_obj_htetu1.cpp +++ b/src/d/actor/d_a_obj_htetu1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_htetu1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000178 .text create_s__19daObjHtetu1Splash_cFUsP4cXyzP5csXyzP12dKy_tevstr_c */ void daObjHtetu1Splash_c::create_s(unsigned short, cXyz*, csXyz*, dKy_tevstr_c*) { @@ -111,7 +112,7 @@ actor_process_profile_definition g_profile_Obj_Htetu1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x004A, + /* Priority */ PRIO_Obj_Htetu1, /* Actor SubMtd */ &Htetu1_Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ice.cpp b/src/d/actor/d_a_obj_ice.cpp index e83b1c42..5becc215 100644 --- a/src/d/actor/d_a_obj_ice.cpp +++ b/src/d/actor/d_a_obj_ice.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_ice.h" #include "d/d_procname.h" +#include "d/d_priority.h" class J3DMaterial; @@ -126,7 +127,7 @@ actor_process_profile_definition g_profile_Obj_Ice = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x000F, + /* Priority */ PRIO_Obj_Ice, /* Actor SubMtd */ &l_daObjIce_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_iceisland.cpp b/src/d/actor/d_a_obj_iceisland.cpp index 560eac39..e19a5623 100644 --- a/src/d/actor/d_a_obj_iceisland.cpp +++ b/src/d/actor/d_a_obj_iceisland.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_iceisland.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_gicel.h" #include "JSystem/JKernel/JKRExpHeap.h" @@ -291,7 +292,7 @@ actor_process_profile_definition g_profile_Obj_Iceisland = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0024, + /* Priority */ PRIO_Obj_Iceisland, /* Actor SubMtd */ &daObj_IceislandMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index 47141f9e..9949be44 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_ikada.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000254 .text __ct__17daObj_Ikada_HIO_cFv */ daObj_Ikada_HIO_c::daObj_Ikada_HIO_c() { @@ -319,7 +320,7 @@ actor_process_profile_definition g_profile_OBJ_IKADA = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01B4, + /* Priority */ PRIO_OBJ_IKADA, /* Actor SubMtd */ &daObj_IkadaMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_jump.cpp b/src/d/actor/d_a_obj_jump.cpp index f0a8772f..3da4d8c0 100644 --- a/src/d/actor/d_a_obj_jump.cpp +++ b/src/d/actor/d_a_obj_jump.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_jump.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000184 .text CreateHeap__Q29daObjJump5Act_cFv */ BOOL daObjJump::Act_c::CreateHeap() { @@ -183,7 +184,7 @@ actor_process_profile_definition g_profile_Obj_Jump = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0031, + /* Priority */ PRIO_Obj_Jump, /* Actor SubMtd */ &daObjJump::Mthd_Table, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp index d4655872..06026a6f 100644 --- a/src/d/actor/d_a_obj_kanat.cpp +++ b/src/d/actor/d_a_obj_kanat.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_kanat.h" #include "d/res/res_kanat.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" @@ -162,7 +163,7 @@ actor_process_profile_definition g_profile_Obj_Kanat = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0079, + /* Priority */ PRIO_Obj_Kanat, /* Actor SubMtd */ &daObjKanat::Mthd_Kanat, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_kanoke.cpp b/src/d/actor/d_a_obj_kanoke.cpp index 6aa96b39..6aeb65eb 100644 --- a/src/d/actor/d_a_obj_kanoke.cpp +++ b/src/d/actor/d_a_obj_kanoke.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_kanoke.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000002F4 .text __ct__13daObjKanoke_cFv */ daObjKanoke_c::daObjKanoke_c() { @@ -169,7 +170,7 @@ actor_process_profile_definition g_profile_Obj_Kanoke = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0078, + /* Priority */ PRIO_Obj_Kanoke, /* Actor SubMtd */ &daObjKanokeMethodTable, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index fef65c85..8463e9c6 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -7,6 +7,7 @@ #include "d/res/res_mhsg.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "weak_data_1811.h" // IWYU pragma: keep @@ -351,7 +352,7 @@ actor_process_profile_definition g_profile_Obj_Ladder = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0030, + /* Priority */ PRIO_Obj_Ladder, /* Actor SubMtd */ &daObjLadder::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_leaves.cpp b/src/d/actor/d_a_obj_leaves.cpp index ac35f7d4..f55497e2 100644 --- a/src/d/actor/d_a_obj_leaves.cpp +++ b/src/d/actor/d_a_obj_leaves.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_leaves.h" #include "d/d_bg_w.h" #include "d/d_procname.h" +#include "d/d_priority.h" class J3DMaterial; @@ -137,7 +138,7 @@ actor_process_profile_definition g_profile_Obj_Leaves = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0057, + /* Priority */ PRIO_Obj_Leaves, /* Actor SubMtd */ &l_daObjLeaves_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_light.cpp b/src/d/actor/d_a_obj_light.cpp index 19062042..044a94ff 100644 --- a/src/d/actor/d_a_obj_light.cpp +++ b/src/d/actor/d_a_obj_light.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_light.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000110 .text solidHeapCB__Q210daObjLight5Act_cFP10fopAc_ac_c */ void daObjLight::Act_c::solidHeapCB(fopAc_ac_c*) { @@ -148,7 +149,7 @@ actor_process_profile_definition g_profile_Obj_Light = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0041, + /* Priority */ PRIO_Obj_Light, /* Actor SubMtd */ &daObjLight::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_lpalm.cpp b/src/d/actor/d_a_obj_lpalm.cpp index 072c23b7..e639f006 100644 --- a/src/d/actor/d_a_obj_lpalm.cpp +++ b/src/d/actor/d_a_obj_lpalm.cpp @@ -7,6 +7,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_oyashi.h" #include "m_Do/m_Do_ext.h" @@ -210,7 +211,7 @@ actor_process_profile_definition g_profile_Obj_Lpalm = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x006F, + /* Priority */ PRIO_Obj_Lpalm, /* Actor SubMtd */ &daObjLpalmMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_magmarock.cpp b/src/d/actor/d_a_obj_magmarock.cpp index 3ef3c053..f91834f8 100644 --- a/src/d/actor/d_a_obj_magmarock.cpp +++ b/src/d/actor/d_a_obj_magmarock.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_magmarock.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000128 .text set_mtx__Q214daObjMagmarock5Act_cFv */ void daObjMagmarock::Act_c::set_mtx() { @@ -159,7 +160,7 @@ actor_process_profile_definition g_profile_Obj_Magmarock = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01A9, + /* Priority */ PRIO_Obj_Magmarock, /* Actor SubMtd */ &daObjMagmarock::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_majyuu_door.cpp b/src/d/actor/d_a_obj_majyuu_door.cpp index 8575abe1..06e67bf6 100644 --- a/src/d/actor/d_a_obj_majyuu_door.cpp +++ b/src/d/actor/d_a_obj_majyuu_door.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_majyuu_door.h" #include "d/d_cc_d.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000010C .text createHeap_CB__FP10fopAc_ac_c */ static BOOL createHeap_CB(fopAc_ac_c*) { @@ -135,7 +136,7 @@ actor_process_profile_definition g_profile_OBJ_MJDOOR = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01B5, + /* Priority */ PRIO_OBJ_MJDOOR, /* Actor SubMtd */ &daObj_MjDoorMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_mkie.cpp b/src/d/actor/d_a_obj_mkie.cpp index 88679400..6327a69a 100644 --- a/src/d/actor/d_a_obj_mkie.cpp +++ b/src/d/actor/d_a_obj_mkie.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_mkie.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000250 .text CreateHeap__Q29daObjMkie5Act_cFv */ BOOL daObjMkie::Act_c::CreateHeap() { @@ -163,7 +164,7 @@ actor_process_profile_definition g_profile_Obj_Mkie = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0036, + /* Priority */ PRIO_Obj_Mkie, /* Actor SubMtd */ &daObjMkie::Mthd_Table, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_mkiek.cpp b/src/d/actor/d_a_obj_mkiek.cpp index 1936fe30..9a328979 100644 --- a/src/d/actor/d_a_obj_mkiek.cpp +++ b/src/d/actor/d_a_obj_mkiek.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_mkiek.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000240 .text CreateHeap__Q210daObjMkiek5Act_cFv */ BOOL daObjMkiek::Act_c::CreateHeap() { @@ -113,7 +114,7 @@ actor_process_profile_definition g_profile_Obj_Mkiek = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0037, + /* Priority */ PRIO_Obj_Mkiek, /* Actor SubMtd */ &daObjMkiek::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index a4ce95c8..1e0a8f2c 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -13,6 +13,7 @@ #include "JAZelAudio/JAIZelBasic.h" #include "SSystem/SComponent/c_xyz.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" #include "d/d_bg_w.h" @@ -1020,7 +1021,7 @@ actor_process_profile_definition g_profile_Obj_MknjD = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01C6, + /* Priority */ PRIO_Obj_MknjD, /* Actor SubMtd */ &daObjMknjD::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_mmrr.cpp b/src/d/actor/d_a_obj_mmrr.cpp index 42bc7ddb..b5d5c531 100644 --- a/src/d/actor/d_a_obj_mmrr.cpp +++ b/src/d/actor/d_a_obj_mmrr.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_mmrr.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000AC .text end__Q29daObjMmrr5Eff_cFv */ void daObjMmrr::Eff_c::end() { @@ -143,7 +144,7 @@ actor_process_profile_definition g_profile_Obj_Mmrr = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0035, + /* Priority */ PRIO_Obj_Mmrr, /* Actor SubMtd */ &daObjMmrr::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_monument.cpp b/src/d/actor/d_a_obj_monument.cpp index 8a44064b..a854d09f 100644 --- a/src/d/actor/d_a_obj_monument.cpp +++ b/src/d/actor/d_a_obj_monument.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -164,7 +165,7 @@ actor_process_profile_definition g_profile_Obj_Monument = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0086, + /* Priority */ PRIO_Obj_Monument, /* Actor SubMtd */ &daObjMonument::Mthd_Table, /* Status */ 0x18 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 8ba9a4af..11ba8f9e 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -14,6 +14,7 @@ #include "d/d_path.h" #include "d/d_cc_d.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -1937,7 +1938,7 @@ actor_process_profile_definition g_profile_Obj_Movebox = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0015, + /* Priority */ PRIO_Obj_Movebox, /* Actor SubMtd */ &daObjMovebox::Mthd_Table, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_msdan.cpp b/src/d/actor/d_a_obj_msdan.cpp index f710891d..7b873735 100644 --- a/src/d/actor/d_a_obj_msdan.cpp +++ b/src/d/actor/d_a_obj_msdan.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_msdan.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000003D4 .text Mthd_Create__Q210daObjMsdan5Act_cFv */ cPhs_State daObjMsdan::Act_c::Mthd_Create() { @@ -68,7 +69,7 @@ actor_process_profile_definition g_profile_Obj_Msdan = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0038, + /* Priority */ PRIO_Obj_Msdan, /* Actor SubMtd */ &daObjMsdan::Mthd_Msdan, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_msdan2.cpp b/src/d/actor/d_a_obj_msdan2.cpp index 90ba6820..4b963c0a 100644 --- a/src/d/actor/d_a_obj_msdan2.cpp +++ b/src/d/actor/d_a_obj_msdan2.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_msdan2.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000024C .text Mthd_Create__Q211daObjMsdan25Act_cFv */ cPhs_State daObjMsdan2::Act_c::Mthd_Create() { @@ -68,7 +69,7 @@ actor_process_profile_definition g_profile_Obj_Msdan2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x003A, + /* Priority */ PRIO_Obj_Msdan2, /* Actor SubMtd */ &daObjMsdan2::Mthd_Msdan2, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_msdan_sub.cpp b/src/d/actor/d_a_obj_msdan_sub.cpp index 1fb970ac..9e4be913 100644 --- a/src/d/actor/d_a_obj_msdan_sub.cpp +++ b/src/d/actor/d_a_obj_msdan_sub.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_msdan_sub.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000012C .text CreateHeap__Q213daObjMsdanSub5Act_cFv */ BOOL daObjMsdanSub::Act_c::CreateHeap() { @@ -98,7 +99,7 @@ actor_process_profile_definition g_profile_Obj_MsdanSub = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0039, + /* Priority */ PRIO_Obj_MsdanSub, /* Actor SubMtd */ &daObjMsdanSub::Mthd_MsdanSub, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_msdan_sub2.cpp b/src/d/actor/d_a_obj_msdan_sub2.cpp index d209a071..861b67eb 100644 --- a/src/d/actor/d_a_obj_msdan_sub2.cpp +++ b/src/d/actor/d_a_obj_msdan_sub2.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_msdan_sub2.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000012C .text CreateHeap__Q214daObjMsdanSub25Act_cFv */ BOOL daObjMsdanSub2::Act_c::CreateHeap() { @@ -98,7 +99,7 @@ actor_process_profile_definition g_profile_Obj_MsdanSub2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x003B, + /* Priority */ PRIO_Obj_MsdanSub2, /* Actor SubMtd */ &daObjMsdanSub2::Mthd_MsdanSub2, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_mshokki.cpp b/src/d/actor/d_a_obj_mshokki.cpp index 67054af6..8216bc24 100644 --- a/src/d/actor/d_a_obj_mshokki.cpp +++ b/src/d/actor/d_a_obj_mshokki.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_mshokki.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000108 .text set_mtx__14daObjMshokki_cFv */ void daObjMshokki_c::set_mtx() { @@ -104,7 +105,7 @@ actor_process_profile_definition g_profile_Obj_Mshokki = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0112, + /* Priority */ PRIO_Obj_Mshokki, /* Actor SubMtd */ &l_daObjMshokki_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp index 1fc1ef75..24e47b2f 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/src/d/actor/d_a_obj_mtest.cpp @@ -8,6 +8,7 @@ #include "d/res/res_owater.h" #include "d/res/res_astop.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -393,7 +394,7 @@ actor_process_profile_definition g_profile_Obj_Mtest = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x002B, + /* Priority */ PRIO_Obj_Mtest, /* Actor SubMtd */ &daObjMtest::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_nest.cpp b/src/d/actor/d_a_obj_nest.cpp index c371230e..8fac0d08 100644 --- a/src/d/actor/d_a_obj_nest.cpp +++ b/src/d/actor/d_a_obj_nest.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_nest.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000012C .text CreateHeap__Q29daObjNest5Act_cFv */ BOOL daObjNest::Act_c::CreateHeap() { @@ -113,7 +114,7 @@ actor_process_profile_definition g_profile_Obj_Nest = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x002C, + /* Priority */ PRIO_Obj_Nest, /* Actor SubMtd */ &daObjNest::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ohatch.cpp b/src/d/actor/d_a_obj_ohatch.cpp index f9c8d401..cedc5eb0 100644 --- a/src/d/actor/d_a_obj_ohatch.cpp +++ b/src/d/actor/d_a_obj_ohatch.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_ohatch.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-0000018C .text set_mtx__13daObjOhatch_cFv */ void daObjOhatch_c::set_mtx() { @@ -114,7 +115,7 @@ actor_process_profile_definition g_profile_Obj_Ohatch = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x005C, + /* Priority */ PRIO_Obj_Ohatch, /* Actor SubMtd */ &l_daObjOhatch_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ojtree.cpp b/src/d/actor/d_a_obj_ojtree.cpp index a957b1b2..3c251d4d 100644 --- a/src/d/actor/d_a_obj_ojtree.cpp +++ b/src/d/actor/d_a_obj_ojtree.cpp @@ -8,6 +8,7 @@ #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" #include "d/d_procname.h" +#include "d/d_priority.h" Mtx daObjOjtree::Act_c::M_tmp_mtx; const char daObjOjtree::Act_c::M_arcname[] = "Ojtree"; @@ -139,7 +140,7 @@ actor_process_profile_definition g_profile_Obj_Ojtree = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x002D, + /* Priority */ PRIO_Obj_Ojtree, /* Actor SubMtd */ &daObjOjtree::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_ospbox.cpp b/src/d/actor/d_a_obj_ospbox.cpp index 097a68b3..d02d7337 100644 --- a/src/d/actor/d_a_obj_ospbox.cpp +++ b/src/d/actor/d_a_obj_ospbox.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_ospbox.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001A0 .text CreateHeap__Q211daObjOspbox5Act_cFv */ BOOL daObjOspbox::Act_c::CreateHeap() { @@ -123,7 +124,7 @@ actor_process_profile_definition g_profile_Obj_Ospbox = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x002F, + /* Priority */ PRIO_Obj_Ospbox, /* Actor SubMtd */ &daObjOspbox::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_otble.cpp b/src/d/actor/d_a_obj_otble.cpp index e9af87b1..9e8a2af0 100644 --- a/src/d/actor/d_a_obj_otble.cpp +++ b/src/d/actor/d_a_obj_otble.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_otble.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text createHeap_CB__FP10fopAc_ac_c */ static BOOL createHeap_CB(fopAc_ac_c*) { @@ -79,7 +80,7 @@ actor_process_profile_definition g_profile_OBJ_OTBLE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01B0, + /* Priority */ PRIO_OBJ_OTBLE, /* Actor SubMtd */ &daObj_Otble::Mthd::Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index ab59c6c9..3fa3acd5 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -13,6 +13,7 @@ #include "f_op/f_op_msg.h" #include "f_op/f_op_msg_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" @@ -367,7 +368,7 @@ actor_process_profile_definition g_profile_Obj_Paper = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0108, + /* Priority */ PRIO_Obj_Paper, /* Actor SubMtd */ &daObjPaper::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp index f963a8d6..b06b1eb9 100644 --- a/src/d/actor/d_a_obj_pbco.cpp +++ b/src/d/actor/d_a_obj_pbco.cpp @@ -8,6 +8,7 @@ #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "d/d_procname.h" +#include "d/d_priority.h" static daObj_Pbco_HIO_c l_HIO; const char daObj_Pbco_c::M_arcname[] = "Pbco"; @@ -144,7 +145,7 @@ actor_process_profile_definition g_profile_Obj_Pbco = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0021, + /* Priority */ PRIO_Obj_Pbco, /* Actor SubMtd */ &daObj_PbcoMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp index 8c02c6a7..08e0d7ad 100644 --- a/src/d/actor/d_a_obj_pbka.cpp +++ b/src/d/actor/d_a_obj_pbka.cpp @@ -8,6 +8,7 @@ #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static int CheckCreateHeap(fopAc_ac_c* i_this) { @@ -124,7 +125,7 @@ actor_process_profile_definition g_profile_Obj_Pbka = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0070, + /* Priority */ PRIO_Obj_Pbka, /* Actor SubMtd */ &daObj_PbkaMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_pfall.cpp b/src/d/actor/d_a_obj_pfall.cpp index 3b12ded0..8e9db4eb 100644 --- a/src/d/actor/d_a_obj_pfall.cpp +++ b/src/d/actor/d_a_obj_pfall.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_pfall.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000010C .text CallbackCreateHeap__FP10fopAc_ac_c */ static BOOL CallbackCreateHeap(fopAc_ac_c*) { @@ -164,7 +165,7 @@ actor_process_profile_definition g_profile_OBJ_PFALL = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01B6, + /* Priority */ PRIO_OBJ_PFALL, /* Actor SubMtd */ &daObj_PfallMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_pirateship.cpp b/src/d/actor/d_a_obj_pirateship.cpp index 194e212e..88f92ea4 100644 --- a/src/d/actor/d_a_obj_pirateship.cpp +++ b/src/d/actor/d_a_obj_pirateship.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_pirateship.h" #include "d/d_procname.h" +#include "d/d_priority.h" class dBgW; @@ -136,7 +137,7 @@ actor_process_profile_definition g_profile_Obj_Pirateship = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01AA, + /* Priority */ PRIO_Obj_Pirateship, /* Actor SubMtd */ &daObjPirateship::Method::Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_plant.cpp b/src/d/actor/d_a_obj_plant.cpp index d787b935..026390be 100644 --- a/src/d/actor/d_a_obj_plant.cpp +++ b/src/d/actor/d_a_obj_plant.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_plant.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -75,7 +76,7 @@ actor_process_profile_definition g_profile_Obj_Plant = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0071, + /* Priority */ PRIO_Obj_Plant, /* Actor SubMtd */ &daObj_PlantMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_quake.cpp b/src/d/actor/d_a_obj_quake.cpp index 3c137431..be675b01 100644 --- a/src/d/actor/d_a_obj_quake.cpp +++ b/src/d/actor/d_a_obj_quake.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_quake.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" @@ -232,7 +233,7 @@ actor_process_profile_definition g_profile_Obj_Quake = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0014, + /* Priority */ PRIO_Obj_Quake, /* Actor SubMtd */ &daObjQuakeMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_rcloud.cpp b/src/d/actor/d_a_obj_rcloud.cpp index e8076d5c..6bd0c85f 100644 --- a/src/d/actor/d_a_obj_rcloud.cpp +++ b/src/d/actor/d_a_obj_rcloud.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_rcloud.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000E8 .text init_mtx__13daObjRcloud_cFv */ void daObjRcloud_c::init_mtx() { @@ -109,7 +110,7 @@ actor_process_profile_definition g_profile_Obj_Rcloud = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0054, + /* Priority */ PRIO_Obj_Rcloud, /* Actor SubMtd */ &l_daObjRcloud_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_rflw.cpp b/src/d/actor/d_a_obj_rflw.cpp index 15aba2b1..caaa4add 100644 --- a/src/d/actor/d_a_obj_rflw.cpp +++ b/src/d/actor/d_a_obj_rflw.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_rflw.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -75,7 +76,7 @@ actor_process_profile_definition g_profile_Obj_Rflw = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0074, + /* Priority */ PRIO_Obj_Rflw, /* Actor SubMtd */ &daObj_RflwMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_rforce.cpp b/src/d/actor/d_a_obj_rforce.cpp index a9321308..a97c4019 100644 --- a/src/d/actor/d_a_obj_rforce.cpp +++ b/src/d/actor/d_a_obj_rforce.cpp @@ -7,6 +7,7 @@ #include "d/d_bg_s_movebg_actor.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_stptetu.h" const char daObjRforce::Act_c::M_arcname[] = "StpTetu"; @@ -145,7 +146,7 @@ actor_process_profile_definition g_profile_Obj_Rforce = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x003E, + /* Priority */ PRIO_Obj_Rforce, /* Actor SubMtd */ &daObjRforce::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index c5f80df1..4252a297 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -9,6 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" #include "d/d_procname.h" +#include "d/d_priority.h" daObj_Roten_HIO_c l_HIO; @@ -196,7 +197,7 @@ actor_process_profile_definition g_profile_Obj_Roten = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01B9, + /* Priority */ PRIO_Obj_Roten, /* Actor SubMtd */ &daObj_RotenMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_search.cpp b/src/d/actor/d_a_obj_search.cpp index f3e007f5..5c59d4f5 100644 --- a/src/d/actor/d_a_obj_search.cpp +++ b/src/d/actor/d_a_obj_search.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_search.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 800FDAFC-800FDB1C .text createHeap_CB__FP10fopAc_ac_c */ static BOOL createHeap_CB(fopAc_ac_c*) { @@ -274,7 +275,7 @@ actor_process_profile_definition g_profile_OBJ_SEARCH = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01B2, + /* Priority */ PRIO_OBJ_SEARCH, /* Actor SubMtd */ &daObj_Search::Mthd::Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_shelf.cpp b/src/d/actor/d_a_obj_shelf.cpp index 1418a71e..aee52bf8 100644 --- a/src/d/actor/d_a_obj_shelf.cpp +++ b/src/d/actor/d_a_obj_shelf.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_shelf.h" #include "d/res/res_otana.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_npc_ba1.h" #include "m_Do/m_Do_mtx.h" @@ -312,7 +313,7 @@ actor_process_profile_definition g_profile_Obj_Shelf = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0017, + /* Priority */ PRIO_Obj_Shelf, /* Actor SubMtd */ &daObjShelf::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_shmrgrd.cpp b/src/d/actor/d_a_obj_shmrgrd.cpp index b8377859..83d612b5 100644 --- a/src/d/actor/d_a_obj_shmrgrd.cpp +++ b/src/d/actor/d_a_obj_shmrgrd.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_shmrgrd.h" #include "d/res/res_shmrgrd.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -646,7 +647,7 @@ actor_process_profile_definition g_profile_Obj_Shmrgrd = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x004B, + /* Priority */ PRIO_Obj_Shmrgrd, /* Actor SubMtd */ &Shmrgrd_Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_smplbg.cpp b/src/d/actor/d_a_obj_smplbg.cpp index 796b1392..3f991e33 100644 --- a/src/d/actor/d_a_obj_smplbg.cpp +++ b/src/d/actor/d_a_obj_smplbg.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_smplbg.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_qtkhd.h" @@ -179,7 +180,7 @@ actor_process_profile_definition g_profile_Obj_Smplbg = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0032, + /* Priority */ PRIO_Obj_Smplbg, /* Actor SubMtd */ &daObjSmplbg::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_stair.cpp b/src/d/actor/d_a_obj_stair.cpp index 6de2e56f..e1fb2b40 100644 --- a/src/d/actor/d_a_obj_stair.cpp +++ b/src/d/actor/d_a_obj_stair.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_stair.h" #include "d/d_bg_w.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000130 .text __ct__16daobj_stairHIO_cFv */ daobj_stairHIO_c::daobj_stairHIO_c() { @@ -95,7 +96,7 @@ actor_process_profile_definition g_profile_Obj_Stair = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x006E, + /* Priority */ PRIO_Obj_Stair, /* Actor SubMtd */ &daObj_StairMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, diff --git a/src/d/actor/d_a_obj_swflat.cpp b/src/d/actor/d_a_obj_swflat.cpp index a4169476..b354f24b 100644 --- a/src/d/actor/d_a_obj_swflat.cpp +++ b/src/d/actor/d_a_obj_swflat.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_swflat.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000138 .text __ct__17daObjSwflat_HIO_cFv */ daObjSwflat_HIO_c::daObjSwflat_HIO_c() { @@ -108,7 +109,7 @@ actor_process_profile_definition g_profile_Obj_Swflat = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0012, + /* Priority */ PRIO_Obj_Swflat, /* Actor SubMtd */ &daObjSwflat::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_swhammer.cpp b/src/d/actor/d_a_obj_swhammer.cpp index dd927418..ebdb427b 100644 --- a/src/d/actor/d_a_obj_swhammer.cpp +++ b/src/d/actor/d_a_obj_swhammer.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_swhammer.h" #include "d/res/res_mhmrsw.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -489,7 +490,7 @@ actor_process_profile_definition g_profile_Obj_Swhammer = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0082, + /* Priority */ PRIO_Obj_Swhammer, /* Actor SubMtd */ &daObjSwhammer::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_swheavy.cpp b/src/d/actor/d_a_obj_swheavy.cpp index cde664a9..1551562a 100644 --- a/src/d/actor/d_a_obj_swheavy.cpp +++ b/src/d/actor/d_a_obj_swheavy.cpp @@ -7,6 +7,7 @@ #include "d/res/res_hhbot.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_player.h" #include "weak_data_1811.h" // IWYU pragma: keep @@ -479,7 +480,7 @@ actor_process_profile_definition g_profile_Obj_Swheavy = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0011, + /* Priority */ PRIO_Obj_Swheavy, /* Actor SubMtd */ &daObjSwheavy::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_swlight.cpp b/src/d/actor/d_a_obj_swlight.cpp index 03874e38..9b772574 100644 --- a/src/d/actor/d_a_obj_swlight.cpp +++ b/src/d/actor/d_a_obj_swlight.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_swlight.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000154 .text is_switch2__Q212daObjSwlight5Act_cCFv */ void daObjSwlight::Act_c::is_switch2() const { @@ -188,7 +189,7 @@ actor_process_profile_definition g_profile_Obj_Swlight = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0013, + /* Priority */ PRIO_Obj_Swlight, /* Actor SubMtd */ &daObjSwlight::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index 169ac86c..3745d004 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -7,6 +7,7 @@ #include "d/res/res_kbota_00.h" #include "d/res/res_hhbot.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w_sv.h" #include "d/actor/d_a_player.h" @@ -823,7 +824,7 @@ actor_process_profile_definition g_profile_Obj_Swpush = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0010, + /* Priority */ PRIO_Obj_Swpush, /* Actor SubMtd */ &daObjSwpush::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index ba73f96c..27c33d6a 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_table.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000001B8 .text CreateHeap__Q210daObjTable5Act_cFv */ BOOL daObjTable::Act_c::CreateHeap() { @@ -98,7 +99,7 @@ actor_process_profile_definition g_profile_Obj_Table = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0075, + /* Priority */ PRIO_Obj_Table, /* Actor SubMtd */ &daObjTable::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_tapestry.cpp b/src/d/actor/d_a_obj_tapestry.cpp index bd3dcddf..3857a65b 100644 --- a/src/d/actor/d_a_obj_tapestry.cpp +++ b/src/d/actor/d_a_obj_tapestry.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_tapestry.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001E0 .text __ct__19daObjTapestry_HIO_cFv */ daObjTapestry_HIO_c::daObjTapestry_HIO_c() { @@ -359,7 +360,7 @@ actor_process_profile_definition g_profile_Obj_Tapestry = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0087, + /* Priority */ PRIO_Obj_Tapestry, /* Actor SubMtd */ &l_daObjTapestry_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_tenmado.cpp b/src/d/actor/d_a_obj_tenmado.cpp index de3fecfb..645fa566 100644 --- a/src/d/actor/d_a_obj_tenmado.cpp +++ b/src/d/actor/d_a_obj_tenmado.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_tenmado.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000001B4 .text CreateHeap__Q212daObjTenmado5Act_cFv */ BOOL daObjTenmado::Act_c::CreateHeap() { @@ -98,7 +99,7 @@ actor_process_profile_definition g_profile_Obj_Tenmado = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0076, + /* Priority */ PRIO_Obj_Tenmado, /* Actor SubMtd */ &daObjTenmado::Mthd_Tenmado, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_tide.cpp b/src/d/actor/d_a_obj_tide.cpp index 3c01de2f..902f7efa 100644 --- a/src/d/actor/d_a_obj_tide.cpp +++ b/src/d/actor/d_a_obj_tide.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_tide.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000644 .text CreateHeap__Q29daObjTide5Act_cFv */ BOOL daObjTide::Act_c::CreateHeap() { @@ -198,7 +199,7 @@ actor_process_profile_definition g_profile_Obj_Tide = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x009B, + /* Priority */ PRIO_Obj_Tide, /* Actor SubMtd */ &daObjTide::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index 52fab709..7ac79d5c 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_timer.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" // IWYU pragma: keep // Needed for dComIfGs_isSwitch inline definition #include "weak_data_1811.h" // IWYU pragma: keep @@ -135,7 +136,7 @@ actor_process_profile_definition g_profile_Obj_Timer = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x002A, + /* Priority */ PRIO_Obj_Timer, /* Actor SubMtd */ &daObjTimer::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_tntrap.cpp b/src/d/actor/d_a_obj_tntrap.cpp index 6eedef5f..8f72f68f 100644 --- a/src/d/actor/d_a_obj_tntrap.cpp +++ b/src/d/actor/d_a_obj_tntrap.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_tntrap.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000002AC .text chk_appear__13daObjTnTrap_cFv */ void daObjTnTrap_c::chk_appear() { @@ -189,7 +190,7 @@ actor_process_profile_definition g_profile_Obj_TnTrap = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0085, + /* Priority */ PRIO_Obj_TnTrap, /* Actor SubMtd */ &l_daObjTnTrap_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 1be42184..ad4d30bb 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -15,6 +15,7 @@ #include "d/d_s_play.h" #include "d/d_a_obj.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -1020,7 +1021,7 @@ actor_process_profile_definition g_profile_OBJ_TORIPOST = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01B3, + /* Priority */ PRIO_OBJ_TORIPOST, /* Actor SubMtd */ &daObjTpostMethodTable, /* Status */ 0x18 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_tousekiki.cpp b/src/d/actor/d_a_obj_tousekiki.cpp index 54cb75e9..3e8730f2 100644 --- a/src/d/actor/d_a_obj_tousekiki.cpp +++ b/src/d/actor/d_a_obj_tousekiki.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_tousekiki.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000010C .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -64,7 +65,7 @@ actor_process_profile_definition g_profile_Obj_Tousekiki = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01AB, + /* Priority */ PRIO_Obj_Tousekiki, /* Actor SubMtd */ &daObj_TousekikiMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_tower.cpp b/src/d/actor/d_a_obj_tower.cpp index 0015e2d1..304fd3e2 100644 --- a/src/d/actor/d_a_obj_tower.cpp +++ b/src/d/actor/d_a_obj_tower.cpp @@ -7,6 +7,7 @@ #include "d/res/res_x_tower.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ @@ -156,7 +157,7 @@ actor_process_profile_definition g_profile_Obj_Tower = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01C4, + /* Priority */ PRIO_Obj_Tower, /* Actor SubMtd */ &daObj_TowerMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_trap.cpp b/src/d/actor/d_a_obj_trap.cpp index 0c570ca0..75c33ddc 100644 --- a/src/d/actor/d_a_obj_trap.cpp +++ b/src/d/actor/d_a_obj_trap.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_trap.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000010C .text solidHeapCB__11daObjTrap_cFP10fopAc_ac_c */ void daObjTrap_c::solidHeapCB(fopAc_ac_c*) { @@ -151,7 +152,7 @@ actor_process_profile_definition g_profile_Obj_Trap = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0048, + /* Priority */ PRIO_Obj_Trap, /* Actor SubMtd */ &Trap_Mthd_Table, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_tribox.cpp b/src/d/actor/d_a_obj_tribox.cpp index 870568d7..5d973438 100644 --- a/src/d/actor/d_a_obj_tribox.cpp +++ b/src/d/actor/d_a_obj_tribox.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_tribox.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001A4 .text set_state__Q211daObjTribox5Act_cFv */ void daObjTribox::Act_c::set_state() { @@ -383,7 +384,7 @@ actor_process_profile_definition g_profile_Obj_Tribox = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0016, + /* Priority */ PRIO_Obj_Tribox, /* Actor SubMtd */ &daObjTribox::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_try.cpp b/src/d/actor/d_a_obj_try.cpp index 03aee2f9..60846944 100644 --- a/src/d/actor/d_a_obj_try.cpp +++ b/src/d/actor/d_a_obj_try.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_try.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000090 .text prm_set_swSave__Q28daObjTry5Act_cFi */ void daObjTry::Act_c::prm_set_swSave(int) { @@ -268,7 +269,7 @@ actor_process_profile_definition g_profile_Obj_Try = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0106, + /* Priority */ PRIO_Obj_Try, /* Actor SubMtd */ &daObjTry::Mthd_Table, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK8000000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_usovmc.cpp b/src/d/actor/d_a_obj_usovmc.cpp index cec29b22..926e8fdc 100644 --- a/src/d/actor/d_a_obj_usovmc.cpp +++ b/src/d/actor/d_a_obj_usovmc.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_usovmc.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_usovmc.h" const char daObjUsovmc::Act_c::M_arcname[7] = "Usovmc"; @@ -130,7 +131,7 @@ actor_process_profile_definition g_profile_Obj_Usovmc = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0023, + /* Priority */ PRIO_Obj_Usovmc, /* Actor SubMtd */ &daObjUsovmc::Mthd_Usovmc, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index 21c8f859..4e7cecdc 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -7,6 +7,7 @@ #include "d/res/res_vfan.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" namespace daObjVfan { @@ -254,7 +255,7 @@ actor_process_profile_definition g_profile_Obj_Vfan = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0020, + /* Priority */ PRIO_Obj_Vfan, /* Actor SubMtd */ &daObjVfan::Mthd_Vfan, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_vgnfd.cpp b/src/d/actor/d_a_obj_vgnfd.cpp index 58759477..9fddfe63 100644 --- a/src/d/actor/d_a_obj_vgnfd.cpp +++ b/src/d/actor/d_a_obj_vgnfd.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_vgnfd.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_vgnfd.h" #include "JSystem/JUtility/JUTAssert.h" @@ -495,7 +496,7 @@ actor_process_profile_definition g_profile_Obj_Vgnfd = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0050, + /* Priority */ PRIO_Obj_Vgnfd, /* Actor SubMtd */ &Vgnfd_Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp index 70f57163..cf09a4cf 100644 --- a/src/d/actor/d_a_obj_vmc.cpp +++ b/src/d/actor/d_a_obj_vmc.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_vmc.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_vmc.h" @@ -365,7 +366,7 @@ actor_process_profile_definition g_profile_Obj_Vmc = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0022, + /* Priority */ PRIO_Obj_Vmc, /* Actor SubMtd */ &daObjVmc::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_vmsdz.cpp b/src/d/actor/d_a_obj_vmsdz.cpp index 62693579..693d2dd3 100644 --- a/src/d/actor/d_a_obj_vmsdz.cpp +++ b/src/d/actor/d_a_obj_vmsdz.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_vmsdz.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_vmsdz.h" const char daObjVmsdz_c::M_arcname[6] = "VmsDZ"; @@ -123,7 +124,7 @@ actor_process_profile_definition g_profile_Obj_Vmsdz = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x004E, + /* Priority */ PRIO_Obj_Vmsdz, /* Actor SubMtd */ &Vmsdz_Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_vmsms.cpp b/src/d/actor/d_a_obj_vmsms.cpp index 9cdf8ac4..fdd75c4c 100644 --- a/src/d/actor/d_a_obj_vmsms.cpp +++ b/src/d/actor/d_a_obj_vmsms.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_vmsms.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_vmsms.h" const char daObjVmsms_c::M_arcname[6] = "VmsMS"; @@ -132,7 +133,7 @@ actor_process_profile_definition g_profile_Obj_Vmsms = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x004D, + /* Priority */ PRIO_Obj_Vmsms, /* Actor SubMtd */ &Vmsms_Mthd_Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_volcano.cpp b/src/d/actor/d_a_obj_volcano.cpp index 4e5078a6..081e3f1a 100644 --- a/src/d/actor/d_a_obj_volcano.cpp +++ b/src/d/actor/d_a_obj_volcano.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_volcano.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000003CC .text StartFire__Q212daObjVolcano5Act_cFv */ void daObjVolcano::Act_c::StartFire() { @@ -153,7 +154,7 @@ actor_process_profile_definition g_profile_Obj_Volcano = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x001F, + /* Priority */ PRIO_Obj_Volcano, /* Actor SubMtd */ &daObjVolcano::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_vtil.cpp b/src/d/actor/d_a_obj_vtil.cpp index e07b7aa9..a8c11377 100644 --- a/src/d/actor/d_a_obj_vtil.cpp +++ b/src/d/actor/d_a_obj_vtil.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_vtil.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text solidHeapCB__11daObjVtil_cFP10fopAc_ac_c */ void daObjVtil_c::solidHeapCB(fopAc_ac_c*) { @@ -216,7 +217,7 @@ actor_process_profile_definition g_profile_Obj_Vtil = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0107, + /* Priority */ PRIO_Obj_Vtil, /* Actor SubMtd */ &Vtil_Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_vyasi.cpp b/src/d/actor/d_a_obj_vyasi.cpp index dfca72c1..7471d2f7 100644 --- a/src/d/actor/d_a_obj_vyasi.cpp +++ b/src/d/actor/d_a_obj_vyasi.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_obj_vyasi.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000015C .text SetStopJointAnimation__Q210daObjVyasi5Act_cFP18J3DAnmTransformKeyff */ void daObjVyasi::Act_c::SetStopJointAnimation(J3DAnmTransformKey*, float, float) { @@ -188,7 +189,7 @@ actor_process_profile_definition g_profile_Obj_Vyasi = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0046, + /* Priority */ PRIO_Obj_Vyasi, /* Actor SubMtd */ &daObjVyasi::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp index b2bacd9f..522bf439 100644 --- a/src/d/actor/d_a_obj_warpt.cpp +++ b/src/d/actor/d_a_obj_warpt.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_warpt.h" #include "d/d_bg_w.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000190 .text __ct__17daObj_Warpt_HIO_cFv */ daObj_Warpt_HIO_c::daObj_Warpt_HIO_c() { @@ -245,7 +246,7 @@ actor_process_profile_definition g_profile_OBJ_WARPT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01B1, + /* Priority */ PRIO_OBJ_WARPT, /* Actor SubMtd */ &daObj_WarptMethodTable, /* Status */ 0x17 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_wood.cpp b/src/d/actor/d_a_obj_wood.cpp index ec64a6d5..5a32c991 100644 --- a/src/d/actor/d_a_obj_wood.cpp +++ b/src/d/actor/d_a_obj_wood.cpp @@ -7,6 +7,7 @@ #include "d/d_wood.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" cPhs_State daObjWood::Act_c::_create() { @@ -72,7 +73,7 @@ actor_process_profile_definition g_profile_Obj_Wood = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0110, + /* Priority */ PRIO_Obj_Wood, /* Actor SubMtd */ &daObjWood::Method::Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_xfuta.cpp b/src/d/actor/d_a_obj_xfuta.cpp index 6e7ababa..0d1ec814 100644 --- a/src/d/actor/d_a_obj_xfuta.cpp +++ b/src/d/actor/d_a_obj_xfuta.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_xfuta.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "dolphin/types.h" namespace daObjXfuta { @@ -143,7 +144,7 @@ actor_process_profile_definition g_profile_Obj_Xfuta = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x003D, + /* Priority */ PRIO_Obj_Xfuta, /* Actor SubMtd */ &daObjXfuta::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index 4e17511f..95bb37fb 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "JSystem/JUtility/JUTAssert.h" @@ -363,7 +364,7 @@ actor_process_profile_definition g_profile_Obj_Zouk = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00FA, + /* Priority */ PRIO_Obj_Zouk, /* Actor SubMtd */ &daObjZouk::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_oq.cpp b/src/d/actor/d_a_oq.cpp index 5039f57b..d5d6f6f9 100644 --- a/src/d/actor/d_a_oq.cpp +++ b/src/d/actor/d_a_oq.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_oq.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000208 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -130,7 +131,7 @@ actor_process_profile_definition g_profile_OQ = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00D7, + /* Priority */ PRIO_OQ, /* Actor SubMtd */ &l_daOQ_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp index 2c0d218c..3307377a 100644 --- a/src/d/actor/d_a_oship.cpp +++ b/src/d/actor/d_a_oship.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_oship.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000234 .text __ct__13daOship_HIO_cFv */ daOship_HIO_c::daOship_HIO_c() { @@ -254,7 +255,7 @@ actor_process_profile_definition g_profile_OSHIP = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x009D, + /* Priority */ PRIO_OSHIP, /* Actor SubMtd */ &daOshipMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index 68a74227..b6ee509b 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_pedestal.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_hdai1.h" #include "weak_data_1811.h" // IWYU pragma: keep @@ -484,7 +485,7 @@ actor_process_profile_definition g_profile_PEDESTAL = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0091, + /* Priority */ PRIO_PEDESTAL, /* Actor SubMtd */ &daPedestal::daActMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_ph.cpp b/src/d/actor/d_a_ph.cpp index 1b2056b8..57e74679 100644 --- a/src/d/actor/d_a_ph.cpp +++ b/src/d/actor/d_a_ph.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_ph.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000158 .text nodeCallBack_UP__FP7J3DNodei */ static BOOL nodeCallBack_UP(J3DNode*, int) { @@ -189,7 +190,7 @@ actor_process_profile_definition g_profile_PH = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00C4, + /* Priority */ PRIO_PH, /* Actor SubMtd */ &l_daPH_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp index 80ae6054..ee7845c0 100644 --- a/src/d/actor/d_a_pirate_flag.cpp +++ b/src/d/actor/d_a_pirate_flag.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_pirate_flag.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/res/res_kaizokusen.h" #include "d/res/res_cloth.h" #include "d/actor/d_a_obj_pirateship.h" @@ -545,7 +546,7 @@ actor_process_profile_definition g_profile_PIRATE_FLAG = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x006A, + /* Priority */ PRIO_PIRATE_FLAG, /* Actor SubMtd */ &l_daPirate_Flag_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 4093ebe1..8ae11fcc 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -18,6 +18,7 @@ #include "d/d_kankyo_wether.h" #include "d/d_path.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_kankyo.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JUtility/JUTAssert.h" @@ -13084,7 +13085,7 @@ actor_process_profile_definition2 g_profile_PLAYER = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0068, + /* Priority */ PRIO_PLAYER, /* Actor SubMtd */ (actor_method_class*)&l_daPy_Method, /* Status */ fopAcStts_FREEZE_e, /* Group */ fopAc_PLAYER_e, diff --git a/src/d/actor/d_a_pt.cpp b/src/d/actor/d_a_pt.cpp index 0e918295..6771c73e 100644 --- a/src/d/actor/d_a_pt.cpp +++ b/src/d/actor/d_a_pt.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_pt.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000110 .text __ct__10daPt_HIO_cFv */ daPt_HIO_c::daPt_HIO_c() { @@ -134,7 +135,7 @@ actor_process_profile_definition g_profile_PT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00EC, + /* Priority */ PRIO_PT, /* Actor SubMtd */ &l_daPt_Method, /* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index 6056148a..512b01a6 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -10,6 +10,7 @@ #include "d/res/res_pw.h" #include "d/d_kankyo_rain.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_camera.h" #include "f_pc/f_pc_manager.h" @@ -505,7 +506,7 @@ actor_process_profile_definition g_profile_PW = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00C7, + /* Priority */ PRIO_PW, /* Actor SubMtd */ &l_daPW_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_pz.cpp b/src/d/actor/d_a_pz.cpp index abacd8bf..eeb8cdda 100644 --- a/src/d/actor/d_a_pz.cpp +++ b/src/d/actor/d_a_pz.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_pz.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000310 .text __ct__10daPz_HIO_cFv */ daPz_HIO_c::daPz_HIO_c() { @@ -414,7 +415,7 @@ actor_process_profile_definition g_profile_PZ = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00C5, + /* Priority */ PRIO_PZ, /* Actor SubMtd */ &daPzMethodTable, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp index 89cc614a..0503f32c 100644 --- a/src/d/actor/d_a_race_item.cpp +++ b/src/d/actor/d_a_race_item.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_sea.h" #include "d/d_item_data.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_player_main.h" #include "m_Do/m_Do_mtx.h" @@ -282,7 +283,7 @@ actor_process_profile_definition g_profile_RACEITEM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00FD, + /* Priority */ PRIO_RACEITEM, /* Actor SubMtd */ &l_daRaceItem_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index adb0886d..d6364e7d 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_rd.h" #include "d/res/res_rd.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -1886,7 +1887,7 @@ actor_process_profile_definition g_profile_RD = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00D4, + /* Priority */ PRIO_RD, /* Actor SubMtd */ &daRdMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_rectangle.cpp b/src/d/actor/d_a_rectangle.cpp index 22096bb4..e3464f45 100644 --- a/src/d/actor/d_a_rectangle.cpp +++ b/src/d/actor/d_a_rectangle.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_rectangle.h" #include "f_op/f_op_actor.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "SSystem/SComponent/c_phase.h" /* 00000078-00000080 .text daRct_Draw__FP15RECTANGLE_class */ @@ -51,7 +52,7 @@ actor_process_profile_definition g_profile_RECTANGLE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x009F, + /* Priority */ PRIO_RECTANGLE, /* Actor SubMtd */ &l_daRct_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp index a61b40ff..9315b4c6 100644 --- a/src/d/actor/d_a_sail.cpp +++ b/src/d/actor/d_a_sail.cpp @@ -7,6 +7,7 @@ #include "d/res/res_kaizokusen.h" #include "d/res/res_cloth.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" #include "d/actor/d_a_obj_pirateship.h" @@ -827,7 +828,7 @@ actor_process_profile_definition g_profile_SAIL = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0069, + /* Priority */ PRIO_SAIL, /* Actor SubMtd */ &l_daSail_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_saku.cpp b/src/d/actor/d_a_saku.cpp index 542d5ea5..94c83c66 100644 --- a/src/d/actor/d_a_saku.cpp +++ b/src/d/actor/d_a_saku.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_saku.h" #include "d/d_procname.h" +#include "d/d_priority.h" class J3DModelData; class J3DMaterial; @@ -172,7 +173,7 @@ actor_process_profile_definition g_profile_SAKU = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0186, + /* Priority */ PRIO_SAKU, /* Actor SubMtd */ &l_daSaku_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp index bc227e1e..0d237cba 100644 --- a/src/d/actor/d_a_salvage.cpp +++ b/src/d/actor/d_a_salvage.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_salvage.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -184,7 +185,7 @@ actor_process_profile_definition g_profile_Salvage = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0189, + /* Priority */ PRIO_Salvage, /* Actor SubMtd */ &daSalvageMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_salvage_tbox.cpp b/src/d/actor/d_a_salvage_tbox.cpp index 2e6a3bd2..83c2abee 100644 --- a/src/d/actor/d_a_salvage_tbox.cpp +++ b/src/d/actor/d_a_salvage_tbox.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_salvage_tbox.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000128 .text getMaxWaterY__25daSTBox_shadowEcallBack_cFPQ29JGeometry8TVec3<f> */ void daSTBox_shadowEcallBack_c::getMaxWaterY(JGeometry::TVec3<float>*) { @@ -154,7 +155,7 @@ actor_process_profile_definition g_profile_SALVAGE_TBOX = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x018A, + /* Priority */ PRIO_SALVAGE_TBOX, /* Actor SubMtd */ &daSTBoxMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_sbox.cpp b/src/d/actor/d_a_sbox.cpp index d7f6789e..bc8cdeda 100644 --- a/src/d/actor/d_a_sbox.cpp +++ b/src/d/actor/d_a_sbox.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_sbox.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -154,7 +155,7 @@ actor_process_profile_definition g_profile_SBOX = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0114, + /* Priority */ PRIO_SBOX, /* Actor SubMtd */ &l_daSbox_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_scene_change.cpp b/src/d/actor/d_a_scene_change.cpp index 51054dc8..7d9a2e5c 100644 --- a/src/d/actor/d_a_scene_change.cpp +++ b/src/d/actor/d_a_scene_change.cpp @@ -8,6 +8,7 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" #include "d/d_procname.h" +#include "d/d_priority.h" static daSceneChgHIO_c l_HIO; @@ -69,7 +70,7 @@ actor_process_profile_definition g_profile_SCENECHG = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01A1, + /* Priority */ PRIO_SCENECHG, /* Actor SubMtd */ &daSceneChgMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp index 727c87d0..ab77ab13 100644 --- a/src/d/actor/d_a_sea.cpp +++ b/src/d/actor/d_a_sea.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_sea.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_stage.h" #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_graphic.h" @@ -1194,7 +1195,7 @@ actor_process_profile_definition g_profile_SEA = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x009A, + /* Priority */ PRIO_SEA, /* Actor SubMtd */ &l_daSea_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_seatag.cpp b/src/d/actor/d_a_seatag.cpp index d2fe72d3..ed2d5a0f 100644 --- a/src/d/actor/d_a_seatag.cpp +++ b/src/d/actor/d_a_seatag.cpp @@ -4,6 +4,7 @@ #include "d/actor/d_a_seatag.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000080 .text daSeatag_Draw__FP10daSeatag_c */ static BOOL daSeatag_Draw(daSeatag_c*) { @@ -50,7 +51,7 @@ actor_process_profile_definition g_profile_SEATAG = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01DF, + /* Priority */ PRIO_SEATAG, /* Actor SubMtd */ &l_daSeatag_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_shand.cpp b/src/d/actor/d_a_shand.cpp index fb7028ac..b02a93a0 100644 --- a/src/d/actor/d_a_shand.cpp +++ b/src/d/actor/d_a_shand.cpp @@ -10,6 +10,7 @@ #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_s_play.h" bool hio_set; @@ -531,7 +532,7 @@ actor_process_profile_definition g_profile_SHAND = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0095, + /* Priority */ PRIO_SHAND, /* Actor SubMtd */ &l_daShand_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index f4b012a6..fc52ed1f 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_ship.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" #include "d/d_drawlist.h" @@ -4709,7 +4710,7 @@ actor_process_profile_definition g_profile_SHIP = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x009C, + /* Priority */ PRIO_SHIP, /* Actor SubMtd */ &l_daShip_Method, /* Status */ 0x02 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 08da9959..c0b3f2fd 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_shop_item.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/d_item.h" @@ -285,7 +286,7 @@ actor_process_profile_definition g_profile_ShopItem = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00FE, + /* Priority */ PRIO_ShopItem, /* Actor SubMtd */ &daShopItemMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_shutter.cpp b/src/d/actor/d_a_shutter.cpp index cfa8f92e..84ac1ed8 100644 --- a/src/d/actor/d_a_shutter.cpp +++ b/src/d/actor/d_a_shutter.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_shutter.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_htobi1.h" #include "d/res/res_htobi2.h" @@ -320,7 +321,7 @@ actor_process_profile_definition g_profile_SHUTTER = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01BA, + /* Priority */ PRIO_SHUTTER, /* Actor SubMtd */ &daShutterMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_shutter2.cpp b/src/d/actor/d_a_shutter2.cpp index 3c69b823..af4495a1 100644 --- a/src/d/actor/d_a_shutter2.cpp +++ b/src/d/actor/d_a_shutter2.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_shutter2.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_htobi3.h" @@ -257,7 +258,7 @@ actor_process_profile_definition g_profile_SHUTTER2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01BB, + /* Priority */ PRIO_SHUTTER2, /* Actor SubMtd */ &daShutter2MethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_sie_flag.cpp b/src/d/actor/d_a_sie_flag.cpp index a9ef6925..5c889625 100644 --- a/src/d/actor/d_a_sie_flag.cpp +++ b/src/d/actor/d_a_sie_flag.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_sie_flag.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000118 .text __ct__16daSie_Flag_HIO_cFv */ daSie_Flag_HIO_c::daSie_Flag_HIO_c() { @@ -94,7 +95,7 @@ actor_process_profile_definition g_profile_Sie_Flag = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x006D, + /* Priority */ PRIO_Sie_Flag, /* Actor SubMtd */ &daSie_FlagMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_sitem.cpp b/src/d/actor/d_a_sitem.cpp index b3e00b9b..0ff8ed67 100644 --- a/src/d/actor/d_a_sitem.cpp +++ b/src/d/actor/d_a_sitem.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_sitem.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001FC .text hand_draw__FP11sitem_class */ void hand_draw(sitem_class*) { @@ -104,7 +105,7 @@ actor_process_profile_definition g_profile_SITEM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00F3, + /* Priority */ PRIO_SITEM, /* Actor SubMtd */ &l_daSitem_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_sk.cpp b/src/d/actor/d_a_sk.cpp index 9d9d2627..9f10d979 100644 --- a/src/d/actor/d_a_sk.cpp +++ b/src/d/actor/d_a_sk.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_sk.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000240 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -70,7 +71,7 @@ actor_process_profile_definition g_profile_SK = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0097, + /* Priority */ PRIO_SK, /* Actor SubMtd */ &l_daSk_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_sk2.cpp b/src/d/actor/d_a_sk2.cpp index f0eb0d99..bdd94bdc 100644 --- a/src/d/actor/d_a_sk2.cpp +++ b/src/d/actor/d_a_sk2.cpp @@ -7,6 +7,7 @@ #include "m_Do/m_Do_ext.h" #include "d/d_bg_w_sv.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000194 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -66,7 +67,7 @@ actor_process_profile_definition g_profile_SK2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0098, + /* Priority */ PRIO_SK2, /* Actor SubMtd */ &l_daSk2_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp index 452d310c..9c92e800 100644 --- a/src/d/actor/d_a_spc_item01.cpp +++ b/src/d/actor/d_a_spc_item01.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_spc_item01.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_bg_s_acch.h" #include "d/d_com_inf_game.h" @@ -288,7 +289,7 @@ actor_process_profile_definition g_profile_SPC_ITEM01 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0100, + /* Priority */ PRIO_SPC_ITEM01, /* Actor SubMtd */ &l_daSpcItem01_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_spotbox.cpp b/src/d/actor/d_a_spotbox.cpp index 0bd39f2d..d2b859e8 100644 --- a/src/d/actor/d_a_spotbox.cpp +++ b/src/d/actor/d_a_spotbox.cpp @@ -8,6 +8,7 @@ #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" #include "d/d_procname.h" +#include "d/d_priority.h" cPhs_State daSpotbox_c::create() { fopAcM_SetupActor(this, daSpotbox_c); @@ -82,7 +83,7 @@ actor_process_profile_definition g_profile_SPOTBOX = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01C9, + /* Priority */ PRIO_SPOTBOX, /* Actor SubMtd */ &l_daSpotbox_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_ss.cpp b/src/d/actor/d_a_ss.cpp index f6bec06d..a78c6ceb 100644 --- a/src/d/actor/d_a_ss.cpp +++ b/src/d/actor/d_a_ss.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_ss.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001DC .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -100,7 +101,7 @@ actor_process_profile_definition g_profile_SS = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00F1, + /* Priority */ PRIO_SS, /* Actor SubMtd */ &l_daSs_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_ssk.cpp b/src/d/actor/d_a_ssk.cpp index 471f1d2e..ea09aa1b 100644 --- a/src/d/actor/d_a_ssk.cpp +++ b/src/d/actor/d_a_ssk.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_ssk.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000194 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -75,7 +76,7 @@ actor_process_profile_definition g_profile_SSK = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0099, + /* Priority */ PRIO_SSK, /* Actor SubMtd */ &l_daSsk_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_sss.cpp b/src/d/actor/d_a_sss.cpp index 64f779c6..d7f521f1 100644 --- a/src/d/actor/d_a_sss.cpp +++ b/src/d/actor/d_a_sss.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_sss.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000001F0 .text hand_draw__FP9sss_class */ void hand_draw(sss_class*) { @@ -114,7 +115,7 @@ actor_process_profile_definition g_profile_SSS = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00F2, + /* Priority */ PRIO_SSS, /* Actor SubMtd */ &l_daSss_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_st.cpp b/src/d/actor/d_a_st.cpp index 34351e76..d6811d8c 100644 --- a/src/d/actor/d_a_st.cpp +++ b/src/d/actor/d_a_st.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_st.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000005B4 .text smoke_set_s__FP8st_classf */ void smoke_set_s(st_class*, float) { @@ -219,7 +220,7 @@ actor_process_profile_definition g_profile_ST = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00B1, + /* Priority */ PRIO_ST, /* Actor SubMtd */ &l_daSt_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_steam_tag.cpp b/src/d/actor/d_a_steam_tag.cpp index dafeb5ae..c811c9a4 100644 --- a/src/d/actor/d_a_steam_tag.cpp +++ b/src/d/actor/d_a_steam_tag.cpp @@ -10,6 +10,7 @@ #include "d/d_item.h" #include "d/d_item_data.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "dolphin/mtx/vec.h" static dCcD_SrcCps l_cps_src = { @@ -237,7 +238,7 @@ actor_process_profile_definition g_profile_SteamTag = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0191, + /* Priority */ PRIO_SteamTag, /* Actor SubMtd */ &l_daSteamTag_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_stone.cpp b/src/d/actor/d_a_stone.cpp index 05bf3ad0..10e8f972 100644 --- a/src/d/actor/d_a_stone.cpp +++ b/src/d/actor/d_a_stone.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_stone.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000110 .text CreateHeapCB__7daStoneFP10fopAc_ac_c */ BOOL daStone::CreateHeapCB(fopAc_ac_c*) { @@ -254,7 +255,7 @@ actor_process_profile_definition g_profile_STONE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0104, + /* Priority */ PRIO_STONE, /* Actor SubMtd */ &daStone::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_stone2.cpp b/src/d/actor/d_a_stone2.cpp index c0b3c842..91216441 100644 --- a/src/d/actor/d_a_stone2.cpp +++ b/src/d/actor/d_a_stone2.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_stone2.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000208 .text __ct__Q28daStone25Act_cFv */ daStone2::Act_c::Act_c() { @@ -288,7 +289,7 @@ actor_process_profile_definition g_profile_Stone2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0105, + /* Priority */ PRIO_Stone2, /* Actor SubMtd */ &daStone2::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_swattack.cpp b/src/d/actor/d_a_swattack.cpp index f668edff..02f3e652 100644 --- a/src/d/actor/d_a_swattack.cpp +++ b/src/d/actor/d_a_swattack.cpp @@ -8,6 +8,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf @@ -169,7 +170,7 @@ actor_process_profile_definition g_profile_SW_ATTACK = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0139, + /* Priority */ PRIO_SW_ATTACK, /* Actor SubMtd */ &daSwAtMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index b6afa131..a27ae5a4 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_swc00.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" /* 00000078-00000180 .text daSwc00_Execute__FP11swc00_class */ @@ -84,7 +85,7 @@ actor_process_profile_definition g_profile_SWC00 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x011A, + /* Priority */ PRIO_SWC00, /* Actor SubMtd */ &l_daSwc00_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 5e6aef9c..2307a8a8 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_swhit0.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "m_Do/m_Do_mtx.h" @@ -487,7 +488,7 @@ actor_process_profile_definition g_profile_SWHIT0 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0119, + /* Priority */ PRIO_SWHIT0, /* Actor SubMtd */ &l_daSwhit0_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp index e76ba775..9b2138bb 100644 --- a/src/d/actor/d_a_switem.cpp +++ b/src/d/actor/d_a_switem.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_switem.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" @@ -220,7 +221,7 @@ actor_process_profile_definition g_profile_SW_ITEM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x013A, + /* Priority */ PRIO_SW_ITEM, /* Actor SubMtd */ &daSwItemMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_swpropeller.cpp b/src/d/actor/d_a_swpropeller.cpp index c8935106..ef51a17a 100644 --- a/src/d/actor/d_a_swpropeller.cpp +++ b/src/d/actor/d_a_swpropeller.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_swpropeller.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000B8 .text _delete__10daSwProp_cFv */ bool daSwProp_c::_delete() { @@ -95,7 +96,7 @@ actor_process_profile_definition g_profile_SW_PROPELLER = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0199, + /* Priority */ PRIO_SW_PROPELLER, /* Actor SubMtd */ &daSwPropMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp index ac83c107..3bf15fb0 100644 --- a/src/d/actor/d_a_swtact.cpp +++ b/src/d/actor/d_a_swtact.cpp @@ -8,6 +8,7 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/actor/d_a_player.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -222,7 +223,7 @@ actor_process_profile_definition g_profile_SW_TACT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x013B, + /* Priority */ PRIO_SW_TACT, /* Actor SubMtd */ &daSwTactMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp index 0b38252f..57083e7c 100644 --- a/src/d/actor/d_a_swtdoor.cpp +++ b/src/d/actor/d_a_swtdoor.cpp @@ -8,6 +8,7 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" #include "SSystem/SComponent/c_lib.h" @@ -102,7 +103,7 @@ actor_process_profile_definition g_profile_SWTDOOR = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00ED, + /* Priority */ PRIO_SWTDOOR, /* Actor SubMtd */ &l_daSwtdoor_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp index d64abfff..4239f7a2 100644 --- a/src/d/actor/d_a_syan.cpp +++ b/src/d/actor/d_a_syan.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_syan.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/res/res_syan.h" @@ -249,7 +250,7 @@ actor_process_profile_definition g_profile_SYAN = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00EF, + /* Priority */ PRIO_SYAN, /* Actor SubMtd */ &l_daSyan_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp index 4b9bcd12..e3cc4697 100644 --- a/src/d/actor/d_a_tag_attention.cpp +++ b/src/d/actor/d_a_tag_attention.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tag_attention.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000188 .text _create__Q214daTagAttention5Act_cFv */ cPhs_State daTagAttention::Act_c::_create() { @@ -63,7 +64,7 @@ actor_process_profile_definition g_profile_Tag_Attention = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0064, + /* Priority */ PRIO_Tag_Attention, /* Actor SubMtd */ &daTagAttention::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_ba1.cpp b/src/d/actor/d_a_tag_ba1.cpp index 22d45f92..9831ac38 100644 --- a/src/d/actor/d_a_tag_ba1.cpp +++ b/src/d/actor/d_a_tag_ba1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tag_ba1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000144 .text __ct__15daTag_Ba1_HIO_cFv */ daTag_Ba1_HIO_c::daTag_Ba1_HIO_c() { @@ -99,7 +100,7 @@ actor_process_profile_definition g_profile_TAG_BA1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x012A, + /* Priority */ PRIO_TAG_BA1, /* Actor SubMtd */ &l_daTag_Ba1_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_etc.cpp b/src/d/actor/d_a_tag_etc.cpp index 6ded4be1..490a63fe 100644 --- a/src/d/actor/d_a_tag_etc.cpp +++ b/src/d/actor/d_a_tag_etc.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_md.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" enum Action { ACT_WAIT, @@ -259,7 +260,7 @@ actor_process_profile_definition g_profile_TAG_ETC = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0122, + /* Priority */ PRIO_TAG_ETC, /* Actor SubMtd */ &l_daTag_Etc_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index 78a62226..68cd7c62 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tag_event.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_bk.h" #include "d/actor/d_a_dr.h" @@ -571,7 +572,7 @@ actor_process_profile_definition g_profile_TAG_EVENT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x011E, + /* Priority */ PRIO_TAG_EVENT, /* Actor SubMtd */ &l_daTag_Event_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_evsw.cpp b/src/d/actor/d_a_tag_evsw.cpp index e3f43366..0ca7ea5b 100644 --- a/src/d/actor/d_a_tag_evsw.cpp +++ b/src/d/actor/d_a_tag_evsw.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tag_evsw.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" /* 00000078-000001F8 .text _create__Q29daTagEvsw5Act_cFv */ @@ -99,7 +100,7 @@ actor_process_profile_definition g_profile_TAG_EVSW = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0062, + /* Priority */ PRIO_TAG_EVSW, /* Actor SubMtd */ &daTagEvsw::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp index ed266bf6..cd1069f0 100644 --- a/src/d/actor/d_a_tag_ghostship.cpp +++ b/src/d/actor/d_a_tag_ghostship.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_tag_ghostship.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "weak_data_1811.h" // IWYU pragma: keep @@ -175,7 +176,7 @@ actor_process_profile_definition g_profile_TAG_GSHIP = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0066, + /* Priority */ PRIO_TAG_GSHIP, /* Actor SubMtd */ &daTag_GshipMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_hint.cpp b/src/d/actor/d_a_tag_hint.cpp index 2a5f2912..f4179a31 100644 --- a/src/d/actor/d_a_tag_hint.cpp +++ b/src/d/actor/d_a_tag_hint.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tag_hint.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-000000F8 .text getEventNo__12daTag_Hint_cFv */ void daTag_Hint_c::getEventNo() { @@ -209,7 +210,7 @@ actor_process_profile_definition g_profile_TAG_HINT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0120, + /* Priority */ PRIO_TAG_HINT, /* Actor SubMtd */ &l_daTag_Hint_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp index 4bf1cd60..2c6d108f 100644 --- a/src/d/actor/d_a_tag_island.cpp +++ b/src/d/actor/d_a_tag_island.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_player_main.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" static fpc_ProcID l_msgId; static msg_class* l_msg; @@ -537,7 +538,7 @@ actor_process_profile_definition g_profile_TAG_ISLAND = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0123, + /* Priority */ PRIO_TAG_ISLAND, /* Actor SubMtd */ &l_daTag_Island_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp index 76cfcf70..adc5b062 100644 --- a/src/d/actor/d_a_tag_kb_item.cpp +++ b/src/d/actor/d_a_tag_kb_item.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_tag_kb_item.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000C8 .text _delete__13daTagKbItem_cFv */ bool daTagKbItem_c::_delete() { @@ -102,7 +103,7 @@ actor_process_profile_definition g_profile_TAG_KB_ITEM = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0127, + /* Priority */ PRIO_TAG_KB_ITEM, /* Actor SubMtd */ &daTagKbItemMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_kf1.cpp b/src/d/actor/d_a_tag_kf1.cpp index 624e405b..e941aadf 100644 --- a/src/d/actor/d_a_tag_kf1.cpp +++ b/src/d/actor/d_a_tag_kf1.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tag_kf1.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000120 .text __ct__15daTag_Kf1_HIO_cFv */ daTag_Kf1_HIO_c::daTag_Kf1_HIO_c() { @@ -184,7 +185,7 @@ actor_process_profile_definition g_profile_TAG_KF1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0124, + /* Priority */ PRIO_TAG_KF1, /* Actor SubMtd */ &l_daTag_Kf1_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_kk1.cpp b/src/d/actor/d_a_tag_kk1.cpp index 0e171ca8..ec963042 100644 --- a/src/d/actor/d_a_tag_kk1.cpp +++ b/src/d/actor/d_a_tag_kk1.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_tag_kk1.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" static daTag_Kk1_HIO_c l_HIO; @@ -137,7 +138,7 @@ actor_process_profile_definition g_profile_TAG_KK1 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0125, + /* Priority */ PRIO_TAG_KK1, /* Actor SubMtd */ &l_daTag_Kk1_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_light.cpp b/src/d/actor/d_a_tag_light.cpp index 9157ddf2..32b1223e 100644 --- a/src/d/actor/d_a_tag_light.cpp +++ b/src/d/actor/d_a_tag_light.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tag_light.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000D0 .text get_cc_r__Q210daTagLight5Act_cCFv */ void daTagLight::Act_c::get_cc_r() const { @@ -143,7 +144,7 @@ actor_process_profile_definition g_profile_Tag_Light = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0063, + /* Priority */ PRIO_Tag_Light, /* Actor SubMtd */ &daTagLight::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_md_cb.cpp b/src/d/actor/d_a_tag_md_cb.cpp index 1dc0370e..1f0df82c 100644 --- a/src/d/actor/d_a_tag_md_cb.cpp +++ b/src/d/actor/d_a_tag_md_cb.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tag_md_cb.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000160 .text __ct__16daTag_MdCb_HIO_cFv */ daTag_MdCb_HIO_c::daTag_MdCb_HIO_c() { @@ -199,7 +200,7 @@ actor_process_profile_definition g_profile_TAG_MDCB = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0129, + /* Priority */ PRIO_TAG_MDCB, /* Actor SubMtd */ &l_daTag_MdCb_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_mk.cpp b/src/d/actor/d_a_tag_mk.cpp index 608036b0..463df6c0 100644 --- a/src/d/actor/d_a_tag_mk.cpp +++ b/src/d/actor/d_a_tag_mk.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tag_mk.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000084 .text getSwbit__10daTag_Mk_cFv */ void daTag_Mk_c::getSwbit() { @@ -204,7 +205,7 @@ actor_process_profile_definition g_profile_TAG_MK = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x011F, + /* Priority */ PRIO_TAG_MK, /* Actor SubMtd */ &l_daTag_Mk_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index afa48492..322fff5f 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_player_main.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "weak_bss_936_to_1036.h" // IWYU pragma: keep @@ -297,7 +298,7 @@ actor_process_profile_definition g_profile_TAG_MSG = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0121, + /* Priority */ PRIO_TAG_MSG, /* Actor SubMtd */ &l_daTag_Msg_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_photo.cpp b/src/d/actor/d_a_tag_photo.cpp index 2beef597..cd94b303 100644 --- a/src/d/actor/d_a_tag_photo.cpp +++ b/src/d/actor/d_a_tag_photo.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tag_photo.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000D0 .text __ct__12daTagPhoto_cFv */ daTagPhoto_c::daTagPhoto_c() { @@ -169,7 +170,7 @@ actor_process_profile_definition g_profile_TAG_PHOTO = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0126, + /* Priority */ PRIO_TAG_PHOTO, /* Actor SubMtd */ &daTagPhotoMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp index 70037b19..a7e3f47d 100644 --- a/src/d/actor/d_a_tag_ret.cpp +++ b/src/d/actor/d_a_tag_ret.cpp @@ -8,6 +8,7 @@ #include "d/d_item_data.h" #include "d/d_cc_d.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player_main.h" @@ -137,7 +138,7 @@ actor_process_profile_definition g_profile_Tag_Ret = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x005F, + /* Priority */ PRIO_Tag_Ret, /* Actor SubMtd */ &daTagRet::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_so.cpp b/src/d/actor/d_a_tag_so.cpp index 645331c8..7a12dfc5 100644 --- a/src/d/actor/d_a_tag_so.cpp +++ b/src/d/actor/d_a_tag_so.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_tag_so.h" #include "d/d_lib.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000010C .text __ct__14daTag_So_HIO_cFv */ daTag_So_HIO_c::daTag_So_HIO_c() { @@ -107,7 +108,7 @@ actor_process_profile_definition g_profile_TAG_SO = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0065, + /* Priority */ PRIO_TAG_SO, /* Actor SubMtd */ &daTag_SoMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_volcano.cpp b/src/d/actor/d_a_tag_volcano.cpp index 903bccc0..e8557815 100644 --- a/src/d/actor/d_a_tag_volcano.cpp +++ b/src/d/actor/d_a_tag_volcano.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_tag_volcano.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" namespace daTagvolcano { namespace { @@ -226,7 +227,7 @@ actor_process_profile_definition g_profile_Tag_Volcano = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0061, + /* Priority */ PRIO_Tag_Volcano, /* Actor SubMtd */ &daTagvolcano::Mthd_Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tag_waterlevel.cpp b/src/d/actor/d_a_tag_waterlevel.cpp index 2acb787a..4e7dfe1f 100644 --- a/src/d/actor/d_a_tag_waterlevel.cpp +++ b/src/d/actor/d_a_tag_waterlevel.cpp @@ -7,6 +7,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "SSystem/SComponent/c_lib.h" namespace daTagWaterlevel { @@ -152,7 +153,7 @@ actor_process_profile_definition g_profile_Tag_Waterlevel = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0128, + /* Priority */ PRIO_Tag_Waterlevel, /* Actor SubMtd */ &daTagWaterlevel::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tama.cpp b/src/d/actor/d_a_tama.cpp index 3e059881..15c813da 100644 --- a/src/d/actor/d_a_tama.cpp +++ b/src/d/actor/d_a_tama.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_tama.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_npc.h" static dCcD_SrcSph l_sph_src = { @@ -155,7 +156,7 @@ actor_process_profile_definition g_profile_TAMA = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x012C, + /* Priority */ PRIO_TAMA, /* Actor SubMtd */ &l_daTama_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 4f9dca7b..3d345118 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -13,6 +13,7 @@ #include "d/d_kankyo.h" #include "d/d_particle.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_graphic.h" @@ -1306,7 +1307,7 @@ actor_process_profile_definition g_profile_TBOX = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0113, + /* Priority */ PRIO_TBOX, /* Actor SubMtd */ &l_daTbox_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index c5c0f063..dbd48105 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_title.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_overlap_mng.h" #include "f_op/f_op_scene_mng.h" #include "m_Do/m_Do_controller_pad.h" @@ -590,7 +591,7 @@ actor_process_profile_definition g_profile_TITLE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x000A, + /* Priority */ PRIO_TITLE, /* Actor SubMtd */ &l_daTitle_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp index f581f8fd..2163cc11 100644 --- a/src/d/actor/d_a_tn.cpp +++ b/src/d/actor/d_a_tn.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_tn.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000220 .text anm_init__FP8tn_classifUcfi */ void anm_init(tn_class*, int, float, unsigned char, float, int) { @@ -325,7 +326,7 @@ actor_process_profile_definition g_profile_TN = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00B2, + /* Priority */ PRIO_TN, /* Actor SubMtd */ &l_daTn_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_toge.cpp b/src/d/actor/d_a_toge.cpp index ef5a27cb..cefb1d21 100644 --- a/src/d/actor/d_a_toge.cpp +++ b/src/d/actor/d_a_toge.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_wind_tag.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" const char daToge_c::m_arcname[] = "Htoge1"; @@ -334,7 +335,7 @@ actor_process_profile_definition g_profile_TOGE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x018C, + /* Priority */ PRIO_TOGE, /* Actor SubMtd */ &daTogeMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tori_flag.cpp b/src/d/actor/d_a_tori_flag.cpp index 3ec0792c..614bbd82 100644 --- a/src/d/actor/d_a_tori_flag.cpp +++ b/src/d/actor/d_a_tori_flag.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tori_flag.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_kankyo_wether.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" @@ -215,7 +216,7 @@ actor_process_profile_definition g_profile_Tori_Flag = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x006C, + /* Priority */ PRIO_Tori_Flag, /* Actor SubMtd */ &daTori_FlagMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index 6cd205da..57b2e301 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -8,6 +8,7 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_ship.h" #include "d/d_kankyo_wether.h" @@ -360,7 +361,7 @@ actor_process_profile_definition g_profile_TORNADO = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0009, + /* Priority */ PRIO_TORNADO, /* Actor SubMtd */ &l_daTornado_Method, /* Status */ 0x06 | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tpota.cpp b/src/d/actor/d_a_tpota.cpp index 37110ff6..0ad89f96 100644 --- a/src/d/actor/d_a_tpota.cpp +++ b/src/d/actor/d_a_tpota.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tpota.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "JSystem/JGeometry.h" #include "d/d_particle.h" #include "JSystem/JParticle/JPAParticle.h" @@ -168,7 +169,7 @@ actor_process_profile_definition g_profile_Tpota = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00F8, + /* Priority */ PRIO_Tpota, /* Actor SubMtd */ &Tpota_Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_tsubo.cpp b/src/d/actor/d_a_tsubo.cpp index a1545cb5..55e8b3ea 100644 --- a/src/d/actor/d_a_tsubo.cpp +++ b/src/d/actor/d_a_tsubo.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_tsubo.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000011C .text prmZ_init__Q27daTsubo5Act_cFv */ void daTsubo::Act_c::prmZ_init() { @@ -629,7 +630,7 @@ actor_process_profile_definition g_profile_TSUBO = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0103, + /* Priority */ PRIO_TSUBO, /* Actor SubMtd */ &daTsubo::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index e0ee0533..8ff26672 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -7,6 +7,7 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "d/d_kankyo_wether.h" @@ -212,7 +213,7 @@ actor_process_profile_definition g_profile_VRBOX = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0007, + /* Priority */ PRIO_VRBOX, /* Actor SubMtd */ &l_daVrbox_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index bef34220..1b84569d 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -8,6 +8,7 @@ #include "f_op/f_op_camera.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_kankyo_rain.h" #include "d/d_kankyo_wether.h" #include "m_Do/m_Do_mtx.h" @@ -303,7 +304,7 @@ actor_process_profile_definition g_profile_VRBOX2 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0004, + /* Priority */ PRIO_VRBOX2, /* Actor SubMtd */ &l_daVrbox2_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index 29c8692e..2f8eb4ce 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -10,6 +10,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" @@ -361,7 +362,7 @@ actor_process_profile_definition g_profile_WALL = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0198, + /* Priority */ PRIO_WALL, /* Actor SubMtd */ &daWallMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_warpdm20.cpp b/src/d/actor/d_a_warpdm20.cpp index 4c3352c1..484dd3dd 100644 --- a/src/d/actor/d_a_warpdm20.cpp +++ b/src/d/actor/d_a_warpdm20.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_warpdm20.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000BC .text _delete__12daWarpdm20_cFv */ bool daWarpdm20_c::_delete() { @@ -209,7 +210,7 @@ actor_process_profile_definition g_profile_WARPDEMO20 = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01A6, + /* Priority */ PRIO_WARPDEMO20, /* Actor SubMtd */ &daWarpdm20MethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_warpf.cpp b/src/d/actor/d_a_warpf.cpp index 87f9ccaa..6eee5536 100644 --- a/src/d/actor/d_a_warpf.cpp +++ b/src/d/actor/d_a_warpf.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_warpf.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -219,7 +220,7 @@ actor_process_profile_definition g_profile_WARPFLOWER = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01A2, + /* Priority */ PRIO_WARPFLOWER, /* Actor SubMtd */ &daWarpfMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_warpfout.cpp b/src/d/actor/d_a_warpfout.cpp index 756e5af1..d113bc6d 100644 --- a/src/d/actor/d_a_warpfout.cpp +++ b/src/d/actor/d_a_warpfout.cpp @@ -7,6 +7,7 @@ #include "d/d_camera.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "weak_data_1811.h" // IWYU pragma: keep @@ -227,7 +228,7 @@ actor_process_profile_definition g_profile_WARPFOUT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01A3, + /* Priority */ PRIO_WARPFOUT, /* Actor SubMtd */ &daWarpfoutMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_warpgn.cpp b/src/d/actor/d_a_warpgn.cpp index 61aa68c1..02dfcbfb 100644 --- a/src/d/actor/d_a_warpgn.cpp +++ b/src/d/actor/d_a_warpgn.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_warpgn.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000120 .text _delete__10daWarpgn_cFv */ bool daWarpgn_c::_delete() { @@ -194,7 +195,7 @@ actor_process_profile_definition g_profile_WARPGANON = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01A7, + /* Priority */ PRIO_WARPGANON, /* Actor SubMtd */ &daWarpgnMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_warphr.cpp b/src/d/actor/d_a_warphr.cpp index 1d8d82f1..6612c80d 100644 --- a/src/d/actor/d_a_warphr.cpp +++ b/src/d/actor/d_a_warphr.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_warphr.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-0000016C .text _delete__10daWarphr_cFv */ bool daWarphr_c::_delete() { @@ -184,7 +185,7 @@ actor_process_profile_definition g_profile_WARPHYRULE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01A5, + /* Priority */ PRIO_WARPHYRULE, /* Actor SubMtd */ &daWarphrMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_warpls.cpp b/src/d/actor/d_a_warpls.cpp index 34026779..0354e6a4 100644 --- a/src/d/actor/d_a_warpls.cpp +++ b/src/d/actor/d_a_warpls.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_warpls.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000E0 .text _delete__10daWarpls_cFv */ bool daWarpls_c::_delete() { @@ -119,7 +120,7 @@ actor_process_profile_definition g_profile_WARPLIGHT = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01A4, + /* Priority */ PRIO_WARPLIGHT, /* Actor SubMtd */ &daWarplsMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_warpmj.cpp b/src/d/actor/d_a_warpmj.cpp index e42136fb..c9d0fa1b 100644 --- a/src/d/actor/d_a_warpmj.cpp +++ b/src/d/actor/d_a_warpmj.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_warpmj.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000A8 .text _delete__10daWarpmj_cFv */ bool daWarpmj_c::_delete() { @@ -164,7 +165,7 @@ actor_process_profile_definition g_profile_WARPMAJYUU = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01A8, + /* Priority */ PRIO_WARPMAJYUU, /* Actor SubMtd */ &daWarpmjMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_waterfall.cpp b/src/d/actor/d_a_waterfall.cpp index 9eed1843..e6a46d2c 100644 --- a/src/d/actor/d_a_waterfall.cpp +++ b/src/d/actor/d_a_waterfall.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_waterfall.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-000000F0 .text _delete__9daWfall_cFv */ bool daWfall_c::_delete() { @@ -144,7 +145,7 @@ actor_process_profile_definition g_profile_WATERFALL = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0195, + /* Priority */ PRIO_WATERFALL, /* Actor SubMtd */ &daWfallMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_wbird.cpp b/src/d/actor/d_a_wbird.cpp index e84af75e..02660a97 100644 --- a/src/d/actor/d_a_wbird.cpp +++ b/src/d/actor/d_a_wbird.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_wbird.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" #include "SSystem/SComponent/c_angle.h" @@ -233,7 +234,7 @@ actor_process_profile_definition g_profile_WBIRD = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00B7, + /* Priority */ PRIO_WBIRD, /* Actor SubMtd */ &l_daWbird_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index 04ee663a..2bdd1673 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -13,6 +13,7 @@ #include "d/d_level_se.h" #include "d/d_path.h" #include "d/d_procname.h" +#include "d/d_priority.h" namespace daWindTag { dCcD_SrcCps l_cps_src = { @@ -368,7 +369,7 @@ actor_process_profile_definition g_profile_WindTag = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00A8, + /* Priority */ PRIO_WindTag, /* Actor SubMtd */ &daWindTagMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_windmill.cpp b/src/d/actor/d_a_windmill.cpp index 976385af..33a2c4f1 100644 --- a/src/d/actor/d_a_windmill.cpp +++ b/src/d/actor/d_a_windmill.cpp @@ -7,6 +7,7 @@ #include "m_Do/m_Do_ext.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" const char* daWindMill_c::m_arcname[] = { "Hpu1", "Hpu2" }; @@ -125,7 +126,7 @@ actor_process_profile_definition g_profile_WINDMILL = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x011C, + /* Priority */ PRIO_WINDMILL, /* Actor SubMtd */ &daWindMillMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_wz.cpp b/src/d/actor/d_a_wz.cpp index a4e54a0f..0ec0482d 100644 --- a/src/d/actor/d_a_wz.cpp +++ b/src/d/actor/d_a_wz.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_wz.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 00000078-00000140 .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -160,7 +161,7 @@ actor_process_profile_definition g_profile_WZ = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x00C3, + /* Priority */ PRIO_WZ, /* Actor SubMtd */ &l_daWZ_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp index 1e99cb8c..a62f29f1 100644 --- a/src/d/actor/d_a_ygcwp.cpp +++ b/src/d/actor/d_a_ygcwp.cpp @@ -8,6 +8,7 @@ #include "d/res/res_ygcwp.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_priority.h" enum { EVENT_WARP_START, @@ -245,7 +246,7 @@ actor_process_profile_definition g_profile_Ygcwp = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x004F, + /* Priority */ PRIO_Ygcwp, /* Actor SubMtd */ &Ygcwp_Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 3836f3d3..48337d74 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_ykgr.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000134 .text draw__17dPa_YkgrPcallBackFP14JPABaseEmitterP15JPABaseParticle */ void dPa_YkgrPcallBack::draw(JPABaseEmitter*, JPABaseParticle*) { @@ -69,7 +70,7 @@ actor_process_profile_definition g_profile_Ykgr = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0185, + /* Priority */ PRIO_Ykgr, /* Actor SubMtd */ &daYkgrMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/actor/d_a_yougan.cpp b/src/d/actor/d_a_yougan.cpp index f96db5da..95786d1d 100644 --- a/src/d/actor/d_a_yougan.cpp +++ b/src/d/actor/d_a_yougan.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_yougan.h" #include "d/d_procname.h" +#include "d/d_priority.h" /* 000000EC-00000158 .text __ct__14daYOUGAN_HIO_cFv */ daYOUGAN_HIO_c::daYOUGAN_HIO_c() { @@ -89,7 +90,7 @@ actor_process_profile_definition g_profile_YOUGAN = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x0184, + /* Priority */ PRIO_YOUGAN, /* Actor SubMtd */ &l_daYougan_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index adbd7f85..22d9753e 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -6,6 +6,7 @@ #include "d/d_gameover.h" #include "d/d_meter.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_Reset.h" @@ -459,6 +460,6 @@ msg_process_profile_definition g_profile_GAMEOVER = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopMsg_Method, - /* Priority */ 0x01DE, + /* Priority */ PRIO_GAMEOVER, /* Msg SubMtd */ &l_dGameover_Method, }; diff --git a/src/d/d_mesg.cpp b/src/d/d_mesg.cpp index 5a31136f..a9a809b4 100644 --- a/src/d/d_mesg.cpp +++ b/src/d/d_mesg.cpp @@ -14,6 +14,7 @@ #include "d/d_com_inf_game.h" #include "d/d_meter.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "f_op/f_op_msg.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_audio.h" @@ -2260,6 +2261,6 @@ msg_process_profile_definition g_profile_MESG = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopMsg_Method, - /* Priority */ 0x01D8, + /* Priority */ PRIO_MESG, /* Msg SubMtd */ &l_dMesg_Method, }; diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp index 58cc44c0..e6cd579e 100644 --- a/src/d/d_throwstone.cpp +++ b/src/d/d_throwstone.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_demo.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" const char daThrowstone_c::M_arcname[] = "Aisi"; @@ -127,7 +128,7 @@ actor_process_profile_definition g_profile_THROWSTONE = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x01CE, + /* Priority */ PRIO_THROWSTONE, /* Actor SubMtd */ &daThrowstoneMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 576fc18f..fea43bb4 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -7,6 +7,7 @@ #include "d/d_com_inf_game.h" #include "d/d_meter.h" #include "d/d_procname.h" +#include "d/d_priority.h" #include "m_Do/m_Do_audio.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" @@ -777,6 +778,6 @@ msg_process_profile_definition g_profile_TIMER = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopMsg_Method, - /* Priority */ 0x01D2, + /* Priority */ PRIO_TIMER, /* Msg SubMtd */ &l_dTimer_Method, }; |