d_a_arrow work (#2139)

* WIP commit, about halfway done

* More progress, fixed up some issues

* Most functions match, minor issues in draw/create, dtor needs particle work

* Forgot to remove NONMATCHING define

---------

Co-authored-by: GinNoOokami <noreply>
This commit is contained in:
Jeff Padgham
2024-04-26 19:12:56 -07:00
committed by GitHub
parent 9e80bf0d84
commit c163dc9ed3
11 changed files with 1384 additions and 195 deletions
+3 -3
View File
@@ -265,12 +265,12 @@ void daAlink_c::setDashDamage() {
/* 800D7768-800D77C8 0D20A8 0060+00 2/2 0/0 3/3 .text
* checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo */
bool daAlink_c::checkIcePolygonDamage(cBgS_PolyInfo* i_poly) {
BOOL daAlink_c::checkIcePolygonDamage(cBgS_PolyInfo* i_poly) {
if (dComIfG_Bgsp().GetPolyAtt0(*i_poly) == 8 && dKy_pol_argument_get(i_poly) & 0x60) {
return true;
return TRUE;
}
return false;
return FALSE;
}
/* 800D77C8-800D7820 0D2108 0058+00 8/8 0/0 0/0 .text checkMagicArmorNoDamage__9daAlink_cFv */
+1 -1
View File
@@ -204,7 +204,7 @@ asm cM3dGSph::~cM3dGSph() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dJntCol_c::getArrowOffsetPosAndAngle(cXyz const* param_0, csXyz const* param_1,
asm int dJntCol_c::getArrowOffsetPosAndAngle(cXyz const* param_0, csXyz const* param_1,
cXyz* param_2, cXyz* param_3) const {
nofralloc
#include "asm/d/d_jnt_col/getArrowOffsetPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz.s"