diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-12-19 11:06:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 12:06:32 -0700 |
| commit | ca71275bbecc7db9a4eeca3a6ac4215b66de4318 (patch) | |
| tree | c2851f8cec211216fe0cb6a31a0260a62fc3bf53 /src/d/a/d_a_player.cpp | |
| parent | 1114b13da81ab0b52fd4bb56a32f32331a21e581 (diff) | |
big d_a_alink pass (#214)
* d_a_alink pass1 wip
* more d_a_alink work
* remove asm
* more daalink work
* 20% dol code decompiled
* fixed some nonmatchings for building
* a few daalink functions and labeling some HIO data
Diffstat (limited to 'src/d/a/d_a_player.cpp')
| -rw-r--r-- | src/d/a/d_a_player.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index f103a528fc..87abd94b82 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -245,7 +245,7 @@ int daPy_boomerangMove_c::posMove(cXyz* param_0, s16* param_1, fopAc_ac_c* param daAlink_c* link = daAlink_getAlinkActorClass(); if ((param_2 == NULL || !link->checkBoomerangCarry(param_2)) && (m_eventKeepFlg == 0 || field_0x0 != 0)) { - s16 tmp = (m_dropAngleY + link->mCollisionRot.y) + cM_rndF(2048.0f); + s16 tmp = (m_dropAngleY + link->shape_angle.y) + cM_rndF(2048.0f); param_0->x = link->current.pos.x + field_0x8 * cM_ssin(tmp); param_0->z = link->current.pos.z + field_0x8 * cM_scos(tmp); @@ -472,7 +472,7 @@ void* daPy_anmHeap_c::loadData(u16 i_resId) { if (mArcNo == 0xFFFF) { dComIfGp_getAnmArchive()->readIdxResource(mBuffer, mBufferSize, i_resId); JKRHeap* heap = setAnimeHeap(); - void* data = J3DAnmLoaderDataBase::load(mBuffer, UNK_FLAG0); + void* data = J3DAnmLoaderDataBase::load(mBuffer, J3DLOADER_UNK_FLAG0); mDoExt_setCurrentHeap(heap); return data; } @@ -607,7 +607,7 @@ void daPy_sightPacket_c::setSight() { mDoLib_project(&mPos, &tmp); mDoMtx_stack_c::transS(tmp.x, tmp.y, tmp.z); mDoMtx_stack_c::scaleM(32.0f, 32.0f, 32.0f); - mDoMtx_stack_c::copy(field_0x14); + mDoMtx_copy(mDoMtx_stack_c::get(), field_0x14); dComIfGd_set2DXlu(this); } @@ -635,7 +635,7 @@ BOOL daPy_py_c::checkMasterSwordEquip() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool daPy_py_c::checkWoodShieldEquip() { +asm BOOL daPy_py_c::checkWoodShieldEquip() { nofralloc #include "asm/d/a/d_a_player/checkWoodShieldEquip__9daPy_py_cFv.s" } |