mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 20:27:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_crod almost fully OK (#270)

Browse Source
This commit is contained in:
TakaRikka
2023-02-05 07:09:29 -08:00
committed by GitHub
parent 1124554ae1
commit 24b833b205
61 changed files with 1386 additions and 4080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+14 -9
View File
@@ -12428,7 +12428,7 @@ void daAlink_c::playerInit() {
mSheathModel = mpSwASheathModel;
field_0x814.Init(120, 0xFF, this);
field_0x306c = shape_angle.y + field_0x59e;
field_0x306c = shape_angle.y + mBodyAngleY;
for (u16 i = 0; i < 3; i++) {
mAtCps[i].Set(*(dCcD_SrcCps*)l_atCpsSrc);
@@ -13798,7 +13798,7 @@ void daAlink_c::setCollision() {
if (checkIronBallWaitAnime() || field_0x351c.absXZ() > lit_8782) {
field_0x306c = field_0x351c.atan2sX_Z();
} else {
field_0x306c = shape_angle.y + field_0x59e;
field_0x306c = shape_angle.y + mBodyAngleY;
}
g_dComIfG_gameInfo.play.mCcs.Set(&field_0x850[0]);
@@ -16290,8 +16290,8 @@ void daAlink_c::setBodyAngleXReadyAnime(int param_0) {
angle_x >>= 1; // divide by 2 adds extra addze?
}
cLib_addCalcAngleS(&mLookAngleY, angle_x, 4, 0x0C00, 0x0180);
field_0x310a = mLookAngleY;
cLib_addCalcAngleS(&mBodyAngleX, angle_x, 4, 0x0C00, 0x0180);
field_0x310a = mBodyAngleX;
}
/* 800BB324-800BB408 0B5C64 00E4+00 2/2 0/0 0/0 .text setMagicArmorBrk__9daAlink_cFi */
@@ -17973,8 +17973,8 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) {
if (i_checkWolf()) {
shape_angle.z = 0;
mLookAngleY = 0;
field_0x59e = 0;
mBodyAngleX = 0;
mBodyAngleY = 0;
} else if (!i_checkReinRide() && !checkBoardRide()) {
shape_angle.x = 0;
shape_angle.z = 0;
@@ -17994,7 +17994,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) {
if (field_0x3190 != 0) {
field_0x3190 = 0;
field_0x59e = 0;
mBodyAngleY = 0;
}
mFishingArm1Angle = csXyz::Zero;
@@ -18733,9 +18733,14 @@ extern "C" asm void __dt__9cCcD_SttsFv() {
#pragma pop
/* 801410EC-8014111C 13BA2C 0030+00 1/1 0/0 0/0 .text __ct__16daPy_actorKeep_cFv */
daPy_actorKeep_c::daPy_actorKeep_c() {
clearData();
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void __ct__16daPy_actorKeep_cFv() {
nofralloc
#include "asm/d/a/d_a_alink/__ct__16daPy_actorKeep_cFv.s"
}
#pragma pop
/* 8014111C-8014112C 13BA5C 0010+00 1/1 0/0 0/0 .text
* onNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2 */