From 4a4624decff1e887b3697abb5c75660bef3f4988 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Thu, 6 Mar 2025 17:37:20 -0500 Subject: [PATCH] Populate particle IDs enum with placeholders and use them everywhere --- include/d/actor/d_a_obj_hha.h | 2 +- include/d/actor/d_a_pedestal.h | 5 +- include/d/d_cc_d.h | 6 +- include/d/d_particle.h | 4 +- include/d/d_particle_name.h | 1053 ++++++++++++++++++++++++++- src/c/c_damagereaction.cpp | 12 +- src/d/actor/d_a_agb.cpp | 2 +- src/d/actor/d_a_am.cpp | 26 +- src/d/actor/d_a_am2.cpp | 18 +- src/d/actor/d_a_arrow.cpp | 18 +- src/d/actor/d_a_arrow_iceeff.cpp | 12 +- src/d/actor/d_a_arrow_lighteff.cpp | 12 +- src/d/actor/d_a_auction.cpp | 2 +- src/d/actor/d_a_bita.cpp | 4 +- src/d/actor/d_a_bk.cpp | 6 +- src/d/actor/d_a_bomb2.cpp | 2 +- src/d/actor/d_a_bomb3.inc | 4 +- src/d/actor/d_a_dai_item.cpp | 6 +- src/d/actor/d_a_deku_item.cpp | 2 +- src/d/actor/d_a_demo_item.cpp | 8 +- src/d/actor/d_a_disappear.cpp | 18 +- src/d/actor/d_a_dr.cpp | 8 +- src/d/actor/d_a_esa.cpp | 4 +- src/d/actor/d_a_floor.cpp | 4 +- src/d/actor/d_a_ghostship.cpp | 2 +- src/d/actor/d_a_hot_floor.cpp | 4 +- src/d/actor/d_a_ib.cpp | 16 +- src/d/actor/d_a_item.cpp | 6 +- src/d/actor/d_a_lamp.cpp | 4 +- src/d/actor/d_a_lbridge.cpp | 6 +- src/d/actor/d_a_leaflift.cpp | 2 +- src/d/actor/d_a_mmusic.cpp | 2 +- src/d/actor/d_a_npc_ji1.cpp | 16 +- src/d/actor/d_a_npc_kamome.cpp | 4 +- src/d/actor/d_a_npc_md.cpp | 18 +- src/d/actor/d_a_npc_nz.cpp | 2 +- src/d/actor/d_a_npc_nz_cut.inc | 2 +- src/d/actor/d_a_npc_os.cpp | 16 +- src/d/actor/d_a_obj_barrier.cpp | 2 +- src/d/actor/d_a_obj_ebomzo.cpp | 4 +- src/d/actor/d_a_obj_eskban.cpp | 6 +- src/d/actor/d_a_obj_gryw00.cpp | 8 +- src/d/actor/d_a_obj_hha.cpp | 9 +- src/d/actor/d_a_obj_homensmoke.cpp | 4 +- src/d/actor/d_a_obj_kanat.cpp | 4 +- src/d/actor/d_a_obj_mknjd.cpp | 8 +- src/d/actor/d_a_obj_movebox.cpp | 4 +- src/d/actor/d_a_obj_toripost.cpp | 4 +- src/d/actor/d_a_obj_vfan.cpp | 22 +- src/d/actor/d_a_obj_vgnfd.cpp | 14 +- src/d/actor/d_a_obj_vmc.cpp | 2 +- src/d/actor/d_a_pedestal.cpp | 3 +- src/d/actor/d_a_player_particle.inc | 111 +-- src/d/actor/d_a_player_tact.inc | 6 +- src/d/actor/d_a_pw.cpp | 2 +- src/d/actor/d_a_rd.cpp | 2 +- src/d/actor/d_a_steam_tag.cpp | 4 +- src/d/actor/d_a_syan.cpp | 4 +- src/d/actor/d_a_tbox.cpp | 26 +- src/d/actor/d_a_title.cpp | 8 +- src/d/actor/d_a_tornado.cpp | 4 +- src/d/actor/d_a_wall.cpp | 12 +- src/d/actor/d_a_warpfout.cpp | 4 +- src/d/actor/d_a_wind_tag.cpp | 2 +- src/d/actor/d_a_ygcwp.cpp | 2 +- src/d/d_a_leaflift_static.cpp | 4 +- src/d/d_a_obj.cpp | 4 +- src/d/d_cc_s.cpp | 2 +- src/d/d_cc_uty.cpp | 2 +- src/d/d_door.cpp | 2 +- src/d/d_gameover.cpp | 6 +- src/d/d_grass.cpp | 10 +- src/d/d_item_data.cpp | 34 +- src/d/d_kankyo_rain.cpp | 4 +- src/d/d_metronome.cpp | 4 +- src/d/d_particle.cpp | 28 +- src/d/d_particle_name.cpp | 53 +- src/d/d_wood.cpp | 2 +- src/d/d_wpot_water.cpp | 6 +- src/f_op/f_op_kankyo_mng.cpp | 2 +- 80 files changed, 1429 insertions(+), 353 deletions(-) diff --git a/include/d/actor/d_a_obj_hha.h b/include/d/actor/d_a_obj_hha.h index 040e1eaee..234de7625 100644 --- a/include/d/actor/d_a_obj_hha.h +++ b/include/d/actor/d_a_obj_hha.h @@ -73,7 +73,7 @@ public: } } - void create_s(unsigned short, cXyz*, float, float, csXyz*); + void create_s(u16, cXyz*, float, float, csXyz*); public: /* 0x00 */ dPa_followEcallBack mEcallBack; diff --git a/include/d/actor/d_a_pedestal.h b/include/d/actor/d_a_pedestal.h index c0a081264..6bdb5e014 100644 --- a/include/d/actor/d_a_pedestal.h +++ b/include/d/actor/d_a_pedestal.h @@ -2,11 +2,10 @@ #define D_A_PEDESTAL_H #include "d/d_bg_w.h" -#include "d/d_com_inf_game.h" -#include "f_op/f_op_actor.h" - #include "d/d_particle.h" +#include "f_op/f_op_actor.h" #include "m_Do/m_Do_ext.h" +#include "SSystem/SComponent/c_phase.h" namespace daPedestal { diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h index 747af640e..8702048e0 100644 --- a/include/d/d_cc_d.h +++ b/include/d/d_cc_d.h @@ -86,14 +86,14 @@ enum dCcG_hitSe { }; enum CcG_At_HitMark { - /* 0x0 */ dCcG_AtHitMark_None_e = 0, - /* 0x1 */ dCcG_AtHitMark_Unk1_e = 1, + /* 0x0 */ dCcG_AtHitMark_None_e = dPa_name::ID_NONE, + /* 0x1 */ dCcG_AtHitMark_Unk1_e = dPa_name::ID_COMMON_0001, /* 0xD */ dCcG_AtHitMark_Nrm_e = dPa_name::ID_COMMON_NORMAL_HIT, /* 0xF */ dCcG_AtHitMark_Big_e = dPa_name::ID_COMMON_BIG_HIT, }; enum CcG_Tg_HitMark { - /* 0x1 */ dCcG_TgHitMark_Unk1_e = 1, + /* 0x1 */ dCcG_TgHitMark_Unk1_e = dPa_name::ID_COMMON_0001, /* 0xC */ dCcg_TgHitMark_Purple_e = dPa_name::ID_COMMON_PURPLE_HIT, }; diff --git a/include/d/d_particle.h b/include/d/d_particle.h index a29226b9f..4c034dfaa 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -1,6 +1,7 @@ #ifndef D_PARTICLE #define D_PARTICLE +#include "d/d_particle_name.h" // IWYU pragma: export #include "JSystem/J3DGraphBase/J3DVertex.h" #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "JSystem/JGeometry.h" @@ -8,8 +9,7 @@ #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAEmitter.h" #include "JSystem/JParticle/JPAEmitterManager.h" -#include "d/d_particle_name.h" -#include "f_pc/f_pc_node.h" +#include "SSystem/SComponent/c_list.h" #include "m_Do/m_Do_ext.h" class mDoDvdThd_toMainRam_c; diff --git a/include/d/d_particle_name.h b/include/d/d_particle_name.h index 9e239b77a..c09a534a9 100644 --- a/include/d/d_particle_name.h +++ b/include/d/d_particle_name.h @@ -3,25 +3,1056 @@ #include "dolphin/types.h" +// Most of the particle enum names in here are made up. +// dPa_name::ID_SCENE_END is the only official name that is known. namespace dPa_name { enum { + ID_NONE = 0x0000, + }; + + // Particles in common.jpc. + // Always loaded regardless of scene. + enum { + ID_COMMON_0001 = 0x0001, + ID_COMMON_0002 = 0x0002, + ID_COMMON_0003 = 0x0003, + ID_COMMON_03DA = 0x03DA, + ID_COMMON_03DB = 0x03DB, + ID_COMMON_03DC = 0x03DC, + ID_COMMON_4004 = 0x4004, + ID_COMMON_445B = 0x445B, ID_COMMON_SMOKE_DEBRIS = 0x2008, ID_COMMON_SMOKE_CLOUD = 0x2009, ID_COMMON_SMOKE_CIRCLE = 0x200A, - ID_COMMON_LIGHT_FLASH = 0xB, - ID_COMMON_PURPLE_HIT = 0xC, - ID_COMMON_NORMAL_HIT = 0xD, - ID_COMMON_BIG_HIT = 0xF, - ID_COMMON_FUSE_SPARKS = 0x11, - ID_COMMON_LIGHT_EXPLOSION = 0x272, - ID_COMMON_STARS_SPIN = 0x27A, - ID_COMMON_STARS_BLOW = 0x27B, - ID_CUT_L_TREE_DOWN = 0x3E0, - ID_PEDESTAL_OCTAGON_GLOW = 0x826D, - ID_WARPFOUT_WARP4 = 0x830e, + ID_COMMON_LIGHT_FLASH = 0x000B, + ID_COMMON_232A = 0x232A, + ID_COMMON_PURPLE_HIT = 0x000C, + ID_COMMON_NORMAL_HIT = 0x000D, + ID_COMMON_000E = 0x000E, + ID_COMMON_BIG_HIT = 0x000F, + ID_COMMON_0010 = 0x0010, + ID_COMMON_FUSE_SPARKS = 0x0011, + ID_COMMON_2012 = 0x2012, + ID_COMMON_0013 = 0x0013, + ID_COMMON_0014 = 0x0014, + ID_COMMON_0015 = 0x0015, + ID_COMMON_0016 = 0x0016, + ID_COMMON_0017 = 0x0017, + ID_COMMON_0018 = 0x0018, + ID_COMMON_0019 = 0x0019, + ID_COMMON_001A = 0x001A, + ID_COMMON_001B = 0x001B, + ID_COMMON_001C = 0x001C, + ID_COMMON_001D = 0x001D, + ID_COMMON_001E = 0x001E, + ID_COMMON_201F = 0x201F, + ID_COMMON_0020 = 0x0020, + ID_COMMON_0021 = 0x0021, + ID_COMMON_2022 = 0x2022, + ID_COMMON_0023 = 0x0023, + ID_COMMON_0024 = 0x0024, + ID_COMMON_0025 = 0x0025, + ID_COMMON_0026 = 0x0026, + ID_COMMON_2027 = 0x2027, + ID_COMMON_0028 = 0x0028, + ID_COMMON_0029 = 0x0029, + ID_COMMON_002A = 0x002A, + ID_COMMON_002B = 0x002B, + ID_COMMON_002C = 0x002C, + ID_COMMON_002D = 0x002D, + ID_COMMON_002E = 0x002E, + ID_COMMON_002F = 0x002F, + ID_COMMON_0030 = 0x0030, + ID_COMMON_0031 = 0x0031, + ID_COMMON_0032 = 0x0032, + ID_COMMON_0033 = 0x0033, + ID_COMMON_035C = 0x035C, + ID_COMMON_0034 = 0x0034, + ID_COMMON_0035 = 0x0035, + ID_COMMON_0036 = 0x0036, + ID_COMMON_0037 = 0x0037, + ID_COMMON_0038 = 0x0038, + ID_COMMON_0432 = 0x0432, + ID_COMMON_0039 = 0x0039, + ID_COMMON_003A = 0x003A, + ID_COMMON_203B = 0x203B, + ID_COMMON_003C = 0x003C, + ID_COMMON_003D = 0x003D, + ID_COMMON_003E = 0x003E, + ID_COMMON_003F = 0x003F, + ID_COMMON_0040 = 0x0040, + ID_COMMON_2041 = 0x2041, + ID_COMMON_0042 = 0x0042, + ID_COMMON_0043 = 0x0043, + ID_COMMON_0044 = 0x0044, + ID_COMMON_0045 = 0x0045, + ID_COMMON_0046 = 0x0046, + ID_COMMON_0047 = 0x0047, + ID_COMMON_0048 = 0x0048, + ID_COMMON_0049 = 0x0049, + ID_COMMON_004A = 0x004A, + ID_COMMON_004B = 0x004B, + ID_COMMON_004C = 0x004C, + ID_COMMON_004D = 0x004D, + ID_COMMON_004E = 0x004E, + ID_COMMON_004F = 0x004F, + ID_COMMON_0050 = 0x0050, + ID_COMMON_0051 = 0x0051, + ID_COMMON_0052 = 0x0052, + ID_COMMON_0053 = 0x0053, + ID_COMMON_0437 = 0x0437, + ID_COMMON_0054 = 0x0054, + ID_COMMON_0056 = 0x0056, + ID_COMMON_0057 = 0x0057, + ID_COMMON_01EA = 0x01EA, + ID_COMMON_01F1 = 0x01F1, + ID_COMMON_01F2 = 0x01F2, + ID_COMMON_01F3 = 0x01F3, + ID_COMMON_01F4 = 0x01F4, + ID_COMMON_01F5 = 0x01F5, + ID_COMMON_01F6 = 0x01F6, + ID_COMMON_01F7 = 0x01F7, + ID_COMMON_01F8 = 0x01F8, + ID_COMMON_01F9 = 0x01F9, + ID_COMMON_01FA = 0x01FA, + ID_COMMON_020D = 0x020D, + ID_COMMON_0214 = 0x0214, + ID_COMMON_0215 = 0x0215, + ID_COMMON_0216 = 0x0216, + ID_COMMON_027C = 0x027C, + ID_COMMON_023E = 0x023E, + ID_COMMON_023F = 0x023F, + ID_COMMON_LIGHT_EXPLOSION = 0x0272, + ID_COMMON_0273 = 0x0273, + ID_COMMON_0274 = 0x0274, + ID_COMMON_0277 = 0x0277, + ID_COMMON_STARS_SPIN = 0x027A, + ID_COMMON_STARS_BLOW = 0x027B, + ID_COMMON_0279 = 0x0279, + ID_COMMON_0285 = 0x0285, + ID_COMMON_0293 = 0x0293, + ID_COMMON_0299 = 0x0299, + ID_COMMON_029A = 0x029A, + ID_COMMON_029B = 0x029B, + ID_COMMON_029C = 0x029C, + ID_COMMON_029D = 0x029D, + ID_COMMON_029E = 0x029E, + ID_COMMON_0055 = 0x0055, + ID_COMMON_029F = 0x029F, + ID_COMMON_02A0 = 0x02A0, + ID_COMMON_02A1 = 0x02A1, + ID_COMMON_02E1 = 0x02E1, + ID_COMMON_02E2 = 0x02E2, + ID_COMMON_02EF = 0x02EF, + ID_COMMON_02E7 = 0x02E7, + ID_COMMON_0309 = 0x0309, + ID_COMMON_030A = 0x030A, + ID_COMMON_0314 = 0x0314, + ID_COMMON_0357 = 0x0357, + ID_COMMON_0358 = 0x0358, + ID_COMMON_0359 = 0x0359, + ID_COMMON_035A = 0x035A, + ID_COMMON_03DD = 0x03DD, + ID_COMMON_03DE = 0x03DE, + ID_COMMON_03DF = 0x03DF, + ID_COMMON_CUT_L_TREE_DOWN = 0x03E0, + ID_COMMON_03E1 = 0x03E1, + ID_COMMON_03E2 = 0x03E2, + ID_COMMON_03E3 = 0x03E3, + ID_COMMON_03E5 = 0x03E5, + ID_COMMON_03E6 = 0x03E6, + ID_COMMON_03E7 = 0x03E7, + ID_COMMON_03E8 = 0x03E8, + ID_COMMON_03E9 = 0x03E9, + ID_COMMON_03EA = 0x03EA, + ID_COMMON_03EB = 0x03EB, + ID_COMMON_03EC = 0x03EC, + ID_COMMON_03ED = 0x03ED, + ID_COMMON_03EE = 0x03EE, + ID_COMMON_03EF = 0x03EF, + ID_COMMON_03F0 = 0x03F0, + ID_COMMON_03F1 = 0x03F1, + ID_COMMON_23F2 = 0x23F2, + ID_COMMON_03F3 = 0x03F3, + ID_COMMON_03F4 = 0x03F4, + ID_COMMON_03F5 = 0x03F5, + ID_COMMON_03F6 = 0x03F6, + ID_COMMON_03F7 = 0x03F7, + ID_COMMON_03F8 = 0x03F8, + ID_COMMON_0429 = 0x0429, + ID_COMMON_0438 = 0x0438, + ID_COMMON_0439 = 0x0439, + ID_COMMON_243A = 0x243A, + ID_COMMON_043B = 0x043B, + ID_COMMON_043C = 0x043C, + ID_COMMON_043D = 0x043D, + ID_COMMON_043E = 0x043E, + ID_COMMON_043F = 0x043F, + ID_COMMON_0440 = 0x0440, + ID_COMMON_0441 = 0x0441, + ID_COMMON_0442 = 0x0442, + ID_COMMON_0453 = 0x0453, + ID_COMMON_0455 = 0x0455, + ID_COMMON_045C = 0x045C, + ID_COMMON_045D = 0x045D, + ID_COMMON_245E = 0x245E, + ID_COMMON_045F = 0x045F, + ID_COMMON_0460 = 0x0460, + ID_COMMON_0461 = 0x0461, + ID_COMMON_0462 = 0x0462, + ID_COMMON_0463 = 0x0463, + ID_COMMON_0464 = 0x0464, + ID_COMMON_0465 = 0x0465, + ID_COMMON_0467 = 0x0467, + ID_COMMON_0468 = 0x0468, + ID_COMMON_0469 = 0x0469, }; + // Particles that are scene-specific. + // These are not in common.jpc, and must be loaded by a scene's particle bank. enum { + ID_SCENE_8058 = 0x8058, + ID_SCENE_8059 = 0x8059, + ID_SCENE_805A = 0x805A, + ID_SCENE_805B = 0x805B, + ID_SCENE_805C = 0x805C, + ID_SCENE_8221 = 0x8221, + ID_SCENE_8222 = 0x8222, + ID_SCENE_8060 = 0x8060, + ID_SCENE_8061 = 0x8061, + ID_SCENE_8062 = 0x8062, + ID_SCENE_8063 = 0x8063, + ID_SCENE_8064 = 0x8064, + ID_SCENE_8065 = 0x8065, + ID_SCENE_8066 = 0x8066, + ID_SCENE_8067 = 0x8067, + ID_SCENE_8068 = 0x8068, + ID_SCENE_8069 = 0x8069, + ID_SCENE_81D5 = 0x81D5, + ID_SCENE_8240 = 0x8240, + ID_SCENE_8241 = 0x8241, + ID_SCENE_8306 = 0x8306, + ID_SCENE_8407 = 0x8407, + ID_SCENE_8408 = 0x8408, + ID_SCENE_8409 = 0x8409, + ID_SCENE_8443 = 0x8443, + ID_SCENE_840A = 0x840A, + ID_SCENE_840B = 0x840B, + ID_SCENE_840C = 0x840C, + ID_SCENE_840D = 0x840D, + ID_SCENE_840E = 0x840E, + ID_SCENE_840F = 0x840F, + ID_SCENE_A410 = 0xA410, + ID_SCENE_A06A = 0xA06A, + ID_SCENE_C06B = 0xC06B, + ID_SCENE_C06C = 0xC06C, + ID_SCENE_C06D = 0xC06D, + ID_SCENE_C1D6 = 0xC1D6, + ID_SCENE_C1D7 = 0xC1D7, + ID_SCENE_C35D = 0xC35D, + ID_SCENE_C35E = 0xC35E, + ID_SCENE_C35F = 0xC35F, + ID_SCENE_C360 = 0xC360, + ID_SCENE_C32B = 0xC32B, + ID_SCENE_C32C = 0xC32C, + ID_SCENE_C361 = 0xC361, + ID_SCENE_C362 = 0xC362, + ID_SCENE_C363 = 0xC363, + ID_SCENE_C364 = 0xC364, + ID_SCENE_C365 = 0xC365, + ID_SCENE_C366 = 0xC366, + ID_SCENE_C367 = 0xC367, + ID_SCENE_C368 = 0xC368, + ID_SCENE_C369 = 0xC369, + ID_SCENE_C36A = 0xC36A, + ID_SCENE_C36B = 0xC36B, + ID_SCENE_C36C = 0xC36C, + ID_SCENE_C36D = 0xC36D, + ID_SCENE_C36E = 0xC36E, + ID_SCENE_C36F = 0xC36F, + ID_SCENE_C370 = 0xC370, + ID_SCENE_C371 = 0xC371, + ID_SCENE_C372 = 0xC372, + ID_SCENE_C373 = 0xC373, + ID_SCENE_C374 = 0xC374, + ID_SCENE_C375 = 0xC375, + ID_SCENE_C376 = 0xC376, + ID_SCENE_C377 = 0xC377, + ID_SCENE_C378 = 0xC378, + ID_SCENE_C379 = 0xC379, + ID_SCENE_C37A = 0xC37A, + ID_SCENE_C37B = 0xC37B, + ID_SCENE_C37C = 0xC37C, + ID_SCENE_C2B9 = 0xC2B9, + ID_SCENE_C3FC = 0xC3FC, + ID_SCENE_8072 = 0x8072, + ID_SCENE_8073 = 0x8073, + ID_SCENE_8076 = 0x8076, + ID_SCENE_8078 = 0x8078, + ID_SCENE_8083 = 0x8083, + ID_SCENE_8084 = 0x8084, + ID_SCENE_8085 = 0x8085, + ID_SCENE_8086 = 0x8086, + ID_SCENE_8089 = 0x8089, + ID_SCENE_808A = 0x808A, + ID_SCENE_808B = 0x808B, + ID_SCENE_808C = 0x808C, + ID_SCENE_8092 = 0x8092, + ID_SCENE_82C6 = 0x82C6, + ID_SCENE_82C7 = 0x82C7, + ID_SCENE_8095 = 0x8095, + ID_SCENE_8096 = 0x8096, + ID_SCENE_82F0 = 0x82F0, + ID_SCENE_82F1 = 0x82F1, + ID_SCENE_8099 = 0x8099, + ID_SCENE_809A = 0x809A, + ID_SCENE_809B = 0x809B, + ID_SCENE_809E = 0x809E, + ID_SCENE_809F = 0x809F, + ID_SCENE_80A0 = 0x80A0, + ID_SCENE_80A1 = 0x80A1, + ID_SCENE_80A2 = 0x80A2, + ID_SCENE_80A3 = 0x80A3, + ID_SCENE_80A4 = 0x80A4, + ID_SCENE_80A6 = 0x80A6, + ID_SCENE_80A7 = 0x80A7, + ID_SCENE_80A8 = 0x80A8, + ID_SCENE_80A9 = 0x80A9, + ID_SCENE_80AA = 0x80AA, + ID_SCENE_A0AB = 0xA0AB, + ID_SCENE_A0AC = 0xA0AC, + ID_SCENE_80B0 = 0x80B0, + ID_SCENE_80B1 = 0x80B1, + ID_SCENE_80B2 = 0x80B2, + ID_SCENE_80B3 = 0x80B3, + ID_SCENE_A0B4 = 0xA0B4, + ID_SCENE_A0B5 = 0xA0B5, + ID_SCENE_80B6 = 0x80B6, + ID_SCENE_8286 = 0x8286, + ID_SCENE_A307 = 0xA307, + ID_SCENE_80B7 = 0x80B7, + ID_SCENE_A0B8 = 0xA0B8, + ID_SCENE_80B9 = 0x80B9, + ID_SCENE_80BA = 0x80BA, + ID_SCENE_80BC = 0x80BC, + ID_SCENE_80BD = 0x80BD, + ID_SCENE_80C4 = 0x80C4, + ID_SCENE_80C5 = 0x80C5, + ID_SCENE_80C6 = 0x80C6, + ID_SCENE_80C7 = 0x80C7, + ID_SCENE_80C8 = 0x80C8, + ID_SCENE_80C9 = 0x80C9, + ID_SCENE_80CA = 0x80CA, + ID_SCENE_80CB = 0x80CB, + ID_SCENE_80CC = 0x80CC, + ID_SCENE_80CE = 0x80CE, + ID_SCENE_80CF = 0x80CF, + ID_SCENE_80D0 = 0x80D0, + ID_SCENE_80D1 = 0x80D1, + ID_SCENE_80D2 = 0x80D2, + ID_SCENE_80D3 = 0x80D3, + ID_SCENE_80D4 = 0x80D4, + ID_SCENE_80D5 = 0x80D5, + ID_SCENE_80D6 = 0x80D6, + ID_SCENE_80D7 = 0x80D7, + ID_SCENE_80D8 = 0x80D8, + ID_SCENE_80D9 = 0x80D9, + ID_SCENE_80DA = 0x80DA, + ID_SCENE_80DB = 0x80DB, + ID_SCENE_80DC = 0x80DC, + ID_SCENE_80DD = 0x80DD, + ID_SCENE_80DE = 0x80DE, + ID_SCENE_80E0 = 0x80E0, + ID_SCENE_A0E1 = 0xA0E1, + ID_SCENE_80E3 = 0x80E3, + ID_SCENE_80E4 = 0x80E4, + ID_SCENE_80E7 = 0x80E7, + ID_SCENE_80EA = 0x80EA, + ID_SCENE_80EC = 0x80EC, + ID_SCENE_80ED = 0x80ED, + ID_SCENE_80EE = 0x80EE, + ID_SCENE_80EF = 0x80EF, + ID_SCENE_80F1 = 0x80F1, + ID_SCENE_A0F2 = 0xA0F2, + ID_SCENE_80F3 = 0x80F3, + ID_SCENE_A0F4 = 0xA0F4, + ID_SCENE_80F5 = 0x80F5, + ID_SCENE_80F6 = 0x80F6, + ID_SCENE_80F7 = 0x80F7, + ID_SCENE_80F8 = 0x80F8, + ID_SCENE_80F9 = 0x80F9, + ID_SCENE_80FA = 0x80FA, + ID_SCENE_A0FB = 0xA0FB, + ID_SCENE_A0FC = 0xA0FC, + ID_SCENE_A0FD = 0xA0FD, + ID_SCENE_80FE = 0x80FE, + ID_SCENE_80FF = 0x80FF, + ID_SCENE_8100 = 0x8100, + ID_SCENE_8101 = 0x8101, + ID_SCENE_8104 = 0x8104, + ID_SCENE_8105 = 0x8105, + ID_SCENE_8106 = 0x8106, + ID_SCENE_8107 = 0x8107, + ID_SCENE_8108 = 0x8108, + ID_SCENE_8109 = 0x8109, + ID_SCENE_810A = 0x810A, + ID_SCENE_810B = 0x810B, + ID_SCENE_8225 = 0x8225, + ID_SCENE_810C = 0x810C, + ID_SCENE_810D = 0x810D, + ID_SCENE_810E = 0x810E, + ID_SCENE_810F = 0x810F, + ID_SCENE_A110 = 0xA110, + ID_SCENE_8112 = 0x8112, + ID_SCENE_8113 = 0x8113, + ID_SCENE_8114 = 0x8114, + ID_SCENE_82A8 = 0x82A8, + ID_SCENE_82A9 = 0x82A9, + ID_SCENE_8119 = 0x8119, + ID_SCENE_811A = 0x811A, + ID_SCENE_811B = 0x811B, + ID_SCENE_811C = 0x811C, + ID_SCENE_811D = 0x811D, + ID_SCENE_A11E = 0xA11E, + ID_SCENE_811F = 0x811F, + ID_SCENE_8120 = 0x8120, + ID_SCENE_8121 = 0x8121, + ID_SCENE_8122 = 0x8122, + ID_SCENE_8123 = 0x8123, + ID_SCENE_8124 = 0x8124, + ID_SCENE_A125 = 0xA125, + ID_SCENE_A126 = 0xA126, + ID_SCENE_8127 = 0x8127, + ID_SCENE_8128 = 0x8128, + ID_SCENE_8129 = 0x8129, + ID_SCENE_812A = 0x812A, + ID_SCENE_812B = 0x812B, + ID_SCENE_812C = 0x812C, + ID_SCENE_812D = 0x812D, + ID_SCENE_A12E = 0xA12E, + ID_SCENE_A12F = 0xA12F, + ID_SCENE_8130 = 0x8130, + ID_SCENE_8131 = 0x8131, + ID_SCENE_A132 = 0xA132, + ID_SCENE_8133 = 0x8133, + ID_SCENE_A134 = 0xA134, + ID_SCENE_A135 = 0xA135, + ID_SCENE_A136 = 0xA136, + ID_SCENE_8137 = 0x8137, + ID_SCENE_8138 = 0x8138, + ID_SCENE_8139 = 0x8139, + ID_SCENE_813A = 0x813A, + ID_SCENE_813B = 0x813B, + ID_SCENE_813C = 0x813C, + ID_SCENE_A13D = 0xA13D, + ID_SCENE_813E = 0x813E, + ID_SCENE_813F = 0x813F, + ID_SCENE_A140 = 0xA140, + ID_SCENE_8141 = 0x8141, + ID_SCENE_8142 = 0x8142, + ID_SCENE_8143 = 0x8143, + ID_SCENE_8144 = 0x8144, + ID_SCENE_8145 = 0x8145, + ID_SCENE_A146 = 0xA146, + ID_SCENE_8147 = 0x8147, + ID_SCENE_8148 = 0x8148, + ID_SCENE_8149 = 0x8149, + ID_SCENE_814A = 0x814A, + ID_SCENE_814B = 0x814B, + ID_SCENE_814C = 0x814C, + ID_SCENE_814D = 0x814D, + ID_SCENE_814E = 0x814E, + ID_SCENE_A14F = 0xA14F, + ID_SCENE_A150 = 0xA150, + ID_SCENE_A151 = 0xA151, + ID_SCENE_8152 = 0x8152, + ID_SCENE_8153 = 0x8153, + ID_SCENE_A154 = 0xA154, + ID_SCENE_A155 = 0xA155, + ID_SCENE_8156 = 0x8156, + ID_SCENE_8157 = 0x8157, + ID_SCENE_8158 = 0x8158, + ID_SCENE_8159 = 0x8159, + ID_SCENE_815A = 0x815A, + ID_SCENE_815B = 0x815B, + ID_SCENE_815C = 0x815C, + ID_SCENE_815D = 0x815D, + ID_SCENE_815E = 0x815E, + ID_SCENE_815F = 0x815F, + ID_SCENE_8160 = 0x8160, + ID_SCENE_8161 = 0x8161, + ID_SCENE_8162 = 0x8162, + ID_SCENE_8163 = 0x8163, + ID_SCENE_8164 = 0x8164, + ID_SCENE_8165 = 0x8165, + ID_SCENE_8166 = 0x8166, + ID_SCENE_8167 = 0x8167, + ID_SCENE_8168 = 0x8168, + ID_SCENE_8169 = 0x8169, + ID_SCENE_816A = 0x816A, + ID_SCENE_A16B = 0xA16B, + ID_SCENE_816C = 0x816C, + ID_SCENE_A16D = 0xA16D, + ID_SCENE_A16E = 0xA16E, + ID_SCENE_A16F = 0xA16F, + ID_SCENE_A170 = 0xA170, + ID_SCENE_A171 = 0xA171, + ID_SCENE_A172 = 0xA172, + ID_SCENE_A173 = 0xA173, + ID_SCENE_8174 = 0x8174, + ID_SCENE_8175 = 0x8175, + ID_SCENE_8176 = 0x8176, + ID_SCENE_8177 = 0x8177, + ID_SCENE_8178 = 0x8178, + ID_SCENE_822D = 0x822D, + ID_SCENE_8179 = 0x8179, + ID_SCENE_817A = 0x817A, + ID_SCENE_817B = 0x817B, + ID_SCENE_A17C = 0xA17C, + ID_SCENE_A17D = 0xA17D, + ID_SCENE_817E = 0x817E, + ID_SCENE_817F = 0x817F, + ID_SCENE_A180 = 0xA180, + ID_SCENE_A181 = 0xA181, + ID_SCENE_8182 = 0x8182, + ID_SCENE_8183 = 0x8183, + ID_SCENE_8411 = 0x8411, + ID_SCENE_8412 = 0x8412, + ID_SCENE_8184 = 0x8184, + ID_SCENE_8185 = 0x8185, + ID_SCENE_8186 = 0x8186, + ID_SCENE_A187 = 0xA187, + ID_SCENE_8188 = 0x8188, + ID_SCENE_8189 = 0x8189, + ID_SCENE_818A = 0x818A, + ID_SCENE_818B = 0x818B, + ID_SCENE_818C = 0x818C, + ID_SCENE_818D = 0x818D, + ID_SCENE_818E = 0x818E, + ID_SCENE_818F = 0x818F, + ID_SCENE_8190 = 0x8190, + ID_SCENE_8191 = 0x8191, + ID_SCENE_8192 = 0x8192, + ID_SCENE_8193 = 0x8193, + ID_SCENE_8194 = 0x8194, + ID_SCENE_8195 = 0x8195, + ID_SCENE_8196 = 0x8196, + ID_SCENE_8197 = 0x8197, + ID_SCENE_8198 = 0x8198, + ID_SCENE_8199 = 0x8199, + ID_SCENE_819A = 0x819A, + ID_SCENE_819B = 0x819B, + ID_SCENE_819C = 0x819C, + ID_SCENE_8217 = 0x8217, + ID_SCENE_827D = 0x827D, + ID_SCENE_819D = 0x819D, + ID_SCENE_819E = 0x819E, + ID_SCENE_819F = 0x819F, + ID_SCENE_81A0 = 0x81A0, + ID_SCENE_81A1 = 0x81A1, + ID_SCENE_81A2 = 0x81A2, + ID_SCENE_81A3 = 0x81A3, + ID_SCENE_81A4 = 0x81A4, + ID_SCENE_81A5 = 0x81A5, + ID_SCENE_81A6 = 0x81A6, + ID_SCENE_81A7 = 0x81A7, + ID_SCENE_81A8 = 0x81A8, + ID_SCENE_81A9 = 0x81A9, + ID_SCENE_81AA = 0x81AA, + ID_SCENE_81AB = 0x81AB, + ID_SCENE_A1BC = 0xA1BC, + ID_SCENE_81AE = 0x81AE, + ID_SCENE_81AF = 0x81AF, + ID_SCENE_81B0 = 0x81B0, + ID_SCENE_81B1 = 0x81B1, + ID_SCENE_81B2 = 0x81B2, + ID_SCENE_A1B3 = 0xA1B3, + ID_SCENE_81B4 = 0x81B4, + ID_SCENE_81B5 = 0x81B5, + ID_SCENE_81B6 = 0x81B6, + ID_SCENE_81B7 = 0x81B7, + ID_SCENE_81B8 = 0x81B8, + ID_SCENE_81BA = 0x81BA, + ID_SCENE_81BB = 0x81BB, + ID_SCENE_8213 = 0x8213, + ID_SCENE_8290 = 0x8290, + ID_SCENE_81BD = 0x81BD, + ID_SCENE_81BE = 0x81BE, + ID_SCENE_81BF = 0x81BF, + ID_SCENE_A1C0 = 0xA1C0, + ID_SCENE_A1C1 = 0xA1C1, + ID_SCENE_81C2 = 0x81C2, + ID_SCENE_81C3 = 0x81C3, + ID_SCENE_A1D8 = 0xA1D8, + ID_SCENE_A1D9 = 0xA1D9, + ID_SCENE_A1DA = 0xA1DA, + ID_SCENE_A1DB = 0xA1DB, + ID_SCENE_A1DC = 0xA1DC, + ID_SCENE_A1DD = 0xA1DD, + ID_SCENE_A1DE = 0xA1DE, + ID_SCENE_A1DF = 0xA1DF, + ID_SCENE_A1E0 = 0xA1E0, + ID_SCENE_81E1 = 0x81E1, + ID_SCENE_A1E2 = 0xA1E2, + ID_SCENE_81E3 = 0x81E3, + ID_SCENE_81E4 = 0x81E4, + ID_SCENE_81E5 = 0x81E5, + ID_SCENE_81E6 = 0x81E6, + ID_SCENE_81E7 = 0x81E7, + ID_SCENE_81E8 = 0x81E8, + ID_SCENE_81E9 = 0x81E9, + ID_SCENE_81C4 = 0x81C4, + ID_SCENE_81C5 = 0x81C5, + ID_SCENE_81C6 = 0x81C6, + ID_SCENE_81C7 = 0x81C7, + ID_SCENE_81C8 = 0x81C8, + ID_SCENE_81C9 = 0x81C9, + ID_SCENE_81CA = 0x81CA, + ID_SCENE_81CB = 0x81CB, + ID_SCENE_81CC = 0x81CC, + ID_SCENE_81CD = 0x81CD, + ID_SCENE_81CE = 0x81CE, + ID_SCENE_81CF = 0x81CF, + ID_SCENE_81EE = 0x81EE, + ID_SCENE_81EF = 0x81EF, + ID_SCENE_81F0 = 0x81F0, + ID_SCENE_8218 = 0x8218, + ID_SCENE_8219 = 0x8219, + ID_SCENE_821A = 0x821A, + ID_SCENE_821B = 0x821B, + ID_SCENE_821C = 0x821C, + ID_SCENE_821D = 0x821D, + ID_SCENE_821E = 0x821E, + ID_SCENE_8242 = 0x8242, + ID_SCENE_8243 = 0x8243, + ID_SCENE_8244 = 0x8244, + ID_SCENE_8245 = 0x8245, + ID_SCENE_8246 = 0x8246, + ID_SCENE_826B = 0x826B, + ID_SCENE_8405 = 0x8405, + ID_SCENE_8406 = 0x8406, + ID_SCENE_81D0 = 0x81D0, + ID_SCENE_81D1 = 0x81D1, + ID_SCENE_81D2 = 0x81D2, + ID_SCENE_81D3 = 0x81D3, + ID_SCENE_81D4 = 0x81D4, + ID_SCENE_820A = 0x820A, + ID_SCENE_820B = 0x820B, + ID_SCENE_820C = 0x820C, + ID_SCENE_81FE = 0x81FE, + ID_SCENE_81FF = 0x81FF, + ID_SCENE_8200 = 0x8200, + ID_SCENE_8201 = 0x8201, + ID_SCENE_8202 = 0x8202, + ID_SCENE_8203 = 0x8203, + ID_SCENE_8204 = 0x8204, + ID_SCENE_8205 = 0x8205, + ID_SCENE_8206 = 0x8206, + ID_SCENE_8207 = 0x8207, + ID_SCENE_8208 = 0x8208, + ID_SCENE_8209 = 0x8209, + ID_SCENE_82CC = 0x82CC, + ID_SCENE_820E = 0x820E, + ID_SCENE_820F = 0x820F, + ID_SCENE_821F = 0x821F, + ID_SCENE_8220 = 0x8220, + ID_SCENE_8223 = 0x8223, + ID_SCENE_8224 = 0x8224, + ID_SCENE_8226 = 0x8226, + ID_SCENE_8232 = 0x8232, + ID_SCENE_8294 = 0x8294, + ID_SCENE_82B1 = 0x82B1, + ID_SCENE_82B2 = 0x82B2, + ID_SCENE_822E = 0x822E, + ID_SCENE_822F = 0x822F, + ID_SCENE_A230 = 0xA230, + ID_SCENE_8268 = 0x8268, + ID_SCENE_8269 = 0x8269, + ID_SCENE_826A = 0x826A, + ID_SCENE_8231 = 0x8231, + ID_SCENE_8236 = 0x8236, + ID_SCENE_8237 = 0x8237, + ID_SCENE_8238 = 0x8238, + ID_SCENE_8239 = 0x8239, + ID_SCENE_823A = 0x823A, + ID_SCENE_823B = 0x823B, + ID_SCENE_823C = 0x823C, + ID_SCENE_823D = 0x823D, + ID_SCENE_8280 = 0x8280, + ID_SCENE_8281 = 0x8281, + ID_SCENE_8282 = 0x8282, + ID_SCENE_8283 = 0x8283, + ID_SCENE_8284 = 0x8284, + ID_SCENE_8287 = 0x8287, + ID_SCENE_8288 = 0x8288, + ID_SCENE_8289 = 0x8289, + ID_SCENE_A247 = 0xA247, + ID_SCENE_A248 = 0xA248, + ID_SCENE_8249 = 0x8249, + ID_SCENE_A24A = 0xA24A, + ID_SCENE_824B = 0x824B, + ID_SCENE_A24C = 0xA24C, + ID_SCENE_824D = 0x824D, + ID_SCENE_824E = 0x824E, + ID_SCENE_A24F = 0xA24F, + ID_SCENE_8250 = 0x8250, + ID_SCENE_A251 = 0xA251, + ID_SCENE_8252 = 0x8252, + ID_SCENE_8253 = 0x8253, + ID_SCENE_8254 = 0x8254, + ID_SCENE_8255 = 0x8255, + ID_SCENE_A256 = 0xA256, + ID_SCENE_8257 = 0x8257, + ID_SCENE_A258 = 0xA258, + ID_SCENE_8259 = 0x8259, + ID_SCENE_A25A = 0xA25A, + ID_SCENE_825B = 0x825B, + ID_SCENE_825C = 0x825C, + ID_SCENE_825D = 0x825D, + ID_SCENE_825E = 0x825E, + ID_SCENE_825F = 0x825F, + ID_SCENE_A260 = 0xA260, + ID_SCENE_A261 = 0xA261, + ID_SCENE_A262 = 0xA262, + ID_SCENE_A263 = 0xA263, + ID_SCENE_8264 = 0x8264, + ID_SCENE_8265 = 0x8265, + ID_SCENE_8266 = 0x8266, + ID_SCENE_A267 = 0xA267, + ID_SCENE_826C = 0x826C, + ID_SCENE_PEDESTAL_OCTAGON_GLOW = 0x826D, + ID_SCENE_826E = 0x826E, + ID_SCENE_826F = 0x826F, + ID_SCENE_8270 = 0x8270, + ID_SCENE_8271 = 0x8271, + ID_SCENE_8275 = 0x8275, + ID_SCENE_8276 = 0x8276, + ID_SCENE_827E = 0x827E, + ID_SCENE_827F = 0x827F, + ID_SCENE_828B = 0x828B, + ID_SCENE_828C = 0x828C, + ID_SCENE_828D = 0x828D, + ID_SCENE_828E = 0x828E, + ID_SCENE_828F = 0x828F, + ID_SCENE_8291 = 0x8291, + ID_SCENE_8292 = 0x8292, + ID_SCENE_8295 = 0x8295, + ID_SCENE_8296 = 0x8296, + ID_SCENE_8297 = 0x8297, + ID_SCENE_8298 = 0x8298, + ID_SCENE_82A2 = 0x82A2, + ID_SCENE_A2A3 = 0xA2A3, + ID_SCENE_82A4 = 0x82A4, + ID_SCENE_82A5 = 0x82A5, + ID_SCENE_82A6 = 0x82A6, + ID_SCENE_82A7 = 0x82A7, + ID_SCENE_82AA = 0x82AA, + ID_SCENE_82AB = 0x82AB, + ID_SCENE_82AC = 0x82AC, + ID_SCENE_82AD = 0x82AD, + ID_SCENE_82AE = 0x82AE, + ID_SCENE_82AF = 0x82AF, + ID_SCENE_82B0 = 0x82B0, + ID_SCENE_82B3 = 0x82B3, + ID_SCENE_82B4 = 0x82B4, + ID_SCENE_82B5 = 0x82B5, + ID_SCENE_82B6 = 0x82B6, + ID_SCENE_82B7 = 0x82B7, + ID_SCENE_82B8 = 0x82B8, + ID_SCENE_82BA = 0x82BA, + ID_SCENE_82BB = 0x82BB, + ID_SCENE_A2C2 = 0xA2C2, + ID_SCENE_A2C3 = 0xA2C3, + ID_SCENE_82EC = 0x82EC, + ID_SCENE_A2ED = 0xA2ED, + ID_SCENE_82EE = 0x82EE, + ID_SCENE_82C4 = 0x82C4, + ID_SCENE_82C5 = 0x82C5, + ID_SCENE_82C8 = 0x82C8, + ID_SCENE_82C9 = 0x82C9, + ID_SCENE_82CA = 0x82CA, + ID_SCENE_82CD = 0x82CD, + ID_SCENE_82CE = 0x82CE, + ID_SCENE_82CF = 0x82CF, + ID_SCENE_A2D0 = 0xA2D0, + ID_SCENE_82D1 = 0x82D1, + ID_SCENE_82D2 = 0x82D2, + ID_SCENE_82D3 = 0x82D3, + ID_SCENE_82D4 = 0x82D4, + ID_SCENE_82D5 = 0x82D5, + ID_SCENE_82D6 = 0x82D6, + ID_SCENE_8310 = 0x8310, + ID_SCENE_8311 = 0x8311, + ID_SCENE_8312 = 0x8312, + ID_SCENE_A401 = 0xA401, + ID_SCENE_A402 = 0xA402, + ID_SCENE_A403 = 0xA403, + ID_SCENE_A404 = 0xA404, + ID_SCENE_8444 = 0x8444, + ID_SCENE_8445 = 0x8445, + ID_SCENE_8456 = 0x8456, + ID_SCENE_845A = 0x845A, + ID_SCENE_82D7 = 0x82D7, + ID_SCENE_82D8 = 0x82D8, + ID_SCENE_82DD = 0x82DD, + ID_SCENE_82DE = 0x82DE, + ID_SCENE_82DF = 0x82DF, + ID_SCENE_A2E0 = 0xA2E0, + ID_SCENE_82EA = 0x82EA, + ID_SCENE_82EB = 0x82EB, + ID_SCENE_82E4 = 0x82E4, + ID_SCENE_82E5 = 0x82E5, + ID_SCENE_82E6 = 0x82E6, + ID_SCENE_830B = 0x830B, + ID_SCENE_830C = 0x830C, + ID_SCENE_8313 = 0x8313, + ID_SCENE_8315 = 0x8315, + ID_SCENE_833D = 0x833D, + ID_SCENE_8316 = 0x8316, + ID_SCENE_A320 = 0xA320, + ID_SCENE_833A = 0x833A, + ID_SCENE_A328 = 0xA328, + ID_SCENE_A33B = 0xA33B, + ID_SCENE_A329 = 0xA329, + ID_SCENE_837D = 0x837D, + ID_SCENE_837E = 0x837E, + ID_SCENE_837F = 0x837F, + ID_SCENE_8380 = 0x8380, + ID_SCENE_8381 = 0x8381, + ID_SCENE_8382 = 0x8382, + ID_SCENE_8383 = 0x8383, + ID_SCENE_8384 = 0x8384, + ID_SCENE_8385 = 0x8385, + ID_SCENE_833C = 0x833C, + ID_SCENE_83D9 = 0x83D9, + ID_SCENE_8386 = 0x8386, + ID_SCENE_8387 = 0x8387, + ID_SCENE_8388 = 0x8388, + ID_SCENE_8389 = 0x8389, + ID_SCENE_838A = 0x838A, + ID_SCENE_838B = 0x838B, + ID_SCENE_838C = 0x838C, + ID_SCENE_838D = 0x838D, + ID_SCENE_832D = 0x832D, + ID_SCENE_832E = 0x832E, + ID_SCENE_832F = 0x832F, + ID_SCENE_8330 = 0x8330, + ID_SCENE_838E = 0x838E, + ID_SCENE_838F = 0x838F, + ID_SCENE_8390 = 0x8390, + ID_SCENE_8391 = 0x8391, + ID_SCENE_8392 = 0x8392, + ID_SCENE_8393 = 0x8393, + ID_SCENE_8394 = 0x8394, + ID_SCENE_8395 = 0x8395, + ID_SCENE_8396 = 0x8396, + ID_SCENE_8397 = 0x8397, + ID_SCENE_8398 = 0x8398, + ID_SCENE_8399 = 0x8399, + ID_SCENE_839A = 0x839A, + ID_SCENE_839B = 0x839B, + ID_SCENE_839C = 0x839C, + ID_SCENE_839D = 0x839D, + ID_SCENE_839E = 0x839E, + ID_SCENE_839F = 0x839F, + ID_SCENE_83A0 = 0x83A0, + ID_SCENE_83A1 = 0x83A1, + ID_SCENE_83A2 = 0x83A2, + ID_SCENE_83A3 = 0x83A3, + ID_SCENE_83A4 = 0x83A4, + ID_SCENE_83A5 = 0x83A5, + ID_SCENE_83A6 = 0x83A6, + ID_SCENE_83A7 = 0x83A7, + ID_SCENE_83A8 = 0x83A8, + ID_SCENE_83A9 = 0x83A9, + ID_SCENE_83AA = 0x83AA, + ID_SCENE_83AB = 0x83AB, + ID_SCENE_83AC = 0x83AC, + ID_SCENE_83AD = 0x83AD, + ID_SCENE_83AE = 0x83AE, + ID_SCENE_83AF = 0x83AF, + ID_SCENE_83B0 = 0x83B0, + ID_SCENE_83B1 = 0x83B1, + ID_SCENE_83B2 = 0x83B2, + ID_SCENE_83B3 = 0x83B3, + ID_SCENE_83B4 = 0x83B4, + ID_SCENE_83B5 = 0x83B5, + ID_SCENE_83B6 = 0x83B6, + ID_SCENE_83B7 = 0x83B7, + ID_SCENE_83B8 = 0x83B8, + ID_SCENE_83B9 = 0x83B9, + ID_SCENE_83BA = 0x83BA, + ID_SCENE_83BB = 0x83BB, + ID_SCENE_83BC = 0x83BC, + ID_SCENE_83BD = 0x83BD, + ID_SCENE_83BE = 0x83BE, + ID_SCENE_83BF = 0x83BF, + ID_SCENE_83C0 = 0x83C0, + ID_SCENE_83C1 = 0x83C1, + ID_SCENE_83C2 = 0x83C2, + ID_SCENE_83C3 = 0x83C3, + ID_SCENE_83C4 = 0x83C4, + ID_SCENE_83C5 = 0x83C5, + ID_SCENE_8433 = 0x8433, + ID_SCENE_833E = 0x833E, + ID_SCENE_833F = 0x833F, + ID_SCENE_8340 = 0x8340, + ID_SCENE_8341 = 0x8341, + ID_SCENE_8342 = 0x8342, + ID_SCENE_8343 = 0x8343, + ID_SCENE_A344 = 0xA344, + ID_SCENE_83CD = 0x83CD, + ID_SCENE_83CE = 0x83CE, + ID_SCENE_83CF = 0x83CF, + ID_SCENE_83D0 = 0x83D0, + ID_SCENE_83D1 = 0x83D1, + ID_SCENE_83D2 = 0x83D2, + ID_SCENE_83D3 = 0x83D3, + ID_SCENE_83D4 = 0x83D4, + ID_SCENE_83D5 = 0x83D5, + ID_SCENE_83D6 = 0x83D6, + ID_SCENE_83D7 = 0x83D7, + ID_SCENE_8346 = 0x8346, + ID_SCENE_8347 = 0x8347, + ID_SCENE_8348 = 0x8348, + ID_SCENE_8349 = 0x8349, + ID_SCENE_834A = 0x834A, + ID_SCENE_834B = 0x834B, + ID_SCENE_834C = 0x834C, + ID_SCENE_834D = 0x834D, + ID_SCENE_834E = 0x834E, + ID_SCENE_834F = 0x834F, + ID_SCENE_8350 = 0x8350, + ID_SCENE_8351 = 0x8351, + ID_SCENE_8352 = 0x8352, + ID_SCENE_8353 = 0x8353, + ID_SCENE_8354 = 0x8354, + ID_SCENE_8355 = 0x8355, + ID_SCENE_8356 = 0x8356, + ID_SCENE_835B = 0x835B, + ID_SCENE_842D = 0x842D, + ID_SCENE_842E = 0x842E, + ID_SCENE_842F = 0x842F, + ID_SCENE_83F9 = 0x83F9, + ID_SCENE_83FA = 0x83FA, + ID_SCENE_83FB = 0x83FB, + ID_SCENE_A413 = 0xA413, + ID_SCENE_8414 = 0x8414, + ID_SCENE_8415 = 0x8415, + ID_SCENE_8416 = 0x8416, + ID_SCENE_8417 = 0x8417, + ID_SCENE_A418 = 0xA418, + ID_SCENE_8419 = 0x8419, + ID_SCENE_841A = 0x841A, + ID_SCENE_841B = 0x841B, + ID_SCENE_841C = 0x841C, + ID_SCENE_A470 = 0xA470, + ID_SCENE_8457 = 0x8457, + ID_SCENE_8458 = 0x8458, + ID_SCENE_8459 = 0x8459, + ID_SCENE_8426 = 0x8426, + ID_SCENE_8427 = 0x8427, + ID_SCENE_8454 = 0x8454, + ID_SCENE_8434 = 0x8434, + ID_SCENE_8435 = 0x8435, + ID_SCENE_8436 = 0x8436, + ID_SCENE_8428 = 0x8428, + ID_SCENE_WARPFOUT_WARP4 = 0x830E, + ID_SCENE_830F = 0x830F, + ID_SCENE_82D9 = 0x82D9, + ID_SCENE_82DA = 0x82DA, + ID_SCENE_82DB = 0x82DB, + ID_SCENE_82DC = 0x82DC, + ID_SCENE_846D = 0x846D, + ID_SCENE_846E = 0x846E, + ID_SCENE_846F = 0x846F, + ID_SCENE_83FD = 0x83FD, + ID_SCENE_83FE = 0x83FE, + ID_SCENE_841D = 0x841D, + ID_SCENE_841E = 0x841E, + ID_SCENE_A2CB = 0xA2CB, + ID_SCENE_8326 = 0x8326, + ID_SCENE_82F2 = 0x82F2, + ID_SCENE_82F3 = 0x82F3, + ID_SCENE_82F4 = 0x82F4, + ID_SCENE_82F5 = 0x82F5, + ID_SCENE_82F6 = 0x82F6, + ID_SCENE_82F7 = 0x82F7, + ID_SCENE_82F8 = 0x82F8, + ID_SCENE_82F9 = 0x82F9, + ID_SCENE_82FA = 0x82FA, + ID_SCENE_82FB = 0x82FB, + ID_SCENE_82FC = 0x82FC, + ID_SCENE_82FD = 0x82FD, + ID_SCENE_82FE = 0x82FE, + ID_SCENE_82FF = 0x82FF, + ID_SCENE_8300 = 0x8300, + ID_SCENE_8301 = 0x8301, + ID_SCENE_8302 = 0x8302, + ID_SCENE_8308 = 0x8308, + ID_SCENE_8304 = 0x8304, + ID_SCENE_8305 = 0x8305, + ID_SCENE_8317 = 0x8317, + ID_SCENE_8318 = 0x8318, + ID_SCENE_8319 = 0x8319, + ID_SCENE_831A = 0x831A, + ID_SCENE_831B = 0x831B, + ID_SCENE_831C = 0x831C, + ID_SCENE_831D = 0x831D, + ID_SCENE_831E = 0x831E, + ID_SCENE_831F = 0x831F, + ID_SCENE_82BC = 0x82BC, + ID_SCENE_82BD = 0x82BD, + ID_SCENE_83D8 = 0x83D8, + ID_SCENE_82BE = 0x82BE, + ID_SCENE_82BF = 0x82BF, + ID_SCENE_82C0 = 0x82C0, + ID_SCENE_82C1 = 0x82C1, + ID_SCENE_846A = 0x846A, + ID_SCENE_846B = 0x846B, + ID_SCENE_846C = 0x846C, + ID_SCENE_8321 = 0x8321, + ID_SCENE_8322 = 0x8322, + ID_SCENE_8323 = 0x8323, + ID_SCENE_8324 = 0x8324, + ID_SCENE_8331 = 0x8331, + ID_SCENE_8332 = 0x8332, + ID_SCENE_8333 = 0x8333, + ID_SCENE_8334 = 0x8334, + ID_SCENE_8338 = 0x8338, + ID_SCENE_8339 = 0x8339, + ID_SCENE_83C6 = 0x83C6, + ID_SCENE_83C7 = 0x83C7, + ID_SCENE_83C8 = 0x83C8, + ID_SCENE_83C9 = 0x83C9, + ID_SCENE_83CA = 0x83CA, + ID_SCENE_83CB = 0x83CB, + ID_SCENE_83CC = 0x83CC, + ID_SCENE_842A = 0x842A, + ID_SCENE_841F = 0x841F, + ID_SCENE_8420 = 0x8420, + ID_SCENE_8421 = 0x8421, + ID_SCENE_8422 = 0x8422, + ID_SCENE_8430 = 0x8430, + ID_SCENE_8423 = 0x8423, + ID_SCENE_8424 = 0x8424, + ID_SCENE_8425 = 0x8425, + ID_SCENE_8446 = 0x8446, + ID_SCENE_8447 = 0x8447, + ID_SCENE_8448 = 0x8448, + ID_SCENE_8449 = 0x8449, + ID_SCENE_844A = 0x844A, + ID_SCENE_844B = 0x844B, + ID_SCENE_844C = 0x844C, + ID_SCENE_844D = 0x844D, + ID_SCENE_844E = 0x844E, + ID_SCENE_844F = 0x844F, + ID_SCENE_8450 = 0x8450, + ID_SCENE_8451 = 0x8451, + ID_SCENE_8452 = 0x8452, + ID_SCENE_8327 = 0x8327, + ID_SCENE_842B = 0x842B, + ID_SCENE_8431 = 0x8431, ID_SCENE_END = 0x8466, }; diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 80e319742..c2b9dae8b 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -216,7 +216,7 @@ BOOL enemy_ice(enemyice* ei) { particleScale.setall(ei->mParticleScale); pos = ac->current.pos; pos.y += ei->mYOffset; - dComIfGp_particle_set(0x274, &pos, NULL, &particleScale); + dComIfGp_particle_set(dPa_name::ID_COMMON_0274, &pos, NULL, &particleScale); } else { return FALSE; } @@ -322,12 +322,12 @@ BOOL enemy_ice(enemyice* ei) { particleScale.setall(ei->mParticleScale); pos = ac->current.pos; pos.y += ei->mYOffset; - dComIfGp_particle_set(0x273, &pos, NULL, &particleScale); - dComIfGp_particle_set(0x274, &pos, NULL, &particleScale); + dComIfGp_particle_set(dPa_name::ID_COMMON_0273, &pos, NULL, &particleScale); + dComIfGp_particle_set(dPa_name::ID_COMMON_0274, &pos, NULL, &particleScale); if (ei->mFreezeTimer == -2) { // Shattered by Skull Hammer. - dComIfGp_particle_set(0x10, &pos); + dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &pos); csXyz angle(0, fopAcM_searchPlayerAngleY(ac), 0); particleScale.setall(2.0f); dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &pos, &angle, &particleScale); @@ -375,7 +375,7 @@ BOOL enemy_ice(enemyice* ei) { particleScale.setall(ei->mParticleScale); pos = ac->current.pos; pos.y += ei->mYOffset; - dComIfGp_particle_set(0x277, &pos, NULL, &particleScale); + dComIfGp_particle_set(dPa_name::ID_COMMON_0277, &pos, NULL, &particleScale); fopAcM_seStart(ac, JA_SE_CM_ICE_RECOVER, 0); } } @@ -459,7 +459,7 @@ void enemy_fire(enemyfire* ef) { } cXyz scale; scale.setall(ef->mParticleScale[i]); - ef->mpFlameEmitters[i] = dComIfGp_particle_set(0x3F1, &ac->current.pos, NULL, &scale); + ef->mpFlameEmitters[i] = dComIfGp_particle_set(dPa_name::ID_COMMON_03F1, &ac->current.pos, NULL, &scale); ef->mFlameTimers[i] = ef->mFireTimer - (s16)cM_rndF(60.0f); if (ef->mFlameTimers[i] < 10) { ef->mFlameTimers[i] = 10; diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 9a584c43d..e8ee08b5e 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -510,7 +510,7 @@ int daAgb_c::uploadMessageSend() { field_0x664 = 60; dComIfGs_onEventBit(0x1A20); - dComIfGp_particle_set(0x2E7, ¤t.pos, NULL, NULL, 255, &field_0x684); + dComIfGp_particle_set(dPa_name::ID_COMMON_02E7, ¤t.pos, NULL, NULL, 255, &field_0x684); JKRHeap::free(l_gbaCommand->getMemAddress(), NULL); delete l_gbaCommand; diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index d7f44d351..7e40dee72 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -273,7 +273,7 @@ static BOOL medama_atari_check(am_class* i_this) { i_this->mAction = ACTION_DOUSA; i_this->mState = 2; } else { - dComIfGp_particle_set(0x10, &i_this->mEyeballPos, &player->shape_angle); + dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &i_this->mEyeballPos, &player->shape_angle); // fopAcM_seStart(i_this, JA_SE_CM_AM_EYE_DAMAGE, 0); mDoAud_seStart(JA_SE_CM_AM_EYE_DAMAGE, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); fopAcM_monsSeStart(i_this, JA_SE_CV_AM_EYE_DAMAGE, 0x42); @@ -574,7 +574,7 @@ static void action_dousa(am_class* i_this) { fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP, 0); i_this->mSmokeCbs[0].end(); dComIfGp_particle_setToon( - 0xA125, &i_this->mWaistPos, &i_this->shape_angle, NULL, + dPa_name::ID_SCENE_A125, &i_this->mWaistPos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCbs[0], fopAcM_GetRoomNo(i_this) ); dComIfGp_getVibration().StartShock(3, -0x21, cXyz(0.0f, 1.0f, 0.0f)); @@ -604,7 +604,7 @@ static void action_dousa(am_class* i_this) { i_this->mNeedleCyl.OffAtSetBit(); if (i_this->mSmokeCbs[2].getEmitter() == NULL) { dComIfGp_particle_setToon( - 0xA154, &i_this->mWaistPos, &i_this->shape_angle, NULL, + dPa_name::ID_SCENE_A154, &i_this->mWaistPos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCbs[2], fopAcM_GetRoomNo(i_this) ); } @@ -673,7 +673,7 @@ static void action_modoru_move(am_class* i_this) { if (i_this->mAcch.ChkGroundHit()) { i_this->mSmokeCbs[0].end(); dComIfGp_particle_setToon( - 0xA125, &i_this->mWaistPos, &i_this->shape_angle, NULL, + dPa_name::ID_SCENE_A125, &i_this->mWaistPos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCbs[0], fopAcM_GetRoomNo(i_this) ); @@ -796,7 +796,7 @@ static void action_itai_move(am_class* i_this) { i_this->mSmokeCbs[3].end(); i_this->mStts.SetWeight(0xFF); dComIfGp_particle_setToon( - 0xA155, &i_this->mJawPos, &i_this->shape_angle, NULL, + dPa_name::ID_SCENE_A155, &i_this->mJawPos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCbs[3], fopAcM_GetRoomNo(i_this) ); fopAcM_seStart(i_this, JA_SE_CM_AM_MOUTH_CLOSE, 0); @@ -821,11 +821,11 @@ static void action_itai_move(am_class* i_this) { i_this->mNeedleCyl.OnAtSetBit(); i_this->mNeedleCyl.OnAtHitBit(); dComIfGp_particle_setToon( - 0xA126, &i_this->mJawPos, &i_this->shape_angle, NULL, + dPa_name::ID_SCENE_A126, &i_this->mJawPos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCbs[1], fopAcM_GetRoomNo(i_this) ); - i_this->m033C = dComIfGp_particle_set(0x8157, &i_this->mJawPos); - i_this->m0340 = dComIfGp_particle_set(0x8156, &i_this->mJawPos); + i_this->m033C = dComIfGp_particle_set(dPa_name::ID_SCENE_8157, &i_this->mJawPos); + i_this->m0340 = dComIfGp_particle_set(dPa_name::ID_SCENE_8156, &i_this->mJawPos); } if (!i_this->mpMorf->isStop()) { @@ -844,7 +844,7 @@ static void action_itai_move(am_class* i_this) { // fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP, 0); mDoAud_seStart(JA_SE_CM_AM_JUMP, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); dComIfGp_particle_setToon( - 0xA125, &i_this->mWaistPos, &i_this->shape_angle, NULL, + dPa_name::ID_SCENE_A125, &i_this->mWaistPos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCbs[0], fopAcM_GetRoomNo(i_this) ); dComIfGp_getVibration().StartShock(1, -0x21, cXyz(0.0f, 1.0f, 0.0f)); @@ -861,8 +861,8 @@ static void action_itai_move(am_class* i_this) { break; } anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); - dComIfGp_particle_set(0x8127, &i_this->mWaistPos); - dComIfGp_particle_set(0x8128, &i_this->mWaistPos); + dComIfGp_particle_set(dPa_name::ID_SCENE_8127, &i_this->mWaistPos); + dComIfGp_particle_set(dPa_name::ID_SCENE_8128, &i_this->mWaistPos); fopAcM_seStart(i_this, JA_SE_CM_AM_BEF_EXPLODE, 0); i_this->mTargetAngleY = i_this->current.angle.y; @@ -956,8 +956,8 @@ static BOOL daAM_Execute(am_class* i_this) { if (i_this->mAction != ACTION_ITAI_MOVE && i_this->mSpawnPosY - 1500.0f > i_this->current.pos.y) { anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); - dComIfGp_particle_set(0x8127, &i_this->mWaistPos); - dComIfGp_particle_set(0x8128, &i_this->mWaistPos); + dComIfGp_particle_set(dPa_name::ID_SCENE_8127, &i_this->mWaistPos); + dComIfGp_particle_set(dPa_name::ID_SCENE_8128, &i_this->mWaistPos); fopAcM_seStart(i_this, JA_SE_CM_AM_BEF_EXPLODE, 0); diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 73076b51f..01948b4cc 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -179,7 +179,7 @@ static BOOL medama_atari_check(am2_class* i_this) { i_this->mAction = ACTION_DOUSA; i_this->mState = 2; } else { - dComIfGp_particle_set(0x10, &hitPos, &player->shape_angle); + dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &hitPos, &player->shape_angle); // Using the fopAcM_seStart inline breaks the codegen. // fopAcM_seStart(i_this, JA_SE_CM_AM2_PARALYZED, 0); mDoAud_seStart(JA_SE_CM_AM2_PARALYZED, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); @@ -286,7 +286,7 @@ static BOOL week_atari_check(am2_class* i_this) { cc_at_check(actor, &atInfo); if (hitType == 1) { - dComIfGp_particle_set(0x10, &hitPos); + dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &hitPos); cXyz particleScale(2.0f, 2.0f, 2.0f); dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &hitPos, &player->shape_angle, &particleScale); } else { @@ -422,7 +422,7 @@ static BOOL naraku_check(am2_class* i_this) { cXyz particleScale(1.0f, 1.0f, 1.0f); i_this->mRippleCb.end(); - dComIfGp_particle_setShipTail(0x33, &i_this->current.pos, NULL, &particleScale, 0xFF, &i_this->mRippleCb); + dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->current.pos, NULL, &particleScale, 0xFF, &i_this->mRippleCb); i_this->mRippleCb.setRate(0.0f); } } @@ -543,7 +543,7 @@ static void action_dousa(am2_class* i_this) { // fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP_S, 0); mDoAud_seStart(JA_SE_CM_AM_JUMP_S, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); - dComIfGp_particle_setToon(0xA125, &i_this->current.pos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(i_this)); + dComIfGp_particle_setToon(dPa_name::ID_SCENE_A125, &i_this->current.pos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(i_this)); if (i_this->mSmokeCb.getEmitter()) { i_this->mSmokeCb.getEmitter()->setRate(12.0f); JGeometry::TVec3 scale; @@ -725,7 +725,7 @@ static void action_mahi(am2_class* i_this) { i_this->mSmokeCb.end(); fopAcM_seStart(actor, JA_SE_CM_AM2_LANDING, 0); - dComIfGp_particle_setToon(0xA125, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor)); + dComIfGp_particle_setToon(dPa_name::ID_SCENE_A125, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor)); if (i_this->mSmokeCb.getEmitter()) { i_this->mSmokeCb.getEmitter()->setRate(12.0f); JGeometry::TVec3 scale; @@ -838,7 +838,7 @@ static void action_itai(am2_class* i_this) { i_this->speedF = 20.0f; fopAcM_monsSeStart(i_this, JA_SE_CV_AM2_DAMAGE, 0x42); - dComIfGp_particle_set(0x81AE, &i_this->mWeakPos, &i_this->shape_angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_81AE, &i_this->mWeakPos, &i_this->shape_angle); if (i_this->health > 0) { anm_init(i_this, AM2_BCK_DAMAGE, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); @@ -897,7 +897,7 @@ static void action_itai(am2_class* i_this) { if (i_this->mAcch.ChkGroundHit()) { i_this->mSmokeCb.end(); - dComIfGp_particle_setToon(0xA125, &i_this->current.pos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(i_this)); + dComIfGp_particle_setToon(dPa_name::ID_SCENE_A125, &i_this->current.pos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(i_this)); if (i_this->mSmokeCb.getEmitter()) { i_this->mSmokeCb.getEmitter()->setRate(12.0f); JGeometry::TVec3 scale; @@ -931,8 +931,8 @@ static void action_itai(am2_class* i_this) { cXyz centerPos = i_this->current.pos; centerPos.y += 50.0f; - dComIfGp_particle_set(0x81AF, &i_this->current.pos, &i_this->shape_angle); - dComIfGp_particle_set(0x81B0, &i_this->current.pos, &i_this->shape_angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_81AF, &i_this->current.pos, &i_this->shape_angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_81B0, &i_this->current.pos, &i_this->shape_angle); fopAcM_seStart(i_this, JA_SE_CM_AM2_EXPLODE, 0); fopAcM_createDisappear(i_this, ¢erPos, 5); fopAcM_onActor(i_this); diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index b1ec785f8..d6ba1b183 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -192,7 +192,7 @@ void daArrow_c::setBlur() { /* 800D4994-800D4A04 .text createBlur__9daArrow_cFv */ void daArrow_c::createBlur() { if (!mBlurFollowCb.getEmitter()) { - dComIfGp_particle_setP1(0x48, ¤t.pos, NULL, NULL, 0xFF, &mBlurFollowCb); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_0048, ¤t.pos, NULL, NULL, 0xFF, &mBlurFollowCb); } } @@ -348,7 +348,7 @@ void daArrow_c::ShieldReflect() { targetAngleX = -cLib_targetAngleX(&link->current.pos, &ganondorfChestPos); fpcM_SetParam(ganondorf, 0x23); mSparkleTimer = 15 + REG0_S(3); - mpSparkleEmitter = dComIfGp_particle_set(0x3EE, &link->current.pos); + mpSparkleEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_03EE, &link->current.pos); } // // Regswaps without creating a fake inline. @@ -396,7 +396,7 @@ bool daArrow_c::check_water_in() { if (mArrowType == TYPE_FIRE) { mInWaterTimer = 1; - dComIfGp_particle_setP1(0x35A, &waterHitPos); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_035A, &waterHitPos); if (!field_0x6e4) { dKy_arrowcol_chg_on(¤t.pos, 0); } @@ -410,7 +410,7 @@ bool daArrow_c::check_water_in() { dKy_arrowcol_chg_on(¤t.pos, 1); } } else if (mArrowType == TYPE_LIGHT) { - dComIfGp_particle_setP1(0x2A1, &waterHitPos); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A1, &waterHitPos); fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0); if (!field_0x6e4) { dKy_arrowcol_chg_on(¤t.pos, 2); @@ -692,7 +692,7 @@ BOOL daArrow_c::procMove() { mDoMtx_stack_c::ZXYrotM(temp10.x, temp10.y, 0); cMtx_copy(mDoMtx_stack_c::get(), field_0x6b4); - dComIfGp_particle_setP1(0x2A1, &field_0x6a8, &temp10); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A1, &field_0x6a8, &temp10); fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0); fopAcM_delete(this); } else { @@ -793,15 +793,15 @@ BOOL daArrow_c::procMove() { cMtx_copy(mDoMtx_stack_c::get(), field_0x6b4); if (mArrowType == TYPE_FIRE) { - dComIfGp_particle_setP1(0x29A, &field_0x6a8, &temp10); - dComIfGp_particle_setP1(0x29B, &field_0x6a8, &temp10); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_029A, &field_0x6a8, &temp10); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_029B, &field_0x6a8, &temp10); fopAcM_seStartCurrent(this, JA_SE_OBJ_FIRE_ARW_EFF, 0); field_0x698 = false; } else if (mArrowType == TYPE_ICE) { if (dComIfG_Bgsp()->ChkGrpInf(mLinChk, 0x200)) { fopAcM_create(PROC_Obj_Magmarock, NULL, &field_0x6a8, current.roomNo); } else { - dComIfGp_particle_setP1(0x29E, &field_0x6a8, &temp10); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_029E, &field_0x6a8, &temp10); fopAcM_createChild( PROC_ARROW_ICEEFF, fopAcM_GetID(this), @@ -812,7 +812,7 @@ BOOL daArrow_c::procMove() { fopAcM_seStartCurrent(this, JA_SE_OBJ_ICE_ARW_EFF, 0); } } else if (mArrowType == TYPE_LIGHT) { - dComIfGp_particle_setP1(0x2A1, &field_0x6a8, &temp10); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A1, &field_0x6a8, &temp10); fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0); field_0x698 = false; } diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index 714feaab0..768f5bc9d 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/src/d/actor/d_a_arrow_iceeff.cpp @@ -196,7 +196,7 @@ bool daArrow_Iceeff_c::_execute() { daArrow_c* arrow = static_cast(fopAcM_SearchByID(parentActorID)); if(field_0xA38 == 0) { if(arrow == 0) { - dComIfGp_particle_setP1(0x55, ¤t.pos, ¤t.angle); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_0055, ¤t.pos, ¤t.angle); fopAcM_delete(this); return true; @@ -219,7 +219,7 @@ bool daArrow_Iceeff_c::_execute() { field_0xA30++; } else { - dComIfGp_particle_setP1(0x55, ¤t.pos, ¤t.angle); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_0055, ¤t.pos, ¤t.angle); fopAcM_seStartCurrent(this, JA_SE_OBJ_MINI_ICE_BREAK, 0); fopAcM_delete(arrow); fopAcM_delete(this); @@ -234,7 +234,7 @@ bool daArrow_Iceeff_c::_execute() { csXyz angle; angle.set(-0x4000, 0, 0); - JPABaseEmitter* ptcl = dComIfGp_particle_setP1(0x29E, ¤t.pos, &angle); + JPABaseEmitter* ptcl = dComIfGp_particle_setP1(dPa_name::ID_COMMON_029E, ¤t.pos, &angle); if(ptcl) { JGeometry::TVec3 scale(0.5f, 0.5f, 0.5f); ptcl->setGlobalScale(scale); @@ -258,14 +258,14 @@ bool daArrow_Iceeff_c::_execute() { } if(field_0xA30 == 0x23) { - JPABaseEmitter* ptcl = dComIfGp_particle_setSingleRipple(0x3D, ¤t.pos, NULL, &ripple_scale); + JPABaseEmitter* ptcl = dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, ¤t.pos, NULL, &ripple_scale); if(ptcl) { JGeometry::TVec3 scale(0.67f, 0.67f, 1.0f); ptcl->setGlobalParticleScale(scale); } } else if(field_0xA30 == 0x28) { - JPABaseEmitter* ptcl = dComIfGp_particle_setP1(0x55, ¤t.pos); + JPABaseEmitter* ptcl = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0055, ¤t.pos); if(ptcl) { ptcl->setAwayFromCenterSpeed(25.0f); ptcl->setAwayFromAxisSpeed(5.0f); @@ -276,7 +276,7 @@ bool daArrow_Iceeff_c::_execute() { ptcl->setGlobalParticleScale(scale2); } - dComIfGp_particle_setSingleRipple(0x3F, ¤t.pos, NULL, &ripple_scale); + dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003F, ¤t.pos, NULL, &ripple_scale); fopAcM_seStartCurrent(this, JA_SE_OBJ_MINI_ICE_BREAK, 0); field_0xA3C = 0; diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index 842b7878c..af1e534e7 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/src/d/actor/d_a_arrow_lighteff.cpp @@ -145,23 +145,23 @@ void daArrow_Lighteff_c::CreateInit() { if(field_0x2E8 == 1) { if(field_0x2F4.getEmitter() == 0) { - dComIfGp_particle_setP1(0x299, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x2F4); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_0299, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x2F4); } } else if(field_0x2E8 == 2) { if(field_0x2F4.getEmitter() == 0) { - dComIfGp_particle_setP1(0x29C, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x2F4); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_029C, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x2F4); } if(field_0x308.getEmitter() == 0) { - dComIfGp_particle_setP1(0x29D, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x308); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_029D, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x308); } } else if(field_0x2E8 == 3) { if(field_0x2F4.getEmitter() == 0) { - dComIfGp_particle_setP1(0x29F, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x2F4); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_029F, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x2F4); } if(field_0x308.getEmitter() == 0) { - dComIfGp_particle_setP1(0x2A0, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x308); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A0, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x308); } } @@ -363,7 +363,7 @@ bool daArrow_Lighteff_c::_execute() { if(field_0x2E8 == 1) { fopAcM_seStartCurrent(this, JA_SE_OBJ_FIRE_ARROW_AMB, 0); if(!dComIfGp_checkCameraAttentionStatus(cam, 0x20)) { - dComIfGp_particle_setSimple(0x4004, &field_0x29C, 0xFF, g_whiteColor, g_whiteColor, 0); + dComIfGp_particle_setSimple(dPa_name::ID_COMMON_4004, &field_0x29C, 0xFF, g_whiteColor, g_whiteColor, 0); } } else if(field_0x2E8 == 2) { diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index 3492a41db..bb976814f 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -1144,7 +1144,7 @@ void daAuction_c::eventMainMsgBikonC() { m7A8 = getNpcActorP(m827)->current.pos; m7A8.y += getPiconDispOfs(m827); - dComIfGp_particle_set(0x8153, &m7A8, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this)); + dComIfGp_particle_set(dPa_name::ID_SCENE_8153, &m7A8, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this)); mTimer = 30; if (m827 == 0) { diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index 9cc6a7b99..b58e81450 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/src/d/actor/d_a_bita.cpp @@ -84,9 +84,9 @@ static void mode_dead(bita_class* i_this) { type = 1; if (type == 0) { - dComIfGp_particle_set(0x80e3, &i_this->current.pos, &i_this->shape_angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_80E3, &i_this->current.pos, &i_this->shape_angle); } else { - dComIfGp_particle_set(0x80e4, &i_this->current.pos, &i_this->shape_angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_80E4, &i_this->current.pos, &i_this->shape_angle); } } diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index 207f18d38..e8081a6b8 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -165,7 +165,7 @@ static void smoke_set_s(bk_class* i_this, f32 rate) { case dBgS_Attr_SAND_e: { i_this->m0350.end(); JPABaseEmitter* emitter1 = dComIfGp_particle_setToon( - 0x2022, &i_this->m0338, &i_this->m0344, NULL, 0xB9, + dPa_name::ID_COMMON_2022, &i_this->m0338, &i_this->m0344, NULL, 0xB9, &i_this->m0350, fopAcM_GetRoomNo(i_this) ); if (emitter1) { @@ -180,7 +180,7 @@ static void smoke_set_s(bk_class* i_this, f32 rate) { break; } case dBgS_Attr_GRASS_e: - JPABaseEmitter* emitter2 = dComIfGp_particle_set(0x24, &i_this->m0338, &i_this->m0344); + JPABaseEmitter* emitter2 = dComIfGp_particle_set(dPa_name::ID_COMMON_0024, &i_this->m0338, &i_this->m0344); if (emitter2) { emitter2->setRate(rate * 0.5f); emitter2->setMaxFrame(3); @@ -3212,7 +3212,7 @@ static BOOL daBk_Execute(bk_class* i_this) { i_this->m0336--; if (i_this->m0336 == 0) { i_this->m0344.y = i_this->current.angle.y; - dComIfGp_particle_set(0xE, &i_this->m116C, &i_this->m0344); + dComIfGp_particle_set(dPa_name::ID_COMMON_000E, &i_this->m116C, &i_this->m0344); } } diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 0cdc27b29..9f51e2356 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -733,7 +733,7 @@ namespace daBomb2 { field_0x6D8 = field_0x6C0; dComIfGp_particle_setP1(dPa_name::ID_COMMON_FUSE_SPARKS, &field_0x6C0, NULL, &scale, 0xFF, &mSparks); - dComIfGp_particle_setToonP1(0x2012, &field_0x6C0, NULL, &scale, 0xDC, &mSmoke); + dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_2012, &field_0x6C0, NULL, &scale, 0xDC, &mSmoke); mSmoke.setOldPosP(&field_0x6CC, &field_0x6D8); } } diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index e8f507ae5..cbcead242 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -695,7 +695,7 @@ void daBomb_c::setFuseEffect() { mFusePos3 = mFusePos; dComIfGp_particle_setP1(dPa_name::ID_COMMON_FUSE_SPARKS, &mFusePos, NULL, &scale, 0xFF, &mSparks); - dComIfGp_particle_setToonP1(0x2012, &mFusePos, NULL, &scale, 0xDC, &mSmoke); + dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_2012, &mFusePos, NULL, &scale, 0xDC, &mSmoke); mSmoke.field_0x0C = &mFusePos2; mSmoke.field_0x10 = &mFusePos3; mSmoke.field_0x04 = 0x14; @@ -719,7 +719,7 @@ void daBomb_c::eff_explode_cheap(const csXyz* rotation) { emitter->setGlobalParticleScale(vec); } - dComIfGp_particle_setBombSmoke(0x232A, ¤t.pos, NULL, &scale); + dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_232A, ¤t.pos, NULL, &scale); emitter = dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, ¤t.pos, NULL, &scale); if(emitter) { emitter->mLifeTime = 0x46; diff --git a/src/d/actor/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp index 3c2a47e5b..a4bfa4607 100644 --- a/src/d/actor/d_a_dai_item.cpp +++ b/src/d/actor/d_a_dai_item.cpp @@ -549,7 +549,7 @@ bool daStandItem_c::actionFobj09() { m698 = NULL; } if (m690 == NULL) { - m690 = dComIfGp_particle_set(0x82B3, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0); + m690 = dComIfGp_particle_set(dPa_name::ID_SCENE_82B3, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0); } else { m690->setGlobalRTMatrix(m660); } @@ -574,10 +574,10 @@ bool daStandItem_c::actionFobj09() { m690 = NULL; } if (m694 == NULL) { - m694 = dComIfGp_particle_set(0x82B4, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0); + m694 = dComIfGp_particle_set(dPa_name::ID_SCENE_82B4, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0); } if (m698 == NULL) { - m698 = dComIfGp_particle_set(0x82B5, ¤t.pos, ¤t.angle); + m698 = dComIfGp_particle_set(dPa_name::ID_SCENE_82B5, ¤t.pos, ¤t.angle); } if (m698) { m698->becomeImmortalEmitter(); diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index 72da83fcf..2cd0b88e3 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -175,7 +175,7 @@ void daDekuItem_c::mode_wait() { } if (mpEmitter == NULL) { - mpEmitter = dComIfGp_particle_set(0x820F, ¤t.pos); + mpEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_820F, ¤t.pos); } else if (mpEmitter != NULL) { mpEmitter->setGlobalTranslation(current.pos); } diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 1a9c9ec5d..6cf4d5b36 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -296,13 +296,13 @@ void daDitem_c::setParticle() { switch (m_effect_type[m_itemNo]) { case 0: - mpEmitters[0] = dComIfGp_particle_set(0x1F7, ¤t.pos, &angle); + mpEmitters[0] = dComIfGp_particle_set(dPa_name::ID_COMMON_01F7, ¤t.pos, &angle); case 1: - mpEmitters[1] = dComIfGp_particle_set(0x1F8, ¤t.pos, &angle); + mpEmitters[1] = dComIfGp_particle_set(dPa_name::ID_COMMON_01F8, ¤t.pos, &angle); case 2: - mpEmitters[2] = dComIfGp_particle_set(0x1F9, ¤t.pos, &angle); + mpEmitters[2] = dComIfGp_particle_set(dPa_name::ID_COMMON_01F9, ¤t.pos, &angle); case 3: - mpEmitters[3] = dComIfGp_particle_set(0x1FA, ¤t.pos, &angle); + mpEmitters[3] = dComIfGp_particle_set(dPa_name::ID_COMMON_01FA, ¤t.pos, &angle); case 4: break; } diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 9bc308a92..c7c79a6be 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -76,20 +76,20 @@ void set_disappear(disappear_class* i_this, float scale) { case 0xB: case 0xC: case 0xD: - dComIfGp_particle_set(0x14, &i_this->current.pos, NULL, &particleScale); + dComIfGp_particle_set(dPa_name::ID_COMMON_0014, &i_this->current.pos, NULL, &particleScale); case 0x3: - dComIfGp_particle_set(0x13, &i_this->current.pos, NULL, &particleScale); - dComIfGp_particle_setStripes(0x15, &i_this->current.pos, NULL, &particleScale, 0xFF, 0x96); - dComIfGp_particle_set(0x16, &i_this->current.pos, NULL, &particleScale); + dComIfGp_particle_set(dPa_name::ID_COMMON_0013, &i_this->current.pos, NULL, &particleScale); + dComIfGp_particle_setStripes(dPa_name::ID_COMMON_0015, &i_this->current.pos, NULL, &particleScale, 0xFF, 0x96); + dComIfGp_particle_set(dPa_name::ID_COMMON_0016, &i_this->current.pos, NULL, &particleScale); break; case 0x1: - dComIfGp_particle_set(0x13, &i_this->current.pos, NULL, &particleScale); - dComIfGp_particle_set(0x16, &i_this->current.pos, NULL, &particleScale); + dComIfGp_particle_set(dPa_name::ID_COMMON_0013, &i_this->current.pos, NULL, &particleScale); + dComIfGp_particle_set(dPa_name::ID_COMMON_0016, &i_this->current.pos, NULL, &particleScale); break; case 0x4: - dComIfGp_particle_set(0x043C, &i_this->current.pos); - dComIfGp_particle_set(0x043D, &i_this->current.pos); - dComIfGp_particle_set(0x043E, &i_this->current.pos); + dComIfGp_particle_set(dPa_name::ID_COMMON_043C, &i_this->current.pos); + dComIfGp_particle_set(dPa_name::ID_COMMON_043D, &i_this->current.pos); + dComIfGp_particle_set(dPa_name::ID_COMMON_043E, &i_this->current.pos); break; } } diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp index cac98dfe6..436c879cd 100644 --- a/src/d/actor/d_a_dr.cpp +++ b/src/d/actor/d_a_dr.cpp @@ -82,7 +82,7 @@ static void move(dr_class* i_this) { anm_init(i_this, DR_BCK_DR_BIKU1, l_HIO.mBiku1Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, DR_BAS_BIKU1); i_this->mState++; i_this->mCountDownTimers[0] = l_HIO.m0E; - i_this->mpBreathEmitter = dComIfGp_particle_set(0x81C4, &i_this->current.pos); + i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81C4, &i_this->current.pos); i_this->m2C9 = 0; // Fall-through case 11: @@ -100,7 +100,7 @@ static void move(dr_class* i_this) { if (i_this->mCountDownTimers[0] != 0) { if (cM_rndF(1.0f) < 0.5f) { anm_init(i_this, DR_BCK_DR_ABARE1, l_HIO.mAbare1Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, DR_BAS_ABARE1); - i_this->mpBreathEmitter = dComIfGp_particle_set(0x81C5, &i_this->current.pos); + i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81C5, &i_this->current.pos); i_this->mCountDownTimers[1] = 500; } else { anm_init(i_this, DR_BCK_DR_ABARE2, l_HIO.mAbare2Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, DR_BAS_ABARE2); @@ -110,14 +110,14 @@ static void move(dr_class* i_this) { MtxP rootJntMtx = i_this->mpMorf->getModel()->getAnmMtx(0x00); // dr_all_root joint cMtx_copy(rootJntMtx, *calc_mtx); MtxPosition(&offset, &rootPos); - dComIfGp_particle_set(0x81C7, &rootPos); + dComIfGp_particle_set(dPa_name::ID_SCENE_81C7, &rootPos); fopAcM_seStart(i_this, JA_SE_CM_DRG_MTOP_MAGMA, 0); i_this->mCountDownTimers[1] = 0; } } else { anm_init(i_this, DR_BCK_DR_HO1, l_HIO.mHo1Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); - i_this->mpBreathEmitter = dComIfGp_particle_set(0x81C6, &i_this->current.pos); + i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81C6, &i_this->current.pos); i_this->mState++; } } diff --git a/src/d/actor/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp index f0c5f9ead..689c2e021 100644 --- a/src/d/actor/d_a_esa.cpp +++ b/src/d/actor/d_a_esa.cpp @@ -111,7 +111,7 @@ void esa_1_move(esa_class* i_this) { i_this->mActionState = 3; if(i_this->field_0x2A4.getEmitter() == NULL) { static cXyz ripple_scale(0.2f, 0.2f, 0.2f); - dComIfGp_particle_setShipTail(0x33, &i_this->current.pos, 0, &ripple_scale, 0xFF, &i_this->field_0x2A4); + dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->current.pos, 0, &ripple_scale, 0xFF, &i_this->field_0x2A4); if(i_this->field_0x2A4.getEmitter()) { i_this->field_0x2A4.setRate(0.4f); } @@ -174,7 +174,7 @@ void esa_1_move(esa_class* i_this) { if(i_this->field_0x2A4.getEmitter() == NULL) { static cXyz ripple_scale(0.2f, 0.2f, 0.2f); - dComIfGp_particle_setShipTail(0x33, &i_this->current.pos, 0, &ripple_scale, 0xFF, &i_this->field_0x2A4); + dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->current.pos, 0, &ripple_scale, 0xFF, &i_this->field_0x2A4); if(i_this->field_0x2A4.getEmitter()) { i_this->field_0x2A4.setRate(0.4f); } diff --git a/src/d/actor/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp index ac1e874b1..b6885c311 100644 --- a/src/d/actor/d_a_floor.cpp +++ b/src/d/actor/d_a_floor.cpp @@ -96,8 +96,8 @@ int daFloor_c::Execute(Mtx**) { /* 00000548-00000640 .text set_effect__9daFloor_cFv */ void daFloor_c::set_effect() { - dComIfGp_particle_set(0x81A6, ¤t.pos, ¤t.angle); - JPABaseEmitter* emtr = dComIfGp_particle_set(0x2027, ¤t.pos, ¤t.angle, NULL, 255, &mSmokeCallBack, fopAcM_GetRoomNo(this)); + dComIfGp_particle_set(dPa_name::ID_SCENE_81A6, ¤t.pos, ¤t.angle); + JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_COMMON_2027, ¤t.pos, ¤t.angle, NULL, 255, &mSmokeCallBack, fopAcM_GetRoomNo(this)); if (emtr != NULL) { emtr->setRate(30); emtr->setMaxFrame(1); diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index 6240f9843..792a808d1 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -345,7 +345,7 @@ bool daGhostship_c::_execute() { dLib_setCirclePath(&mPaths[i]); if(mAlpha != 0.0f) { - dComIfGp_particle_setSimple(0x8306, &mPaths[i].mPos, 0xFF, g_whiteColor, g_whiteColor, 0); + dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8306, &mPaths[i].mPos, 0xFF, g_whiteColor, g_whiteColor, 0); } } diff --git a/src/d/actor/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp index 5457503c6..4776af878 100644 --- a/src/d/actor/d_a_hot_floor.cpp +++ b/src/d/actor/d_a_hot_floor.cpp @@ -66,9 +66,9 @@ bool daHot_Floor_c::_delete() { bool daHot_Floor_c::_execute() { if (mbSpawnParticle) { if (mEmitter2 == NULL && !(fopAcM_GetParam(this) & 1)) - mEmitter2 = dComIfGp_particle_set(0x814c, ¤t.pos); + mEmitter2 = dComIfGp_particle_set(dPa_name::ID_SCENE_814C, ¤t.pos); if (mEmitter1 == NULL && !(fopAcM_GetParam(this) & 2)) - mEmitter1 = dComIfGp_particle_set(0x8120, ¤t.pos); + mEmitter1 = dComIfGp_particle_set(dPa_name::ID_SCENE_8120, ¤t.pos); cLib_chaseF(&mSpawnTimer, 60.0f, 5.0f); mbSpawnParticle = false; } else { diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index c1d0ee2cc..1da550291 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -88,17 +88,17 @@ void daIball_c::createDisappearEffect(int param_1, int color_idx) { pos.y += m_data.mYOffset; switch (param_1) { case 0: - dComIfGp_particle_set(0x1C, &pos, NULL, &scale, 0xFF, dPa_control_c::getLifeBallSetColorEcallBack(color_idx)); - dComIfGp_particle_set(0x1D, &pos, NULL, &scale); + dComIfGp_particle_set(dPa_name::ID_COMMON_001C, &pos, NULL, &scale, 0xFF, dPa_control_c::getLifeBallSetColorEcallBack(color_idx)); + dComIfGp_particle_set(dPa_name::ID_COMMON_001D, &pos, NULL, &scale); if (color_idx == 2) { - dComIfGp_particle_set(0x47, &pos); + dComIfGp_particle_set(dPa_name::ID_COMMON_0047, &pos); } fopAcM_seStartCurrent(this, JA_SE_OBJ_CUT_INOCHIDAMA, 0); break; case 1: - dComIfGp_particle_set(0x19, &pos, NULL, &scale); - dComIfGp_particle_set(0x1A, &pos, NULL, &scale); - dComIfGp_particle_set(0x1B, &pos, NULL, &scale); + dComIfGp_particle_set(dPa_name::ID_COMMON_0019, &pos, NULL, &scale); + dComIfGp_particle_set(dPa_name::ID_COMMON_001A, &pos, NULL, &scale); + dComIfGp_particle_set(dPa_name::ID_COMMON_001B, &pos, NULL, &scale); fopAcM_seStartCurrent(this, JA_SE_CM_INOCHIDAMA_BREAK, 0); break; } @@ -214,7 +214,7 @@ void daIball_c::checkGeo() { particle_scale.setall(0.25f); cXyz particle_pos(current.pos); particle_pos.y = groundY; - dComIfGp_particle_set(0x80D5, &particle_pos, NULL, &particle_scale); + dComIfGp_particle_set(dPa_name::ID_SCENE_80D5, &particle_pos, NULL, &particle_scale); fopAcM_delete(this); } } @@ -246,7 +246,7 @@ void daIball_c::mode_wait() { /* 800F3F6C-800F3FE8 .text mode_water_init__9daIball_cFv */ void daIball_c::mode_water_init() { - dComIfGp_particle_setShipTail(0x33, ¤t.pos, NULL, &scale, 0xFF, &mRippleCb); + dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, ¤t.pos, NULL, &scale, 0xFF, &mRippleCb); mRippleCb.setRate(0.0f); mMode = MODE_WATER; } diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 5855c5983..2cc266cbc 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -208,7 +208,7 @@ void daItem_c::CreateInit() { animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f); if (fopAcM_SearchByName(PROC_BST)) { // Gohdan - mpParticleEmitter = dComIfGp_particle_set(0x81E1, ¤t.pos); + mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81E1, ¤t.pos); } } @@ -1055,7 +1055,7 @@ BOOL daItem_c::itemActionForArrow() { mOnGroundTimer++; if (mOnGroundTimer == 1 && fopAcM_SearchByName(PROC_BST)) { // Gohdan - JPABaseEmitter* emitter = dComIfGp_particle_set(0xA1E2, ¤t.pos, NULL, NULL, 0xFF, &mPtclSmokeCb, fopAcM_GetRoomNo(this)); + JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_SCENE_A1E2, ¤t.pos, NULL, NULL, 0xFF, &mPtclSmokeCb, fopAcM_GetRoomNo(this)); if (emitter) { emitter->setMaxFrame(1); } @@ -1236,7 +1236,7 @@ void daItem_c::mode_water_init() { temp3 *= scale.x; particleScale.setall(temp3); - dComIfGp_particle_setShipTail(0x33, ¤t.pos, NULL, &particleScale, 0xFF, &mPtclRippleCb); + dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, ¤t.pos, NULL, &particleScale, 0xFF, &mPtclRippleCb); mPtclRippleCb.mRate = 0.0f; } diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index 054fff13b..ebe34addf 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/src/d/actor/d_a_lamp.cpp @@ -88,7 +88,7 @@ static BOOL daLamp_Execute(lamp_class* i_this) { if (!i_this->mParticleInit) { static cXyz fire_scale(0.5f, 0.5f, 0.5f); - dComIfGp_particle_set(0x1ea, &i_this->mPos, NULL, &fire_scale, 0xFF, &i_this->mPa); + dComIfGp_particle_set(dPa_name::ID_COMMON_01EA, &i_this->mPos, NULL, &fire_scale, 0xFF, &i_this->mPa); i_this->mParticleInit = 1; i_this->mParticlePower = 1.0f; } @@ -96,7 +96,7 @@ static BOOL daLamp_Execute(lamp_class* i_this) { if (i_this->mPa.getEmitter()) { cXyz whitePartPos = i_this->mPos; whitePartPos.y += partHeightOffset; - dComIfGp_particle_setSimple(0x4004, &whitePartPos, 0xFF, g_whiteColor, g_whiteColor, 0); + dComIfGp_particle_setSimple(dPa_name::ID_COMMON_4004, &whitePartPos, 0xFF, g_whiteColor, g_whiteColor, 0); cLib_addCalc2(&i_this->mParticlePower, cM_rndF(0.2f) + 1.0f, 0.5f, partMaxFlickerPerTick); } else { i_this->mParticlePower = 0.0f; diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp index 4ba379b35..32e0f23fd 100644 --- a/src/d/actor/d_a_lbridge.cpp +++ b/src/d/actor/d_a_lbridge.cpp @@ -72,7 +72,7 @@ void daLbridge_c::CreateInit() { fopAcM_setCullSizeBox(this, -600.0f, -100.0f, -150.0f, 600.0f, 100.0f, 150.0f); fopAcM_setCullSizeFar(this, 1.5f); - mpEmitter = dComIfGp_particle_set(0x810FU, ¤t.pos, ¤t.angle); + mpEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_810F, ¤t.pos, ¤t.angle); if (mpEmitter != NULL) { mpEmitter->stopDrawParticle(); @@ -231,8 +231,8 @@ void daLbridge_c::appear_bridge() { pos1.z += 100.0f; pos2.z -= 100.0f; - dComIfGp_particle_setProjection(0x8119U, &pos1, ¤t.angle); - dComIfGp_particle_setProjection(0x8119U, &pos2, ¤t.angle); + dComIfGp_particle_setProjection(dPa_name::ID_SCENE_8119, &pos1, ¤t.angle); + dComIfGp_particle_setProjection(dPa_name::ID_SCENE_8119, &pos2, ¤t.angle); set_on_se(); diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp index 261177507..60732b718 100644 --- a/src/d/actor/d_a_leaflift.cpp +++ b/src/d/actor/d_a_leaflift.cpp @@ -115,7 +115,7 @@ void daLlift_c::CreateInit() { if (mWaterY != -1e9f) { cXyz particlePos = current.pos; particlePos.y = mWaterY + 1.0f; - mEmitter3 = dComIfGp_particle_set(0x82AA, &particlePos, ¤t.angle); + mEmitter3 = dComIfGp_particle_set(dPa_name::ID_SCENE_82AA, &particlePos, ¤t.angle); if (mEmitter3) { mEmitter3->stopCreateParticle(); } diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp index de0a7d41f..cb06b528c 100644 --- a/src/d/actor/d_a_mmusic.cpp +++ b/src/d/actor/d_a_mmusic.cpp @@ -116,7 +116,7 @@ bool daMmusic::Act_c::_execute() { if (mpEmitter == NULL && field_0x298 == 1) { set_mtx(); cXyz scale(1.0f, 1.0f, 1.0f); - JPABaseEmitter* emtr = dComIfGp_particle_set(0x826c, ¤t.pos); + JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_SCENE_826C, ¤t.pos); mpEmitter = emtr; if (emtr != NULL) { mpEmitter->setGlobalRTMatrix(mMtx); diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index d0ba78bc1..d8b343532 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -373,7 +373,7 @@ BOOL daNpc_Ji1_c::normalSubActionHarpoonGuard(s16 param_1) { field_0xD74++; field_0xD68 = 0; setAnm(9, 0.0f, 1); - dComIfGp_particle_set(0xC, field_0x7E0.GetTgHitPosP()); + dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, field_0x7E0.GetTgHitPosP()); fopAcM_seStart(this, JA_SE_CV_JI_DEFENCE, 0); fopAcM_seStart(this, JA_SE_OBJ_COL_SWS_NMTLP, 0); } @@ -1864,7 +1864,7 @@ u32 daNpc_Ji1_c::privateCut() { u32 daNpc_Ji1_c::setParticle(int max, f32 rate, f32 spread) { dtParticle(); if(field_0x2E0.getEmitter() == 0) { - JPABaseEmitter* emitter = dComIfGp_particle_setToon(0x2022, ¤t.pos, 0, 0, 0xB9, &field_0x2E0, fopAcM_GetRoomNo(this)); + JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, ¤t.pos, 0, 0, 0xB9, &field_0x2E0, fopAcM_GetRoomNo(this)); if(emitter) { emitter->setRate(rate); emitter->setSpread(spread); @@ -1888,7 +1888,7 @@ void daNpc_Ji1_c::dtParticle() { /* 000058F0-000059E8 .text setParticleAT__11daNpc_Ji1_cFiff */ u32 daNpc_Ji1_c::setParticleAT(int max, f32 rate, f32 spread) { if(field_0x300.getEmitter() == 0) { - JPABaseEmitter* emitter = dComIfGp_particle_setToon(0x2022, &field_0x320, 0, 0, 0xB9, &field_0x300, fopAcM_GetRoomNo(this)); + JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, &field_0x320, 0, 0, 0xB9, &field_0x300, fopAcM_GetRoomNo(this)); if(field_0x300.getEmitter()) { JGeometry::TVec3 scaleVec; scaleVec.x = 2.0f; @@ -2813,7 +2813,7 @@ void daNpc_Ji1_c::setAnimFromMsgNo(u32 msgNo) { if(field_0x430 != 0) { field_0x430->becomeInvalidEmitter(); field_0x430 = 0; - field_0x430 = dComIfGp_particle_set(0x81A5, ¤t.pos); + field_0x430 = dComIfGp_particle_set(dPa_name::ID_SCENE_81A5, ¤t.pos); } setAnm(0x18, 8.0f, 0); @@ -2997,7 +2997,7 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) { pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_NAKU); if(field_0x430 == 0) { - field_0x430 = dComIfGp_particle_set(0x81A4, ¤t.pos); + field_0x430 = dComIfGp_particle_set(dPa_name::ID_SCENE_81A4, ¤t.pos); harpoonRelease(0); } @@ -3684,8 +3684,8 @@ void daNpc_Ji1_c::setHitParticle(cXyz* param_1, u32 param_2) { scale = *param_1; } - dComIfGp_particle_set(0xD, field_0x7E0.GetTgHitPosP(), &angle, &scale); - dComIfGp_particle_set(0x10, field_0x7E0.GetTgHitPosP(), 0, &scale); + dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, field_0x7E0.GetTgHitPosP(), &angle, &scale); + dComIfGp_particle_set(dPa_name::ID_COMMON_0010, field_0x7E0.GetTgHitPosP(), 0, &scale); fopAcM_seStart(this, JA_SE_CM_JI_DAMAGE, 0); fopAcM_seStart(this, param_2, 0); dKy_SordFlush_set(*field_0x7E0.GetTgHitPosP(), 0); @@ -3693,7 +3693,7 @@ void daNpc_Ji1_c::setHitParticle(cXyz* param_1, u32 param_2) { /* 000114EC-0001161C .text setGuardParticle__11daNpc_Ji1_cFv */ void daNpc_Ji1_c::setGuardParticle() { - dComIfGp_particle_set(0xC, field_0x7E0.GetTgHitPosP()); + dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, field_0x7E0.GetTgHitPosP()); fopAcM_seStart(this, JA_SE_OBJ_COL_SWS_NMTLP, 0); fopAcM_seStart(this, JA_SE_CV_JI_DEFENCE, 0); dKy_SordFlush_set(*field_0x7E0.GetTgHitPosP(), 0); diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 8b0108a65..f70fbb3aa 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -1298,13 +1298,13 @@ BOOL daNpc_kam_c::execute() { if (!isWaterHit()) { onWaterHit(); - JPABaseEmitter* splashEmitter = dComIfGp_particle_set(0x40, ¤t.pos); + JPABaseEmitter* splashEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0040, ¤t.pos); if (splashEmitter) { splashEmitter->setRate(15.0f); splashEmitter->setGlobalScale(splash_scale); } - JPABaseEmitter* rippleEmitter = dComIfGp_particle_setSingleRipple(0x3D, ¤t.pos); + JPABaseEmitter* rippleEmitter = dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, ¤t.pos); if (rippleEmitter) { rippleEmitter->setGlobalScale(ripple_scale); } diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index ef55f4194..fc5d0a2d6 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -1043,13 +1043,13 @@ BOOL daNpc_Md_c::mirrorCancelCheck() { /* 00003648-00003674 .text setWingEmitter__10daNpc_Md_cFv */ void daNpc_Md_c::setWingEmitter() { - particle_set(&m0508[0], 0x819B); + particle_set(&m0508[0], dPa_name::ID_SCENE_819B); } /* 00003674-000036C0 .text setHane02Emitter__10daNpc_Md_cFv */ void daNpc_Md_c::setHane02Emitter() { - particle_set(&m0508[2], 0x8217); - particle_set(&m0508[3], 0x8217); + particle_set(&m0508[2], dPa_name::ID_SCENE_8217); + particle_set(&m0508[3], dPa_name::ID_SCENE_8217); } /* 000036C0-000036FC .text deleteHane02Emitter__10daNpc_Md_cFv */ @@ -1060,8 +1060,8 @@ void daNpc_Md_c::deleteHane02Emitter() { /* 000036FC-00003748 .text setHane03Emitter__10daNpc_Md_cFv */ void daNpc_Md_c::setHane03Emitter() { - particle_set(&m0508[4], 0x827D); - particle_set(&m0508[5], 0x827D); + particle_set(&m0508[4], dPa_name::ID_SCENE_827D); + particle_set(&m0508[5], dPa_name::ID_SCENE_827D); } /* 00003748-00003784 .text deleteHane03Emitter__10daNpc_Md_cFv */ @@ -1132,10 +1132,10 @@ BOOL daNpc_Md_c::lightHitCheck() { fopAc_ac_c* hitActor = mCps.GetAtHitAc(); if (fopAcM_CheckStatus(this, fopAcStts_CARRY_e) && !isNoCarryAction()) { if (hitActor != dComIfGp_getLinkPlayer() && m3058.getEmitter() == NULL) { - dComIfGp_particle_set(0x8232, ¤t.pos, NULL, NULL, 0xFF, &m3058); + dComIfGp_particle_set(dPa_name::ID_SCENE_8232, ¤t.pos, NULL, NULL, 0xFF, &m3058); } } else if (m3058.getEmitter() == NULL) { - dComIfGp_particle_set(0x8232, ¤t.pos, NULL, NULL, 0xFF, &m3058); + dComIfGp_particle_set(dPa_name::ID_SCENE_8232, ¤t.pos, NULL, NULL, 0xFF, &m3058); } cM3d_lineVsPosSuisenCross(mCps.GetStart(), mCps.GetEnd(), *mCps.GetAtHitPosP(), &m3058.getPos()); @@ -1153,7 +1153,7 @@ BOOL daNpc_Md_c::lightHitCheck() { } if (m304C.getEmitter() == NULL) { - m304C.makeEmitter(0x8226, mpHarpLightModel->getBaseTRMtx(), ¤t.pos, NULL); + m304C.makeEmitter(dPa_name::ID_SCENE_8226, mpHarpLightModel->getBaseTRMtx(), ¤t.pos, NULL); JPABaseEmitter* emitter = m304C.getEmitter(); JGeometry::TVec3 temp; temp.set(1.0f, 1.0f, 1.0f); @@ -2662,7 +2662,7 @@ BOOL daNpc_Md_c::setAnm(int anmIdx) { if (m312D == 0x10) { if (m0508[1] == NULL) { - m0508[1] = dComIfGp_particle_set(0x819D, ¤t.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0, &tevStr.mColorK0); + m0508[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_819D, ¤t.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0, &tevStr.mColorK0); if (m0508[1]) { m0508[1]->becomeImmortalEmitter(); } diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index 1797a4911..260330cf1 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -885,7 +885,7 @@ void daNpc_Nz_c::setSmokeParticle() { } if(field_0x914.getEmitter() == NULL) { - JPABaseEmitter* emitter = dComIfGp_particle_setToon(0x2022, ¤t.pos, ¤t.angle, 0, 0xB9, &field_0x914, fopAcM_GetRoomNo(this)); + JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, ¤t.pos, ¤t.angle, 0, 0xB9, &field_0x914, fopAcM_GetRoomNo(this)); if(emitter) { emitter->setRate(3.0f); emitter->setSpread(0.2f); diff --git a/src/d/actor/d_a_npc_nz_cut.inc b/src/d/actor/d_a_npc_nz_cut.inc index 8eeec7d8d..74870c288 100644 --- a/src/d/actor/d_a_npc_nz_cut.inc +++ b/src/d/actor/d_a_npc_nz_cut.inc @@ -334,7 +334,7 @@ void daNpc_Nz_c::cutSetAnmProc() { mDoMtx_stack_c::copy(pModel->getAnmMtx(m_jnt.getHeadJntNum())); mDoMtx_stack_c::multVec(&temp4, &pos); - dComIfGp_particle_set(0x57, &pos, &shape_angle, &scale, 0xFF, 0, -1, &color); + dComIfGp_particle_set(dPa_name::ID_COMMON_0057, &pos, &shape_angle, &scale, 0xFF, 0, -1, &color); } } } diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 0bc5c4766..b55c3fe49 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -500,7 +500,7 @@ void daNpc_Os_c::eventOrderCheck() { /* 00001300-000013D4 .text makeBeam__10daNpc_Os_cFi */ void daNpc_Os_c::makeBeam(int param_1) { if(field_0x738.getEmitter() == NULL) { - field_0x738.makeEmitter(0x826E, ¤t.pos, &shape_angle, 0); + field_0x738.makeEmitter(dPa_name::ID_SCENE_826E, ¤t.pos, &shape_angle, 0); if(param_1) { fopAcM_seStartCurrent(this, JA_SE_OBJ_OSTATUE_LIGHT_ST, 0); @@ -508,7 +508,7 @@ void daNpc_Os_c::makeBeam(int param_1) { } if(field_0x740.getEmitter() == NULL) { - field_0x740.makeEmitter(0x826F, ¤t.pos, &shape_angle, 0); + field_0x740.makeEmitter(dPa_name::ID_SCENE_826F, ¤t.pos, &shape_angle, 0); } } @@ -872,7 +872,7 @@ BOOL daNpc_Os_c::carryNpcAction(void* param_1) { } else { fopAcM_seStartCurrent(this, JA_SE_OBJ_OSTATUE_PUT, 0); - smokeSet(0xA328); + smokeSet(dPa_name::ID_SCENE_A328); setNpcAction(&daNpc_Os_c::waitNpcAction, 0); return true; @@ -907,7 +907,7 @@ BOOL daNpc_Os_c::throwNpcAction(void* param_1) { else if(field_0x7A9 != -1) { if(mAcch.ChkGroundHit()) { fopAcM_seStartCurrent(this, JA_SE_OBJ_OSTATUE_PUT, 0); - smokeSet(0xA33B); + smokeSet(dPa_name::ID_SCENE_A33B); setNpcAction(&daNpc_Os_c::waitNpcAction, 0); } @@ -933,7 +933,7 @@ BOOL daNpc_Os_c::jumpNpcAction(void* param_1) { } else if(field_0x7A9 != -1) { if(mAcch.ChkGroundHit()) { - smokeSet(0xA33B); + smokeSet(dPa_name::ID_SCENE_A33B); setNpcAction(&daNpc_Os_c::waitNpcAction, 0); } @@ -2054,7 +2054,7 @@ void daNpc_Os_c::animationPlay() { mPrevMorfFrame = frame; if(field_0x78C == 1 && mpMorf->checkFrame(17.0f)) { - smokeSet(0xA328); + smokeSet(dPa_name::ID_SCENE_A328); } playBrkAnm(); @@ -2250,13 +2250,13 @@ BOOL daNpc_Os_c::execute() { if(!isWaterHit()) { onWaterHit(); - JPABaseEmitter* splash = dComIfGp_particle_set(0x40, ¤t.pos); + JPABaseEmitter* splash = dComIfGp_particle_set(dPa_name::ID_COMMON_0040, ¤t.pos); if(splash) { splash->setRate(15.0f); splash->setGlobalScale(splash_scale); } - JPABaseEmitter* ripple = dComIfGp_particle_setSingleRipple(0x3D, ¤t.pos); + JPABaseEmitter* ripple = dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, ¤t.pos); if(ripple) { ripple->setGlobalScale(ripple_scale); } diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index d0c16fc7e..59bc66b02 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -394,7 +394,7 @@ void daObjBarrier_ef_c::birth(fopAc_ac_c* i_hitActor, f32 i_radius, cXyz i_cente mDoMtx_stack_c::ZXYrotM(0, angle.y, 0); mpModel[effect_idx]->setBaseTRMtx(mDoMtx_stack_c::get()); - dComIfGp_particle_set(0x81A9, &pos, &angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_81A9, &pos, &angle); } } diff --git a/src/d/actor/d_a_obj_ebomzo.cpp b/src/d/actor/d_a_obj_ebomzo.cpp index 8d4811184..b2b490e2f 100644 --- a/src/d/actor/d_a_obj_ebomzo.cpp +++ b/src/d/actor/d_a_obj_ebomzo.cpp @@ -145,7 +145,7 @@ void daObjEbomzo::Act_c::check() { r = tevStr.mColorK0.r; g = tevStr.mColorK0.g; b = tevStr.mColorK0.b; - mpParticleEmitter = dComIfGp_particle_set(0x828e, ¤t.pos, ¤t.angle); + mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_828E, ¤t.pos, ¤t.angle); if (mpParticleEmitter) mpParticleEmitter->setGlobalPrmColor(r, g, b); } } @@ -170,7 +170,7 @@ void daObjEbomzo::Act_c::demo() { mpParticleEmitter = NULL; } - dComIfGp_particle_set(0x828f, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_828F, ¤t.pos, ¤t.angle); } } diff --git a/src/d/actor/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp index 0e741794c..8b0b70e57 100644 --- a/src/d/actor/d_a_obj_eskban.cpp +++ b/src/d/actor/d_a_obj_eskban.cpp @@ -243,8 +243,8 @@ void daObjEskban::Act_c::eff_b_break(u16 particleID) { /* 00000D44-00000EF0 .text daObjEskban_effect_set__Q211daObjEskban5Act_cFv */ void daObjEskban::Act_c::daObjEskban_effect_set() { - eff_m_break(0x82b1, 2); - eff_b_break(0x82b2); + eff_m_break(dPa_name::ID_SCENE_82B1, 2); + eff_b_break(dPa_name::ID_SCENE_82B2); static cXyz offset_vec(0, 250, 0); mDoMtx_stack_c::copy(mpModel->getBaseTRMtx()); @@ -252,7 +252,7 @@ void daObjEskban::Act_c::daObjEskban_effect_set() { if (!M_smoke) { return; } - JPABaseEmitter* pBEmtr = dComIfGp_particle_setToon(0x2027, &mSmokePos, NULL, NULL, 0xc8, + JPABaseEmitter* pBEmtr = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &mSmokePos, NULL, NULL, 0xc8, M_smoke, -1, NULL, NULL, NULL); if (!pBEmtr) { return; diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp index 97aecbc22..9bc32e452 100644 --- a/src/d/actor/d_a_obj_gryw00.cpp +++ b/src/d/actor/d_a_obj_gryw00.cpp @@ -42,11 +42,11 @@ BOOL daObjGryw00_c::setup_high_water_level_btk_anm() { /* 00000168-000002D0 .text particle_set__13daObjGryw00_cFv */ void daObjGryw00_c::particle_set() { cXyz homePos = this->home.pos; - dComIfGp_particle_set(0x8295U, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL); - dComIfGp_particle_set(0x8297U, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL); - mpEmitters[0] = dComIfGp_particle_set(0x8296U, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, + dComIfGp_particle_set(dPa_name::ID_SCENE_8295, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL); + dComIfGp_particle_set(dPa_name::ID_SCENE_8297, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL); + mpEmitters[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_8296, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL); - mpEmitters[1] = dComIfGp_particle_set(0x8298U, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, + mpEmitters[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_8298, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL); } diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp index aefadf257..b9d1eef53 100644 --- a/src/d/actor/d_a_obj_hha.cpp +++ b/src/d/actor/d_a_obj_hha.cpp @@ -74,7 +74,10 @@ const HHA_RES_FILE_ID l_daObjHha_bdl_idx_table[2] = {HHA_BDL_HHA1, HHA_BDL_HHA2} const HHA_RES_FILE_ID l_daObjHha_dzb_idx_table[2] = {HHA_DZB_HHA1, HHA_DZB_HHA2}; const HHA_RES_FILE_ID l_daObjHha_btk_idx_table[2] = {HHA_BTK_YSWTR00_01, HHA_BTK_YSWTR00_02}; const J3DFrameCtrl::Attribute_e l_daObjHha_btk_mode_table[2] = {J3DFrameCtrl::LOOP_REPEAT_e, J3DFrameCtrl::LOOP_ONCE_e}; -const u16 l_daObjHha_splash_id_table[2] = {0x810D, 0x810E}; +const u16 l_daObjHha_splash_id_table[] = { + dPa_name::ID_SCENE_810D, + dPa_name::ID_SCENE_810E, +}; /* 00000078-00000170 .text init_data__14daObjHhaPart_cFffUsUcUc */ void daObjHhaPart_c::init_data(float yPos, float yTar, u16 speed, u8 i, u8 isMiddle) { @@ -169,7 +172,7 @@ void daObjHhaPart_c::draw_normal(daObjHha_c* parent) { } /* 0000056C-00000698 .text create_s__16daObjHhaSplash_cFUsP4cXyzffP5csXyz */ -void daObjHhaSplash_c::create_s(unsigned short id, cXyz* pPos, float offsetY, float offsetZ, csXyz* pAngle) { +void daObjHhaSplash_c::create_s(u16 particleID, cXyz* pPos, float offsetY, float offsetZ, csXyz* pAngle) { cXyz calcVec; mPos.set(pPos->x, pPos->y + offsetY, pPos->z); @@ -179,7 +182,7 @@ void daObjHhaSplash_c::create_s(unsigned short id, cXyz* pPos, float offsetY, fl mPos += calcVec; mBasePos = mPos; mAngle = *pAngle; - dComIfGp_particle_set(id, &mPos, &mAngle, NULL, 255, &mEcallBack); + dComIfGp_particle_set(particleID, &mPos, &mAngle, NULL, 255, &mEcallBack); bIsActive = true; } diff --git a/src/d/actor/d_a_obj_homensmoke.cpp b/src/d/actor/d_a_obj_homensmoke.cpp index 17f0a4546..ba6c9fada 100644 --- a/src/d/actor/d_a_obj_homensmoke.cpp +++ b/src/d/actor/d_a_obj_homensmoke.cpp @@ -84,7 +84,7 @@ namespace daObjHomensmoke { cMtx_multVec(mMtx, &norse_offsetS, &mSmokePos); } - JPABaseEmitter* smokeEmitter = dComIfGp_particle_setToon(0x2027, &mSmokePos, NULL, NULL, 0xFF, &mSmokeCb, fopAcM_GetRoomNo(this)); + JPABaseEmitter* smokeEmitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &mSmokePos, NULL, NULL, 0xFF, &mSmokeCb, fopAcM_GetRoomNo(this)); if (smokeEmitter) { static f32 rate_table[2] = {1.0f, 0.5f}; f32 rate = rate_table[mType & 1]; @@ -100,7 +100,7 @@ namespace daObjHomensmoke { smokeEmitter->setGlobalParticleScale(scale); } - JPABaseEmitter* rubbleEmitter = dComIfGp_particle_setToon(0x81B1, ¤t.pos); + JPABaseEmitter* rubbleEmitter = dComIfGp_particle_setToon(dPa_name::ID_SCENE_81B1, ¤t.pos); if (rubbleEmitter) { rubbleEmitter->setGlobalPrmColor(tevStr.mColorK0.r, tevStr.mColorK0.g, tevStr.mColorK0.b); if (mType == 1) { diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp index f9cea2819..a5d1260f3 100644 --- a/src/d/actor/d_a_obj_kanat.cpp +++ b/src/d/actor/d_a_obj_kanat.cpp @@ -88,11 +88,11 @@ BOOL daObjKanat::Act_c::Execute(Mtx** pMtx) { color.b = tevStr.mColorC0.b; color.a = tevStr.mColorC0.a; dComIfGp_particle_set( - 0x82A2, ¤t.pos, ¤t.angle, NULL, 0xFF, + dPa_name::ID_SCENE_82A2, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, current.roomNo, &tevStr.mColorK0, &color ); dComIfGp_particle_setToon( - 0xA2A3, ¤t.pos, ¤t.angle, NULL, 0xB4, + dPa_name::ID_SCENE_A2A3, ¤t.pos, ¤t.angle, NULL, 0xB4, &mSmokeCb, current.roomNo, &tevStr.mColorK0, &color ); } diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 4dafaf537..2edbde5e9 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -591,7 +591,7 @@ bool daObjMknjD::Act_c::daObjMknjD_break() { /* Particles and sound effects */ // After 1 frame, the particles for the statue splitting in half spawn. if (mBreakTimer == 1) { - mEmitters[0] = dComIfGp_particle_set(0x8185, ¤t.pos, ¤t.angle); + mEmitters[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_8185, ¤t.pos, ¤t.angle); GXColor emitter2Color; emitter2Color.r = tevStr.mColorC0.r; @@ -599,9 +599,9 @@ bool daObjMknjD::Act_c::daObjMknjD_break() { emitter2Color.b = tevStr.mColorC0.b; emitter2Color.a = tevStr.mColorC0.a; - mEmitters[1] = dComIfGp_particle_setProjection(0x8186, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, current.roomNo, &tevStr.mColorK0, &emitter2Color); + mEmitters[1] = dComIfGp_particle_setProjection(dPa_name::ID_SCENE_8186, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, current.roomNo, &tevStr.mColorK0, &emitter2Color); - mEmitters[2] = dComIfGp_particle_setToon(0xA187, ¤t.pos, ¤t.angle, NULL, 0xFF, &mSmokeCBs[2]); + mEmitters[2] = dComIfGp_particle_setToon(dPa_name::ID_SCENE_A187, ¤t.pos, ¤t.angle, NULL, 0xFF, &mSmokeCBs[2]); mSmokeCBs[2].setRateOff(0); fopAcM_seStartCurrent(this, JA_SE_OBJ_SAGE_GATE_CREAK, 0); @@ -634,7 +634,7 @@ bool daObjMknjD::Act_c::daObjMknjD_break() { mBrokenPos = current.pos; mBrokenPos.y += 350.0f; - mEmitters[3] = dComIfGp_particle_setToon(0x2027, &mBrokenPos, ¤t.angle, NULL, 0xFF, &mSmokeCBs[3]); + mEmitters[3] = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &mBrokenPos, ¤t.angle, NULL, 0xFF, &mSmokeCBs[3]); if (mEmitters[3] != NULL) { mEmitters[3]->setVolumeSweep(0.5f); mEmitters[3]->setLifeTime(0x2D); diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index ea20f62b7..38e8acbd0 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -1523,7 +1523,7 @@ namespace daObjMovebox { for (int i = 0; i < (int)ARRAY_SIZE(mSmokeCbs); i++) { JPABaseEmitter* emitter = dComIfGp_particle_setToon( - 0x2022, &mSmokeCbs[i].field_0x20, &mSmokeCbs[i].field_0x2C, + dPa_name::ID_COMMON_2022, &mSmokeCbs[i].field_0x20, &mSmokeCbs[i].field_0x2C, &scl, 0xB9, &mSmokeCbs[i], fopAcM_GetRoomNo(this) ); if (emitter) { @@ -1720,7 +1720,7 @@ namespace daObjMovebox { cXyz particlePos; particlePos.set(current.pos.x, current.pos.y + 75.0f, current.pos.z); JPABaseEmitter* emitter = dComIfGp_particle_set( - 0x3E6, &particlePos, NULL, NULL, 0xFF, NULL, -1, + dPa_name::ID_COMMON_03E6, &particlePos, NULL, NULL, 0xFF, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0, &particle_scale ); if (emitter) { diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index b60b9324c..e93bcd80a 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -337,7 +337,7 @@ int daObjTpost_c::getMsgXY() { col.b = REG12_S(2) + 0x80; mDoMtx_stack_c::copy(mMorf->getModel()->mpNodeMtx[2]); mDoMtx_stack_c::multVec(&pos, &pos); - dComIfGp_particle_set(0x57, &pos, &shape_angle, &scale, 0xFF, NULL, -1, &col); + dComIfGp_particle_set(dPa_name::ID_COMMON_0057, &pos, &shape_angle, &scale, 0xFF, NULL, -1, &col); break; case dItem_FATHER_LETTER_e: @@ -631,7 +631,7 @@ void daObjTpost_c::setAnm(s8 anmPrmIdx, bool param_2) { cXyz scale; scale.setall(1.0f); if(mMorf->getFrame() == 1.0f) { - dComIfGp_particle_set(0x8190, ¤t.pos, ¤t.angle, &scale); + dComIfGp_particle_set(dPa_name::ID_SCENE_8190, ¤t.pos, ¤t.angle, &scale); mDoAud_seStart(JA_SE_OBJ_POST_LUGGAGE_OUT); } } diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index 26b82a9cb..796c0ba39 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -136,17 +136,17 @@ void daObjVfan::Act_c::init_mtx() { /* 000006BC-000009B4 .text ParticleSet__Q29daObjVfan5Act_cFv */ void daObjVfan::Act_c::ParticleSet() { - dComIfGp_particle_set(0x83cd, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x83ce, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x83cf, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x83d0, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x83d1, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x83d2, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x83d3, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x83d4, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x83d5, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x83d6, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x83d7, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_83CD, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_83CE, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_83CF, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_83D0, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_83D1, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_83D2, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_83D3, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_83D4, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_83D5, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_83D6, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_83D7, ¤t.pos, ¤t.angle); } /* 000009B4-00000C74 .text Execute__Q29daObjVfan5Act_cFPPA3_A4_f */ diff --git a/src/d/actor/d_a_obj_vgnfd.cpp b/src/d/actor/d_a_obj_vgnfd.cpp index 5b6a1261a..fbcf1fc2b 100644 --- a/src/d/actor/d_a_obj_vgnfd.cpp +++ b/src/d/actor/d_a_obj_vgnfd.cpp @@ -59,12 +59,12 @@ static char* l_daObjVgnfd_break_act_name[] = { }; static u16 l_daObjVgnfd_pt_table[] = { - 0x833E, - 0x833F, - 0x8340, - 0x8341, - 0x8342, - 0x8343, + dPa_name::ID_SCENE_833E, + dPa_name::ID_SCENE_833F, + dPa_name::ID_SCENE_8340, + dPa_name::ID_SCENE_8341, + dPa_name::ID_SCENE_8342, + dPa_name::ID_SCENE_8343, }; enum { @@ -384,7 +384,7 @@ bool daObjVgnfd_c::_execute() { emtr->setGlobalPrmColor(tevStr.mColorK0.r, tevStr.mColorK0.g, tevStr.mColorK0.b); } } - dComIfGp_particle_setToon(0xA344, ¤t.pos, ¤t.angle, &scale, 0xA0, &mSmoke); + dComIfGp_particle_setToon(dPa_name::ID_SCENE_A344, ¤t.pos, ¤t.angle, &scale, 0xA0, &mSmoke); dComIfGp_getVibration().StartQuake(4, 11, cXyz(0.0f, 1.0f, 0.0f)); fopAcM_seStartCurrent(this, JA_SE_OBJ_B_BOSS_DR_BRK_2, 0); break; diff --git a/src/d/actor/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp index 2bb257fb7..70ef06238 100644 --- a/src/d/actor/d_a_obj_vmc.cpp +++ b/src/d/actor/d_a_obj_vmc.cpp @@ -186,7 +186,7 @@ void daObjVmc::Act_c::init_mtx() { /* 00000B1C-00000BD0 .text daObjVmc_base_main__Q28daObjVmc5Act_cFv */ void daObjVmc::Act_c::daObjVmc_base_main() { if (mHasTree == 1) { - dComIfGp_particle_setToon(0xa1bc, ¤t.pos, ¤t.angle, NULL, 0xFF, &mSmoke, fopAcM_GetRoomNo(this)); + dComIfGp_particle_setToon(dPa_name::ID_SCENE_A1BC, ¤t.pos, ¤t.angle, NULL, 0xFF, &mSmoke, fopAcM_GetRoomNo(this)); cLib_offBit(attention_info.flags, fopAc_Attn_UNK10000000_e); mState = STATE_TREE_DEMO_WAIT; shape_angle.y = fopAcM_searchActorAngleY(this, dComIfGp_getPlayer(0)) + 0x1800; diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index e97d02d57..55bc4ec05 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -4,6 +4,7 @@ // #include "d/actor/d_a_pedestal.h" +#include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/res/res_hdai1.h" @@ -309,7 +310,7 @@ BOOL daPds_c::actionMoveEvent(int) { /* 00000AEC-00000B40 .text initialEffectSet__Q210daPedestal7daPds_cFi */ void daPds_c::initialEffectSet(int) { - mOctagonGlowCb.makeEmitter(dPa_name::ID_PEDESTAL_OCTAGON_GLOW, ¤t.pos, &shape_angle, NULL); + mOctagonGlowCb.makeEmitter(dPa_name::ID_SCENE_PEDESTAL_OCTAGON_GLOW, ¤t.pos, &shape_angle, NULL); initBrkAnm(0, true); } diff --git a/src/d/actor/d_a_player_particle.inc b/src/d/actor/d_a_player_particle.inc index c6387c33b..1dbb6d280 100644 --- a/src/d/actor/d_a_player_particle.inc +++ b/src/d/actor/d_a_player_particle.inc @@ -627,7 +627,7 @@ void daPy_lk_c::setWaterRipple() { ) { if (m3280.getEmitter() == NULL) { - dComIfGp_particle_setShipTail(0x33, ¤t.pos, NULL, NULL, 0xFF, &m3280); + dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, ¤t.pos, NULL, NULL, 0xFF, &m3280); } f32 var_f1 = (0.1f * std::fabsf(getSpeedF())); @@ -642,7 +642,7 @@ void daPy_lk_c::setWaterRipple() { if (emitter != NULL && ((emitter->mGlobalParticleScale.x < 0.8f && checkNoResetFlg0(daPyFlg0_UNK80)) || (emitter->mGlobalParticleScale.x > 0.8f && !checkNoResetFlg0(daPyFlg0_UNK80)))) { m3280.end(); - emitter = dComIfGp_particle_setShipTail(0x33, ¤t.pos, NULL, NULL, 0xFF, &m3280); + emitter = dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, ¤t.pos, NULL, NULL, 0xFF, &m3280); } if (emitter != NULL) { @@ -749,7 +749,7 @@ void daPy_lk_c::setWaterRipple() { if (((mAcch.ChkGroundHit() || checkModeFlg(ModeFlg_SWIM)) && mCurrAttributeCode == dBgS_Attr_WATERFALL_e) || (checkModeFlg(ModeFlg_HANG) && m3588 == 0x17)) { if (m3400.getEmitter() == NULL) { - m3400.makeEmitter(0x23, mpCLModel->getAnmMtx(15), ¤t.pos, NULL); + m3400.makeEmitter(dPa_name::ID_COMMON_0023, mpCLModel->getAnmMtx(15), ¤t.pos, NULL); JPABaseEmitter* emitter = m3400.getEmitter(); if (emitter != NULL) { @@ -763,7 +763,7 @@ void daPy_lk_c::setWaterRipple() { cXyz local_ac; mDoMtx_multVecZero(mpCLModel->getAnmMtx(0), &local_ac); - dComIfGp_particle_setSingleRipple(0x3F, &local_ac, NULL, (cXyz*)&waterfall_ripple_scale); + dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003F, &local_ac, NULL, (cXyz*)&waterfall_ripple_scale); m34CD = 15; dComIfGp_getVibration().StartQuake(4, 1, cXyz(0.0f, 1.0f, 0.0f)); } else { @@ -788,7 +788,7 @@ void daPy_lk_c::setWaterRipple() { } /* 8012B340-8012B8EC .text setFootEffectType__9daPy_lk_cFiP4cXyzii */ -void daPy_lk_c::setFootEffectType(int param_0, cXyz* i_pos, int param_2, int param_3) { +void daPy_lk_c::setFootEffectType(int effectID, cXyz* i_pos, int param_2, int param_3) { static JGeometry::TVec3 run_splash_scale(0.6f, 0.6f, 0.6f); static Vec grass_scale = {1.5f, 1.5f, 1.5f}; static JGeometry::TVec3 run_grass_scale(0.65f, 0.65f, 0.65f); @@ -812,48 +812,48 @@ void daPy_lk_c::setFootEffectType(int param_0, cXyz* i_pos, int param_2, int par footEffect->setPos(i_pos); footEffect->setAngle(&angle); - if (param_0 == 0x23) { + if (effectID == dPa_name::ID_COMMON_0023) { if (checkNoResetFlg0(daPyFlg0_UNK80) && m35D0 > 10.0f + i_pos->y) { footEffect->mPos.y = m35D0 - 10.0f; } - } else if (mCurProc == daPyProc_CUT_ROLL_e && param_0 == 0x2022) { - param_0 = -2; + } else if (mCurProc == daPyProc_CUT_ROLL_e && effectID == dPa_name::ID_COMMON_2022) { + effectID = -2; } else if (param_3 == 5) { - param_0 = 0x2027; + effectID = dPa_name::ID_COMMON_2027; } - s32 effectId = footEffect->getID(); - if (param_0 != effectId) { - if (effectId != fpcM_ERROR_PROCESS_ID_e) { + s32 oldEffectID = footEffect->getID(); + if (effectID != oldEffectID) { + if (oldEffectID != -1) { footEffect->getSmokeCallBack()->end(); footEffect->getOtherCallBack()->end(); } - if (param_0 == -2) { - emitter = dComIfGp_particle_setP1(0x2022, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)daPy_HIO_basic_c0::m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this)); - } else if (param_0 == 0x2022 || param_0 == 0x2027) { - emitter = dComIfGp_particle_setToonP1((u16)param_0, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)daPy_HIO_basic_c0::m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this)); - } else if (param_0 == 0x24) { + if (effectID == -2) { + emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_2022, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)daPy_HIO_basic_c0::m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this)); + } else if (effectID == dPa_name::ID_COMMON_2022 || effectID == dPa_name::ID_COMMON_2027) { + emitter = dComIfGp_particle_setToonP1(effectID, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)daPy_HIO_basic_c0::m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this)); + } else if (effectID == dPa_name::ID_COMMON_0024) { GXColor color = {tevStr.mColorC0.r, tevStr.mColorC0.g, tevStr.mColorC0.b, tevStr.mColorC0.a}; - emitter = dComIfGp_particle_setP1((u16)param_0, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&grass_scale, 0xFF, footEffect->getOtherCallBack(), -1, &color, &tevStr.mColorK0); + emitter = dComIfGp_particle_setP1(effectID, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&grass_scale, 0xFF, footEffect->getOtherCallBack(), -1, &color, &tevStr.mColorK0); } else { GXColor amb, dif; dKy_get_seacolor(&amb, &dif); - emitter = dComIfGp_particle_setP1((u16)param_0, &footEffect->getPos(), &footEffect->getAngle(), NULL, 0xFF, footEffect->getOtherCallBack(), -1, &amb); + emitter = dComIfGp_particle_setP1(effectID, &footEffect->getPos(), &footEffect->getAngle(), NULL, 0xFF, footEffect->getOtherCallBack(), -1, &amb); } if (emitter != NULL) { - footEffect->setID(param_0); + footEffect->setID(effectID); } - if (param_0 == -2) { - param_0 = 0x2022; + if (effectID == -2) { + effectID = dPa_name::ID_COMMON_2022; } } if (emitter != NULL) { if (param_3 == 5) { - if (param_0 == 0x2027) { + if (effectID == dPa_name::ID_COMMON_2027) { emitter->setLifeTime(40); emitter->setRate(10.0f); emitter->setEmitterScale(heavy_emit_smoke_scale); @@ -862,7 +862,7 @@ void daPy_lk_c::setFootEffectType(int param_0, cXyz* i_pos, int param_2, int par } else { emitter->setRate(15.0f); emitter->setSpread(1.0f); - if (param_0 == 0x24) { + if (effectID == dPa_name::ID_COMMON_0024) { emitter->setDirectionalSpeed(12.0f); } } @@ -873,7 +873,7 @@ void daPy_lk_c::setFootEffectType(int param_0, cXyz* i_pos, int param_2, int par emitter->setRate(8.0f); emitter->setSpread(0.3f); } else if (param_3 == 2) { - if (param_0 == 0x24) { + if (effectID == dPa_name::ID_COMMON_0024) { emitter->setGlobalScale(run_grass_scale); emitter->setRate(10.0f); emitter->setSpread(1.0f); @@ -883,7 +883,7 @@ void daPy_lk_c::setFootEffectType(int param_0, cXyz* i_pos, int param_2, int par emitter->setSpread(1.0f); emitter->setGlobalScale(run_splash_scale); } - } else if (param_3 == 4 && param_0 == 0x23) { + } else if (param_3 == 4 && effectID == dPa_name::ID_COMMON_0023) { emitter->setRate(3.0f); emitter->setSpread(0.2f); } else { @@ -941,7 +941,7 @@ void daPy_lk_c::setFootEffect() { GXColor amb, dif; dKy_get_seacolor(&amb, &dif); - JPABaseEmitter* emitter = dComIfGp_particle_setP1(0x23, &p, NULL, NULL, 0xFF, &m3410, -1, &amb); + JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0023, &p, NULL, NULL, 0xFF, &m3410, -1, &amb); if (emitter != NULL) { emitter->setLifeTime(15); emitter->setRate(4.0f); @@ -956,18 +956,21 @@ void daPy_lk_c::setFootEffect() { if (strcmp(dComIfGp_getStartStageName(), "Adanmae") == 0) { if (checkResetFlg0(daPyRFlg0_UNK10)) { if (getFootOnGround() && m35D0 <= current.pos.y) { - dComIfGp_particle_setP1(0x8237, &pos, ¤t.angle); + dComIfGp_particle_setP1(dPa_name::ID_SCENE_8237, &pos, ¤t.angle); } } } - s32 temp_r3_4 = dComIfGp_particle_checkAtrCodeEffect(mCurrAttributeCode); - if (temp_r3_4 == -1) { + s32 effectID = dComIfGp_particle_checkAtrCodeEffect(mCurrAttributeCode); + if (effectID == -1) { return; } s32 var_r29; - if (checkResetFlg0(daPyRFlg0_UNK10) && getFootOnGround() && (checkHeavyStateOn() || temp_r3_4 == 0x23 || temp_r3_4 == 0x24)) { + if ( + checkResetFlg0(daPyRFlg0_UNK10) && getFootOnGround() && + (checkHeavyStateOn() || effectID == dPa_name::ID_COMMON_0023 || effectID == dPa_name::ID_COMMON_0024) + ) { if (getRightFootOnGround()) { m34BE = 2; } else { @@ -1011,34 +1014,34 @@ void daPy_lk_c::setFootEffect() { pos.x = m370C.x + rnd * cM_scos(current.angle.y); pos.y = current.pos.y; pos.z = m370C.z - rnd * cM_scos(current.angle.y); - setFootEffectType(temp_r3_4, &pos, 0, var_r29); + setFootEffectType(effectID, &pos, 0, var_r29); } else { if (m34BE == 4) { f32 rnd = cM_rndFX(17.5f); pos.x = current.pos.x + rnd * cM_scos(current.angle.y); pos.y = current.pos.y; pos.z = current.pos.z - rnd * cM_scos(current.angle.y); - setFootEffectType(temp_r3_4, &pos, 0, var_r29); + setFootEffectType(effectID, &pos, 0, var_r29); } else if (m34BE == 3) { if (mCurrAttributeCode == dBgS_Attr_GRASS_e || mCurrAttributeCode == dBgS_Attr_WATER_e) { mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x27), &pos); - setFootEffectType(temp_r3_4, &pos, 0, var_r29); + setFootEffectType(effectID, &pos, 0, var_r29); mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x22), &pos); - setFootEffectType(temp_r3_4, &pos, 1, var_r29); + setFootEffectType(effectID, &pos, 1, var_r29); } else { - setFootEffectType(temp_r3_4, ¤t.pos, 0, var_r29); + setFootEffectType(effectID, ¤t.pos, 0, var_r29); } } else if (m34BE == 1) { mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x22), &pos); - setFootEffectType(temp_r3_4, &pos, 0, var_r29); + setFootEffectType(effectID, &pos, 0, var_r29); } else if (m34BE == 2) { mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x27), &pos); - setFootEffectType(temp_r3_4, &pos, 0, var_r29); + setFootEffectType(effectID, &pos, 0, var_r29); } else if (m34BE == 5) { - setFootEffectType(temp_r3_4, ¤t.pos, 0, 1); + setFootEffectType(effectID, ¤t.pos, 0, 1); } else if (m34BE == 6) { mDoMtx_multVecZero(mpCLModel->getAnmMtx(0), &pos); @@ -1050,7 +1053,7 @@ void daPy_lk_c::setFootEffect() { pos.y = groundY; } - setFootEffectType(temp_r3_4, &pos, 0, 1); + setFootEffectType(effectID, &pos, 0, 1); } } } @@ -1076,12 +1079,12 @@ void daPy_lk_c::setSwimTail() { static JGeometry::TVec3 tail_scale(1.0f, 1.0f, -1.0f); if (mSwimTailEcallBack[0].getEmitter() == NULL) { - dComIfGp_particle_setShipTail(0x3A, &mSwimTailEcallBack[0].getPos(), ¤t.angle, &scale, 0xFF, &mSwimTailEcallBack[0]); + dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_003A, &mSwimTailEcallBack[0].getPos(), ¤t.angle, &scale, 0xFF, &mSwimTailEcallBack[0]); mSwimTailEcallBack[0].field_0x05 = true; } if (mSwimTailEcallBack[1].getEmitter() == NULL) { - dComIfGp_particle_setShipTail(0x3A, &mSwimTailEcallBack[1].getPos(), ¤t.angle, &scale, 0xFF, &mSwimTailEcallBack[1]); + dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_003A, &mSwimTailEcallBack[1].getPos(), ¤t.angle, &scale, 0xFF, &mSwimTailEcallBack[1]); } } @@ -1091,7 +1094,7 @@ void daPy_lk_c::setCutWaterSplash() { cXyz pos; mDoMtx_multVecZero(mpCLModel->getAnmMtx(4), &pos); - dComIfGp_particle_setP1(0x39, &pos); + dComIfGp_particle_setP1(dPa_name::ID_COMMON_0039, &pos); } } @@ -1100,7 +1103,7 @@ void daPy_lk_c::setSwimWaterDrop(daPy_waterDropEcallBack_c* callBack) { f32 tmp = m35D0 + 10.0f; if (checkNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP) || !checkNoResetFlg0(daPy_lk_c::daPyFlg0_UNK80) || (callBack->getPos().y > tmp && !checkModeFlg(ModeFlg_SWIM))) { if (callBack->getEmitter() == NULL && (callBack->field_0x1C || checkNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP))) { - JPABaseEmitter* emitter = dComIfGp_particle_setP1(0x38, &callBack->getPos(), NULL, NULL, 0xFF, callBack); + JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0038, &callBack->getPos(), NULL, NULL, 0xFF, callBack); if (emitter != NULL) { emitter->setParticleCallBackPtr(&daPy_waterDropEcallBack_c::m_pcallback); @@ -1143,11 +1146,11 @@ void daPy_lk_c::setWaterDrop() { if (dKyr_player_overhead_bg_chk() && dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) != dStageType_MISC_e && mCurProc != PROC_KI && mAcch.m_roof_y == 1e9f) { if (m3460[0].mpEmitter == NULL) { - m3460[0].makeEmitter(0x432, mpCLModel->getAnmMtx(0x0E), ¤t.pos, NULL); + m3460[0].makeEmitter(dPa_name::ID_COMMON_0432, mpCLModel->getAnmMtx(0x0E), ¤t.pos, NULL); } if (m3460[1].mpEmitter == NULL) { - m3460[1].makeEmitter(0x432, mpCLModel->getAnmMtx(0x02), ¤t.pos, NULL); + m3460[1].makeEmitter(dPa_name::ID_COMMON_0432, mpCLModel->getAnmMtx(0x02), ¤t.pos, NULL); } m334C.end(); @@ -1179,7 +1182,7 @@ void daPy_lk_c::setDamageFlameEmitter() { for (int i = 0; i < (s32)ARRAY_SIZE(mDmEcallBack); i++, jointNoP++, dmECB++) { cXyz jointPos; mDoMtx_multVecZero(mpCLModel->getAnmMtx(*jointNoP), &jointPos); - dmECB->makeEmitter(0x3F1, mpCLModel->getAnmMtx(*jointNoP), &jointPos, NULL); + dmECB->makeEmitter(dPa_name::ID_COMMON_03F1, mpCLModel->getAnmMtx(*jointNoP), &jointPos, NULL); if (dmECB->getEmitter() == NULL) { continue; } @@ -1197,7 +1200,7 @@ void daPy_lk_c::setDamageCurseEmitter() { if (!daPy_dmEcallBack_c::checkCurse()) { endDamageEmitter(); - mDmEcallBack[0].makeEmitter(0x815B, mpCLModel->getAnmMtx(0x1E), ¤t.pos, NULL); + mDmEcallBack[0].makeEmitter(dPa_name::ID_SCENE_815B, mpCLModel->getAnmMtx(0x1E), ¤t.pos, NULL); if (checkUpperReadyThrowAnime()) { resetActAnimeUpper(UPPER_MOVE2_e, -1.0f); @@ -1214,8 +1217,8 @@ void daPy_lk_c::setDamageElecEmitter() { if (!daPy_dmEcallBack_c::checkElec()) { endDamageEmitter(); - mDmEcallBack[0].makeEmitter(0x3ED, mpCLModel->getAnmMtx(4), ¤t.pos, NULL); - mDmEcallBack[1].makeEmitter(0x3EE, mpCLModel->getAnmMtx(4), ¤t.pos, NULL); + mDmEcallBack[0].makeEmitter(dPa_name::ID_COMMON_03ED, mpCLModel->getAnmMtx(4), ¤t.pos, NULL); + mDmEcallBack[1].makeEmitter(dPa_name::ID_COMMON_03EE, mpCLModel->getAnmMtx(4), ¤t.pos, NULL); } daPy_dmEcallBack_c::setElec(daPy_HIO_elecDamage_c0::m.field_0x2); @@ -1245,7 +1248,7 @@ void daPy_lk_c::endFlameDamageEmitter() { mDoMtx_multVecZero(mDmEcallBack[i].mpMtx, &pos); pos.y = m35D0; - dComIfGp_particle_set(0x35A, &pos); + dComIfGp_particle_set(dPa_name::ID_COMMON_035A, &pos); } } @@ -1290,12 +1293,12 @@ u32 daPy_lk_c::setItemWaterEffect(fopAc_ac_c* i_actor, int param_1, int param_2) pos = i_actor->old.pos * var_f31 + i_actor->current.pos * (1.0f - var_f31); } - dComIfGp_particle_setSingleRipple(0x3D, &pos, NULL, &eff_scale0); - dComIfGp_particle_setSingleRipple(0x3F, &pos, NULL, &eff_scale0); + dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, &pos, NULL, &eff_scale0); + dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003F, &pos, NULL, &eff_scale0); GXColor amb, dif; dKy_get_seacolor(&amb, &dif); - JPABaseEmitter* emitter = dComIfGp_particle_setP1(0x23, &pos, NULL, &eff_scale2, 0xFF, NULL, -1, &amb); + JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0023, &pos, NULL, &eff_scale2, 0xFF, NULL, -1, &amb); if (emitter != NULL) { emitter->setMaxFrame(1); diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc index 53247c481..ae5845875 100644 --- a/src/d/actor/d_a_player_tact.inc +++ b/src/d/actor/d_a_player_tact.inc @@ -277,7 +277,7 @@ BOOL daPy_lk_c::procTactWait_init(int r30) { initShipRideUseItem(r31, 2); m34D2 = -1; - m32E4.makeEmitter(0x50, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_COMMON_0050, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); m3570 = r30; m34D8 = 0; m3574 = -1; @@ -549,7 +549,7 @@ BOOL daPy_lk_c::procTactPlay_init(s32 r27, int r30, int r31) { } } - m32E4.makeEmitter(0x51, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_COMMON_0051, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); m34D0 = 0; m3574 = r30; m3624 = 0; @@ -793,7 +793,7 @@ BOOL daPy_lk_c::procTactPlayOriginal_init() { mDoAud_tact_setStickPos(m3570, m3574); mDoAud_tact_playArmSwing(m3570, m3574); setTactModel(); - m32E4.makeEmitter(0x51, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_COMMON_0051, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); m34D6 = 0xF; m34DA = 0; mDoAud_taktModeMute(); diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index 55f9c8ef6..9d9e94252 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -202,7 +202,7 @@ void action_dousa(pw_class* i_this) { i_this->m3A4 = 0.0f; first_mode_change(i_this); i_this->m38C = fopAcM_searchPlayerAngleY(i_this); - JPABaseEmitter* particle = dComIfGp_particle_set(0x82EE, &i_this->m2CC, &i_this->shape_angle); + JPABaseEmitter* particle = dComIfGp_particle_set(dPa_name::ID_SCENE_82EE, &i_this->m2CC, &i_this->shape_angle); if (particle != NULL) { particle->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(0x17)); // j_pw_item_r1 joint } diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 2d7f6d887..360f290d9 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -623,7 +623,7 @@ bool daRd_c::checkTgHit() { cXyz* hitPos = mCyl.GetTgHitPosP(); cc_at_check(this, &atInfo); if (mHitType == 1 || mHitType == 7 || mHitType == 8 || health <= 0) { - dComIfGp_particle_set(0x10, mCyl.GetTgHitPosP()); + dComIfGp_particle_set(dPa_name::ID_COMMON_0010, mCyl.GetTgHitPosP()); cXyz scale(2.0f, 2.0f, 2.0f); dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, hitPos, &player->shape_angle, &scale); if (health <= 0) { diff --git a/src/d/actor/d_a_steam_tag.cpp b/src/d/actor/d_a_steam_tag.cpp index 6567ec5b8..ef8305512 100644 --- a/src/d/actor/d_a_steam_tag.cpp +++ b/src/d/actor/d_a_steam_tag.cpp @@ -93,9 +93,9 @@ BOOL daSteamTag_c::createEmitter() { if (mEmitterNum < 8) { u16 particleID; if (((s16)cM_rndF(100.0f) % 2) != 0) { - particleID = 0x808B; + particleID = dPa_name::ID_SCENE_808B; } else { - particleID = 0x808C; + particleID = dPa_name::ID_SCENE_808C; } mpEmitter = dComIfGp_particle_setToon(particleID, ¤t.pos, ¤t.angle, &scale, getData()->steam_alpha); if (mpEmitter) { diff --git a/src/d/actor/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp index 3f2ab527e..b4047e9c4 100644 --- a/src/d/actor/d_a_syan.cpp +++ b/src/d/actor/d_a_syan.cpp @@ -139,7 +139,7 @@ static BOOL daSyan_Execute(syan_class* i_this) { if (!i_this->emtrEnabled[i]) { i_this->emtrEnabled[i] = true; static cXyz fire_scale(0.7f, 0.7f, 0.7f); - dComIfGp_particle_set(0x1ea, &i_this->partPos[i], NULL, &fire_scale, 0xFF, &i_this->emtrCallBack[i]); + dComIfGp_particle_set(dPa_name::ID_COMMON_01EA, &i_this->partPos[i], NULL, &fire_scale, 0xFF, &i_this->emtrCallBack[i]); } else { JPABaseEmitter* emtr = i_this->emtrCallBack[i].getEmitter(); if (emtr != NULL) { @@ -162,7 +162,7 @@ static BOOL daSyan_Execute(syan_class* i_this) { i_this->emtrCallBack[i].getEmitter()->setGlobalParticleScale(scale); cXyz pos(i_this->partPos[i].x, i_this->partPos[i].y + REG0_F(7) + 20.0f, i_this->partPos[i].z); - dComIfGp_particle_setSimple(0x4004, &pos, 0xFF, g_whiteColor, g_whiteColor, 0); + dComIfGp_particle_setSimple(dPa_name::ID_COMMON_4004, &pos, 0xFF, g_whiteColor, g_whiteColor, 0); } } } diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 00f98dc9d..7977ea9be 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -672,14 +672,14 @@ void daTbox_c::demoInitAppear_Tact() { angle.y = current.angle.y; angle.z = current.angle.z; - dComIfGp_particle_set(0x82F1, ¤t.pos, &angle); - dComIfGp_particle_set(0x82F0, ¤t.pos, &angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_82F1, ¤t.pos, &angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_82F0, ¤t.pos, &angle); angle.y += 0x5555; - dComIfGp_particle_set(0x82F0, ¤t.pos, &angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_82F0, ¤t.pos, &angle); angle.y += 0x5555; - dComIfGp_particle_set(0x82F0, ¤t.pos, &angle); + dComIfGp_particle_set(dPa_name::ID_SCENE_82F0, ¤t.pos, &angle); fopAcM_seStart(this, JA_SE_OBJ_TRIFORCE_BOX_IN, 0); } @@ -688,8 +688,8 @@ void daTbox_c::demoInitAppear_Tact() { void daTbox_c::demoInitAppear() { fopAcM_seStart(this, JA_SE_OBJ_KOUBAKU_TBOX, 0); - dComIfGp_particle_set(0x3EB, ¤t.pos); - dComIfGp_particle_set(0x3EC, ¤t.pos); + dComIfGp_particle_set(dPa_name::ID_COMMON_03EB, ¤t.pos); + dComIfGp_particle_set(dPa_name::ID_COMMON_03EC, ¤t.pos); } /* 00001B38-00001CF4 .text demoProcAppear_Tact__8daTbox_cFv */ @@ -735,7 +735,7 @@ void daTbox_c::demoProcAppear() { } if (mAppearTimer == 0x05) { - JPABaseEmitter* emitter = dComIfGp_particle_setToon(0x2022, ¤t.pos, NULL, NULL, 0xB9, &mSmokeCB); + JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, ¤t.pos, NULL, NULL, 0xB9, &mSmokeCB); if (emitter != NULL) { emitter->setRate(100.0f); @@ -896,13 +896,13 @@ void daTbox_c::OpenInit() { flagOn(daTboxFlg_OPENING_e); - dComIfGp_particle_set(0x01F1, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x01F2, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x01F3, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x01F4, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(0x01F6, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_COMMON_01F1, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_COMMON_01F2, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_COMMON_01F3, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_COMMON_01F4, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_COMMON_01F6, ¤t.pos, ¤t.angle); - mSmokeEmitter = dComIfGp_particle_set(0x01F5, ¤t.pos, ¤t.angle); + mSmokeEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_01F5, ¤t.pos, ¤t.angle); if (mSmokeEmitter != NULL) { mSmokeEmitter->mGlobalPrmColor.a = 0; } diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index e35a9aaaa..ba4f13039 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -243,7 +243,7 @@ void daTitle_proc_c::calc_2d_alpha() { 0.0f ); - mpEmitter = dComIfGp_particle_set2Dback(0x83F9, &pos); + mpEmitter = dComIfGp_particle_set2Dback(dPa_name::ID_SCENE_83F9, &pos); } else { pos.set( ((this->pane[4].mPosTopLeftOrig.x - 320.0f) - this->m094) + attr().field_0x30, @@ -284,7 +284,7 @@ void daTitle_proc_c::calc_2d_alpha() { m00C.set(pane[4].mPosTopLeftOrig.x - 320.0f, pane[4].mPosTopLeftOrig.y - 240.0f, 0.0f); - mpEmitter2 = dComIfGp_particle_set2Dfore(0x83FB, &m00C); + mpEmitter2 = dComIfGp_particle_set2Dfore(dPa_name::ID_SCENE_83FB, &m00C); } else if (m018 > 80 && m018 <= 115 && mpEmitter2 != NULL) { m00C.x += (pane[5].mPosTopLeftOrig.x - pane[4].mPosTopLeftOrig.x) / 35.0f; @@ -314,7 +314,7 @@ void daTitle_proc_c::calc_2d_alpha() { } else { if (mpEmitter == NULL) { pos.set(pane[4].mPosTopLeftOrig.x - 320.0f, pane[4].mPosTopLeftOrig.y - 240.0f, 0.0f); - mpEmitter = dComIfGp_particle_set2Dback(0x83F9, &pos); + mpEmitter = dComIfGp_particle_set2Dback(dPa_name::ID_SCENE_83F9, &pos); } else { pos.set( ((pane[4].mPosTopLeftOrig.x - 320.0f) - m094) + attr().field_0x30, @@ -357,7 +357,7 @@ void daTitle_proc_c::calc_2d_alpha() { angle.y = 0; angle.z = (s16)cM_rndFX(4000.0f); - dComIfGp_particle_set2Dback(0x83FA, &pos, &angle); + dComIfGp_particle_set2Dback(dPa_name::ID_SCENE_83FA, &pos, &angle); } else { m020 -= 1; } diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index f3f7c2a89..0b1dc292c 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -176,7 +176,7 @@ BOOL daTornado_c::execute() { mPtclTimer -= 1; } else { mPtclTimer = 10; - dComIfGp_particle_set(0x8213, ¤t.pos, NULL, (cXyz*)&wind_scale); + dComIfGp_particle_set(dPa_name::ID_SCENE_8213, ¤t.pos, NULL, (cXyz*)&wind_scale); } fopAcM_seStartCurrent(this, JA_SE_OBJ_TORNADE_SUS, 100); @@ -322,7 +322,7 @@ s32 daTornado_c::create() { dKyw_tornado_Notice(¤t.pos); mpModelUnder->setBaseScale(under_scale); mCenter = current.pos; - dComIfGp_particle_set(0x81bb, &mCenter, NULL, NULL, 0xFF, &mPtclCb); + dComIfGp_particle_set(dPa_name::ID_SCENE_81BB, &mCenter, NULL, NULL, 0xFF, &mPtclCb); fopAcM_OnStatus(this, fopAcStts_SHOWMAP_e); } mDoMtx_stack_c::transS(current.pos); diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index a52b3090b..0f729d281 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -263,8 +263,16 @@ void daWall_c::set_tri() { /* 00000D84-00000F74 .text set_effect__8daWall_cFv */ void daWall_c::set_effect() { - u16 projection_id[3] = {0xa16e, 0xa170, 0xa172}; - u16 particle_id[3] = {0xa16f, 0xa171, 0xa173}; + u16 projection_id[] = { + dPa_name::ID_SCENE_A16E, + dPa_name::ID_SCENE_A170, + dPa_name::ID_SCENE_A172, + }; + u16 particle_id[] = { + dPa_name::ID_SCENE_A16F, + dPa_name::ID_SCENE_A171, + dPa_name::ID_SCENE_A173, + }; csXyz local_28 = current.angle; local_28.y += 0x8000; diff --git a/src/d/actor/d_a_warpfout.cpp b/src/d/actor/d_a_warpfout.cpp index 73fbfe8cd..ddcd2e708 100644 --- a/src/d/actor/d_a_warpfout.cpp +++ b/src/d/actor/d_a_warpfout.cpp @@ -141,7 +141,7 @@ void daWarpfout_c::initWarp4(int) { fopAc_ac_c* link = dComIfGp_getLinkPlayer(); for (int i = 0; i < 6; i++) { - dComIfGp_particle_set(dPa_name::ID_WARPFOUT_WARP4, &link->current.pos); + dComIfGp_particle_set(dPa_name::ID_SCENE_WARPFOUT_WARP4, &link->current.pos); } } @@ -164,7 +164,7 @@ void daWarpfout_c::set_effect_wind01(cXyz effectPos, s16 effectAngleZOffset) { csXyz effectAngle = get_effect_angle(); effectAngle.z += effectAngleZOffset; - dComIfGp_particle_set(0x830f, &effectPos, &effectAngle); + dComIfGp_particle_set(dPa_name::ID_SCENE_830F, &effectPos, &effectAngle); } /* 000005F4-00000670 .text get_effect_angle__12daWarpfout_cFv */ diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index 65f0eca15..5e26f324a 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -164,7 +164,7 @@ void daWindTag::daWindTag_c::CreateInit() { mEfColor.g = mEfTevStr.mColorC0.g; mEfColor.b = mEfTevStr.mColorC0.b; mEfColor.a = mEfTevStr.mColorC0.a; - mpEmitter = dComIfGp_particle_set(0x8290, ¤t.pos, NULL, &scale, 0xFF, NULL, fopAcM_GetRoomNo(this), &mEfColor); + mpEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_8290, ¤t.pos, NULL, &scale, 0xFF, NULL, fopAcM_GetRoomNo(this), &mEfColor); if (mpEmitter != NULL) mpEmitter->setGlobalScale(efScale); } diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp index 232b17d93..fe2ed226e 100644 --- a/src/d/actor/d_a_ygcwp.cpp +++ b/src/d/actor/d_a_ygcwp.cpp @@ -128,7 +128,7 @@ void daYgcwp_c::init_mtx() { /* 00000588-000005F0 .text make_shine__9daYgcwp_cFv */ void daYgcwp_c::make_shine() { - dComIfGp_particle_set(0x8316, ¤t.pos, NULL, &scale); + dComIfGp_particle_set(dPa_name::ID_SCENE_8316, ¤t.pos, NULL, &scale); } /* 000005F0-00000654 .text set_timer__9daYgcwp_cFv */ diff --git a/src/d/d_a_leaflift_static.cpp b/src/d/d_a_leaflift_static.cpp index 538c74bc9..f008a0527 100644 --- a/src/d/d_a_leaflift_static.cpp +++ b/src/d/d_a_leaflift_static.cpp @@ -32,11 +32,11 @@ BOOL daLlift_c::MoveUpLift() { else if ((upVel != 0.0f) && (mbIsAscending == FALSE)) { fopAcM_seStart(this, JA_SE_OBJ_LOTUS_LIFT_UP, 0); mbIsAscending = TRUE; - mEmitter1 = dComIfGp_particle_set(0x82AC, ¤t.pos, ¤t.angle); + mEmitter1 = dComIfGp_particle_set(dPa_name::ID_SCENE_82AC, ¤t.pos, ¤t.angle); mEmitter2 = NULL; upLiftPos = current.pos; upLiftPos.y = mWaterY; - mEmitter4 = dComIfGp_particle_set(0x82AB, &upLiftPos, ¤t.angle); + mEmitter4 = dComIfGp_particle_set(dPa_name::ID_SCENE_82AB, &upLiftPos, ¤t.angle); mEmitterTimer = 0; if (mEmitter3) { mEmitter3->stopCreateParticle(); diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index 89f830c41..5f6f3e294 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -19,7 +19,7 @@ namespace daObj { case dBgS_Attr_WATER_e: { scaleV.setall(scale * 0.85f); - JPABaseEmitter* pEmtr = dComIfGp_particle_set(0x23, &ac->current.pos, NULL, &scaleV); + JPABaseEmitter* pEmtr = dComIfGp_particle_set(dPa_name::ID_COMMON_0023, &ac->current.pos, NULL, &scaleV); if (pEmtr != NULL) { pEmtr->setRate(20.0f); pEmtr->setMaxFrame(1); @@ -31,7 +31,7 @@ namespace daObj { case dBgS_Attr_GRASS_e: { scaleV.setall(scale); - JPABaseEmitter* pEmtr = dComIfGp_particle_set(0x24, &ac->current.pos, NULL, &scaleV); + JPABaseEmitter* pEmtr = dComIfGp_particle_set(dPa_name::ID_COMMON_0024, &ac->current.pos, NULL, &scaleV); if (pEmtr != NULL) { pEmtr->setLifeTime(20); pEmtr->setRate(50.0f); diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp index abd5ed5c0..61b2b2ba7 100644 --- a/src/d/d_cc_s.cpp +++ b/src/d/d_cc_s.cpp @@ -315,7 +315,7 @@ void dCcS::ProcAtTgHitmark(bool, bool, cCcD_Obj* atObj, cCcD_Obj* tgObj, dCcD_GO csXyz angle; CalcParticleAngle(atInf, atStts, tgStts, &angle); if (atInf->GetAtHitMark() == dCcG_AtHitMark_Big_e) { - dComIfGp_particle_set(0x10, pos); + dComIfGp_particle_set(dPa_name::ID_COMMON_0010, pos); cXyz scale; scale.x = scale.y = scale.z = 2.0f; dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, pos, &angle, &scale); diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp index 822be4741..f55c485f3 100644 --- a/src/d/d_cc_uty.cpp +++ b/src/d/d_cc_uty.cpp @@ -226,7 +226,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) { pauseTime = 6 + g_regHIO.mChild->mShortRegs[7]; if (atInfo->pParticlePos) { - dComIfGp_particle_set(0x10, atInfo->pParticlePos); + dComIfGp_particle_set(dPa_name::ID_COMMON_0010, atInfo->pParticlePos); cXyz scale; scale.x = scale.y = scale.z = 2.0f; csXyz angle; diff --git a/src/d/d_door.cpp b/src/d/d_door.cpp index 8ab882a87..c3a5ace00 100644 --- a/src/d/d_door.cpp +++ b/src/d/d_door.cpp @@ -384,7 +384,7 @@ void dDoor_info_c::setPosAndAngle(cXyz* pPos, s16 angle) { void dDoor_smoke_c::smokeInit(dDoor_info_c* door) { mPos = door->current.pos; mRot.y = door->shape_angle.y; - JPABaseEmitter* emtr = dComIfGp_particle_set(0x2022, &mPos, &mRot, NULL, 0xAA, &mSmokeCb, fopAcM_GetRoomNo(door)); + JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_COMMON_2022, &mPos, &mRot, NULL, 0xAA, &mSmokeCb, fopAcM_GetRoomNo(door)); m34 = 0; m35 = 0; if (emtr != NULL) { diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 65e6f0762..de00391c8 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -264,7 +264,7 @@ BOOL dDlst_GameOverScrnDraw_c::animeOpen() { anime1(i); if (letter[i].mUserArea == 5) { cXyz temp(x[i], 50.0f, 0.0f); - dComIfGp_particle_set2Dfore(0x2E, &temp); + dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_002E, &temp); } } @@ -326,12 +326,12 @@ BOOL dDlst_GameOverScrnDraw_c::animeClose() { /* 8018F05C-8018F0CC .text setEmitter0__24dDlst_GameOverScrnDraw_cF4cXyz */ void dDlst_GameOverScrnDraw_c::setEmitter0(cXyz pos) { - mpEmitter0 = dComIfGp_particle_set2Dfore(0x2f, &pos); + mpEmitter0 = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_002F, &pos); } /* 8018F0CC-8018F13C .text setEmitter1__24dDlst_GameOverScrnDraw_cF4cXyz */ void dDlst_GameOverScrnDraw_c::setEmitter1(cXyz pos) { - mpEmitter1 = dComIfGp_particle_set2DmenuFore(0x30, &pos); + mpEmitter1 = dComIfGp_particle_set2DmenuFore(dPa_name::ID_COMMON_0030, &pos); } /* 8018F13C-8018F334 .text anime1__24dDlst_GameOverScrnDraw_cFi */ diff --git a/src/d/d_grass.cpp b/src/d/d_grass.cpp index 0c62e0ae3..d078aa582 100644 --- a/src/d/d_grass.cpp +++ b/src/d/d_grass.cpp @@ -47,7 +47,7 @@ static bool l_CutSoundFlag; /* 80077048-8007712C .text setBatta__FP4cXyzP8_GXColor */ void setBatta(cXyz* pos, GXColor* color) { if (!dKy_rain_check() && !dComIfGp_event_runCheck() && strncmp(dComIfGp_getStartStageName(), "kin", 3) != 0 && strcmp(dComIfGp_getStartStageName(), "Xboss1") != 0 && cM_rnd() > 0.99f) - dComIfGp_particle_set(0x453, pos, NULL, NULL, 0xFF, NULL, -1, color, color); + dComIfGp_particle_set(dPa_name::ID_COMMON_0453, pos, NULL, NULL, 0xFF, NULL, -1, color, color); } /* 8007712C-8007734C .text WorkCo__13dGrass_data_cFP10fopAc_ac_cUli */ @@ -230,8 +230,8 @@ dGrass_packet_c::dGrass_packet_c() { mDLSize = 0xa0; mpDLCut = l_Vmori_01DL; mDLCutSize = 0x80; - mCoParticle = 0x8222; - mAtParticle = 0x8221; + mCoParticle = dPa_name::ID_SCENE_8222; + mAtParticle = dPa_name::ID_SCENE_8221; } else { mpPosArr = (f32*)l_pos; mpColorArr = l_color; @@ -242,8 +242,8 @@ dGrass_packet_c::dGrass_packet_c() { mDLSize = 0xa0; mpDLCut = l_Oba_kusa_a_cutDL; mDLCutSize = 0x80; - mCoParticle = 0x03db; - mAtParticle = 0x03da; + mCoParticle = dPa_name::ID_COMMON_03DB; + mAtParticle = dPa_name::ID_COMMON_03DA; } } diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index 8a7b93f51..8cb333796 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -9818,48 +9818,48 @@ dItem_data_item_info dItem_data::item_info[0x100] = { dItem_data_effect_info dItem_data::effect_info[] = { { // 0x00: dItem_HEART_e - 0x0002, + dPa_name::ID_COMMON_0002, dPa_name::ID_SCENE_END, }, { // 0x01: dItem_GREEN_RUPEE_e - 0x0003, + dPa_name::ID_COMMON_0003, dPa_name::ID_SCENE_END, }, { // 0x02: dItem_BLUE_RUPEE_e - 0x0003, + dPa_name::ID_COMMON_0003, dPa_name::ID_SCENE_END, }, { // 0x03: dItem_YELLOW_RUPEE_e - 0x0003, + dPa_name::ID_COMMON_0003, dPa_name::ID_SCENE_END, }, { // 0x04: dItem_RED_RUPEE_e - 0x0003, + dPa_name::ID_COMMON_0003, dPa_name::ID_SCENE_END, }, { // 0x05: dItem_PURPLE_RUPEE_e - 0x0003, + dPa_name::ID_COMMON_0003, dPa_name::ID_SCENE_END, }, { // 0x06: dItem_ORANGE_RUPEE_e - 0x0002, + dPa_name::ID_COMMON_0002, dPa_name::ID_SCENE_END, }, { // 0x07: dItem_HEART_PIECE_e dPa_name::ID_SCENE_END, - 0x0293, + dPa_name::ID_COMMON_0293, }, { // 0x08: dItem_HEART_CONTAINER_e dPa_name::ID_SCENE_END, - 0x0293, + dPa_name::ID_COMMON_0293, }, { // 0x09: dItem_SMALL_MAGIC_e @@ -9923,7 +9923,7 @@ dItem_data_effect_info dItem_data::effect_info[] = { }, { // 0x15: dItem_SMALL_KEY_e - 0x0003, + dPa_name::ID_COMMON_0003, dPa_name::ID_SCENE_END, }, { @@ -10164,37 +10164,37 @@ dItem_data_effect_info dItem_data::effect_info[] = { { // 0x45: dItem_SKULL_NECKLACE_e dPa_name::ID_SCENE_END, - 0x0293, + dPa_name::ID_COMMON_0293, }, { // 0x46: dItem_BOKOBABA_SEED_e dPa_name::ID_SCENE_END, - 0x0293, + dPa_name::ID_COMMON_0293, }, { // 0x47: dItem_GOLDEN_FEATHER_e dPa_name::ID_SCENE_END, - 0x0293, + dPa_name::ID_COMMON_0293, }, { // 0x48: BOKO_BELT dPa_name::ID_SCENE_END, - 0x0293, + dPa_name::ID_COMMON_0293, }, { // 0x49: dItem_RED_JELLY_e dPa_name::ID_SCENE_END, - 0x0293, + dPa_name::ID_COMMON_0293, }, { // 0x4A: dItem_GREEN_JELLY_e dPa_name::ID_SCENE_END, - 0x0293, + dPa_name::ID_COMMON_0293, }, { // 0x4B: dItem_BLUE_JELLY_e dPa_name::ID_SCENE_END, - 0x0293, + dPa_name::ID_COMMON_0293, }, { // 0x4C: dItem_MAP_e diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 6faaf724a..2d096780b 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -142,7 +142,7 @@ void dKyr_kamome_move() { pWind->mKamomeEff[i].mAngleYSpeed = cM_rndFX(1.0f); pWind->mKamomeEff[i].mScale = 0.0f; pWind->mKamomeEff[i].mTimer = 300.0f + cM_rndF(180.0f); - pWind->mKamomeEff[i].mpEmitter = dComIfGp_particle_set(0x429, &pWind->mKamomeEff[i].mPos); + pWind->mKamomeEff[i].mpEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0429, &pWind->mKamomeEff[i].mPos); pWind->mKamomeEff[i].mStatus++; } else { pWind->mKamomeEff[i].mTimer--; @@ -366,7 +366,7 @@ void dKyr_wind_move() { pos.y = windEff.mBasePos.y + windEff.mPos.y; pos.z = windEff.mBasePos.z + windEff.mPos.z; - windEff.mpEmitter = dComIfGp_particle_set(0x31, &pos); + windEff.mpEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0031, &pos); if (windEff.mpEmitter != NULL) { windEff.mpEmitter->setGlobalAlpha(0); windEff.mpEmitter->setGlobalScale(JGeometry::TVec3(fVar23, fVar23, fVar23)); diff --git a/src/d/d_metronome.cpp b/src/d/d_metronome.cpp index e67cbf37b..83a27c38f 100644 --- a/src/d/d_metronome.cpp +++ b/src/d/d_metronome.cpp @@ -339,14 +339,14 @@ void dMetronome_c::melodyShow() { pos.y = pane_wn[mBeat - 1].mPosCenter.y - 240.0f; } - dComIfGp_particle_set2Dfore(0x23e, &pos); + dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_023E, &pos); if (daPy_getPlayerLinkActorClass()->getTactTopPos(&tactTop)) { mDoLib_project(&tactTop, &sparklePos); sparklePos.x -= 320.0f; sparklePos.y -= 240.0f; - mpEmitter = dComIfGp_particle_set2Dfore(0x23f, &sparklePos); + mpEmitter = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_023F, &sparklePos); mpEmitter->becomeImmortalEmitter(); } diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index b1e14d2f4..aa8f00a60 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -486,12 +486,12 @@ void dPa_simpleEcallBack::draw(JPABaseEmitter* emtr) { } /* 8007C6EC-8007C774 .text create__19dPa_simpleEcallBackFP17JPAEmitterManagerUsUc */ -JPABaseEmitter* dPa_simpleEcallBack::create(JPAEmitterManager* manager, u16 param_2, u8 param_3) { +JPABaseEmitter* dPa_simpleEcallBack::create(JPAEmitterManager* manager, u16 effectID, u8 param_3) { mpBaseEmitter = NULL; mGrpID = param_3; - mResID = param_2; + mResID = effectID; if (createEmitter(manager)) { - if (param_2 == 0xa06a || param_2 == 0xa410) { + if (effectID == dPa_name::ID_SCENE_A06A || effectID == dPa_name::ID_SCENE_A410) { mbIsSmoke = true; mpBaseEmitter->mpParticleCallBack = &dPa_control_c::mSmokePcallback; } else { @@ -787,7 +787,7 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(int code, const cXyz* pos, const cs } JPABaseEmitter* emtr = NULL; - if (*i_return_id == 0x23) { + if (*i_return_id == dPa_name::ID_COMMON_0023) { if (flag & 0x04) { cXyz ptclScale(scale3, scale3, scale3); dKy_get_seacolor(&amb, &dif); @@ -797,7 +797,7 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(int code, const cXyz* pos, const cs emtr = setNormal(*i_return_id, pos, angle, &ptclScale, 0xFF, NULL, -1, &amb, NULL, NULL); } } - } else if (*i_return_id == 0x24) { + } else if (*i_return_id == dPa_name::ID_COMMON_0024) { if (flag & 0x02) { cXyz ptclScale(scale2, scale2, scale2); @@ -812,9 +812,9 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(int code, const cXyz* pos, const cs emtr = setNormal(*i_return_id, pos, angle, &ptclScale, 0xFF, NULL, -1, &amb, &i_tevStr->mColorK0, NULL); } } - } else if (*i_return_id == 0x2022) { + } else if (*i_return_id == dPa_name::ID_COMMON_2022) { if (flag & 0x08) - *i_return_id = 0x2027; + *i_return_id = dPa_name::ID_COMMON_2027; if (flag & 0x09) { cXyz ptclScale(scale1, scale1, scale1); @@ -836,9 +836,9 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(int code, const cXyz* pos, const cs } /* 8007D998-8007DA58 .text setSimpleLand__13dPa_control_cFR13cBgS_PolyInfoPC4cXyzPC5csXyzfffP12dKy_tevstr_cPii */ -JPABaseEmitter* dPa_control_c::setSimpleLand(cBgS_PolyInfo& polyInfo, const cXyz* pos, const csXyz* angle, f32 scale1, f32 scale2, f32 scale3, dKy_tevstr_c* i_tevStr, int* i_return_code, int flag) { +JPABaseEmitter* dPa_control_c::setSimpleLand(cBgS_PolyInfo& polyInfo, const cXyz* pos, const csXyz* angle, f32 scale1, f32 scale2, f32 scale3, dKy_tevstr_c* i_tevStr, int* i_return_id, int flag) { if (dComIfG_Bgsp()->ChkPolySafe(polyInfo)) { - return setSimpleLand(dComIfG_Bgsp()->GetAttributeCode(polyInfo), pos, angle, scale1, scale2, scale3, i_tevStr, i_return_code, flag); + return setSimpleLand(dComIfG_Bgsp()->GetAttributeCode(polyInfo), pos, angle, scale1, scale2, scale3, i_tevStr, i_return_id, flag); } return NULL; } @@ -846,11 +846,11 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(cBgS_PolyInfo& polyInfo, const cXyz /* 8007DA58-8007DAA8 .text checkAtrCodeEffect__13dPa_control_cFi */ s32 dPa_control_c::checkAtrCodeEffect(int code) { if (code == dBgS_Attr_WATER_e) { - return 0x23; + return dPa_name::ID_COMMON_0023; } else if (code == dBgS_Attr_GRASS_e) { - return 0x24; + return dPa_name::ID_COMMON_0024; } else if (code != dBgS_Attr_UNK1B_e && code != dBgS_Attr_ICE_e && code != dBgS_Attr_GIANT_FLOWER_e && code != dBgS_Attr_CARPET_e) { - return 0x2022; + return dPa_name::ID_COMMON_2022; } else { return -1; } @@ -865,13 +865,13 @@ JPABaseEmitter* dPa_control_c::setNormalStripes(u16 ptclID, const cXyz* pos, con } /* 8007DB34-8007DBC4 .text newSimple__13dPa_control_cFUsUc */ -bool dPa_control_c::newSimple(u16 param_1, u8 param_2) { +bool dPa_control_c::newSimple(u16 effectID, u8 param_2) { /* Nonmatching */ if (mNumSimple >= 25) { OSReport("\x1b[43;30m１エミッター登録数オーバー！！\n"); return false; } - JPABaseEmitter* emitter = mSimpleCallbacks[mNumSimple].create(mEmitterMng, param_1, param_2); + JPABaseEmitter* emitter = mSimpleCallbacks[mNumSimple].create(mEmitterMng, effectID, param_2); if (!emitter) { return false; } diff --git a/src/d/d_particle_name.cpp b/src/d/d_particle_name.cpp index 7fb43ce38..1ea2e4b60 100644 --- a/src/d/d_particle_name.cpp +++ b/src/d/d_particle_name.cpp @@ -7,19 +7,50 @@ namespace dPa_name { u16 j_o_id[] = { - 0x0000, 0x0001, 0x0002, 0x0003, - 0x03DA, 0x03DB, 0x03DC, 0x4004, + dPa_name::ID_NONE, + dPa_name::ID_COMMON_0001, + dPa_name::ID_COMMON_0002, + dPa_name::ID_COMMON_0003, + dPa_name::ID_COMMON_03DA, + dPa_name::ID_COMMON_03DB, + dPa_name::ID_COMMON_03DC, + dPa_name::ID_COMMON_4004, }; u16 s_o_id[] = { - 0x8058, 0x8059, 0x805A, 0x805B, - 0x805C, 0x8221, 0x8222, 0x8060, - 0x8061, 0x8062, 0x8063, 0x8064, - 0x8065, 0x8066, 0x8067, 0x8068, - 0x8069, 0x81D5, 0x8240, 0x8241, - 0x8306, 0x8407, 0x8408, 0x8409, - 0x8443, 0x840A, 0x840B, 0x840C, - 0x840D, 0x840E, 0x840F, 0xA410, - 0xA06A, 0xC06B, + dPa_name::ID_SCENE_8058, + dPa_name::ID_SCENE_8059, + dPa_name::ID_SCENE_805A, + dPa_name::ID_SCENE_805B, + dPa_name::ID_SCENE_805C, + dPa_name::ID_SCENE_8221, + dPa_name::ID_SCENE_8222, + dPa_name::ID_SCENE_8060, + dPa_name::ID_SCENE_8061, + dPa_name::ID_SCENE_8062, + dPa_name::ID_SCENE_8063, + dPa_name::ID_SCENE_8064, + dPa_name::ID_SCENE_8065, + dPa_name::ID_SCENE_8066, + dPa_name::ID_SCENE_8067, + dPa_name::ID_SCENE_8068, + dPa_name::ID_SCENE_8069, + dPa_name::ID_SCENE_81D5, + dPa_name::ID_SCENE_8240, + dPa_name::ID_SCENE_8241, + dPa_name::ID_SCENE_8306, + dPa_name::ID_SCENE_8407, + dPa_name::ID_SCENE_8408, + dPa_name::ID_SCENE_8409, + dPa_name::ID_SCENE_8443, + dPa_name::ID_SCENE_840A, + dPa_name::ID_SCENE_840B, + dPa_name::ID_SCENE_840C, + dPa_name::ID_SCENE_840D, + dPa_name::ID_SCENE_840E, + dPa_name::ID_SCENE_840F, + dPa_name::ID_SCENE_A410, + dPa_name::ID_SCENE_A06A, + dPa_name::ID_SCENE_C06B, }; } diff --git a/src/d/d_wood.cpp b/src/d/d_wood.cpp index 8469e529c..185b16e54 100644 --- a/src/d/d_wood.cpp +++ b/src/d/d_wood.cpp @@ -777,7 +777,7 @@ void dWood::Unit_c::cc_hit_before_cut(dWood::Packet_c *packet) { g_env_light.settingTevStruct(TEV_TYPE_BG0, &mPos, &mTevStr); // Spawn cut down particles (a bunch of leaves) - dComIfGp_particle_set(dPa_name::ID_CUT_L_TREE_DOWN, &mPos, NULL, + dComIfGp_particle_set(dPa_name::ID_COMMON_CUT_L_TREE_DOWN, &mPos, NULL, NULL, 0xff, NULL, -1, &mTevStr.mColorK0, NULL, NULL); diff --git a/src/d/d_wpot_water.cpp b/src/d/d_wpot_water.cpp index 06c2a9e5d..408963e7f 100644 --- a/src/d/d_wpot_water.cpp +++ b/src/d/d_wpot_water.cpp @@ -61,9 +61,9 @@ static BOOL dWpotWater_Delete(dWpotWater_c* i_this) { s32 dWpotWater_c::create() { new(this) dWpotWater_c(); - dComIfGp_particle_set(0x8083, &mPos); - dComIfGp_particle_set(0x8084, &mPos); - emtr = dComIfGp_particle_set(0x8086, &mPos, NULL, NULL, 0xAA, &dWpotWater_c::mEcallback); + dComIfGp_particle_set(dPa_name::ID_SCENE_8083, &mPos); + dComIfGp_particle_set(dPa_name::ID_SCENE_8084, &mPos); + emtr = dComIfGp_particle_set(dPa_name::ID_SCENE_8086, &mPos, NULL, NULL, 0xAA, &dWpotWater_c::mEcallback); if (emtr == NULL) { return cPhs_ERROR_e; } else { diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index 61d7b53e9..e7a187909 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -98,6 +98,6 @@ int fopKyM_createMpillar(cXyz const* i_pos, f32 i_size) { scale.x = i_size; scale.y = i_size; scale.z = i_size; - dComIfGp_particle_set(0x80d5, i_pos, NULL, &scale); + dComIfGp_particle_set(dPa_name::ID_SCENE_80D5, i_pos, NULL, &scale); return -1; }