mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-07 09:45:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_gra2 work (#2482)

Browse Source 
* Tiny start on d_a_obj_gra2

* Initial work

* Solid work done

* More work

* work on some rolling functions and deme camera

* Almost all functions worked on

* All functions worked on

* Fixed some BaseNpc functions I broke

* PR Cleanup

* PR cleanup part 2
This commit is contained in:
Carco_21
2025-06-16 09:40:16 -04:00
committed by GitHub
parent bb008ca9cf
commit ba4ea76d4d
9 changed files with 4725 additions and 3543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc2.cpp
+9 -9
View File
@@ -47,11 +47,11 @@ static BOOL daBaseNpc_subIdx(int i_step, int i_num, u16* i_idx, BOOL i_closed) {
}
/* 8014D5C4-8014D620 147F04 005C+00 2/2 0/0 0/0 .text daBaseNpc_incIdx__FiPUsii */
static void daBaseNpc_incIdx(int i_pathNo, u16* i_pathIdx, BOOL i_pathClosed, int i_pathDirection) {
static BOOL daBaseNpc_incIdx(int i_pathNo, u16* i_pathIdx, BOOL i_pathClosed, int i_pathDirection) {
if (i_pathDirection < 0) {
daBaseNpc_subIdx(1, i_pathNo, i_pathIdx, i_pathClosed);
return daBaseNpc_subIdx(1, i_pathNo, i_pathIdx, i_pathClosed);
} else {
daBaseNpc_addIdx(1, i_pathNo, i_pathIdx, i_pathClosed);
return daBaseNpc_addIdx(1, i_pathNo, i_pathIdx, i_pathClosed);
}
}
@@ -180,8 +180,8 @@ s32 daBaseNpc_path_c::chkPnt(cXyz i_pos) {
}
/* 8014DAC4-8014DB04 148404 0040+00 0/0 0/0 3/3 .text setNextPnt__16daBaseNpc_path_cFv */
void daBaseNpc_path_c::setNextPnt() {
daBaseNpc_incIdx(mPathInfo->m_num, &mIdx, dPath_ChkClose(mPathInfo), mDirection);
BOOL daBaseNpc_path_c::setNextPnt() {
return daBaseNpc_incIdx(mPathInfo->m_num, &mIdx, dPath_ChkClose(mPathInfo), mDirection);
}
/* 8014DB04-8014DB0C 148444 0008+00 0/0 0/0 3/3 .text getIdx__16daBaseNpc_path_cFv */
@@ -475,9 +475,9 @@ int daBaseNpc_c::setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_speed, f32 i_mor
/* 8014EEE4-8014EF28 149824 0044+00 0/0 0/0 1/1 .text
* setBckAnm__11daBaseNpc_cFP15J3DAnmTransformfiiib */
void daBaseNpc_c::setBckAnm(J3DAnmTransform* i_anm, f32 i_speed, int i_mode, int i_start,
int daBaseNpc_c::setBckAnm(J3DAnmTransform* i_anm, f32 i_speed, int i_mode, int i_start,
int i_end, bool i_modify) {
mBck.init(i_anm, TRUE, i_mode, i_speed, i_start, i_end, i_modify);
return mBck.init(i_anm, TRUE, i_mode, i_speed, i_start, i_end, i_modify);
}
/* 8014EF28-8014EF64 149868 003C+00 0/0 0/0 1/1 .text getTexPtrnAnmP__11daBaseNpc_cFPci
@@ -488,9 +488,9 @@ J3DAnmTransform* daBaseNpc_c::getTexPtrnAnmP(char* i_arcName, int i_resIdx) {
/* 8014EF64-8014EFA4 1498A4 0040+00 0/0 0/0 1/1 .text
* setBtpAnm__11daBaseNpc_cFP16J3DAnmTexPatternP12J3DModelDatafi */
void daBaseNpc_c::setBtpAnm(J3DAnmTexPattern* i_anm, J3DModelData* i_modelData, f32 i_speed,
int daBaseNpc_c::setBtpAnm(J3DAnmTexPattern* i_anm, J3DModelData* i_modelData, f32 i_speed,
int i_mode) {
mBtp.init(i_modelData, i_anm, TRUE, i_mode, i_speed, 0, -1);
return mBtp.init(i_modelData, i_anm, TRUE, i_mode, i_speed, 0, -1);
}
/* 8014EFA4-8014EFF0 1498E4 004C+00 2/0 0/0 2/0 .text attnSttsOn__11daBaseNpc_cFii */