izzy/Starship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Starship.git synced 2026-07-05 15:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

sf_77e40 - Match 30 more funcs (#69)

Browse Source 
* Match func_8007C9E0

* Match func_8007CAF0

* Match func_8007CC00

* Match func_8007CCBC

* Match func_8007CD7C

* Match func_8007CEBC

* Match func_8007CF30

* Match 4 more funcs

* Match 5 more funcs

* Match func_8007D2F4

* Match func_8007D55C

* func_8007D748

* Match several more

* Match func_8007DB70

* Match func_8007DED4

* Match func_8007E014

* Match another handful

* obj2F4->unk_0E8 -> obj2F4->vel

* Object_8C.unk_54 -> Object_8C.vel

* obj80->unk_64 -> obj80->vel

* obj408->unk_06C -> obj408->vel

* Name gravity

* obj8C names

* Run make format
This commit is contained in:
Ryan Myers
2024-01-05 09:53:32 -06:00
committed by GitHub
parent fb7cf7ce65
commit ec3bc32c5c
14 changed files with 910 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+6 -5
View File
@@ -377,12 +377,13 @@ void func_8007C8C4(Object_8C*);
void func_8007C85C(f32 posX, f32 posY, f32 posZ, f32 arg3);
void func_8007C9E0(Object_8C*);
void func_8007CAF0(Object_8C*);
void func_8007D074(f32, f32, f32, f32);
void func_8007D0E0(f32, f32, f32, f32);
void func_8007D10C(f32, f32, f32, f32);
void func_8007D1E0(f32, f32, f32, f32);
void func_8007CF30(f32 posX, f32 posY, f32 posZ, f32 scale2);
void func_8007D074(f32 posX, f32 posY, f32 posZ, f32 scale2);
void func_8007D0E0(f32 posX, f32 posY, f32 posZ, f32 scale2);
void func_8007D10C(f32 posX, f32 posY, f32 posZ, f32 scale2);
void func_8007D1E0(f32 posX, f32 posY, f32 posZ, f32 scale2);
void func_8007D24C(f32 posX, f32 posY, f32 posZ, f32 scale2);
void func_8007D2C8(f32, f32, f32, f32);
void func_8007D24C(f32, f32, f32, f32);
void func_8007D2F4(Object_8C*);
void func_8007D55C(Object_8C*);
void func_8007D748(Object_8C*);
include/hud.h
+1 -1
View File
@@ -54,7 +54,7 @@ extern s32 D_1011D90[];
extern s32 D_1011E60[];
extern s32 D_1013580[];
extern s32 D_1013700[];
extern s32 D_20031B0[];
extern Gfx D_20031B0[];
extern Gfx D_2010A30[];
extern u16 D_3000B20[];
extern u16 D_30013E0[];
include/sf64math.h
+1 -1
View File
@@ -63,7 +63,7 @@ void Matrix_Push(Matrix** mtxStack);
void Matrix_Pop(Matrix** mtxStack);
void Matrix_Mult(Matrix*, Matrix*, u8);
void Matrix_Translate(Matrix*, f32, f32, f32, u8);
void Matrix_Scale(Matrix*, f32, f32, f32, u8);
void Matrix_Scale(Matrix* mtx, f32 xScale, f32 yScale, f32 zScale, u8 mode);
void Matrix_RotateX(Matrix*, f32, u8);
void Matrix_RotateY(Matrix*, f32, u8);
void Matrix_RotateZ(Matrix*, f32, u8);
include/sf64object.h
+6 -6
View File
@@ -148,7 +148,7 @@ typedef struct {
/* 0x54 */ s32 unk_54;
/* 0x58 */ char pad58[8];
/* 0x60 */ f32 unk_60;
/* 0x64 */ Vec3f unk_64;
/* 0x64 */ Vec3f vel;
/* 0x70 */ Vec3f sfxPos;
/* 0x7C */ char pad7C[4];
} Object_80; // size = 0x80
@@ -192,7 +192,7 @@ typedef struct {
/* 0x4E */ s16 unk_4E;
/* 0x50 */ u16 timer_50;
/* 0x52 */ char pad52[0x2];
/* 0x54 */ Vec3f unk_54;
/* 0x54 */ Vec3f vel;
/* 0x60 */ Vec3f unk_60;
/* 0x6C */ f32 scale1;
/* 0x70 */ f32 scale2;
@@ -223,9 +223,9 @@ typedef struct {
/* 0x064 */ s16 unk_064;
/* 0x066 */ s16 unk_066;
/* 0x068 */ f32 unk_068;
/* 0x06C */ Vec3f unk_06C;
/* 0x06C */ Vec3f vel;
/* 0x078 */ char pad78[0xC];
/* 0x084 */ f32 unk_084;
/* 0x084 */ f32 gravity;
/* 0x088 */ s16 unk_088;
/* 0x08A */ s16 unk_08A;
/* 0x08C */ char pad8C[6];
@@ -320,10 +320,10 @@ typedef struct {
/* 0x0D8 */ Vec3f unk_0D8;
/* 0x0E4 */ s16 unk_0E4;
/* 0x0E6 */ s16 unk_0E6;
/* 0x0E8 */ Vec3f unk_0E8;
/* 0x0E8 */ Vec3f vel;
/* 0x0F4 */ Vec3f unk_0F4;
/* 0x100 */ Vec3f sfxPos;
/* 0x10C */ f32 unk_10C;
/* 0x10C */ f32 gravity;
/* 0x110 */ f32 scale;
/* 0x114 */ f32 unk_114;
/* 0x118 */ f32 unk_118;
include/variables.h
+5
View File
@@ -216,6 +216,11 @@ extern s32 D_800D173C[];
extern Gfx* D_800D178C[6];
extern s32 D_800D18F0[]; //[6][4]?
extern s32 D_800D1950[];
extern Gfx* D_800D17A4[];
extern f32 D_800D17F8[];
extern u8 D_800D184C[][4];
extern Gfx* D_800D18A0[];
extern Gfx D_6004900[];
// sf_hud
extern s16 D_800D1970;
src/main/fox_360.c
+11 -11
View File
@@ -1967,15 +1967,15 @@ void func_800319AC(Object_2F4* this) {
sp9C.x = spBC * sp9C.z;
sp9C.z = spB4 * sp9C.z;
this->unk_0E8.x = this->unk_148 + sp9C.x;
this->unk_0E8.y = this->unk_14C + sp9C.y;
this->unk_0E8.z = this->unk_144 + sp9C.z;
this->vel.x = this->unk_148 + sp9C.x;
this->vel.y = this->unk_14C + sp9C.y;
this->vel.z = this->unk_144 + sp9C.z;
this->unk_148 -= (this->unk_148 * 0.1f);
this->unk_14C -= (this->unk_14C * 0.1f);
this->unk_144 -= (this->unk_144 * 0.1f);
if ((this->obj.pos.y < D_80177940 + 40.0f) && (this->unk_0E8.y < 0.0f)) {
if ((this->obj.pos.y < D_80177940 + 40.0f) && (this->vel.y < 0.0f)) {
this->obj.pos.y = D_80177940 + 40.0f;
this->unk_0E8.y = 0.0f;
this->vel.y = 0.0f;
}
if (this->unk_050 != 0) {
this->unk_050 = 0;
@@ -2054,14 +2054,14 @@ void func_800319AC(Object_2F4* this) {
if (((gCurrentLevel == LEVEL_BOLSE) || (gCurrentLevel == LEVEL_SECTOR_Z)) && (this->timer_0C6 == 0)) {
var_a3 = 3;
}
sp90.x = this->unk_0E8.x;
sp90.y = this->unk_0E8.y;
sp90.z = this->unk_0E8.z;
sp90.x = this->vel.x;
sp90.y = this->vel.y;
sp90.z = this->vel.z;
temp_v0_27 = func_8006351C(this->index, &this->obj.pos, &sp90, var_a3);
if (temp_v0_27 != 0) {
this->obj.pos.x -= this->unk_0E8.x;
this->obj.pos.y -= this->unk_0E8.y;
this->obj.pos.z -= this->unk_0E8.z;
this->obj.pos.x -= this->vel.x;
this->obj.pos.y -= this->vel.y;
this->obj.pos.z -= this->vel.z;
if ((temp_v0_27 >= 2) && (this->unk_0E4 >= 0xB)) {
this->timer_0BE = 2;
this->obj.status = 3;
src/main/fox_43AC0.c
+4 -4
View File
@@ -67,15 +67,15 @@ void func_80042FF4(Object_2F4* obj2F4, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f
obj2F4->obj.rot.x = arg4;
obj2F4->obj.rot.y = arg5;
obj2F4->obj.rot.z = arg6;
obj2F4->unk_0E8.x = arg7;
obj2F4->unk_0E8.y = arg8;
obj2F4->unk_0E8.z = arg9;
obj2F4->vel.x = arg7;
obj2F4->vel.y = arg8;
obj2F4->vel.z = arg9;
obj2F4->scale = argA;
obj2F4->timer_0BC = argC;
obj2F4->timer_0BE = 20;
Object_SetInfo(&obj2F4->info, obj2F4->obj.id);
if (gLevelType == LEVELTYPE_PLANET) {
obj2F4->unk_10C = 0.5f;
obj2F4->gravity = 0.5f;
}
}
src/main/fox_beam.c
+5 -5
View File
@@ -9,7 +9,7 @@ void func_80035D30(Object_8C* obj8C, f32 xPos, f32 yPos, f32 zPos) {
obj8C->obj.pos.x = xPos;
obj8C->obj.pos.y = yPos;
obj8C->obj.pos.z = zPos;
obj8C->unk_54.z = 0.0f;
obj8C->vel.z = 0.0f;
obj8C->scale2 = 0.3f;
obj8C->unk_4A = 100;
obj8C->unk_48 = 3;
@@ -1892,9 +1892,9 @@ void func_8003C4D0(PlayerShot* shot, s32 unkD6) {
}
} else if ((obj2F4->obj.id == OBJ_2F4_200) && (obj2F4->scale >= 0.5f) && (unkD6 >= 31)) {
obj2F4->unk_0D4 = shot->playerNum + 1;
obj2F4->unk_0E8.x = sp68 * 0.03f;
obj2F4->unk_0E8.y = sp64 * 0.03f;
obj2F4->unk_0E8.z = sp60 * 0.03f;
obj2F4->vel.x = sp68 * 0.03f;
obj2F4->vel.y = sp64 * 0.03f;
obj2F4->vel.z = sp60 * 0.03f;
obj2F4->obj.status = 3;
obj2F4->timer_0BC = (s32) (Rand_ZeroOne() * 15.0f) + 10;
obj2F4->timer_0BE = 0;
@@ -1942,7 +1942,7 @@ void func_8003C4D0(PlayerShot* shot, s32 unkD6) {
obj8C->unk_4E = 1;
obj8C->unk_44 = 176;
obj8C->unk_4C = 0;
obj8C->unk_54.x = obj8C->unk_54.y = obj8C->unk_54.z = 0.0f;
obj8C->vel.x = obj8C->vel.y = obj8C->vel.z = 0.0f;
obj8C->scale2 = 20.0f;
}
}
src/main/fox_enmy.c
+33 -33
View File
@@ -355,7 +355,7 @@ void func_80061E48(Object_2F4* obj2F4, f32 xPos, f32 yPos, f32 zPos) {
obj2F4->obj.pos.x = xPos;
obj2F4->obj.pos.y = yPos;
obj2F4->obj.pos.z = zPos;
obj2F4->unk_0E8.z = 10.0f;
obj2F4->vel.z = 10.0f;
Object_SetInfo(&obj2F4->info, obj2F4->obj.id);
}
@@ -1343,9 +1343,9 @@ void func_80065380(Object_2F4* obj2F4, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f
obj2F4->obj.id = OBJ_2F4_182;
obj2F4->timer_0BC = (s32) (Rand_ZeroOne() * 10.0f) + 10;
obj2F4->timer_0C2 = 30;
obj2F4->unk_0E8.x = arg4;
obj2F4->unk_0E8.y = arg5;
obj2F4->unk_0E8.z = arg6;
obj2F4->vel.x = arg4;
obj2F4->vel.y = arg5;
obj2F4->vel.z = arg6;
obj2F4->obj.pos.x = xPos;
obj2F4->obj.pos.y = yPos;
obj2F4->obj.pos.z = zPos;
@@ -1695,13 +1695,13 @@ void func_80066254(Object_2F4* obj2F4) {
}
void func_8006654C(Object_2F4* obj2F4) {
obj2F4->unk_10C = 0.4f;
obj2F4->gravity = 0.4f;
if (obj2F4->obj.pos.y <= D_80177940 + 130.0f) {
obj2F4->obj.pos.y = D_80177940 + 130.0f;
obj2F4->unk_0E8.y = 0.0f;
obj2F4->vel.y = 0.0f;
}
obj2F4->unk_0E8.x = __sinf(obj2F4->obj.rot.y * M_DTOR) * (*obj2F4).unk_114;
obj2F4->unk_0E8.z = __cosf(obj2F4->obj.rot.y * M_DTOR) * (*obj2F4).unk_114;
obj2F4->vel.x = __sinf(obj2F4->obj.rot.y * M_DTOR) * (*obj2F4).unk_114;
obj2F4->vel.z = __cosf(obj2F4->obj.rot.y * M_DTOR) * (*obj2F4).unk_114;
switch (obj2F4->unk_0B8) {
case 0:
if (obj2F4->unk_114 < 20.0f) {
@@ -1740,12 +1740,12 @@ void func_8006654C(Object_2F4* obj2F4) {
obj2F4->scale = 0.8f;
if (obj2F4->unk_0D0 != 0) {
obj2F4->obj.status = 3;
obj2F4->unk_0E8.y = (Rand_ZeroOne() * 5.0f) + 6.0f;
obj2F4->vel.y = (Rand_ZeroOne() * 5.0f) + 6.0f;
if (obj2F4->unk_0D0 == 2) {
obj2F4->unk_0E8.y = -2.0f;
obj2F4->vel.y = -2.0f;
}
obj2F4->unk_0E8.z = -15.0f;
obj2F4->unk_10C = 0.5f;
obj2F4->vel.z = -15.0f;
obj2F4->gravity = 0.5f;
func_8007D2C8(obj2F4->obj.pos.x, obj2F4->obj.pos.y + 30.0f, obj2F4->obj.pos.z, 13.0f);
Audio_PlaySfx(0x2903A008, &obj2F4->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
@@ -1755,9 +1755,9 @@ void func_8006684C(Object_2F4* obj2F4) {
s32 pad;
if (obj2F4->timer_0BE != 0) {
obj2F4->unk_0E8.z = 0.0f;
obj2F4->unk_0E8.x = 0.0f;
obj2F4->unk_0E8.y = 0.0f;
obj2F4->vel.z = 0.0f;
obj2F4->vel.x = 0.0f;
obj2F4->vel.y = 0.0f;
if (obj2F4->timer_0BE == 1) {
Object_Kill(&obj2F4->obj, &obj2F4->sfxPos);
obj2F4->unk_044 = 1;
@@ -1770,7 +1770,7 @@ void func_8006684C(Object_2F4* obj2F4) {
} else {
obj2F4->obj.rot.x += 11.0f;
obj2F4->obj.rot.y += 7.0f;
if (obj2F4->unk_0E8.y < -3.0f) {
if (obj2F4->vel.y < -3.0f) {
func_8007BFFC(obj2F4->obj.pos.x, obj2F4->obj.pos.y + 30.0f, obj2F4->obj.pos.z, 0.0f, 0.0f, 0.0f, 7.0f, 5);
obj2F4->timer_0BE = 3;
}
@@ -1843,8 +1843,8 @@ void func_80066D5C(Object_80* obj80) {
Audio_PlaySfx(0x2900300F, &obj80->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
break;
case 2:
obj80->unk_64.x += 0.05f;
obj80->obj.rot.x += obj80->unk_64.x;
obj80->vel.x += 0.05f;
obj80->obj.rot.x += obj80->vel.x;
if (obj80->obj.rot.x >= 90.0f) {
obj80->obj.rot.x = 90.0f;
obj80->unk_44 = 40;
@@ -1954,11 +1954,11 @@ void func_80067348(Object_2F4* obj2F4, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f
obj2F4->obj.pos.z = zPos;
obj2F4->obj.rot.x = xRot;
obj2F4->obj.rot.y = yRot;
obj2F4->unk_0E8.x = arg6;
obj2F4->unk_0E8.y = arg7;
obj2F4->unk_0E8.z = arg8;
obj2F4->vel.x = arg6;
obj2F4->vel.y = arg7;
obj2F4->vel.z = arg8;
obj2F4->timer_0BC = (s32) (Rand_ZeroOne() * 15.0f) + 25.0f;
obj2F4->unk_10C = 0.5f;
obj2F4->gravity = 0.5f;
Object_SetInfo(&obj2F4->info, obj2F4->obj.id);
}
@@ -2475,10 +2475,10 @@ void func_800690D0(s32 index, ObjectId objId) {
}
void func_800693E8(Object_2F4* obj2F4) {
obj2F4->obj.pos.x += obj2F4->unk_0E8.x;
obj2F4->obj.pos.z += obj2F4->unk_0E8.z;
obj2F4->obj.pos.y += obj2F4->unk_0E8.y;
obj2F4->unk_0E8.y -= obj2F4->unk_10C;
obj2F4->obj.pos.x += obj2F4->vel.x;
obj2F4->obj.pos.z += obj2F4->vel.z;
obj2F4->obj.pos.y += obj2F4->vel.y;
obj2F4->vel.y -= obj2F4->gravity;
if ((D_80161AB8 != 0) && (obj2F4->obj.id != OBJ_2F4_198) &&
((gCurrentLevel != LEVEL_MACBETH) || (obj2F4->obj.id == OBJ_2F4_200))) {
@@ -2522,10 +2522,10 @@ void func_800693E8(Object_2F4* obj2F4) {
}
void func_80069658(Object_408* obj408) {
obj408->obj.pos.x += obj408->unk_06C.x;
obj408->obj.pos.y += obj408->unk_06C.y;
obj408->obj.pos.z += obj408->unk_06C.z;
obj408->unk_06C.y -= obj408->unk_084;
obj408->obj.pos.x += obj408->vel.x;
obj408->obj.pos.y += obj408->vel.y;
obj408->obj.pos.z += obj408->vel.z;
obj408->vel.y -= obj408->gravity;
if ((D_80161AB8 != 0) && ((obj408->obj.pos.z + D_80177D20) > (obj408->info.unk_10 - gPlayer[0].camEye.z))) {
if (gPlayer[0].camEye.z) {} // fake
Object_Kill(&obj408->obj, &obj408->sfxPos);
@@ -2574,9 +2574,9 @@ void func_80069858(Object_4C* obj4C) {
}
void func_80069924(Object_8C* obj8C) {
obj8C->obj.pos.x += obj8C->unk_54.x;
obj8C->obj.pos.y += obj8C->unk_54.y;
obj8C->obj.pos.z += obj8C->unk_54.z;
obj8C->obj.pos.x += obj8C->vel.x;
obj8C->obj.pos.y += obj8C->vel.y;
obj8C->obj.pos.z += obj8C->vel.z;
if (D_80161AB8 != 0) {
if ((gPlayer[0].camEye.z + obj8C->info.unk_10) < (obj8C->obj.pos.z + D_80177D20)) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
src/main/fox_enmy2.c
+148 -149
View File
File diff suppressed because it is too large Load Diff
src/main/fox_play.c
+12 -12
View File
@@ -694,30 +694,30 @@ void func_800A670C(Object_2F4* obj2F4, s32 arg1, f32 arg2, f32 arg3, f32 arg4) {
obj2F4->obj.pos.x = arg2;
obj2F4->obj.pos.y = arg3;
obj2F4->obj.pos.z = arg4;
obj2F4->unk_10C = 0.5f;
obj2F4->gravity = 0.5f;
if ((arg1 == 0) || (arg1 == 1)) {
obj2F4->unk_0E8.y = (Rand_ZeroOne() * 5.0f) + 10.0f;
obj2F4->unk_0E8.x = 10.0f;
obj2F4->vel.y = (Rand_ZeroOne() * 5.0f) + 10.0f;
obj2F4->vel.x = 10.0f;
if (arg1 == 0) {
obj2F4->unk_0E8.x = -10.0f;
obj2F4->vel.x = -10.0f;
}
obj2F4->timer_0BC = 15;
} else {
if (gLevelType == LEVELTYPE_PLANET) {
obj2F4->unk_0E8.y = (Rand_ZeroOne() * 7.0f) + 7.0f;
obj2F4->unk_0E8.x = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->unk_0E8.z = (Rand_ZeroOne() * 5.0f) + 5.0f;
obj2F4->vel.y = (Rand_ZeroOne() * 7.0f) + 7.0f;
obj2F4->vel.x = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->vel.z = (Rand_ZeroOne() * 5.0f) + 5.0f;
if (gLevelMode == LEVELMODE_ALL_RANGE) {
obj2F4->unk_0E8.z = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->vel.z = (Rand_ZeroOne() - 0.5f) * 10.0f;
}
obj2F4->timer_0BC = (s32) (Rand_ZeroOne() * 10.0f) + 10;
} else {
obj2F4->unk_0E8.x = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->unk_0E8.y = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->unk_0E8.z = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->vel.x = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->vel.y = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->vel.z = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->timer_0BC = (s32) (Rand_ZeroOne() * 25.0f) + 25;
obj2F4->unk_10C = 0.0f;
obj2F4->gravity = 0.0f;
}
if (arg1 == 2) {
obj2F4->scale = (Rand_ZeroOne() * 1.5f) + 0.75f;
src/main/sf_43E80.c
+7 -7
View File
@@ -147,9 +147,9 @@ void func_800438E0(Object_8C* obj8C, f32 xPos, f32 yPos, f32 zPos, f32 scale) {
obj8C->obj.pos.x = xPos;
obj8C->obj.pos.y = yPos;
obj8C->obj.pos.z = zPos;
obj8C->unk_54.x = Rand_ZeroOne() - (2.0f * Rand_ZeroOne());
obj8C->unk_54.y = ((Rand_ZeroOne() * 3.0f) - (gPlayer->vel.z / 5.0f)) + 3.0f;
obj8C->unk_54.z = ((Rand_ZeroOne() * 3.0f) - (gPlayer->vel.z / 5.0f)) + 2.0f;
obj8C->vel.x = Rand_ZeroOne() - (2.0f * Rand_ZeroOne());
obj8C->vel.y = ((Rand_ZeroOne() * 3.0f) - (gPlayer->vel.z / 5.0f)) + 3.0f;
obj8C->vel.z = ((Rand_ZeroOne() * 3.0f) - (gPlayer->vel.z / 5.0f)) + 2.0f;
obj8C->scale2 = ((Rand_ZeroOne() * 0.8f) + 0.3f) * scale;
obj8C->timer_50 = (s32) (Rand_ZeroOne() * 5.0f) + 8;
obj8C->obj.rot.x = Rand_ZeroOne() * 360.0f;
@@ -1427,12 +1427,12 @@ void func_800481F4(Player* player) {
obj2F4->obj.pos.z, obj2F4->obj.rot.x, obj2F4->obj.rot.y, obj2F4->obj.rot.z, 0.0f,
0.0f, 0.0f) != 0) {
if (player->pos.x < obj2F4->obj.pos.x) {
player->unk_0D8.x = (obj2F4->unk_0E8.z > 5.0f) ? -5.0f : -1.5f;
player->unk_0D8.x = (obj2F4->vel.z > 5.0f) ? -5.0f : -1.5f;
player->unk_1DC = 8;
player->timer_1E8 = 15;
player->unk_1EC = player->unk_1F0 = 20;
} else {
player->unk_0D8.x = (obj2F4->unk_0E8.z > 5.0f) ? 5.0f : 1.5f;
player->unk_0D8.x = (obj2F4->vel.z > 5.0f) ? 5.0f : 1.5f;
player->unk_1DC = 8;
player->timer_1E8 = 15;
player->unk_1EC = player->unk_1F0 = -20;
@@ -1453,12 +1453,12 @@ void func_800481F4(Player* player) {
Math_SmoothStepToF(&player->unk_0D0, 15.0f, 0.3f, 3.5f, 0.001f);
Math_SmoothStepToF(&player->unk_08C, 0, 0.3f, 3.5f, 0.001f);
if (player->pos.x < (obj2F4->unk_170 + obj2F4->obj.pos.x)) {
player->unk_0D8.x = (obj2F4->unk_0E8.z > 5.0f) ? -5.0f : -1.5f;
player->unk_0D8.x = (obj2F4->vel.z > 5.0f) ? -5.0f : -1.5f;
player->unk_1DC = 8;
player->timer_1E8 = 15;
player->unk_1EC = player->unk_1F0 = 20;
} else {
player->unk_0D8.x = (obj2F4->unk_0E8.z > 5.0f) ? 5.0f : 1.5f;
player->unk_0D8.x = (obj2F4->vel.z > 5.0f) ? 5.0f : 1.5f;
player->unk_1DC = 8;
player->timer_1E8 = 15;
player->unk_1EC = player->unk_1F0 = -20;
src/main/sf_77E40.c
+659 -212
View File
File diff suppressed because it is too large Load Diff
src/main/sf_hud.c
+12 -12
View File
@@ -2015,19 +2015,19 @@ bool func_80091B90(Object_2F4* obj2F4) {
Math_Vec3fFromAngles(&vec, obj2F4->obj.rot.x, obj2F4->obj.rot.y, obj2F4->unk_138 + obj2F4->unk_114);
obj2F4->unk_0E8.y = obj2F4->unk_14C + vec.y;
obj2F4->unk_0E8.x = obj2F4->unk_148 + vec.x;
obj2F4->unk_0E8.z = obj2F4->unk_144 + vec.z;
obj2F4->vel.y = obj2F4->unk_14C + vec.y;
obj2F4->vel.x = obj2F4->unk_148 + vec.x;
obj2F4->vel.z = obj2F4->unk_144 + vec.z;
obj2F4->unk_148 -= obj2F4->unk_148 * 0.1f;
obj2F4->unk_14C -= obj2F4->unk_14C * 0.1f;
obj2F4->unk_144 -= obj2F4->unk_144 * 0.1f;
if ((obj2F4->obj.pos.y < D_80177940 + 40.0f) && (obj2F4->unk_0E8.y < 0.0f) && (gLevelType == LEVELTYPE_PLANET)) {
if ((obj2F4->obj.pos.y < D_80177940 + 40.0f) && (obj2F4->vel.y < 0.0f) && (gLevelType == LEVELTYPE_PLANET)) {
obj2F4->obj.pos.y = D_80177940 + 40.0f;
obj2F4->unk_0E8.y = 0.0f;
obj2F4->vel.y = 0.0f;
}
obj2F4->unk_0E8.z -= D_80177D08;
obj2F4->vel.z -= D_80177D08;
return false;
}
@@ -2190,8 +2190,8 @@ void func_800922F4(Object_2F4* obj2F4) {
if (Rand_ZeroOne() < 0.5f) {
func_8007C120(obj2F4->obj.pos.x + ((Rand_ZeroOne() - 0.5f) * 30.0f),
obj2F4->obj.pos.y + (Rand_ZeroOne() * 10.0f),
obj2F4->obj.pos.z + ((Rand_ZeroOne() - 0.5f) * 30.0f), obj2F4->unk_0E8.x,
obj2F4->unk_0E8.y, obj2F4->unk_0E8.z, obj2F4->scale * 0.07f, 3);
obj2F4->obj.pos.z + ((Rand_ZeroOne() - 0.5f) * 30.0f), obj2F4->vel.x, obj2F4->vel.y,
obj2F4->vel.z, obj2F4->scale * 0.07f, 3);
}
}
}
@@ -2245,8 +2245,8 @@ void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) {
obj8C->unk_48 = -obj8C->unk_48;
}
} else {
obj8C->unk_54.x = (Rand_ZeroOne() - 0.5f) * 5.0f;
obj8C->unk_54.y = (Rand_ZeroOne() - 0.5f) * 3.0f;
obj8C->vel.x = (Rand_ZeroOne() - 0.5f) * 5.0f;
obj8C->vel.y = (Rand_ZeroOne() - 0.5f) * 3.0f;
obj8C->unk_48 = 0;
if (Rand_ZeroOne() < 0.5f) {
@@ -2299,7 +2299,7 @@ void func_80094954(Object_8C* obj8C) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
}
obj8C->unk_54.y += obj8C->scale1;
obj8C->vel.y += obj8C->scale1;
obj8C->scale1 -= 0.05f;
if (obj8C->scale1 < -1.0f) {
@@ -2317,7 +2317,7 @@ void func_80094954(Object_8C* obj8C) {
if (player->state_1C8 == PLAYERSTATE_1C8_6) {
obj8C->unk_46 = 2;
if (player->unk_1D0 >= 4) {
obj8C->unk_54.y -= 0.13f;
obj8C->vel.y -= 0.13f;
}
}