mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-04 02:19:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

more misc. cleanup (#2232)

Browse Source
This commit is contained in:
Caroline Madsen
2024-10-31 20:36:11 -04:00
committed by GitHub
parent 30777a85b5
commit 09423b6fa0
121 changed files with 2254 additions and 17343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alldie.cpp
+4 -8
View File
@@ -24,9 +24,7 @@ int daAlldie_c::actionWait() {
/* 804D5838-804D5888 000098 0050+00 1/1 0/0 0/0 .text actionCheck__10daAlldie_cFv */
int daAlldie_c::actionCheck() {
s8 roomNo = fopAcM_GetRoomNo(this);
if (fopAcM_myRoomSearchEnemy(roomNo) == NULL) {
if (fopAcM_myRoomSearchEnemy(fopAcM_GetRoomNo(this)) == NULL) {
mAction = ACT_TIMER;
mTimer = 65;
}
@@ -36,9 +34,7 @@ int daAlldie_c::actionCheck() {
/* 804D5888-804D5938 0000E8 00B0+00 1/1 0/0 0/0 .text actionTimer__10daAlldie_cFv */
int daAlldie_c::actionTimer() {
s8 roomNo = fopAcM_GetRoomNo(this);
if (fopAcM_myRoomSearchEnemy(roomNo) != NULL) {
if (fopAcM_myRoomSearchEnemy(fopAcM_GetRoomNo(this)) != NULL) {
mAction = ACT_CHECK;
} else {
if (mTimer > 0) {
@@ -165,7 +161,7 @@ int daAlldie_c::create() {
s8 roomNo = fopAcM_GetRoomNo(this);
if (!dComIfGs_isSwitch(getSwbit(), roomNo)) {
if (!dComIfGs_isSwitch(getSwbit(), fopAcM_GetRoomNo(this))) {
mAction = ACT_CHECK;
} else {
mAction = ACT_WAIT;
@@ -222,4 +218,4 @@ extern actor_process_profile_definition g_profile_ALLDIE = {
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
};
};
src/d/actor/d_a_arrow.cpp
+65 -1194
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_b_oh2.cpp
+2 -3
View File
@@ -161,8 +161,7 @@ static void action(b_oh2_class* i_this) {
mDoMtx_stack_c::XrotM(i_this->shape_angle.x);
i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
int roomNo = fopAcM_GetRoomNo(i_this);
i_this->mpMorf->play(0, dComIfGp_getReverb(roomNo));
i_this->mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
if (boss->speedF <= 1.0f) {
i_this->mpBrk->setFrame(0.0f);
@@ -326,4 +325,4 @@ extern actor_process_profile_definition g_profile_B_OH2 = {
0x44000,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_do.cpp
+2 -2
View File
@@ -2572,7 +2572,7 @@ static cPhs__Step daDo_Create(fopAc_ac_c* i_this) {
fopAcM_OnStatus(i_this, fopAcStts_CULL_e);
fopAcM_OnCarryType(i_this, fopAcM_CARRY_TYPE_8);
i_this->attention_info.flags = 0;
i_this->attention_info.distances[fopAc_attn_SPEAK_e] = 7;
i_this->attention_info.distances[fopAc_attn_CARRY_e] = 7;
fopAcM_SetMtx(i_this, _this->mpMorf->getModel()->getBaseTRMtx());
_this->mBgS_Acch.Set(fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this), i_this,
1, &_this->mBgS_AcchCir, fopAcM_GetSpeed_p(i_this), NULL, NULL);
@@ -2824,4 +2824,4 @@ extern actor_process_profile_definition g_profile_DO = {
0x8044000,
fopAc_NPC_e,
fopAc_CULLBOX_0_e,
};
};
src/d/actor/d_a_door_boss.cpp
+3 -5
View File
@@ -266,9 +266,8 @@ void daBdoor_c::calcGoal(cXyz* i_goalP, int param_1) {
void daBdoor_c::smokeInit() {
mParticlePos = current.pos;
mParticleAngle = shape_angle;
s32 room = fopAcM_GetRoomNo(this);
dComIfGp_particle_setPolyColor(0x8156, mAcch.m_gnd, &mParticlePos, &tevStr, &mParticleAngle,
NULL, 0, NULL, room, NULL);
NULL, 0, NULL, fopAcM_GetRoomNo(this), NULL);
}
/* 806700C4-806701F4 000D24 0130+00 1/1 0/0 0/0 .text checkArea__9daBdoor_cFv */
@@ -297,8 +296,7 @@ BOOL daBdoor_c::checkFront() {
/* 80670294-80670320 000EF4 008C+00 1/1 0/0 0/0 .text checkOpen__9daBdoor_cFv */
BOOL daBdoor_c::checkOpen() {
// Fake Match - should be daPy_py_c::i_checkNowWolf
if (dComIfGp_getLinkPlayer()->mNoResetFlg1 & daPy_py_c::FLG1_IS_WOLF) {
if (daPy_py_c::i_checkNowWolf()) {
return false;
}
if (!dComIfGs_isDungeonItemBossKey()) {
@@ -479,4 +477,4 @@ extern actor_process_profile_definition g_profile_BOSS_DOOR = {
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
};
};
src/d/actor/d_a_door_bossL1.cpp
+15 -46
View File
@@ -379,9 +379,8 @@ int daBdoorL1_c::create() {
shape_angle.x = 0;
current.angle.z = 0;
current.angle.x = 0;
s32 roomNo = fopAcM_GetRoomNo(this);
u32 swBit = door_param2_c::getSwbit(this);
if (dComIfGs_isSwitch(swBit, roomNo) == 0 && dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) {
if (!dComIfGs_isSwitch(door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this))
&& dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) {
createKey();
} else {
mKeyHoleId = -1;
@@ -407,7 +406,7 @@ void daBdoorL1_c::demoProc() {
cXyz cStack_38;
if (dComIfGp_evmng_getIsAddvance(field_0x5a0)) {
switch (demoAction) {
case 0:
case 0: {
int* puVar3 = dComIfGp_evmng_getMyIntegerP(field_0x5a0, "Timer");
if (puVar3 == NULL) {
field_0x5a4 = 1;
@@ -415,6 +414,7 @@ void daBdoorL1_c::demoProc() {
field_0x5a4 = *puVar3;
}
break;
}
case 1:
field_0x59a = 5;
break;
@@ -483,12 +483,13 @@ void daBdoorL1_c::demoProc() {
dComIfGp_evmng_cutEnd(field_0x5a0);
}
break;
case 2:
case 2: {
obj_keyhole_class* keyhole = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId);
if ((keyhole != NULL && keyhole->checkOpenEnd()) || mKeyHoleId == -1) {
dComIfGp_evmng_cutEnd(field_0x5a0);
}
break;
}
case 3:
if (openProc() != 0) {
openEnd();
@@ -561,46 +562,15 @@ void daBdoorL1_c::demoProc() {
}
}
/* 804E4A6C-804E4A74 000058 0006+02 0/1 0/0 0/0 .rodata l_lv1_eff$4252 */
static u16 const l_lv1_eff[3] = {
0x8C42,
0x8C43,
0x8C44,
};
/* 804E4A74-804E4A7C 000060 0006+02 0/1 0/0 0/0 .rodata l_lv2_eff$4253 */
static u16 const l_lv2_eff[3] = {
0x8C45,
0x8C46,
0x8C47,
};
/* 804E4A7C-804E4A80 000068 0004+00 0/1 0/0 0/0 .rodata l_lv4_eff_a$4254 */
static u16 const l_lv4_eff_a[2] = {
0x8C48,
0x8C49,
};
/* 804E4A80-804E4A84 00006C 0004+00 0/1 0/0 0/0 .rodata l_lv4_eff_b$4255 */
static u16 const l_lv4_eff_b[2] = {
0x8C4A,
0x8C4B,
};
/* 804E4A84-804E4A88 000070 0004+00 0/1 0/0 0/0 .rodata l_lv6_eff_a$4256 */
static u16 const l_lv6_eff_a[2] = {
0x8C4C,
0x8C4D,
};
/* 804E4A88-804E4A8C 000074 0004+00 0/1 0/0 0/0 .rodata l_lv6_eff_b$4257 */
static u16 const l_lv6_eff_b[2] = {
0x8C4E,
0x8C4F,
};
/* 804E3180-804E357C 001460 03FC+00 1/1 0/0 0/0 .text openInit__11daBdoorL1_cFv */
int daBdoorL1_c::openInit() {
static u16 const l_lv1_eff[3] = {0x8C42, 0x8C43, 0x8C44};
static u16 const l_lv2_eff[3] = {0x8C45, 0x8C46, 0x8C47};
static u16 const l_lv4_eff_a[2] = {0x8C48, 0x8C49};
static u16 const l_lv4_eff_b[2] = {0x8C4A, 0x8C4B};
static u16 const l_lv6_eff_a[2] = {0x8C4C, 0x8C4D};
static u16 const l_lv6_eff_b[2] = {0x8C4E, 0x8C4F};
u32 i;
if (field_0x590->ChkUsed()) {
dComIfG_Bgsp().Release(field_0x590);
@@ -764,9 +734,8 @@ int daBdoorL1_c::closeProc() {
field_0x7d0.y += 10.0f;
field_0x5ac.CrrPos(dComIfG_Bgsp());
cXyz cStack_34(1.65f, 1.65f, 1.65f);
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_setPolyColor(0x8c50, field_0x5ac.m_gnd, &current.pos, &tevStr,
&shape_angle, &cStack_34, 0, 0, roomNo,
&shape_angle, &cStack_34, 0, 0, fopAcM_GetRoomNo(this),
0);
break;
}
@@ -1096,4 +1065,4 @@ extern actor_process_profile_definition g_profile_L1BOSS_DOOR = {
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
};
};
src/d/actor/d_a_door_bossL5.cpp
+5 -8
View File
@@ -171,9 +171,8 @@ int daBdoorL5_c::create() {
if (rv != cPhs_COMPLEATE_e) {
return rv;
}
s32 roomNo = fopAcM_GetRoomNo(this);
u32 swBit = door_param2_c::getSwbit(this);
if (dComIfGs_isSwitch(swBit, roomNo) == 0 && dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) {
if (!dComIfGs_isSwitch(door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this))
&& dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) {
createKey();
} else {
mKeyHoleId = -1;
@@ -361,9 +360,8 @@ void daBdoorL5_c::calcGoal(cXyz* param_1, int param_2) {
void daBdoorL5_c::smokeInit() {
field_0x5a4 = current.pos;
field_0x5b0 = shape_angle;
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_setPolyColor(0x8156, field_0x5b8.m_gnd, &field_0x5a4, &tevStr, &field_0x5b0,
0, 0, 0, roomNo, 0);
0, 0, 0, fopAcM_GetRoomNo(this), 0);
}
/* 80671B14-80671C14 000F54 0100+00 1/1 0/0 0/0 .text createKey__11daBdoorL5_cFv */
@@ -414,8 +412,7 @@ int daBdoorL5_c::checkFront() {
/* 80671DE4-80671E70 001224 008C+00 1/1 0/0 0/0 .text checkOpen__11daBdoorL5_cFv */
int daBdoorL5_c::checkOpen() {
// Fake Match - should be daPy_py_c::i_checkNowWolf
if (dComIfGp_getLinkPlayer()->mNoResetFlg1 & daPy_py_c::FLG1_IS_WOLF) {
if (daPy_py_c::i_checkNowWolf()) {
return 0;
}
@@ -583,4 +580,4 @@ extern actor_process_profile_definition g_profile_L5BOSS_DOOR = {
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
};
};
src/d/actor/d_a_door_mbossL1.cpp
+6 -11
View File
@@ -981,27 +981,24 @@ int daMBdoorL1_c::openInit() {
}
if (getDoorType() == 0) {
for (int i = 0; i < 2; i++) {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(
l_eff_id[i],
&current.pos, &acStack_3c, 0, 0xff, 0, roomNo, NULL, NULL, NULL);
&current.pos, &acStack_3c, 0, 0xff, 0, fopAcM_GetRoomNo(this), NULL, NULL, NULL);
}
} else {
if (getDoorType() == 1) {
for (u32 k = 0; k < 5; k++) {
switch (level) {
case 4: {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(
l_eff_id_lv4[k],
&current.pos, &acStack_3c, 0, 0xff, 0, roomNo, NULL, NULL, NULL);
&current.pos, &acStack_3c, 0, 0xff, 0, fopAcM_GetRoomNo(this), NULL, NULL, NULL);
break;
}
default: {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(
l_eff_id_lv3[k],
&current.pos, &acStack_3c, 0, 0xff, 0, roomNo, NULL, NULL, NULL);
&current.pos, &acStack_3c, 0, 0xff, 0, fopAcM_GetRoomNo(this), NULL, NULL, NULL);
break;
}
}
@@ -1357,9 +1354,8 @@ void daMBdoorL1_c::smokeInit2() {
field_0x81c.y -= 10.0f;
field_0x828.y += 10.0f;
field_0x604.CrrPos(dComIfG_Bgsp());
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_setPolyColor(0x8c50, field_0x604.m_gnd, &current.pos, &tevStr,
&shape_angle, NULL, 0, NULL, roomNo, 0);
&shape_angle, NULL, 0, NULL, fopAcM_GetRoomNo(this), 0);
}
}
@@ -1541,8 +1537,7 @@ int daMBdoorL1_c::startDemoEnd() {
f32 fVar1 = dVar12 < 0.0f ? 180.0f : -180.0f;
cXyz cStack_88(current.pos.x - fVar1 * local_70.x, current.pos.y,
current.pos.z - fVar1 * local_70.z);
s32 roomNo = fopAcM_GetRoomNo(player);
dComIfGs_setRestartRoom(cStack_88, dVar12 > 0.0f ? current.angle.y : (s16)(current.angle.y + 0x8000), roomNo);
dComIfGs_setRestartRoom(cStack_88, dVar12 > 0.0f ? current.angle.y : (s16)(current.angle.y + 0x8000), fopAcM_GetRoomNo(player));
return 1;
}
@@ -1560,7 +1555,7 @@ int daMBdoorL1_c::checkMBossRoom() {
int daMBdoorL1_c::checkStopClose() {
u8 FRoomNo = door_param2_c::getFRoomNo(this);
door_param2_c::getFRoomNo(this);
s32 roomNo = fopAcM_GetRoomNo(this);
s8 roomNo = fopAcM_GetRoomNo(this);
if (mDoorStop.mModel == NULL) {
return 0;
}
src/d/actor/d_a_door_shutter.cpp
+8 -17
View File
@@ -279,8 +279,7 @@ void daDoor20_c::setEventPrm() {
}
if (chkMakeKey()) {
if (field_0x5f0) {
// FAKE MATCH: should be daPy_py_c::i_checkNowWolf
if (((daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR))->checkWolf()) {
if (daPy_py_c::i_checkNowWolf()) {
if (dComIfGs_getKeyNum() == 0) {
return;
}
@@ -446,13 +445,11 @@ void daDoor20_c::openInit_0() {
csXyz acStack_2c(0, field_0x670, 0);
for (u32 i = 0; i < 5; i++) {
if (strcmp(dComIfGp_getStartStageName(), "D_MN10") == 0) {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(l_eff_id_lv4[i],
&current.pos, &acStack_2c, NULL, 0xff, NULL, roomNo, NULL, NULL, NULL);
dComIfGp_particle_set(l_eff_id_lv4[i], &current.pos, &acStack_2c, NULL, 0xff, NULL,
fopAcM_GetRoomNo(this), NULL, NULL, NULL);
} else {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(l_eff_id_lv3[i],
&current.pos, &acStack_2c, NULL, 0xff, NULL, roomNo, NULL, NULL, NULL);
dComIfGp_particle_set(l_eff_id_lv3[i], &current.pos, &acStack_2c, NULL, 0xff, NULL,
fopAcM_GetRoomNo(this), NULL, NULL, NULL);
}
}
fopAcM_onSwitch(this, bVar5);
@@ -462,12 +459,6 @@ void daDoor20_c::openInit_0() {
}
}
/* 80466864-80466868 000044 0004+00 1/1 0/0 0/0 .rodata l_eff_id$4449 */
static u16 const l_eff_id[2] = {
0x8295,
0x8296,
};
/* 80461D24-80461EC4 001264 01A0+00 1/1 0/0 0/0 .text openInit_1__10daDoor20_cFv */
void daDoor20_c::openInit_1() {
J3DAnmTransform* anm;
@@ -481,10 +472,10 @@ void daDoor20_c::openInit_1() {
JUT_ASSERT(918, rt == 0);
u8 bVar5 = door_param2_c::getSwbit3(this);
if (bVar5 != 0xff && !fopAcM_isSwitch(this, bVar5)) {
static u16 const l_eff_id[2] = {0x8295, 0x8296};
for (int i = 0; i < 2; i++) {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(l_eff_id[i], &current.pos, &shape_angle, NULL, 0xff, NULL,
roomNo, NULL, NULL, NULL);
fopAcM_GetRoomNo(this), NULL, NULL, NULL);
}
fopAcM_onSwitch(this, bVar5);
field_0x672 = true;
@@ -2289,4 +2280,4 @@ extern actor_process_profile_definition g_profile_DOOR20 = {
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
};
src/d/actor/d_a_dshutter.cpp
+29 -421
View File
@@ -5,150 +5,27 @@
#include "d/actor/d_a_dshutter.h"
#include "SSystem/SComponent/c_math.h"
#include "Z2AudioLib/Z2Instances.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" void callInit__7daDsh_cFv();
extern "C" void callExecute__7daDsh_cFv();
extern "C" void initOpenWait__7daDsh_cFv();
extern "C" void executeOpenWait__7daDsh_cFv();
extern "C" void initOpen__7daDsh_cFv();
extern "C" void executeOpen__7daDsh_cFv();
extern "C" void initCloseWait__7daDsh_cFv();
extern "C" void executeCloseWait__7daDsh_cFv();
extern "C" void initClose__7daDsh_cFv();
extern "C" void executeClose__7daDsh_cFv();
extern "C" s16 func_80467DF8(s16*);
//
// External References:
//
//
// Declarations:
//
/* ############################################################################################## */
/* 80467F5C-80467F68 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80467F68-80467F7C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
#pragma push
#pragma force_active on
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
0x00000000,
0x3FE00000,
0x00000000,
};
#pragma pop
UNK_REL_DATA
/* 80467F7C-80467F88 -00001 000C+00 2/2 0/0 0/0 .data l_arcName */
SECTION_DATA static char* l_arcName[] = {
static char* l_arcName[] = {
"K_tetd",
"S_bsaku00",
"S_lv7saku",
};
/* 80467F88-80467F94 -00001 000C+00 0/1 0/0 0/0 .data @3631 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3631[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)initOpenWait__7daDsh_cFv,
};
#pragma pop
/* 80467F94-80467FA0 -00001 000C+00 0/1 0/0 0/0 .data @3632 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3632[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)executeOpenWait__7daDsh_cFv,
};
#pragma pop
/* 80467FA0-80467FAC -00001 000C+00 0/1 0/0 0/0 .data @3635 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3635[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)initOpen__7daDsh_cFv,
};
#pragma pop
/* 80467FAC-80467FB8 -00001 000C+00 0/1 0/0 0/0 .data @3636 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3636[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)executeOpen__7daDsh_cFv,
};
#pragma pop
/* 80467FB8-80467FC4 -00001 000C+00 0/1 0/0 0/0 .data @3639 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3639[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)initCloseWait__7daDsh_cFv,
};
#pragma pop
/* 80467FC4-80467FD0 -00001 000C+00 0/1 0/0 0/0 .data @3640 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3640[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)executeCloseWait__7daDsh_cFv,
};
#pragma pop
/* 80467FD0-80467FDC -00001 000C+00 0/1 0/0 0/0 .data @3643 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3643[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)initClose__7daDsh_cFv,
};
#pragma pop
/* 80467FDC-80467FE8 -00001 000C+00 0/1 0/0 0/0 .data @3644 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3644[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)executeClose__7daDsh_cFv,
};
#pragma pop
/* 80467498-8046751C 000078 0084+00 1/1 0/0 0/0 .text __dt__7daDsh_cFv */
daDsh_c::~daDsh_c() {}
/* ############################################################################################## */
/* 80467F04-80467F10 000000 000C+00 2/2 0/0 0/0 .rodata l_bmd */
SECTION_RODATA static int const l_bmd[] = {
static int const l_bmd[] = {
4,
4,
4,
};
COMPILER_STRIP_GATE(0x80467F04, &l_bmd);
/* 8046751C-8046759C 0000FC 0080+00 1/0 0/0 0/0 .text CreateHeap__7daDsh_cFv */
int daDsh_c::CreateHeap() {
@@ -178,7 +55,7 @@ int daDsh_c::Execute(f32 (**param_0)[3][4]) {
callExecute();
setMtx();
*param_0 = &mBgMtx;
func_80467DF8(&mTiltTime);
cLib_calcTimer(&mTiltTime);
return 1;
}
@@ -221,105 +98,28 @@ int daDsh_c::initOpenWait() {
return 1;
}
/* ############################################################################################## */
/* 80468070-80468074 000000 0001+03 1/1 0/0 0/0 .bss @1109 */
static u8 lit_1109[1 + 3 /* padding */];
/* 80468074-80468078 000004 0001+03 0/0 0/0 0/0 .bss @1107 */
#pragma push
#pragma force_active on
static u8 lit_1107[1 + 3 /* padding */];
#pragma pop
/* 80468078-8046807C 000008 0001+03 0/0 0/0 0/0 .bss @1105 */
#pragma push
#pragma force_active on
static u8 lit_1105[1 + 3 /* padding */];
#pragma pop
/* 8046807C-80468080 00000C 0001+03 0/0 0/0 0/0 .bss @1104 */
#pragma push
#pragma force_active on
static u8 lit_1104[1 + 3 /* padding */];
#pragma pop
/* 80468080-80468084 000010 0001+03 0/0 0/0 0/0 .bss @1099 */
#pragma push
#pragma force_active on
static u8 lit_1099[1 + 3 /* padding */];
#pragma pop
/* 80468084-80468088 000014 0001+03 0/0 0/0 0/0 .bss @1097 */
#pragma push
#pragma force_active on
static u8 lit_1097[1 + 3 /* padding */];
#pragma pop
/* 80468088-8046808C 000018 0001+03 0/0 0/0 0/0 .bss @1095 */
#pragma push
#pragma force_active on
static u8 lit_1095[1 + 3 /* padding */];
#pragma pop
/* 8046808C-80468090 00001C 0001+03 0/0 0/0 0/0 .bss @1094 */
#pragma push
#pragma force_active on
static u8 lit_1094[1 + 3 /* padding */];
#pragma pop
/* 80468090-80468094 000020 0001+03 0/0 0/0 0/0 .bss @1057 */
#pragma push
#pragma force_active on
static u8 lit_1057[1 + 3 /* padding */];
#pragma pop
/* 80468094-80468098 000024 0001+03 0/0 0/0 0/0 .bss @1055 */
#pragma push
#pragma force_active on
static u8 lit_1055[1 + 3 /* padding */];
#pragma pop
/* 80468098-8046809C 000028 0001+03 0/0 0/0 0/0 .bss @1053 */
#pragma push
#pragma force_active on
static u8 lit_1053[1 + 3 /* padding */];
#pragma pop
/* 8046809C-804680A0 00002C 0001+03 0/0 0/0 0/0 .bss @1052 */
#pragma push
#pragma force_active on
static u8 lit_1052[1 + 3 /* padding */];
#pragma pop
/* 804680A0-804680A4 000030 0001+03 0/0 0/0 0/0 .bss @1014 */
#pragma push
#pragma force_active on
static u8 lit_1014[1 + 3 /* padding */];
#pragma pop
/* 804680A4-804680A8 000034 0001+03 0/0 0/0 0/0 .bss @1012 */
#pragma push
#pragma force_active on
static u8 lit_1012[1 + 3 /* padding */];
#pragma pop
/* 804680A8-804680AC 000038 0001+03 0/0 0/0 0/0 .bss @1010 */
#pragma push
#pragma force_active on
static u8 lit_1010[1 + 3 /* padding */];
#pragma pop
/* 804680AC-804680B0 00003C 0001+03 0/0 0/0 0/0 .bss @1009 */
#pragma push
#pragma force_active on
static u8 lit_1009[1 + 3 /* padding */];
#pragma pop
UNK_BSS(1109)
UNK_BSS(1107)
UNK_BSS(1105)
UNK_BSS(1104)
UNK_BSS(1099)
UNK_BSS(1097)
UNK_BSS(1095)
UNK_BSS(1094)
UNK_BSS(1057)
UNK_BSS(1055)
UNK_BSS(1053)
UNK_BSS(1052)
UNK_BSS(1014)
UNK_BSS(1012)
UNK_BSS(1010)
UNK_BSS(1009)
/* 804680B0-804680C8 000040 0018+00 2/3 0/0 0/0 .bss l_openWaitAction */
static daDsh_c::action_c l_openWaitAction /* (&daDsh_c::initOpenWait, &daDsh_c::executeOpenWait) */;
static daDsh_c::action_c l_openWaitAction(&daDsh_c::initOpenWait, &daDsh_c::executeOpenWait);
/* 804680C8-804680E0 000058 0018+00 1/2 0/0 0/0 .bss l_openAction */
static daDsh_c::action_c l_openAction /* (&daDsh_c::initOpen, &daDsh_c::executeOpen) */;
static daDsh_c::action_c l_openAction(&daDsh_c::initOpen, &daDsh_c::executeOpen);
/* 804677E4-80467840 0003C4 005C+00 1/0 0/0 0/0 .text executeOpenWait__7daDsh_cFv */
int daDsh_c::executeOpenWait() {
@@ -330,14 +130,11 @@ int daDsh_c::executeOpenWait() {
return 1;
}
/* ############################################################################################## */
/* 80467F10-80467F1C 00000C 000C+00 1/1 0/0 0/0 .rodata l_dzb */
SECTION_RODATA static int const l_dzb[] = {7, 7, 7};
COMPILER_STRIP_GATE(0x80467F10, &l_dzb);
static int const l_dzb[] = {7, 7, 7};
/* 80467F1C-80467F28 000018 000C+00 1/1 0/0 0/0 .rodata l_heap_size */
SECTION_RODATA static u32 const l_heap_size[] = {0xC10, 0xC10, 0x3D60};
COMPILER_STRIP_GATE(0x80467F1C, &l_heap_size);
static u32 const l_heap_size[] = {0xC10, 0xC10, 0x3D60};
/* 80467840-80467988 000420 0148+00 1/0 0/0 0/0 .text initOpen__7daDsh_cFv */
int daDsh_c::initOpen() {
@@ -359,8 +156,7 @@ int daDsh_c::initOpen() {
}
/* 804680E0-804680F8 000070 0018+00 2/3 0/0 0/0 .bss l_closeWaitAction */
static daDsh_c::action_c
l_closeWaitAction /* (&daDsh_c::initCloseWait, &daDsh_c::executeCloseWait) */;
static daDsh_c::action_c l_closeWaitAction(&daDsh_c::initCloseWait, &daDsh_c::executeCloseWait);
/* 80467988-80467A64 000568 00DC+00 1/0 0/0 0/0 .text executeOpen__7daDsh_cFv */
int daDsh_c::executeOpen() {
@@ -392,9 +188,8 @@ int daDsh_c::initCloseWait() {
return 1;
}
/* ############################################################################################## */
/* 804680F8-80468110 000088 0018+00 1/2 0/0 0/0 .bss l_closeAction */
static daDsh_c::action_c l_closeAction /* (&daDsh_c::initClose, &daDsh_c::executeClose) */;
static daDsh_c::action_c l_closeAction(&daDsh_c::initClose, &daDsh_c::executeClose);
/* 80467A80-80467ADC 000660 005C+00 1/0 0/0 0/0 .text executeCloseWait__7daDsh_cFv */
int daDsh_c::executeCloseWait() {
@@ -459,180 +254,7 @@ static int daDsh_Delete(daDsh_c* i_this) {
return ret;
}
/* ############################################################################################## */
/* 80468110-80468114 0000A0 0004+00 0/0 0/0 0/0 .bss
* sInstance__40JASGlobalInstance<19JASDefaultBankTable> */
#pragma push
#pragma force_active on
static u8 data_80468110[4];
#pragma pop
/* 80468114-80468118 0000A4 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14JASAudioThread> */
#pragma push
#pragma force_active on
static u8 data_80468114[4];
#pragma pop
/* 80468118-8046811C 0000A8 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */
#pragma push
#pragma force_active on
static u8 data_80468118[4];
#pragma pop
/* 8046811C-80468120 0000AC 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */
#pragma push
#pragma force_active on
static u8 data_8046811C[4];
#pragma pop
/* 80468120-80468124 0000B0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80468120[4];
#pragma pop
/* 80468124-80468128 0000B4 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80468124[4];
#pragma pop
/* 80468128-8046812C 0000B8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys>
*/
#pragma push
#pragma force_active on
static u8 data_80468128[4];
#pragma pop
/* 8046812C-80468130 0000BC 0004+00 0/0 0/0 0/0 .bss
* sInstance__36JASGlobalInstance<15JAISoundStarter> */
#pragma push
#pragma force_active on
static u8 data_8046812C[4];
#pragma pop
/* 80468130-80468134 0000C0 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14Z2SoundStarter> */
#pragma push
#pragma force_active on
static u8 data_80468130[4];
#pragma pop
/* 80468134-80468138 0000C4 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */
#pragma push
#pragma force_active on
static u8 data_80468134[4];
#pragma pop
/* 80468138-8046813C 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */
#pragma push
#pragma force_active on
static u8 data_80468138[4];
#pragma pop
/* 8046813C-80468140 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */
#pragma push
#pragma force_active on
static u8 data_8046813C[4];
#pragma pop
/* 80468140-80468144 0000D0 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAIStreamMgr> */
#pragma push
#pragma force_active on
static u8 data_80468140[4];
#pragma pop
/* 80468144-80468148 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80468144[4];
#pragma pop
/* 80468148-8046814C 0000D8 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAISoundInfo> */
#pragma push
#pragma force_active on
static u8 data_80468148[4];
#pragma pop
/* 8046814C-80468150 0000DC 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13JAUSoundTable> */
#pragma push
#pragma force_active on
static u8 data_8046814C[4];
#pragma pop
/* 80468150-80468154 0000E0 0004+00 0/0 0/0 0/0 .bss
* sInstance__38JASGlobalInstance<17JAUSoundNameTable> */
#pragma push
#pragma force_active on
static u8 data_80468150[4];
#pragma pop
/* 80468154-80468158 0000E4 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAUSoundInfo> */
#pragma push
#pragma force_active on
static u8 data_80468154[4];
#pragma pop
/* 80468158-8046815C 0000E8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo>
*/
#pragma push
#pragma force_active on
static u8 data_80468158[4];
#pragma pop
/* 8046815C-80468160 0000EC 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */
#pragma push
#pragma force_active on
static u8 data_8046815C[4];
#pragma pop
/* 80468160-80468164 0000F0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience>
*/
#pragma push
#pragma force_active on
static u8 data_80468160[4];
#pragma pop
/* 80468164-80468168 0000F4 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80468164[4];
#pragma pop
/* 80468168-8046816C 0000F8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80468168[4];
#pragma pop
/* 8046816C-80468170 0000FC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr>
*/
#pragma push
#pragma force_active on
static u8 data_8046816C[4];
#pragma pop
/* 80468170-80468174 000100 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */
#pragma push
#pragma force_active on
static u8 data_80468170[4];
#pragma pop
/* 80468174-80468178 000104 0004+00 1/1 0/0 0/0 .bss None */
static s8 data_80468174[4];
AUDIO_INSTANCES;
/* 80467C7C-80467DF8 00085C 017C+00 1/0 0/0 0/0 .text daDsh_Create__FP10fopAc_ac_c */
int daDsh_c::create() {
@@ -664,20 +286,6 @@ static int daDsh_Create(fopAc_ac_c* i_this) {
return static_cast<daDsh_c*>(i_this)->create();
}
/* 80467DF8-80467E14 0009D8 001C+00 1/1 0/0 0/0 .text cLib_calcTimer<s>__FPs */
extern "C" s16 func_80467DF8(s16* param_0) {
// NONMATCHING
}
/* 80467E14-80467EF8 0009F4 00E4+00 0/0 1/0 0/0 .text __sinit_d_a_dshutter_cpp */
void __sinit_d_a_dshutter_cpp(){// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x80467E14, __sinit_d_a_dshutter_cpp);
#pragma pop
/* 80467FF0-80468010 -00001 0020+00 1/0 0/0 0/0 .data l_daDsh_Method */
static actor_method_class l_daDsh_Method = {
(process_method_func)daDsh_Create, (process_method_func)daDsh_Delete,
@@ -704,4 +312,4 @@ extern actor_process_profile_definition2 g_profile_DSHUTTER = {
fopAc_CULLBOX_0_e, // cullType
},
0,
};
};
src/d/actor/d_a_e_ba.cpp
+40 -817
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_e_fz.cpp
+2 -95
View File
@@ -6,108 +6,15 @@
*/
#include "d/actor/d_a_e_fz.h"
UNK_REL_DATA
#include "f_op/f_op_actor_enemy.h"
#include "d/actor/d_a_mirror.h"
#include "d/actor/d_a_b_yo.h"
#include "d/d_com_inf_game.h"
#include "d/d_item.h"
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_midna.h"
#include "SSystem/SComponent/c_math.h"
#include "SSystem/SComponent/c_xyz.h"
static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
0x00000000,
0x3FE00000,
0x00000000,
};
/* 806C14D4-806C18E8 002C74 0414+00 1/1 0/0 0/0 .text
* setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz */
// NONMATCHING
// gave up on this one, it's a mess.
// it appears to be actually defined in f_op_actor header and is in ~60 enemy actor TUs
// so needs to be solved eventually
// bind_id issue + regalloc (could be related)
static int setMidnaBindEffect(fopEn_enemy_c* i_actorP, Z2CreatureEnemy* i_creatureP, cXyz* i_pos,
cXyz* i_scale) {
static GXColor e_prim[2] = {
{0xFF, 0x78, 0x00, 0x00},
{0xFF, 0x64, 0x78, 0x00},
};
static GXColor e_env[2] = {
{0x5A, 0x2D, 0x2D, 0x00},
{0x3C, 0x1E, 0x1E, 0x00},
};
int darkworld_check;
daPy_py_c* player_actor = daPy_getPlayerActorClass();
if (player_actor->getMidnaActor() && player_actor->checkWolfLock(i_actorP)) {
cXyz pos3;
if (dKy_darkworld_check()) {
darkworld_check = 1;
} else {
darkworld_check = 0;
}
if (i_actorP->getMidnaBindMode() == 0) {
i_actorP->setMidnaBindMode(1);
csXyz angle;
PSMTXCopy(player_actor->getMidnaActor()->getMtxHairTop(), mDoMtx_stack_c::get());
cXyz cStack_54(100.0f, 0.0f, 0.0f);
mDoMtx_stack_c::multVec(&cStack_54, &pos3);
cXyz pos = pos3 - *i_pos;
angle.y = cM_atan2s(pos.x, pos.z);
angle.x = -cM_atan2s(pos.y, JMAFastSqrt(pos.x * pos.x + pos.z * pos.z));
angle.z = 0;
s32 room_no = fopAcM_GetRoomNo(i_actorP);
JPABaseEmitter* emitter = dComIfGp_particle_set(
0x29b, i_pos, &i_actorP->tevStr, &angle, i_scale, 0xff, 0, room_no,
&e_prim[darkworld_check], &e_env[darkworld_check], 0);
if (emitter) {
emitter->setGlobalParticleHeightScale(0.01f * pos.abs());
}
room_no = fopAcM_GetRoomNo(i_actorP);
dComIfGp_particle_set(0x29c, i_pos, &i_actorP->tevStr, &i_actorP->shape_angle,
i_scale, 0xff, 0, room_no, &e_prim[darkworld_check],
&e_env[darkworld_check], 0);
i_creatureP->startCreatureSound(Z2SE_MIDNA_BIND_LOCK_ON, 0, -1);
}
static u16 eff_id[3] = {0x029D, 0x029E, 0x029F};
for (int i = 0; i < 3; i++) {
u32* bind_id = i_actorP->getMidnaBindID(i);
s32 room_no = fopAcM_GetRoomNo(i_actorP);
*bind_id = dComIfGp_particle_set(*bind_id, eff_id[i], i_pos, &i_actorP->tevStr,
&i_actorP->shape_angle, i_scale, 0xff, 0, room_no,
&e_prim[darkworld_check], &e_env[darkworld_check], 0);
}
i_creatureP->startCreatureSound(Z2SE_MIDNA_BIND_LOCK_SUS, 0, -1);
return 1;
}
i_actorP->setMidnaBindMode(0);
return 0;
}
namespace {
/* 806C1A38-806C1A78 000038 0040+00 1/1 0/0 0/0 .data cc_fz_src__22@unnamed@d_a_e_fz_cpp@
src/d/actor/d_a_e_vt.cpp
+1 -65
View File
@@ -8,75 +8,11 @@
#include "SSystem/SComponent/c_math.h"
#include "c/c_damagereaction.h"
#include "cmath.h"
#include "d/actor/d_a_midna.h"
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "d/d_camera.h"
// NONMATCHING load order and regalloc
static int setMidnaBindEffect(fopEn_enemy_c* i_enemy, Z2CreatureEnemy* i_sound,
cXyz* i_pos, cXyz* i_scale) {
static GXColor e_prim[2] = {
{0xFF, 0x78, 0x00, 0x00},
{0xFF, 0x64, 0x78, 0x00},
};
static GXColor e_env[2] = {
{0x5A, 0x2D, 0x2D, 0x00},
{0x3C, 0x1E, 0x1E, 0x00},
};
daPy_py_c* player = daPy_getPlayerActorClass();
if (player->getMidnaActor() != NULL && player->checkWolfLock(i_enemy)) {
cXyz local_48;
int world = dKy_darkworld_check() ? 1 : 0;
if (i_enemy->getMidnaBindMode() == 0) {
i_enemy->setMidnaBindMode(1);
csXyz angle;
MTXCopy(daPy_py_c::getMidnaActor()->getMtxHairTop(), mDoMtx_stack_c::get());
cXyz local_54(100.0f, 0.0f, 0.0f);
mDoMtx_stack_c::multVec(&local_54, &local_48);
cXyz local_60 = local_48 - *i_pos;
angle.y = cM_atan2s(local_60.x, local_60.z);
angle.x = -cM_atan2s(local_60.y,
JMAFastSqrt(local_60.x * local_60.x + local_60.z * local_60.z));
angle.z = 0;
JPABaseEmitter* emitter =
dComIfGp_particle_set(0x29B, i_pos, &i_enemy->tevStr, &angle, i_scale,
0xff, NULL, fopAcM_GetRoomNo(i_enemy),
&e_prim[world], &e_env[world], NULL);
if (emitter != NULL) {
emitter->setGlobalParticleHeightScale(0.01f * local_60.abs());
}
dComIfGp_particle_set(0x29C, i_pos, &i_enemy->tevStr, &i_enemy->shape_angle,
i_scale, 0xff, NULL, fopAcM_GetRoomNo(i_enemy),
&e_prim[world], &e_env[world], NULL);
i_sound->startCreatureSound(Z2SE_MIDNA_BIND_LOCK_ON, 0, -1);
}
static u16 eff_id[3] = {0x029D, 0x029E, 0x029F};
for (int i = 0; i < 3; i++) {
u32* bind_id = i_enemy->getMidnaBindID(i);
*bind_id = dComIfGp_particle_set(*bind_id, eff_id[i], i_pos, &i_enemy->tevStr,
&i_enemy->shape_angle, i_scale, 0xff, NULL,
fopAcM_GetRoomNo(i_enemy),
&e_prim[world], &e_env[world], NULL);
}
i_sound->startCreatureSoundLevel(Z2SE_MIDNA_BIND_LOCK_SUS, 0, -1);
return 1;
} else {
i_enemy->setMidnaBindMode(0);
return 0;
}
}
#include "f_op/f_op_actor_enemy.h"
#define WL_CUT_TYPE_SMALL 1
#define WL_CUT_TYPE_JUMP 2
src/d/actor/d_a_e_yk.cpp
+2 -81
View File
@@ -8,90 +8,11 @@
#include "d/actor/d_a_e_yk.h"
#include "c/c_damagereaction.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_midna.h"
#include "d/actor/d_a_player.h"
#include "d/d_s_play.h"
#include "dol2asm.h"
#include "SSystem/SComponent/c_math.h"
/* 80807D70-80807D7C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80807D7C-80807D90 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
0x00000000,
0x3FE00000,
0x00000000,
};
// NONMATCHING load order and regalloc
static int setMidnaBindEffect(fopEn_enemy_c* i_enemy, Z2CreatureEnemy* i_sound,
cXyz* i_pos, cXyz* i_scale) {
static GXColor e_prim[2] = {
{0xFF, 0x78, 0x00, 0x00},
{0xFF, 0x64, 0x78, 0x00},
};
static GXColor e_env[2] = {
{0x5A, 0x2D, 0x2D, 0x00},
{0x3C, 0x1E, 0x1E, 0x00},
};
daPy_py_c* player = daPy_getPlayerActorClass();
if (player->getMidnaActor() != NULL && player->checkWolfLock(i_enemy)) {
cXyz local_48;
int world = dKy_darkworld_check() ? 1 : 0;
if (i_enemy->getMidnaBindMode() == 0) {
i_enemy->setMidnaBindMode(1);
csXyz angle;
MTXCopy(daPy_py_c::getMidnaActor()->getMtxHairTop(), mDoMtx_stack_c::get());
cXyz local_54(100.0f, 0.0f, 0.0f);
mDoMtx_stack_c::multVec(&local_54, &local_48);
cXyz local_60 = local_48 - *i_pos;
angle.y = cM_atan2s(local_60.x, local_60.z);
angle.x = -cM_atan2s(local_60.y,
JMAFastSqrt(local_60.x * local_60.x + local_60.z * local_60.z));
angle.z = 0;
JPABaseEmitter* emitter =
dComIfGp_particle_set(0x29B, i_pos, &i_enemy->tevStr, &angle, i_scale,
0xff, NULL, fopAcM_GetRoomNo(i_enemy),
&e_prim[world], &e_env[world], NULL);
if (emitter != NULL) {
emitter->setGlobalParticleHeightScale(0.01f * local_60.abs());
}
dComIfGp_particle_set(0x29C, i_pos, &i_enemy->tevStr, &i_enemy->shape_angle,
i_scale, 0xff, NULL, fopAcM_GetRoomNo(i_enemy),
&e_prim[world], &e_env[world], NULL);
i_sound->startCreatureSound(Z2SE_MIDNA_BIND_LOCK_ON, 0, -1);
}
static u16 eff_id[3] = {0x029D, 0x029E, 0x029F};
for (int i = 0; i < 3; i++) {
u32* bind_id = i_enemy->getMidnaBindID(i);
*bind_id = dComIfGp_particle_set(*bind_id, eff_id[i], i_pos, &i_enemy->tevStr,
&i_enemy->shape_angle, i_scale, 0xff, NULL,
fopAcM_GetRoomNo(i_enemy),
&e_prim[world], &e_env[world], NULL);
}
i_sound->startCreatureSoundLevel(Z2SE_MIDNA_BIND_LOCK_SUS, 0, -1);
return 1;
} else {
i_enemy->setMidnaBindMode(0);
return 0;
}
}
UNK_REL_DATA
#include "f_op/f_op_actor_enemy.h"
/* 80807EF8-80807EFC 000008 0004+00 2/2 0/0 0/0 .bss None */
static u8 data_80807EF8;
src/d/actor/d_a_horse.cpp
+1 -33
View File
@@ -2460,38 +2460,6 @@ extern "C" void __dt__10cCcD_GSttsFv() {
// NONMATCHING
}
/* 80844B8C-80844B90 00CD4C 0004+00 3/0 0/0 0/0 .text
* setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform */
void J3DMtxCalc::setAnmTransform(u8 param_0, J3DAnmTransform* param_1) {
/* empty function */
}
/* 80844B90-80844B94 00CD50 0004+00 3/0 0/0 0/0 .text
* setAnmTransform__10J3DMtxCalcFP15J3DAnmTransform */
void J3DMtxCalc::setAnmTransform(J3DAnmTransform* param_0) {
/* empty function */
}
/* 80844B94-80844B9C 00CD54 0008+00 3/0 0/0 0/0 .text getAnmTransform__10J3DMtxCalcFUc */
J3DAnmTransform* J3DMtxCalc::getAnmTransform(u8 param_0) {
return NULL;
}
/* 80844B9C-80844BA4 00CD5C 0008+00 3/0 0/0 0/0 .text getAnmTransform__10J3DMtxCalcFv */
J3DAnmTransform* J3DMtxCalc::getAnmTransform() {
return NULL;
}
/* 80844BA4-80844BA8 00CD64 0004+00 3/0 0/0 0/0 .text setWeight__10J3DMtxCalcFUcf */
void J3DMtxCalc::setWeight(u8 param_0, f32 param_1) {
/* empty function */
}
/* 80844BA8-80844BB4 00CD68 000C+00 3/0 0/0 0/0 .text getWeight__10J3DMtxCalcCFUc */
void J3DMtxCalc::getWeight(u8 param_0) const {
// NONMATCHING
}
/* 80844BB4-80844BDC 00CD74 0028+00 1/0 0/0 0/0 .text
* init__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya>FRC3VecRA3_A4_Cf
*/
@@ -2827,4 +2795,4 @@ static u8 data_80845E10[4];
static u8 data_80845E14[4];
#pragma pop
/* 8084585C-8084585C 0003B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 8084585C-8084585C 0003B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_kytag12.cpp
+18 -932
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_myna.cpp
-2
View File
@@ -583,7 +583,6 @@ void daMyna_c::attack_fly_init() {
}
/* 80946BF4-80946D20 001074 012C+00 1/0 0/0 0/0 .text attack_fly_move__8daMyna_cFv */
// NONMATCHING regswap
void daMyna_c::attack_fly_move() {
if (daMyna_evtTagActor0 != NULL) {
cXyz var1(1.0f, 1.0f, 1.0f);
@@ -727,7 +726,6 @@ void daMyna_c::shopping_wait_init() {
}
/* 809471E8-809475B4 001668 03CC+00 1/0 0/0 0/0 .text shopping_wait_move__8daMyna_cFv */
// NONMATCHING regswap
void daMyna_c::shopping_wait_move() {
if (!daPy_py_c::i_checkNowWolf()) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
src/d/actor/d_a_nbomb.cpp
+58 -1338
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_obj_eff.cpp
+2 -3
View File
@@ -13,9 +13,8 @@ int daObjEff::Act_c::_create() {
fopAcM_SetupActor(this, Act_c);
if (daObj::PrmAbstract<Act_c::Prm_e>(this, PRM_8, PRM_0) == 3) {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_setColor(0x00E7, &current.pos, NULL, NULL, NULL, 0.0f, 55, NULL, &scale,
NULL, roomNo, &scale);
NULL, fopAcM_GetRoomNo(this), &scale);
}
return cPhs_ERROR_e;
@@ -84,4 +83,4 @@ extern actor_process_profile_definition g_profile_Obj_Eff = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
};
src/d/actor/d_a_obj_enemy_create.cpp
+3 -3
View File
@@ -36,11 +36,11 @@ void daObjE_CREATE_c::NormalAction() {
// this was probably supposed to be:
// "cLib_offsetPos(&current.pos, &current.pos, angle, &offsetPos)"
cLib_offsetPos(&offsetPos, &current.pos, angle, &offsetPos);
s8 roomNo = fopAcM_GetRoomNo(this);
mActorList[i] =
fopAcM_createChild(mEnemyProcName, fopAcM_GetID(this), mEnemyParams,
&current.pos, roomNo, &mEnemyAngle, NULL, -1, NULL);
&current.pos, fopAcM_GetRoomNo(this), &mEnemyAngle,
NULL, -1, NULL);
}
mActionMode++;
mKillCheckDelayTimer = 50;
@@ -285,4 +285,4 @@ extern actor_process_profile_definition g_profile_Obj_E_CREATE = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_obj_firepillar2.cpp
+7 -11
View File
@@ -121,12 +121,10 @@ int daObjFPillar2_c::Create() {
fopAcM_SetMtx(this, mMtx);
mSoundObj.init(&mSoundPos, 1);
if (getKind() == KIND_PIPE_FIRE) {
s32 roomNo = fopAcM_GetRoomNo(this);
field_0x980 = dComIfGp_particle_set(0x84df, &current.pos, &current.angle, 0, 0xff, 0,
roomNo, 0, 0, 0);
roomNo = fopAcM_GetRoomNo(this);
fopAcM_GetRoomNo(this), 0, 0, 0);
field_0x984 = dComIfGp_particle_set(0x84e0, &current.pos, &current.angle, 0, 0xff, 0,
roomNo, 0, 0, 0);
fopAcM_GetRoomNo(this), 0, 0, 0);
}
actionOffInit();
return 1;
@@ -322,16 +320,15 @@ void daObjFPillar2_c::actionOff() {
void daObjFPillar2_c::actionOnWaitInit() {
if (getKind() == KIND_PIPE_FIRE) {
for (int i = 0; i < 3; i++) {
s32 roomNo = fopAcM_GetRoomNo(this);
mPipeFireEmitters[i] = dComIfGp_particle_set(
l_pipe_fire_id[i], &current.pos, &current.angle, 0, 0xff, 0, roomNo, 0, 0, 0);
mPipeFireEmitters[i] = dComIfGp_particle_set(l_pipe_fire_id[i], &current.pos,
&current.angle, 0, 0xff, 0,
fopAcM_GetRoomNo(this), 0, 0, 0);
}
} else {
if (getKind() == KIND_MAGMA_POLE) {
for (int i = 0; i < 3; i++) {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_set(l_yogan_foot_id[i], &current.pos, &current.angle,
&mYoganScale, 0xff, 0, roomNo, 0, 0, 0);
&mYoganScale, 0xff, 0, fopAcM_GetRoomNo(this), 0, 0, 0);
}
}
}
@@ -373,10 +370,9 @@ void daObjFPillar2_c::actionOnWait() {
void daObjFPillar2_c::actionOnInit() {
if (getKind() == KIND_MAGMA_POLE) {
for (int i = 0; i < 3; i++) {
s32 roomNo = fopAcM_GetRoomNo((fopAc_ac_c*)this);
mMagmaPoleEmitters[i] = dComIfGp_particle_set(
l_yogan_head_id[getSize()][i],
&current.pos, &current.angle, 0, 0xff, 0, roomNo, 0, 0, 0);
&current.pos, &current.angle, 0, 0xff, 0, fopAcM_GetRoomNo(this), 0, 0, 0);
if (mMagmaPoleEmitters[i] != NULL) {
mMagmaPoleEmitters[i]->becomeImmortalEmitter();
mMagmaPoleEmitters[i]->setGlobalRTMatrix(mModel->getAnmMtx(0));
src/d/actor/d_a_obj_graWall.cpp
+2 -3
View File
@@ -12,8 +12,7 @@ int daObjGraWall_c::Create() {
field_0x6e0 = fopAcM_GetParam(this);
if (field_0x6e0 != 0xff) {
int roomNo = fopAcM_GetRoomNo(this);
if (dComIfGs_isSwitch(field_0x6e0, roomNo) != 0) {
if (dComIfGs_isSwitch(field_0x6e0, fopAcM_GetRoomNo(this)) != 0) {
return cPhs_ERROR_e;
}
} else {
@@ -129,4 +128,4 @@ extern actor_process_profile_definition g_profile_GRA_WALL = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_obj_hhashi.cpp
+15 -17
View File
@@ -13,25 +13,23 @@
#include "m_Do/m_Do_lib.h"
#include "SSystem/SComponent/c_math.h"
/* ############################################################################################## */
/* 805814AC-805814F0 000000 0044+00 10/10 0/0 0/0 .rodata ccCylSrc$3773 */
const static dCcD_SrcCyl ccCylSrc = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x100000, 0x1f}, 0x11}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
110.0f, // mRadius
158.0f // mHeight
} // mCyl
};
/* 8057F9B8-8057FA18 000078 0060+00 1/1 0/0 0/0 .text initCcCylinder__13daObjHHASHI_cFv
*/
void daObjHHASHI_c::initCcCylinder() {
const static dCcD_SrcCyl ccCylSrc = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x100000, 0x1f}, 0x11}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
110.0f, // mRadius
158.0f // mHeight
} // mCyl
};
mStts.Init(0xff, 0xff, this);
mCyl.Set(ccCylSrc);
mCyl.SetStts(&mStts);
@@ -429,4 +427,4 @@ extern actor_process_profile_definition g_profile_Obj_HHASHI = {
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 805815AC-805815AC 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 805815AC-805815AC 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_obj_movebox.cpp
+67 -548
View File
@@ -5,237 +5,14 @@
#include "d/actor/d_a_obj_movebox.h"
#include "SSystem/SComponent/c_math.h"
#include "Z2AudioLib/Z2Instances.h"
#include "d/actor/d_a_player.h"
#include "d/d_path.h"
#include "dol2asm.h"
#include "d/actor/d_a_obj_burnbox.h"
#include "d/actor/d_a_obj_eff.h"
//
// Forward References:
//
UNK_REL_DATA
extern "C" void __ct__Q212daObjMovebox5Bgc_cFv();
extern "C" void __dt__4cXyzFv();
extern "C" void __ct__4cXyzFv();
extern "C" void
gnd_pos__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cif();
extern "C" void wrt_pos__Q212daObjMovebox5Bgc_cFRC4cXyz();
extern "C" void
wall_pos__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cisf();
extern "C" void proc_vertical__Q212daObjMovebox5Bgc_cFPQ212daObjMovebox5Act_c();
extern "C" void
chk_wall_pre__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cis();
extern "C" void
chk_wall_touch__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cs();
extern "C" void
chk_wall_touch2__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cis();
extern "C" void prm_get_swSave1__Q212daObjMovebox5Act_cCFv();
extern "C" void prmZ_init__Q212daObjMovebox5Act_cFv();
extern "C" void prmX_init__Q212daObjMovebox5Act_cFv();
extern "C" void attr__Q212daObjMovebox5Act_cCFv();
extern "C" void set_mtx__Q212daObjMovebox5Act_cFv();
extern "C" void init_mtx__Q212daObjMovebox5Act_cFv();
extern "C" void path_init__Q212daObjMovebox5Act_cFv();
extern "C" void path_save__Q212daObjMovebox5Act_cFv();
extern "C" void CreateHeap__Q212daObjMovebox5Act_cFv();
extern "C" void RideCallBack__Q212daObjMovebox5Act_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c();
extern "C" void
PPCallBack__Q212daObjMovebox5Act_cFP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel();
extern "C" void Create__Q212daObjMovebox5Act_cFv();
extern "C" void afl_sway__Q212daObjMovebox5Act_cFv();
extern "C" void check_to_walk__Q212daObjMovebox5Act_cFv();
extern "C" void clr_moment_cnt__Q212daObjMovebox5Act_cFv();
extern "C" void chk_appear__Q212daObjMovebox5Act_cCFv();
extern "C" void eff_smoke_slip_start__Q212daObjMovebox5Act_cFv();
extern "C" void mode_wait_init__Q212daObjMovebox5Act_cFv();
extern "C" void mode_wait__Q212daObjMovebox5Act_cFv();
extern "C" void mode_walk_init__Q212daObjMovebox5Act_cFv();
extern "C" void mode_walk__Q212daObjMovebox5Act_cFv();
extern "C" void mode_afl_init__Q212daObjMovebox5Act_cFv();
extern "C" void mode_afl__Q212daObjMovebox5Act_cFv();
extern "C" void __dt__14dBgS_ObjGndChkFv();
extern "C" void sound_slip__Q212daObjMovebox5Act_cFv();
extern "C" void sound_limit__Q212daObjMovebox5Act_cFv();
extern "C" void sound_land__Q212daObjMovebox5Act_cFv();
extern "C" void vib_land__Q212daObjMovebox5Act_cFv();
extern "C" void eff_land_smoke__Q212daObjMovebox5Act_cFv();
extern "C" void Execute__Q212daObjMovebox5Act_cFPPA3_A4_f();
extern "C" void Draw__Q212daObjMovebox5Act_cFv();
extern "C" void __dt__8cM3dGPlaFv();
extern "C" void Delete__Q212daObjMovebox5Act_cFv();
extern "C" static void func_80480920();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" static void func_80480BC0();
extern "C" static void func_80480C18();
extern "C" static void func_80480C38();
extern "C" static void func_80480C64();
extern "C" void __dt__10cCcD_GSttsFv();
extern "C" void func_80480CD8(void* _this, fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e,
daObjMovebox::Act_c::Prm_e);
extern "C" void __sinit_d_a_obj_movebox_cpp();
extern "C" void func_80480DA0();
extern "C" void __dt__11dBgS_WtrChkFv();
extern "C" void func_80480E50();
extern "C" void __ct__14dBgS_ObjGndChkFv();
extern "C" static void func_80480EE4();
extern "C" static void func_80480EEC();
extern "C" static void func_80480EF4();
extern "C" static void func_80480EFC();
extern "C" static void func_80480F04();
extern "C" static void func_80480F0C();
extern "C" u8 const M_lin5__Q212daObjMovebox5Bgc_c[80];
extern "C" u8 const M_lin20__Q212daObjMovebox5Bgc_c[368];
extern "C" void* const M_arcname__Q212daObjMovebox5Act_c[8];
extern "C" u8 const M_cyl_src__Q212daObjMovebox5Act_c[68];
extern "C" u8 const M_attr__Q212daObjMovebox5Act_c[1280];
extern "C" extern char const* const d_a_obj_movebox__stringBase0;
extern "C" u8 M_gnd_work__Q212daObjMovebox5Bgc_c[1932];
extern "C" u8 M_wrt_work__Q212daObjMovebox5Bgc_c[84];
extern "C" u8 M_wall_work__Q212daObjMovebox5Bgc_c[2576];
//
// External References:
//
extern "C" void mDoMtx_XrotS__FPA4_fs();
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void transM__14mDoMtx_stack_cFfff();
extern "C" void transM__14mDoMtx_stack_cFRC4cXyz();
extern "C" void scaleM__14mDoMtx_stack_cFfff();
extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz();
extern "C" void quatM__14mDoMtx_stack_cFPC10Quaternion();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc();
extern "C" void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i();
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void onSwitch__10dSv_info_cFii();
extern "C" void offSwitch__10dSv_info_cFii();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff();
extern "C" void quat_rotBaseY__5daObjFP10QuaternionRC4cXyz();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci();
extern "C" void
setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void dPath_GetPnt__FPC5dPathi();
extern "C" void dPath_GetRoomPath__Fii();
extern "C" void setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj();
extern "C" void StartShock__12dVibration_cFii4cXyz();
extern "C" void LineCross__4cBgSFP11cBgS_LinChk();
extern "C" void GroundCross__4cBgSFP11cBgS_GndChk();
extern "C" void GetActorPointer__4cBgSCFi();
extern "C" void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla();
extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo();
extern "C" void SplGrpChk__4dBgSFP14dBgS_SplGrpChk();
extern "C" void dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz();
extern "C" void dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz();
extern "C" void RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c();
extern "C" void __ct__11dBgS_GndChkFv();
extern "C" void __dt__11dBgS_GndChkFv();
extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c();
extern "C" void __ct__14dBgS_ObjLinChkFv();
extern "C" void __dt__14dBgS_ObjLinChkFv();
extern "C" void __ct__16dBgS_MoveBgActorFv();
extern "C" bool IsDelete__16dBgS_MoveBgActorFv();
extern "C" bool ToFore__16dBgS_MoveBgActorFv();
extern "C" bool ToBack__16dBgS_MoveBgActorFv();
extern "C" void
MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f();
extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv();
extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv();
extern "C" void Set__14dBgS_SplGrpChkFR4cXyzf();
extern "C" void __dt__14dBgS_SplGrpChkFv();
extern "C" void SetObj__16dBgS_PolyPassChkFv();
extern "C" void __ct__11dBgS_WtrChkFv();
extern "C" void Move__4dBgWFv();
extern "C" void GetAc__22dCcD_GAtTgCoCommonBaseFv();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void ChkTgHit__12dCcD_GObjInfFv();
extern "C" void GetTgHitGObj__12dCcD_GObjInfFv();
extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
extern "C" void MoveCTg__8dCcD_CylFR4cXyz();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void dKy_pol_sound_get__FPC13cBgS_PolyInfo();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void __pl__4cXyzCFRC3Vec();
extern "C" void cM_rnd__Fv();
extern "C" void SetPos__11cBgS_GndChkFPC4cXyz();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void __dl__FPv();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_15();
extern "C" void _savegpr_20();
extern "C" void _savegpr_24();
extern "C" void _savegpr_25();
extern "C" void _savegpr_26();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_15();
extern "C" void _restgpr_20();
extern "C" void _restgpr_24();
extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" f32 Zero__4cXyz[3];
extern "C" u8 BaseY__4cXyz[12];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 mEcallback__18dPa_modelEcallBack[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void* M_dir_base__Q212daObjMovebox5Act_c[2];
extern "C" void __register_global_object();
//
// Declarations:
//
/* 80481704-80481710 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80481710-80481724 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
#pragma push
#pragma force_active on
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
0x00000000,
0x3FE00000,
0x00000000,
};
#pragma pop
/* ############################################################################################## */
/* 80480F28-80480F78 000000 0050+00 14/14 0/0 0/0 .rodata M_lin5__Q212daObjMovebox5Bgc_c */
const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin5[] = {
{0.0f, 0.0f, 0.0f, 0.0f}, {-0.5f, -0.5f, 1.0f, 1.0f}, {0.5f, -0.5f, -1.0f, 1.0f},
@@ -243,7 +20,7 @@ const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin5[] = {
};
/* 80480F78-804810E8 000050 0170+00 0/4 0/0 0/0 .rodata M_lin20__Q212daObjMovebox5Bgc_c */
SECTION_RODATA const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin20[] = {
const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin20[] = {
{0.0f, 0.0f, 0.0f, 0.0f}, {-0.25f, -0.25f, 0.0f, 0.0f}, {-0.5f, -0.5f, 1.0f, 1.0f},
{0.0f, -0.5f, -1.0f, 1.0f}, {0.0f, 0.0f, -1.0f, -1.0f}, {-0.5f, 0.0f, 1.0f, -1.0f},
{0.25f, -0.25f, 0.0f, 0.0f}, {0.0f, -0.5f, 1.0f, 1.0f}, {0.5f, -0.5f, -1.0f, 1.0f},
@@ -268,98 +45,22 @@ daObjMovebox::Bgc_c::Bgc_c() {
mState = STATE_0_e;
}
/* 80481888-8048188C 000008 0001+03 4/4 0/0 0/0 .bss @1109 */
static u8 lit_1109[1 + 3 /* padding */];
/* 8048188C-80481890 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */
#pragma push
#pragma force_active on
static u8 lit_1107[1 + 3 /* padding */];
#pragma pop
/* 80481890-80481894 000010 0001+03 0/0 0/0 0/0 .bss @1105 */
#pragma push
#pragma force_active on
static u8 lit_1105[1 + 3 /* padding */];
#pragma pop
/* 80481894-80481898 000014 0001+03 0/0 0/0 0/0 .bss @1104 */
#pragma push
#pragma force_active on
static u8 lit_1104[1 + 3 /* padding */];
#pragma pop
/* 80481898-8048189C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */
#pragma push
#pragma force_active on
static u8 lit_1099[1 + 3 /* padding */];
#pragma pop
/* 8048189C-804818A0 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */
#pragma push
#pragma force_active on
static u8 lit_1097[1 + 3 /* padding */];
#pragma pop
/* 804818A0-804818A4 000020 0001+03 0/0 0/0 0/0 .bss @1095 */
#pragma push
#pragma force_active on
static u8 lit_1095[1 + 3 /* padding */];
#pragma pop
/* 804818A4-804818A8 000024 0001+03 0/0 0/0 0/0 .bss @1094 */
#pragma push
#pragma force_active on
static u8 lit_1094[1 + 3 /* padding */];
#pragma pop
/* 804818A8-804818AC 000028 0001+03 0/0 0/0 0/0 .bss @1057 */
#pragma push
#pragma force_active on
static u8 lit_1057[1 + 3 /* padding */];
#pragma pop
/* 804818AC-804818B0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */
#pragma push
#pragma force_active on
static u8 lit_1055[1 + 3 /* padding */];
#pragma pop
/* 804818B0-804818B4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */
#pragma push
#pragma force_active on
static u8 lit_1053[1 + 3 /* padding */];
#pragma pop
/* 804818B4-804818B8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */
#pragma push
#pragma force_active on
static u8 lit_1052[1 + 3 /* padding */];
#pragma pop
/* 804818B8-804818BC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */
#pragma push
#pragma force_active on
static u8 lit_1014[1 + 3 /* padding */];
#pragma pop
/* 804818BC-804818C0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */
#pragma push
#pragma force_active on
static u8 lit_1012[1 + 3 /* padding */];
#pragma pop
/* 804818C0-804818C4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */
#pragma push
#pragma force_active on
static u8 lit_1010[1 + 3 /* padding */];
#pragma pop
/* 804818C4-804818C8 000044 0001+03 0/0 0/0 0/0 .bss @1009 */
#pragma push
#pragma force_active on
static u8 lit_1009[1 + 3 /* padding */];
#pragma pop
UNK_BSS(1109)
UNK_BSS(1107)
UNK_BSS(1105)
UNK_BSS(1104)
UNK_BSS(1099)
UNK_BSS(1097)
UNK_BSS(1095)
UNK_BSS(1094)
UNK_BSS(1057)
UNK_BSS(1055)
UNK_BSS(1053)
UNK_BSS(1052)
UNK_BSS(1014)
UNK_BSS(1012)
UNK_BSS(1010)
UNK_BSS(1009)
/* 804818D4-80482060 000054 078C+00 7/8 0/0 0/0 .bss M_gnd_work__Q212daObjMovebox5Bgc_c
*/
@@ -628,7 +329,7 @@ void daObjMovebox::Act_c::prmX_init() {
/* 80481104-80481124 -00001 0020+00 3/3 0/0 0/0 .rodata M_arcname__Q212daObjMovebox5Act_c
*/
SECTION_RODATA const char* const daObjMovebox::Act_c::M_arcname[8] = {
const char* const daObjMovebox::Act_c::M_arcname[8] = {
"Kkiba_00", "Osiblk", "H_Box20", "A_SMBlock", "P_Lv4blk", "P_Lv4blk2", "H_OsiHaka", "dummy4",
};
@@ -866,7 +567,6 @@ int daObjMovebox::Act_c::CreateHeap() {
/* 8047EBEC-8047ED10 0011EC 0124+00 1/1 0/0 0/0 .text
* RideCallBack__Q212daObjMovebox5Act_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
void daObjMovebox::Act_c::RideCallBack(dBgW* i_bgw, fopAc_ac_c* i_actor, fopAc_ac_c* i_rideActor) {
i_bgw; // affects stack
Act_c* a_this = (Act_c*)i_actor;
if (a_this->field_0x5ac == 2) {
@@ -1039,6 +739,7 @@ int daObjMovebox::Act_c::Create() {
/* 8047F11C-8047F38C 00171C 0270+00 1/1 0/0 0/0 .text afl_sway__Q212daObjMovebox5Act_cFv
*/
// NONMATCHING regalloc
void daObjMovebox::Act_c::afl_sway() {
f32 var_f31 = field_0x8c0 * field_0x8c0 + field_0x8c4 * field_0x8c4;
f32 var_f29 = i_attr().mMaxTiltPower * i_attr().mMaxTiltPower;
@@ -1046,19 +747,11 @@ void daObjMovebox::Act_c::afl_sway() {
const BgcSrc_c* pbgc = i_attr().field_0x9e ? mBgc.M_lin20 : mBgc.M_lin5;
int check_num = i_attr().field_0x9e ? 21 : 5;
bool var_r22 = true;
if (!mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[0]) &&
!mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[2]))
{
var_r22 = false;
}
bool var_r22 = mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[0]) ||
mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[2]);
bool var_r21 = true;
if (!mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[1]) &&
!mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[3]))
{
var_r21 = false;
}
bool var_r21 = mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[1]) ||
mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[3]);
if (var_f31 > var_f29) {
f32 var_f30 = i_attr().mMaxTiltPower / JMAFastSqrt(var_f31);
@@ -1066,16 +759,13 @@ void daObjMovebox::Act_c::afl_sway() {
field_0x8c4 *= var_f30;
}
f32 var_f24 = field_0x8c8 - field_0x8c0;
f32 var_f23 = field_0x8cc - field_0x8c4;
f32 var_f28 = i_attr().mTiltSpringFactor * -(field_0x8c8 - field_0x8c0);
f32 var_f27 = i_attr().mTiltSpringFactor * -(field_0x8cc - field_0x8c4);
f32 var_f26 = -field_0x8d0 * i_attr().mTiltViscoscityResistance;
f32 var_f25 = -field_0x8d4 * i_attr().mTiltViscoscityResistance;
f32 var_f28 = i_attr().mTiltSpringFactor * -var_f24;
f32 var_f27 = i_attr().mTiltSpringFactor * -var_f23;
f32 var_f26 = field_0x8d0 * -i_attr().mTiltViscoscityResistance;
f32 var_f25 = field_0x8d4 * -i_attr().mTiltViscoscityResistance;
field_0x8d0 += var_f28 * var_f26;
field_0x8d4 += var_f27 * var_f25;
field_0x8d0 += var_f28 + var_f26;
field_0x8d4 += var_f27 + var_f25;
field_0x8c8 += field_0x8d0;
field_0x8cc += field_0x8d4;
@@ -1295,7 +985,7 @@ void daObjMovebox::Act_c::mode_walk() {
/* 8047FCBC-8047FCE4 0022BC 0028+00 1/1 0/0 0/0 .text mode_afl_init__Q212daObjMovebox5Act_cFv */
void daObjMovebox::Act_c::mode_afl_init() {
fopAcM_SetSpeedF(this, 0.0f);
mpBgW->SetCrrFunc(dBgS_MoveBGProc_Trans);
mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical);
field_0x5ac = 2;
}
@@ -1304,22 +994,37 @@ void daObjMovebox::Act_c::mode_afl_init() {
void daObjMovebox::Act_c::mode_afl() {
f32 var_f31;
f32 var_f30 = current.pos.y - mBgc.field_0x60;
if (var_f30 > 0.0f) {
if (var_f30 >= 0.0f) {
var_f31 = 0.0f;
} else if (var_f30 > -i_attr().field_0x68) {
} else if (var_f30 <= -i_attr().field_0x68) {
var_f31 = 1.0f;
} else {
var_f31 = -var_f30 * i_attr().field_0x6c;
}
field_0x8b8 += i_attr().mWaterOscillationAngleSpeed * (cM_rnd() + 1.0f);
fopAcM_SetGravity(this, field_0x8bc + var_f31 * i_attr().mBuoyancy +
i_attr().mGravity * cM_ssin(field_0x8b8));
field_0x8b8 += (s16)(i_attr().mWaterOscillationAngleSpeed * (cM_rnd() + 1.0f));
fopAcM_SetGravity(this, var_f31 * i_attr().mBuoyancy + i_attr().mGravity +
i_attr().mWaterOscillationAccel * cM_ssin(field_0x8b8) + field_0x8bc);
field_0x8bc = 0.0f;
if (cLib_checkBit<daObjMovebox::Bgc_c::State_e>(mBgc.mState, daObjMovebox::Bgc_c::STATE_1_e)) {
if (!cLib_checkBit<daObjMovebox::Bgc_c::State_e>(mBgc.mState, daObjMovebox::Bgc_c::STATE_1_e)) {
afl_sway();
}
f32 tmp = 1.0f - var_f31;
f32 viscosity_resistance = var_f31 * i_attr().mWaterViscoscityResistance
+ tmp * i_attr().mViscosityResistance;
f32 inertia_resistance = var_f31 * i_attr().mWaterInertiaResistance
+ tmp * i_attr().mInertiaResistance;
field_0x8d8 = mBgc.field_0x60 - current.pos.y;
if (field_0x8d8 < 0.0f) {
field_0x8d8 = 0.0f;
} else if (field_0x8d8 > i_attr().field_0x68) {
field_0x8d8 = i_attr().field_0x68;
}
daObj::posMoveF_stream(this, NULL, &cXyz::Zero, viscosity_resistance, inertia_resistance);
}
void daObjMovebox::Act_c::mode_proc_call() {
@@ -1358,7 +1063,7 @@ void daObjMovebox::Act_c::sound_limit() {
}
}
mDoAud_seStartLevel(i_attr().field_0x80, &eyePos, var_r29, mReverb);
mDoAud_seStart(i_attr().field_0x80, &eyePos, var_r29, mReverb);
}
/* 804800E4-804801A8 0026E4 00C4+00 1/1 0/0 0/0 .text sound_land__Q212daObjMovebox5Act_cFv */
@@ -1372,7 +1077,7 @@ void daObjMovebox::Act_c::sound_land() {
}
}
mDoAud_seStartLevel(i_attr().field_0x84, &eyePos, var_r29, mReverb);
mDoAud_seStart(i_attr().field_0x84, &eyePos, var_r29, mReverb);
}
/* 804801A8-804801FC 0027A8 0054+00 1/1 0/0 0/0 .text vib_land__Q212daObjMovebox5Act_cFv
@@ -1381,207 +1086,20 @@ void daObjMovebox::Act_c::vib_land() {
dComIfGp_getVibration().StartShock(4, 31, cXyz(0.0f, 1.0f, 0.0f));
}
/* 8048168C-80481690 000764 0004+00 0/0 0/0 0/0 .rodata @4774 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4774 = 2.0f;
COMPILER_STRIP_GATE(0x8048168C, &lit_4774);
#pragma pop
/* 80481690-80481694 000768 0004+00 0/0 0/0 0/0 .rodata @4775 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4775 = 75.0f;
COMPILER_STRIP_GATE(0x80481690, &lit_4775);
#pragma pop
f32 dummy_literal(f32 x) {
return x + 75.0f + 2.0f;
}
/* 804801FC-8048027C 0027FC 0080+00 1/1 0/0 0/0 .text eff_land_smoke__Q212daObjMovebox5Act_cFv */
void daObjMovebox::Act_c::eff_land_smoke() {
daObjEff::Act_c::make_land_smoke(&current.pos, i_attr().mLandSmokeScale);
}
/* 80482BDC-80482BEC 00135C 000C+04 0/0 0/0 0/0 .bss @4762 */
#pragma push
#pragma force_active on
static u8 lit_4762[12 + 4 /* padding */];
#pragma pop
void dummy_static() {
static cXyz particle_scale;
}
/* 80482BEC-80482BF8 00136C 000C+00 0/0 0/0 0/0 .bss particle_scale$4761 */
#pragma push
#pragma force_active on
static u8 particle_scale[12];
#pragma pop
/* 80482BF8-80482BFC 001378 0004+00 0/0 0/0 0/0 .bss
* sInstance__40JASGlobalInstance<19JASDefaultBankTable> */
#pragma push
#pragma force_active on
static u8 data_80482BF8[4];
#pragma pop
/* 80482BFC-80482C00 00137C 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14JASAudioThread> */
#pragma push
#pragma force_active on
static u8 data_80482BFC[4];
#pragma pop
/* 80482C00-80482C04 001380 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C00[4];
#pragma pop
/* 80482C04-80482C08 001384 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C04[4];
#pragma pop
/* 80482C08-80482C0C 001388 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80482C08[4];
#pragma pop
/* 80482C0C-80482C10 00138C 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80482C0C[4];
#pragma pop
/* 80482C10-80482C14 001390 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys>
*/
#pragma push
#pragma force_active on
static u8 data_80482C10[4];
#pragma pop
/* 80482C14-80482C18 001394 0004+00 0/0 0/0 0/0 .bss
* sInstance__36JASGlobalInstance<15JAISoundStarter> */
#pragma push
#pragma force_active on
static u8 data_80482C14[4];
#pragma pop
/* 80482C18-80482C1C 001398 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14Z2SoundStarter> */
#pragma push
#pragma force_active on
static u8 data_80482C18[4];
#pragma pop
/* 80482C1C-80482C20 00139C 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */
#pragma push
#pragma force_active on
static u8 data_80482C1C[4];
#pragma pop
/* 80482C20-80482C24 0013A0 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C20[4];
#pragma pop
/* 80482C24-80482C28 0013A4 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C24[4];
#pragma pop
/* 80482C28-80482C2C 0013A8 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAIStreamMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C28[4];
#pragma pop
/* 80482C2C-80482C30 0013AC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80482C2C[4];
#pragma pop
/* 80482C30-80482C34 0013B0 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAISoundInfo> */
#pragma push
#pragma force_active on
static u8 data_80482C30[4];
#pragma pop
/* 80482C34-80482C38 0013B4 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13JAUSoundTable> */
#pragma push
#pragma force_active on
static u8 data_80482C34[4];
#pragma pop
/* 80482C38-80482C3C 0013B8 0004+00 0/0 0/0 0/0 .bss
* sInstance__38JASGlobalInstance<17JAUSoundNameTable> */
#pragma push
#pragma force_active on
static u8 data_80482C38[4];
#pragma pop
/* 80482C3C-80482C40 0013BC 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAUSoundInfo> */
#pragma push
#pragma force_active on
static u8 data_80482C3C[4];
#pragma pop
/* 80482C40-80482C44 0013C0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo>
*/
#pragma push
#pragma force_active on
static u8 data_80482C40[4];
#pragma pop
/* 80482C44-80482C48 0013C4 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C44[4];
#pragma pop
/* 80482C48-80482C4C 0013C8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience>
*/
#pragma push
#pragma force_active on
static u8 data_80482C48[4];
#pragma pop
/* 80482C4C-80482C50 0013CC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80482C4C[4];
#pragma pop
/* 80482C50-80482C54 0013D0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80482C50[4];
#pragma pop
/* 80482C54-80482C58 0013D4 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80482C54[4];
#pragma pop
/* 80482C58-80482C5C 0013D8 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */
#pragma push
#pragma force_active on
static u8 data_80482C58[4];
#pragma pop
AUDIO_INSTANCES;
/* 8048027C-80480728 00287C 04AC+00 1/0 0/0 0/0 .text Execute__Q212daObjMovebox5Act_cFPPA3_A4_f */
int daObjMovebox::Act_c::Execute(Mtx** param_0) {
@@ -1612,10 +1130,9 @@ int daObjMovebox::Act_c::Execute(Mtx** param_0) {
(J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd");
JUT_ASSERT(kibako_bmd != 0);
s32 room_no = fopAcM_GetRoomNo(this);
JPABaseEmitter* emitter = dComIfGp_particle_set(
0x82AF, &sp48, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(),
room_no, NULL, NULL, &scale);
fopAcM_GetRoomNo(this), NULL, NULL, &scale);
dPa_modelEcallBack::setModel(emitter, kibako_bmd, tevStr, 3, NULL, 0, 0);
for (int i = 0; i < 3; i++) {
@@ -1634,7 +1151,7 @@ int daObjMovebox::Act_c::Execute(Mtx** param_0) {
if (cLib_checkBit<daObjMovebox::Bgc_c::State_e>(mBgc.mState,
daObjMovebox::Bgc_c::STATE_20_e))
{
mDoAud_seStartLevel(i_attr().field_0x88, &eyePos, 0, mReverb);
mDoAud_seStart(i_attr().field_0x88, &eyePos, 0, mReverb);
}
if (field_0x5ac == 0) {
@@ -1750,6 +1267,8 @@ int daObjMovebox::Act_c::Mthd_Create() {
heap_size, NULL);
JUT_ASSERT((phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e));
}
return phase_state;
}
int daObjMovebox::Act_c::Mthd_Delete() {
@@ -1814,4 +1333,4 @@ extern actor_process_profile_definition g_profile_Obj_Movebox = {
0x00040504, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
};
src/d/actor/d_a_obj_onsenTaru.cpp
+2 -3
View File
@@ -379,10 +379,9 @@ void daOnsTaru_c::breakEffSet() {
J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd");
JUT_ASSERT(0x310, kibako_bmd != 0);
s32 room_no = fopAcM_GetRoomNo(this);
JPABaseEmitter* emitter =
dComIfGp_particle_set(0x8A99, &pos, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(),
room_no, NULL, NULL, &scale);
fopAcM_GetRoomNo(this), NULL, NULL, &scale);
if (emitter != NULL) {
dPa_modelEcallBack::setModel(emitter, kibako_bmd, tevStr, 3, NULL, 0, 0);
}
@@ -450,4 +449,4 @@ extern actor_process_profile_definition g_profile_Obj_OnsenTaru = {
0x00040020, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
};
src/d/actor/d_a_obj_web1.cpp
+2 -3
View File
@@ -136,8 +136,7 @@ static int daObj_Web1_Execute(obj_web1_class* i_this) {
i_this->mHitTimer--;
}
int roomNo = fopAcM_GetRoomNo(i_this);
i_this->mZ2SoundObj.framework(0, dComIfGp_getReverb(roomNo));
i_this->mZ2SoundObj.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
if (i_this->mDeleteTimer != 0) {
if (i_this->mDeleteTimer == 1) {
@@ -343,4 +342,4 @@ extern actor_process_profile_definition g_profile_OBJ_WEB1 = {
0x40100,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_obj_zraMark.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ int daObjZraMark_c::CreateHeap() {
break;
}
s32 room_no = fopAcM_GetRoomNo(this);
s8 room_no = fopAcM_GetRoomNo(this);
if (!mHahenMngr.create(pos, room_no, color, var_r29, 0)) {
// "------------------Fragment Generation Error\n"
OS_REPORT("------------------破片生成ミス\n");
src/d/actor/d_a_tag_chgrestart.cpp
+2 -3
View File
@@ -77,8 +77,7 @@ s32 daTagChgRestart_c::execute() {
restart_angle = entry_p->mAngle.y;
}
s32 l_roomNo = fopAcM_GetRoomNo(player);
dComIfGs_setRestartRoom(restart_pos, restart_angle, l_roomNo);
dComIfGs_setRestartRoom(restart_pos, restart_angle, fopAcM_GetRoomNo(player));
fopAcM_onSwitch(this, daTagChgRestart_prm::getSwNo(this));
}
@@ -131,4 +130,4 @@ extern actor_process_profile_definition g_profile_Tag_ChgRestart = {
0x40000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
};
src/d/actor/d_a_tag_kmsg.cpp
+23 -183
View File
@@ -8,86 +8,6 @@
#include "d/actor/d_a_player.h"
#include "SSystem/SComponent/c_counter.h"
#include "string.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" void create__12daTag_KMsg_cFv();
extern "C" void Delete__12daTag_KMsg_cFv();
extern "C" void Execute__12daTag_KMsg_cFv();
extern "C" bool Draw__12daTag_KMsg_cFv();
extern "C" void isDelete__12daTag_KMsg_cFv();
extern "C" static void daTag_KMsg_Create__FPv();
extern "C" static void daTag_KMsg_Delete__FPv();
extern "C" static void daTag_KMsg_Execute__FPv();
extern "C" static void daTag_KMsg_Draw__FPv();
extern "C" static bool daTag_KMsg_IsDelete__FPv();
extern "C" void __dt__12daTag_KMsg_cFv();
extern "C" extern char const* const d_a_tag_kmsg__stringBase0;
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs();
extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs();
extern "C" void fopAcM_cancelCarryNow__FP10fopAc_ac_c();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void reset__14dEvt_control_cFv();
extern "C" void reset__14dEvt_control_cFPv();
extern "C" void setObjectArchive__16dEvent_manager_cFPc();
extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc();
extern "C" void endCheck__16dEvent_manager_cFs();
extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci();
extern "C" void cutEnd__16dEvent_manager_cFi();
extern "C" void LineCross__4cBgSFP11cBgS_LinChk();
extern "C" void __ct__11dBgS_LinChkFv();
extern "C" void __dt__11dBgS_LinChkFv();
extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c();
extern "C" void daNpcT_chkDoBtnIsSpeak__FP10fopAc_ac_c();
extern "C" void daNpcT_getDistTableIdx__Fii();
extern "C" void daNpcT_chkEvtBit__FUl();
extern "C" void __ct__10dMsgFlow_cFv();
extern "C" void __dt__10dMsgFlow_cFv();
extern "C" void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c();
extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci();
extern "C" void __pl__4cXyzCFRC3Vec();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void __ml__4cXyzCFf();
extern "C" void norm__4cXyzCFv();
extern "C" void __ct__7cSAngleFs();
extern "C" void Sin__7cSAngleCFv();
extern "C" void Cos__7cSAngleCFv();
extern "C" void __dl__FPv();
extern "C" void _savegpr_25();
extern "C" void _restgpr_25();
//
// Declarations:
//
/* ############################################################################################## */
/* 8048EADC-8048EAE0 000000 0004+00 2/2 0/0 0/0 .rodata @3884 */
SECTION_RODATA static f32 const lit_3884 = 10.0f;
COMPILER_STRIP_GATE(0x8048EADC, &lit_3884);
/* 8048EAFC-8048EAFC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8048EAFC = "";
SECTION_DEAD static char const* const stringBase_8048EAFD = "EXTINCTION";
SECTION_DEAD static char const* const stringBase_8048EB08 = "PURCHASE";
SECTION_DEAD static char const* const stringBase_8048EB11 = "Bans1";
SECTION_DEAD static char const* const stringBase_8048EB17 = "sekizoA";
SECTION_DEAD static char const* const stringBase_8048EB1F = "Lv6Gate";
#pragma pop
struct EventListItem {
char* mEventName;
@@ -95,48 +15,19 @@ struct EventListItem {
};
/* 8048EB2C-8048EB44 -00001 0018+00 1/1 0/0 0/0 .data l_evtList */
SECTION_DATA static EventListItem l_evtList[3] = {
static EventListItem l_evtList[3] = {
{"", 0},
{"EXTINCTION", 2},
{"PURCHASE", 1},
};
/* 8048EB44-8048EB50 -00001 000C+00 1/1 0/0 0/0 .data l_resNameList */
SECTION_DATA static char* l_resNameList[3] = {
static char* l_resNameList[3] = {
"",
"Bans1",
"sekizoA",
};
/* 8048EB50-8048EB70 -00001 0020+00 1/0 0/0 0/0 .data daTag_KMsg_MethodTable */
SECTION_DATA static void* daTag_KMsg_MethodTable[8] = {
(void*)daTag_KMsg_Create__FPv,
(void*)daTag_KMsg_Delete__FPv,
(void*)daTag_KMsg_Execute__FPv,
(void*)daTag_KMsg_IsDelete__FPv,
(void*)daTag_KMsg_Draw__FPv,
(void*)NULL,
(void*)NULL,
(void*)NULL,
};
/* 8048EB70-8048EBA0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_KMSG */
SECTION_DATA extern void* g_profile_TAG_KMSG[12] = {
(void*)0xFFFFFFFD, (void*)0x0008FFFD,
(void*)0x02EB0000, (void*)&g_fpcLf_Method,
(void*)0x000005CC, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x01220000, (void*)&daTag_KMsg_MethodTable,
(void*)0x00044000, (void*)0x000E0000,
};
/* 8048EBA0-8048EBAC 000074 000C+00 2/2 0/0 0/0 .data __vt__12daTag_KMsg_c */
SECTION_DATA extern void* __vt__12daTag_KMsg_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12daTag_KMsg_cFv,
};
/* 8048DE78-8048DFDC 000078 0164+00 1/1 0/0 0/0 .text create__12daTag_KMsg_cFv */
int daTag_KMsg_c::create() {
attention_info.position = current.pos;
@@ -162,7 +53,6 @@ int daTag_KMsg_c::create() {
}
}
/* 8048DFDC-8048E010 0001DC 0034+00 1/1 0/0 0/0 .text Delete__12daTag_KMsg_cFv */
int daTag_KMsg_c::Delete() {
OS_REPORT("|%06d:%x|daTag_KMsg_c -> Delete\n", g_Counter, this);
@@ -171,57 +61,8 @@ int daTag_KMsg_c::Delete() {
return 1;
}
/* ############################################################################################## */
/* 8048EAE0-8048EAE4 000004 0004+00 0/1 0/0 0/0 .rodata @4206 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4206 = 1000000000.0f;
COMPILER_STRIP_GATE(0x8048EAE0, &lit_4206);
#pragma pop
/* 8048EAE4-8048EAE8 000008 0004+00 0/1 0/0 0/0 .rodata @4207 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4207 = -0.5f;
COMPILER_STRIP_GATE(0x8048EAE4, &lit_4207);
#pragma pop
/* 8048EAE8-8048EAEC 00000C 0004+00 0/1 0/0 0/0 .rodata @4208 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4208 = -20.0f;
COMPILER_STRIP_GATE(0x8048EAE8, &lit_4208);
#pragma pop
/* 8048EAEC-8048EAF4 000010 0004+04 0/1 0/0 0/0 .rodata @4209 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4209[1 + 1 /* padding */] = {
80.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x8048EAEC, &lit_4209);
#pragma pop
/* 8048EAF4-8048EAFC 000018 0008+00 0/1 0/0 0/0 .rodata @4211 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4211[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x8048EAF4, &lit_4211);
#pragma pop
/* 8048EAFC-8048EAFC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8048EB27 = "KMsg";
#pragma pop
/* 8048E010-8048E8B8 000210 08A8+00 1/1 0/0 0/0 .text Execute__12daTag_KMsg_cFv */
// Various issues: stack, getTalkAngle
#ifdef NONMATCHING
// NONMATCHING Various issues: stack, getTalkAngle
int daTag_KMsg_c::Execute() {
bool r28 = false;
if (home.roomNo == dComIfGp_roomControl_getStayNo()) {
@@ -346,19 +187,18 @@ int daTag_KMsg_c::Execute() {
cXyz vec60 = attention_info.position;
vec60.y += f31;
cXyz vec54;
cXyz vec9c;
vec54.x = vec60.x + 80.0f * angle.Sin();
vec54.y = vec60.y;
vec54.z = vec60.x + 80.0f * angle.Cos();
vec54.z = vec60.z + 80.0f * angle.Cos();
dBgS_LinChk lin_chk;
lin_chk.ClrSttsWallOff();
lin_chk.onBackFlag();
lin_chk.onFrontFlag();
lin_chk.Set(&vec54, &vec60, NULL);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
cXyz vec48;
cXyz vec30 = vec54 - vec60;
// !@bug If decompiled correctly, vec9c is uninitialized
cXyz vec48 = vec9c + vec30.norm() * 10.0f;
vec48 = lin_chk.i_GetCross() + vec30.norm() * 10.0f;
attention_info.position.x = vec48.x;
attention_info.position.z = vec48.z;
}
@@ -368,11 +208,6 @@ int daTag_KMsg_c::Execute() {
}
return 0;
}
#else
int daTag_KMsg_c::Execute() {
// NONMATCHING
}
#endif
/* 8048E8B8-8048E8C0 000AB8 0008+00 1/1 0/0 0/0 .text Draw__12daTag_KMsg_cFv */
int daTag_KMsg_c::Draw() {
@@ -380,7 +215,6 @@ int daTag_KMsg_c::Draw() {
}
/* 8048E8C0-8048E9A8 000AC0 00E8+00 2/2 0/0 0/0 .text isDelete__12daTag_KMsg_cFv */
#ifndef NONMATCHING
int daTag_KMsg_c::isDelete() {
switch(getType()) {
case KMSG_TYPE_0:
@@ -403,11 +237,6 @@ int daTag_KMsg_c::isDelete() {
return 0;
}
}
#else
int daTag_KMsg_c::isDelete() {
// NONMATCHING
}
#endif
/* 8048E9A8-8048E9C8 000BA8 0020+00 1/0 0/0 0/0 .text daTag_KMsg_Create__FPv */
static int daTag_KMsg_Create(void* i_this) {
@@ -434,10 +263,21 @@ static int daTag_KMsg_IsDelete(void* param_0) {
return 1;
}
/* 8048EA30-8048EAD4 000C30 00A4+00 1/0 0/0 0/0 .text __dt__12daTag_KMsg_cFv */
void __dt__12daTag_KMsg_cFv() {
//asm daTag_KMsg_c::~daTag_KMsg_c() {
// NONMATCHING
}
/* 8048EB50-8048EB70 -00001 0020+00 1/0 0/0 0/0 .data daTag_KMsg_MethodTable */
static void* daTag_KMsg_MethodTable[8] = {
(void*)daTag_KMsg_Create,
(void*)daTag_KMsg_Delete,
(void*)daTag_KMsg_Execute,
(void*)daTag_KMsg_IsDelete,
(void*)daTag_KMsg_Draw,
};
/* 8048EAFC-8048EAFC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 8048EB70-8048EBA0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_KMSG */
extern void* g_profile_TAG_KMSG[12] = {
(void*)0xFFFFFFFD, (void*)0x0008FFFD,
(void*)0x02EB0000, (void*)&g_fpcLf_Method,
(void*)0x000005CC, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x01220000, (void*)&daTag_KMsg_MethodTable,
(void*)0x00044000, (void*)0x000E0000,
};
src/d/actor/d_a_tag_setrestart.cpp
+2 -3
View File
@@ -75,8 +75,7 @@ int daTagRestart_c::execute() {
restart_pos.y = fopAcM_gc_c::getGroundY();
}
s32 player_roomNo = fopAcM_GetRoomNo(player);
dComIfGs_setRestartRoom(restart_pos, restart_angle, player_roomNo);
dComIfGs_setRestartRoom(restart_pos, restart_angle, fopAcM_GetRoomNo(player));
}
}
@@ -131,4 +130,4 @@ extern actor_process_profile_definition g_profile_Tag_Restart = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_tbox.cpp
+4 -4
View File
@@ -719,9 +719,8 @@ void daTbox_c::dropProc() {
mDoMtx_identity(field_0x988);
speedF = 0.0f;
cXyz vec1(2.0f, 2.0f, 2.0f);
s32 room_no = fopAcM_GetRoomNo(this);
dComIfGp_particle_setPolyColor(0xe7, mAcch.m_gnd, &current.pos, &tevStr, &home.angle,
&vec1, 0, NULL, room_no, NULL);
&vec1, 0, NULL, fopAcM_GetRoomNo(this), NULL);
dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
u32 sound_id = 0;
cXyz vec2 = current.pos;
@@ -1247,7 +1246,8 @@ int daTbox_c::setGetDemoItem() {
}
/* 804946A4-804948CC 003A64 0228+00 11/0 0/0 0/0 .text actionOpenWait__8daTbox_cFv */
// nonmatching (regalloc)
// nonmatching -- matches if checkTreasureRupeeReturn has return type bool,
// but that breaks daAlink_c::procCoGetItem
int daTbox_c::actionOpenWait() {
daMidna_c* midna = daPy_py_c::getMidnaActor();
daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1720,4 +1720,4 @@ extern actor_process_profile_definition g_profile_TBOX = {
0x44100,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_ykgr.cpp
+63 -591
View File
@@ -6,125 +6,37 @@
#include "d/actor/d_a_ykgr.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "dol2asm.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "Z2AudioLib/Z2Instances.h"
//
// Forward References:
//
inline daYkgr_HIO_c::daYkgr_HIO_c() {
field_0x4 = 0;
field_0x8 = 0xff;
field_0xc = 3;
field_0x10 = -16.0f;
field_0x14 = -5.0f;
field_0x18 = -3.0f;
field_0x1c = 0.0f;
field_0x20 = 1500.0f;
field_0x24 = 500.0f;
}
extern "C" void draw__17dPa_YkgrPcallBackFP14JPABaseEmitterP15JPABaseParticle();
extern "C" void setParam__17dPa_YkgrPcallBackFf();
extern "C" void getPosRate__8daYkgr_cFv();
extern "C" static void daYkgrCreate__FPv();
extern "C" static bool daYkgrDelete__FPv();
extern "C" static void daYkgrExecute__FPv();
extern "C" static void daYkgrDraw__FPv();
extern "C" static bool daYkgrIsDelete__FPv();
extern "C" void __dt__12daYkgr_HIO_cFv();
extern "C" void __dt__14mDoHIO_entry_cFv();
extern "C" void __dt__17dPa_YkgrPcallBackFv();
extern "C" void execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle();
extern "C" void __sinit_d_a_ykgr_cpp();
extern "C" void draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle();
extern "C" extern char const* const d_a_ykgr__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcM_setStageLayer__FPv();
extern "C" void dComIfGs_BossLife_public_Get__Fv();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void dPath_GetRoomPath__Fii();
extern "C" void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz();
extern "C" void cM_atan2s__Fff();
extern "C" void cLib_addCalc2__FPffff();
extern "C" void __dt__19JPAParticleCallBackFv();
extern "C" void func_802807E0();
extern "C" void __dl__FPv();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 m_aim_rate__8daYkgr_c[4];
extern "C" u8 m_path__8daYkgr_c[4];
extern "C" u8 m_emitter__8daYkgr_c[4];
extern "C" void __register_global_object();
//
// Declarations:
//
inline dPa_YkgrPcallBack::dPa_YkgrPcallBack() {
field_0x4 = 0.5f;
field_0x8 = 0.0f;
field_0xc = 0.0f;
field_0x10 = 0.0f;
field_0x14 = 0.5f;
field_0x18 = 0.0f;
field_0x1c = 1;
}
/* 805A848C-805A84D4 0000EC 0048+00 1/0 0/0 0/0 .text
* draw__17dPa_YkgrPcallBackFP14JPABaseEmitterP15JPABaseParticle */
// Needs inheritance
#ifdef NONMATCHING
void dPa_YkgrPcallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
GXSetIndTexMtx(GX_ITM_0, &field_0x4, field_0x1c);
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_A0);
}
#else
void dPa_YkgrPcallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
// NONMATCHING
}
#endif
/* ############################################################################################## */
/* 805A8FBC-805A8FC0 000000 0004+00 6/6 0/0 0/0 .rodata @3759 */
SECTION_RODATA static f32 const lit_3759 = -17.0f;
COMPILER_STRIP_GATE(0x805A8FBC, &lit_3759);
/* 805A8FC0-805A8FC4 000004 0004+00 0/1 0/0 0/0 .rodata @3760 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3760 = 47.0f;
COMPILER_STRIP_GATE(0x805A8FC0, &lit_3760);
#pragma pop
/* 805A8FC4-805A8FC8 000008 0004+00 0/5 0/0 0/0 .rodata @3761 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3761[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x805A8FC4, &lit_3761);
#pragma pop
/* 805A8FC8-805A8FCC 00000C 0004+00 0/4 0/0 0/0 .rodata @3762 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3762 = 0.5f;
COMPILER_STRIP_GATE(0x805A8FC8, &lit_3762);
#pragma pop
/* 805A8FCC-805A8FD4 000010 0004+04 0/4 0/0 0/0 .rodata @3763 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3763[1 + 1 /* padding */] = {
1.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x805A8FCC, &lit_3763);
#pragma pop
/* 805A8FD4-805A8FDC 000018 0008+00 0/2 0/0 0/0 .rodata @3766 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3766[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x805A8FD4, &lit_3766);
#pragma pop
/* 805A84D4-805A85D4 000134 0100+00 2/2 0/0 0/0 .text setParam__17dPa_YkgrPcallBackFf */
void dPa_YkgrPcallBack::setParam(f32 param_1) {
@@ -148,136 +60,25 @@ void dPa_YkgrPcallBack::setParam(f32 param_1) {
}
}
/* ############################################################################################## */
/* 805A8FDC-805A8FE4 000020 0008+00 0/1 0/0 0/0 .rodata @3846 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3846[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x805A8FDC, &lit_3846);
#pragma pop
/* 805A8FE4-805A8FEC 000028 0008+00 0/1 0/0 0/0 .rodata @3847 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3847[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x805A8FE4, &lit_3847);
#pragma pop
/* 805A8FEC-805A8FF4 000030 0008+00 0/1 0/0 0/0 .rodata @3848 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_3848[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x805A8FEC, &lit_3848);
#pragma pop
/* 805A90B8-805A90BC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */
static u8 lit_1109[1 + 3 /* padding */];
/* 805A90BC-805A90C0 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */
#pragma push
#pragma force_active on
static u8 lit_1107[1 + 3 /* padding */];
#pragma pop
/* 805A90C0-805A90C4 000010 0001+03 0/0 0/0 0/0 .bss @1105 */
#pragma push
#pragma force_active on
static u8 lit_1105[1 + 3 /* padding */];
#pragma pop
/* 805A90C4-805A90C8 000014 0001+03 0/0 0/0 0/0 .bss @1104 */
#pragma push
#pragma force_active on
static u8 lit_1104[1 + 3 /* padding */];
#pragma pop
/* 805A90C8-805A90CC 000018 0001+03 0/0 0/0 0/0 .bss @1099 */
#pragma push
#pragma force_active on
static u8 lit_1099[1 + 3 /* padding */];
#pragma pop
/* 805A90CC-805A90D0 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */
#pragma push
#pragma force_active on
static u8 lit_1097[1 + 3 /* padding */];
#pragma pop
/* 805A90D0-805A90D4 000020 0001+03 0/0 0/0 0/0 .bss @1095 */
#pragma push
#pragma force_active on
static u8 lit_1095[1 + 3 /* padding */];
#pragma pop
/* 805A90D4-805A90D8 000024 0001+03 0/0 0/0 0/0 .bss @1094 */
#pragma push
#pragma force_active on
static u8 lit_1094[1 + 3 /* padding */];
#pragma pop
/* 805A90D8-805A90DC 000028 0001+03 0/0 0/0 0/0 .bss @1057 */
#pragma push
#pragma force_active on
static u8 lit_1057[1 + 3 /* padding */];
#pragma pop
/* 805A90DC-805A90E0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */
#pragma push
#pragma force_active on
static u8 lit_1055[1 + 3 /* padding */];
#pragma pop
/* 805A90E0-805A90E4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */
#pragma push
#pragma force_active on
static u8 lit_1053[1 + 3 /* padding */];
#pragma pop
/* 805A90E4-805A90E8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */
#pragma push
#pragma force_active on
static u8 lit_1052[1 + 3 /* padding */];
#pragma pop
/* 805A90E8-805A90EC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */
#pragma push
#pragma force_active on
static u8 lit_1014[1 + 3 /* padding */];
#pragma pop
/* 805A90EC-805A90F0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */
#pragma push
#pragma force_active on
static u8 lit_1012[1 + 3 /* padding */];
#pragma pop
/* 805A90F0-805A90F4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */
#pragma push
#pragma force_active on
static u8 lit_1010[1 + 3 /* padding */];
#pragma pop
/* 805A90F4-805A90F8 000044 0001+03 0/0 0/0 0/0 .bss @1009 */
#pragma push
#pragma force_active on
static u8 lit_1009[1 + 3 /* padding */];
#pragma pop
/* 805A90F8-805A9104 000048 000C+00 0/1 0/0 0/0 .bss @3744 */
#pragma push
#pragma force_active on
static u8 lit_3744[12];
#pragma pop
UNK_BSS(1109)
UNK_BSS(1107)
UNK_BSS(1105)
UNK_BSS(1104)
UNK_BSS(1099)
UNK_BSS(1097)
UNK_BSS(1095)
UNK_BSS(1094)
UNK_BSS(1057)
UNK_BSS(1055)
UNK_BSS(1053)
UNK_BSS(1052)
UNK_BSS(1014)
UNK_BSS(1012)
UNK_BSS(1010)
UNK_BSS(1009)
/* 805A9104-805A912C 000054 0028+00 2/3 0/0 0/0 .bss l_HIO */
static u8 l_HIO[40];
static daYkgr_HIO_c l_HIO;
/* 805A85D4-805A882C 000234 0258+00 1/1 0/0 0/0 .text getPosRate__8daYkgr_cFv */
f32 daYkgr_c::getPosRate() {
@@ -295,37 +96,21 @@ f32 daYkgr_c::getPosRate() {
dVar11 = dVar10;
}
}
if (dVar11 > ((daYkgr_HIO_c*)&l_HIO)->field_0x20) {
dVar11 = ((daYkgr_HIO_c*)&l_HIO)->field_0x20;
} else if (dVar11 < ((daYkgr_HIO_c*)&l_HIO)->field_0x24) {
dVar11 = ((daYkgr_HIO_c*)&l_HIO)->field_0x24;
if (dVar11 > l_HIO.field_0x20) {
dVar11 = l_HIO.field_0x20;
} else if (dVar11 < l_HIO.field_0x24) {
dVar11 = l_HIO.field_0x24;
}
f32 y = (((daYkgr_HIO_c*)&l_HIO)->field_0x20);
y = (dVar11 - ((daYkgr_HIO_c*)&l_HIO)->field_0x24) / (y -((daYkgr_HIO_c*)&l_HIO)->field_0x24);
f32 y = (l_HIO.field_0x20);
y = (dVar11 - l_HIO.field_0x24) / (y -l_HIO.field_0x24);
return 1.0f - y;
}
/* ############################################################################################## */
/* 805A8FF4-805A8FF8 000038 0004+00 0/2 0/0 0/0 .rodata @3951 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3951 = -3.0f;
COMPILER_STRIP_GATE(0x805A8FF4, &lit_3951);
#pragma pop
/* 805A912C-805A9138 00007C 000C+00 0/1 0/0 0/0 .bss @3851 */
#pragma push
#pragma force_active on
static u8 lit_3851[12];
#pragma pop
/* 805A9138-805A9158 000088 0020+00 2/3 0/0 0/0 .bss YkgrCB */
static u8 YkgrCB[32];
static dPa_YkgrPcallBack YkgrCB;
/* 805A882C-805A8A48 00048C 021C+00 1/0 0/0 0/0 .text daYkgrCreate__FPv */
// regalloc
#ifdef NONMATCHING
// NONMATCHING regalloc
inline int daYkgr_c::_create() {
dPath* path;
s32 uVar1 = fopAcM_GetParam(this) ;
@@ -344,8 +129,8 @@ inline int daYkgr_c::_create() {
this->current.pos = player->current.pos;
m_emitter = dComIfGp_particle_set(0x80e2, &this->current.pos, NULL, NULL);
if (m_emitter != NULL) {
m_emitter->setParticleCallBackPtr((JPAParticleCallBack*)YkgrCB);
((dPa_YkgrPcallBack*)YkgrCB)->setParam(-3.0f);
m_emitter->setParticleCallBackPtr(&YkgrCB);
YkgrCB.setParam(-3.0f);
} else {
return cPhs_ERROR_e;
}
@@ -377,50 +162,31 @@ inline int daYkgr_c::_create() {
static int daYkgrCreate(void* i_this) {
return static_cast<daYkgr_c*>(i_this)->_create();
}
#else
static int daYkgrCreate(void* param_0) {
// NONMATCHING
}
#endif
/* 805A8A48-805A8A50 0006A8 0008+00 1/0 0/0 0/0 .text daYkgrDelete__FPv */
static int daYkgrDelete(void* param_0) {
return 1;
}
/* ############################################################################################## */
/* 805A8FF8-805A8FFC 00003C 0004+00 0/1 0/0 0/0 .rodata @3976 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3976 = 0.25f;
COMPILER_STRIP_GATE(0x805A8FF8, &lit_3976);
#pragma pop
/* 805A8FFC-805A9000 000040 0004+00 0/1 0/0 0/0 .rodata @3977 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3977 = 1.0f / 20.0f;
COMPILER_STRIP_GATE(0x805A8FFC, &lit_3977);
#pragma pop
/* 805A8A50-805A8BBC 0006B0 016C+00 1/0 0/0 0/0 .text daYkgrExecute__FPv */
// NONMATCHING regalloc
inline int daYkgr_c::_execute() {
cLib_addCalc2(&field_0x5a4, m_aim_rate, 0.25f, 0.05f);
cLib_addCalc2(&m_aim_rate, ((f32*)l_HIO)[7], 0.25f, 0.05f);
cLib_addCalc2(&m_aim_rate, l_HIO.field_0x1c, 0.25f, 0.05f);
cLib_addCalc2(&field_0x5a8, getPosRate(), 0.25f, 0.05f);
f32 fVar4 = field_0x5a8 * 0.5f + field_0x5a4 * 0.5f;
((dPa_YkgrPcallBack*)YkgrCB)->setParam(fVar4 * ((f32*)l_HIO)[6] + (1.0f - fVar4) * ((f32*)l_HIO)[5]);
YkgrCB.setParam(fVar4 * l_HIO.field_0x18 + (1.0f - fVar4) * l_HIO.field_0x14);
if (m_alpha_flag == 0) {
if (m_alpha != 0) {
if (m_alpha > ((s32*)l_HIO)[3]) {
m_alpha = m_alpha - ((s32*)l_HIO)[3];
if (m_alpha > l_HIO.field_0xc) {
m_alpha = m_alpha - l_HIO.field_0xc;
} else {
m_alpha = 0;
}
}
} else if (m_alpha < 0xff) {
if (m_alpha < 0xff - ((s32*)l_HIO)[3]) {
m_alpha = m_alpha + ((s32*)l_HIO)[3];
if (m_alpha < 0xff - l_HIO.field_0xc) {
m_alpha = m_alpha + l_HIO.field_0xc;
} else {
m_alpha = 0xff;
}
@@ -432,33 +198,12 @@ static int daYkgrExecute(void* i_this) {
return static_cast<daYkgr_c*>(i_this)->_execute();
}
/* ############################################################################################## */
/* 805A9000-805A9004 000044 0004+00 0/1 0/0 0/0 .rodata @4032 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4032 = 100.0f;
COMPILER_STRIP_GATE(0x805A9000, &lit_4032);
#pragma pop
/* 805A9004-805A9008 000048 0004+00 0/1 0/0 0/0 .rodata @4033 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4033 = 255.0f;
COMPILER_STRIP_GATE(0x805A9004, &lit_4033);
#pragma pop
/* 805A9018-805A9018 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_805A9018 = "D_MN04A";
#pragma pop
/* 805A8BBC-805A8D90 00081C 01D4+00 1/0 0/0 0/0 .text daYkgrDraw__FPv */
inline int daYkgr_c::_draw() {
bool rv;
if (strcmp(dComIfGp_getStartStageName(), "D_MN04A") == 0) {
m_alpha = (dComIfGs_BossLife_public_Get() / 100.0f) * 255.0f;
f32 alpha = dComIfGs_BossLife_public_Get() / 100.0f;
m_alpha = alpha * 255.0f;
if (m_alpha == 0) {
m_alpha++;
}
@@ -480,13 +225,16 @@ static int daYkgrDraw(void* i_this) {
return static_cast<daYkgr_c*>(i_this)->_draw();
}
/* 805A8D90-805A8D98 0009F0 0008+00 1/0 0/0 0/0 .text daYkgrIsDelete__FPv */
static int daYkgrIsDelete(void* param_0) {
return 1;
}
/* ############################################################################################## */
/* 805A8D98-805A8DF4 0009F8 005C+00 2/1 0/0 0/0 .text __dt__12daYkgr_HIO_cFv */
daYkgr_HIO_c::~daYkgr_HIO_c() {
/* empty function */
}
/* 805A9020-805A9040 -00001 0020+00 1/0 0/0 0/0 .data daYkgrMethodTable */
static actor_method_class daYkgrMethodTable = {
daYkgrCreate,
@@ -513,280 +261,4 @@ extern actor_process_profile_definition g_profile_Ykgr = {
0,
};
/* 805A9070-805A9084 000050 0014+00 2/2 0/0 0/0 .data __vt__17dPa_YkgrPcallBack */
SECTION_DATA extern void* __vt__17dPa_YkgrPcallBack[5] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__17dPa_YkgrPcallBackFv,
(void*)execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle,
(void*)draw__17dPa_YkgrPcallBackFP14JPABaseEmitterP15JPABaseParticle,
};
/* 805A9084-805A9098 000064 0014+00 1/1 0/0 0/0 .data __vt__19JPAParticleCallBack */
SECTION_DATA extern void* __vt__19JPAParticleCallBack[5] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)NULL,
(void*)execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle,
(void*)draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle,
};
/* 805A9098-805A90A4 000078 000C+00 2/2 0/0 0/0 .data __vt__12daYkgr_HIO_c */
SECTION_DATA extern void* __vt__12daYkgr_HIO_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12daYkgr_HIO_cFv,
};
/* 805A90A4-805A90B0 000084 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */
SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__14mDoHIO_entry_cFv,
};
/* 805A8D98-805A8DF4 0009F8 005C+00 2/1 0/0 0/0 .text __dt__12daYkgr_HIO_cFv */
daYkgr_HIO_c::~daYkgr_HIO_c() {
// NONMATCHING
}
/* 805A8DF4-805A8E3C 000A54 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */
void __dt__14mDoHIO_entry_cFv() {
//asm mDoHIO_entry_c::~mDoHIO_entry_c() {
// NONMATCHING
}
/* 805A8E3C-805A8E9C 000A9C 0060+00 2/1 0/0 0/0 .text __dt__17dPa_YkgrPcallBackFv */
#ifdef NONMATCHING
dPa_YkgrPcallBack::~dPa_YkgrPcallBack() {
}
#else
dPa_YkgrPcallBack::~dPa_YkgrPcallBack() {
// NONMATCHING
}
#endif
/* 805A8E9C-805A8EA0 000AFC 0004+00 2/0 0/0 0/0 .text
* execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle */
void JPAParticleCallBack::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
/* empty function */
}
/* ############################################################################################## */
/* 805A9008-805A900C 00004C 0004+00 0/1 0/0 0/0 .rodata @4061 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4061 = -16.0f;
COMPILER_STRIP_GATE(0x805A9008, &lit_4061);
#pragma pop
/* 805A900C-805A9010 000050 0004+00 0/1 0/0 0/0 .rodata @4062 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4062 = -5.0f;
COMPILER_STRIP_GATE(0x805A900C, &lit_4062);
#pragma pop
/* 805A9010-805A9014 000054 0004+00 0/1 0/0 0/0 .rodata @4063 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4063 = 1500.0f;
COMPILER_STRIP_GATE(0x805A9010, &lit_4063);
#pragma pop
/* 805A9014-805A9018 000058 0004+00 0/1 0/0 0/0 .rodata @4064 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4064 = 500.0f;
COMPILER_STRIP_GATE(0x805A9014, &lit_4064);
#pragma pop
/* 805A8EA0-805A8FA4 000B00 0104+00 0/0 1/0 0/0 .text __sinit_d_a_ykgr_cpp */
void __sinit_d_a_ykgr_cpp() {
// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x805A8EA0, __sinit_d_a_ykgr_cpp);
#pragma pop
/* 805A8FA4-805A8FA8 000C04 0004+00 1/0 0/0 0/0 .text
* draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle */
void JPAParticleCallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
/* empty function */
}
/* ############################################################################################## */
/* 805A9158-805A915C 0000A8 0004+00 0/0 0/0 0/0 .bss
* sInstance__40JASGlobalInstance<19JASDefaultBankTable> */
#pragma push
#pragma force_active on
static u8 data_805A9158[4];
#pragma pop
/* 805A915C-805A9160 0000AC 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14JASAudioThread> */
#pragma push
#pragma force_active on
static u8 data_805A915C[4];
#pragma pop
/* 805A9160-805A9164 0000B0 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */
#pragma push
#pragma force_active on
static u8 data_805A9160[4];
#pragma pop
/* 805A9164-805A9168 0000B4 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */
#pragma push
#pragma force_active on
static u8 data_805A9164[4];
#pragma pop
/* 805A9168-805A916C 0000B8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr>
*/
#pragma push
#pragma force_active on
static u8 data_805A9168[4];
#pragma pop
/* 805A916C-805A9170 0000BC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr>
*/
#pragma push
#pragma force_active on
static u8 data_805A916C[4];
#pragma pop
/* 805A9170-805A9174 0000C0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys>
*/
#pragma push
#pragma force_active on
static u8 data_805A9170[4];
#pragma pop
/* 805A9174-805A9178 0000C4 0004+00 0/0 0/0 0/0 .bss
* sInstance__36JASGlobalInstance<15JAISoundStarter> */
#pragma push
#pragma force_active on
static u8 data_805A9174[4];
#pragma pop
/* 805A9178-805A917C 0000C8 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14Z2SoundStarter> */
#pragma push
#pragma force_active on
static u8 data_805A9178[4];
#pragma pop
/* 805A917C-805A9180 0000CC 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */
#pragma push
#pragma force_active on
static u8 data_805A917C[4];
#pragma pop
/* 805A9180-805A9184 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */
#pragma push
#pragma force_active on
static u8 data_805A9180[4];
#pragma pop
/* 805A9184-805A9188 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */
#pragma push
#pragma force_active on
static u8 data_805A9184[4];
#pragma pop
/* 805A9188-805A918C 0000D8 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAIStreamMgr> */
#pragma push
#pragma force_active on
static u8 data_805A9188[4];
#pragma pop
/* 805A918C-805A9190 0000DC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr>
*/
#pragma push
#pragma force_active on
static u8 data_805A918C[4];
#pragma pop
/* 805A9190-805A9194 0000E0 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAISoundInfo> */
#pragma push
#pragma force_active on
static u8 data_805A9190[4];
#pragma pop
/* 805A9194-805A9198 0000E4 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13JAUSoundTable> */
#pragma push
#pragma force_active on
static u8 data_805A9194[4];
#pragma pop
/* 805A9198-805A919C 0000E8 0004+00 0/0 0/0 0/0 .bss
* sInstance__38JASGlobalInstance<17JAUSoundNameTable> */
#pragma push
#pragma force_active on
static u8 data_805A9198[4];
#pragma pop
/* 805A919C-805A91A0 0000EC 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAUSoundInfo> */
#pragma push
#pragma force_active on
static u8 data_805A919C[4];
#pragma pop
/* 805A91A0-805A91A4 0000F0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo>
*/
#pragma push
#pragma force_active on
static u8 data_805A91A0[4];
#pragma pop
/* 805A91A4-805A91A8 0000F4 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */
#pragma push
#pragma force_active on
static u8 data_805A91A4[4];
#pragma pop
/* 805A91A8-805A91AC 0000F8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience>
*/
#pragma push
#pragma force_active on
static u8 data_805A91A8[4];
#pragma pop
/* 805A91AC-805A91B0 0000FC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr>
*/
#pragma push
#pragma force_active on
static u8 data_805A91AC[4];
#pragma pop
/* 805A91B0-805A91B4 000100 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr>
*/
#pragma push
#pragma force_active on
static u8 data_805A91B0[4];
#pragma pop
/* 805A91B4-805A91B8 000104 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr>
*/
#pragma push
#pragma force_active on
static u8 data_805A91B4[4];
#pragma pop
/* 805A91B8-805A91BC 000108 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */
#pragma push
#pragma force_active on
static u8 data_805A91B8[4];
#pragma pop
/* 805A9018-805A9018 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
AUDIO_INSTANCES;