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

docs and such (#137)

Browse Source
This commit is contained in:
petrie911
2024-02-19 10:05:11 -03:00
committed by GitHub
parent 41698a131a
commit f227194d24
37 changed files with 1765 additions and 1609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/context.h
+6 -6
View File
@@ -29,12 +29,12 @@ extern f32 gGroundLevel;
extern f32 D_80177950;
extern f32 D_80177968;
extern f32 D_80177970;
extern f32 D_80177978;
extern f32 D_80177980;
extern f32 D_80177988;
extern f32 D_801779A0;
extern f32 D_801779B8;
extern f32 D_801779C0;
extern f32 gCsCamEyeX;
extern f32 gCsCamEyeY;
extern f32 gCsCamEyeZ;
extern f32 gCsCamAtX;
extern f32 gCsCamAtY;
extern f32 gCsCamAtZ;
extern Vec3f D_801779D8;
extern Vec3f D_801779E8;
extern bool gExpertMode;
include/fox_map.h
+36 -16
View File
@@ -11,36 +11,56 @@ typedef struct {
/* 0xC */ f32 scale;
} ObjPosition;
typedef enum {
/* 0 */ PL_PATH_BLU,
/* 1 */ PL_PATH_YLW,
/* 2 */ PL_PATH_RED,
/* 3 */ PL_WARP_YLW,
/* 4 */ PL_WARP_RED,
} PathType;
typedef struct {
/* 0x00 */ s32 unk_00;
/* 0x04 */ PlanetId unk_04;
/* 0x08 */ PlanetId unk_08;
/* 0x0C */ s32 unk_0C;
/* 0x00 */ PathType type;
/* 0x04 */ PlanetId start;
/* 0x08 */ PlanetId end;
/* 0x0C */ s32 length;
/* 0x10 */ char pad10[0x4];
/* 0x14 */ s32 unk_14;
/* 0x18 */ s32 unk_18;
} UnkStruct_D_menu_801AFD18; // size = 0x1C
/* 0x18 */ s32 alpha;
} PlanetPath; // size = 0x1C
typedef enum {
/* 0 */ PL_ANIM_STATIC,
/* 1 */ PL_ANIM_BILLBOARD,
/* 2 */ PL_ANIM_ROTATE_Y,
/* 3 */ PL_ANIM_ROTATE_Z,
/* 4 */ PL_ANIM_SPIN,
} PlanetAnim;
typedef struct {
/* 0x0 */ f32 radius;
/* 0x4 */ f32 incl;
/* 0x8 */ f32 tilt;
} OrbitParams;
typedef struct {
/* 0x00 */ PlanetId id;
/* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08;
/* 0x0C */ f32 zAngle;
/* 0x04 */ OrbitParams orbit;
/* 0x10 */ Vec3f pos;
/* 0x1C */ f32 unk_1C;
/* 0x1C */ f32 longitude;
/* 0x20 */ f32 scale;
/* 0x24 */ s32 alpha;
/* 0x28 */ s32 unk_28;
/* 0x2C */ PlanetId unk_2C;
/* 0x30 */ PlanetId unk_30;
/* 0x34 */ PlanetId unk_34;
/* 0x28 */ PlanetAnim anim;
/* 0x2C */ PlanetId dest1;
/* 0x30 */ PlanetId dest2;
/* 0x34 */ PlanetId warp;
} Planet; // size = 0x38
typedef struct {
/* 0x0 */ u8* addr;
/* 0x0 */ u8* texture;
/* 0x4 */ s32 width;
/* 0x8 */ s32 height;
/* 0xC */ f32 xPos;
} Texture; // size = 0x10
} TitleCard; // size = 0x10
#endif
include/macros.h
+1
View File
@@ -23,6 +23,7 @@
#define SIGN_OF(x) (((x) > 0) ? 1 : ((x) == 0) ? 0 : -1)
#define SQ(x) ((x) * (x))
#define CUBE(x) ((x) * (x) * (x))
#define VEC3F_SQ(vec) (SQ((vec).x) + SQ((vec).y) + SQ((vec).z))
#define DOT_XYZ(a, b) ((a).x * (b).x + (a).y * (b).y + (a).z * (b).z)
#define ABS(x) ((x) >= 0 ? (x) : -(x))
include/structs.h
+3 -7
View File
@@ -42,13 +42,9 @@ typedef struct {
#define BONUS_TEXT_1UP 101
typedef struct {
/* 0x00 */ f32 unk_00;
/* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08;
/* 0x0C */ f32 unk_0C;
/* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14;
} UnkStruct_D_menu_801B8294; // size = 0x18
/* 0x00 */ Vec3f eye;
/* 0x0C */ Vec3f at;
} CameraPoint; // size = 0x18
typedef struct {
/* 0x00 */ f32 unk_00;
linker_scripts/us/symbol_addrs_EBFBE0.txt
+1
View File
@@ -8,6 +8,7 @@ D_menu_801AE99C = 0x801AE99C; // force_migration:True segment:ovl_menu
sTimeTrialMinuteTextures = 0x801AF28C; // force_migration:True segment:ovl_menu
sPlanetList = 0x801AF7E8;// segment:ovl_menu
spectrumAnalizerMode = 0x801B9318;// segment:ovl_menu
sPaths = 0x801AFD18; // segment:ovl_menu
D_menu_801B6E50 = 0x801B6E50; // force_migration:True segment:ovl_menu
D_menu_801B7BA0 = 0x801B7BA0;// segment:ovl_menu
D_menu_801B8248 = 0x801B8248; // size:0x28 segment:ovl_menu
linker_scripts/us/symbol_addrs_engine.txt
+6 -6
View File
@@ -454,15 +454,15 @@ gBombButton = 0x80177948;
D_80177950 = 0x80177950;
D_80177958 = 0x80177958;
gInputHold = 0x80177974;
D_80177978 = 0x80177978;
gCsCamEyeX = 0x80177978;
gInputPress = 0x8017797C;
D_80177980 = 0x80177980;
D_80177988 = 0x80177988;
gCsCamEyeY = 0x80177980;
gCsCamEyeZ = 0x80177988;
D_80177990 = 0x80177990;
D_801779A0 = 0x801779A0;
gCsCamAtX = 0x801779A0;
D_801779A8 = 0x801779A8;
D_801779B8 = 0x801779B8;
D_801779C0 = 0x801779C0;
gCsCamAtY = 0x801779B8;
gCsCamAtZ = 0x801779C0;
gChargeTimers = 0x801779C8;
D_801779D8 = 0x801779D8;
D_801779E8 = 0x801779E8;
src/main/fox_360.c
+22 -22
View File
@@ -151,23 +151,23 @@ void func_8002E700(Player* player) {
player->unk_4DC = gCsFrameCount = 0;
player->unk_130 = player->unk_034 = player->unk_110 = player->unk_08C = player->unk_0D8.x =
player->unk_0D8.y = player->unk_0D8.z = player->unk_134 = player->unk_4D8 = 0.0f;
D_80177978 = 1673.0f;
D_80177980 = 337.0f;
gCsCamEyeX = 1673.0f;
gCsCamEyeY = 337.0f;
if (player->pos.z < 0.0f) {
D_80177988 = -480.0f;
gCsCamEyeZ = -480.0f;
} else {
D_80177988 = 480.0f;
gCsCamEyeZ = 480.0f;
}
player->unk_0E8 = 0.0f;
player->pos.x = 2100.0f;
player->unk_0D0 = 30.0f;
player->unk_0E4 = -8.0f;
player->unk_114 = 90.0f;
D_801779A0 = 2100.0f;
gCsCamAtX = 2100.0f;
player->pos.y = 450.0f;
D_801779B8 = 450.0f;
gCsCamAtY = 450.0f;
player->pos.z = 0.0f;
D_801779C0 = 0.0f;
gCsCamAtZ = 0.0f;
D_80177A48[0] = 1.0f;
player->wings.unk_2C = 1;
player->unk_1D0++;
@@ -190,9 +190,9 @@ void func_8002E700(Player* player) {
player->pos.y = -420.0f;
player->pos.z = 0.0f;
player->unk_0EC = 0.0f;
D_80177978 = -683.0f;
D_80177980 = -346.0f;
D_80177988 = 305.0f;
gCsCamEyeX = -683.0f;
gCsCamEyeY = -346.0f;
gCsCamEyeZ = 305.0f;
player->shields = Play_GetMaxShields();
player->wings.rightState = WINGSTATE_INTACT;
player->wings.leftState = WINGSTATE_INTACT;
@@ -207,7 +207,7 @@ void func_8002E700(Player* player) {
break;
case 3:
D_8017835C = 32;
D_80177988 -= 1.0f;
gCsCamEyeZ -= 1.0f;
if (D_80178340 == 0) {
player->unk_190 = player->unk_194 = 5.0f;
player->unk_114 = 90.0f;
@@ -218,8 +218,8 @@ void func_8002E700(Player* player) {
}
break;
case 4:
D_80177988 -= 1.0f;
D_80177978 -= 1.0f;
gCsCamEyeZ -= 1.0f;
gCsCamEyeX -= 1.0f;
player->unk_0E4 += 0.4f;
if (gCsFrameCount >= 130) {
player->state_1C8 = PLAYERSTATE_1C8_3;
@@ -231,9 +231,9 @@ void func_8002E700(Player* player) {
}
break;
}
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y;
D_801779C0 = player->pos.z;
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y;
gCsCamAtZ = player->pos.z;
Math_SmoothStepToF(&player->unk_0EC, 0.0f, 0.1f, 2.0f, 0);
Math_SmoothStepToF(&player->unk_12C, 0.0f, 0.1f, 3.0f, 0);
Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + player->unk_114 + 180.0f) * M_DTOR, 0);
@@ -250,12 +250,12 @@ void func_8002E700(Player* player) {
player->pos.z += player->vel.z;
player->unk_138 = player->pos.z;
player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130;
Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0);
}
void func_8002ED60(Player* player) {
src/main/fox_A48A0.c
+7 -8
View File
@@ -2,8 +2,7 @@
void func_800A3CA0(void) {
Matrix_Push(&gGfxMatrix);
Matrix_LookAt(gGfxMatrix, D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0, 0.0f, 1.0f, 0.0f,
1);
Matrix_LookAt(gGfxMatrix, gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ, 0.0f, 1.0f, 0.0f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1);
Matrix_RotateY(gGfxMatrix, gControllerPress[gPlayerNum].stick_x * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, gControllerPress[gPlayerNum].stick_y * M_DTOR, 1);
@@ -22,12 +21,12 @@ void func_800A3E00(void) {
case 1:
D_80177868 = 2;
gDrawMode = DRAWMODE_7;
D_801779B8 = 0.0f;
D_801779A0 = D_801779B8;
D_80177988 = D_801779A0;
D_80177980 = D_80177988;
D_80177978 = D_80177980;
D_801779C0 = -10.0f;
gCsCamAtY = 0.0f;
gCsCamAtX = gCsCamAtY;
gCsCamEyeZ = gCsCamAtX;
gCsCamEyeY = gCsCamEyeZ;
gCsCamEyeX = gCsCamEyeY;
gCsCamAtZ = -10.0f;
break;
case 2:
if ((gControllerPress[0].button & START_BUTTON) || (gControllerPress[1].button & START_BUTTON)) {
src/main/fox_context.c
+6 -6
View File
@@ -27,12 +27,12 @@ f32 gGroundLevel;
f32 D_80177950;
f32 D_80177968;
f32 D_80177970;
f32 D_80177978;
f32 D_80177980;
f32 D_80177988;
f32 D_801779A0;
f32 D_801779B8;
f32 D_801779C0;
f32 gCsCamEyeX;
f32 gCsCamEyeY;
f32 gCsCamEyeZ;
f32 gCsCamAtX;
f32 gCsCamAtY;
f32 gCsCamAtZ;
Vec3f D_801779D8;
Vec3f D_801779E8;
bool gExpertMode;
src/main/fox_demo.c
+50 -51
View File
@@ -244,9 +244,9 @@ void func_80048E40(Player* player) {
sp5C.y = 0.0f;
sp5C.z = 300.0f;
Matrix_MultVec3f(gCalcMatrix, &sp5C, &sp50);
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y;
D_801779C0 = player->unk_138 + D_80177D20;
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y;
gCsCamAtZ = player->unk_138 + D_80177D20;
switch (gCsFrameCount) {
case 101:
@@ -320,20 +320,20 @@ void func_80048E40(Player* player) {
}
}
} else {
D_80177978 = player->pos.x + sp50.x;
D_80177980 = player->pos.y + sp50.y;
D_80177988 = player->unk_138 + D_80177D20 + sp50.z;
gCsCamEyeX = player->pos.x + sp50.x;
gCsCamEyeY = player->pos.y + sp50.y;
gCsCamEyeZ = player->unk_138 + D_80177D20 + sp50.z;
}
break;
}
Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0);
Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + 180.0f) * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, -((player->unk_0E4 + player->unk_4D8) * M_DTOR), 1);
@@ -931,12 +931,12 @@ void func_8004AAF4(Player* player) {
sp64.x *= -1.0f;
}
Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.005f, 0.0f);
Math_SmoothStepToF(&player->camEye.x, player->pos.x + sp64.x, *D_80177A48, 500.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, player->pos.y + sp64.y, *D_80177A48, 500.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, player->unk_138 + D_80177D20 + sp64.z, *D_80177A48, 500.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, player->pos.x, *D_80177A48, 500.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, player->pos.y, *D_80177A48, 500.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, player->unk_138 + D_80177D20, *D_80177A48, 500.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.x, player->pos.x + sp64.x, D_80177A48[0], 500.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, player->pos.y + sp64.y, D_80177A48[0], 500.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, player->unk_138 + D_80177D20 + sp64.z, D_80177A48[0], 500.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, player->pos.x, D_80177A48[0], 500.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, player->pos.y, D_80177A48[0], 500.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, player->unk_138 + D_80177D20, D_80177A48[0], 500.0f, 0.0f);
break;
}
Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + 180.0f) * M_DTOR, 0);
@@ -1036,12 +1036,12 @@ void func_8004B368(Player* player) {
player->timer_1F8 = 0x78;
player->timer_1FC = 0x14;
D_80177A48[0] = 0.001f;
D_80177978 = player->camEye.x;
D_80177980 = player->camEye.y;
D_80177988 = player->camEye.z;
D_801779A0 = player->camAt.x;
D_801779B8 = player->camAt.y;
D_801779C0 = player->camAt.z;
gCsCamEyeX = player->camEye.x;
gCsCamEyeY = player->camEye.y;
gCsCamEyeZ = player->camEye.z;
gCsCamAtX = player->camAt.x;
gCsCamAtY = player->camAt.y;
gCsCamAtZ = player->camAt.z;
}
break;
@@ -1050,15 +1050,15 @@ void func_8004B368(Player* player) {
Math_SmoothStepToF(&player->unk_0EC, (player->unk_004 * 60.0f) * D_80177950, 0.1f, 4.0f, 0.1f);
}
if (player->timer_1F8 < 80) {
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y;
D_801779C0 = player->unk_138 + D_80177D20 + 30.0f;
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y;
gCsCamAtZ = player->unk_138 + D_80177D20 + 30.0f;
Math_SmoothStepToF(&D_80177A48[0], 0.05f, 0.1f, 0.0005f, 0.0f);
}
Math_SmoothStepToF(&player->pos.x, player->camEye.x, 0.1f, 10.0f, 0.0f);
D_80177980 += ((player->camAt.y + 500.0f) - player->camEye.y) * 0.01f;
player->camEye.y = D_80177980;
gCsCamEyeY += ((player->camAt.y + 500.0f) - player->camEye.y) * 0.01f;
player->camEye.y = gCsCamEyeY;
var_fa1 = player->unk_004 * 190.0f;
if ((D_80177950 > 0.0f) && (player->unk_004 > 0.0f)) {
@@ -1104,9 +1104,9 @@ void func_8004B368(Player* player) {
if (player->unk_000 > 0.3f) {
player->unk_000 = 0.3f;
}
Math_SmoothStepToF(&D_801779A0, player->pos.x, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&D_801779B8, player->pos.y, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&D_801779C0, player->unk_138 + D_80177D20 + 30.0f, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&gCsCamAtX, player->pos.x, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&gCsCamAtY, player->pos.y, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&gCsCamAtZ, player->unk_138 + D_80177D20 + 30.0f, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->pos.y, player->camEye.y + 5.0f, 0.1f, 4.0f, 0.0f);
Math_SmoothStepToF(&player->unk_0E4, 20.0f, 0.1f, 0.2f, 0.01f);
Math_SmoothStepToF(&player->pos.x, player->camEye.x, 0.1f, 2.0f, 0.0f);
@@ -1142,10 +1142,9 @@ void func_8004B368(Player* player) {
sp78.z = -800.0f;
Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C);
Math_SmoothStepToF(&D_801779A0, player->pos.x, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&D_801779B8, player->pos.y - D_80177A48[6], D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&D_801779C0, player->unk_138 + D_80177D20 - D_80177A48[6], D_80177A48[0], 50000.0f,
0.0f);
Math_SmoothStepToF(&gCsCamAtX, player->pos.x, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&gCsCamAtY, player->pos.y - D_80177A48[6], D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&gCsCamAtZ, player->unk_138 + D_80177D20 - D_80177A48[6], D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&D_80177A48[6], 130.0f, 0.1f, 0.25f, 0.0f);
player->unk_000 += 0.002f;
@@ -1153,9 +1152,9 @@ void func_8004B368(Player* player) {
player->unk_000 = 0.3f;
}
D_80177978 += ((player->pos.x + sp6C.x) - D_80177978) * player->unk_000;
D_80177980 += ((player->pos.y + sp6C.y) - D_80177980) * player->unk_000;
D_80177988 += ((player->unk_138 + D_80177D20 + sp6C.z) - D_80177988) * player->unk_000;
gCsCamEyeX += ((player->pos.x + sp6C.x) - gCsCamEyeX) * player->unk_000;
gCsCamEyeY += ((player->pos.y + sp6C.y) - gCsCamEyeY) * player->unk_000;
gCsCamEyeZ += ((player->unk_138 + D_80177D20 + sp6C.z) - gCsCamEyeZ) * player->unk_000;
D_80178430 += 0.2f;
D_8017842C += 0.2f;
D_80178418 += player->unk_008;
@@ -1294,15 +1293,15 @@ void func_8004B368(Player* player) {
player->timer_1F8 = 0xA;
func_80078E50(player->pos.x, player->pos.y, player->unk_138, 30.0f);
}
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y - D_80177A48[6];
D_801779C0 = player->unk_138 + D_80177D20 - D_80177A48[6];
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y - D_80177A48[6];
gCsCamAtZ = player->unk_138 + D_80177D20 - D_80177A48[6];
break;
case 5:
D_801779A0 += D_80177A48[7];
D_801779B8 += D_80177A48[8];
D_801779C0 += D_80177A48[9];
gCsCamAtX += D_80177A48[7];
gCsCamAtY += D_80177A48[8];
gCsCamAtZ += D_80177A48[9];
player->unk_234 = 0;
if (player->timer_1F8 == 0) {
player->state_1C8 = PLAYERSTATE_1C8_6;
@@ -1352,12 +1351,12 @@ void func_8004B368(Player* player) {
player->unk_0F8 = player->unk_0EC;
player->unk_138 = player->pos.z;
Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 50000.0f, 0.f);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[0], 50000.0f, 0.f);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 50000.0f, 0.f);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.f);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.f);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.f);
player->unk_088 += 10.0f;
player->unk_080 = (-SIN_DEG(player->unk_088)) * 0.3f;
src/main/fox_game.c
+1 -1
View File
@@ -168,7 +168,7 @@ void func_800A1C14(Gfx** arg0) {
void func_800A1E68(Gfx** arg0) {
gSPDisplayList((*arg0)++, D_Gfx_800DBAA0);
gDPSetScissor((*arg0)++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT * 3);
gDPSetFillColor((*arg0)++, 0x00010001);
gDPSetFillColor((*arg0)++, FILL_COLOR(0x0001));
gDPSetColorImage((*arg0)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, gFrameBuffers[0].data);
gDPFillRectangle((*arg0)++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT * 3 - 1);
gDPPipeSync((*arg0)++);
src/main/fox_hud.c
+105 -105
View File
@@ -4997,13 +4997,13 @@ void func_800935E8(Player* player) {
D_80178348 = D_80178350 = D_80178354 = 0;
D_80178358 = 0;
player->camEye.x = D_80177978 = -3061.2f;
player->camEye.y = D_80177980 = 1745.9f;
player->camEye.z = D_80177988 = -5786.0f;
player->camEye.x = gCsCamEyeX = -3061.2f;
player->camEye.y = gCsCamEyeY = 1745.9f;
player->camEye.z = gCsCamEyeZ = -5786.0f;
player->camAt.x = D_801779A0 = 300.0f;
player->camAt.y = D_801779B8 = 2200.0f;
player->camAt.z = D_801779C0 = -5700.0f;
player->camAt.x = gCsCamAtX = 300.0f;
player->camAt.y = gCsCamAtY = 2200.0f;
player->camAt.z = gCsCamAtZ = -5700.0f;
D_801616A0.x = 5.18f;
D_801616A0.y = 124.17f;
@@ -5068,9 +5068,9 @@ void func_800935E8(Player* player) {
i = D_80177A10[6];
stepSize = D_80177A48[5];
src.x = D_80177978;
src.y = D_80177980;
src.z = D_80177988;
src.x = gCsCamEyeX;
src.y = gCsCamEyeY;
src.z = gCsCamEyeZ;
dest.x = D_800D22D8[i].x;
dest.y = D_800D22D8[i].y;
@@ -5082,18 +5082,18 @@ void func_800935E8(Player* player) {
}
D_80177A10[6]++;
}
D_80177978 = src.x;
D_80177980 = src.y;
D_80177988 = src.z;
gCsCamEyeX = src.x;
gCsCamEyeY = src.y;
gCsCamEyeZ = src.z;
}
if (D_80177A10[7] == 1) {
i = D_80177A10[7];
stepSize = D_80177A48[5];
src.x = D_801779A0;
src.y = D_801779B8;
src.z = D_801779C0;
src.x = gCsCamAtX;
src.y = gCsCamAtY;
src.z = gCsCamAtZ;
dest.x = D_800D22FC[i].x;
dest.y = D_800D22FC[i].y;
@@ -5105,9 +5105,9 @@ void func_800935E8(Player* player) {
}
}
D_801779A0 = src.x;
D_801779B8 = src.y;
D_801779C0 = src.z;
gCsCamAtX = src.x;
gCsCamAtY = src.y;
gCsCamAtZ = src.z;
}
if (gCsFrameCount >= 50) {
@@ -5180,17 +5180,17 @@ void func_800935E8(Player* player) {
Matrix_RotateY(gCalcMatrix, M_DTOR * 30.0f, 1);
Matrix_MultVec3f(gCalcMatrix, &src, &dest);
D_80177978 = dest.x;
D_80177980 = dest.y;
D_80177988 = dest.z;
gCsCamEyeX = dest.x;
gCsCamEyeY = dest.y;
gCsCamEyeZ = dest.z;
player->camAt.x = D_801779A0 = D_80177978;
player->camAt.y = D_801779B8 = D_80177980 + 100.0f;
player->camAt.z = D_801779C0 = D_80177988 + 10.0f;
player->camAt.x = gCsCamAtX = gCsCamEyeX;
player->camAt.y = gCsCamAtY = gCsCamEyeY + 100.0f;
player->camAt.z = gCsCamAtZ = gCsCamEyeZ + 10.0f;
player->camEye.x = D_80177978;
player->camEye.y = D_80177980;
player->camEye.z = D_80177988;
player->camEye.x = gCsCamEyeX;
player->camEye.y = gCsCamEyeY;
player->camEye.z = gCsCamEyeZ;
}
if (player->timer_1F8 == 774) {
@@ -5211,8 +5211,8 @@ void func_800935E8(Player* player) {
temp2 = SIN_DEG(gGameFrameCount * 70.0f) * temp;
}
player->camEye.y = D_80177980 + temp2;
player->camAt.y = D_80177980 + 100.0f;
player->camEye.y = gCsCamEyeY + temp2;
player->camAt.y = gCsCamEyeY + 100.0f;
Math_SmoothStepToF(&player->unk_018, -1200.0f, 0.02f, 60.0f, 0.0f);
@@ -5295,8 +5295,8 @@ void func_800935E8(Player* player) {
Object_Kill(&actor->obj, actor->sfxPos);
player->camEye.z = D_80177988 = 800.0f;
player->camAt.z = D_801779C0 = 0.0f;
player->camEye.z = gCsCamEyeZ = 800.0f;
player->camAt.z = gCsCamAtZ = 0.0f;
case 6:
player->unk_060 = SIN_DEG(player->unk_0F4 * 0.7f) * 0.5f;
@@ -5305,19 +5305,19 @@ void func_800935E8(Player* player) {
player->unk_080 = -SIN_DEG(player->unk_088) * 0.5f;
player->unk_0F0 = SIN_DEG(player->unk_0F4) * 1.5f;
D_80177978 = player->pos.x * (600.0f / player->unk_09C);
D_80177980 = player->pos.y * (740.0f / player->unk_0A0);
D_80177980 -= -50.0f;
gCsCamEyeX = player->pos.x * (600.0f / player->unk_09C);
gCsCamEyeY = player->pos.y * (740.0f / player->unk_0A0);
gCsCamEyeY -= -50.0f;
D_801779A0 = player->pos.x * (600.0f / player->unk_09C);
D_801779B8 = player->pos.y * (750.0f / player->unk_0A0);
D_801779B8 += player->unk_060 * 10.0f;
gCsCamAtX = player->pos.x * (600.0f / player->unk_09C);
gCsCamAtY = player->pos.y * (750.0f / player->unk_0A0);
gCsCamAtY += player->unk_060 * 10.0f;
Math_SmoothStepToF(&player->pos.z, 0.0f, 0.1f, 40.0f, 0.1f);
D_80177A48[0] = 0.03f;
D_80177988 = 240.0f;
D_801779C0 = player->pos.z + (D_80177D20 - 1.0f);
gCsCamEyeZ = 240.0f;
gCsCamAtZ = player->pos.z + (D_80177D20 - 1.0f);
if (((player->timer_1F8 % 2) == 0) && (player->timer_1F8 > 962)) {
func_800933D8(player->pos.x, player->pos.y, player->pos.z + 50.0f, 20.0f);
@@ -5363,12 +5363,12 @@ void func_800935E8(Player* player) {
player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130;
Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.0f);
}
// unused data
@@ -5752,22 +5752,22 @@ void func_80095604(Player* player) {
Matrix_RotateY(gCalcMatrix, -(M_DTOR * D_80177A48[4]), 1);
Matrix_MultVec3f(gCalcMatrix, &src, &dest);
Math_SmoothStepToF(&D_80177978, dest.x, 0.02f, player->unk_0D0, 0.001f);
Math_SmoothStepToF(&D_80177980, dest.y, 0.02f, player->unk_0D0, 0.001f);
Math_SmoothStepToF(&D_80177988, dest.z, 0.02f, player->unk_0D0, 0.001f);
Math_SmoothStepToF(&gCsCamEyeX, dest.x, 0.02f, player->unk_0D0, 0.001f);
Math_SmoothStepToF(&gCsCamEyeY, dest.y, 0.02f, player->unk_0D0, 0.001f);
Math_SmoothStepToF(&gCsCamEyeZ, dest.z, 0.02f, player->unk_0D0, 0.001f);
player->camEye.x = D_80177978;
player->camEye.y = D_80177980;
player->camEye.z = D_80177988;
player->camEye.x = gCsCamEyeX;
player->camEye.y = gCsCamEyeY;
player->camEye.z = gCsCamEyeZ;
if (gCsFrameCount < 200) {
Math_SmoothStepToF(&D_801779A0, gBosses[0].obj.pos.x, 0.03f, 100.0f, 0.001f);
Math_SmoothStepToF(&D_801779B8, gBosses[0].obj.pos.y, 0.03f, 100.0f, 0.001f);
Math_SmoothStepToF(&D_801779C0, gBosses[0].obj.pos.z + 600.0f + D_80177D20, 0.03f, 100.0f, 0.001f);
Math_SmoothStepToF(&gCsCamAtX, gBosses[0].obj.pos.x, 0.03f, 100.0f, 0.001f);
Math_SmoothStepToF(&gCsCamAtY, gBosses[0].obj.pos.y, 0.03f, 100.0f, 0.001f);
Math_SmoothStepToF(&gCsCamAtZ, gBosses[0].obj.pos.z + 600.0f + D_80177D20, 0.03f, 100.0f, 0.001f);
} else {
Math_SmoothStepToF(&D_801779A0, player->pos.x, D_80177A48[6], 1000.0f, 0.001f);
Math_SmoothStepToF(&D_801779B8, player->pos.y, D_80177A48[6], 1000.0f, 0.001f);
Math_SmoothStepToF(&D_801779C0, player->pos.z + D_80177D20, D_80177A48[6], 1000.0f, 0.001f);
Math_SmoothStepToF(&gCsCamAtX, player->pos.x, D_80177A48[6], 1000.0f, 0.001f);
Math_SmoothStepToF(&gCsCamAtY, player->pos.y, D_80177A48[6], 1000.0f, 0.001f);
Math_SmoothStepToF(&gCsCamAtZ, player->pos.z + D_80177D20, D_80177A48[6], 1000.0f, 0.001f);
if (gCsFrameCount > 180) {
D_80177A48[6] += 0.005f;
} else {
@@ -5775,9 +5775,9 @@ void func_80095604(Player* player) {
}
}
player->camAt.x = D_801779A0;
player->camAt.y = D_801779B8;
player->camAt.z = D_801779C0;
player->camAt.x = gCsCamAtX;
player->camAt.y = gCsCamAtY;
player->camAt.z = gCsCamAtZ;
D_80177A48[0] = 0.0f;
break;
@@ -5847,13 +5847,13 @@ void func_80095604(Player* player) {
Matrix_RotateY(gCalcMatrix, -(M_DTOR * actor->unk_0F4.y), 1);
Matrix_MultVec3f(gCalcMatrix, &src, &dest);
player->camAt.x = D_801779A0 = player->pos.x;
player->camAt.y = D_801779B8 = player->pos.y;
player->camAt.z = D_801779C0 = player->pos.z - 50.0f + D_80177D20;
player->camAt.x = gCsCamAtX = player->pos.x;
player->camAt.y = gCsCamAtY = player->pos.y;
player->camAt.z = gCsCamAtZ = player->pos.z - 50.0f + D_80177D20;
player->camEye.x = D_80177978 = dest.x;
player->camEye.y = D_80177980 = dest.y;
player->camEye.z = D_80177988 = dest.z;
player->camEye.x = gCsCamEyeX = dest.x;
player->camEye.y = gCsCamEyeY = dest.y;
player->camEye.z = gCsCamEyeZ = dest.z;
D_80177A48[0] = 1.0f;
@@ -5887,13 +5887,13 @@ void func_80095604(Player* player) {
}
if (gCsFrameCount < 1200) {
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y;
D_801779C0 = player->pos.z - 50.0f + D_80177D20;
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y;
gCsCamAtZ = player->pos.z - 50.0f + D_80177D20;
} else {
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y + 10.0f;
D_801779C0 = player->pos.z - 50.0f + D_80177D20;
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y + 10.0f;
gCsCamAtZ = player->pos.z - 50.0f + D_80177D20;
}
D_80177A48[0] = 0.05f;
@@ -5913,9 +5913,9 @@ void func_80095604(Player* player) {
Matrix_RotateY(gCalcMatrix, -(M_DTOR * actor->unk_0F4.y), 1);
Matrix_MultVec3f(gCalcMatrix, &src, &dest);
D_80177978 = dest.x;
D_80177980 = dest.y;
D_80177988 = dest.z;
gCsCamEyeX = dest.x;
gCsCamEyeY = dest.y;
gCsCamEyeZ = dest.z;
if (gCsFrameCount >= 1360) {
D_80178348 = D_80178350 = D_80178354 = 0;
@@ -6034,12 +6034,12 @@ void func_80095604(Player* player) {
player->unk_178 += 20.0f;
Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.001f);
}
void func_80096A74(Player* player) {
@@ -6059,13 +6059,13 @@ void func_80096A74(Player* player) {
player->unk_1D0 = 1;
D_80178340 = D_80178358 = 255;
player->camEye.x = D_80177978 = 0.0f;
player->camEye.y = D_80177980 = player->pos.y + D_80177A48[1];
player->camEye.z = D_80177988 = 0.0f;
player->camEye.x = gCsCamEyeX = 0.0f;
player->camEye.y = gCsCamEyeY = player->pos.y + D_80177A48[1];
player->camEye.z = gCsCamEyeZ = 0.0f;
player->camAt.x = D_801779A0 = 0.0f;
player->camAt.y = D_801779B8 = 0.0f;
player->camAt.z = D_801779C0 = 0.0f;
player->camAt.x = gCsCamAtX = 0.0f;
player->camAt.y = gCsCamAtY = 0.0f;
player->camAt.z = gCsCamAtZ = 0.0f;
D_80177A48[0] = 1.0f;
D_80177A48[2] = 0.0f;
@@ -6102,13 +6102,13 @@ void func_80096A74(Player* player) {
D_80177A48[0] = 0.2f;
}
D_80177978 = player->pos.x;
D_80177980 = player->pos.y + D_80177A48[1];
D_80177988 = player->pos.z + D_80177A48[2];
gCsCamEyeX = player->pos.x;
gCsCamEyeY = player->pos.y + D_80177A48[1];
gCsCamEyeZ = player->pos.z + D_80177A48[2];
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y;
D_801779C0 = player->pos.z;
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y;
gCsCamAtZ = player->pos.z;
if (gCsFrameCount == 270) {
player->unk_190 = player->unk_194 = 10.0f;
@@ -6136,13 +6136,13 @@ void func_80096A74(Player* player) {
D_80137E84[0] = 0;
gControllerHold[player->num].button = button;
D_80177978 = player->pos.x;
D_80177980 = (player->pos.y * player->unk_148 + 50.0f);
D_80177988 = D_80177A48[2];
gCsCamEyeX = player->pos.x;
gCsCamEyeY = (player->pos.y * player->unk_148 + 50.0f);
gCsCamEyeZ = D_80177A48[2];
D_801779A0 = player->pos.x;
D_801779B8 = (player->pos.y * player->unk_148 + 20.0f);
D_801779C0 = player->pos.z;
gCsCamAtX = player->pos.x;
gCsCamAtY = (player->pos.y * player->unk_148 + 20.0f);
gCsCamAtZ = player->pos.z;
if (gCsFrameCount == 300) {
D_80177CE8 = 0;
@@ -6204,10 +6204,10 @@ void func_80096A74(Player* player) {
player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130;
}
Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.0f);
}
src/main/fox_play.c
+44 -44
View File
@@ -5551,10 +5551,10 @@ void func_800B56BC(Player* player) {
f32 var_fv0;
f32 temp;
D_80177978 = (player->pos.x - player->unk_0AC) * player->unk_148;
gCsCamEyeX = (player->pos.x - player->unk_0AC) * player->unk_148;
if (((player->form == FORM_ARWING) && (player->state_1C8 == PLAYERSTATE_1C8_3)) ||
(player->state_1C8 == PLAYERSTATE_1C8_5)) {
D_80177980 = (player->pos.y - player->unk_0B0) * player->unk_148;
gCsCamEyeY = (player->pos.y - player->unk_0B0) * player->unk_148;
}
var_fv1 = gInputPress->stick_x;
var_fv0 = -gInputPress->stick_y;
@@ -5571,14 +5571,14 @@ void func_800B56BC(Player* player) {
} else {
Math_SmoothStepToF(&player->unk_02C, 2.0f * var_fv0, 0.1f, 4.0f, 0.05f);
}
D_80177978 -= player->unk_030 * 1.5f;
D_80177980 -= player->unk_02C - 50.0f;
D_801779A0 = (player->pos.x - player->unk_0AC) * player->unk_14C;
D_801779A0 += player->unk_084 * -2.0f;
D_801779A0 -= player->unk_030 * 0.5f;
D_801779B8 = ((player->pos.y - player->unk_0B0) * player->unk_14C) + 20.0f;
D_801779B8 += player->unk_060 * 5.0f;
D_801779B8 -= player->unk_02C * 0.25f;
gCsCamEyeX -= player->unk_030 * 1.5f;
gCsCamEyeY -= player->unk_02C - 50.0f;
gCsCamAtX = (player->pos.x - player->unk_0AC) * player->unk_14C;
gCsCamAtX += player->unk_084 * -2.0f;
gCsCamAtX -= player->unk_030 * 0.5f;
gCsCamAtY = ((player->pos.y - player->unk_0B0) * player->unk_14C) + 20.0f;
gCsCamAtY += player->unk_060 * 5.0f;
gCsCamAtY -= player->unk_02C * 0.25f;
switch (D_800D2F54) {
case 0:
Math_SmoothStepToF(&D_800D2F58, 0.0f, 0.4f, 10.0f, 0);
@@ -5587,29 +5587,29 @@ void func_800B56BC(Player* player) {
Math_SmoothStepToF(&D_800D2F58, 200.0f, 0.4f, 10.0f, 0);
break;
}
D_80177978 += player->unk_0AC;
D_801779A0 += player->unk_0AC;
D_80177980 += player->unk_0B0 + D_800D2F58;
D_801779C0 = (player->unk_138 + D_80177D20) - 1.0f;
D_80177988 = 400.0f + D_800D2F58;
gCsCamEyeX += player->unk_0AC;
gCsCamAtX += player->unk_0AC;
gCsCamEyeY += player->unk_0B0 + D_800D2F58;
gCsCamAtZ = (player->unk_138 + D_80177D20) - 1.0f;
gCsCamEyeZ = 400.0f + D_800D2F58;
if (D_80177C70 == 2) {
D_80177988 -= 50.0f;
gCsCamEyeZ -= 50.0f;
}
if (player->unk_4DC != 0) {
D_80177988 += 200.0f;
D_801779B8 = (player->pos.y - player->unk_0B0) * 0.9f;
Math_SmoothStepToF(&player->camEye.z, D_80177988, 0.1f, 8.0f, 0.0f);
gCsCamEyeZ += 200.0f;
gCsCamAtY = (player->pos.y - player->unk_0B0) * 0.9f;
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, 0.1f, 8.0f, 0.0f);
Math_SmoothStepToF(&player->unk_018, 0.2f, 1.0f, 0.05f, 0.0f);
} else {
Math_SmoothStepToF(&player->camEye.z, D_80177988, 0.2f, 20.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, 0.2f, 20.0f, 0.0f);
Math_SmoothStepToF(&player->unk_018, 1.0f, 1.0f, 0.05f, 0.0f);
}
D_801779B8 += player->unk_0B0 + (D_800D2F58 * 0.5f);
Math_SmoothStepToF(&player->camEye.x, D_80177978, player->unk_014, 1000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, D_80177980, player->unk_018, 1000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, player->unk_014, 1000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, player->unk_018, 1000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, player->unk_014, 1000.0f, 0.0f);
gCsCamAtY += player->unk_0B0 + (D_800D2F58 * 0.5f);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, player->unk_014, 1000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, player->unk_018, 1000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, player->unk_014, 1000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, player->unk_018, 1000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, player->unk_014, 1000.0f, 0.0f);
Math_SmoothStepToF(&player->unk_014, 1.0f, 1.0f, 0.05f, 0.0f);
temp = -player->unk_0EC;
if (gLevelType == LEVELTYPE_PLANET) {
@@ -5632,27 +5632,27 @@ void func_800B5D30(Player* player, s32 arg1) {
sp4C.y = 0;
sp4C.z = -1000.0f;
Matrix_MultVec3f(gCalcMatrix, &sp4C, &sp40);
D_80177978 = player->pos.x;
D_80177980 = player->pos.y + player->unk_080;
D_80177988 = player->unk_138 + D_80177D20;
D_801779A0 = player->pos.x + sp40.x;
D_801779B8 = player->pos.y + player->unk_080 + sp40.y;
D_801779C0 = player->unk_138 + D_80177D20 + sp40.z;
Math_SmoothStepToF(&player->camEye.x, D_80177978, player->unk_014, 100.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, D_80177980, player->unk_014, 100.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, D_80177988, player->unk_014, 50.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, player->unk_014, 100.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, player->unk_014, 100.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, player->unk_014, 100.0f, 0.0f);
gCsCamEyeX = player->pos.x;
gCsCamEyeY = player->pos.y + player->unk_080;
gCsCamEyeZ = player->unk_138 + D_80177D20;
gCsCamAtX = player->pos.x + sp40.x;
gCsCamAtY = player->pos.y + player->unk_080 + sp40.y;
gCsCamAtZ = player->unk_138 + D_80177D20 + sp40.z;
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, player->unk_014, 100.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, player->unk_014, 100.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, player->unk_014, 50.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, player->unk_014, 100.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, player->unk_014, 100.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, player->unk_014, 100.0f, 0.0f);
Math_SmoothStepToF(&player->unk_014, 1.0f, 1.0f, 0.05f, 0);
player->unk_034 = -(player->unk_0F8 + player->unk_0F0);
if (arg1 != 0) {
player->camEye.x = D_80177978;
player->camEye.y = D_80177980;
player->camEye.z = D_80177988;
player->camAt.x = D_801779A0;
player->camAt.y = D_801779B8;
player->camAt.z = D_801779C0;
player->camEye.x = gCsCamEyeX;
player->camEye.y = gCsCamEyeY;
player->camEye.z = gCsCamEyeZ;
player->camAt.x = gCsCamAtX;
player->camAt.y = gCsCamAtY;
player->camAt.z = gCsCamAtZ;
}
}
src/main/fox_std_lib.c
+19 -18
View File
@@ -540,7 +540,7 @@ void TextureRect_4bCI(Gfx** gfxPtr, void* texture, void* palette, u32 width, u32
gDPLoadTextureBlock_4b((*gfxPtr)++, texture, G_IM_FMT_CI, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
(s32) ((yPos + height * yScale) * 4.0f), 0, 0, 0, (s32) (1.0f / xScale * 1024.0f),
(s32) ((yPos + height * yScale) * 4.0f), G_TX_RENDERTILE, 0, 0, (s32) (1.0f / xScale * 1024.0f),
(s32) (1.0f / yScale * 1024.0f));
}
@@ -550,8 +550,8 @@ void TextureRect_4bCI_Flip(Gfx** gfxPtr, void* texture, void* palette, u32 width
gDPLoadTextureBlock_4b((*gfxPtr)++, texture, G_IM_FMT_CI, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangleFlip((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f),
(s32) ((xPos + width * xScale) * 4.0f), (s32) ((yPos + height * yScale) * 4.0f), 0, 0, 0,
(s32) (1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
(s32) ((xPos + width * xScale) * 4.0f), (s32) ((yPos + height * yScale) * 4.0f),
G_TX_RENDERTILE, 0, 0, (s32) (1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
void TextureRect_4bCI_MirX(Gfx** gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos,
@@ -560,7 +560,7 @@ void TextureRect_4bCI_MirX(Gfx** gfxPtr, void* texture, void* palette, u32 width
gDPLoadTextureBlock_4b((*gfxPtr)++, texture, G_IM_FMT_CI, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
(s32) ((yPos + height * yScale) * 4.0f), 0, (width - 1) * 32, 0,
(s32) ((yPos + height * yScale) * 4.0f), G_TX_RENDERTILE, (width - 1) * 32, 0,
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
@@ -570,7 +570,7 @@ void TextureRect_4bCI_MirY(Gfx** gfxPtr, void* texture, void* palette, u32 width
gDPLoadTextureBlock_4b((*gfxPtr)++, texture, G_IM_FMT_CI, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
(s32) ((yPos + height * yScale) * 4.0f), 0, 0, (height - 1) * 32,
(s32) ((yPos + height * yScale) * 4.0f), G_TX_RENDERTILE, 0, (height - 1) * 32,
(s32) (1.0f / xScale * 1024.0f), (u16) (s32) (-1.0f / yScale * 1024.0f));
}
@@ -580,7 +580,7 @@ void TextureRect_8bCI(Gfx** gfxPtr, void* texture, void* palette, u32 width, u32
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_CI, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
(s32) ((yPos + height * yScale) * 4.0f), 0, 0, 0, (s32) (1.0f / xScale * 1024.0f),
(s32) ((yPos + height * yScale) * 4.0f), G_TX_RENDERTILE, 0, 0, (s32) (1.0f / xScale * 1024.0f),
(s32) (1.0f / yScale * 1024.0f));
}
@@ -598,7 +598,7 @@ void TextureRect_16bRGBA_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 height
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
(s32) ((yPos + height * yScale) * 4.0f), 0, (width - 1) * 32, 0,
(s32) ((yPos + height * yScale) * 4.0f), G_TX_RENDERTILE, (width - 1) * 32, 0,
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
@@ -615,8 +615,8 @@ void TextureRect_8bIA_FilpMirX(Gfx** gfxPtr, void* texture, u32 width, u32 heigh
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangleFlip((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f),
(s32) ((xPos + height * xScale) * 4.0f), (s32) ((yPos + width * yScale) * 4.0f), 0,
(width - 1) * 32, 0, (u16) (s32) (-1.0f / yScale * 1024.0f),
(s32) ((xPos + height * xScale) * 4.0f), (s32) ((yPos + width * yScale) * 4.0f),
G_TX_RENDERTILE, (width - 1) * 32, 0, (u16) (s32) (-1.0f / yScale * 1024.0f),
(s32) (1.0f / xScale * 1024.0f));
}
@@ -625,8 +625,9 @@ void TextureRect_8bIA_FilpMirY(Gfx** gfxPtr, void* texture, u32 width, u32 heigh
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangleFlip((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f),
(s32) ((xPos + height * xScale) * 4.0f), (s32) ((yPos + width * yScale) * 4.0f), 0, 0,
(height - 1) * 32, (s32) (1.0f / yScale * 1024.0f), (u16) (s32) (-1.0f / xScale * 1024.0f));
(s32) ((xPos + height * xScale) * 4.0f), (s32) ((yPos + width * yScale) * 4.0f),
G_TX_RENDERTILE, 0, (height - 1) * 32, (s32) (1.0f / yScale * 1024.0f),
(u16) (s32) (-1.0f / xScale * 1024.0f));
}
void TextureRect_8bIA_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
@@ -634,7 +635,7 @@ void TextureRect_8bIA_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 height, f
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
(s32) ((yPos + height * yScale) * 4.0f), 0, (width - 1) * 32, 0,
(s32) ((yPos + height * yScale) * 4.0f), G_TX_RENDERTILE, (width - 1) * 32, 0,
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
@@ -643,7 +644,7 @@ void TextureRect_8bIA_MirY(Gfx** gfxPtr, void* texture, u32 width, u32 height, f
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
(s32) ((yPos + height * yScale) * 4.0f), 0, 0, (height - 1) * 32,
(s32) ((yPos + height * yScale) * 4.0f), G_TX_RENDERTILE, 0, (height - 1) * 32,
(s32) (1.0f / xScale * 1024.0f), (u16) (s32) (-1.0f / yScale * 1024.0f));
}
@@ -651,7 +652,7 @@ void TextureRect_16bIA(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 x
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
(s32) ((yPos + height * yScale) * 4.0f), 0, 0, 0, (s32) (1.0f / xScale * 1024.0f),
(s32) ((yPos + height * yScale) * 4.0f), G_TX_RENDERTILE, 0, 0, (s32) (1.0f / xScale * 1024.0f),
(s32) (1.0f / yScale * 1024.0f));
}
@@ -660,7 +661,7 @@ void TextureRect_16bIA_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 height,
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_16b, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
(s32) ((yPos + height * yScale) * 4.0f), 0, (width - 1) * 32, 0,
(s32) ((yPos + height * yScale) * 4.0f), G_TX_RENDERTILE, (width - 1) * 32, 0,
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
@@ -669,7 +670,7 @@ void TextureRect_16bIA_MirY(Gfx** gfxPtr, void* texture, u32 width, u32 height,
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_16b, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
(s32) ((yPos + height * yScale) * 4.0f), 0, 0, (height - 1) * 32,
(s32) ((yPos + height * yScale) * 4.0f), G_TX_RENDERTILE, 0, (height - 1) * 32,
(s32) (1.0f / xScale * 1024.0f), (u16) (s32) (-1.0f / yScale * 1024.0f));
}
@@ -678,7 +679,7 @@ void TextureRect_16bIA_MirXY(Gfx** gfxPtr, void* texture, u32 width, u32 height,
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_16b, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
(s32) ((yPos + height * yScale) * 4.0f), 0, (width - 1) * 32, (height - 1) * 32,
(s32) ((yPos + height * yScale) * 4.0f), G_TX_RENDERTILE, (width - 1) * 32, (height - 1) * 32,
(u16) (s32) (-1.0f / xScale * 1024.0f), (u16) (s32) (-1.0f / yScale * 1024.0f));
}
@@ -687,7 +688,7 @@ void TextureRect_32bRGBA(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
(s32) ((yPos + height * yScale) * 4.0f), 0, 0, 0, (s32) (1.0f / xScale * 1024.0f),
(s32) ((yPos + height * yScale) * 4.0f), G_TX_RENDERTILE, 0, 0, (s32) (1.0f / xScale * 1024.0f),
(s32) (1.0f / yScale * 1024.0f));
}
src/overlays/ovl_ending/fox_end1.c
+30 -30
View File
@@ -867,12 +867,12 @@ void func_ending_8018A124(s32 arg0) {
f32 sp0[2] = { -22.0f, 204.0f };
// not fake, but weird.
D_80177978 = (&sp2C)[arg0][0];
D_80177980 = (&sp2C)[arg0][1];
D_80177988 = (&sp2C)[arg0][2];
D_801779A0 = (&sp20)[arg0][0];
D_801779B8 = (&sp20)[arg0][1];
D_801779C0 = (&sp20)[arg0][2];
gCsCamEyeX = (&sp2C)[arg0][0];
gCsCamEyeY = (&sp2C)[arg0][1];
gCsCamEyeZ = (&sp2C)[arg0][2];
gCsCamAtX = (&sp20)[arg0][0];
gCsCamAtY = (&sp20)[arg0][1];
gCsCamAtZ = (&sp20)[arg0][2];
gLight1R = (&sp14)[arg0][0];
gLight1G = (&sp14)[arg0][1];
@@ -1065,9 +1065,9 @@ void func_ending_8018A96C(void) {
gRadioState = 0;
gGameFrameCount = 0;
gOverlayStage = 0;
D_80177978 = D_80177980 = D_80177988 = 0.0f;
D_801779A0 = D_801779B8 = 0.0f;
D_801779C0 = -100.0f;
gCsCamEyeX = gCsCamEyeY = gCsCamEyeZ = 0.0f;
gCsCamAtX = gCsCamAtY = 0.0f;
gCsCamAtZ = -100.0f;
D_ending_80196D00 = 1;
break;
@@ -1106,8 +1106,8 @@ void func_ending_8018A96C(void) {
void func_ending_8018AAC4(void) {
Matrix_Push(&gGfxMatrix);
Matrix_LookAt(gGfxMatrix, D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0, 0.0f, 100.0f,
0.0f, 0);
Matrix_LookAt(gGfxMatrix, gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ, 0.0f, 100.0f, 0.0f,
0);
switch (D_ending_80196D00) {
case 1:
@@ -1508,13 +1508,13 @@ void func_ending_8018B860(void) {
s32 sp28[3] = { 32, 32, 32 };
s32 sp1C[3] = { 5, 5, 8 };
D_80177978 = sp4C.x;
D_80177980 = sp4C.y;
D_80177988 = sp4C.z;
gCsCamEyeX = sp4C.x;
gCsCamEyeY = sp4C.y;
gCsCamEyeZ = sp4C.z;
D_801779A0 = sp40.x;
D_801779B8 = sp40.y;
D_801779C0 = sp40.z;
gCsCamAtX = sp40.x;
gCsCamAtY = sp40.y;
gCsCamAtZ = sp40.z;
gLight1R = sp28[0];
gLight1G = sp28[1];
@@ -1541,7 +1541,7 @@ void func_ending_8018B860(void) {
func_ending_8018B6D8(&gActors[8], 4);
func_ending_8018B6D8(&gActors[9], 5);
D_80177A48[0] = D_801779A0;
D_80177A48[0] = gCsCamAtX;
D_80177A10[0] = 0;
D_ending_8019858C = 0;
gBgColor = 0x4AE5;
@@ -1555,13 +1555,13 @@ void func_ending_8018BAD0(void) {
s32 sp28[3] = { 32, 32, 32 };
s32 sp1C[3] = { 5, 5, 8 };
D_80177978 = sp4C.x;
D_80177980 = sp4C.y;
D_80177988 = sp4C.z;
gCsCamEyeX = sp4C.x;
gCsCamEyeY = sp4C.y;
gCsCamEyeZ = sp4C.z;
D_801779A0 = sp40.x;
D_801779B8 = sp40.y;
D_801779C0 = sp40.z;
gCsCamAtX = sp40.x;
gCsCamAtY = sp40.y;
gCsCamAtZ = sp40.z;
gLight1R = sp28[0];
gLight1G = sp28[1];
@@ -1702,17 +1702,17 @@ bool func_ending_8018BCB0(void) {
}
if (D_80177A10[0] == 0) {
if ((gActors[0].obj.pos.x <= D_801779A0) && (gActors[0].obj.pos.x > -400.0f)) {
if ((gActors[0].obj.pos.x <= gCsCamAtX) && (gActors[0].obj.pos.x > -400.0f)) {
D_80177A48[0] = gActors[0].obj.pos.x;
}
if (gCsFrameCount >= 30) {
Math_SmoothStepToF(&D_801779A0, D_80177A48[0], 0.004f, 1000.0f, 0.0001f);
Math_SmoothStepToF(&D_801779B8, 156.0f, 0.002f, 1000.0f, 0.0001f);
Math_SmoothStepToF(&gCsCamAtX, D_80177A48[0], 0.004f, 1000.0f, 0.0001f);
Math_SmoothStepToF(&gCsCamAtY, 156.0f, 0.002f, 1000.0f, 0.0001f);
}
} else {
D_801779A0 = gActors[0].obj.pos.x;
D_801779B8 = gActors[0].obj.pos.y;
D_801779C0 = gActors[0].obj.pos.z;
gCsCamAtX = gActors[0].obj.pos.x;
gCsCamAtY = gActors[0].obj.pos.y;
gCsCamAtZ = gActors[0].obj.pos.z;
}
if ((gCsFrameCount < 548) && (gCsFrameCount >= 240)) {
src/overlays/ovl_i1/fox_co.c
+58 -58
View File
@@ -2659,12 +2659,12 @@ void func_i1_8018F880(Player* player) {
actor0->iwork[14] = 2;
actor1->iwork[14] = 3;
actor2->iwork[14] = 4;
player->camEye.x = D_80177978 = player->pos.x - 400.0f;
gPlayer[0].camEye.y = D_80177980 = player->pos.y + 600.0f;
player->camEye.z = D_80177988 = player->unk_138 + 2000.0f;
player->camAt.x = D_801779A0 = player->pos.x;
player->camAt.y = D_801779B8 = player->pos.y;
player->camAt.z = D_801779C0 = player->unk_138 + 300.0f;
player->camEye.x = gCsCamEyeX = player->pos.x - 400.0f;
gPlayer[0].camEye.y = gCsCamEyeY = player->pos.y + 600.0f;
player->camEye.z = gCsCamEyeZ = player->unk_138 + 2000.0f;
player->camAt.x = gCsCamAtX = player->pos.x;
player->camAt.y = gCsCamAtY = player->pos.y;
player->camAt.z = gCsCamAtZ = player->unk_138 + 300.0f;
D_80177A48[0] = 0;
D_80177A48[1] = D_80177A48[2] = 0;
D_80178358 = 0xFF;
@@ -2677,12 +2677,12 @@ void func_i1_8018F880(Player* player) {
D_8017835C = 3;
Math_SmoothStepToF(&D_80177A48[0], 0.01f, 1.0f, 0.0005f, 0.0f);
}
D_80177978 = player->pos.x - 150.0f;
D_80177980 = player->pos.y - 70.0f;
D_80177988 = player->unk_138 + 150.0f;
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y;
D_801779C0 = player->unk_138;
gCsCamEyeX = player->pos.x - 150.0f;
gCsCamEyeY = player->pos.y - 70.0f;
gCsCamEyeZ = player->unk_138 + 150.0f;
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y;
gCsCamAtZ = player->unk_138;
if (player->timer_1F8 == 0) {
player->unk_1D0 = 2;
player->timer_1F8 = 130;
@@ -2718,12 +2718,12 @@ void func_i1_8018F880(Player* player) {
break;
case 2:
Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f);
D_80177978 = player->pos.x - 50.0f;
D_80177980 = player->pos.y + 10.0f;
D_80177988 = player->unk_138 - 10.0f;
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y + 10.0f;
D_801779C0 = player->unk_138 + 10.0f;
gCsCamEyeX = player->pos.x - 50.0f;
gCsCamEyeY = player->pos.y + 10.0f;
gCsCamEyeZ = player->unk_138 - 10.0f;
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y + 10.0f;
gCsCamAtZ = player->unk_138 + 10.0f;
if (player->timer_1F8 == 20) {
Radio_PlayMessage(gMsg_ID_2010, RCID_FOX);
}
@@ -2750,20 +2750,20 @@ void func_i1_8018F880(Player* player) {
if ((D_801782F8 != 0) && (gGameFrameCount & 2)) {
player->wings.unk_30 = 5.0f;
}
D_80177980 = player->pos.y + 10.0f;
D_801779B8 = player->pos.y + 10.0f;
gCsCamEyeY = player->pos.y + 10.0f;
gCsCamAtY = player->pos.y + 10.0f;
break;
case 4:
if ((D_801782F8 != 0) && (gGameFrameCount & 2)) {
player->wings.unk_30 = 5.0f;
}
Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f);
D_80177978 = actor0->obj.pos.x - 50.0f;
D_80177980 = actor0->obj.pos.y + 10.0f;
D_80177988 = actor0->obj.pos.z - 10.0f;
D_801779A0 = actor0->obj.pos.x;
D_801779B8 = actor0->obj.pos.y + 10.0f;
D_801779C0 = actor0->obj.pos.z + 10.0f;
gCsCamEyeX = actor0->obj.pos.x - 50.0f;
gCsCamEyeY = actor0->obj.pos.y + 10.0f;
gCsCamEyeZ = actor0->obj.pos.z - 10.0f;
gCsCamAtX = actor0->obj.pos.x;
gCsCamAtY = actor0->obj.pos.y + 10.0f;
gCsCamAtZ = actor0->obj.pos.z + 10.0f;
if (player->timer_1F8 == 0) {
player->unk_1D0 = 5;
player->timer_1F8 = 5;
@@ -2787,8 +2787,8 @@ void func_i1_8018F880(Player* player) {
player->timer_1F8 = 190;
}
D_80177980 = actor0->obj.pos.y + 10.0f;
D_801779B8 = actor0->obj.pos.y + 10.0f;
gCsCamEyeY = actor0->obj.pos.y + 10.0f;
gCsCamAtY = actor0->obj.pos.y + 10.0f;
break;
case 6:
Math_SmoothStepToF(&actor0->fwork[19], 0.0f, 0.1f, 3.0f, 0.01f);
@@ -2796,13 +2796,13 @@ void func_i1_8018F880(Player* player) {
D_80177A48[3] -= 0.5f;
D_80177978 = actor2->obj.pos.x + 100.0f + D_80177A48[3];
D_80177980 = actor2->obj.pos.y + 10.0f;
D_80177988 = actor2->obj.pos.z - 70.0f;
gCsCamEyeX = actor2->obj.pos.x + 100.0f + D_80177A48[3];
gCsCamEyeY = actor2->obj.pos.y + 10.0f;
gCsCamEyeZ = actor2->obj.pos.z - 70.0f;
D_801779A0 = actor2->obj.pos.x + 20.0f + (D_80177A48[3] * 0.5f);
D_801779B8 = actor2->obj.pos.y + 10.0f;
D_801779C0 = actor2->obj.pos.z + 10.0f;
gCsCamAtX = actor2->obj.pos.x + 20.0f + (D_80177A48[3] * 0.5f);
gCsCamAtY = actor2->obj.pos.y + 10.0f;
gCsCamAtZ = actor2->obj.pos.z + 10.0f;
if (player->timer_1F8 == 0) {
player->unk_1D0 = 7;
@@ -2821,12 +2821,12 @@ void func_i1_8018F880(Player* player) {
break;
case 7:
Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f);
D_80177978 = actor1->obj.pos.x + 20.0f;
D_80177980 = actor1->obj.pos.y + 10.0f;
D_80177988 = actor1->obj.pos.z - 50.0f;
D_801779A0 = actor1->obj.pos.x + 10.0f;
D_801779B8 = actor1->obj.pos.y + 10.0f;
D_801779C0 = actor1->obj.pos.z + 10.0f;
gCsCamEyeX = actor1->obj.pos.x + 20.0f;
gCsCamEyeY = actor1->obj.pos.y + 10.0f;
gCsCamEyeZ = actor1->obj.pos.z - 50.0f;
gCsCamAtX = actor1->obj.pos.x + 10.0f;
gCsCamAtY = actor1->obj.pos.y + 10.0f;
gCsCamAtZ = actor1->obj.pos.z + 10.0f;
if (player->timer_1F8 == 0) {
player->unk_1D0 = 8;
D_80177A48[0] = 0.0f;
@@ -2852,12 +2852,12 @@ void func_i1_8018F880(Player* player) {
D_80177A48[3] += player->unk_004;
Math_SmoothStepToF(&player->unk_004, 2.0f, 1.0f, 0.2f, 0.0f);
}
D_80177978 = player->pos.x;
D_80177988 = (player->unk_138 - 600.0f) + D_80177A48[3];
D_80177980 = player->pos.y + D_80177A48[8];
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y + 20.0f;
D_801779C0 = player->unk_138 + 100.0f;
gCsCamEyeX = player->pos.x;
gCsCamEyeZ = (player->unk_138 - 600.0f) + D_80177A48[3];
gCsCamEyeY = player->pos.y + D_80177A48[8];
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y + 20.0f;
gCsCamAtZ = player->unk_138 + 100.0f;
if (player->timer_1F8 < 100) {
Math_SmoothStepToF(&D_80177A48[8], 10.0f, 0.1f, 0.7f, 0.0f);
}
@@ -2907,12 +2907,12 @@ void func_i1_8018F880(Player* player) {
}
break;
case 9:
D_80177978 = player->pos.x;
D_80177980 = player->pos.y;
D_80177988 = player->unk_138 + 1000.0f;
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y;
D_801779C0 = player->unk_138 + 1100.0f;
gCsCamEyeX = player->pos.x;
gCsCamEyeY = player->pos.y;
gCsCamEyeZ = player->unk_138 + 1000.0f;
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y;
gCsCamAtZ = player->unk_138 + 1100.0f;
D_80177A48[0] = 0.03f;
player->unk_190 = 2.0f;
if (player->timer_1F8 == 0) {
@@ -2946,12 +2946,12 @@ void func_i1_8018F880(Player* player) {
case 10:
break;
}
Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, player->unk_080 + D_80177980, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, D_801779B8 - player->unk_080, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, player->unk_080 + gCsCamEyeY, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY - player->unk_080, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->wings.unk_04, D_80177A48[1], 0.2f, 1.0f, 0.0f);
Math_SmoothStepToF(&player->wings.unk_0C, D_80177A48[2], 0.2f, 1.0f, 0.0f);
player->wings.unk_08 = player->wings.unk_04;
src/overlays/ovl_i2/fox_me.c
+42 -42
View File
@@ -1923,13 +1923,13 @@ void func_i2_8018CD8C(Player* player) {
D_80177A48[2] = -13000.0f;
D_80177A48[4] = -22000.0f;
player->camEye.x = D_80177978 = player->pos.x + 100.0f;
player->camEye.y = D_80177980 = player->pos.y;
player->camEye.z = D_80177988 = D_80177A48[1] + player->unk_138;
player->camEye.x = gCsCamEyeX = player->pos.x + 100.0f;
player->camEye.y = gCsCamEyeY = player->pos.y;
player->camEye.z = gCsCamEyeZ = D_80177A48[1] + player->unk_138;
player->camAt.x = D_801779A0 = D_80177A48[2] + player->pos.x;
player->camAt.y = D_801779B8 = player->pos.y;
player->camAt.z = D_801779C0 = D_80177A48[4] + player->unk_138;
player->camAt.x = gCsCamAtX = D_80177A48[2] + player->pos.x;
player->camAt.y = gCsCamAtY = player->pos.y;
player->camAt.z = gCsCamAtZ = D_80177A48[4] + player->unk_138;
player->unk_1D0 = 1;
@@ -1937,12 +1937,12 @@ void func_i2_8018CD8C(Player* player) {
case 1:
actor3->vel.z = 4.0f;
D_80177978 = player->pos.x + 100.0f;
D_80177980 = player->pos.y;
D_80177988 = D_80177A48[1] + player->unk_138;
D_801779A0 = D_80177A48[2] + player->pos.x;
D_801779B8 = player->pos.y + 20.0f;
D_801779C0 = D_80177A48[4] + player->unk_138;
gCsCamEyeX = player->pos.x + 100.0f;
gCsCamEyeY = player->pos.y;
gCsCamEyeZ = D_80177A48[1] + player->unk_138;
gCsCamAtX = D_80177A48[2] + player->pos.x;
gCsCamAtY = player->pos.y + 20.0f;
gCsCamAtZ = D_80177A48[4] + player->unk_138;
Math_SmoothStepToF(&D_80177A48[1], 8000.0f, 0.05f, 20.0f, 0);
Math_SmoothStepToF(&D_80177A48[2], 0.0f, 0.05f, 25.0f, 0);
Math_SmoothStepToF(&D_80177A48[4], 0.0f, 0.05f, 200.0f, 0);
@@ -2055,12 +2055,12 @@ void func_i2_8018CD8C(Player* player) {
break;
case 2:
D_80177978 = player->pos.x;
D_80177980 = (player->pos.y * player->unk_148) + 50.0f;
D_80177988 = 400.0f;
D_801779A0 = player->pos.x;
D_801779B8 = (player->pos.y * player->unk_148) + 20.0f;
D_801779C0 = player->unk_138;
gCsCamEyeX = player->pos.x;
gCsCamEyeY = (player->pos.y * player->unk_148) + 50.0f;
gCsCamEyeZ = 400.0f;
gCsCamAtX = player->pos.x;
gCsCamAtY = (player->pos.y * player->unk_148) + 20.0f;
gCsCamAtZ = player->unk_138;
Math_SmoothStepToF(D_80177A48, 1.0f, 1.0f, 0.01f, 0.0f);
@@ -2105,12 +2105,12 @@ void func_i2_8018CD8C(Player* player) {
break;
}
Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 20000.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 20000.0f, 0.0f);
}
void func_i2_8018D9EC(Actor* actor) {
@@ -2243,14 +2243,14 @@ void func_i2_8018E084(Player* player) {
Matrix_MultVec3f(gCalcMatrix, &src, &dest);
D_80177978 = gBosses[0].obj.pos.x + dest.x;
D_80177980 = gBosses[0].obj.pos.y + dest.y;
gCsCamEyeX = gBosses[0].obj.pos.x + dest.x;
gCsCamEyeY = gBosses[0].obj.pos.y + dest.y;
D_80177988 = gBosses[0].obj.pos.z + D_80177D20 + dest.z;
D_801779A0 = gBosses[0].obj.pos.x;
D_801779B8 = gBosses[0].obj.pos.y;
gCsCamEyeZ = gBosses[0].obj.pos.z + D_80177D20 + dest.z;
gCsCamAtX = gBosses[0].obj.pos.x;
gCsCamAtY = gBosses[0].obj.pos.y;
D_801779C0 = gBosses[0].obj.pos.z + D_80177D20;
gCsCamAtZ = gBosses[0].obj.pos.z + D_80177D20;
Math_SmoothStepToF(&D_80177A48[1], 180.0f, 0.05f, 1.0f, 0.0f);
Math_SmoothStepToF(&D_80177A48[2], 1500.0f, 0.1f, 10.0f, 0.0f);
@@ -2310,9 +2310,9 @@ void func_i2_8018E084(Player* player) {
Matrix_MultVec3f(gCalcMatrix, &src, &dest);
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y;
D_801779C0 = player->unk_138 + D_80177D20 + 150.0f;
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y;
gCsCamAtZ = player->unk_138 + D_80177D20 + 150.0f;
if (gCsFrameCount > 1390) {
player->unk_0D0 += 2.0f;
@@ -2335,9 +2335,9 @@ void func_i2_8018E084(Player* player) {
}
}
} else {
D_80177978 = player->pos.x + dest.x;
D_80177980 = player->pos.y + dest.y;
D_80177988 = player->unk_138 + D_80177D20 + 150.0f + dest.z;
gCsCamEyeX = player->pos.x + dest.x;
gCsCamEyeY = player->pos.y + dest.y;
gCsCamEyeZ = player->unk_138 + D_80177D20 + 150.0f + dest.z;
}
break;
}
@@ -2444,12 +2444,12 @@ void func_i2_8018E084(Player* player) {
break;
}
Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0);
Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + 180.0f) * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, -((player->unk_0E4 + player->unk_4D8) * M_DTOR), 1);
src/overlays/ovl_i2/fox_sx.c
+25 -25
View File
@@ -1484,12 +1484,12 @@ void func_i2_80193A30(Player* player) {
func_i2_80193800(&gActors[5 + i], i);
}
player->unk_1D0 = 1;
player->camEye.x = D_80177978 = 100.0f;
player->camEye.y = D_80177980 = 0.0f;
player->camEye.z = D_80177988 = -200.0f;
player->camAt.x = D_801779A0 = 0.0f;
player->camAt.y = D_801779B8 = 0.0f;
player->camAt.z = D_801779C0 = -1000.0f;
player->camEye.x = gCsCamEyeX = 100.0f;
player->camEye.y = gCsCamEyeY = 0.0f;
player->camEye.z = gCsCamEyeZ = -200.0f;
player->camAt.x = gCsCamAtX = 0.0f;
player->camAt.y = gCsCamAtY = 0.0f;
player->camAt.z = gCsCamAtZ = -1000.0f;
player->unk_034 = -5.0f;
player->unk_0D0 = 0.0f;
D_80178340 = 255;
@@ -1499,8 +1499,8 @@ void func_i2_80193A30(Player* player) {
D_80178340 = 255;
}
D_80177A48[0] = 0.5f;
D_801779A0 = gActors[5].obj.pos.x;
D_801779C0 = gActors[5].obj.pos.z;
gCsCamAtX = gActors[5].obj.pos.x;
gCsCamAtZ = gActors[5].obj.pos.z;
player->unk_034 -= 0.1f;
if (gCsFrameCount == 140) {
x = gActors[5].obj.pos.x;
@@ -1553,9 +1553,9 @@ void func_i2_80193A30(Player* player) {
case 3:
if (gCsFrameCount >= 201) {
D_801779A0 = player->pos.x;
D_801779B8 = player->pos.y;
D_801779C0 = player->pos.z;
gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y;
gCsCamAtZ = player->pos.z;
Math_SmoothStepToF(D_80177A48, 0.1f, 1.0f, 0.01f, 0);
}
@@ -1589,9 +1589,9 @@ void func_i2_80193A30(Player* player) {
gActors[1].obj.pos.z -= player->pos.z;
gActors[2].obj.pos.z -= player->pos.z;
player->camEye.z -= player->pos.z;
D_80177988 -= player->pos.z;
gCsCamEyeZ -= player->pos.z;
player->camAt.z -= player->pos.z;
D_801779C0 -= player->pos.z;
gCsCamAtZ -= player->pos.z;
player->pos.z = 0.0f;
player->unk_0D0 = 0.0f;
}
@@ -1601,12 +1601,12 @@ void func_i2_80193A30(Player* player) {
Math_SmoothStepToF(&player->unk_034, 0.0f, 0.2f, 0.5f, 0);
Math_SmoothStepToF(&player->pos.y, 350.0f, 0.1f, 15.0f, 0);
Math_SmoothStepToF(&player->unk_0E4, 0.0f, 0.1f, 2.0f, 0);
D_80177978 = player->pos.x;
D_80177980 = (player->pos.y * player->unk_148) + 50.0f;
D_80177988 = 400.0f;
D_801779A0 = player->pos.x;
D_801779B8 = (player->pos.y * player->unk_148) + 20.0f;
D_801779C0 = player->unk_138;
gCsCamEyeX = player->pos.x;
gCsCamEyeY = (player->pos.y * player->unk_148) + 50.0f;
gCsCamEyeZ = 400.0f;
gCsCamAtX = player->pos.x;
gCsCamAtY = (player->pos.y * player->unk_148) + 20.0f;
gCsCamAtZ = player->unk_138;
Math_SmoothStepToF(D_80177A48, 1.0f, 1.0f, 0.01f, 0);
if (player->timer_1F8 == 0) {
@@ -1627,12 +1627,12 @@ void func_i2_80193A30(Player* player) {
}
break;
}
Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 20000.0f, 0);
Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 20000.0f, 0);
Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 20000.0f, 0);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 20000.0f, 0);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[0], 20000.0f, 0);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 20000.0f, 0);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 20000.0f, 0);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 20000.0f, 0);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 20000.0f, 0);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 20000.0f, 0);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 20000.0f, 0);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 20000.0f, 0);
Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + 180.0f) * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, -(player->unk_0E4 * M_DTOR), 1);
src.x = 0.0f;
src/overlays/ovl_i3/fox_a6.c
+55 -55
View File
@@ -2235,39 +2235,39 @@ void func_i3_8018DF74(Player* player) {
Matrix_Translate(gCalcMatrix, 0.0f, 350.0f, D_80177A48[6], 0);
Matrix_RotateY(gCalcMatrix, -(D_80177A48[4] * M_DTOR), 1);
Matrix_MultVec3f(gCalcMatrix, &sp74, &sp68);
D_80177978 = sp68.x;
D_80177980 = sp68.y;
D_80177988 = sp68.z;
gCsCamEyeX = sp68.x;
gCsCamEyeY = sp68.y;
gCsCamEyeZ = sp68.z;
if (gCsFrameCount < 200) {
Math_SmoothStepToF(&D_80177A48[4], 0.0f, 0.05f, 0.56f, 0.001f);
D_801779A0 = gActors[1].obj.pos.x;
D_801779B8 = gActors[1].obj.pos.y;
D_801779C0 = gActors[1].obj.pos.z;
gCsCamAtX = gActors[1].obj.pos.x;
gCsCamAtY = gActors[1].obj.pos.y;
gCsCamAtZ = gActors[1].obj.pos.z;
D_80177A48[0] = 1.0f;
D_80177A48[1] = 1.0f;
} else {
Math_SmoothStepToF(&D_80177A48[4], 0.0f, 0.05f, 0.56f, 0.001f);
Math_SmoothStepToF(&D_80177A48[5], 0.0f, 0.003f, 100.0f, 0.001f);
Math_SmoothStepToF(&D_801779A0, player->pos.x, 0.01f, 20.0f, 0.0001f);
Math_SmoothStepToF(&D_801779B8, player->pos.y, 0.01f, 20.0f, 0.0001f);
Math_SmoothStepToF(&D_801779C0, player->pos.z - 2500.0f, 0.01f, 20.0f, 0.0001f);
Math_SmoothStepToF(&gCsCamAtX, player->pos.x, 0.01f, 20.0f, 0.0001f);
Math_SmoothStepToF(&gCsCamAtY, player->pos.y, 0.01f, 20.0f, 0.0001f);
Math_SmoothStepToF(&gCsCamAtZ, player->pos.z - 2500.0f, 0.01f, 20.0f, 0.0001f);
D_80177A48[0] = 1.0f;
D_80177A48[1] = 1.0f;
}
} else {
Math_SmoothStepToF(&D_80177A48[3], 0.1f, 0.3f, 0.1f, 0.00001f);
temp1 = fabsf(player->pos.x - D_80177978) * D_80177A48[3];
temp2 = fabsf(player->pos.y * player->unk_148 + 50.0f - D_80177980) * D_80177A48[3];
temp3 = fabsf(player->pos.z + 400.0f - D_80177988) * D_80177A48[3];
D_80177978 += temp1;
D_80177980 -= temp2;
D_80177988 -= temp3;
temp1 = fabsf(player->pos.x - D_801779A0) * D_80177A48[3];
temp2 = fabsf(player->pos.y * player->unk_148 + 20.0f - D_801779B8) * D_80177A48[3];
temp3 = fabsf(player->pos.z - 51.0f - D_801779C0) * D_80177A48[3];
D_801779A0 += temp1;
D_801779B8 -= temp2;
D_801779C0 -= temp3;
temp1 = fabsf(player->pos.x - gCsCamEyeX) * D_80177A48[3];
temp2 = fabsf(player->pos.y * player->unk_148 + 50.0f - gCsCamEyeY) * D_80177A48[3];
temp3 = fabsf(player->pos.z + 400.0f - gCsCamEyeZ) * D_80177A48[3];
gCsCamEyeX += temp1;
gCsCamEyeY -= temp2;
gCsCamEyeZ -= temp3;
temp1 = fabsf(player->pos.x - gCsCamAtX) * D_80177A48[3];
temp2 = fabsf(player->pos.y * player->unk_148 + 20.0f - gCsCamAtY) * D_80177A48[3];
temp3 = fabsf(player->pos.z - 51.0f - gCsCamAtZ) * D_80177A48[3];
gCsCamAtX += temp1;
gCsCamAtY -= temp2;
gCsCamAtZ -= temp3;
D_80177A48[0] = 1.0f;
D_80177A48[1] = 1.0f;
}
@@ -2375,12 +2375,12 @@ void func_i3_8018DF74(Player* player) {
player->unk_138 = player->pos.z;
}
player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130;
Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[1], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[1], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[1], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[1], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[1], 50000.0f, 0.001f);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[1], 50000.0f, 0.001f);
}
void func_i3_8018EA88(Actor* actor) {
@@ -2496,16 +2496,16 @@ void func_i3_8018ED78(Player* player) {
player->unk_234 = 0;
player->unk_0D0 = 0.0f;
}
Math_SmoothStepToF(&D_80177978, gBosses[0].obj.pos.x, 0.05f, 1000.0f, 0.001f);
Math_SmoothStepToF(&D_80177980, gBosses[0].obj.pos.y, 0.05f, 1000.0f, 0.001f);
Math_SmoothStepToF(&D_80177988, gBosses[0].obj.pos.z + D_80177D20, 0.05f, 10.0f, 0.0001f);
player->camEye.x = D_80177978;
player->camEye.y = D_80177980;
player->camEye.z = D_80177988;
Math_SmoothStepToF(&gCsCamEyeX, gBosses[0].obj.pos.x, 0.05f, 1000.0f, 0.001f);
Math_SmoothStepToF(&gCsCamEyeY, gBosses[0].obj.pos.y, 0.05f, 1000.0f, 0.001f);
Math_SmoothStepToF(&gCsCamEyeZ, gBosses[0].obj.pos.z + D_80177D20, 0.05f, 10.0f, 0.0001f);
player->camEye.x = gCsCamEyeX;
player->camEye.y = gCsCamEyeY;
player->camEye.z = gCsCamEyeZ;
D_801779A0 = gBosses[0].obj.pos.x;
D_801779B8 = gBosses[0].obj.pos.y;
D_801779C0 = gBosses[0].obj.pos.z + D_80177D20;
gCsCamAtX = gBosses[0].obj.pos.x;
gCsCamAtY = gBosses[0].obj.pos.y;
gCsCamAtZ = gBosses[0].obj.pos.z + D_80177D20;
D_80177A48[0] = 0.04f;
if (gCsFrameCount == 140) {
func_i3_8018EA88(actor4);
@@ -2575,9 +2575,9 @@ void func_i3_8018ED78(Player* player) {
D_80177A48[5] = 300.0f;
D_80177A48[4] = 0.0f;
D_80177A48[9] = 50.0f;
player->camAt.x = D_801779A0 = player->pos.x;
player->camAt.y = D_801779B8 = 0.0f;
player->camAt.z = D_801779C0 = player->pos.z + 50.0f + D_80177D20;
player->camAt.x = gCsCamAtX = player->pos.x;
player->camAt.y = gCsCamAtY = 0.0f;
player->camAt.z = gCsCamAtZ = player->pos.z + 50.0f + D_80177D20;
}
if (D_80178340 != 0) {
D_80178358 = 0;
@@ -2606,18 +2606,18 @@ void func_i3_8018ED78(Player* player) {
if (D_80177A48[4] < 0.0f) {
D_80177A48[4] = D_80177A48[4] + 360.0f;
}
D_801779A0 = player->pos.x;
D_801779B8 = 0.0f;
D_801779C0 = D_80177A48[9] + player->pos.z + D_80177D20;
gCsCamAtX = player->pos.x;
gCsCamAtY = 0.0f;
gCsCamAtZ = D_80177A48[9] + player->pos.z + D_80177D20;
D_80177A48[0] = 0.008f;
} else {
Math_SmoothStepToAngle(&D_80177A48[4], 0.0f, 0.1f, 10.0f, 0.001f);
Math_SmoothStepToF(&D_80177A48[5], 0.0f, 0.1f, 1000.0f, 0.001f);
D_8015F984 -= 0.005f;
D_801779A0 += 2.0f;
player->camAt.x = D_801779A0 = player->pos.x;
player->camAt.y = D_801779B8 = 0.0f;
player->camAt.z = D_801779C0 = D_80177A48[9] + player->pos.z + D_80177D20;
gCsCamAtX += 2.0f;
player->camAt.x = gCsCamAtX = player->pos.x;
player->camAt.y = gCsCamAtY = 0.0f;
player->camAt.z = gCsCamAtZ = D_80177A48[9] + player->pos.z + D_80177D20;
}
sp78.x = 0.0f;
sp78.y = 0.0f;
@@ -2625,9 +2625,9 @@ void func_i3_8018ED78(Player* player) {
Matrix_Translate(gCalcMatrix, D_80177A48[1], 0.0f, D_80177A48[3] + D_80177D20, 0);
Matrix_RotateY(gCalcMatrix, -(D_80177A48[4] * M_DTOR), 1);
Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C);
player->camEye.x = D_80177978 = sp6C.x;
player->camEye.y = D_80177980 = sp6C.y;
player->camEye.z = D_80177988 = sp6C.z;
player->camEye.x = gCsCamEyeX = sp6C.x;
player->camEye.y = gCsCamEyeY = sp6C.y;
player->camEye.z = gCsCamEyeZ = sp6C.z;
if (gCsFrameCount == 1076) {
Object_Kill(&gActors[0].obj, gActors[0].sfxPos);
@@ -2721,10 +2721,10 @@ void func_i3_8018ED78(Player* player) {
player->pos.z += player->vel.z;
player->unk_138 = player->pos.z;
player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130;
Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 50000.0f, 0.0001f);
Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 50000.0f, 0.0001f);
Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 50000.0f, 0.0001f);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 50000.0f, 0.0001f);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[0], 50000.0f, 0.0001f);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 50000.0f, 0.0001f);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.0001f);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.0001f);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.0001f);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.0001f);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.0001f);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.0001f);
}
src/overlays/ovl_i3/fox_aq.c
+30 -30
View File
@@ -448,12 +448,12 @@ f32 func_i3_801A958C(s32 arg0, f32 arg1) {
}
void func_i3_801A95C8(void) {
Math_SmoothStepToF(&gPlayer[0].camEye.x, D_80177978, 0.1f, 50.0f, 0.0001f);
Math_SmoothStepToF(&gPlayer[0].camEye.y, D_80177980, 0.1f, 50.0f, 0.0001f);
Math_SmoothStepToF(&gPlayer[0].camEye.z, D_80177988, 0.1f, 50.0f, 0.0001f);
Math_SmoothStepToF(&gPlayer[0].camAt.x, D_801779A0, 0.1f, 50.0f, 0.0001f);
Math_SmoothStepToF(&gPlayer[0].camAt.y, D_801779B8, 0.1f, 50.0f, 0.0001f);
Math_SmoothStepToF(&gPlayer[0].camAt.z, D_801779C0, 0.1f, 50.0f, 0.0001f);
Math_SmoothStepToF(&gPlayer[0].camEye.x, gCsCamEyeX, 0.1f, 50.0f, 0.0001f);
Math_SmoothStepToF(&gPlayer[0].camEye.y, gCsCamEyeY, 0.1f, 50.0f, 0.0001f);
Math_SmoothStepToF(&gPlayer[0].camEye.z, gCsCamEyeZ, 0.1f, 50.0f, 0.0001f);
Math_SmoothStepToF(&gPlayer[0].camAt.x, gCsCamAtX, 0.1f, 50.0f, 0.0001f);
Math_SmoothStepToF(&gPlayer[0].camAt.y, gCsCamAtY, 0.1f, 50.0f, 0.0001f);
Math_SmoothStepToF(&gPlayer[0].camAt.z, gCsCamAtZ, 0.1f, 50.0f, 0.0001f);
}
void func_i3_801A96DC(Actor* actor) {
@@ -826,31 +826,31 @@ void func_i3_801AA8E8(Player* player) {
} else {
Math_SmoothStepToF(&player->unk_02C, var_fv1, 0.05f, 2.0f, 0.05f);
}
D_80177978 = (player->pos.x - player->unk_0AC) * (600.0f / player->unk_09C);
D_80177978 -= player->unk_030 * 1.5f;
D_80177978 += player->unk_0AC + D_i3_801C41B8[9];
D_80177980 = player->pos.y * (740.0f / player->unk_0A0);
D_80177980 -= player->unk_02C - 50.0f;
D_80177980 += player->unk_0B0;
D_801779A0 = (player->pos.x - player->unk_0AC - D_i3_801C41B8[9]) * (600.0f / player->unk_09C);
D_801779A0 += player->unk_084 * -2.0f;
D_801779A0 -= player->unk_030 * 0.5f;
D_801779A0 += player->unk_0AC;
D_801779B8 = (player->pos.y - player->unk_0B0) * (750.0f / player->unk_0A0);
D_801779B8 += player->unk_060 * 10.0f;
D_801779B8 -= player->unk_02C * -0.55f;
D_801779B8 += player->unk_0B0 + D_i3_801C41B8[10];
if (D_801779B8 < 20.0f) {
D_801779B8 = 20.0f;
gCsCamEyeX = (player->pos.x - player->unk_0AC) * (600.0f / player->unk_09C);
gCsCamEyeX -= player->unk_030 * 1.5f;
gCsCamEyeX += player->unk_0AC + D_i3_801C41B8[9];
gCsCamEyeY = player->pos.y * (740.0f / player->unk_0A0);
gCsCamEyeY -= player->unk_02C - 50.0f;
gCsCamEyeY += player->unk_0B0;
gCsCamAtX = (player->pos.x - player->unk_0AC - D_i3_801C41B8[9]) * (600.0f / player->unk_09C);
gCsCamAtX += player->unk_084 * -2.0f;
gCsCamAtX -= player->unk_030 * 0.5f;
gCsCamAtX += player->unk_0AC;
gCsCamAtY = (player->pos.y - player->unk_0B0) * (750.0f / player->unk_0A0);
gCsCamAtY += player->unk_060 * 10.0f;
gCsCamAtY -= player->unk_02C * -0.55f;
gCsCamAtY += player->unk_0B0 + D_i3_801C41B8[10];
if (gCsCamAtY < 20.0f) {
gCsCamAtY = 20.0f;
}
D_80177988 = 240.0f;
D_801779C0 = player->unk_138 + (D_80177D20 - 1.0f);
Math_SmoothStepToF(&player->camEye.x, D_80177978, player->unk_014, 1000.0f, 0);
Math_SmoothStepToF(&player->camEye.y, D_80177980, player->unk_014, 1000.0f, 0);
Math_SmoothStepToF(&player->camEye.z, D_80177988, 0.2f, 30.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, D_801779A0, player->unk_014, 1000.0f, 0);
Math_SmoothStepToF(&player->camAt.y, D_801779B8, player->unk_014, 1000.0f, 0);
Math_SmoothStepToF(&player->camAt.z, D_801779C0, player->unk_014, 1000.0f, 0);
gCsCamEyeZ = 240.0f;
gCsCamAtZ = player->unk_138 + (D_80177D20 - 1.0f);
Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, player->unk_014, 1000.0f, 0);
Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, player->unk_014, 1000.0f, 0);
Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, 0.2f, 30.0f, 0.0f);
Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, player->unk_014, 1000.0f, 0);
Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, player->unk_014, 1000.0f, 0);
Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, player->unk_014, 1000.0f, 0);
Math_SmoothStepToF(&player->unk_014, 1.0f, 1.0f, 0.05f, 0.0f);
temp = -player->unk_0EC;
Math_SmoothStepToF(&player->unk_034, temp * 0.3f, 0.1f, 1.5f, 0.0f);

Some files were not shown because too many files have changed in this diff Show More