mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add helper macros to simplify fopAcM_ct-related version differences

Browse Source
This commit is contained in:
LagoLunatic
2026-05-07 16:13:55 -04:00
parent e1f5b7e23b
commit cf210f963b
47 changed files with 102 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f_op/f_op_actor_mng.h
+12 -4
View File
@@ -12,15 +12,23 @@
#include "d/d_event.h"
// The name of this macro is official and comes from a TP debug assert: "fopAcM_ct No Call !!"
#define fopAcM_ct(ptr,ClassName) \
if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \
new (ptr) ClassName(); \
fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \
#define fopAcM_ct(ptr, ClassName) \
if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \
new (ptr) ClassName(); \
fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \
}
// Unofficial name, kept to avoid conflicts with open PRs. TODO: Remove later.
#define fopAcM_SetupActor fopAcM_ct
#if VERSION == VERSION_DEMO
#define fopAcM_ct_Demo fopAcM_ct
#define fopAcM_ct_Retail(ptr, ClassName)
#else
#define fopAcM_ct_Demo(ptr, ClassName)
#define fopAcM_ct_Retail fopAcM_ct
#endif
class J3DModelData;
class daItem_c;
src/d/actor/d_a_atdoor.cpp
+2 -8
View File
@@ -93,17 +93,11 @@ bool daAtdoor_c::CreateInit() {
/* 0000036C-00000418 .text create__10daAtdoor_cFv */
cPhs_State daAtdoor_c::create() {
cPhs_State ret = dComIfG_resLoad(&mPhase, daAtdoor_c::M_arcname);
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(this, daAtdoor_c);
if (ret != cPhs_COMPLEATE_e) {
return ret;
}
fopAcM_ct(this, daAtdoor_c);
#else
fopAcM_ct(this, daAtdoor_c);
if (ret != cPhs_COMPLEATE_e) {
return ret;
}
#endif
fopAcM_ct_Demo(this, daAtdoor_c);
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x1580)) {
return cPhs_ERROR_e;
src/d/actor/d_a_beam.cpp
+2 -7
View File
@@ -594,15 +594,10 @@ static cPhs_State daBeamCreate(void* i_this) {
/* 00001CA4-00001D34 .text _create__8daBeam_cFv */
cPhs_State daBeam_c::_create() {
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(this, daBeam_c);
cPhs_State PVar1 = dComIfG_resLoad(&mPhase, M_arcname);
if (PVar1 == cPhs_COMPLEATE_e) {
fopAcM_ct(this, daBeam_c);
#else
fopAcM_ct(this, daBeam_c);
cPhs_State PVar1 = dComIfG_resLoad(&mPhase, M_arcname);
if (PVar1 == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(this, daBeam_c);
if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x22A0)) {
return CreateInit();
}
src/d/actor/d_a_bpw.cpp
+2 -6
View File
@@ -4369,14 +4369,10 @@ static cPhs_State daBPW_Create(fopAc_ac_c* a_this) {
bpw_class* i_this = (bpw_class*)a_this;
fopAc_ac_c* actor = a_this;
csXyz sp18 = actor->shape_angle;
#if VERSION > VERSION_DEMO
fopAcM_ct(actor, bpw_class);
#endif
fopAcM_ct_Retail(actor, bpw_class);
res = dComIfG_resLoad(&i_this->m2AC, "BPW");
if (res == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(actor, bpw_class);
#endif
fopAcM_ct_Demo(actor, bpw_class);
i_this->mType = (bpw_class::Actor_Type_e)fopAcM_GetParam(actor);
i_this->mUnknownParam2 = (bpw_class::Damage_Action_e)((uint)fopAcM_GetParam(actor) >> 8);
i_this->mLightState = (u8)((uint)fopAcM_GetParam(actor) >> 0x10);
src/d/actor/d_a_branch.cpp
+2 -6
View File
@@ -191,15 +191,11 @@ static BOOL daBranch_Delete(daBranch_c* i_this) {
}
inline cPhs_State daBranch_c::create() {
#if VERSION > VERSION_DEMO
fopAcM_ct(this, daBranch_c);
#endif
fopAcM_ct_Retail(this, daBranch_c);
cPhs_State phase_state = dComIfG_resLoad(&mPhase, daBranch_c::m_arcname);
if (phase_state == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(this, daBranch_c);
#endif
fopAcM_ct_Demo(this, daBranch_c);
if (!fopAcM_entrySolidHeap(this, daBranch_c::solidHeapCB, 0x4000)) {
for (int i = 0; i < (s32)ARRAY_SIZE(mAnims); i++) {
src/d/actor/d_a_bridge.cpp
+2 -7
View File
@@ -1449,15 +1449,10 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
static cPhs_State daBridge_Create(fopAc_ac_c* a_this) {
bridge_class* i_this = (bridge_class*)a_this;
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(&i_this->actor, bridge_class);
cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "Bridge");
if (ret == cPhs_COMPLEATE_e) {
fopAcM_ct(&i_this->actor, bridge_class);
#else
fopAcM_ct(&i_this->actor, bridge_class);
cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "Bridge");
if (ret == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(&i_this->actor, bridge_class);
i_this->mTypeBits = fopAcM_GetParam(a_this);
if (i_this->mTypeBits == 0xFF) {
i_this->mTypeBits = 0;
src/d/actor/d_a_demo_kmm.cpp
+2 -9
View File
@@ -54,19 +54,12 @@ BOOL daDemo_Kmm_c::CreateInit() {
/* 00000308-000003A0 .text create__12daDemo_Kmm_cFv */
cPhs_State daDemo_Kmm_c::create() {
#if VERSION == DEMO
fopAcM_ct_Retail(this, daDemo_Kmm_c);
cPhs_State ret = dComIfG_resLoad(&this->mPhase, M_arcname);
if (ret != cPhs_COMPLEATE_e) {
return ret;
}
fopAcM_ct(this, daDemo_Kmm_c);
#else
fopAcM_ct(this, daDemo_Kmm_c);
cPhs_State ret = dComIfG_resLoad(&this->mPhase, M_arcname);
if (ret != cPhs_COMPLEATE_e) {
return ret;
}
#endif
fopAcM_ct_Demo(this, daDemo_Kmm_c);
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x5700)) {
return cPhs_ERROR_e;
src/d/actor/d_a_dr.cpp
+2 -6
View File
@@ -247,15 +247,11 @@ static BOOL createHeap(fopAc_ac_c* i_actor) {
static cPhs_State daDr_Create(fopAc_ac_c* i_this) {
dr_class* a_this = (dr_class*)i_this;
#if VERSION > VERSION_DEMO
fopAcM_ct(a_this, dr_class);
#endif
fopAcM_ct_Retail(a_this, dr_class);
cPhs_State phase_state = dComIfG_resLoad(&a_this->mPhs, "Dr");
if (phase_state == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(a_this, dr_class);
#endif
fopAcM_ct_Demo(a_this, dr_class);
if (!fopAcM_entrySolidHeap(a_this, createHeap, 0xF000)) {
return cPhs_ERROR_e;
src/d/actor/d_a_ep.cpp
+2 -7
View File
@@ -637,16 +637,11 @@ static cPhs_State daEp_Create(fopAc_ac_c* a_this) {
};
ep_class* i_this = (ep_class*)a_this;
fopAcM_ct_Retail(a_this, ep_class);
#if VERSION == VERSION_DEMO
cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "Ep");
if (ret == cPhs_COMPLEATE_e) {
fopAcM_ct(a_this, ep_class);
#else
fopAcM_ct(a_this, ep_class);
cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "Ep");
if (ret == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(a_this, ep_class);
i_this->mType = fopAcM_GetParam(a_this) & 0x3F;
if (i_this->mType == 0x3F) {
i_this->mType = 0;
src/d/actor/d_a_fallrock.cpp
+2 -6
View File
@@ -188,15 +188,11 @@ static cPhs_State daFallRock_Create(fopAc_ac_c* i_this) {
/* 00001050-0000127C .text create__12daFallRock_cFv */
cPhs_State daFallRock_c::create() {
#if VERSION > VERSION_DEMO
fopAcM_ct(this, daFallRock_c);
#endif
fopAcM_ct_Retail(this, daFallRock_c);
cPhs_State res = dComIfG_resLoad(&mPhs, m_arcname);
if (res == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(this, daFallRock_c);
#endif
fopAcM_ct_Demo(this, daFallRock_c);
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0xB80)) {
return cPhs_ERROR_e;
src/d/actor/d_a_fgmahou.cpp
+2 -6
View File
@@ -400,15 +400,11 @@ static cPhs_State daFgmahou_Create(fopAc_ac_c* a_this) {
fgmahou_class* i_this = static_cast<fgmahou_class*>(a_this);
#if VERSION > VERSION_DEMO
fopAcM_ct(i_this, fgmahou_class);
#endif
fopAcM_ct_Retail(i_this, fgmahou_class);
cPhs_State phase_state = dComIfG_resLoad(&i_this->mPhs, "Fganon");
if(phase_state == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(i_this, fgmahou_class);
#endif
fopAcM_ct_Demo(i_this, fgmahou_class);
i_this->mOrbNumber = fopAcM_GetParam(i_this) & 0xF;
src/d/actor/d_a_jbo.cpp
+2 -6
View File
@@ -189,15 +189,11 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
/* 0000081C-00000A90 .text daJBO_Create__FP10fopAc_ac_c */
static cPhs_State daJBO_Create(fopAc_ac_c* i_this) {
#if VERSION > VERSION_DEMO
fopAcM_ct(i_this, jbo_class);
#endif
fopAcM_ct_Retail(i_this, jbo_class);
jbo_class* a_this = (jbo_class*)i_this;
cPhs_State state = dComIfG_resLoad(&a_this->mPhs, "JBO");
if (state == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(i_this, jbo_class);
#endif
fopAcM_ct_Demo(i_this, jbo_class);
if (!fopAcM_entrySolidHeap(i_this, &useHeapInit, 0x1c20)) {
return cPhs_ERROR_e;
} else {
src/d/actor/d_a_kamome.cpp
+2 -8
View File
@@ -1481,17 +1481,11 @@ static cPhs_State daKamome_Create(fopAc_ac_c* a_this) {
};
kamome_class* i_this = (kamome_class*)a_this;
#if VERSION == VERSION_DEMO
cPhs_State PVar1 = dComIfG_resLoad(&i_this->mPhase, "Kamome");
if (PVar1 == cPhs_COMPLEATE_e) {
fopAcM_ct(a_this, kamome_class);
#else
fopAcM_ct(a_this, kamome_class);
fopAcM_ct_Retail(a_this, kamome_class);
cPhs_State PVar1 = dComIfG_resLoad(&i_this->mPhase, "Kamome");
if (PVar1 == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(a_this, kamome_class);
i_this->mType = fopAcM_GetParam(a_this);
if (i_this->mType == 0xff) {
src/d/actor/d_a_kn.cpp
+2 -7
View File
@@ -515,15 +515,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
static cPhs_State daKN_Create(fopAc_ac_c* a_this) {
kn_class* i_this = (kn_class*)a_this;
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(a_this, kn_class);
cPhs_State PVar1 = dComIfG_resLoad(&i_this->mPhase, "KN");
if (PVar1 == cPhs_COMPLEATE_e) {
fopAcM_ct(&i_this->actor, kn_class);
#else
fopAcM_ct(a_this, kn_class);
cPhs_State PVar1 = dComIfG_resLoad(&i_this->mPhase, "KN");
if (PVar1 == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(&i_this->actor, kn_class);
i_this->m2B4 = fopAcM_GetParam(a_this);
i_this->m2B5 = fopAcM_GetParam(a_this) >> 8;
i_this->m2EC = a_this->current.pos;
src/d/actor/d_a_knob00.cpp
+2 -8
View File
@@ -371,17 +371,11 @@ BOOL daKnob00_c::CreateInit() {
/* 00000D84-00000E70 .text create__10daKnob00_cFv */
cPhs_State daKnob00_c::create() {
cPhs_State ret = dComIfG_resLoad(&mPhase, M_arcname);
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(this, daKnob00_c);
if (ret != cPhs_COMPLEATE_e) {
return ret;
}
fopAcM_ct(this, daKnob00_c);
#else
fopAcM_ct(this, daKnob00_c);
if (ret != cPhs_COMPLEATE_e) {
return ret;
}
#endif
fopAcM_ct_Demo(this, daKnob00_c);
if (fopAcM_GetRoomNo(this) == -1) {
fopAcM_SetRoomNo(this, getFRoomNo());
src/d/actor/d_a_ks.cpp
+2 -6
View File
@@ -1552,16 +1552,12 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) {
/* 000034F8-00003A94 .text daKS_Create__FP10fopAc_ac_c */
static cPhs_State daKS_Create(fopAc_ac_c* i_this) {
#if VERSION > VERSION_DEMO
fopAcM_ct(i_this, ks_class);
#endif
fopAcM_ct_Retail(i_this, ks_class);
ks_class* a_this = (ks_class*)i_this;
cPhs_State res = dComIfG_resLoad(&a_this->mPhs, "KS");
if (res == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(i_this, ks_class);
#endif
fopAcM_ct_Demo(i_this, ks_class);
if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x1060)) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_kytag03.cpp
+2 -6
View File
@@ -128,15 +128,11 @@ static BOOL daKytag03_Delete(kytag03_class* i_this) {
static cPhs_State daKytag03_Create(fopAc_ac_c* i_ac) {
kytag03_class* i_this = (kytag03_class*)i_ac;
#if VERSION > VERSION_DEMO
fopAcM_ct(i_ac, kytag03_class);
#endif
fopAcM_ct_Retail(i_ac, kytag03_class);
cPhs_State ret = dComIfG_resLoad(&i_this->mPhs, "M_DOOR");
if (ret == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(i_ac, kytag03_class);
#endif
fopAcM_ct_Demo(i_ac, kytag03_class);
if (!fopAcM_entrySolidHeap(&i_this->actor, useHeapInit, 0x4c30)) {
return cPhs_ERROR_e;
src/d/actor/d_a_kytag05.cpp
+2 -6
View File
@@ -122,17 +122,13 @@ static BOOL daKytag05_Delete(kytag05_class*) {
/* 00000404-000004C0 .text daKytag05_Create__FP10fopAc_ac_c */
static cPhs_State daKytag05_Create(fopAc_ac_c* i_this) {
#if VERSION > VERSION_DEMO
fopAcM_ct(i_this, kytag05_class);
#endif
fopAcM_ct_Retail(i_this, kytag05_class);
kytag05_class *a_this = (kytag05_class*)i_this;
if (dComIfGs_isSymbol(1) != 0) {
return cPhs_STOP_e;
}
#if VERSION == VERSION_DEMO
fopAcM_ct(i_this, kytag05_class);
#endif
fopAcM_ct_Demo(i_this, kytag05_class);
a_this->mIndex = 0;
a_this->mTimer = 0;
src/d/actor/d_a_kytag06.cpp
+2 -6
View File
@@ -60,18 +60,14 @@ static BOOL daKytag06_Delete(kytag06_class*) {
/* 000001A4-00000224 .text daKytag06_Create__FP10fopAc_ac_c */
static cPhs_State daKytag06_Create(fopAc_ac_c* i_this) {
#if VERSION > VERSION_DEMO
fopAcM_ct(i_this, kytag06_class);
#endif
fopAcM_ct_Retail(i_this, kytag06_class);
kytag06_class* a_this = (kytag06_class*)i_this;
cPhs_State phase_state;
if(dComIfGs_isSymbol(0)) {
phase_state = cPhs_ERROR_e;
} else {
#if VERSION == VERSION_DEMO
fopAcM_ct(i_this, kytag06_class);
#endif
fopAcM_ct_Demo(i_this, kytag06_class);
a_this->field_0x294 = 0;
phase_state = cPhs_COMPLEATE_e;
}
src/d/actor/d_a_kytag07.cpp
+2 -6
View File
@@ -86,16 +86,12 @@ static cPhs_State daKytag07_Create(fopAc_ac_c* i_this) {
kytag07_class* a_this = (kytag07_class*)i_this;
dScnKy_env_light_c& env_light = dKy_getEnvlight();
#if VERSION > VERSION_DEMO
fopAcM_ct(i_this, kytag07_class);
#endif
fopAcM_ct_Retail(i_this, kytag07_class);
if (strcmp(dComIfGp_getStartStageName(), "GTower") != 0)
env_light.mbDayNightTactStop = true;
#if VERSION == VERSION_DEMO
fopAcM_ct(i_this, kytag07_class);
#endif
fopAcM_ct_Demo(i_this, kytag07_class);
return cPhs_COMPLEATE_e;
}
src/d/actor/d_a_mbdoor.cpp
+2 -6
View File
@@ -257,17 +257,13 @@ BOOL daMbdoor_c::CreateInit() {
/* 00000A44-00000AF4 .text create__10daMbdoor_cFv */
cPhs_State daMbdoor_c::create() {
cPhs_State phase_state = dComIfG_resLoad(&mPhs, getArcName());
#if VERSION > VERSION_DEMO
fopAcM_ct(this, daMbdoor_c);
#endif
fopAcM_ct_Retail(this, daMbdoor_c);
if (phase_state != cPhs_COMPLEATE_e) {
return phase_state;
}
#if VERSION == VERSION_DEMO
fopAcM_ct(this, daMbdoor_c);
#endif
fopAcM_ct_Demo(this, daMbdoor_c);
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x8200)) {
return cPhs_ERROR_e;
src/d/actor/d_a_mdoor.cpp
+2 -8
View File
@@ -177,17 +177,11 @@ BOOL daMdoor_c::CreateInit() {
/* 000005E0-00000698 .text create__9daMdoor_cFv */
cPhs_State daMdoor_c::create() {
cPhs_State ret = dComIfG_resLoad(&mPhase, M_arcname);
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(this, daMdoor_c);
if (ret != cPhs_COMPLEATE_e) {
return ret;
}
fopAcM_ct(this, daMdoor_c);
#else
fopAcM_ct(this, daMdoor_c);
if (ret != cPhs_COMPLEATE_e) {
return ret;
}
#endif
fopAcM_ct_Demo(this, daMdoor_c);
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x1640)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_bs1.cpp
+2 -6
View File
@@ -2160,15 +2160,11 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00004980-00004AD8 .text _create__11daNpc_Bs1_cFv */
cPhs_State daNpc_Bs1_c::_create() {
#if VERSION > VERSION_DEMO
fopAcM_ct(this, daNpc_Bs1_c);
#endif
fopAcM_ct_Retail(this, daNpc_Bs1_c);
cPhs_State phase_state = dComIfG_resLoad(&mPhase, "Bs");
if (phase_state == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(this, daNpc_Bs1_c);
#endif
fopAcM_ct_Demo(this, daNpc_Bs1_c);
mType = fopAcM_GetParamBit(fopAcM_GetParam(this), 0x14, 0x4);
switch (mType) {
case 0:
src/d/actor/d_a_npc_hr.cpp
+2 -6
View File
@@ -2081,14 +2081,10 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 000051A8-000052C4 .text _create__10daNpc_Hr_cFv */
cPhs_State daNpc_Hr_c::_create() {
#if VERSION > VERSION_DEMO
fopAcM_ct(this, daNpc_Hr_c);
#endif
fopAcM_ct_Retail(this, daNpc_Hr_c);
cPhs_State state = dComIfG_resLoad(&mPhs, "Hr");
if (state == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(this, daNpc_Hr_c);
#endif
fopAcM_ct_Demo(this, daNpc_Hr_c);
switch(fopAcM_GetName(this)) {
case PROC_NPC_HR:
switch (getShapeType()) {
src/d/actor/d_a_npc_kamome.cpp
+2 -6
View File
@@ -312,9 +312,7 @@ static BOOL checkCreateHeap(fopAc_ac_c* i_this) {
/* 00000ED8-0000101C .text create__11daNpc_kam_cFv */
cPhs_State daNpc_kam_c::create() {
#if VERSION > VERSION_DEMO
fopAcM_ct(this, daNpc_kam_c);
#endif
fopAcM_ct_Retail(this, daNpc_kam_c);
if (l_act != NULL && l_act != this) {
return cPhs_ERROR_e;
@@ -326,9 +324,7 @@ cPhs_State daNpc_kam_c::create() {
cPhs_State phase_state = dComIfG_resLoad(&mPhs, "Kamome");
if (phase_state == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(this, daNpc_kam_c);
#endif
fopAcM_ct_Demo(this, daNpc_kam_c);
if (!fopAcM_entrySolidHeap(this, checkCreateHeap, l_heap_size)) {
#if VERSION > VERSION_DEMO
src/d/actor/d_a_npc_km1.cpp
+2 -6
View File
@@ -709,9 +709,7 @@ cPhs_State daNpc_Km1_c::_create() {
0x272E0
};
#if VERSION > VERSION_DEMO
fopAcM_ct(this, daNpc_Km1_c);
#endif
fopAcM_ct_Retail(this, daNpc_Km1_c);
if (!decideType(fopAcM_GetParam(this) & 0xFF )) {
return cPhs_ERROR_e;
@@ -728,9 +726,7 @@ cPhs_State daNpc_Km1_c::_create() {
}
l_HIO.field_0x8 += 1;
#if VERSION == VERSION_DEMO
fopAcM_ct(this, daNpc_Km1_c);
#endif
fopAcM_ct_Demo(this, daNpc_Km1_c);
if(fopAcM_entrySolidHeap(this,CheckCreateHeap,a_heap_size_tbl[field_0x7D3])){
fopAcM_SetMtx(this,mpMorf->getModel()->getBaseTRMtx());
src/d/actor/d_a_npc_ls1.cpp
+1 -3
View File
@@ -2210,9 +2210,7 @@ cPhs_State daNpc_Ls1_c::_create() {
cPhs_State state;
#if VERSION > VERSION_DEMO
fopAcM_ct(this, daNpc_Ls1_c);
#endif
fopAcM_ct_Retail(this, daNpc_Ls1_c);
if (!decideType(fopAcM_GetParam(this) & 0xFF)) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_md.cpp
+2 -6
View File
@@ -374,9 +374,7 @@ cPhs_State daNpc_Md_c::create() {
strcpy(mModelArcName, l_arc_name);
int heapSizeIdx = 0;
#if VERSION > VERSION_DEMO
fopAcM_ct(this, daNpc_Md_c);
#endif
fopAcM_ct_Retail(this, daNpc_Md_c);
mType = fopAcM_GetParam(this) >> 0x08;
if ((int)mType == -2) { // Bug: Comparing unsigned value with -2 is always false.
@@ -430,9 +428,7 @@ cPhs_State daNpc_Md_c::create() {
cPhs_State phase_state = dComIfG_resLoad(&mPhase, mModelArcName);
m313D = 1;
if (phase_state == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(this, daNpc_Md_c);
#endif
fopAcM_ct_Demo(this, daNpc_Md_c);
if (dComIfGp_getCb1Player() != NULL) {
return cPhs_ERROR_e;
src/d/actor/d_a_npc_rsh1.cpp
+2 -6
View File
@@ -1796,17 +1796,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00004328-00004464 .text _create__12daNpc_Rsh1_cFv */
cPhs_State daNpc_Rsh1_c::_create() {
#if VERSION > VERSION_DEMO
fopAcM_ct(this, daNpc_Rsh1_c);
#endif
fopAcM_ct_Retail(this, daNpc_Rsh1_c);
cPhs_State state = dComIfG_resLoad(&mPhs, m_arcname);
if (state == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(this, daNpc_Rsh1_c);
#endif
fopAcM_ct_Demo(this, daNpc_Rsh1_c);
m95E = (fopAcM_GetParam(this) >> 0x14) & 0xF;
switch (m95E) {
src/d/actor/d_a_npc_tc.cpp
+2 -7
View File
@@ -1853,15 +1853,10 @@ bool daNpc_Tc_c::isCreate() {
/* 00003FC0-00004090 .text _create__10daNpc_Tc_cFv */
cPhs_State daNpc_Tc_c::_create() {
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(this, daNpc_Tc_c);
cPhs_State phase_state = dComIfG_resLoad(&mPhs, "Tc");
if(phase_state == cPhs_COMPLEATE_e) {
fopAcM_ct(this, daNpc_Tc_c);
#else
fopAcM_ct(this, daNpc_Tc_c);
cPhs_State phase_state = dComIfG_resLoad(&mPhs, "Tc");
if(phase_state == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(this, daNpc_Tc_c);
getArg();
if(!isCreate()) {
src/d/actor/d_a_npc_zl1.cpp
+1 -3
View File
@@ -2882,9 +2882,7 @@ cPhs_State daNpc_Zl1_c::_create() {
};
cPhs_State state;
#if VERSION > VERSION_DEMO
fopAcM_ct(this, daNpc_Zl1_c);
#endif
fopAcM_ct_Retail(this, daNpc_Zl1_c);
if(!decideType(fopAcM_GetParam(this) & 0xFF)) { // idk if this is supposed to be here
return cPhs_ERROR_e;
}
src/d/actor/d_a_nzg.cpp
+2 -6
View File
@@ -161,14 +161,10 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
/* 00000620-00000864 .text daNZG_Create__FP10fopAc_ac_c */
static cPhs_State daNZG_Create(fopAc_ac_c* i_this) {
nzg_class* nzg_this = (nzg_class*)i_this;
#if VERSION > VERSION_DEMO
fopAcM_ct(i_this, nzg_class);
#endif
fopAcM_ct_Retail(i_this, nzg_class);
cPhs_State phase_state = dComIfG_resLoad(&nzg_this->mPhs, "NZG");
if (phase_state == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(i_this, nzg_class);
#endif
fopAcM_ct_Demo(i_this, nzg_class);
if (!fopAcM_entrySolidHeap(&nzg_this->actor, useHeapInit, 0x680)) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_obj_bemos.cpp
+2 -9
View File
@@ -474,19 +474,12 @@ cPhs_State daBemos_c::CreateInit() {
/* 00003F90-0000403C .text _create__9daBemos_cFv */
cPhs_State daBemos_c::_create() {
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(this, daBemos_c);
cPhs_State ret = dComIfG_resLoad(&mPhase, m_arcname);
m6B8 = fopAcM_GetParam(this) >> 0x1C;
#else
fopAcM_ct(this, daBemos_c);
cPhs_State ret = dComIfG_resLoad(&mPhase, m_arcname);
m6B8 = fopAcM_GetParam(this) >> 0x1C;
#endif
if (ret == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(this, daBemos_c);
#endif
fopAcM_ct_Demo(this, daBemos_c);
static s32 SHeapSize[] = {0x1740, 0x1E00, 0xBA0};
if (fopAcM_entrySolidHeap(this, CheckCreateHeap, SHeapSize[m6B8])) {
src/d/actor/d_a_obj_demo_barrel.cpp
+2 -7
View File
@@ -64,15 +64,10 @@ BOOL daObj_Demo_Barrel_c::CreateHeap() {
}
cPhs_State daObj_Demo_Barrel_c::_create() {
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(this, daObj_Demo_Barrel_c);
cPhs_State ret = dComIfG_resLoad(&mPhase, M_arcname);
if (ret == cPhs_COMPLEATE_e) {
fopAcM_ct(this, daObj_Demo_Barrel_c);
#else
fopAcM_ct(this, daObj_Demo_Barrel_c);
cPhs_State ret = dComIfG_resLoad(&mPhase, M_arcname);
if (ret == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(this, daObj_Demo_Barrel_c);
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x22E0)) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_obj_lpalm.cpp
+2 -7
View File
@@ -81,15 +81,10 @@ void daObjLpalm_c::CreateInit() {
}
cPhs_State daObjLpalm_c::_create() {
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(this, daObjLpalm_c);
cPhs_State ret = dComIfG_resLoad(&mPhs, M_arcname);
if (ret == cPhs_COMPLEATE_e) {
fopAcM_ct(this, daObjLpalm_c);
#else
fopAcM_ct(this, daObjLpalm_c);
cPhs_State ret = dComIfG_resLoad(&mPhs, M_arcname);
if (ret == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(this, daObjLpalm_c);
if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0xf00) == 0) {
ret = cPhs_ERROR_e;
} else {
src/d/actor/d_a_obj_otble.cpp
+2 -12
View File
@@ -119,7 +119,7 @@ void daObj_Otble::Act_c::CreateInit() {
cPhs_State daObj_Otble::Act_c::_create() {
static const u32 heapsize[] = {0x1240, 0x1240};
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(this, daObj_Otble::Act_c);
m294 = fopAcM_GetParam(this) & 0xff;
if (m294 > 1) {
m294 = 1;
@@ -127,17 +127,7 @@ cPhs_State daObj_Otble::Act_c::_create() {
cPhs_State ret = dComIfG_resLoad(&mPhase, "Okmono");
if (ret == cPhs_COMPLEATE_e) {
fopAcM_ct(this, daObj_Otble::Act_c);
#else
fopAcM_ct(this, daObj_Otble::Act_c);
m294 = fopAcM_GetParam(this) & 0xFF;
if (m294 > 1) {
m294 = 1;
}
cPhs_State ret = dComIfG_resLoad(&mPhase, "Okmono");
if (ret == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(this, daObj_Otble::Act_c);
if (!fopAcM_entrySolidHeap(this, createHeap_CB, heapsize[m294])) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_obj_pfall.cpp
+2 -6
View File
@@ -183,16 +183,12 @@ void daObj_Pfall_c::CreateInit() {
/* 000008CC-000009E8 .text _create__13daObj_Pfall_cFv */
cPhs_State daObj_Pfall_c::_create() {
#if VERSION > VERSION_DEMO
fopAcM_ct(this, daObj_Pfall_c);
#endif
fopAcM_ct_Retail(this, daObj_Pfall_c);
cPhs_State phase = dComIfG_resLoad(&mPhsPfall, "Pfall");
if (phase == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_ct(this, daObj_Pfall_c);
#endif
fopAcM_ct_Demo(this, daObj_Pfall_c);
if (!fopAcM_entrySolidHeap(this, CallbackCreateHeap, 0x38E0)) {
return cPhs_ERROR_e;
src/d/actor/d_a_obj_rcloud.cpp
+2 -6
View File
@@ -83,13 +83,9 @@ bool daObjRcloud_c::create_heap() {
/* 00000238-000003B4 .text _create__13daObjRcloud_cFv */
cPhs_State daObjRcloud_c::_create() {
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(this, daObjRcloud_c);
cPhs_State phase = cPhs_ERROR_e;
fopAcM_ct(this, daObjRcloud_c);
#else
fopAcM_ct(this, daObjRcloud_c);
cPhs_State phase = cPhs_ERROR_e;
#endif
fopAcM_ct_Demo(this, daObjRcloud_c);
if (fopAcM_IsFirstCreating(this)) {
mDemoNameIndex = param_get_arg();
src/d/actor/d_a_obj_smplbg.cpp
+2 -6
View File
@@ -57,18 +57,14 @@ BOOL daObjSmplbg::Act_c::Create() {
/* 0000032C-00000474 .text Mthd_Create__Q211daObjSmplbg5Act_cFv */
cPhs_State daObjSmplbg::Act_c::Mthd_Create() {
#if VERSION > VERSION_DEMO
fopAcM_ct(this, Act_c);
#endif
fopAcM_ct_Retail(this, Act_c);
mType = prm_get_type();
if(mType >= 1){
mType = 0;
}
#if VERSION == VERSION_DEMO
fopAcM_ct(this, Act_c);
#endif
fopAcM_ct_Demo(this, Act_c);
cPhs_State phase_state = dComIfG_resLoad(&mPhs, attr().mResName);
if(phase_state == cPhs_COMPLEATE_e){
src/d/actor/d_a_obj_swlight.cpp
+2 -6
View File
@@ -109,15 +109,11 @@ bool Act_c::create_heap() {
/* 0000045C-00000704 .text _create__Q212daObjSwlight5Act_cFv */
cPhs_State Act_c::_create() {
#if VERSION > VERSION_DEMO
fopAcM_ct(this, Act_c);
#endif
fopAcM_ct_Retail(this, Act_c);
mF24 = prm_get_type();
#if VERSION == VERSION_DEMO
fopAcM_ct(this, Act_c);
#endif
fopAcM_ct_Demo(this, Act_c);
cPhs_State PVar2 = dComIfG_resLoad(&mPhase, M_arcname);
if (PVar2 == cPhs_COMPLEATE_e) {
src/d/actor/d_a_obj_tousekiki.cpp
+2 -8
View File
@@ -58,16 +58,10 @@ static cPhs_State daObj_TousekikiCreate(void* i_this) {
/* 000002DC-000004F4 .text _create__17daObj_Tousekiki_cFv */
cPhs_State daObj_Tousekiki_c::_create() {
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(this, daObj_Tousekiki_c);
cPhs_State PVar1 = dComIfG_resLoad(&mPhase, M_arcname);
if (PVar1 == cPhs_COMPLEATE_e) {
fopAcM_ct(this, daObj_Tousekiki_c);
#else
fopAcM_ct(this, daObj_Tousekiki_c);
cPhs_State PVar1 = dComIfG_resLoad(&mPhase, M_arcname);
if (PVar1 == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(this, daObj_Tousekiki_c);
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x900)) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_sbox.cpp
+2 -9
View File
@@ -244,19 +244,12 @@ BOOL daSbox_c::CreateInit() {
/* 000008F0-000009F0 .text create__8daSbox_cFv */
cPhs_State daSbox_c::create() {
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(this, daSbox_c);
cPhs_State PVar1 = dComIfG_resLoad(&mPhase, M_arcname);
if (PVar1 != cPhs_COMPLEATE_e) {
return PVar1;
}
fopAcM_ct(this, daSbox_c);
#else
fopAcM_ct(this, daSbox_c);
cPhs_State PVar1 = dComIfG_resLoad(&mPhase, M_arcname);
if (PVar1 != cPhs_COMPLEATE_e) {
return PVar1;
}
#endif
fopAcM_ct_Demo(this, daSbox_c);
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x15C0)) {
return cPhs_ERROR_e;
src/d/actor/d_a_sk.cpp
+2 -9
View File
@@ -287,17 +287,10 @@ static cPhs_State daSk_Create(fopAc_ac_c* a_this) {
};
sk_class* i_this = (sk_class*)a_this;
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(a_this, sk_class);
cPhs_State PVar2 = dComIfG_resLoad(&i_this->mPhase, "Sk");
if (PVar2 == cPhs_COMPLEATE_e) {
fopAcM_ct(a_this, sk_class);
#else
fopAcM_ct(a_this, sk_class);
cPhs_State PVar2 = dComIfG_resLoad(&i_this->mPhase, "Sk");
if (PVar2 == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(a_this, sk_class);
i_this->m2B4 = fopAcM_GetParam(i_this);
if (i_this->m2B4 == 0xff) {
i_this->m2B4 = 0;
src/d/actor/d_a_sk2.cpp
+2 -7
View File
@@ -188,15 +188,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
/* 00000918-00000BC4 .text daSk2_Create__FP10fopAc_ac_c */
static cPhs_State daSk2_Create(fopAc_ac_c* a_this) {
sk2_class* i_this = (sk2_class*)a_this;
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(a_this, sk2_class);
cPhs_State PVar1 = dComIfG_resLoad(&i_this->mPhase, "Sk2");
if (PVar1 == cPhs_COMPLEATE_e) {
fopAcM_ct(a_this, sk2_class);
#else
fopAcM_ct(a_this, sk2_class);
cPhs_State PVar1 = dComIfG_resLoad(&i_this->mPhase, "Sk2");
if (PVar1 == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(a_this, sk2_class);
i_this->m2B4 = fopAcM_GetParam(a_this);
i_this->m2B5 = fopAcM_GetParam(a_this) >> 8;
src/d/actor/d_a_ssk.cpp
+2 -7
View File
@@ -365,15 +365,10 @@ static cPhs_State daSsk_Create(fopAc_ac_c* a_this) {
ssk_class* i_this = (ssk_class*)a_this;
#if VERSION == VERSION_DEMO
fopAcM_ct_Retail(a_this, ssk_class);
cPhs_State PVar2 = dComIfG_resLoad(&i_this->mPhase, "Ssk");
if (PVar2 == cPhs_COMPLEATE_e) {
fopAcM_ct(a_this, ssk_class);
#else
fopAcM_ct(a_this, ssk_class);
cPhs_State PVar2 = dComIfG_resLoad(&i_this->mPhase, "Ssk");
if (PVar2 == cPhs_COMPLEATE_e) {
#endif
fopAcM_ct_Demo(a_this, ssk_class);
i_this->m2D0.setRateOff(0);
i_this->m2B4 = fopAcM_GetParam(a_this);
i_this->m2B5 = fopAcM_GetParam(a_this) >> 8;
src/d/actor/d_a_swc00.cpp
+2 -6
View File
@@ -46,9 +46,7 @@ static BOOL daSwc00_Delete(swc00_class* i_this) {
/* 00000190-00000274 .text daSwc00_Create__FP10fopAc_ac_c */
static cPhs_State daSwc00_Create(fopAc_ac_c* i_this) {
#if VERSION > VERSION_DEMO
fopAcM_ct(i_this, swc00_class);
#endif
fopAcM_ct_Retail(i_this, swc00_class);
swc00_class* a_this = (swc00_class*)i_this;
@@ -62,9 +60,7 @@ static cPhs_State daSwc00_Create(fopAc_ac_c* i_this) {
}
}
#if VERSION == VERSION_DEMO
fopAcM_ct(i_this, swc00_class);
#endif
fopAcM_ct_Demo(i_this, swc00_class);
i_this->scale.x *= 100.0f;
i_this->scale.x += 30.0f;
src/d/actor/d_a_tag_light.cpp
+2 -6
View File
@@ -126,9 +126,7 @@ bool Act_c::create_heap() {
/* 0000035C-000006F0 .text _create__Q210daTagLight5Act_cFv */
cPhs_State Act_c::_create() {
#if VERSION > VERSION_DEMO
fopAcM_ct(this, Act_c);
#endif
fopAcM_ct_Retail(this, Act_c);
m2A0 = prm_get_type();
cXyz sp08;
@@ -143,9 +141,7 @@ cPhs_State Act_c::_create() {
m4A4.y = sp08.y;
m4A4.z = sp08.z;
#if VERSION == VERSION_DEMO
fopAcM_ct(this, Act_c);
#endif
fopAcM_ct_Demo(this, Act_c);
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);