From 897f043575ae2cdf0f3c990b9fa23ba5a750fd58 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 8 May 2026 18:12:26 -0400 Subject: [PATCH] Document some more enum value names --- include/d/actor/d_a_obj_eayogn.h | 4 +- include/d/actor/d_a_player.h | 4 +- include/d/actor/d_a_player_main.h | 6 +- include/d/d_cc_d.h | 8 ++- include/d/d_meter.h | 5 +- src/c/c_damagereaction.cpp | 2 +- src/d/actor/d_a_bb.cpp | 26 ++------ src/d/actor/d_a_bdk.cpp | 8 +-- src/d/actor/d_a_bdkobj.cpp | 4 +- src/d/actor/d_a_bgn.cpp | 2 +- src/d/actor/d_a_bgn2.cpp | 2 +- src/d/actor/d_a_bgn3.cpp | 2 +- src/d/actor/d_a_bk.cpp | 4 +- src/d/actor/d_a_bl.cpp | 2 +- src/d/actor/d_a_bmd.cpp | 2 +- src/d/actor/d_a_bmdfoot.cpp | 2 +- src/d/actor/d_a_boomerang.cpp | 2 +- src/d/actor/d_a_bpw.cpp | 2 +- src/d/actor/d_a_btd.cpp | 4 +- src/d/actor/d_a_bwd.cpp | 2 +- src/d/actor/d_a_bwds.cpp | 2 +- src/d/actor/d_a_cc.cpp | 36 +++-------- src/d/actor/d_a_gm.cpp | 4 +- src/d/actor/d_a_gnd.cpp | 4 +- src/d/actor/d_a_himo2.cpp | 2 +- src/d/actor/d_a_ib.cpp | 2 +- src/d/actor/d_a_kddoor.cpp | 2 +- src/d/actor/d_a_ki.cpp | 2 +- src/d/actor/d_a_obj_leaves.cpp | 13 +--- src/d/actor/d_a_obj_nest.cpp | 6 +- src/d/actor/d_a_obj_paper.cpp | 12 +--- src/d/actor/d_a_oq.cpp | 4 +- src/d/actor/d_a_ph.cpp | 6 +- src/d/actor/d_a_player_bottle.inc | 2 +- src/d/actor/d_a_player_fan.inc | 3 +- src/d/actor/d_a_player_hammer.inc | 8 +-- src/d/actor/d_a_player_main.cpp | 100 ++++++++++++++---------------- src/d/actor/d_a_player_sword.inc | 6 +- src/d/actor/d_a_pw.cpp | 2 +- src/d/actor/d_a_ss.cpp | 2 +- src/d/actor/d_a_ssk.cpp | 2 +- src/d/actor/d_a_swpropeller.cpp | 2 +- src/d/actor/d_a_tn.cpp | 6 +- src/d/actor/d_a_wz.cpp | 2 +- src/d/d_a_boko_static.cpp | 2 +- src/d/d_a_obj.cpp | 4 +- src/d/d_camera.cpp | 7 ++- src/d/d_cc_s.cpp | 4 +- src/d/d_cc_uty.cpp | 8 +-- src/d/d_file_select.cpp | 12 +--- src/d/d_stage.cpp | 12 +--- 51 files changed, 148 insertions(+), 224 deletions(-) diff --git a/include/d/actor/d_a_obj_eayogn.h b/include/d/actor/d_a_obj_eayogn.h index d67f5724e..42e9b2753 100644 --- a/include/d/actor/d_a_obj_eayogn.h +++ b/include/d/actor/d_a_obj_eayogn.h @@ -8,9 +8,7 @@ class daObjEayogn_c : public fopAc_ac_c { public: - // TODO: this function is marked as weak in the REL symbol map, but it does not get inlined for some reason? - // BOOL check_ev_bit() const { return dComIfGs_isSymbol(1); } - BOOL check_ev_bit() const; + inline BOOL check_ev_bit() const; cPhs_State _create(); bool _execute(); diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index fdd645775..623d97b97 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -230,13 +230,13 @@ public: daPyRFlg0_UNK40000 = 0x00040000, daPyRFlg0_UNK80000 = 0x00080000, daPyRFlg0_POISON_CURSE = 0x00100000, - daPyRFlg0_UNK200000 = 0x00200000, + daPyRFlg0_LIGHT_REFLECT = 0x00200000, daPyRFlg0_GRAB_PUT_START = 0x00400000, daPyRFlg0_UNK800000 = 0x00800000, daPyRFlg0_TACT_INPUT = 0x01000000, daPyRFlg0_FAIRY_USE = 0x02000000, daPyRFlg0_SUBJECT_ACCEPT = 0x04000000, - daPyRFlg0_UNK8000000 = 0x08000000, + daPyRFlg0_NOT_ATTACKING = 0x08000000, daPyRFlg0_UNK10000000 = 0x10000000, daPyRFlg0_ARROW_SHOOT = 0x20000000, daPyRFlg0_ROPE_FORCE_END = 0x40000000, diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h index 29ca6c4b6..9fb1d25ca 100644 --- a/include/d/actor/d_a_player_main.h +++ b/include/d/actor/d_a_player_main.h @@ -1211,7 +1211,9 @@ public: void autoGroundHit(); BOOL checkAttentionPosAngle(fopAc_ac_c*, cXyz**); void setNeckAngle(); +#if VERSION > VERSION_DEMO void checkOriginalHatAnimation(); +#endif void setHatAngle(); void setMoveSlantAngle(); void setWaistAngle(); @@ -2314,8 +2316,8 @@ public: /* 0x4284 */ dCcD_Cyl mAtCyl; /* 0x43B4 */ dCcD_Cyl mLightCyl; /* 0x44E4 */ dCcD_Cps mAtCps[3]; - /* 0x488C */ dCcD_Cps mFanWindCps; - /* 0x49C4 */ dCcD_Sph mFanWindSph; + /* 0x488C */ dCcD_Cps mFanWindCps; // Used when swinging the Deku Leaf + /* 0x49C4 */ dCcD_Sph mFanWindSph; // Used when swinging the Deku Leaf and when creating a burst of air while gliding with it /* 0x4AF0 */ dCcD_Cps mFanLightCps; struct ProcInitTableEntry { diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h index 27738ed57..9e8c28b22 100644 --- a/include/d/d_cc_d.h +++ b/include/d/d_cc_d.h @@ -33,7 +33,7 @@ enum dCcD_ObjAtType { /* 0x00400000 */ AT_TYPE_UNK400000 = (1 << 22), /* 0x00800000 */ AT_TYPE_LIGHT = (1 << 23), /* 0x01000000 */ AT_TYPE_STALFOS_MACE = (1 << 24), - /* 0x02000000 */ AT_TYPE_UNK2000000 = (1 << 25), + /* 0x02000000 */ AT_TYPE_FAN_SWING = (1 << 25), /* 0x04000000 */ AT_TYPE_DARKNUT_SWORD = (1 << 26), /* 0x08000000 */ AT_TYPE_GRAPPLING_HOOK = (1 << 27), /* 0x10000000 */ AT_TYPE_MOBLIN_SPEAR = (1 << 28), @@ -79,8 +79,8 @@ enum dCcG_hitSe { /* 0x01 */ dCcG_SE_UNK1 = 1, /* 0x02 */ dCcG_SE_UNK2 = 2, /* 0x03 */ dCcG_SE_UNK3 = 3, - /* 0x04 */ dCcG_SE_UNK4 = 4, - /* 0x05 */ dCcG_SE_UNK5 = 5, + /* 0x04 */ dCcG_SE_WOOD = 4, + /* 0x05 */ dCcG_SE_METAL = 5, /* 0x06 */ dCcG_SE_UNK6 = 6, /* 0x07 */ dCcG_SE_ARROW = 7, /* 0x08 */ dCcG_SE_HOOKSHOT = 8, @@ -96,6 +96,7 @@ enum CcG_At_HitMark { }; enum CcG_Tg_HitMark { + /* 0x0 */ dCcG_TgHitMark_None_e = dPa_name::ID_NONE, /* 0x1 */ dCcG_TgHitMark_Unk1_e = dPa_name::ID_AK_JN_O_FIRE00, /* 0xC */ dCcg_TgHitMark_Purple_e = dPa_name::ID_AK_JN_NG, /* 0xD */ dCcG_TgHitMark_Nrm_e = dPa_name::ID_AK_JN_OK, @@ -111,6 +112,7 @@ enum dCcG_At_Spl { /* 0x5 */ dCcG_At_Spl_UNK5 = 5, /* 0x6 */ dCcG_At_Spl_UNK6 = 6, /* 0x7 */ dCcG_At_Spl_UNK7 = 7, + // 8 and higher mean it can't be guarded/shielded against /* 0x8 */ dCcG_At_Spl_UNK8 = 8, /* 0x9 */ dCcG_At_Spl_UNK9 = 9, /* 0xA */ dCcG_At_Spl_UNKA = 0xA, diff --git a/include/d/d_meter.h b/include/d/d_meter.h index daedaa688..72721d59b 100644 --- a/include/d/d_meter.h +++ b/include/d/d_meter.h @@ -518,9 +518,8 @@ public: class mapCtrlDisp_c { public: - // TODO: these two functions are supposed to be weak - void initMapCtrlDisp(); - void moveMapCtrlDisp(); + inline void initMapCtrlDisp(); + inline void moveMapCtrlDisp(); void Create() {} void Delete() {} diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 639d77c6c..863dcc0d1 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -90,7 +90,7 @@ dCcD_SrcCyl cc_cyl_src = { /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index 1f26bb615..20c4562a8 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/src/d/actor/d_a_bb.cpp @@ -2577,7 +2577,7 @@ static cPhs_State daBb_Create(fopAc_ac_c* a_this) { /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, - /* SrcGObjAt Se */ dCcG_SE_UNK5, + /* SrcGObjAt Se */ dCcG_SE_METAL, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, @@ -2611,18 +2611,10 @@ static cPhs_State daBb_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, -#if VERSION == DEMO - /* SrcGObjTg HitMark */ dCcG_SE_UNK1, -#else - /* SrcGObjTg HitMark */ 0, -#endif + /* SrcGObjTg HitMark */ DEMO_SELECT(dCcG_TgHitMark_Unk1_e, dCcG_AtHitMark_None_e), /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, -#if VERSION == DEMO - /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e, -#else - /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e, -#endif + /* SrcGObjTg SPrm */ DEMO_SELECT(dCcG_TgSPrm_NoConHit_e, dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e), /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS @@ -2647,18 +2639,10 @@ static cPhs_State daBb_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, -#if VERSION == DEMO - /* SrcGObjTg HitMark */ dCcG_SE_UNK1, -#else - /* SrcGObjTg HitMark */ 0, -#endif + /* SrcGObjTg HitMark */ DEMO_SELECT(dCcG_TgHitMark_Unk1_e, dCcG_TgHitMark_None_e), /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, -#if VERSION == DEMO - /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e, -#else - /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e, -#endif + /* SrcGObjTg SPrm */ DEMO_SELECT(dCcG_TgSPrm_NoConHit_e, dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e), /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index 7c5033562..f07becdfc 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/src/d/actor/d_a_bdk.cpp @@ -3789,7 +3789,7 @@ static cPhs_State daBdk_Create(fopAc_ac_c* a_this) { /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, - /* SrcGObjAt Se */ dCcG_SE_UNK5, + /* SrcGObjAt Se */ dCcG_SE_METAL, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK9, /* SrcGObjAt Mtrl */ 0, @@ -3822,7 +3822,7 @@ static cPhs_State daBdk_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, @@ -3906,7 +3906,7 @@ static cPhs_State daBdk_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, @@ -3962,7 +3962,7 @@ static cPhs_State daBdk_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_bdkobj.cpp b/src/d/actor/d_a_bdkobj.cpp index 638480a3d..cfd1179a2 100644 --- a/src/d/actor/d_a_bdkobj.cpp +++ b/src/d/actor/d_a_bdkobj.cpp @@ -517,7 +517,7 @@ static cPhs_State daBdkobj_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, @@ -546,7 +546,7 @@ static cPhs_State daBdkobj_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp index abcd36fe1..ad84068a7 100644 --- a/src/d/actor/d_a_bgn.cpp +++ b/src/d/actor/d_a_bgn.cpp @@ -290,7 +290,7 @@ static cPhs_State daBgn_Create(fopAc_ac_c* i_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK9, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoConHit_e, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_bgn2.cpp b/src/d/actor/d_a_bgn2.cpp index 2bd81c6b6..5687a2ea0 100644 --- a/src/d/actor/d_a_bgn2.cpp +++ b/src/d/actor/d_a_bgn2.cpp @@ -162,7 +162,7 @@ static cPhs_State daBgn2_Create(fopAc_ac_c*) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNKA, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoConHit_e, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_bgn3.cpp b/src/d/actor/d_a_bgn3.cpp index d0546e920..30c162e13 100644 --- a/src/d/actor/d_a_bgn3.cpp +++ b/src/d/actor/d_a_bgn3.cpp @@ -162,7 +162,7 @@ static cPhs_State daBgn3_Create(fopAc_ac_c*) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK9, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoConHit_e, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index e4655d42c..94110d9d2 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -1731,7 +1731,7 @@ static void attack_set(bk_class* i_this, u8 r28) { i_this->m1040.SetAtSe(dCcG_SE_UNK2); } else { i_this->m1040.SetAtType(AT_TYPE_UNK2000); - i_this->m1040.SetAtSe(dCcG_SE_UNK4); + i_this->m1040.SetAtSe(dCcG_SE_WOOD); } if (r28 == 0) { @@ -2826,7 +2826,7 @@ static void wepon_search(bk_class* i_this) { if (fopAcM_GetParam(boko) == daBoko_c::Type_BOKO_STICK_e) { i_this->m02D5 = 0; i_this->m1040.SetAtType(AT_TYPE_UNK2000); - i_this->m1040.SetAtSe(dCcG_SE_UNK4); + i_this->m1040.SetAtSe(dCcG_SE_WOOD); } else { i_this->m02D5 = 1; i_this->m1040.SetAtType(AT_TYPE_UNK800); diff --git a/src/d/actor/d_a_bl.cpp b/src/d/actor/d_a_bl.cpp index d81876406..2e84ea3ca 100644 --- a/src/d/actor/d_a_bl.cpp +++ b/src/d/actor/d_a_bl.cpp @@ -167,7 +167,7 @@ static cPhs_State daBL_Create(fopAc_ac_c*) { /* SrcObjTg Type */ AT_TYPE_ALL & ~AT_TYPE_WATER & ~AT_TYPE_UNK20000 & ~AT_TYPE_UNK400000 & ~AT_TYPE_LIGHT, /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, - /* SrcGObjAt Se */ dCcG_SE_UNK4, + /* SrcGObjAt Se */ dCcG_SE_WOOD, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, diff --git a/src/d/actor/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp index 9950c43cc..4279ed936 100644 --- a/src/d/actor/d_a_bmd.cpp +++ b/src/d/actor/d_a_bmd.cpp @@ -1940,7 +1940,7 @@ static cPhs_State daBmd_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcG_TgHitMark_Nrm_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp index 40596c149..31dfd7d88 100644 --- a/src/d/actor/d_a_bmdfoot.cpp +++ b/src/d/actor/d_a_bmdfoot.cpp @@ -769,7 +769,7 @@ static cPhs_State daBmdfoot_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoConHit_e, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 0f1231bae..9229ad4af 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -775,7 +775,7 @@ static dCcD_SrcCps l_at_cps_src = { /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, - /* SrcGObjAt Se */ dCcG_SE_UNK4, + /* SrcGObjAt Se */ dCcG_SE_WOOD, /* SrcGObjAt HitMark */ dCcG_AtHitMark_Unk1_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp index d1e667828..4bd6aec94 100644 --- a/src/d/actor/d_a_bpw.cpp +++ b/src/d/actor/d_a_bpw.cpp @@ -4459,7 +4459,7 @@ void kantera_create_init(bpw_class* i_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp index bdafdf393..f1901ee65 100644 --- a/src/d/actor/d_a_btd.cpp +++ b/src/d/actor/d_a_btd.cpp @@ -2799,7 +2799,7 @@ static cPhs_State daBtd_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, @@ -2883,7 +2883,7 @@ static cPhs_State daBtd_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_bwd.cpp b/src/d/actor/d_a_bwd.cpp index 6c00bf96e..462c631c6 100644 --- a/src/d/actor/d_a_bwd.cpp +++ b/src/d/actor/d_a_bwd.cpp @@ -2398,7 +2398,7 @@ static cPhs_State daBwd_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK9, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoConHit_e, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_bwds.cpp b/src/d/actor/d_a_bwds.cpp index db1bdb63e..dc673db68 100644 --- a/src/d/actor/d_a_bwds.cpp +++ b/src/d/actor/d_a_bwds.cpp @@ -990,7 +990,7 @@ static cPhs_State daBwds_Create(fopAc_ac_c* a_this) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_cc.cpp b/src/d/actor/d_a_cc.cpp index 4ce810488..d4e4fb21e 100644 --- a/src/d/actor/d_a_cc.cpp +++ b/src/d/actor/d_a_cc.cpp @@ -328,15 +328,9 @@ void naraku_check(cc_class* i_this) { fopAcM_seStart(&i_this->actor, JA_SE_OBJ_FALL_WATER_M, 0); i_this->m300 = true; cXyz sp18(0.5f, 0.5f, 0.5f); -#if VERSION == VERSION_DEMO - i_this->m368.remove(); - dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &i_this->actor.current.pos, NULL, &sp18, 0xff, &i_this->m368); - i_this->m368.setRate(0.0f); -#else - i_this->m390.remove(); - dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &i_this->actor.current.pos, NULL, &sp18, 0xff, &i_this->m390); - i_this->m390.setRate(0.0f); -#endif + DEMO_SELECT(i_this->m368, i_this->m390).remove(); + dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &i_this->actor.current.pos, NULL, &sp18, 0xff, &DEMO_SELECT(i_this->m368, i_this->m390)); + DEMO_SELECT(i_this->m368, i_this->m390).setRate(0.0f); } f32 fVar1 = 40.0f + REG12_F(0); @@ -368,11 +362,7 @@ void naraku_check(cc_class* i_this) { } else if (i_this->m300) { i_this->m2F8 = 0; i_this->m300 = false; -#if VERSION == VERSION_DEMO - i_this->m368.remove(); -#else - i_this->m390.remove(); -#endif + DEMO_SELECT(i_this->m368, i_this->m390).remove(); } } @@ -535,11 +525,7 @@ BOOL body_atari_check(cc_class* i_this) { if (i_this->m2F5 == 0x15) { fopAcM_seStart(a_this, JA_SE_LK_MS_WEP_HIT, 0x36); -#if VERSION == VERSION_DEMO - a_this->gravity = -(REG12_F(19) + 10.0f); -#else - a_this->gravity = -(REG12_F(19) + 3.0f); -#endif + a_this->gravity = -(REG12_F(19) + DEMO_SELECT(10.0f, 3.0f)); i_this->m324 = 0.0f; i_this->m2F8 = 0; return FALSE; @@ -603,11 +589,7 @@ BOOL body_atari_check(cc_class* i_this) { bVar4 = true; if (i_this->m2F5 == 0x15) { fopAcM_seStart(a_this, JA_SE_LK_W_WEP_HIT, 0x36); -#if VERSION == VERSION_DEMO - a_this->gravity = -(REG12_F(19) + 10.0f); -#else - a_this->gravity = -(REG12_F(19) + 3.0f); -#endif + a_this->gravity = -(REG12_F(19) + DEMO_SELECT(10.0f, 3.0f)); i_this->m324 = 0.0f; i_this->m2F8 = 0; return FALSE; @@ -1704,11 +1686,7 @@ void action_noboru(cc_class* i_this) { i_this->m310.y = 0; i_this->m310.z = 0; i_this->m2F9 = 1; -#if VERSION == VERSION_DEMO - i_this->m368.remove(); -#else - i_this->m390.remove(); -#endif + DEMO_SELECT(i_this->m368, i_this->m390).remove(); a_this->attention_info.flags = 0; if (i_this->m320 != CC_BCK_TACHI_WALK) { diff --git a/src/d/actor/d_a_gm.cpp b/src/d/actor/d_a_gm.cpp index bd326d97b..3d1300229 100644 --- a/src/d/actor/d_a_gm.cpp +++ b/src/d/actor/d_a_gm.cpp @@ -171,7 +171,7 @@ static cPhs_State daGM_Create(fopAc_ac_c*) { /* SrcObjTg Type */ AT_TYPE_ALL & ~AT_TYPE_WATER & ~AT_TYPE_UNK20000 & ~AT_TYPE_UNK400000 & ~AT_TYPE_LIGHT, /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, - /* SrcGObjAt Se */ dCcG_SE_UNK5, + /* SrcGObjAt Se */ dCcG_SE_METAL, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, @@ -200,7 +200,7 @@ static cPhs_State daGM_Create(fopAc_ac_c*) { /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, - /* SrcGObjAt Se */ dCcG_SE_UNK5, + /* SrcGObjAt Se */ dCcG_SE_METAL, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK6, /* SrcGObjAt Mtrl */ 0, diff --git a/src/d/actor/d_a_gnd.cpp b/src/d/actor/d_a_gnd.cpp index b71f8d99c..71a5ef5d0 100644 --- a/src/d/actor/d_a_gnd.cpp +++ b/src/d/actor/d_a_gnd.cpp @@ -269,7 +269,7 @@ static cPhs_State daGnd_Create(fopAc_ac_c*) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, @@ -297,7 +297,7 @@ static cPhs_State daGnd_Create(fopAc_ac_c*) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK6, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoConHit_e, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp index a50ca20a0..347fba301 100644 --- a/src/d/actor/d_a_himo2.cpp +++ b/src/d/actor/d_a_himo2.cpp @@ -1824,7 +1824,7 @@ static cPhs_State daHimo2_Create(fopAc_ac_c* i_this) { /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, - /* SrcGObjAt Se */ dCcG_SE_UNK5, + /* SrcGObjAt Se */ dCcG_SE_METAL, /* SrcGObjAt HitMark */ dCcG_AtHitMark_Unk1_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index af5b1091d..16c642901 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -297,7 +297,7 @@ void daIball_c::damage() { if (hitObj) { if (hitObj->ChkAtType(AT_TYPE_SWORD) || hitObj->ChkAtType(AT_TYPE_BOKO_STICK) || hitObj->ChkAtType(AT_TYPE_MACHETE) || hitObj->ChkAtType(AT_TYPE_SKULL_HAMMER) || - hitObj->ChkAtType(AT_TYPE_UNK2000000) || hitObj->ChkAtType(AT_TYPE_STALFOS_MACE) || + hitObj->ChkAtType(AT_TYPE_FAN_SWING) || hitObj->ChkAtType(AT_TYPE_STALFOS_MACE) || hitObj->ChkAtType(AT_TYPE_DARKNUT_SWORD) || hitObj->ChkAtType(AT_TYPE_HOOKSHOT) || hitObj->ChkAtType(AT_TYPE_BOOMERANG) || hitObj->ChkAtType(AT_TYPE_NORMAL_ARROW) || hitObj->ChkAtType(AT_TYPE_FIRE_ARROW) || hitObj->ChkAtType(AT_TYPE_ICE_ARROW) || diff --git a/src/d/actor/d_a_kddoor.cpp b/src/d/actor/d_a_kddoor.cpp index 22233a3c1..9b40cc932 100644 --- a/src/d/actor/d_a_kddoor.cpp +++ b/src/d/actor/d_a_kddoor.cpp @@ -127,7 +127,7 @@ void dDoor_ssk_sub_c::init() { /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, - /* SrcGObjAt Se */ dCcG_SE_UNK4, + /* SrcGObjAt Se */ dCcG_SE_WOOD, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK1, /* SrcGObjAt Mtrl */ 0, diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index dcd896abf..aacaab6b8 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/src/d/actor/d_a_ki.cpp @@ -1140,7 +1140,7 @@ static BOOL daKi_Execute(ki_class* i_this) { i_this->m31C = 150.0f; } else #endif - if (i_this->mStts.GetAtSpl() == 1) { + if (i_this->mStts.GetAtSpl() == dCcG_At_Spl_UNK1) { i_this->m31C = l_kiHIO.m38; } else { i_this->m31C = l_kiHIO.m34; diff --git a/src/d/actor/d_a_obj_leaves.cpp b/src/d/actor/d_a_obj_leaves.cpp index 97baa398d..99e3f7fd2 100644 --- a/src/d/actor/d_a_obj_leaves.cpp +++ b/src/d/actor/d_a_obj_leaves.cpp @@ -331,14 +331,7 @@ bool daObjLeaves_c::checkCollision() { default: f32 abs = (*mSph.GetTgHitPosP() - current.pos).absXZ(); -#if VERSION == VERSION_DEMO - if (abs < l_HIO.m10) -#elif VERSION == VERSION_JPN - if (abs < 95.0f) -#else - if (abs < 110.0f) -#endif - { + if (abs < VERSION_SELECT(l_HIO.m10, 95.0f, 110.0f, 110.0f)) { switch (cVar5) { case AT_TYPE_HOOKSHOT: case AT_TYPE_MACHETE: @@ -353,7 +346,7 @@ bool daObjLeaves_c::checkCollision() { case AT_TYPE_LIGHT_ARROW: case AT_TYPE_ICE_ARROW: case AT_TYPE_DARKNUT_SWORD: - case AT_TYPE_UNK2000000: + case AT_TYPE_FAN_SWING: case AT_TYPE_STALFOS_MACE: case AT_TYPE_MOBLIN_SPEAR: birthEffect(2, mSph.GetTgHitPosP(), NULL, &tevStr.mColorK0); @@ -436,7 +429,7 @@ void daObjLeaves_c::tg_hitCallback(fopAc_ac_c* a_this, dCcD_GObjInf* arg1, fopAc case AT_TYPE_LIGHT_ARROW: case AT_TYPE_ICE_ARROW: case AT_TYPE_DARKNUT_SWORD: - case AT_TYPE_UNK2000000: + case AT_TYPE_FAN_SWING: case AT_TYPE_STALFOS_MACE: case AT_TYPE_MOBLIN_SPEAR: i_this->birthEffect(2, i_this->mSph.GetTgHitPosP(), NULL, &a_this->tevStr.mColorK0); diff --git a/src/d/actor/d_a_obj_nest.cpp b/src/d/actor/d_a_obj_nest.cpp index 7bc1a4529..5e7ec37ec 100644 --- a/src/d/actor/d_a_obj_nest.cpp +++ b/src/d/actor/d_a_obj_nest.cpp @@ -81,11 +81,7 @@ cPhs_State daObjNest::Act_c::Mthd_Create() { M_arcname, MTORISU_DZB_MTORISU, NULL, -#if VERSION == VERSION_DEMO - 0x1820 -#else - 0xAA0 -#endif + DEMO_SELECT(0x1820, 0xAA0) ); JUT_ASSERT(329, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index 985956774..19fcb0e83 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -56,11 +56,7 @@ namespace daObjPaper { }, { /* mResName */ "Ppos", -#if VERSION == VERSION_DEMO - /* mHeapSize */ 0x1000, -#else - /* mHeapSize */ 0x04C0, -#endif + /* mHeapSize */ DEMO_SELECT(0x1000, 0x04C0), /* mModelId */ PPOS_BDL_PPOS, /* mEyeOffset */ 0x00, /* mAttentionOffset */ 0x32, @@ -74,11 +70,7 @@ namespace daObjPaper { }, { /* mResName */ "Piwa", -#if VERSION == VERSION_DEMO - /* mHeapSize */ 0x8000, -#else - /* mHeapSize */ 0x04C0, -#endif + /* mHeapSize */ DEMO_SELECT(0x8000, 0x04C0), /* mModelId */ PIWA_BDL_PIWA, /* mEyeOffset */ 0x3C, /* mAttentionOffset */ 0x82, diff --git a/src/d/actor/d_a_oq.cpp b/src/d/actor/d_a_oq.cpp index eedefd232..f624f39cd 100644 --- a/src/d/actor/d_a_oq.cpp +++ b/src/d/actor/d_a_oq.cpp @@ -123,7 +123,7 @@ static cPhs_State daOQ_Create(fopAc_ac_c*) { /* SrcObjTg Type */ AT_TYPE_ALL & ~AT_TYPE_WATER & ~AT_TYPE_UNK20000 & ~AT_TYPE_WIND & ~AT_TYPE_UNK400000 & ~AT_TYPE_LIGHT, /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, - /* SrcGObjAt Se */ dCcG_SE_UNK5, + /* SrcGObjAt Se */ dCcG_SE_METAL, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, @@ -152,7 +152,7 @@ static cPhs_State daOQ_Create(fopAc_ac_c*) { /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, - /* SrcGObjAt Se */ dCcG_SE_UNK5, + /* SrcGObjAt Se */ dCcG_SE_METAL, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, diff --git a/src/d/actor/d_a_ph.cpp b/src/d/actor/d_a_ph.cpp index aecfbc8f4..646289bea 100644 --- a/src/d/actor/d_a_ph.cpp +++ b/src/d/actor/d_a_ph.cpp @@ -182,7 +182,7 @@ static cPhs_State daPH_Create(fopAc_ac_c*) { /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, - /* SrcGObjAt Se */ dCcG_SE_UNK5, + /* SrcGObjAt Se */ dCcG_SE_METAL, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK8, /* SrcGObjAt Mtrl */ 0, @@ -211,12 +211,12 @@ static cPhs_State daPH_Create(fopAc_ac_c*) { /* SrcObjTg Type */ AT_TYPE_SWORD | AT_TYPE_WIND, /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsPlayer_e, - /* SrcGObjAt Se */ dCcG_SE_UNK5, + /* SrcGObjAt Se */ dCcG_SE_METAL, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK1, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_player_bottle.inc b/src/d/actor/d_a_player_bottle.inc index 8729f1d52..daac482a6 100644 --- a/src/d/actor/d_a_player_bottle.inc +++ b/src/d/actor/d_a_player_bottle.inc @@ -369,7 +369,7 @@ BOOL daPy_lk_c::procBottleOpen() { dCcG_At_Spl spl; if (mEquipItem == dItem_WATER_BOTTLE_e) { spl = dCcG_At_Spl_UNK0; - } else { + } else { // dItem_FOREST_WATER_e spl = dCcG_At_Spl_UNK4; onNoResetFlg1(daPyFlg1_FOREST_WATER_USE); m3554 = 3; diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index 704d0be2d..978cc44e8 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -191,7 +191,7 @@ BOOL daPy_lk_c::procFanSwing_init() { setFanModel(); mProcVar0.m3570 = 0; voiceStart(7); - setAtParam(AT_TYPE_UNK2000000, 1, dCcG_At_Spl_UNK0, dCcG_SE_UNK4, dCcG_AtHitMark_Nrm_e, CUT_TYPE_NONE, 50.0f); + setAtParam(AT_TYPE_FAN_SWING, 1, dCcG_At_Spl_UNK0, dCcG_SE_WOOD, dCcG_AtHitMark_Nrm_e, CUT_TYPE_NONE, 50.0f); m35EC = m_HIO->mItem.mFan.m.field_0x10; if (setShapeFanLeaf()) { m34D0 = 1; @@ -437,6 +437,7 @@ BOOL daPy_lk_c::procFanGlide() { maxFallSpeed = m_HIO->mItem.mFan.m.field_0x38; } if (checkSetItemTrigger(dItem_DEKU_LEAF_e, 1) && frameCtrl.getRate() < 0.01f && mProcVar0.m3570 == 0) { + // Using the Deku Leaf while gliding to create a burst of air around you. setSingleMoveAnime( ANM_USEFANB, m_HIO->mItem.mFan.m.field_0x20, diff --git a/src/d/actor/d_a_player_hammer.inc b/src/d/actor/d_a_player_hammer.inc index 5d3dde5cd..d68e7f575 100644 --- a/src/d/actor/d_a_player_hammer.inc +++ b/src/d/actor/d_a_player_hammer.inc @@ -182,7 +182,7 @@ BOOL daPy_lk_c::procHammerSideSwing_init() { voiceStart(1); m34D4 = shape_angle.y; setBlurPosResource(LKANM__HAMMERSIDE_POS); - setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK0, dCcG_SE_UNK5, dCcG_AtHitMark_Nrm_e, CUT_TYPE_HAMMER_SIDESWING, 50.0f); + setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK0, dCcG_SE_METAL, dCcG_AtHitMark_Nrm_e, CUT_TYPE_HAMMER_SIDESWING, 50.0f); mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_HAMSWINGAA)); m35EC = m_HIO->mItem.mHam.m.field_0xC; return true; @@ -254,7 +254,7 @@ BOOL daPy_lk_c::procHammerFrontSwingReady_init() { } else { m34D4 = m34E8; } - setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK0, dCcG_SE_UNK5, dCcG_AtHitMark_Nrm_e, CUT_TYPE_HAMMER_FRONTSWING, 50.0f); + setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK0, dCcG_SE_METAL, dCcG_AtHitMark_Nrm_e, CUT_TYPE_HAMMER_FRONTSWING, 50.0f); voiceStart(7); mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_HAMSWINGBPREA)); m35EC = m_HIO->mItem.mHam.m.field_0x24; @@ -305,7 +305,7 @@ BOOL daPy_lk_c::procHammerFrontSwing_init() { m34D4 = shape_angle.y; setBlurPosResource(LKANM__HAMMERFRONT_POS); mCutType = CUT_TYPE_HAMMER_FRONTSWING; - offResetFlg0(daPyRFlg0_UNK8000000); + offResetFlg0(daPyRFlg0_NOT_ATTACKING); onResetFlg0(daPy_RFLG0(daPyRFlg0_UNK1 | daPyRFlg0_UNK2)); m34D0 = 0; mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_HAMSWINGBHITA)); @@ -399,7 +399,7 @@ BOOL daPy_lk_c::procHammerFrontSwingEnd_init() { current.angle.y = shape_angle.y; mVelocity = 0.0f; mCutType = CUT_TYPE_HAMMER_FRONTSWING; - offResetFlg0(daPyRFlg0_UNK8000000); + offResetFlg0(daPyRFlg0_NOT_ATTACKING); return true; } diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index dee92cae4..52881fbaf 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -1538,7 +1538,7 @@ void daPy_lk_c::hideHatAndBackle(J3DMaterial* mtl) { /* 80106D8C-80106E50 .text drawMirrorLightModel__9daPy_lk_cFv */ void daPy_lk_c::drawMirrorLightModel() { - if (checkResetFlg0(daPyRFlg0_UNK200000)) { + if (checkResetFlg0(daPyRFlg0_LIGHT_REFLECT)) { mDoMtx_stack_c::transS(l_ms_light_local_start); mDoMtx_stack_c::YrotM(-0x8000); mDoMtx_stack_c::revConcat(mpEquippedShieldModel->getBaseTRMtx()); @@ -5068,9 +5068,7 @@ BOOL daPy_lk_c::checkElecReturnDamage(dCcD_GObjInf* param_1, cXyz* param_2) { if (param_1->ChkAtHit() && param_1->GetAtHitGObj() != NULL) { dCcD_GObjInf* gobj_p = (dCcD_GObjInf*)param_1->GetAtHitGObj(); if (gobj_p->GetTgSpl() == dCcG_Tg_Spl_UNK1) { - param_2->x = param_1->GetAtHitPosP()->x; - param_2->y = param_1->GetAtHitPosP()->y; - param_2->z = param_1->GetAtHitPosP()->z; + *param_2 = *param_1->GetAtHitPosP(); return true; } } @@ -5278,9 +5276,9 @@ BOOL daPy_lk_c::changeDamageProc() { u8 hitSe = mCyl.GetTgHitObjSe(); if (hitSe == dCcG_SE_UNK6) { seStartOnlyReverb(JA_SE_OBJ_COL_N_BDY_MPLT); - } else if (hitSe == dCcG_SE_UNK2 || hitSe == dCcG_SE_UNK5) { + } else if (hitSe == dCcG_SE_UNK2 || hitSe == dCcG_SE_METAL) { seStartOnlyReverb(JA_SE_OBJ_COL_SWS_NMTLP); - } else if (hitSe == dCcG_SE_UNK4) { + } else if (hitSe == dCcG_SE_WOOD) { seStartOnlyReverb(JA_SE_OBJ_COL_NWHP_NMTL); } else { seStartOnlyReverb(JA_SE_OBJ_COL_SWM_NSWL); @@ -5589,7 +5587,11 @@ cXyz* daPy_lk_c::getDamageVec(dCcD_GObjInf* i_hitObj) { f32 var_f31 = vec->abs2XZ(); if (checkResetFlg0(daPyRFlg0_UNK80000)) { - sp40.set(cM_ssin(shape_angle.y) * -10.0f, 0.0f, cM_scos(shape_angle.y) * -10.0f); + sp40.set( + cM_ssin(shape_angle.y) * -10.0f, + 0.0f, + cM_scos(shape_angle.y) * -10.0f + ); i_hitObj->SetTgRVec(sp40); } else if (var_f31 < 0.1f) { sp40 = current.pos - *i_hitObj->GetTgHitPosP(); @@ -5832,7 +5834,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) { gravity = m_HIO->mAutoJump.m.field_0xC; m34F2 = 0; m34F4 = 0; - onResetFlg0(daPyRFlg0_UNK8000000); + onResetFlg0(daPyRFlg0_NOT_ATTACKING); m34C5 = 0; offNoResetFlg0(daPyFlg0_UNK4); offResetFlg0(daPyRFlg0_UNK2); @@ -6467,22 +6469,17 @@ BOOL daPy_lk_c::procCrouchDefenseSlip_init() { commonProcInit(daPyProc_CROUCH_DEFENSE_SLIP_e); cXyz* damage_vec = getDamageVec(&mCyl); current.angle.y = cM_atan2s(damage_vec->x, damage_vec->z); - dCcD_GObjInf* pfVar3 = mCyl.GetTgHitGObj(); + dCcD_GObjInf* tgHitObj = mCyl.GetTgHitGObj(); f32 dVar5; - if ( - pfVar3 != NULL && - ( - pfVar3->GetAtSpl() == dCcG_At_Spl_UNK5 || - pfVar3->GetAtSpl() == dCcG_At_Spl_UNK6 || - pfVar3->GetAtSpl() == dCcG_At_Spl_UNK7 - ) - ) { + if (tgHitObj != NULL && (tgHitObj->GetAtSpl() == dCcG_At_Spl_UNK5 || + tgHitObj->GetAtSpl() == dCcG_At_Spl_UNK6 || + tgHitObj->GetAtSpl() == dCcG_At_Spl_UNK7)) + { setSingleMoveAnime(ANM_DIFENCEA, m_HIO->mNockback.m.field_0x8, m_HIO->mNockback.m.field_0xC, m_HIO->mNockback.m.field_0x0, m_HIO->mNockback.m.field_0x10); dVar5 = damage_vec->absXZ(); - mVelocity = - (m_HIO->mNockback.m.field_0x18 * dVar5) + m_HIO->mNockback.m.field_0x14; + mVelocity = (m_HIO->mNockback.m.field_0x18 * dVar5) + m_HIO->mNockback.m.field_0x14; m34D0 = m_HIO->mNockback.m.field_0x2; m35A0 = m_HIO->mNockback.m.field_0x1C; m35A4 = m_HIO->mNockback.m.field_0x20; @@ -8232,14 +8229,12 @@ BOOL daPy_lk_c::procElecDamage_init(const cXyz* param_1) { if (param_1 != 0) { m370C = current.pos - *param_1; m34D6 = 1; + } else if (mCyl.ChkTgHit()) { + cXyz* damage_vec = getDamageVec(&mCyl); + m370C = *damage_vec; + m34D6 = 1; } else { - if (mCyl.ChkTgHit()) { - cXyz* damage_vec = getDamageVec(&mCyl); - m370C = *damage_vec; - m34D6 = 1; - } else { - m34D6 = 0; - } + m34D6 = 0; } initShipRideUseItem(iVar2, 0); seStartOnlyReverb(JA_SE_LK_ELEC_PARALYSED); @@ -8284,10 +8279,10 @@ BOOL daPy_lk_c::procGuardSlip_init() { } else { dVar5 = ANM_ATNGAR; } - dCcD_GObjInf* iVar4 = mCyl.GetTgHitGObj(); - if (iVar4 != NULL && (iVar4->GetAtSpl() == dCcG_At_Spl_UNK5 || - iVar4->GetAtSpl() == dCcG_At_Spl_UNK6 || - iVar4->GetAtSpl() == dCcG_At_Spl_UNK7)) + dCcD_GObjInf* tgHitObj = mCyl.GetTgHitGObj(); + if (tgHitObj != NULL && (tgHitObj->GetAtSpl() == dCcG_At_Spl_UNK5 || + tgHitObj->GetAtSpl() == dCcG_At_Spl_UNK6 || + tgHitObj->GetAtSpl() == dCcG_At_Spl_UNK7)) { setSingleMoveAnime(dVar5, m_HIO->mNockback.m.field_0x8, m_HIO->mNockback.m.field_0xC, m_HIO->mNockback.m.field_0x0, @@ -8303,8 +8298,7 @@ BOOL daPy_lk_c::procGuardSlip_init() { } else { setSingleMoveAnime(dVar5, m_HIO->mGuard.m.field_0x4, m_HIO->mGuard.m.field_0x8, m_HIO->mGuard.m.field_0x0, m_HIO->mGuard.m.field_0xC); - mVelocity = - (m_HIO->mGuard.m.field_0x14 * damage_vec->absXZ()) + m_HIO->mGuard.m.field_0x10; + mVelocity = (m_HIO->mGuard.m.field_0x14 * damage_vec->absXZ()) + m_HIO->mGuard.m.field_0x10; m34D0 = m_HIO->mGuard.m.field_0x2; m35A0 = m_HIO->mGuard.m.field_0x18; m35A4 = m_HIO->mGuard.m.field_0x1C; @@ -9302,6 +9296,7 @@ void daPy_lk_c::setNeckAngle() { } } +#if VERSION > VERSION_DEMO /* 8011BE08-8011BEA4 .text checkOriginalHatAnimation__9daPy_lk_cFv */ void daPy_lk_c::checkOriginalHatAnimation() { if ( @@ -9314,6 +9309,7 @@ void daPy_lk_c::checkOriginalHatAnimation() { onResetFlg0(daPyRFlg0_UNK800000); } } +#endif /* 8011BEA4-8011CBA4 .text setHatAngle__9daPy_lk_cFv */ void daPy_lk_c::setHatAngle() { @@ -9651,7 +9647,7 @@ void daPy_lk_c::setAtParam(u32 type, int atp, dCcG_At_Spl spl, u8 se, u8 hitMark cps->SetR(radius); } mCutType = cutType; - offResetFlg0(daPyRFlg0_UNK8000000); + offResetFlg0(daPyRFlg0_NOT_ATTACKING); offNoResetFlg0(daPyFlg0_UNK10000000); } @@ -9678,9 +9674,9 @@ void daPy_lk_c::checkLightHit() { if (dComIfGs_getSelectEquip(1) == dItem_MIRROR_SHIELD_e) { mDoMtx_multVecSR(mpEquippedShieldModel->getBaseTRMtx(), &l_ms_light_local_vec, &lightVec); if (lightHit) { - onResetFlg0(daPyRFlg0_UNK200000); + onResetFlg0(daPyRFlg0_LIGHT_REFLECT); } else if (mLightCyl.ChkTgHit() && mLightCyl.GetTgRVecP()->inprod(lightVec) < 0.0f) { - onResetFlg0(daPyRFlg0_UNK200000); + onResetFlg0(daPyRFlg0_LIGHT_REFLECT); } if (mFanLightCps.ChkAtHit()) { if (m3438.getEmitter() == NULL) { @@ -9706,7 +9702,7 @@ void daPy_lk_c::checkLightHit() { } else { m3438.end(); } - if (checkResetFlg0(daPyRFlg0_UNK200000)) { + if (checkResetFlg0(daPyRFlg0_LIGHT_REFLECT)) { if (!mFanLightCps.ChkAtSet()) { seStartOnlyReverb(JA_SE_OBJ_MIRROR_REFLECT); } else { @@ -9715,7 +9711,7 @@ void daPy_lk_c::checkLightHit() { resetCurse(); } if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000_e) && - checkResetFlg0(daPyRFlg0_UNK200000)) + checkResetFlg0(daPyRFlg0_LIGHT_REFLECT)) { if (m342C.getEmitter() == NULL) { m342C.makeEmitter(dPa_name::ID_AK_SN_MIRRORSHIELD00, mpEquippedShieldModel->getBaseTRMtx(), @@ -10144,9 +10140,7 @@ void daPy_lk_c::setCollision() { cXyz sp88; f32 in_f31; if ((int)m3534 != 0) { - sp94.x = mFanWindCps.GetEndP()->x; - sp94.y = mFanWindCps.GetEndP()->y; - sp94.z = mFanWindCps.GetEndP()->z; + sp94 = *mFanWindCps.GetEndP(); f32 dVar27 = m3534 / 10.0f; f32 fVar4 = (dVar27 * (m_HIO->mItem.mFan.m.field_0x18 - m_HIO->mItem.mFan.m.field_0x1C) + m_HIO->mItem.mFan.m.field_0x1C); @@ -10201,18 +10195,16 @@ void daPy_lk_c::setCollision() { m33E8.end(); } mpYuchw00Brk->setFrame(dVar27); - } else { - if (mpYbafo00Btk->getFrame() < 5.0f) { - mDoMtx_multVecZero(mpYbafo00Model->getBaseTRMtx(), &sp94); - sp88.set( - sp94.x, - 10.0f + sp94.y, - sp94.z - ); - spC4 = cXyz::Zero; - bVar5 = true; - in_f31 = 120.0f; - } + } else if (mpYbafo00Btk->getFrame() < 5.0f) { + mDoMtx_multVecZero(mpYbafo00Model->getBaseTRMtx(), &sp94); + sp88.set( + sp94.x, + 10.0f + sp94.y, + sp94.z + ); + spC4 = cXyz::Zero; + bVar5 = true; + in_f31 = 120.0f; } if (bVar5) { @@ -10241,7 +10233,7 @@ void daPy_lk_c::setCollision() { } else { mFanWindSph.ResetAtHit(); } - if (checkResetFlg0(daPyRFlg0_UNK200000)) { + if (checkResetFlg0(daPyRFlg0_LIGHT_REFLECT)) { mDoMtx_multVec(mpEquippedShieldModel->getBaseTRMtx(), &l_ms_light_local_start, &sp94); cXyz local_118; mDoMtx_multVecSR(mpEquippedShieldModel->getBaseTRMtx(), &l_ms_light_local_vec, &local_118); @@ -11359,7 +11351,7 @@ BOOL daPy_lk_c::execute() { setDamageCurseEmitter(); } - if (checkResetFlg0(daPyRFlg0_UNK8000000)) { + if (checkResetFlg0(daPyRFlg0_NOT_ATTACKING)) { mCutType = CUT_TYPE_NONE; } diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index 46c8d0ba6..7f003b8e2 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -376,7 +376,7 @@ void daPy_lk_c::setJumpCutAtParam() { } setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcG_SE_UNK1, dCcG_AtHitMark_Big_e, CUT_TYPE_JUMPCUT_SWORD, radius); } else if (mEquipItem == dItem_SKULL_HAMMER_e) { - setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK1, dCcG_SE_UNK5, dCcG_AtHitMark_Nrm_e, CUT_TYPE_JUMPCUT_HAMMER, 50.0f); + setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK1, dCcG_SE_METAL, dCcG_AtHitMark_Nrm_e, CUT_TYPE_JUMPCUT_HAMMER, 50.0f); } else if (mActorKeepEquip.getActor()) { setEnemyWeaponAtParam(TRUE); } else { @@ -1385,7 +1385,7 @@ BOOL daPy_lk_c::procCutTurn_init(int param_0) { voiceStart(1); dComIfGp_setPlayerStatus0(0, daPyStts0_SWORD_SWING_e); mCutType = CUT_TYPE_CUT_TURN; - offResetFlg0(daPyRFlg0_UNK8000000); + offResetFlg0(daPyRFlg0_NOT_ATTACKING); mAtCyl.SetR(m35A4 * 0.5f); if (!checkNoResetFlg0(daPyFlg0_UNK80000000)) { m32E4.makeEmitter(dPa_name::ID_AK_JN_ROUNDATTACKTOE, mpCLModel->getAnmMtx(0x28), ¤t.pos, NULL); @@ -1506,7 +1506,7 @@ BOOL daPy_lk_c::procCutRoll_init() { dComIfGp_setItemMagicCount(-2); mCutType = CUT_TYPE_CUT_ROLL; mCutCount = 0; - offResetFlg0(daPyRFlg0_UNK8000000); + offResetFlg0(daPyRFlg0_NOT_ATTACKING); if (checkNormalSwordEquip()) { m35A4 = m_HIO->mCut.mCutRoll.m.field_0x20; if (checkNoResetFlg1(daPyFlg1_SOUP_POWER_UP)) { diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index 306126698..db7e2f14b 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -526,7 +526,7 @@ static cPhs_State daPW_Create(fopAc_ac_c* i_actor) { /* SrcObjTg Type */ AT_TYPE_ALL & ~AT_TYPE_WATER & ~AT_TYPE_UNK20000 & ~AT_TYPE_WIND & ~AT_TYPE_UNK400000 & ~AT_TYPE_LIGHT, /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_GrpAll_e, /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_VsGrpAll_e, - /* SrcGObjAt Se */ dCcG_SE_UNK5, + /* SrcGObjAt Se */ dCcG_SE_METAL, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, diff --git a/src/d/actor/d_a_ss.cpp b/src/d/actor/d_a_ss.cpp index 156d34dfb..13bd7aa5a 100644 --- a/src/d/actor/d_a_ss.cpp +++ b/src/d/actor/d_a_ss.cpp @@ -98,7 +98,7 @@ static cPhs_State daSs_Create(fopAc_ac_c*) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_ssk.cpp b/src/d/actor/d_a_ssk.cpp index 7dfd3eadd..21279b0a0 100644 --- a/src/d/actor/d_a_ssk.cpp +++ b/src/d/actor/d_a_ssk.cpp @@ -343,7 +343,7 @@ static cPhs_State daSsk_Create(fopAc_ac_c* a_this) { /* SrcObjTg Type */ AT_TYPE_ALL & ~AT_TYPE_BOOMERANG & ~AT_TYPE_WATER & ~AT_TYPE_UNK20000 & ~AT_TYPE_WIND & ~AT_TYPE_UNK400000 & ~AT_TYPE_LIGHT, /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsEnemy_e, - /* SrcGObjAt Se */ dCcG_SE_UNK4, + /* SrcGObjAt Se */ dCcG_SE_WOOD, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK1, /* SrcGObjAt Mtrl */ 0, diff --git a/src/d/actor/d_a_swpropeller.cpp b/src/d/actor/d_a_swpropeller.cpp index bbfac9bc0..b8a9d26db 100644 --- a/src/d/actor/d_a_swpropeller.cpp +++ b/src/d/actor/d_a_swpropeller.cpp @@ -17,7 +17,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Type */ 0, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_ALL & ~AT_TYPE_BOOMERANG & ~AT_TYPE_UNK2000000, + /* SrcObjTg Type */ AT_TYPE_ALL & ~AT_TYPE_BOOMERANG & ~AT_TYPE_FAN_SWING, /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp index 360189a4d..a84a0acd3 100644 --- a/src/d/actor/d_a_tn.cpp +++ b/src/d/actor/d_a_tn.cpp @@ -352,7 +352,7 @@ static cPhs_State daTn_Create(fopAc_ac_c*) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, @@ -381,7 +381,7 @@ static cPhs_State daTn_Create(fopAc_ac_c*) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, @@ -465,7 +465,7 @@ static cPhs_State daTn_Create(fopAc_ac_c*) { /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcG_SE_UNK5, + /* SrcGObjTg Se */ dCcG_SE_METAL, /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0, /* SrcGObjTg Mtrl */ 0, diff --git a/src/d/actor/d_a_wz.cpp b/src/d/actor/d_a_wz.cpp index ab64092b4..47ce83a4e 100644 --- a/src/d/actor/d_a_wz.cpp +++ b/src/d/actor/d_a_wz.cpp @@ -182,7 +182,7 @@ static cPhs_State daWZ_Create(fopAc_ac_c*) { /* SrcObjTg Type */ AT_TYPE_ALL & ~AT_TYPE_WATER & ~AT_TYPE_UNK20000 & ~AT_TYPE_UNK400000 & ~AT_TYPE_LIGHT, /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, - /* SrcGObjAt Se */ dCcG_SE_UNK5, + /* SrcGObjAt Se */ dCcG_SE_METAL, /* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK0, /* SrcGObjAt Mtrl */ 0, diff --git a/src/d/d_a_boko_static.cpp b/src/d/d_a_boko_static.cpp index ff8aae5e3..087cb9e2b 100644 --- a/src/d/d_a_boko_static.cpp +++ b/src/d/d_a_boko_static.cpp @@ -77,7 +77,7 @@ f32 daBoko_c::m_blur_rate[] = { /* Type_PGANON_SWORD_e */ 0.2f, }; u8 daBoko_c::m_se_type[] = { - /* Type_BOKO_STICK_e */ dCcG_SE_UNK4, + /* Type_BOKO_STICK_e */ dCcG_SE_WOOD, /* Type_MACHETE_e */ dCcG_SE_UNK1, /* Type_STALFOS_MACE_e */ dCcG_SE_UNK1, /* Type_DARKNUT_SWORD_e */ dCcG_SE_UNK1, diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index 5744bff3b..8ad9caa1e 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -294,9 +294,9 @@ void HitSeStart(const cXyz* i_sePos, int i_roomNo, const dCcD_GObjInf* i_CcObj, } } - if (hit_se == dCcG_SE_UNK4) { + if (hit_se == dCcG_SE_WOOD) { sfx = JA_SE_LK_W_WEP_HIT; - } else if (hit_se == dCcG_SE_UNK5) { + } else if (hit_se == dCcG_SE_METAL) { sfx = JA_SE_LK_MS_WEP_HIT; } else if (master_sword_hit) { sfx = JA_SE_LK_SW_HIT_M; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 580f31979..266c30cab 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -1229,11 +1229,14 @@ int dCamera_c::nextMode(s32 i_curMode) { if (next_mode == 12 && types[mCurType].mStyles[next_mode] < 0) { next_mode = i_curMode; + if ( + mCurType != mCamTypeEvent && mCurType != mCamTypeBoat && #if VERSION == VERSION_DEMO - if (mCurType != mCamTypeEvent && mCurType != mCamTypeBoat && mCurType != GetCameraTypeFromCameraName("BoatBattle")) + mCurType != GetCameraTypeFromCameraName("BoatBattle") #else - if (mCurType != mCamTypeEvent && mCurType != mCamTypeBoat && mCurType != mCamTypeBoatBattle && mCurType != mCamTypeRestrict) + mCurType != mCamTypeBoatBattle && mCurType != mCamTypeRestrict #endif + ) { m254 |= 1; } diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp index 06f4ae489..337b5ecee 100644 --- a/src/d/d_cc_s.cpp +++ b/src/d/d_cc_s.cpp @@ -327,7 +327,7 @@ void dCcS::ProcAtTgHitmark(bool, bool, cCcD_Obj* atObj, cCcD_Obj* tgObj, dCcD_GO dKy_SordFlush_set(*pos, 1); } } else { - if (tgInf->GetTgHitMark() == 0) { return; } + if (tgInf->GetTgHitMark() == dCcG_TgHitMark_None_e) { return; } dKy_SordFlush_set(*pos, 0); csXyz angle; CalcParticleAngle(atInf, atStts, tgStts, &angle); @@ -353,7 +353,7 @@ void dCcS::SetAtTgGObjInf(bool i_setAt, bool i_setTg, atObjInf->SetAtHitPos(*i_hitPos); atObjInf->SetAtRVec(*tgObjInf->GetTgVecP()); - if (atGStts != NULL && atGStts->GetTgSpl() == 0) { + if (atGStts != NULL && atGStts->GetTgSpl() == dCcG_Tg_Spl_UNK0) { atGStts->SetTgSpl(tgObjInf->GetTgSpl()); } diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp index 3ccf37e84..f228aeb49 100644 --- a/src/d/d_cc_uty.cpp +++ b/src/d/d_cc_uty.cpp @@ -43,9 +43,9 @@ u32 at_se_get(cCcD_Obj* obj) { dCcD_GObjInf* gObjInf = dCcD_GetGObjInf(obj); if (gObjInf->ChkAtType(AT_TYPE_SKULL_HAMMER | AT_TYPE_STALFOS_MACE)) { return JA_SE_LK_HAMMER_HIT; - } else if (gObjInf->GetAtSe() == dCcG_SE_UNK4) { + } else if (gObjInf->GetAtSe() == dCcG_SE_WOOD) { return JA_SE_LK_W_WEP_HIT; - } else if (gObjInf->GetAtSe() == dCcG_SE_UNK5) { + } else if (gObjInf->GetAtSe() == dCcG_SE_METAL) { return JA_SE_LK_MS_WEP_HIT; } else if (gObjInf->GetAtSe() == dCcG_SE_ARROW) { return JA_SE_LK_ARROW_HIT; @@ -61,9 +61,9 @@ u32 at_se_getC(cCcD_Obj* obj) { dCcD_GObjInf* gObjInf = dCcD_GetGObjInf(obj); if (gObjInf->ChkAtType(AT_TYPE_SKULL_HAMMER | AT_TYPE_STALFOS_MACE)) { return JA_SE_LK_HAMMER_HIT; - } else if (gObjInf->GetAtSe() == dCcG_SE_UNK4) { + } else if (gObjInf->GetAtSe() == dCcG_SE_WOOD) { return JA_SE_LK_W_WEP_CRT_HIT; - } else if (gObjInf->GetAtSe() == dCcG_SE_UNK5) { + } else if (gObjInf->GetAtSe() == dCcG_SE_METAL) { return JA_SE_LK_MS_WEP_CRT_HIT; } else if (gObjInf->GetAtSe() == dCcG_SE_ARROW) { return JA_SE_LK_ARROW_HIT; diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 355fc85a4..d8e75781e 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -819,11 +819,7 @@ void dFile_select_c::menuSelect() { field_0x3944 = 0.0f; mIconMode = 5; field_0x392b = 6; -#if VERSION == VERSION_DEMO - field_0x392a = 7; -#else - field_0x392a = 8; -#endif + field_0x392a = DEMO_SELECT(7, 8); } } else if(CPad_CHECK_TRIG_B(0)){ @@ -832,11 +828,7 @@ void dFile_select_c::menuSelect() { field_0x30d8.pane->hide(); mIconMode = 5; field_0x392b = 6; -#if VERSION == VERSION_DEMO - field_0x392a = 7; -#else - field_0x392a = 8; -#endif + field_0x392a = DEMO_SELECT(7, 8); } else if(stick->checkRightTrigger()) { if(field_0x3928 != 3) { diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 63a12c191..fde9e8e15 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -721,11 +721,7 @@ dStage_objectNameInf l_objectName[] = { OBJNAME("Bmcon2", PROC_NPC_BMCON1, 1, 0), OBJNAME("Bmsw", PROC_NPC_BMSW, 255, 0), OBJNAME("Btsw", PROC_NPC_BTSW, 255, 0), -#if VERSION == VERSION_DEMO - OBJNAME("Btsw2", PROC_NPC_BTSW2, 255, 0), -#else - OBJNAME("Btsw2", PROC_NPC_BTSW2, 255, 59), -#endif + OBJNAME("Btsw2", PROC_NPC_BTSW2, 255, DEMO_SELECT(0, 59)), OBJNAME("Zk1", PROC_NPC_ZK1, 255, 59), OBJNAME("Zl1", PROC_NPC_ZL1, 255, 60), OBJNAME("Ob1", PROC_NPC_OB1, 255, 60), @@ -1021,11 +1017,7 @@ dStage_objectNameInf l_objectName[] = { OBJNAME("UkD2", PROC_NPC_UK, 7, 0), OBJNAME("Co1", PROC_NPC_CO1, 255, 59), OBJNAME("Mt", PROC_NPC_MT, 255, 0), -#if VERSION == VERSION_DEMO - OBJNAME("Mn", PROC_NPC_MN, 255, 0), -#else - OBJNAME("Mn", PROC_NPC_MN, 255, 59), -#endif + OBJNAME("Mn", PROC_NPC_MN, 255, DEMO_SELECT(0, 59)), OBJNAME("Ah", PROC_NPC_AH, 255, 0), OBJNAME("Hyuf1", PROC_Hmlif, 255, 61), OBJNAME("Hyuf2", PROC_Hmlif, 255, 61),