mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-08-18 14:12:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

wip on sf_A4B50 (probably fox_play), also names and cleanup (#43)

Browse Source 
* objects?

* objects2?

* more stuff

* format

* even more cleanup

* RCP function names

* format

* NO U

* makerom too
This commit is contained in:
petrie911
2023-12-04 12:50:52 -06:00
committed by GitHub
parent b035b53569
commit 3a38f87ea5
34 changed files with 4987 additions and 1626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/ast_DE5D50.c
+977 -976
View File
File diff suppressed because it is too large Load Diff
src/main/fox_2EFE0.c
+2 -2
View File
@@ -36,9 +36,9 @@ void func_8002E3E0(Object_2F4* arg0) {
s32 func_8002E4F8(u16* arg0, s32 arg1) {
if ((D_8017829C == 0) && (D_80178280[0].unk_1C8 != 0)) {
func_800BA808(arg0, arg1);
return 1;
return true;
} else {
return 0;
return false;
}
}
src/main/fox_84F70.c
+1 -1
View File
@@ -13,7 +13,7 @@ void func_800843FC(s32 arg0) {
void func_80084488(s32 arg0) {
s32 var_s1;
func_800B8FA8();
RCP_SetupDL_12();
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -150.0f, 0);
for (var_s1 = 0; var_s1 < MIN(360, arg0 * 15); var_s1 += 15) {
src/main/fox_A24B0.c
+5 -4
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "sf64dma.h"
extern void func_80187520(s32, void*);
@@ -82,7 +83,7 @@ void func_800A1980(void) {
func_8001D400(0);
}
s32 func_800A1B6C(void) {
bool func_800A1B6C(void) {
static u8 sHoldTimer = 0;
static u8 sOverlaySelect = 99;
static u8 sCurrentOverlay = 99;
@@ -100,9 +101,9 @@ s32 func_800A1B6C(void) {
if (sHoldTimer) {
sHoldTimer--;
return 1;
return true;
}
return 0;
return false;
}
void func_800A1C14(Gfx** arg0) {
@@ -291,7 +292,7 @@ void func_800A26C0(void) {
}
func_800A1C14(&gUnkDisp1);
func_800A25DC();
if (func_800A1B6C() != 1) {
if (func_800A1B6C() != true) {
Lib_Perspective(&gUnkDisp1);
func_800A1FB0(&gUnkDisp1, D_801778A8, 0);
if (D_8017783C != 0) {
src/main/fox_display.c
+14 -14
View File
@@ -161,9 +161,9 @@ void Animation_DrawLimb(s32 mode, Limb* limb, Limb** skeleton, Vec3f* jointTable
}
if (!override) {
Matrix_Translate(gCalcMatrix, trans.x, trans.y, trans.z, 1);
Matrix_RotateZ(gCalcMatrix, rot.z * 0.017453292f, 1);
Matrix_RotateY(gCalcMatrix, rot.y * 0.017453292f, 1);
Matrix_RotateX(gCalcMatrix, rot.x * 0.017453292f, 1);
Matrix_RotateZ(gCalcMatrix, rot.z * M_DTOR, 1);
Matrix_RotateY(gCalcMatrix, rot.y * M_DTOR, 1);
Matrix_RotateX(gCalcMatrix, rot.x * M_DTOR, 1);
if (dList != NULL) {
if (mode >= 2) {
Matrix_MultVec3f(gCalcMatrix, &origin, &pos);
@@ -224,9 +224,9 @@ void Animation_DrawSkeleton(s32 mode, Limb** skeletonSegment, Vec3f* jointTable,
}
if (override == 0) {
Matrix_Translate(gCalcMatrix, baseTrans.x, baseTrans.y, baseTrans.z, 1);
Matrix_RotateZ(gCalcMatrix, baseRot.z * 0.017453292f, 1);
Matrix_RotateY(gCalcMatrix, baseRot.y * 0.017453292f, 1);
Matrix_RotateX(gCalcMatrix, baseRot.x * 0.017453292f, 1);
Matrix_RotateZ(gCalcMatrix, baseRot.z * M_DTOR, 1);
Matrix_RotateY(gCalcMatrix, baseRot.y * M_DTOR, 1);
Matrix_RotateX(gCalcMatrix, baseRot.x * M_DTOR, 1);
if (dList != NULL) {
Matrix_Mult(gGfxMatrix, gCalcMatrix, 1);
Matrix_SetGfxMtx(&gMasterDisp);
@@ -360,19 +360,19 @@ void Animation_GetSkeletonBoundingBox(Limb** skeletonSegment, AnimationHeader* a
} else {
var_t6 = frameData[(s16) key[1].z];
}
Matrix_RotateZ(gGfxMatrix, (((s32) var_t6 * 360.0f) / 65536.0f) * 0.017453292f, 0);
Matrix_RotateZ(gGfxMatrix, (((s32) var_t6 * 360.0f) / 65536.0f) * M_DTOR, 0);
if (frame < (s16) key[1].yLen) {
var_t6 = frameData[(s16) key[1].y + frame];
} else {
var_t6 = frameData[(s16) key[1].y];
}
Matrix_RotateY(gGfxMatrix, (((s32) var_t6 * 360.0f) / 65536.0f) * 0.017453292f, 1);
Matrix_RotateY(gGfxMatrix, (((s32) var_t6 * 360.0f) / 65536.0f) * M_DTOR, 1);
if (frame < (s16) key[1].xLen) {
var_t6 = frameData[(s16) key[1].x + frame];
} else {
var_t6 = frameData[(s16) key[1].x];
}
Matrix_RotateX(gGfxMatrix, (((s32) var_t6 * 360.0f) / 65536.0f) * 0.017453292f, 1);
Matrix_RotateX(gGfxMatrix, (((s32) var_t6 * 360.0f) / 65536.0f) * M_DTOR, 1);
vtxFound = false;
if (limb->dList != NULL) {
Animation_FindBoundingBox(limb->dList, 0x2000, min, max, &vtxFound, &vtxCount, &vtxList);
@@ -516,8 +516,8 @@ s32 Math_PursueVec3f(Vec3f* pos, Vec3f* target, Vec3f* rot, f32 stepSize, f32 sc
targetRotX = Math_RadToDeg(-Math_Atan2F(diff.y, sqrtf(SQ(diff.x) + SQ(diff.z))));
Math_SmoothStepToAngle(&rot->y, targetRotY, scaleTurn, maxTurn, 0.0f);
Math_SmoothStepToAngle(&rot->x, targetRotX, scaleTurn, maxTurn, 0.0f);
Matrix_RotateY(&worldTransform, rot->y * 0.017453292f, 0);
Matrix_RotateX(&worldTransform, rot->x * 0.017453292f, 1);
Matrix_RotateY(&worldTransform, rot->y * M_DTOR, 0);
Matrix_RotateX(&worldTransform, rot->x * M_DTOR, 1);
localStep.z = stepSize;
Matrix_MultVec3fNoTranslate(&worldTransform, &localStep, &worldStep);
@@ -705,15 +705,15 @@ void Graphics_FillRectangle(Gfx** gfxPtr, s32 ulx, s32 uly, s32 lrx, s32 lry, u8
void Math_Vec3fFromAngles(Vec3f* step, f32 xRot, f32 yRot, f32 stepsize) {
Vec3f sp1C;
Matrix_RotateY(gCalcMatrix, yRot * 0.017453292f, 0);
Matrix_RotateX(gCalcMatrix, xRot * 0.017453292f, 1);
Matrix_RotateY(gCalcMatrix, yRot * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, xRot * M_DTOR, 1);
sp1C.x = sp1C.y = 0.0f;
sp1C.z = stepsize;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp1C, step);
}
f32 Math_RadToDeg(f32 rAngle) {
rAngle *= 57.295776f;
rAngle *= M_RTOD;
while (rAngle < 0.0f) {
rAngle += 360.0f;
src/main/fox_edata.c
+4 -4
View File
@@ -1,19 +1,19 @@
#include "global.h"
void func_800594F0(Object_80* arg0) {
func_800B9EB0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_57(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
Matrix_RotateY(gGfxMatrix, M_PI, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6007D90);
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
void func_800595D0(Object_80* arg0) {
func_800B9EB0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_57(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
Matrix_RotateY(gGfxMatrix, M_PI, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6007CF0);
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
void func_800596B0(Object_2F4* arg0) {
src/main/fox_edisplay.c
+42 -42
View File
@@ -25,16 +25,16 @@ void func_8005980C(f32 arg0) {
void func_80059850(Object_4C* arg0) {
RCP_SetupDL(&gMasterDisp, 0x40);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 60);
func_800B9B38(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
void func_800598DC(s32 arg0) {
}
void func_800598E8(Object_2F4* arg0) {
func_800B9B38(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
gSPDisplayList(gMasterDisp++, D_6025B50);
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
void func_800599A4(s32 arg0, Vec3f* arg1, s32* arg2) {
@@ -51,11 +51,10 @@ void func_800599A4(s32 arg0, Vec3f* arg1, s32* arg2) {
}
f32 D_800CF9B0[] = {
-12.32422638f, -12.00849533f, -11.08310699f, -9.561470032f, -7.440753937f, -4.713317871f, -1.393303037f,
2.485869884f, 6.872662067f, 11.66899109f, 16.7521019f, 21.98126984f, 27.19302368f, 32.21533966f,
36.87569427f, 41.0078125f, 44.46230316f, 47.09422302f, 48.7610054f, 49.34596634f, 47.64530182f,
42.98818588f, 36.06262207f, 27.66272163f, 18.64647293f, 9.883304596f, 2.113918066f, -4.157948017f,
-8.673706055f, -11.39522171f, -12.32422638f,
-12.324226f, -12.008495f, -11.083107f, -9.56147f, -7.440754f, -4.713318f, -1.393303f, 2.48587f,
6.872662f, 11.668991f, 16.752102f, 21.98127f, 27.193024f, 32.21534f, 36.875694f, 41.007812f,
44.462303f, 47.094223f, 48.761005f, 49.345966f, 47.6453f, 42.988186f, 36.062622f, 27.662722f,
18.646473f, 9.883305f, 2.113918f, -4.157948f, -8.673706f, -11.395222f, -12.324226f,
};
f32 D_800CFA2C[] = {
1.0f, 1.0f, 0.95f, 0.9f, 0.85f, 0.8f, 0.75f, 0.7f, 0.65f, 0.6f,
@@ -104,7 +103,7 @@ void func_80059C34(Object_4C* arg0) {
}
void func_80059C40(Object_4C* arg0) {
func_800B9C50(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_47(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 180);
switch (arg0->unk_45) {
case 0x0:
@@ -139,7 +138,7 @@ void func_80059C40(Object_4C* arg0) {
gSPDisplayList(gMasterDisp++, D_6034B90);
break;
}
func_800B9B38(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
void func_80059F68(Object_6C* arg0) {
@@ -432,11 +431,11 @@ void func_8005ADAC(Object_2F4* arg0) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1);
Matrix_Scale(gGfxMatrix, sp5C, sp5C * 0.7f, sp5C, 1);
Matrix_RotateZ(gGfxMatrix, -arg0->obj.rot.z * M_DTOR, 1U);
Matrix_RotateX(gGfxMatrix, -arg0->obj.rot.x * M_DTOR, 1U);
Matrix_RotateY(gGfxMatrix, -arg0->obj.rot.y * M_DTOR, 1U);
Matrix_RotateY(gGfxMatrix, -D_80178280[D_801778A0].unk_058, 1U);
Matrix_RotateX(gGfxMatrix, D_80178280[D_801778A0].unk_05C, 1U);
Matrix_RotateZ(gGfxMatrix, -arg0->obj.rot.z * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, -arg0->obj.rot.x * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, -arg0->obj.rot.y * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, -D_80178280[D_801778A0].unk_058, 1);
Matrix_RotateX(gGfxMatrix, D_80178280[D_801778A0].unk_05C, 1);
Matrix_SetGfxMtx(&gMasterDisp);
func_8005465C(D_80177C98);
Matrix_Pop(&gGfxMatrix);
@@ -447,7 +446,7 @@ void func_8005ADAC(Object_2F4* arg0) {
if (D_80177DB0 & 1) {
sp54 = 180.0f;
}
func_800BA170();
RCP_SetupDL_64_2();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 100);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 70.0f, -10.0f, -100.0f, 1);
@@ -549,14 +548,14 @@ void func_8005B6A4(Object_2F4* arg0) {
}
void func_8005B71C(Object_2F4* arg0) {
func_800BA1D0(arg0->unk_046, D_80178328, D_80178330, D_80178338, arg0->unk_048, D_801783DC);
RCP_SetupDL_29(arg0->unk_046, D_80178328, D_80178330, D_80178338, arg0->unk_048, D_801783DC);
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6018C00);
}
void func_8005B7CC(Object_2F4* arg0) {
func_800BA1D0(arg0->unk_046, D_80178328, D_80178330, D_80178338, arg0->unk_048, D_801783DC);
RCP_SetupDL_29(arg0->unk_046, D_80178328, D_80178330, D_80178338, arg0->unk_048, D_801783DC);
gSPDisplayList(gMasterDisp++, D_6022920);
}
@@ -593,7 +592,7 @@ void func_8005B9A4(Object_2F4* arg0) {
void func_8005BA30(Object_2F4* arg0) {
if (arg0->unk_0BC != 0) {
func_800BA400();
RCP_SetupDL_27();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
gSPDisplayList(gMasterDisp++, D_6020B40);
@@ -695,7 +694,7 @@ void func_8005BAB4(s32 arg0, s32 arg1) {
gSPDisplayList(gMasterDisp++, D_6034B90);
break;
case 0xE6:
func_800BA550();
RCP_SetupDL_48();
RCP_SetupDL(&gMasterDisp, 0x45);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
@@ -729,12 +728,12 @@ void func_8005BAB4(s32 arg0, s32 arg1) {
Matrix_RotateZ(gGfxMatrix, D_80163FE0[arg1].unk_11C, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 0.0f, 1);
Matrix_Scale(gGfxMatrix, 1.2f, 1.0f, 1.2f, 1);
Matrix_RotateX(gGfxMatrix, -M_PI / 2.0f, 1U);
Matrix_RotateX(gGfxMatrix, -M_PI / 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024AC0);
break;
case 0xD7:
func_800BA550();
RCP_SetupDL_48();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 255);
Matrix_Scale(gGfxMatrix, 4.0f, 4.0f, 4.0f, 1);
@@ -845,7 +844,7 @@ void func_8005CDA8(Object_6C* arg0) {
RCP_SetupDL(&gMasterDisp, 0x29);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, arg0->unk_44);
} else {
func_800B9B38(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK | G_LIGHTING); // wrong order?
for (i = 0; i < 7; i++) {
@@ -933,19 +932,19 @@ void func_8005D654(Object_80* arg0, s32 arg1) {
arg0->obj.pos.y -= D_8017847C;
if (arg0->unk_1C.unk_04 == 0) {
if ((arg0->obj.id == 0x13) || (arg0->obj.id == 0x37) || (arg0->obj.id == 9) || (arg0->obj.id == 0x32)) {
func_800B9EB0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_57(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
if (arg1 < 0) {
func_800596C0();
}
gSPDisplayList(gMasterDisp++, arg0->unk_1C.unk_00);
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
} else {
if (arg0->obj.id == 8) {
if (arg1 < 0) {
return; // weird control flow
}
func_800B9B38(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
func_800597C0(arg1);
if (arg1 < 0) {
@@ -953,7 +952,7 @@ void func_8005D654(Object_80* arg0, s32 arg1) {
}
gSPDisplayList(gMasterDisp++, arg0->unk_1C.unk_00);
if (arg0->obj.id == 8) {
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
}
} else if (arg0->unk_1C.unk_00 != NULL) {
@@ -1511,7 +1510,7 @@ void func_8005F670(Vec3f* arg0) {
}
#ifdef NON_MATCHING
s32 func_8005F9DC(Vec3f* arg0) {
bool func_8005F9DC(Vec3f* arg0) {
Vec3f sp2C;
Vec3f sp20;
@@ -1523,11 +1522,12 @@ s32 func_8005F9DC(Vec3f* arg0) {
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp2C, &sp20);
if ((sp20.z < 1000.0f) && (sp20.z > -13000.0f) && (fabsf(sp20.x) < (fabsf(sp20.z * 0.4f) + 2000.0f)) &&
(fabsf(sp20.y) < (fabsf(sp20.y * 0.4f) + 2000.0f))) {
return 1;
return true;
}
return 0;
return false;
}
#else
bool func_8005F9DC(Vec3f* arg0);
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/fox_edisplay/func_8005F9DC.s")
#endif
@@ -1543,7 +1543,7 @@ void func_8005FB70(s32 arg0) {
Object_80* var_s0_2;
if ((D_80177880 == 1) && (D_80178234 != 0x10)) {
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
if (D_80177AB0 == 5) {
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
}
@@ -1562,7 +1562,7 @@ void func_8005FB70(s32 arg0) {
}
}
} else {
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
for (i = 0, var_s0_2 = D_80161B00; i < ARRAY_COUNT(D_80161B00); i++, var_s0_2++) {
if (var_s0_2->obj.status >= 2) {
if (arg0 > 0) {
@@ -1578,9 +1578,9 @@ void func_8005FB70(s32 arg0) {
for (i = 0, var_s0_3 = D_8016F110; i < ARRAY_COUNT(D_8016F110); i++, var_s0_3++) {
if ((var_s0_3->obj.status >= 2) && (var_s0_3->obj.id != 0x136)) {
if (!(var_s0_3->unk_05C & 1)) {
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
} else {
func_800BA400();
RCP_SetupDL_27();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 64, 64, 255, 255);
}
func_800597C0(arg0);
@@ -1600,9 +1600,9 @@ void func_8005FB70(s32 arg0) {
if ((var_s0_4->obj.status >= 2) && (func_80060FE4(&var_s0_4->obj.pos, -12000.0f) != 0)) {
Matrix_Push(&gGfxMatrix);
if ((var_s0_4->obj.id == 0xA5) || (var_s0_4->obj.id == 0xA6)) {
func_800B9EB0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_57(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
} else {
func_800B9B38(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
func_8005D8B8(var_s0_4, arg0);
Matrix_Pop(&gGfxMatrix);
@@ -1612,12 +1612,12 @@ void func_8005FB70(s32 arg0) {
if (var_s0_5->obj.status >= 2) {
if (!(var_s0_5->unk_0C6 & 1)) {
if (D_80178234 == 0xF) {
func_800BA1A0();
RCP_SetupDL_23();
} else {
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
} else {
func_800BA400();
RCP_SetupDL_27();
if (var_s0_5->unk_110 >= 0.0f) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} else {
@@ -1702,9 +1702,9 @@ void func_8006046C(s32 arg0) {
for (i = 0, var_s0_2 = D_8016F110; i < ARRAY_COUNT(D_8016F110); i++, var_s0_2++) {
if ((var_s0_2->obj.status >= 2) && (var_s0_2->obj.id == 0x136)) {
if (!(var_s0_2->unk_05C & 1)) {
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
} else {
func_800BA400();
RCP_SetupDL_27();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 64, 64, 255, 255);
}
Matrix_Push(&gGfxMatrix);
@@ -1767,7 +1767,7 @@ void func_80060968(void) {
} else if ((D_80178234 == 0xD) || (D_80178234 == 9)) {
RCP_SetupDL(&gMasterDisp, 0x29);
} else {
func_800B92F8();
RCP_SetupDL_14();
}
for (i = 0; i < ARRAY_COUNT(D_80174750); i++) {
if (D_80174750[i].unk_00 != 0) {
src/main/fox_enmy1.c
+32 -31
View File
@@ -43,7 +43,7 @@ s32 func_80060FE4(Vec3f* arg0, f32 arg1) {
Vec3f sp20;
if ((D_80177880 != 1) && (D_80178280[0].unk_1C8 != 2)) {
return 1;
return true;
}
Matrix_RotateY(gCalcMatrix, D_80178280[D_801778A0].unk_058, 0);
sp2C.x = arg0->x - D_80178280[D_801778A0].unk_040.x;
@@ -52,9 +52,9 @@ s32 func_80060FE4(Vec3f* arg0, f32 arg1) {
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp2C, &sp20);
if ((sp20.z < 1000.0f) && (arg1 < sp20.z) && (fabsf(sp20.x) < (fabsf(sp20.z * 0.5f) + 2000.0f))) {
return 1;
return true;
}
return 0;
return false;
}
s32 func_80061148(Vec3f* arg0, f32 arg1) {
@@ -62,7 +62,7 @@ s32 func_80061148(Vec3f* arg0, f32 arg1) {
Vec3f sp20;
if (D_80177880 != 1) {
return 1;
return true;
}
if (D_80178280[0].unk_1C8 == 7) {
return func_80060FE4(arg0, arg1);
@@ -74,9 +74,9 @@ s32 func_80061148(Vec3f* arg0, f32 arg1) {
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp2C, &sp20);
if ((sp20.z < 0.0f) && (arg1 < sp20.z) && (fabsf(sp20.x) < (fabsf(sp20.z * 0.5f) + 500.0f))) {
return 1;
return true;
}
return 0;
return false;
}
void func_800612B8(ObjectStruct_1C* arg0, u32 arg1) {
@@ -246,9 +246,9 @@ void func_80061A4C(void) {
for (i = 0; i < ARRAY_COUNT(D_80170130); i++) {
if (D_80170130[i].obj.status == 0) {
sp1C = (Rand_ZeroOne() - 0.5f);
sp28 = D_80178280[0].unk_074 + (sp1C * 400.0f) + (5.0f * D_80178280[0].unk_0C0);
sp28 = D_80178280[0].unk_074 + (sp1C * 400.0f) + (5.0f * D_80178280[0].unk_0C0.x);
sp1C = (Rand_ZeroOne() - 0.5f);
sp24 = D_80178280[0].unk_078 + (sp1C * 400.0f) + (5.0f * D_80178280[0].unk_0C4);
sp24 = D_80178280[0].unk_078 + (sp1C * 400.0f) + (5.0f * D_80178280[0].unk_0C0.y);
sp20 = -D_80177D20 - 500.0f;
if (D_80177D08 < 0.0f) {
sp20 = -D_80177D20 + 500.0f;
@@ -270,11 +270,11 @@ void func_80061B68(void) {
if (D_80170130[i].obj.status == 0) {
sp1C = (Rand_ZeroOne() - 0.5f);
sp28 = D_80178280[0].unk_074 + (sp1C * 2000.0f) + (5.0f * D_80178280[0].unk_0C0);
sp28 = D_80178280[0].unk_074 + (sp1C * 2000.0f) + (5.0f * D_80178280[0].unk_0C0.x);
sp24 = 0;
while (sp24 <= D_80177940) {
sp1C = (Rand_ZeroOne() - 0.5f);
sp24 = D_80178280[0].unk_078 + (sp1C * 2000.0f) + (5.0f * D_80178280[0].unk_0C4);
sp24 = D_80178280[0].unk_078 + (sp1C * 2000.0f) + (5.0f * D_80178280[0].unk_0C0.y);
}
sp20 = -D_80177D20 - 3000.0f;
if (D_80177D08 < 0.0f) {
@@ -296,9 +296,10 @@ void func_80061CD0(void) {
for (i = 0; i < ARRAY_COUNT(D_80170130); i++) {
if (D_80170130[i].obj.status == 0) {
sp1C = (Rand_ZeroOne() - 0.5f);
sp28 = D_80178280[D_801778A0].unk_074 + (sp1C * 3000.0f) + (5.0f * D_80178280[D_801778A0].unk_0C0);
sp28 = D_80178280[D_801778A0].unk_074 + (sp1C * 3000.0f) + (5.0f * D_80178280[D_801778A0].unk_0C0.x);
sp1C = (Rand_ZeroOne() - 0.5f);
sp24 = D_80178280[D_801778A0].unk_078 + 1000.0f + (sp1C * 500.0f) + (5.0f * D_80178280[D_801778A0].unk_0C4);
sp24 =
D_80178280[D_801778A0].unk_078 + 1000.0f + (sp1C * 500.0f) + (5.0f * D_80178280[D_801778A0].unk_0C0.y);
sp20 = -D_80177D20 - 2000.0f * Rand_ZeroOne();
if (D_80177D08 < 0.0f) {
sp20 = -D_80177D20 + 1000.0f;
@@ -666,39 +667,39 @@ s32 func_80062DBC(Vec3f* arg0, f32* var_s0, Object* arg2, f32 arg3, f32 arg4, f3
if ((var_s0[1] + 20.0f) > (fabsf((var_s0[0] + arg2->pos.z) - var_ft5)) &&
((var_s0[5] + 20.0f) > fabsf((var_s0[4] + arg2->pos.x) - var_fa1)) &&
((var_s0[3] + 10.0f) > fabsf((var_s0[2] + arg2->pos.y) - var_ft4))) {
return 1;
return true;
}
var_s0 += 6;
}
}
return 0;
return false;
}
s32 func_800631A8(Vec3f* arg0, f32* arg1, Vec3f* arg2) {
if (((s32) arg1[0] != 0) && (fabsf((arg1[1] + arg2->z) - arg0->z) < (arg1[2] + 20.0f)) &&
(fabsf((arg1[5] + arg2->x) - arg0->x) < (arg1[6] + 20.0f)) &&
(fabsf((arg1[3] + arg2->y) - arg0->y) < (arg1[4] + 20.0f))) {
return 1;
return true;
}
return 0;
return false;
}
s32 func_8006326C(Vec3f* arg0, s32 arg1, s32 arg2, Object* arg3) {
s32 func_8006326C(Vec3f* arg0, Vec3f* arg1, s32 arg2, Object* arg3) {
Vec3f sp74;
Vec3f sp68;
Vec3f sp5C;
Vec3f sp50;
Vec3f sp44;
s32 var_s1;
s32 pad1;
Vec3f sp30;
s32 pad1[3];
f32 sp30;
s32 pad2;
sp74.x = arg0->x - arg3->pos.x;
sp74.z = arg0->z - arg3->pos.z;
if (((fabsf(sp74.x) < 1100.0f) && (fabsf(sp74.z) < 1100.0f)) || (arg2 == 0xB4)) {
sp74.y = arg0->y - arg3->pos.y;
Matrix_RotateY(gCalcMatrix, -arg3->rot.y * M_DTOR, 0U);
Matrix_RotateY(gCalcMatrix, -arg3->rot.y * M_DTOR, 0);
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp74, &sp68);
sp5C.x = arg3->pos.x + sp68.x;
sp5C.y = arg3->pos.y + sp68.y;
@@ -726,7 +727,7 @@ s32 func_8006326C(Vec3f* arg0, s32 arg1, s32 arg2, Object* arg3) {
var_s1 = 8;
}
if (func_800998FC(&sp5C, &sp50, arg1, var_s1, &sp44, &sp30) > 0) {
return 1;
return true;
}
} else {
var_s1 = 0;
@@ -748,14 +749,14 @@ s32 func_8006326C(Vec3f* arg0, s32 arg1, s32 arg2, Object* arg3) {
var_s1 = 1;
}
if (func_800A3690(&sp5C, &sp50, var_s1, &sp44) != 0) {
return 1;
return true;
}
}
}
return 0;
return false;
}
s32 func_8006351C(s32 arg0, Vec3f* arg1, s32 arg2, s32 arg3) {
s32 func_8006351C(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) {
Object_58* var_s0;
Object_80* var_s0_2;
Object_4C* var_s0_3;
@@ -879,13 +880,13 @@ s32 func_8006351C(s32 arg0, Vec3f* arg1, s32 arg2, s32 arg3) {
var_s0_5->unk_0D8.x = arg1->x;
var_s0_5->unk_0D8.y = arg1->y;
var_s0_5->unk_0D8.z = arg1->z;
return 1;
return true;
}
}
}
}
}
return 0;
return false;
}
void func_80063CAC(Object_80* arg0) {
@@ -1528,7 +1529,7 @@ void func_800656D4(Object_2F4* arg0) {
sp8C.x = arg0->unk_0E8;
sp8C.y = arg0->unk_0EC;
sp8C.z = arg0->unk_0F0;
if ((func_8006351C(arg0->unk_040, &arg0->obj.pos, (s32) &sp8C, 1) != 0) || (arg0->unk_0D0 != 0) ||
if ((func_8006351C(arg0->unk_040, &arg0->obj.pos, &sp8C, 1) != 0) || (arg0->unk_0D0 != 0) ||
(arg0->obj.pos.y < (D_80177940 + 10.0f)) || (D_80178280[0].unk_1C8 == 7)) {
func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 3.0f);
func_80060FBC(&arg0->obj, &arg0->unk_100);
@@ -1608,7 +1609,7 @@ void func_80066254(Object_2F4* arg0) {
switch (D_80161A62) {
case 9:
if (D_80178234 == 0x10) {
func_800BA808(D_80182544, 0xAA);
func_800BA808(gMsg_ID_18031, 0xAA);
}
/* fallthrough */
case 4:
@@ -1641,11 +1642,11 @@ void func_80066254(Object_2F4* arg0) {
func_80019218(0x4900000C, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
} else if (arg0->unk_044 == 0x18) {
if (D_801778B0[3] > 0) {
func_800BA808(D_80183CA8, 0x1E);
func_800BA808(gMsg_ID_20261, 0x1E);
} else if (D_801778B0[2] > 0) {
func_800BA808(D_80183D3C, 0x14);
func_800BA808(gMsg_ID_20263, 0x14);
} else if (D_801778B0[1] > 0) {
func_800BA808(D_80183CF0, 0xA);
func_800BA808(gMsg_ID_20262, 0xA);
}
} else if (Rand_ZeroOne() <= D_800CFE5C[arg0->unk_044]) {
func_800660F0(arg0);
src/main/fox_message.c
+4 -103
View File
@@ -1,104 +1,5 @@
#include "global.h"
typedef enum {
MSGCHAR_END,
MSGCHAR_NWL,
MSGCHAR_NP2,
MSGCHAR_NP3,
MSGCHAR_NP4,
MSGCHAR_NP5,
MSGCHAR_NP6,
MSGCHAR_NP7,
MSGCHAR_NP8,
MSGCHAR_NP9,
MSGCHAR_NPA,
MSGCHAR_NPB,
MSGCHAR_SPC,
MSGCHAR_QSP,
MSGCHAR_HSP,
MSGCHAR_NPF,
MSGCHAR_CLF,
MSGCHAR_CUP,
MSGCHAR_CRT,
MSGCHAR_CDN,
MSGCHAR_AUP,
MSGCHAR_ALF,
MSGCHAR_ADN,
MSGCHAR_ART,
MSGCHAR_A,
MSGCHAR_B,
MSGCHAR_C,
MSGCHAR_D,
MSGCHAR_E,
MSGCHAR_F,
MSGCHAR_G,
MSGCHAR_H,
MSGCHAR_I,
MSGCHAR_J,
MSGCHAR_K,
MSGCHAR_L,
MSGCHAR_M,
MSGCHAR_N,
MSGCHAR_O,
MSGCHAR_P,
MSGCHAR_Q,
MSGCHAR_R,
MSGCHAR_S,
MSGCHAR_T,
MSGCHAR_U,
MSGCHAR_V,
MSGCHAR_W,
MSGCHAR_X,
MSGCHAR_Y,
MSGCHAR_Z,
MSGCHAR_a,
MSGCHAR_b,
MSGCHAR_c,
MSGCHAR_d,
MSGCHAR_e,
MSGCHAR_f,
MSGCHAR_g,
MSGCHAR_h,
MSGCHAR_i,
MSGCHAR_j,
MSGCHAR_k,
MSGCHAR_l,
MSGCHAR_m,
MSGCHAR_n,
MSGCHAR_o,
MSGCHAR_p,
MSGCHAR_q,
MSGCHAR_r,
MSGCHAR_s,
MSGCHAR_t,
MSGCHAR_u,
MSGCHAR_v,
MSGCHAR_w,
MSGCHAR_x,
MSGCHAR_y,
MSGCHAR_z,
MSGCHAR_EXM,
MSGCHAR_QST,
MSGCHAR_DSH,
MSGCHAR_CMA,
MSGCHAR_PRD,
MSGCHAR_0,
MSGCHAR_1,
MSGCHAR_2,
MSGCHAR_3,
MSGCHAR_4,
MSGCHAR_5,
MSGCHAR_6,
MSGCHAR_7,
MSGCHAR_8,
MSGCHAR_9,
MSGCHAR_APS,
MSGCHAR_LPR,
MSGCHAR_RPR,
MSGCHAR_CLN,
MSGCHAR_PIP,
} CharCode;
u16* Message_PtrFromId(u16 msgId) {
s32 i;
MsgLookup* lookup = gMsgLookup;
@@ -157,7 +58,7 @@ void Message_DisplayChar(Gfx** gfxPtr, u16 msgChar, s32 xpos, s32 ypos) {
0x400, 0x400);
}
s32 Message_DisplayText(Gfx** gfxPtr, u16* msgPtr, s32 xPos, s32 yPos, s32 len) {
bool Message_DisplayText(Gfx** gfxPtr, u16* msgPtr, s32 xPos, s32 yPos, s32 len) {
s32 xChar = xPos;
s32 yChar = yPos;
s32 i;
@@ -256,13 +157,13 @@ void Message_DisplayScrollingText(Gfx** gfxPtr, u16* msgPtr, s32 xPos, s32 yPos,
}
}
s32 Message_NotWhitespace(u16* msgPtr, s32 charPos) {
bool Message_IsPrintingChar(u16* msgPtr, s32 charPos) {
s32 i;
s32 print;
// bug: if the for loop is skipped, print is never initialized
for (i = 0; msgPtr[i] != 0 && i < charPos; i++) {
print = 0;
print = false;
switch (msgPtr[i]) {
case 1:
case 2:
@@ -281,7 +182,7 @@ s32 Message_NotWhitespace(u16* msgPtr, s32 charPos) {
case 15:
break;
default:
print = 1;
print = true;
break;
}
}
src/main/fox_radio.c
+4 -4
View File
@@ -9,9 +9,9 @@ extern s32 D_80178748;
s32 D_800D4A70 = 0;
void func_800BA760(void) {
func_800B9358();
RCP_SetupDL_36();
if (D_80177D50 == 1.3f) {
D_801782F8 = Message_NotWhitespace(D_80178308, D_801782D8);
D_801782F8 = Message_IsPrintingChar(D_80178308, D_801782D8);
}
}
@@ -403,7 +403,7 @@ void func_800BAAE8(void) {
D_800D4A74 = -1.0f;
}
sp38 = D_80177D38 * 20.0f * D_800D4A74;
func_800BA490();
RCP_SetupDL_76();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
if (var_s0 != 0) {
@@ -802,7 +802,7 @@ void func_800BC040(void) {
func_800BB388();
if (((s32) D_80177D68 == 10) || ((s32) D_80177D68 == 20) || ((s32) D_80177D68 == 30)) {
Matrix_Push(&gGfxMatrix);
func_800B9358();
RCP_SetupDL_36();
Matrix_Translate(gGfxMatrix, -150.0f, -115.0f, -443.0f, 1);
Matrix_Scale(gGfxMatrix, 0.068f, 0.068f, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
src/main/fox_rcp.c
+53 -53
View File
@@ -6,7 +6,7 @@ void RCP_SetupDL(Gfx** gfxP, s16 i) {
gSPDisplayList((*gfxP)++, &((Gfx*) gSetupDLs)[i * 9]);
}
void func_800B8E14(Gfx** gfxP, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetFog(Gfx** gfxP, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gDPSetFogColor((*gfxP)++, r, g, b, a);
gSPFogPosition((*gfxP)++, near, far);
}
@@ -17,241 +17,241 @@ void dummy_800B8F08(void) {
void dummy_800B8F10(void) {
}
void func_800B8F18(void) {
void RCP_SetupDL_0(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_0]);
}
void func_800B8F48(void) {
void RCP_SetupDL_1(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_1]);
}
void func_800B8F78(void) {
void RCP_SetupDL_11(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_11]);
}
void func_800B8FA8(void) {
void RCP_SetupDL_12(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_12]);
}
void func_800B8FD8(void) {
void RCP_SetupDL_2(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_2]);
}
void func_800B9008(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_3(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_3]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800B9120(void) {
void RCP_SetupDL_4(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_4]);
}
void func_800B9150(void) {
void RCP_SetupDL_7(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_7]);
}
void func_800B9180(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_9(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_9]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800B9298(void) {
void RCP_SetupDL_8(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_8]);
}
void func_800B92C8(void) {
void RCP_SetupDL_13(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_13]);
}
void func_800B92F8(void) {
void RCP_SetupDL_14(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_14]);
}
void func_800B9328(void) {
void RCP_SetupDL_17(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_17]);
}
void func_800B9358(void) {
void RCP_SetupDL_36(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_36]);
}
void func_800B9388(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_52(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_52]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800B94A0(void) {
void RCP_SetupDL_62(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_62]);
}
void func_800B94D0(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_37(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_37]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800B95E8(void) {
void RCP_SetupDL_18(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_18]);
}
void func_800B9618(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_20(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_20]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800B9730(void) {
void RCP_SetupDL_19(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_19]);
}
void func_800B9760(void) {
void RCP_SetupDL_21(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_21]);
}
void func_800B9790(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_33(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_33]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800B98A8(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_34(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_34]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800B99C0(void) {
void RCP_SetupDL_40(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_40]);
}
void func_800B99F0(void) {
void RCP_SetupDL_42(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_42]);
}
void func_800B9A20(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_43(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_43]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800B9B38(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_60(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_60]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800B9C50(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_47(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_47]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800B9D68(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_66(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_66]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800B9E80(void) {
void RCP_SetupDL_55(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_55]);
}
void func_800B9EB0(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_57(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_57]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800B9FC8(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_45(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_45]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800BA0E0(void) {
void RCP_SetupDL_46(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_46]);
}
void func_800BA110(void) {
void RCP_SetupDL_41(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_41]);
}
void func_800BA140(void) {
void RCP_SetupDL_64(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_64]);
}
void func_800BA170(void) {
void RCP_SetupDL_64_2(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_64]);
}
void func_800BA1A0(void) {
void RCP_SetupDL_23(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_23]);
}
void func_800BA1D0(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_29(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_29]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800BA2E8(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_30(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_30]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
}
void func_800BA400(void) {
void RCP_SetupDL_27(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_27]);
}
void func_800BA430(void) {
void RCP_SetupDL_32(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_32]);
}
void func_800BA460(void) {
void RCP_SetupDL_73(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_73]);
}
void func_800BA490(void) {
void RCP_SetupDL_76(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_76]);
}
void func_800BA4C0(void) {
void RCP_SetupDL_74(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_74]);
}
void func_800BA4F0(void) {
void RCP_SetupDL_78(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_78]);
}
void func_800BA520(void) {
void RCP_SetupDL_81(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_81]);
}
void func_800BA550(void) {
void RCP_SetupDL_48(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_48]);
}
void func_800BA580(void) {
void RCP_SetupDL_68(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_68]);
}
void func_800BA5B0(void) {
void RCP_SetupDL_49(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_49]);
}
void func_800BA5E0(void) {
void RCP_SetupDL_44(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_44]);
}
void func_800BA610(void) {
void RCP_SetupDL_50(void) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_50]);
}
void func_800BA640(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
void RCP_SetupDL_61(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_61]);
gDPSetFogColor(gMasterDisp++, r, g, b, a);
gSPFogPosition(gMasterDisp++, near, far);
src/main/main.c
+3 -3
View File
@@ -496,7 +496,7 @@ void Main_StartNextTask(void) {
}
void Main_ThreadEntry(void* arg0) {
OSMesg osMsg;
OSMesg ogMsg;
u8 mesg;
osCreateThread(&gAudioThread, THREAD_ID_AUDIO, Audio_ThreadEntry, arg0,
@@ -515,8 +515,8 @@ void Main_ThreadEntry(void* arg0) {
Main_InitMesgQueues();
while (true) {
osRecvMesg(&gMainThreadMsgQueue, &osMsg, OS_MESG_BLOCK);
mesg = (u32) osMsg;
osRecvMesg(&gMainThreadMsgQueue, &ogMsg, OS_MESG_BLOCK);
mesg = (u32) ogMsg;
switch (mesg) {
case EVENT_MESG_VI:
src/main/note_data.c
+128 -128
View File
@@ -166,134 +166,134 @@ f32 gBendPitchTwoSemitonesFrequencies[] = {
};
f32 gPitchFrequencies[] = {
/* 0x00 */ 0.105112f, // PITCH_A0
/* 0x01 */ 0.111362f, // PITCH_BFLAT0
/* 0x02 */ 0.117984f, // PITCH_B0
/* 0x03 */ 0.125f, // PITCH_C1
/* 0x04 */ 0.132433f, // PITCH_DFLAT1
/* 0x05 */ 0.140308f, // PITCH_D1
/* 0x06 */ 0.148651f, // PITCH_EFLAT1
/* 0x07 */ 0.15749f, // PITCH_E1
/* 0x08 */ 0.166855f, // PITCH_F1
/* 0x09 */ 0.176777f, // PITCH_GFLAT1
/* 0x0A */ 0.187288f, // PITCH_G1
/* 0x0B */ 0.198425f, // PITCH_AFLAT1
/* 0x0C */ 0.210224f, // PITCH_A1
/* 0x0D */ 0.222725f, // PITCH_BFLAT1
/* 0x0E */ 0.235969f, // PITCH_B1
/* 0x0F */ 0.25f, // PITCH_C2
/* 0x10 */ 0.264866f, // PITCH_DFLAT2
/* 0x11 */ 0.280616f, // PITCH_D2
/* 0x12 */ 0.297302f, // PITCH_EFLAT2
/* 0x13 */ 0.31498f, // PITCH_E2
/* 0x14 */ 0.33371f, // PITCH_F2
/* 0x15 */ 0.353553f, // PITCH_GFLAT2
/* 0x16 */ 0.374577f, // PITCH_G2
/* 0x17 */ 0.39685f, // PITCH_AFLAT2
/* 0x18 */ 0.420448f, // PITCH_A2
/* 0x19 */ 0.445449f, // PITCH_BFLAT2
/* 0x1A */ 0.471937f, // PITCH_B2
/* 0x1B */ 0.5f, // PITCH_C3
/* 0x1C */ 0.529732f, // PITCH_DFLAT3
/* 0x1D */ 0.561231f, // PITCH_D3
/* 0x1E */ 0.594604f, // PITCH_EFLAT3
/* 0x1F */ 0.629961f, // PITCH_E3
/* 0x20 */ 0.66742f, // PITCH_F3
/* 0x21 */ 0.707107f, // PITCH_GFLAT3
/* 0x22 */ 0.749154f, // PITCH_G3
/* 0x23 */ 0.793701f, // PITCH_AFLAT3
/* 0x24 */ 0.840897f, // PITCH_A3
/* 0x25 */ 0.890899f, // PITCH_BFLAT3
/* 0x26 */ 0.943875f, // PITCH_B3
/* 0x27 */ 1.0f, // PITCH_C4 (Middle C)
/* 0x28 */ 1.059463f, // PITCH_DFLAT4
/* 0x29 */ 1.122462f, // PITCH_D4
/* 0x2A */ 1.189207f, // PITCH_EFLAT4
/* 0x2B */ 1.259921f, // PITCH_E4
/* 0x2C */ 1.33484f, // PITCH_F4
/* 0x2D */ 1.414214f, // PITCH_GFLAT4
/* 0x2E */ 1.498307f, // PITCH_G4
/* 0x2F */ 1.587401f, // PITCH_AFLAT4
/* 0x30 */ 1.681793f, // PITCH_A4
/* 0x31 */ 1.781798f, // PITCH_BFLAT4
/* 0x32 */ 1.887749f, // PITCH_B4
/* 0x33 */ 2.0f, // PITCH_C5
/* 0x34 */ 2.118926f, // PITCH_DFLAT5
/* 0x35 */ 2.244924f, // PITCH_D5
/* 0x36 */ 2.378414f, // PITCH_EFLAT5
/* 0x37 */ 2.519842f, // PITCH_E5
/* 0x38 */ 2.66968f, // PITCH_F5
/* 0x39 */ 2.828428f, // PITCH_GFLAT5
/* 0x3A */ 2.996615f, // PITCH_G5
/* 0x3B */ 3.174803f, // PITCH_AFLAT5
/* 0x3C */ 3.363586f, // PITCH_A5
/* 0x3D */ 3.563596f, // PITCH_BFLAT5
/* 0x3E */ 3.775498f, // PITCH_B5
/* 0x3F */ 4.0f, // PITCH_C6
/* 0x40 */ 4.237853f, // PITCH_DFLAT6
/* 0x41 */ 4.489849f, // PITCH_D6
/* 0x42 */ 4.756829f, // PITCH_EFLAT6
/* 0x43 */ 5.039685f, // PITCH_E6
/* 0x44 */ 5.33936f, // PITCH_F6
/* 0x45 */ 5.656855f, // PITCH_GFLAT6
/* 0x46 */ 5.993229f, // PITCH_G6
/* 0x47 */ 6.349606f, // PITCH_AFLAT6
/* 0x48 */ 6.727173f, // PITCH_A6
/* 0x49 */ 7.127192f, // PITCH_BFLAT6
/* 0x4A */ 7.550996f, // PITCH_B6
/* 0x4B */ 8.0f, // PITCH_C7
/* 0x4C */ 8.475705f, // PITCH_DFLAT7
/* 0x4D */ 8.979697f, // PITCH_D7
/* 0x4E */ 9.513658f, // PITCH_EFLAT7
/* 0x4F */ 10.07937f, // PITCH_E7
/* 0x50 */ 10.6787205f, // PITCH_F7
/* 0x51 */ 11.31371f, // PITCH_GFLAT7
/* 0x52 */ 11.986459f, // PITCH_G7
/* 0x53 */ 12.699211f, // PITCH_AFLAT7
/* 0x54 */ 13.454346f, // PITCH_A7
/* 0x55 */ 14.254383f, // PITCH_BFLAT7
/* 0x56 */ 15.101993f, // PITCH_B7
/* 0x57 */ 16.0f, // PITCH_C8
/* 0x58 */ 16.95141f, // PITCH_DFLAT8
/* 0x59 */ 17.959395f, // PITCH_D8
/* 0x5A */ 19.027315f, // PITCH_EFLAT8
/* 0x5B */ 20.15874f, // PITCH_E8
/* 0x5C */ 21.35744f, // PITCH_F8
/* 0x5D */ 22.62742f, // PITCH_GFLAT8
/* 0x5E */ 23.972918f, // PITCH_G8
/* 0x5F */ 25.398422f, // PITCH_AFLAT8
/* 0x60 */ 26.908691f, // PITCH_A8
/* 0x61 */ 28.508766f, // PITCH_BFLAT8
/* 0x62 */ 30.203985f, // PITCH_B8
/* 0x63 */ 32.0f, // PITCH_C9
/* 0x64 */ 33.90282f, // PITCH_DFLAT9
/* 0x65 */ 35.91879f, // PITCH_D9
/* 0x66 */ 38.05463f, // PITCH_EFLAT9
/* 0x67 */ 40.31748f, // PITCH_E9
/* 0x68 */ 42.71488f, // PITCH_F9
/* 0x69 */ 45.25484f, // PITCH_GFLAT9
/* 0x6A */ 47.945835f, // PITCH_G9
/* 0x6B */ 50.796845f, // PITCH_AFLAT9
/* 0x6C */ 53.817383f, // PITCH_A9
/* 0x6D */ 57.017532f, // PITCH_BFLAT9
/* 0x6E */ 60.40797f, // PITCH_B9
/* 0x6F */ 64.0f, // PITCH_C10
/* 0x70 */ 67.80564f, // PITCH_DFLAT10
/* 0x71 */ 71.83758f, // PITCH_D10
/* 0x72 */ 76.10926f, // PITCH_EFLAT10
/* 0x73 */ 80.63496f, // PITCH_E10
/* 0x74 */ 85.42976f, // PITCH_F10
/* 0x75 */ 45.25484f, // PITCH_GFLAT9G1
/* 0x76 */ 47.945835f, // PITCH_G9
/* 0x77 */ 50.796844f, // PITCH_AFLAT9
/* 0x78 */ 53.817383f, // PITCH_A9
/* 0x79 */ 57.017532f, // PITCH_BFLAT9
/* 0x7A */ 60.40797f, // PITCH_B9
/* 0x7B */ 64.0f, // PITCH_C10
/* 0x7C */ 67.80564f, // PITCH_DFLAT10
/* 0x7D */ 71.837578f, // PITCH_D10
/* 0x7E */ 76.10926f, // PITCH_EFLAT10
/* 0x7F */ 80.63496f, // PITCH_E10
/* 0x00 */ 0.105112f, // PITCH_A0
/* 0x01 */ 0.111362f, // PITCH_BFLAT0
/* 0x02 */ 0.117984f, // PITCH_B0
/* 0x03 */ 0.125f, // PITCH_C1
/* 0x04 */ 0.132433f, // PITCH_DFLAT1
/* 0x05 */ 0.140308f, // PITCH_D1
/* 0x06 */ 0.148651f, // PITCH_EFLAT1
/* 0x07 */ 0.15749f, // PITCH_E1
/* 0x08 */ 0.166855f, // PITCH_F1
/* 0x09 */ 0.176777f, // PITCH_GFLAT1
/* 0x0A */ 0.187288f, // PITCH_G1
/* 0x0B */ 0.198425f, // PITCH_AFLAT1
/* 0x0C */ 0.210224f, // PITCH_A1
/* 0x0D */ 0.222725f, // PITCH_BFLAT1
/* 0x0E */ 0.235969f, // PITCH_B1
/* 0x0F */ 0.25f, // PITCH_C2
/* 0x10 */ 0.264866f, // PITCH_DFLAT2
/* 0x11 */ 0.280616f, // PITCH_D2
/* 0x12 */ 0.297302f, // PITCH_EFLAT2
/* 0x13 */ 0.31498f, // PITCH_E2
/* 0x14 */ 0.33371f, // PITCH_F2
/* 0x15 */ 0.353553f, // PITCH_GFLAT2
/* 0x16 */ 0.374577f, // PITCH_G2
/* 0x17 */ 0.39685f, // PITCH_AFLAT2
/* 0x18 */ 0.420448f, // PITCH_A2
/* 0x19 */ 0.445449f, // PITCH_BFLAT2
/* 0x1A */ 0.471937f, // PITCH_B2
/* 0x1B */ 0.5f, // PITCH_C3
/* 0x1C */ 0.529732f, // PITCH_DFLAT3
/* 0x1D */ 0.561231f, // PITCH_D3
/* 0x1E */ 0.594604f, // PITCH_EFLAT3
/* 0x1F */ 0.629961f, // PITCH_E3
/* 0x20 */ 0.66742f, // PITCH_F3
/* 0x21 */ 0.707107f, // PITCH_GFLAT3
/* 0x22 */ 0.749154f, // PITCH_G3
/* 0x23 */ 0.793701f, // PITCH_AFLAT3
/* 0x24 */ 0.840897f, // PITCH_A3
/* 0x25 */ 0.890899f, // PITCH_BFLAT3
/* 0x26 */ 0.943875f, // PITCH_B3
/* 0x27 */ 1.0f, // PITCH_C4 (Middle C)
/* 0x28 */ 1.059463f, // PITCH_DFLAT4
/* 0x29 */ 1.122462f, // PITCH_D4
/* 0x2A */ 1.189207f, // PITCH_EFLAT4
/* 0x2B */ 1.259921f, // PITCH_E4
/* 0x2C */ 1.33484f, // PITCH_F4
/* 0x2D */ 1.414214f, // PITCH_GFLAT4
/* 0x2E */ 1.498307f, // PITCH_G4
/* 0x2F */ 1.587401f, // PITCH_AFLAT4
/* 0x30 */ 1.681793f, // PITCH_A4
/* 0x31 */ 1.781798f, // PITCH_BFLAT4
/* 0x32 */ 1.887749f, // PITCH_B4
/* 0x33 */ 2.0f, // PITCH_C5
/* 0x34 */ 2.118926f, // PITCH_DFLAT5
/* 0x35 */ 2.244924f, // PITCH_D5
/* 0x36 */ 2.378414f, // PITCH_EFLAT5
/* 0x37 */ 2.519842f, // PITCH_E5
/* 0x38 */ 2.66968f, // PITCH_F5
/* 0x39 */ 2.828428f, // PITCH_GFLAT5
/* 0x3A */ 2.996615f, // PITCH_G5
/* 0x3B */ 3.174803f, // PITCH_AFLAT5
/* 0x3C */ 3.363586f, // PITCH_A5
/* 0x3D */ 3.563596f, // PITCH_BFLAT5
/* 0x3E */ 3.775498f, // PITCH_B5
/* 0x3F */ 4.0f, // PITCH_C6
/* 0x40 */ 4.237853f, // PITCH_DFLAT6
/* 0x41 */ 4.489849f, // PITCH_D6
/* 0x42 */ 4.756829f, // PITCH_EFLAT6
/* 0x43 */ 5.039685f, // PITCH_E6
/* 0x44 */ 5.33936f, // PITCH_F6
/* 0x45 */ 5.656855f, // PITCH_GFLAT6
/* 0x46 */ 5.993229f, // PITCH_G6
/* 0x47 */ 6.349606f, // PITCH_AFLAT6
/* 0x48 */ 6.727173f, // PITCH_A6
/* 0x49 */ 7.127192f, // PITCH_BFLAT6
/* 0x4A */ 7.550996f, // PITCH_B6
/* 0x4B */ 8.0f, // PITCH_C7
/* 0x4C */ 8.475705f, // PITCH_DFLAT7
/* 0x4D */ 8.979697f, // PITCH_D7
/* 0x4E */ 9.513658f, // PITCH_EFLAT7
/* 0x4F */ 10.07937f, // PITCH_E7
/* 0x50 */ 10.67872f, // PITCH_F7
/* 0x51 */ 11.31371f, // PITCH_GFLAT7
/* 0x52 */ 11.986459f, // PITCH_G7
/* 0x53 */ 12.699211f, // PITCH_AFLAT7
/* 0x54 */ 13.454346f, // PITCH_A7
/* 0x55 */ 14.254383f, // PITCH_BFLAT7
/* 0x56 */ 15.101993f, // PITCH_B7
/* 0x57 */ 16.0f, // PITCH_C8
/* 0x58 */ 16.95141f, // PITCH_DFLAT8
/* 0x59 */ 17.959395f, // PITCH_D8
/* 0x5A */ 19.027315f, // PITCH_EFLAT8
/* 0x5B */ 20.15874f, // PITCH_E8
/* 0x5C */ 21.35744f, // PITCH_F8
/* 0x5D */ 22.62742f, // PITCH_GFLAT8
/* 0x5E */ 23.972918f, // PITCH_G8
/* 0x5F */ 25.398422f, // PITCH_AFLAT8
/* 0x60 */ 26.908691f, // PITCH_A8
/* 0x61 */ 28.508766f, // PITCH_BFLAT8
/* 0x62 */ 30.203985f, // PITCH_B8
/* 0x63 */ 32.0f, // PITCH_C9
/* 0x64 */ 33.90282f, // PITCH_DFLAT9
/* 0x65 */ 35.91879f, // PITCH_D9
/* 0x66 */ 38.05463f, // PITCH_EFLAT9
/* 0x67 */ 40.31748f, // PITCH_E9
/* 0x68 */ 42.71488f, // PITCH_F9
/* 0x69 */ 45.25484f, // PITCH_GFLAT9
/* 0x6A */ 47.945835f, // PITCH_G9
/* 0x6B */ 50.796845f, // PITCH_AFLAT9
/* 0x6C */ 53.817383f, // PITCH_A9
/* 0x6D */ 57.017532f, // PITCH_BFLAT9
/* 0x6E */ 60.40797f, // PITCH_B9
/* 0x6F */ 64.0f, // PITCH_C10
/* 0x70 */ 67.80564f, // PITCH_DFLAT10
/* 0x71 */ 71.83758f, // PITCH_D10
/* 0x72 */ 76.10926f, // PITCH_EFLAT10
/* 0x73 */ 80.63496f, // PITCH_E10
/* 0x74 */ 85.42976f, // PITCH_F10
/* 0x75 */ 45.25484f, // PITCH_GFLAT9G1
/* 0x76 */ 47.945835f, // PITCH_G9
/* 0x77 */ 50.796844f, // PITCH_AFLAT9
/* 0x78 */ 53.817383f, // PITCH_A9
/* 0x79 */ 57.017532f, // PITCH_BFLAT9
/* 0x7A */ 60.40797f, // PITCH_B9
/* 0x7B */ 64.0f, // PITCH_C10
/* 0x7C */ 67.80564f, // PITCH_DFLAT10
/* 0x7D */ 71.83758f, // PITCH_D10
/* 0x7E */ 76.10926f, // PITCH_EFLAT10
/* 0x7F */ 80.63496f, // PITCH_E10
};
u8 gDefaultShortNoteVelocityTable[] = {
src/main/sf_2F300.c
+2 -2
View File
@@ -41,9 +41,9 @@ s32 func_8002FE74(void) {
case 14:
return D_8015F928 == (D_800C9B4C + 0x960);
case 17:
return D_8016F9F0 == 4;
return D_8016F110[2].unk_0D0 == 4;
case 16:
return D_8016F5BE == 2;
return D_8016F110[1].unk_0A6 == 2;
default:
return 0;
}
src/main/sf_A4B50.c
+1465 -37
View File
File diff suppressed because it is too large Load Diff
src/main/sf_hud.c
+21 -21
View File
@@ -1257,7 +1257,7 @@ void func_8008D984(void) {
}
if ((D_800D2190[D_801778A0] & 2) || ((D_800D2190[D_801778A0] == 0) && (D_80177DA0[D_801778A0] != 0))) {
func_800BA4F0();
RCP_SetupDL_78();
if (D_80177DA0[D_801778A0] >= 2) {
if (Math_SmoothStepToF(&D_800D21A4, D_800D21A0, 0.4f, 100.0f, 0.1f) == 0.0f) {
if (D_800D21A0 == 255.0f) {
@@ -1292,13 +1292,13 @@ void func_8008DC34(void) {
}
void func_8008DCB0(f32 arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4) {
func_800BA4F0();
RCP_SetupDL_78();
gDPSetPrimColor(gMasterDisp++, 0, 0, arg2, arg3, arg4, D_80161708);
TextureRect_4bCI(&gMasterDisp, D_1011ED0, D_1011F08, 16, 7, arg0, arg1, 1.0f, 1.0f);
}
void func_8008DD78(f32 arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) {
func_800BA4F0();
RCP_SetupDL_78();
gDPSetPrimColor(gMasterDisp++, 0, 0, arg3, arg4, arg5, D_80161708);
if (arg2 >= 10) {
@@ -1400,11 +1400,11 @@ void func_8008E2C8(f32 arg0, f32 arg1, s32* arg2, f32 arg3) {
}
if (i & 1) {
func_800BA4F0();
RCP_SetupDL_78();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_4bCI(&gMasterDisp, D_1011E80, D_1011EC0, 0x10, 8, (var_fs0 * arg3) + arg0, arg1, arg3, arg3);
} else {
func_800BA490();
RCP_SetupDL_76();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
func_8008C390((var_fs0 * arg3) + arg0, arg1, arg3, var_s2);
var_fs0 += 9.0f;
@@ -1567,7 +1567,7 @@ void func_8008F96C(void) {
func_8008E5E8();
}
func_800B9358();
RCP_SetupDL_36();
if ((D_80177880 != 2) && (D_80161708 != 0)) {
func_8008D4F0(246.0f, 28.0f);
@@ -1621,19 +1621,19 @@ void func_800907C4(Object_408* arg0) {
}
s32 func_8009092C(Object_2F4* arg0) {
s32 var_s5 = 0;
bool var_s5 = false;
Object_408* var_s1;
s32 i = 0;
if (arg0->unk_0E6 != 0) {
return 1;
return true;
}
var_s1 = &D_8016F110[1];
for (i = 1; i < 4; i++, var_s1++) {
if (var_s1->obj.status == 2) {
var_s5 = 1;
var_s5 = true;
if (arg0->unk_0E6 == 0) {
arg0->unk_0E6 = i;
} else if (Rand_ZeroOne() > 0.4f) {
@@ -1868,15 +1868,15 @@ s32 func_80091368(Object_2F4* arg0) {
switch (arg0->unk_0E4) {
case 1:
func_800BA808(D_801839B8, 10);
func_800BA808(gMsg_ID_20220, 10);
break;
case 3:
func_800BA808(D_80183A08, 30);
func_800BA808(gMsg_ID_20221, 30);
break;
case 2:
func_800BA808(D_80183A64, 20);
func_800BA808(gMsg_ID_20222, 20);
break;
}
D_801778B0[arg0->unk_0E4] = -1;
@@ -2107,13 +2107,13 @@ s32 func_80091F00(Object_2F4* arg0) {
if ((arg0->unk_0D0 == 3) && (arg0->unk_0D4 == 1)) {
switch (arg0->unk_0E4) {
case 1:
func_800BA808(D_8018398C, 10);
func_800BA808(gMsg_ID_20210, 10);
break;
case 3:
func_800BA808(D_80183950, 30);
func_800BA808(gMsg_ID_20200, 30);
break;
case 2:
func_800BA808(D_80183900, 20);
func_800BA808(gMsg_ID_20190, 20);
break;
}
}
@@ -2121,13 +2121,13 @@ s32 func_80091F00(Object_2F4* arg0) {
if ((arg0->unk_0D0 != 3) && (arg0->unk_0D4 == 1)) {
switch (arg0->unk_0E4) {
case 1:
func_800BA808(D_801836B0, 10);
func_800BA808(gMsg_ID_20060, 10);
break;
case 3:
func_800BA808(D_801836F8, 30);
func_800BA808(gMsg_ID_20070, 30);
break;
case 2:
func_800BA808(D_80183724, 20);
func_800BA808(gMsg_ID_20080, 20);
break;
}
}
@@ -2135,13 +2135,13 @@ s32 func_80091F00(Object_2F4* arg0) {
if ((arg0->unk_0D4 == 2) || (arg0->unk_0D4 == 100)) {
switch (arg0->unk_0E4) {
case 1:
func_800BA808(D_80183630, 10);
func_800BA808(gMsg_ID_20030, 10);
break;
case 3:
func_800BA808(D_8018366C, 30);
func_800BA808(gMsg_ID_20040, 30);
break;
case 2:
func_800BA808(D_80183690, 20);
func_800BA808(gMsg_ID_20050, 20);
break;
}
}
src/overlays/ovl_EBFBE0/fox_option.c
+4 -4
View File
@@ -2237,7 +2237,7 @@ void func_EBFBE0_80198608(s32 arg0, s32 arg1, f32 arg2, f32 arg3) {
void func_EBFBE0_8019882C(s32 arg0, s32 arg1, f32 arg2, f32 arg3) {
s32 temp;
s8* sp20;
char* sp20;
f32 temp2;
if ((arg3 > 58.0f) && (arg3 < 197.0f)) {
@@ -2683,7 +2683,7 @@ void func_EBFBE0_80199820(s32 arg0) {
void func_EBFBE0_80199EA8(void) {
s32 i;
func_800BA490();
RCP_SetupDL_76();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@@ -3029,7 +3029,7 @@ void func_EBFBE0_8019AB30(void) {
colorGB = D_EBFBE0_801B9368;
var_v0 = 0xFFFFFFFFF;
var_v0 = 0xFFFFFFFF;
if (D_EBFBE0_801B936C != 0) {
colorGB = 255;
@@ -3365,7 +3365,7 @@ void func_EBFBE0_8019BC44(f32 x, f32 y, f32 arg2, f32 arg3, f32 arg4, f32 arg5)
Matrix_SetGfxMtx(&gMasterDisp);
func_800B9E80();
RCP_SetupDL_55();
gSPDisplayList(gMasterDisp++, D_604A9F0);
src/overlays/ovl_EBFBE0/fox_title.c
+12 -12
View File
@@ -476,7 +476,7 @@ void func_EBFBE0_801881FC(void) {
D_EBFBE0_801B8350[1].unk_00.y = -7.0f;
D_EBFBE0_801B8350[1].unk_00.z = -12.0f;
D_EBFBE0_801B8350[1].unk_48 = -2.009996f;
D_EBFBE0_801B8350[1].unk_4C = 56.909969f;
D_EBFBE0_801B8350[1].unk_4C = 56.90997f;
D_EBFBE0_801B8350[1].unk_50 = 0.00f;
} else {
D_EBFBE0_801B8350[1].unk_00.x = 147.0f;
@@ -508,7 +508,7 @@ void func_EBFBE0_801881FC(void) {
D_EBFBE0_801B8350[2].unk_00.y = 1.00f;
D_EBFBE0_801B8350[2].unk_00.z = -143.0f;
D_EBFBE0_801B8350[2].unk_48 = -0.500016f;
D_EBFBE0_801B8350[2].unk_4C = -33.319988f;
D_EBFBE0_801B8350[2].unk_4C = -33.31999f;
D_EBFBE0_801B8350[2].unk_50 = 0.00f;
} else {
D_EBFBE0_801B8350[2].unk_00.x = -143.0f;
@@ -978,7 +978,7 @@ void func_EBFBE0_8018994C(void) {
if (D_EBFBE0_801B82B8 == 638) {
func_80019218(0x11030010, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_80019218(0x31024059, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_800BA808(D_8017A0F4, 300);
func_800BA808(gMsg_ID_60, 300);
}
if (D_EBFBE0_801B82B8 == 838) {
@@ -2197,9 +2197,9 @@ void func_EBFBE0_8018D510(s32 arg0) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, var_fa0, 1);
Matrix_Scale(gGfxMatrix, var_fv0, var_fv0 * 0.7f, var_fv0, 1);
Matrix_RotateZ(gGfxMatrix, -D_EBFBE0_801B84E8[arg0].unk_20 * 0.017453292f, 1);
Matrix_RotateX(gGfxMatrix, -D_EBFBE0_801B84E8[arg0].unk_18 * 0.017453292f, 1);
Matrix_RotateY(gGfxMatrix, -D_EBFBE0_801B84E8[arg0].unk_1C * 0.017453292f, 1);
Matrix_RotateZ(gGfxMatrix, -D_EBFBE0_801B84E8[arg0].unk_20 * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, -D_EBFBE0_801B84E8[arg0].unk_18 * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, -D_EBFBE0_801B84E8[arg0].unk_1C * M_DTOR, 1);
sp3C = -Math_Atan2F(D_80177978 - D_EBFBE0_801B84E8[arg0].unk_00.x, D_80177988 - D_EBFBE0_801B84E8[arg0].unk_00.z);
temp = sqrtf(SQ(D_80177988 - D_EBFBE0_801B84E8[arg0].unk_00.z) + SQ(D_80177978 - D_EBFBE0_801B84E8[arg0].unk_00.x));
@@ -2297,10 +2297,10 @@ void func_EBFBE0_8018DDB8(s32 arg0) {
gGfxMatrix, 0.0f,
(D_EBFBE0_801B9050 - D_EBFBE0_801B84E8[arg0].unk_00.y * 2.05f) + (D_EBFBE0_801B9048 - 84.0f) * 1.99f, 0.0f, 1);
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 1.0f, 1);
Matrix_RotateY(gGfxMatrix, 3.1415927f, 1);
Matrix_RotateY(gGfxMatrix, M_PI, 1);
Matrix_SetGfxMtx(&gMasterDisp);
func_800BA140();
RCP_SetupDL_64();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 240);
gSPDisplayList(gMasterDisp++, D_6032580);
@@ -2437,7 +2437,7 @@ void func_EBFBE0_8018E67C(s32 arg0) {
sp5C = D_EBFBE0_801B8350[arg0].unk_58 % Animation_GetFrameCount(D_EBFBE0_801ADA00[arg0].unk_0);
func_800BA1D0(D_80178320, D_80178328, D_80178330, 255, 995, 1000);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, 255, 995, 1000);
Matrix_Push(&gGfxMatrix);
@@ -2472,14 +2472,14 @@ void func_EBFBE0_8018E67C(s32 arg0) {
Matrix_SetGfxMtx(&gMasterDisp);
func_800BA140();
RCP_SetupDL_64();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 128);
gSPDisplayList(gMasterDisp++, D_6041070);
Matrix_Pop(&gGfxMatrix);
temp_fv1 = __sinf((f32) sp5C * 12.0f * 0.017453292f) * 15.0f;
temp_fv1 = __sinf((f32) sp5C * 12.0f * M_DTOR) * 15.0f;
if (temp_fv1 >= 0) {
D_EBFBE0_801B8350[arg0].unk_0C = temp_fv1;
@@ -2673,7 +2673,7 @@ void func_EBFBE0_8018F438(void) {
D_EBFBE0_801B82C8 += 70.0f;
D_EBFBE0_801B82C8 = Math_ModF(D_EBFBE0_801B82C8, 4101.6f);
func_800BA1D0(D_80178320, D_80178328, D_80178330, 255, 995, 1000);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, 255, 995, 1000);
Matrix_Push(&gGfxMatrix);