m_Do_main / f_ap_game / f_op_actor debug work and misc (#2744)

* m_Do_main / f_ap_game debug stuff

* revolution sdk compatibility

* f_op_actor debug work

* rename fopAcM_SetupActor to fopAcM_ct

* fix build

* fix jp/pal splits
This commit is contained in:
TakaRikka
2025-10-19 10:30:49 -07:00
committed by GitHub
parent 31c0f94a10
commit 850fae1aa3
870 changed files with 10837 additions and 964 deletions
+5 -3
View File
@@ -3750,9 +3750,9 @@ public:
s16 getHookshotStopTime() const { return field_0x3026; }
bool getHookshotLeft() const { return field_0x3020 == 0; }
static int getBallModelIdx() { return 0x25; }
static int getBallBtkIdx() { return 0x49; }
static int getBallBrkIdx() { return 0x41; }
static u16 getBallModelIdx() { return 0x25; }
static u16 getBallBtkIdx() { return 0x49; }
static u16 getBallBrkIdx() { return 0x41; }
bool checkRootTransClearMode() { return field_0x2f99 & 7; }
bool checkRootTransZClearMode() { return field_0x2f99 & 4; }
@@ -3828,6 +3828,8 @@ public:
u16 getReadyItem() { return dComIfGp_getSelectItem(mSelectItemId); }
static u32 getOtherHeapSize() { return 0xF0A60; }
static daAlink_BckData const m_mainBckShield[20];
static daAlink_BckData const m_mainBckSword[5];
static daAlink_BckData const m_mainBckFishing[28];
+1 -1
View File
@@ -56,7 +56,7 @@ public:
}
int create() {
fopAcM_SetupActor(this, daGuardMng_c);
fopAcM_ct(this, daGuardMng_c);
create_init();
return cPhs_COMPLEATE_e;
}
+2
View File
@@ -391,6 +391,8 @@ public:
onStateFlg0(daMidna_FLG0(FLG0_PORTAL_OBJ_CALL | FLG0_TAG_WAIT));
}
static u32 getOtherHeapSize() { return 0x1D0; }
static daMidna_texData_s const m_texDataTable[21];
static daMidna_anmData_s const m_anmDataTable[53];
+1 -1
View File
@@ -6,7 +6,7 @@
class daTagArena_c : public fopAc_ac_c {
public:
int create() {
fopAcM_SetupActor(this, daTagArena_c);
fopAcM_ct(this, daTagArena_c);
return cPhs_COMPLEATE_e;
}
+1 -1
View File
@@ -11,7 +11,7 @@ public:
}
int create() {
fopAcM_SetupActor(this, daTagAssist_c);
fopAcM_ct(this, daTagAssist_c);
create_init();
return cPhs_COMPLEATE_e;
}
+1 -1
View File
@@ -14,7 +14,7 @@ public:
u8 getSwBit2() { return fopAcM_GetParam(this) >> 16; }
int create() {
fopAcM_SetupActor(this, daTag_Chk_c);
fopAcM_ct(this, daTag_Chk_c);
if (getAreaType() == 0) {
scale.x *= 50.0f;
+1 -1
View File
@@ -30,7 +30,7 @@ public:
}
int create() {
fopAcM_SetupActor(this, daTagGra_c);
fopAcM_ct(this, daTagGra_c);
if (getMode() == 2) {
if (dComIfGs_isSwitch(getSwBit(),fopAcM_GetRoomNo(this))) {
+1 -1
View File
@@ -6,7 +6,7 @@
class daTagSchedule_c : public fopAc_ac_c {
public:
int create() {
fopAcM_SetupActor(this, daTagSchedule_c);
fopAcM_ct(this, daTagSchedule_c);
return cPhs_COMPLEATE_e;
}
+1 -1
View File
@@ -68,7 +68,7 @@ public:
}
int create() {
fopAcM_SetupActor(this, daTagTheBHint_c);
fopAcM_ct(this, daTagTheBHint_c);
field_0x568 = pow(scale.x * 100.0f,2.0f);
return cPhs_COMPLEATE_e;
}