PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 21:45:00 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

fix fakes

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2024-04-07 01:05:58 -03:00
parent 5c59226db4
commit f2c5292e7b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/engine/fox_enmy.c
View File

@ -729,8 +729,8 @@ bool func_enmy_8006326C(Vec3f* arg0, Vec3f* arg1, ObjectId objId, Object* obj) {
Vec3f sp50;
Vec3f sp44;
s32 colId;
s32 pad1[3];
f32 sp30;
s32 pad1[2];
f32 sp30[2];
s32 pad2;
sp74.x = arg0->x - obj->pos.x;
@ -764,7 +764,7 @@ bool func_enmy_8006326C(Vec3f* arg0, Vec3f* arg1, ObjectId objId, Object* obj) {
} else if (objId == OBJ_BOSS_313) {
colId = COL1_8;
}
if (func_col1_800998FC(&sp5C, &sp50, arg1, colId, &sp44, &sp30) > 0) {
if (func_col1_800998FC(&sp5C, &sp50, arg1, colId, &sp44, sp30) > 0) {
return true;
}
} else {
@ -2798,14 +2798,18 @@ void TexturedLine_Update(TexturedLine* texLine) {
if (texLine->timer != 0) {
texLine->timer--;
}
sp34 = texLine->unk_04.x - texLine->unk_10.x;
sp30 = texLine->unk_04.y - texLine->unk_10.y;
sp2C = texLine->unk_04.z - texLine->unk_10.z;
texLine->unk_20 = Math_Atan2F(sp34, sp2C);
texLine->unk_1C = -Math_Atan2F(sp30, sqrtf(SQ(sp34) + SQ(sp2C)));
if (texLine->mode != 4) {
texLine->unk_24 = sqrtf(SQ(sp34) + SQ(sp30) + SQ(sp2C));
}
if (gGameState == GSTATE_PLAY) {
if (((texLine->mode == 1) || (texLine->mode == 101) || (texLine->mode == 50)) &&
(gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (gPlayer[0].unk_1F4 == 0)) {

5
src/engine/fox_play.c
View File

@ -1191,8 +1191,7 @@ bool func_play_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4,
Vec3f sp54;
Vec3f sp48;
Vec3f sp3C;
f32 pad1;
f32 sp34;
f32 sp34[2];
s32 colId;
s32 useCol2;
@ -1361,7 +1360,7 @@ bool func_play_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4,
}
if (!useCol2) {
if (func_col1_800998FC(&sp54, &sp48, arg8, colId, &sp3C, &sp34) > 0) {
if (func_col1_800998FC(&sp54, &sp48, arg8, colId, &sp3C, sp34) > 0) {
return true;
}
} else {