mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 21:18:23 -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_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();