mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-10-26 12:05:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match ActorBomb (#158)

Browse Source 
* actor prog from overlay 0

* fix build issues

* ActorBomb OK for eur

* ActorBomb OK for eur1, usa and jp

* fix regressions
This commit is contained in:
Yanis
2026-10-08 03:35:12 +02:00
committed by GitHub
parent 2c723299b7
commit 89dedbb3d1
86 changed files with 746 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp
+5 -4
View File
@@ -49,15 +49,16 @@ MapObjectUnkSWSW_40::MapObjectUnkSWSW_40(G3d_Model *pModel) :
this->ModelRender::func_ov000_02057c38(0x6, 0x2);
}
void MapObjectUnkSWSW_40::vfunc_1C(UnkSystem4_vfunc_1C *param1) {
if (param1->mUnk_00[0x1] == this->mUnk_60) {
void MapObjectUnkSWSW_40::vfunc_1C(G3d_RenderState *param1) {
if (param1->currentCmd[1] == this->mUnk_60) {
param1->mUnk_B4->mUnk_00 &= ~0x2;
MtxFx33_InitXRotation(&param1->mUnk_B4->mUnk_28, SIN((u16) this->mUnk_68), COS((u16) this->mUnk_68));
}
if (param1->mUnk_00[0x1] != this->mUnk_64) {
if (param1->currentCmd[1] != this->mUnk_64) {
return;
}
param1->mUnk_B4->mUnk_00 &= ~0x2;
MtxFx33_InitXRotation(&param1->mUnk_B4->mUnk_28, SIN((u16) this->mUnk_6A), COS((u16) this->mUnk_6A));
}
@@ -492,7 +493,7 @@ ActorUnkNSSW *MapObjectUnkSWSW::func_ov032_02121dc8(VecFx32 *param1) {
params.func_ov000_020975f8();
params.mInitialAngle = this->mAngle.angle_s;
params.mUnk_28 = *(unk32 *) &this->mUnk_38;
params.mUnk_28 = this->mRef.Get32(); //! TODO: ref conflicts
VecFx32_Init(param1->x, param1->y, param1->z, &params.mInitialPos);