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

Clean up HIO reg accesses

Browse Source
This commit is contained in:
LagoLunatic
2025-07-17 21:41:40 -04:00
parent ce8a70bfb0
commit 67259edeeb
28 changed files with 64 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_arrow.cpp
+2 -2
View File
@@ -1102,8 +1102,8 @@ BOOL daArrow_c::_execute() {
cXyz offset;
offset.x = 0.0f;
offset.y = 45.0f + g_regHIO.mChild->mFloatRegs[8];
offset.z = 30.0f + g_regHIO.mChild->mFloatRegs[9];
offset.y = 45.0f + REG0_F(8);
offset.z = 30.0f + REG0_F(9);
mDoMtx_YrotS(*calc_mtx, player->shape_angle.y);
cXyz offsetOut;
MtxPosition(&offset, &offsetOut);
src/d/actor/d_a_esa.cpp
+3 -3
View File
@@ -250,7 +250,7 @@ static cPhs_State daEsa_Create(fopAc_ac_c* i_actor) {
i_this->field_0x2B9 = fopAcM_GetParam(i_this) & 0xFF;
i_this->field_0x2BA = fopAcM_GetParam(i_this) >> 8 & 0xFF;
if(g_regHIO.mChild->mShortRegs[0] != 0) {
if(REG0_S(0) != 0) {
i_this->field_0x2BA = 1;
}
@@ -274,8 +274,8 @@ static cPhs_State daEsa_Create(fopAc_ac_c* i_actor) {
}
}
f32 temp = g_regHIO.mChild->mFloatRegs[6] + 0.65f;
f32 scaleF = temp + cM_rndF(g_regHIO.mChild->mFloatRegs[5] + 1.0f - temp);
f32 temp = REG0_F(6) + 0.65f;
f32 scaleF = temp + cM_rndF(REG0_F(5) + 1.0f - temp);
cXyz scale(scaleF, scaleF, scaleF);
i_this->mpModel->setBaseScale(scale);
fopAcM_SetMtx(i_this, i_this->mpModel->getBaseTRMtx());
src/d/actor/d_a_kt.cpp
+1 -1
View File
@@ -237,7 +237,7 @@ calc_012:
i_this->mTimer[0] = cM_rndF(2.0f) + 10.0f + REG0_F(12);
}
if (i_this->mTimer[0] > (s16)(REG0_S(1) + 8)) {
cLib_addCalcAngleS2(&i_this->mAngleRoll, g_regHIO.mChild->mShortRegs[2] + 0x3000, 2, g_regHIO.mChild->mShortRegs[3] + 0x2000);
cLib_addCalcAngleS2(&i_this->mAngleRoll, REG0_S(2) + 0x3000, 2, REG0_S(3) + 0x2000);
}
if (i_this->mTimer[1] == 0) {
i_this->mTimer[1] = 20.0f + cM_rndF(50.0f);
src/d/actor/d_a_machine.cpp
-2
View File
@@ -205,7 +205,6 @@ void daMachine_c::set_next_pnt() {
field_0xc15 += field_0xc16;
if(dPath_ChkClose(field_0xc18) != 0) {
if (field_0xc15 > (s8)field_0xc18->m_num - 1) {
field_0xc15 = 0;
} else if (field_0xc15 < 0) {
@@ -378,7 +377,6 @@ void daMachine_c::set_at() {
fVar1 = field_0xc04.getFrameCtrl()->getFrame();
if ((5.0f < fVar1) && (25.0f > fVar1)) {
field_0xc6c.set(field_0xc3c[0][3],
field_0xc3c[1][3],
field_0xc3c[2][3]);
src/d/actor/d_a_npc_ji1.cpp
+2 -2
View File
@@ -3750,8 +3750,8 @@ BOOL daNpc_Ji1_c::battleAtSet() {
f32 cos = cM_scos(current.angle.y);
if(mAnimation == 0x14) {
field_0xA40.SetR(g_regHIO.mChild[10].mFloatRegs[9] + 85.0f);
field_0xB90.y = field_0xB78.y = g_regHIO.mChild[10].mFloatRegs[10] + 40.0f;
field_0xA40.SetR(REG10_F(9) + 85.0f);
field_0xB90.y = field_0xB78.y = REG10_F(10) + 40.0f;
field_0xA40.SetStartEnd(field_0xB90, field_0xB78);
field_0xA40.CalcVec(&temp);
if(!temp.normalizeRS()) {
src/d/actor/d_a_npc_km1.cpp
+8 -35
View File
@@ -17,8 +17,7 @@ static daNpc_Km1_HIO_c l_HIO;
/* 000000EC-00000144 .text __ct__15daNpc_Km1_HIO_cFv */
daNpc_Km1_HIO_c::daNpc_Km1_HIO_c() {
static hio_prm_c a_prm_tbl= {
static hio_prm_c a_prm_tbl = {
0x1FFE,
0x38E0,
0xE002,
@@ -67,7 +66,6 @@ static BOOL nodeCallBack_Km(J3DNode* i_node, int i_calcTiming) {
extern dCcD_SrcCyl dNpc_cyl_src;
/* 0000032C-0000043C .text createInit__11daNpc_Km1_cFv */
bool daNpc_Km1_c::createInit() {
mEventCut.setActorInfo2("Km1", this);
attention_info.flags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_SPEAK_e;
attention_info.distances[fopAc_Attn_TYPE_TALK_e] = 0xAB;
@@ -88,7 +86,6 @@ bool daNpc_Km1_c::createInit() {
/* 0000043C-0000054C .text setMtx__11daNpc_Km1_cFv */
void daNpc_Km1_c::setMtx() {
if (field_0x7C7 == 0) {
playTexPatternAnm();
field_0x7B4 = mpMorf->play(&eyePos,0,0);
@@ -138,7 +135,6 @@ void daNpc_Km1_c::setAnm_tex(signed char i_param_1) {
/* 00000734-00000850 .text init_btp__11daNpc_Km1_cFbi */
bool daNpc_Km1_c::init_btp(bool param_1, int param_2) {
int btp_num;
int iVar3;
J3DModelData *pJVar4;
@@ -173,7 +169,6 @@ bool daNpc_Km1_c::initTexPatternAnm(bool param_1) {
/* 00000894-00000958 .text playTexPatternAnm__11daNpc_Km1_cFv */
void daNpc_Km1_c::playTexPatternAnm() {
//TODO: Rewrite this conditional logic
bool var_r4 = true;
if(field_0x7CD == 0){
@@ -200,14 +195,12 @@ void daNpc_Km1_c::playTexPatternAnm() {
/* 00000958-00000A24 .text setAnm_anm__11daNpc_Km1_cFPQ211daNpc_Km1_c9anm_prm_c */
s32 daNpc_Km1_c::setAnm_anm(daNpc_Km1_c::anm_prm_c* i_anm_ptr) {
u32 uVar2 = 0;
int local_18;
int local_14;
if (i_anm_ptr->field_0x0 >= 0 && field_0x7CE != i_anm_ptr->field_0x0) {
field_0x7CE = i_anm_ptr->field_0x0;
if (mpMorf != NULL) {
anmResID(field_0x7CE,&local_18,&local_14);
@@ -225,7 +218,6 @@ s32 daNpc_Km1_c::setAnm_anm(daNpc_Km1_c::anm_prm_c* i_anm_ptr) {
/* 00000A24-00000A8C .text setAnm__11daNpc_Km1_cFv */
void daNpc_Km1_c::setAnm() {
static daNpc_Km1_c::anm_prm_c a_anm_prm_tbl[3] = {
{-1,-1,0.0f,0.0f,-1},
{ANM_WAIT,0,8.0f,1.0f,J3DFrameCtrl::EMode_LOOP},
@@ -237,7 +229,6 @@ void daNpc_Km1_c::setAnm() {
/* 00000A8C-00000A98 .text chngAnmTag__11daNpc_Km1_cFv */
void daNpc_Km1_c::chngAnmTag() {
switch(field_0x7CC){
case 0:
break;
@@ -246,7 +237,6 @@ void daNpc_Km1_c::chngAnmTag() {
/* 00000A98-00000AA4 .text ctrlAnmTag__11daNpc_Km1_cFv */
void daNpc_Km1_c::ctrlAnmTag() {
switch(field_0x7CB){
case 0:
break;
@@ -263,11 +253,10 @@ void daNpc_Km1_c::chngAnmAtr(unsigned char param_1) {
/* 00000AE4-00000AE8 .text ctrlAnmAtr__11daNpc_Km1_cFv */
void daNpc_Km1_c::ctrlAnmAtr() {
}
/* 00000AE8-00000B50 .text setAnm_ATR__11daNpc_Km1_cFi */
void daNpc_Km1_c::setAnm_ATR(int param_1) {
static daNpc_Km1_c::anm_prm_c a_anm_prm_tbl[1] = {
{ANM_WAIT,0x00,8.0f,1.0f,J3DFrameCtrl::EMode_LOOP}
};
@@ -280,7 +269,6 @@ void daNpc_Km1_c::setAnm_ATR(int param_1) {
/* 00000B50-00000C0C .text anmAtr__11daNpc_Km1_cFUs */
void daNpc_Km1_c::anmAtr(unsigned short param_1) {
if(param_1 == 6){
if(field_0x7D6 == 0){
field_0x7CC = 0xFF;
@@ -302,7 +290,6 @@ void daNpc_Km1_c::anmAtr(unsigned short param_1) {
/* 00000C0C-00000C64 .text setStt__11daNpc_Km1_cFSc */
void daNpc_Km1_c::setStt(signed char param_1) {
s8 uVar1 = field_0x7D0;
field_0x7D0 = param_1;
switch((s8)field_0x7D0) {
@@ -317,15 +304,14 @@ void daNpc_Km1_c::setStt(signed char param_1) {
break;
}
}
/* 00000C64-00000C6C .text next_msgStatus__11daNpc_Km1_cFPUl */
u16 daNpc_Km1_c::next_msgStatus(unsigned long*) {
return fopMsgStts_MSG_ENDS_e;
}
/* 00000C6C-00000C74 .text getMsg__11daNpc_Km1_cFv */
u32 daNpc_Km1_c::getMsg() {
return 0;
}
@@ -342,7 +328,6 @@ void daNpc_Km1_c::eventOrder() {
/* 00000CC4-00000D04 .text checkOrder__11daNpc_Km1_cFv */
void daNpc_Km1_c::checkOrder() {
if(eventInfo.checkCommandDemoAccrpt()){
return;
}
@@ -359,7 +344,6 @@ void daNpc_Km1_c::checkOrder() {
/* 00000D04-00000E94 .text lookBack__11daNpc_Km1_cFv */
void daNpc_Km1_c::lookBack() {
cXyz vec1;
cXyz vec2 = current.pos;
vec2.y = eyePos.y;
@@ -400,7 +384,6 @@ void daNpc_Km1_c::lookBack() {
/* 00000E94-00000F14 .text chkAttention__11daNpc_Km1_cFv */
bool daNpc_Km1_c::chkAttention() {
dAttention_c& attention = dComIfGp_getAttention();
if(attention.LockonTruth() != 0){
return this == attention.LockonTarget(0);
@@ -411,7 +394,6 @@ bool daNpc_Km1_c::chkAttention() {
/* 00000F14-00000F78 .text setAttention__11daNpc_Km1_cFv */
void daNpc_Km1_c::setAttention() {
f32 f1 = current.pos.z;
f32 f2 = current.pos.y + l_HIO.mPrmTbl.mAttentionArrowYOffset;
@@ -425,7 +407,6 @@ void daNpc_Km1_c::setAttention() {
/* 00000F78-00000FA4 .text decideType__11daNpc_Km1_cFi */
bool daNpc_Km1_c::decideType(int param_1) {
field_0x7D3 = 0xFF;
switch(fopAcM_GetName(this)){
case PROC_NPC_KM1:
@@ -492,7 +473,6 @@ void daNpc_Km1_c::privateCut() {
/* 00001144-00001164 .text endEvent__11daNpc_Km1_cFv */
void daNpc_Km1_c::endEvent() {
dComIfGp_event_onEventFlag(8);
field_0x7CB = 0xFF;
@@ -500,7 +480,6 @@ void daNpc_Km1_c::endEvent() {
/* 00001164-000011C4 .text event_proc__11daNpc_Km1_cFv */
void daNpc_Km1_c::event_proc() {
if(!mEventCut.cutProc()){
privateCut();
}
@@ -510,7 +489,6 @@ void daNpc_Km1_c::event_proc() {
/* 000011C4-00001270 .text set_action__11daNpc_Km1_cFM11daNpc_Km1_cFPCvPvPv_iPv */
bool daNpc_Km1_c::set_action(ActionFunc i_action, void* param_2) {
if(field_0x6F4 != i_action){
if(field_0x6F4 != 0){
field_0x7D5 = 0xFF;
@@ -525,7 +503,6 @@ bool daNpc_Km1_c::set_action(ActionFunc i_action, void* param_2) {
/* 00001270-00001368 .text wait01__11daNpc_Km1_cFv */
BOOL daNpc_Km1_c::wait01() {
if(field_0x7C5 != 0){
bool set_stt = true;
field_0x7B7 = 0xFF;
@@ -574,7 +551,6 @@ BOOL daNpc_Km1_c::talk01() {
/* 000013F8-000014AC .text wait_action1__11daNpc_Km1_cFPv */
int daNpc_Km1_c::wait_action1(void*) {
if(field_0x7D5 == 0){
setStt(1);
field_0x7D5 += 1;
@@ -599,7 +575,6 @@ int daNpc_Km1_c::wait_action1(void*) {
/* 000014AC-00001548 .text demo__11daNpc_Km1_cFv */
u8 daNpc_Km1_c::demo() {
if(demoActorID == 0){
if(field_0x7C7 != 0){
field_0x7C7 = 0;
@@ -649,7 +624,6 @@ BOOL daNpc_Km1_c::_draw() {
/* 000016AC-00001808 .text _execute__11daNpc_Km1_cFv */
BOOL daNpc_Km1_c::_execute() {
if(field_0x7B8 == 0){
field_0x774 = current.pos;
field_0x76C = current.angle;
@@ -680,7 +654,6 @@ BOOL daNpc_Km1_c::_execute() {
/* 00001808-0000188C .text _delete__11daNpc_Km1_cFv */
BOOL daNpc_Km1_c::_delete() {
fopAcM_GetID(this);
dComIfG_resDeleteDemo(&field_0x6C4,"Km");
@@ -704,13 +677,14 @@ static BOOL CheckCreateHeap(fopAc_ac_c* actor) {
/* 000018AC-00001A1C .text _create__11daNpc_Km1_cFv */
cPhs_State daNpc_Km1_c::_create() {
static int a_heap_size_tbl[1] = {0x000272E0};
static int a_heap_size_tbl[] = {
0x272E0
};
#if VERSION > VERSION_DEMO
fopAcM_SetupActor(this, daNpc_Km1_c);
#endif
if (!decideType(fopAcM_GetParam(this) & 0xFF )) {
return cPhs_ERROR_e;
}
@@ -745,7 +719,6 @@ cPhs_State daNpc_Km1_c::_create() {
/* 00001E4C-00002158 .text CreateHeap__11daNpc_Km1_cFv */
BOOL daNpc_Km1_c::CreateHeap() {
static u8 a_tex_pattern_num_tbl[1] = {TEXPATTERN_MABA};
J3DModelData *a_mdl_data;
@@ -759,9 +732,8 @@ BOOL daNpc_Km1_c::CreateHeap() {
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL,
0x80000, 0x11020002
);
if (mpMorf){
if (mpMorf){
if(mpMorf->getModel()) {
m_head_jnt_num = a_mdl_data->getJointName()->getIndex("head");
JUT_ASSERT(VERSION_SELECT(1335, 1344, 1344, 1344), m_head_jnt_num >= 0);
m_backbone_jnt_num = a_mdl_data->getJointName()->getIndex("backbone");
@@ -786,6 +758,7 @@ BOOL daNpc_Km1_c::CreateHeap() {
}
return FALSE;
}
/* 00002158-00002178 .text daNpc_Km1_Create__FP10fopAc_ac_c */
static cPhs_State daNpc_Km1_Create(fopAc_ac_c* i_this) {
return ((daNpc_Km1_c*)i_this)->_create();
src/d/actor/d_a_npc_photo.cpp
-2
View File
@@ -798,7 +798,6 @@ bool daNpcPhoto_c::_delete() {
/* 000010A4-0000125C .text _draw__12daNpcPhoto_cFv */
bool daNpcPhoto_c::_draw() {
J3DModel* model = mpMorf->getModel();
J3DModelData *model_data = model->getModelData();
g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
@@ -1939,7 +1938,6 @@ void daNpcPhoto_c::setMtx() {
/* 000040B8-0000432C .text chkAttention__12daNpcPhoto_cFv */
void daNpcPhoto_c::chkAttention() {
if(mEventCut.getAttnFlag()) {
mLookAtPos = mEventCut.getAttnPos();
field_0x9D6 = 1;
src/d/actor/d_a_obj_correct.cpp
-1
View File
@@ -106,7 +106,6 @@ void* daObjCorrect::Act_c::chk_try_actor2(daObjTry::Act_c* actor, daObjTry::Type
if (type == actor->prm_get_type()) {
f32 dist = actor->current.pos.abs2(current.pos);
if (dist < i_depression_r_sq) {
bool should_return;
if (dist < i_sw_r_sq) {
should_return = prm_get_swSave() == actor->prm_get_swSave();
src/d/actor/d_a_obj_doguu.cpp
-2
View File
@@ -222,7 +222,6 @@ void daObjDoguu_c::CreateInit() {
field_0x8A2 = true;
field_0x8AC = 14;
} else if (dComIfGs_isEventBit(0x1480) && dComIfGs_isEventBit(0x1440) && dComIfGs_isEventBit(0x1410)) {
mBckHead.setFrame(mBckHead.getEndFrame());
mBckBody.setFrame(mBckBody.getEndFrame());
mBckCrystal.setFrame(mBckCrystal.getEndFrame());
@@ -230,7 +229,6 @@ void daObjDoguu_c::CreateInit() {
field_0x8A1 = true;
field_0x8A2 = false;
field_0x8AC = 14;
} else {
field_0x8A1 = false;
if (
src/d/actor/d_a_obj_pfall.cpp
-3
View File
@@ -74,7 +74,6 @@ void daObj_Pfall_c::setAnm() {
/* 00000190-000004DC .text set_mtx__13daObj_Pfall_cFv */
void daObj_Pfall_c::set_mtx() {
static cXyz offset_pos_left(-35.0f, 0.0f, 105.0f);
static cXyz offset_pos_right(35.0f, 0.0f, -105.0f);
@@ -325,7 +324,6 @@ void daObj_Pfall_c::mode_wait_init() {
/* 00000F1C-00000FC0 .text mode_wait__13daObj_Pfall_cFv */
void daObj_Pfall_c::mode_wait() {
if(dLib_checkPlayerInCircle(current.pos, 100.0f, 100.0f)
&& dComIfGp_getPlayer(0)->speedF == 0.0f
&& cLib_calcTimer(&field_0x3B8) == 0) {
@@ -370,7 +368,6 @@ void daObj_Pfall_c::mode_proc_call() {
/* 00001130-000012F4 .text _execute__13daObj_Pfall_cFv */
bool daObj_Pfall_c::_execute() {
attention_info.position = current.pos;
eyePos = current.pos;
src/d/actor/d_a_player_main.cpp
-1
View File
@@ -8435,7 +8435,6 @@ BOOL daPy_lk_c::procIceSlipFallUp() {
/* 8011970C-801197D4 .text procIceSlipAlmostFall_init__9daPy_lk_cFv */
BOOL daPy_lk_c::procIceSlipAlmostFall_init() {
commonProcInit(daPyProc_ICE_SLIP_ALMOST_FALL_e);
current.angle.y = cM_atan2s(m36AC.x, m36AC.z);
int direction = getDirectionFromAngle(current.angle.y - shape_angle.y);
src/d/actor/d_a_tag_event.cpp
+3 -5
View File
@@ -514,12 +514,10 @@ cPhs_State daTag_Event_c::create() {
if (getType() == 0xD) {
setActio(ACTION_SPE_ARRIVAL);
} else if (mEventIdx != -1 && (swbit == 0xFF || !dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this)))) {
setActio(ACTION_ARRIVAL);
} else {
if (mEventIdx != -1 && (swbit == 0xFF || !dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this)))) {
setActio(ACTION_ARRIVAL);
} else {
setActio(ACTION_WAIT);
}
setActio(ACTION_WAIT);
}
shape_angle.x = shape_angle.z = 0;
src/d/d_cc_uty.cpp
+3 -3
View File
@@ -223,7 +223,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) {
fopAcM_seStart(tgActor, JA_SE_LK_LAST_HIT, 0);
pauseTime = 6 + g_regHIO.mChild->mShortRegs[7];
pauseTime = 6 + REG0_S(7);
if (atInfo->pParticlePos) {
dComIfGp_particle_set(dPa_name::ID_COMMON_0010, atInfo->pParticlePos);
@@ -241,7 +241,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) {
if (atInfo->mResultingAttackType == 9) {
pauseTime = 6;
} else {
pauseTime = 4 + g_regHIO.mChild->mShortRegs[6];
pauseTime = 4 + REG0_S(6);
}
} else {
if (fopAcM_GetName(tgActor) == PROC_MT) {
@@ -254,7 +254,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) {
} else {
fopAcM_seStart(tgActor, at_se_get(atInfo->mpObj), r29);
}
pauseTime = 1 + g_regHIO.mChild->mShortRegs[5];
pauseTime = 1 + REG0_S(5);
}
}
src/d/d_kankyo.cpp
+2 -2
View File
@@ -350,11 +350,11 @@ void envcolor_init() {
stage_vrbox_info_class* vrbox = dComIfGp_getStageVrboxInfo();
for (int i = 0; i < 20; i++) {
g_regHIO.mChild[3].mFloatRegs[i] = 0.0f;
REG3_F(i) = 0.0f;
}
for (int i = 0; i < 10; i++) {
g_regHIO.mChild[3].mShortRegs[i] = 0;
REG3_S(i) = 0;
}
#if VERSION > VERSION_DEMO