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

fox_play finished, lots of new names for things (#58)

Browse Source 
* stuff

* three whole files

* format

* format and such

* a switch in time

* merge prep

* nintendo switch

* format

* the great switch statement of our time

* 43AC0 matched

* stuff

* Enums everywhere

* oh god the switch

* knakyo

* new headers

* format

* fox

* everyone hates recursion

* format

* one more thing

* one more one more thing

* renames

* matches

* matrix scale why

* names and such

* cleanup

* name back

* it just keeps going

* they don't give up

* splits

* merge going poorly

* I object

* more names

* one nonmatching

* merge time

* merge complete

* cleanup

* poor rambo

* level fix
This commit is contained in:
petrie911
2023-12-24 13:28:35 -06:00
committed by GitHub
parent f76ce38ad1
commit 7633af7a28
39 changed files with 5818 additions and 2339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/fox_43AC0.c
+9 -9
View File
@@ -70,11 +70,11 @@ void func_80042FF4(Object_2F4* obj2F4, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f
obj2F4->unk_0E8.x = arg7;
obj2F4->unk_0E8.y = arg8;
obj2F4->unk_0E8.z = arg9;
obj2F4->unk_110 = argA;
obj2F4->unk_0BC = argC;
obj2F4->unk_0BE = 20;
obj2F4->scale = argA;
obj2F4->timer_0BC = argC;
obj2F4->timer_0BE = 20;
Object_SetInfo(&obj2F4->info, obj2F4->obj.id);
if (gLevelType == LEVELTYPE_GROUND) {
if (gLevelType == LEVELTYPE_PLANET) {
obj2F4->unk_10C = 0.5f;
}
}
@@ -104,14 +104,14 @@ void func_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3) {
D_80178440 = arg1;
D_80178444 = arg2;
player->unk_1C8 = 7;
player->state_1C8 = PLAYERSTATE_1C8_7;
player->unk_1D0 = 10;
player->unk_1F8 = 50;
player->unk_1FC = 50;
player->timer_1F8 = 50;
player->timer_1FC = 50;
player->unk_000 = 0.0f;
player->unk_004 = 1.0f;
if (player->unk_074 < player->unk_0AC) {
if (player->pos.x < player->unk_0AC) {
player->unk_004 = -1.0f;
}
gPlayer[0].unk_0C0.x = 0.0f;
gPlayer[0].vel.x = 0.0f;
}
src/main/fox_6B3B0.c
+311 -307
View File
File diff suppressed because it is too large Load Diff
src/main/fox_A48A0.c
+7 -7
View File
@@ -5,8 +5,8 @@ void func_800A3CA0(void) {
Matrix_LookAt(gGfxMatrix, D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0, 0.0f, 1.0f, 0.0f,
1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1);
Matrix_RotateY(gGfxMatrix, gControllerPress[D_801778A0].stick_x * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, gControllerPress[D_801778A0].stick_y * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, gControllerPress[gPlayerNum].stick_x * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, gControllerPress[gPlayerNum].stick_y * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_23();
Matrix_Pop(&gGfxMatrix);
@@ -15,13 +15,13 @@ void func_800A3CA0(void) {
void func_800A3E00(void) {
switch (D_80177868) {
case 0:
if (D_8017783C == 0) {
if (D_Timer_8017783C == 0) {
D_80177868 = 1;
}
break;
case 1:
D_80177868 = 2;
D_80177898 = 7;
gDrawMode = DRAWMODE_7;
D_801779B8 = 0.0f;
D_801779A0 = D_801779B8;
D_80177988 = D_801779A0;
@@ -33,13 +33,13 @@ void func_800A3E00(void) {
if ((gControllerPress[0].button & START_BUTTON) || (gControllerPress[1].button & START_BUTTON)) {
func_8001D638(0);
D_80177868 = 3;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
func_800A5844();
D_8017783C = 0;
D_Timer_8017783C = 0;
}
break;
case 3:
if (D_8017783C == 0) {
if (D_Timer_8017783C == 0) {
D_80177854 = 2;
}
break;
src/main/fox_display.c
+181 -176
View File
@@ -17,7 +17,7 @@ s32 D_800CA228 = 0;
s32 D_800CA22C = 0;
f32 D_800CA230 = 0.0f;
Object_2F4* D_800CA234 = NULL;
s32 D_800CA238 = 0;
s32 D_Timer_800CA238 = 0;
f32 D_800CA23C[3] = { 0.5f, 0.25f, 0.25f };
f32 D_800CA248[3] = { 2.0f, 1.0f, 0.5f };
@@ -31,24 +31,24 @@ void func_80051B30(void) {
if ((D_80177854 == 0x64) || (D_800CA234 == NULL)) {
return;
}
if ((D_800CA234->obj.status != 2) || (gPlayer[0].unk_1C8 != 3)) {
if ((D_800CA234->obj.status != 2) || (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_3)) {
D_800CA234 = NULL;
D_800CA238 = 0;
D_Timer_800CA238 = 0;
return;
}
if (D_800CA238 != 0) {
D_800CA238--;
if (D_800CA238 == 0) {
if (D_Timer_800CA238 != 0) {
D_Timer_800CA238--;
if (D_Timer_800CA238 == 0) {
D_800CA234 = NULL;
return;
}
}
if (!(D_800CA238 & 4)) {
if (!(D_Timer_800CA238 & 4)) {
Matrix_RotateY(gCalcMatrix, gPlayer[0].unk_058, 0);
Matrix_RotateX(gCalcMatrix, gPlayer[0].unk_05C, 1);
sp68.x = D_800CA234->obj.pos.x - gPlayer[0].unk_040.x;
sp68.y = D_800CA234->obj.pos.y - gPlayer[0].unk_040.y;
sp68.z = D_800CA234->obj.pos.z + D_80177D20 - gPlayer[0].unk_040.z;
sp68.x = D_800CA234->obj.pos.x - gPlayer[0].camEye.x;
sp68.y = D_800CA234->obj.pos.y - gPlayer[0].camEye.y;
sp68.z = D_800CA234->obj.pos.z + D_80177D20 - gPlayer[0].camEye.z;
Matrix_MultVec3f(gCalcMatrix, &sp68, &sp5C);
sp7C = 0;
if ((sp5C.z < 0.0f) && (sp5C.z > -12000.0f) && (fabsf(sp5C.x) < fabsf(sp5C.z * 0.4f))) {
@@ -125,7 +125,7 @@ s32 func_800520FC(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* dat
Player* player = (Player*) data;
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
if (player->unk_1C4 == 1) {
if (player->num == 1) {
if (limbIndex == 0x10) {
rot->y += player->unk_154;
rot->y -= player->unk_180;
@@ -152,14 +152,14 @@ s32 func_800520FC(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* dat
}
} else {
if (limbIndex == 0xB) {
if (player->unk_1C4 == 0) {
if (player->num == 0) {
rot->y += -player->unk_154 * 0.8f;
}
if (player->unk_1C4 == 2) {
if (player->num == 2) {
rot->y += player->unk_154;
rot->y -= player->unk_180;
}
if (player->unk_1C4 == 3) {
if (player->num == 3) {
rot->y += player->unk_154 * 0.8f;
}
}
@@ -167,7 +167,7 @@ s32 func_800520FC(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* dat
rot->y += -player->unk_158 * 0.8f;
rot->x -= player->unk_15C;
}
if ((limbIndex == 0x11) && (player->unk_1C4 != 2)) {
if ((limbIndex == 0x11) && (player->num != 2)) {
rot->y += player->unk_180;
rot->x -= player->unk_180;
rot->y += -player->unk_158 * 0.2f;
@@ -185,7 +185,7 @@ void func_800523A8(s32 limbIndex, Vec3f* rot, void* data) {
sp1C.x = 3.0f;
sp1C.y = 1.0f;
sp1C.z = -28.0f;
Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_801613B0[player->unk_1C4]);
Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_801613B0[player->num]);
}
}
@@ -197,7 +197,7 @@ void func_80052420(s32 limbIndex, Vec3f* rot, void* data) {
sp1C.x = 13.0f;
sp1C.y = 2.0f;
sp1C.z = 28.0f;
Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_801613B0[player->unk_1C4]);
Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_801613B0[player->num]);
}
}
@@ -209,7 +209,7 @@ void func_80052498(s32 limbIndex, Vec3f* rot, void* data) {
sp1C.x = 0.0f;
sp1C.y = 2.0f;
sp1C.z = 29.0f;
Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_801613B0[player->unk_1C4]);
Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_801613B0[player->num]);
}
}
@@ -221,18 +221,18 @@ void func_8005250C(s32 limbIndex, Vec3f* rot, void* data) {
sp1C.x = 19.0f;
sp1C.y = 1.0f;
sp1C.z = 32.0f;
Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_801613B0[player->unk_1C4]);
Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_801613B0[player->num]);
}
}
void func_80052584(Player* player) {
Matrix_Push(&gGfxMatrix);
Matrix_Copy(gGfxMatrix, &gIdentityMatrix);
if ((player->unk_1C8 == 3) && (player->unk_1F8 != 0)) {
Matrix_Translate(gGfxMatrix, D_801613B0[player->unk_1C4].x, D_801613B0[player->unk_1C4].y,
D_801613B0[player->unk_1C4].z, 1);
Matrix_Scale(gGfxMatrix, D_800CA23C[player->unk_1F8 - 1], D_800CA23C[player->unk_1F8 - 1],
D_800CA23C[player->unk_1F8 - 1], 1);
if ((player->state_1C8 == PLAYERSTATE_1C8_3) && (player->timer_1F8 != 0)) {
Matrix_Translate(gGfxMatrix, D_801613B0[player->num].x, D_801613B0[player->num].y, D_801613B0[player->num].z,
1);
Matrix_Scale(gGfxMatrix, D_800CA23C[player->timer_1F8 - 1], D_800CA23C[player->timer_1F8 - 1],
D_800CA23C[player->timer_1F8 - 1], 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_40();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
@@ -245,7 +245,7 @@ void func_800526B8(Player* player) {
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gCalcMatrix, 0.5f, 0.5f, 0.5f, 1);
Matrix_Translate(gCalcMatrix, 0.0f, 35.0f, 0.0f, 1);
switch (player->unk_1C4) {
switch (player->num) {
case 0:
Animation_DrawSkeleton(5, D_301D258, player->jointTable, func_800520FC, func_800523A8, player, gCalcMatrix);
break;
@@ -277,13 +277,13 @@ void func_80052884(Player* player) {
} else {
gSPDisplayList(gMasterDisp++, D_300FB80);
}
Matrix_MultVec3f(gGfxMatrix, &sp40, &D_80161518[player->unk_1C4]);
Matrix_MultVec3f(gGfxMatrix, &sp40, &D_80161518[player->num]);
Matrix_Translate(gGfxMatrix, 0.0f, 51.0f, -10.0f, 1);
Matrix_RotateY(gGfxMatrix, -player->unk_180 * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, player->unk_17C * M_DTOR, 1);
if (D_801778A0 == player->unk_1C4) {
if (gPlayerNum == player->num) {
sp64 = 0.0f;
if (D_801779C8[player->unk_1C4] >= 20) {
if (gChargeTimers[player->num] >= 20) {
sp64 = (f32) (gFrameCount & 7) * 80.0f;
}
sp58.x = 0.0f;
@@ -303,7 +303,7 @@ void func_80052884(Player* player) {
} else {
gSPDisplayList(gMasterDisp++, D_301F140);
}
Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_80161548[player->unk_1C4]);
Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_80161548[player->num]);
Matrix_Pop(&gGfxMatrix);
}
@@ -317,9 +317,9 @@ f32 D_800CA2A8 = 0.0f;
void func_80052B80(Player* player) {
Matrix_Push(&gGfxMatrix);
if ((player->unk_1C8 == 3) && (player->unk_1A0 != 0)) {
Matrix_Translate(gGfxMatrix, D_80161548[player->unk_1C4].x, D_80161548[player->unk_1C4].y,
D_80161548[player->unk_1C4].z, 1);
if ((player->state_1C8 == PLAYERSTATE_1C8_3) && (player->unk_1A0 != 0)) {
Matrix_Translate(gGfxMatrix, D_80161548[player->num].x, D_80161548[player->num].y, D_80161548[player->num].z,
1);
Matrix_Scale(gGfxMatrix, D_800CA248[player->unk_1A0 - 1], D_800CA248[player->unk_1A0 - 1],
D_800CA248[player->unk_1A0 - 1], 1);
Matrix_SetGfxMtx(&gMasterDisp);
@@ -343,7 +343,7 @@ void func_80052D48(Player* player) {
f32 sp2C;
Matrix_Push(&gGfxMatrix);
Matrix_Copy(gGfxMatrix, &D_80161418[player->unk_1C4]);
Matrix_Copy(gGfxMatrix, &D_80161418[player->num]);
if (gVersusMode) {
RCP_SetupDL_64();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 150);
@@ -363,7 +363,7 @@ void func_80052D48(Player* player) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 20.0f, 30.0f, -10.0f, 1);
if (!gVersusMode) {
Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1);
}
Matrix_Scale(gGfxMatrix, sp2C, sp2C, sp2C, 1);
Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1);
@@ -386,7 +386,7 @@ void func_80052D48(Player* player) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, -20.0f, 30.0f, -10.0f, 1);
if (!gVersusMode) {
Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1);
}
Matrix_Scale(gGfxMatrix, sp2C, sp2C, sp2C, 1);
Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1);
@@ -557,7 +557,8 @@ void func_80053658(WingInfo* wings) {
Matrix_RotateX(gGfxMatrix, wings->unk_38 * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_64_2();
if ((gGameState == GSTATE_PLAY) && (gPlayer[0].unk_1C8 == 2) && (gCurrentLevel == LEVEL_CORNERIA)) {
if ((gGameState == GSTATE_PLAY) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) &&
(gCurrentLevel == LEVEL_CORNERIA)) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 120);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_30194E0);
@@ -595,9 +596,9 @@ void func_80053C38(Player* player, s32 arg1) {
Vec3f sp4C;
f32 sp48;
if ((D_801778A0 == player->unk_1C4) && (arg1 == 0)) {
if ((gPlayerNum == player->num) && (arg1 == 0)) {
sp48 = 0.0f;
if (D_801779C8[player->unk_1C4] >= 20) {
if (gChargeTimers[player->num] >= 20) {
sp48 = (f32) (gFrameCount & 7) * 80.0f;
}
sp4C.x = 0.0f;
@@ -607,8 +608,8 @@ void func_80053C38(Player* player, s32 arg1) {
sp4C.z = 2400.0f + sp48;
Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_801613E0[1]);
}
if ((player->unk_238 != 0) && (gAllRangeMode == 0) &&
(fabsf((player->unk_138 + D_80177D20) - player->unk_040.z) < 10.0f)) {
if ((player->unk_238 != 0) && (gLevelMode == LEVELMODE_ON_RAILS) &&
(fabsf((player->unk_138 + D_80177D20) - player->camEye.z) < 10.0f)) {
if (arg1 == 0) {
D_800CA228 = 1;
Matrix_Push(&gGfxMatrix);
@@ -647,19 +648,19 @@ void func_80053F7C(Player* player) {
Vec3f* pad;
s32 i;
if ((D_801778A0 == player->unk_1C4) && ((player->unk_1CC == 0) || (player->unk_1CC == 1)) &&
if ((gPlayerNum == player->num) && ((player->form == FORM_ARWING) || (player->form == FORM_LANDMASTER)) &&
(player->unk_234 != 0) &&
(((gGameState == GSTATE_PLAY) && (player->unk_1C8 == 3)) || (gGameState == GSTATE_MENU))) {
(((gGameState == GSTATE_PLAY) && (player->state_1C8 == PLAYERSTATE_1C8_3)) || (gGameState == GSTATE_MENU))) {
for (i = 0; i < 2; i++) {
pad = &D_801613E0[i];
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, pad->x, pad->y, pad->z, 1);
if (D_801779C8[player->unk_1C4] >= 20) {
if (gChargeTimers[player->num] >= 20) {
RCP_SetupDL(&gMasterDisp, 0x3F);
if (i == 1) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
Math_SmoothStepToF(&D_800CA298[player->unk_1C4], 2.0f, 1.0f, 0.4f, 0.0f);
Math_SmoothStepToF(&D_800CA298[player->num], 2.0f, 1.0f, 0.4f, 0.0f);
} else {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
gDPSetEnvColor(gMasterDisp++, 255, 255, 0, 255);
@@ -668,8 +669,8 @@ void func_80053F7C(Player* player) {
RCP_SetupDL_36();
}
if (i == 1) {
Matrix_Scale(gGfxMatrix, D_800CA298[player->unk_1C4], D_800CA298[player->unk_1C4], 1.0f, 1);
Math_SmoothStepToF(&D_800CA298[player->unk_1C4], 1.0f, 1.0f, 0.2f, 0.0f);
Matrix_Scale(gGfxMatrix, D_800CA298[player->num], D_800CA298[player->num], 1.0f, 1);
Math_SmoothStepToF(&D_800CA298[player->num], 1.0f, 1.0f, 0.2f, 0.0f);
}
Matrix_Scale(gGfxMatrix, 4.0f, 4.0f, 4.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
@@ -680,17 +681,17 @@ void func_80053F7C(Player* player) {
}
void func_80054280(Player* player, s32 arg1) {
switch (player->unk_1CC) {
case 0:
switch (player->form) {
case FORM_ARWING:
func_80053C38(player, arg1);
return;
case 1:
case FORM_LANDMASTER:
func_80052884(player);
return;
case 2:
case FORM_BLUE_MARINE:
func_E16C50_801ACBB4();
return;
case 3:
case FORM_ON_FOOT:
func_800526B8(player);
return;
}
@@ -708,15 +709,15 @@ void func_80054300(Player* player) {
} else {
player->unk_23C = 180;
}
switch (player->unk_1CC) {
case 0:
switch (player->form) {
case FORM_ARWING:
fake_label:
Matrix_Scale(gGfxMatrix, 2.5049999f, 1.5f, 2.5049999f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 30.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1032780);
break;
case 1:
case FORM_LANDMASTER:
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 1.17f, 1.17f, 1.17f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 20.0f, 1);
@@ -731,9 +732,9 @@ void func_80054300(Player* player) {
}
Matrix_Pop(&gGfxMatrix);
break;
case 2:
case FORM_BLUE_MARINE:
break;
case 3:
case FORM_ON_FOOT:
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1);
Matrix_RotateX(gGfxMatrix, M_PI / 2.0f, 1);
@@ -751,7 +752,7 @@ void func_8005465C(s32 levelType) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
switch (levelType) {
case LEVELTYPE_GROUND:
case LEVELTYPE_PLANET:
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
break;
case LEVELTYPE_SPACE:
@@ -772,7 +773,7 @@ void func_8005478C(Player* player) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 100);
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, player->unk_0F8 * M_DTOR, 1);
if (player->unk_1CC == 1) {
if (player->form == FORM_LANDMASTER) {
if (player->unk_194 <= 0.0f) {
Matrix_Pop(&gGfxMatrix);
return;
@@ -811,12 +812,12 @@ void func_80054914(Player* player) {
sp4C = -1.0f;
}
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, player->unk_074 + sp34.x, player->unk_078 + sp34.y,
Matrix_Translate(gGfxMatrix, player->pos.x + sp34.x, player->pos.y + sp34.y,
player->unk_138 + player->unk_144 + sp34.z, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[D_801778A0].unk_05C, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 20.0f * sp4C * M_DTOR, 1);
if (player->unk_1CC == 0) {
if (player->form == FORM_ARWING) {
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
} else {
Matrix_Scale(gGfxMatrix, 1.2f, 1.2f, 1.2f, 1);
@@ -834,15 +835,15 @@ void func_80054914(Player* player) {
}
void func_80054CA4(Player* player) {
if (D_80177AB8[player->unk_1C4] > 1.0f) {
if (D_80177AB8[player->num] > 1.0f) {
Matrix_Push(&gGfxMatrix);
Matrix_Copy(gGfxMatrix, &D_80161418[player->unk_1C4]);
Matrix_Copy(gGfxMatrix, &D_80161418[player->num]);
Matrix_Translate(gGfxMatrix, 0.0f, -5.0f, 10.0f, 1);
Matrix_Scale(gGfxMatrix, 2.5f, 1.6f, 2.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x44);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 255, 255, (s32) D_80177AB8[player->unk_1C4]);
gDPSetEnvColor(gMasterDisp++, 255, 0, 255, (s32) D_80177AB8[player->unk_1C4]);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 255, 255, (s32) D_80177AB8[player->num]);
gDPSetEnvColor(gMasterDisp++, 255, 0, 255, (s32) D_80177AB8[player->num]);
gSPDisplayList(gMasterDisp++, D_101CD70);
Matrix_Pop(&gGfxMatrix);
Texture_Scroll(D_101D070, 0x20, 0x20, 3);
@@ -864,20 +865,20 @@ void func_80054E80(Player* player) {
u8 var_v1;
f32 sp80;
if (D_801779C8[player->unk_1C4] > 10) {
if (gChargeTimers[player->num] > 10) {
RCP_SetupDL(&gMasterDisp, 0x43);
Matrix_Copy(gCalcMatrix, &D_80161418[player->unk_1C4]);
if ((player->unk_238 != 0) && (gAllRangeMode == 0)) {
Matrix_Copy(gCalcMatrix, &D_80161418[player->num]);
if ((player->unk_238 != 0) && (gLevelMode == LEVELMODE_ON_RAILS)) {
Matrix_MultVec3f(gCalcMatrix, &spB8, &sp94);
} else {
Matrix_MultVec3f(gCalcMatrix, &spC4, &sp94);
}
Matrix_Push(&gGfxMatrix);
sp80 = D_801779C8[player->unk_1C4] / 20.0f;
sp80 = gChargeTimers[player->num] / 20.0f;
Matrix_Translate(gGfxMatrix, sp94.x, sp94.y, sp94.z, 0);
Matrix_Scale(gGfxMatrix, sp80, sp80, 1.0f, 1);
Matrix_Push(&gGfxMatrix);
if ((player->unk_238 != 0) && (gAllRangeMode == 0)) {
if ((player->unk_238 != 0) && (gLevelMode == LEVELMODE_ON_RAILS)) {
Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, 1);
} else {
Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1);
@@ -885,7 +886,7 @@ void func_80054E80(Player* player) {
RCP_SetupDL(&gMasterDisp, 0x31);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 128);
if (gVersusMode) {
switch (player->unk_1C4) {
switch (player->num) {
case 0:
gDPSetEnvColor(gMasterDisp++, 255, 255, 32, 128);
break;
@@ -909,7 +910,7 @@ void func_80054E80(Player* player) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_101C2E0);
Matrix_Pop(&gGfxMatrix);
if ((player->unk_238 != 0) && (gAllRangeMode == 0)) {
if ((player->unk_238 != 0) && (gLevelMode == LEVELMODE_ON_RAILS)) {
Matrix_Scale(gGfxMatrix, 0.3f, 0.3f, 0.3f, 1);
}
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 1.0f, 1);
@@ -922,11 +923,11 @@ void func_80054E80(Player* player) {
gSPDisplayList(gMasterDisp++, D_1024AC0);
Matrix_Pop(&gGfxMatrix);
}
if (D_80177AA0[player->unk_1C4] > 0.1f) {
if (D_80177AA0[player->num] > 0.1f) {
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x43);
Matrix_Copy(gCalcMatrix, &D_80161418[player->unk_1C4]);
var_v1 = gLaserStrength[player->unk_1C4];
Matrix_Copy(gCalcMatrix, &D_80161418[player->num]);
var_v1 = gLaserStrength[player->num];
if (player->wings.unk_14 > -8.0f) {
var_v1 = 0;
}
@@ -934,14 +935,14 @@ void func_80054E80(Player* player) {
case 0:
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 192, 255, 192, 128);
gDPSetEnvColor(gMasterDisp++, 64, 255, 64, 128);
if ((player->unk_238 != 0) && (gAllRangeMode == 0)) {
if ((player->unk_238 != 0) && (gLevelMode == LEVELMODE_ON_RAILS)) {
Matrix_MultVec3f(gCalcMatrix, &spB8, &sp94);
} else {
Matrix_MultVec3f(gCalcMatrix, &spC4, &sp94);
}
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, sp94.x, sp94.y, sp94.z, 0);
Matrix_Scale(gGfxMatrix, D_80177AA0[player->unk_1C4], D_80177AA0[player->unk_1C4], 1.0f, 1);
Matrix_Scale(gGfxMatrix, D_80177AA0[player->num], D_80177AA0[player->num], 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024AC0);
Matrix_Pop(&gGfxMatrix);
@@ -959,13 +960,13 @@ void func_80054E80(Player* player) {
Matrix_MultVec3f(gCalcMatrix, &spA0, &sp88);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, sp94.x, sp94.y, sp94.z, 0);
Matrix_Scale(gGfxMatrix, D_80177AA0[player->unk_1C4], D_80177AA0[player->unk_1C4], 1.0f, 1);
Matrix_Scale(gGfxMatrix, D_80177AA0[player->num], D_80177AA0[player->num], 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024AC0);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, sp88.x, sp88.y, sp88.z, 0);
Matrix_Scale(gGfxMatrix, D_80177AA0[player->unk_1C4], D_80177AA0[player->unk_1C4], 1.0f, 1);
Matrix_Scale(gGfxMatrix, D_80177AA0[player->num], D_80177AA0[player->num], 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024AC0);
Matrix_Pop(&gGfxMatrix);
@@ -978,19 +979,19 @@ void func_80054E80(Player* player) {
void func_80055788(Player* player) {
f32 sp54;
if (D_801779C8[player->unk_1C4] >= 0xB) {
if (gChargeTimers[player->num] >= 0xB) {
RCP_SetupDL(&gMasterDisp, 0x43);
Matrix_Push(&gGfxMatrix);
sp54 = D_801779C8[player->unk_1C4] / 20.0f;
Matrix_Translate(gGfxMatrix, D_80161548[player->unk_1C4].x, D_80161548[player->unk_1C4].y,
D_80161548[player->unk_1C4].z, 0);
sp54 = gChargeTimers[player->num] / 20.0f;
Matrix_Translate(gGfxMatrix, D_80161548[player->num].x, D_80161548[player->num].y, D_80161548[player->num].z,
0);
Matrix_Scale(gGfxMatrix, sp54, sp54, 1.0f, 1);
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1);
RCP_SetupDL(&gMasterDisp, 0x31);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 128);
if (gVersusMode) {
switch (player->unk_1C4) {
switch (player->num) {
case 0:
gDPSetEnvColor(gMasterDisp++, 255, 255, 32, 128);
break;
@@ -1032,10 +1033,9 @@ void func_80055B58(Player* player) {
f32 var_fv0;
s32 pad[3];
if ((player->unk_234 != 0) && (player->unk_1C8 != 4)) {
switch (player->unk_1CC) {
case 0:
if ((player->unk_234 != 0) && (player->state_1C8 != PLAYERSTATE_1C8_4)) {
switch (player->form) {
case FORM_ARWING:
Matrix_RotateY(gCalcMatrix, (player->unk_114 + player->unk_0E8 + player->unk_134 + 180.0f) * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix,
-((player->unk_120 + player->unk_0E4 + player->unk_134 + player->unk_4D8) * M_DTOR), 1);
@@ -1052,10 +1052,10 @@ void func_80055B58(Player* player) {
Matrix_MultVec3f(gCalcMatrix, &sp4C, &sp40);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, player->unk_074 + sp40.x, player->unk_078 + sp40.y,
Matrix_Translate(gGfxMatrix, player->pos.x + sp40.x, player->pos.y + sp40.y,
player->unk_138 + player->unk_144 + sp40.z, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[D_801778A0].unk_05C, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1);
Matrix_SetGfxMtx(&gMasterDisp);
func_8005478C(player);
Matrix_Pop(&gGfxMatrix);
@@ -1063,17 +1063,17 @@ void func_80055B58(Player* player) {
func_80054CA4(player);
func_80054E80(player);
break;
case 1:
case FORM_LANDMASTER:
func_80052D48(player);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, D_80161518[player->unk_1C4].x, D_80161518[player->unk_1C4].y,
D_80161518[player->unk_1C4].z, 0);
Matrix_Translate(gGfxMatrix, D_80161518[player->num].x, D_80161518[player->num].y,
D_80161518[player->num].z, 0);
Matrix_SetGfxMtx(&gMasterDisp);
func_8005478C(player);
Matrix_Pop(&gGfxMatrix);
func_80055788(player);
break;
case 2:
case FORM_BLUE_MARINE:
func_80054914(player);
break;
}
@@ -1104,7 +1104,7 @@ void func_80055E98(Player* player) {
}
var_fs0 = var_fs0 * 0.25f;
sp50 = player->unk_0E4 * 0.25f;
if (player->unk_1C8 == 7) {
if (player->state_1C8 == PLAYERSTATE_1C8_7) {
var_fs0 = 0.0f;
sp50 = 0.0f;
}
@@ -1140,10 +1140,10 @@ void func_80055E98(Player* player) {
}
void func_80056230(Player* player) {
if ((player->unk_234 != 0) && (player->unk_1CC == 0) && (gCurrentLevel != LEVEL_VENOM_2) &&
(gCurrentLevel != LEVEL_TRAINING) && (gLevelType == LEVELTYPE_GROUND)) {
if ((player->unk_234 != 0) && (player->form == FORM_ARWING) && (gCurrentLevel != LEVEL_VENOM_ANDROSS) &&
(gCurrentLevel != LEVEL_TRAINING) && (gLevelType == LEVELTYPE_PLANET)) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, player->unk_074, player->unk_078, player->unk_138 + player->unk_144, 1);
Matrix_Translate(gGfxMatrix, player->pos.x, player->pos.y, player->unk_138 + player->unk_144, 1);
Matrix_RotateY(gGfxMatrix, (player->unk_114 + player->unk_0E8 + 180.0f) * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, -((player->unk_120 + player->unk_0E4 + player->unk_4D8) * M_DTOR), 1);
Matrix_RotateZ(gGfxMatrix, -((player->unk_0F8 + player->unk_0F0 + player->unk_134) * M_DTOR), 1);
@@ -1183,27 +1183,27 @@ void func_800564C0(Player* player, s32 arg1) {
if (player->unk_234 != 0) {
Matrix_Push(&gGfxMatrix);
if (player->unk_1CC == 1) {
if (player->form == FORM_LANDMASTER) {
if (player->unk_1D4 != 0) {
Matrix_Translate(gGfxMatrix, 0.0f, D_8017847C, 0.0f, 1);
}
Matrix_Translate(gGfxMatrix, player->unk_074, player->unk_078 + player->unk_18C + 30.0f,
Matrix_Translate(gGfxMatrix, player->pos.x, player->pos.y + player->unk_18C + 30.0f,
player->unk_138 + player->unk_144, 1);
if (gVersusMode) {
for (i = 0; i < gCamCount; i++) {
if (D_80177B00[player->unk_1C4][i] != 0) {
if (D_80177B00[player->num][i] != 0) {
Matrix_MultVec3f(gGfxMatrix, &sp50, &D_80161578[i]);
if ((i == D_801778A0) &&
if ((i == gPlayerNum) &&
((D_80161578[i].z > 300.0f) || (D_80161578[i].z < -8000.0f) ||
(fabsf(D_80161578[i].x) > (fabsf(D_80161578[i].z * 0.5f) + 100.0f)) ||
(fabsf(D_80161578[i].y)) > (fabsf(D_80161578[i].z * 0.5f) + 100.0f))) {
D_80177B00[player->unk_1C4][i] = 0;
D_80177B00[player->num][i] = 0;
}
}
}
}
if (func_800563B4(player->unk_1C4, arg1) == 0) {
if (func_800563B4(player->num, arg1) == 0) {
Matrix_Pop(&gGfxMatrix);
return;
}
@@ -1216,38 +1216,38 @@ void func_800564C0(Player* player, s32 arg1) {
Matrix_RotateZ(gGfxMatrix, (-player->unk_12C - player->unk_130) * M_DTOR, 1);
Matrix_Translate(gGfxMatrix, player->unk_084, player->unk_080 - 30.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
} else if (player->unk_1CC == 3) {
} else if (player->form == FORM_ON_FOOT) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, player->unk_074, player->unk_078, player->unk_138 + player->unk_144, 1);
if (func_800563B4(player->unk_1C4, arg1) == 0) {
Matrix_Translate(gGfxMatrix, player->pos.x, player->pos.y, player->unk_138 + player->unk_144, 1);
if (func_800563B4(player->num, arg1) == 0) {
Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gGfxMatrix);
return;
}
Matrix_Pop(&gGfxMatrix);
Matrix_Translate(gCalcMatrix, player->unk_074, player->unk_078 + D_8017847C,
player->unk_138 + player->unk_144, 0);
Matrix_Translate(gCalcMatrix, player->pos.x, player->pos.y + D_8017847C, player->unk_138 + player->unk_144,
0);
Matrix_RotateY(gCalcMatrix, (player->unk_114 + player->unk_0E8 + player->unk_134 + 180.0f) * M_DTOR, 1);
Matrix_RotateX(gCalcMatrix, -((player->unk_120 + player->unk_0E4 + player->unk_134) * M_DTOR), 1);
Matrix_RotateZ(gCalcMatrix, -((player->unk_0F8 + player->unk_0F0 + player->unk_134) * M_DTOR), 1);
Matrix_Translate(gCalcMatrix, player->unk_084, player->unk_080, 0.0f, 1);
} else {
Matrix_Translate(gGfxMatrix, player->unk_074, player->unk_078, player->unk_138 + player->unk_144, 1);
Matrix_Translate(gGfxMatrix, player->pos.x, player->pos.y, player->unk_138 + player->unk_144, 1);
if (gVersusMode) {
for (i = 0; i < gCamCount; i++) {
if (D_80177B00[player->unk_1C4][i] != 0) {
if (D_80177B00[player->num][i] != 0) {
Matrix_MultVec3f(gGfxMatrix, &sp50, &D_80161578[i]);
if ((i == D_801778A0) &&
if ((i == gPlayerNum) &&
((D_80161578[i].z > 300.0f) || (D_80161578[i].z < -8000.0f) ||
(fabsf(D_80161578[i].x) > (fabsf(D_80161578[i].z * 0.5f) + 100.0f)) ||
(fabsf(D_80161578[i].y) > (fabsf(D_80161578[i].z * 0.5f) + 100.0f)))) {
D_80177B00[player->unk_1C4][i] = 0;
D_80177B00[player->num][i] = 0;
}
}
}
}
if (func_800563B4(player->unk_1C4, arg1) == 0) {
if (func_800563B4(player->num, arg1) == 0) {
Matrix_Pop(&gGfxMatrix);
return;
}
@@ -1283,7 +1283,7 @@ void func_800564C0(Player* player, s32 arg1) {
if (arg1 != 0) {
func_800596C0();
} else {
Matrix_Copy(&D_80161418[player->unk_1C4], gGfxMatrix);
Matrix_Copy(&D_80161418[player->num], gGfxMatrix);
}
func_80054280(player, arg1);
Matrix_Pop(&gGfxMatrix);
@@ -1319,8 +1319,8 @@ void func_80056E2C(Player* player) {
sp34 = sp30 = 0.0f;
}
Matrix_Push(&gGfxMatrix);
if (gAllRangeMode == 1) {
if (player->unk_1CC == 3) {
if (gLevelMode == LEVELMODE_ALL_RANGE) {
if (player->form == FORM_ON_FOOT) {
Matrix_Translate(gGfxMatrix, player->unk_064, player->unk_068 + 2.0f, player->unk_06C, 1);
} else {
Matrix_Translate(gGfxMatrix, player->unk_064, player->unk_068 + 2.0f, player->unk_06C, 1);
@@ -1332,7 +1332,7 @@ void func_80056E2C(Player* player) {
Matrix_RotateX(gGfxMatrix, player->unk_248, 1);
Matrix_RotateZ(gGfxMatrix, player->unk_24C, 1);
Matrix_Scale(gGfxMatrix, 0.8f + sp34, 0.0f, 0.8f + sp30, 1);
if ((player->unk_1CC == 0) || (player->unk_1CC == 2) || (player->unk_1CC == 3)) {
if ((player->form == FORM_ARWING) || (player->form == FORM_BLUE_MARINE) || (player->form == FORM_ON_FOOT)) {
sp2C = player->unk_0F8 + player->unk_0F0 + player->unk_134;
if (((sp2C > 70.0f) && (sp2C < 110.0f)) || ((sp2C < -70.0f) && (sp2C > -110.0f))) {
sp2C = 70.0f;
@@ -1409,7 +1409,7 @@ void func_80057504(void) {
}
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, D_80161578[i].x, D_80161578[i].y, D_80161578[i].z, 1);
if ((D_80177854 != 0x64) && (i == D_801778A0)) {
if ((D_80177854 != 0x64) && (i == gPlayerNum)) {
Math_SmoothStepToF(&D_801615A8[i], 0.0f, 0.5f, 20.0f, 0);
Math_SmoothStepToF(&D_801615B8[i], 1.0, 0.5f, 0.2f, 0);
}
@@ -1436,8 +1436,8 @@ void func_80057814(Player* player) {
Vec3f sp2C;
Vec3f sp20;
sp20.x = player->unk_074;
sp20.y = player->unk_078;
sp20.x = player->pos.x;
sp20.y = player->pos.y;
sp20.z = player->unk_138;
sp2C.x = player->unk_460.x;
sp2C.y = player->unk_460.y;
@@ -1448,7 +1448,7 @@ void func_80057814(Player* player) {
player->unk_46C.z = player->unk_460.z - sp2C.z;
player->unk_480 = &player->unk_46C;
player->unk_47C = &player->unk_460;
player->unk_488 = player->unk_0C0.y;
player->unk_488 = player->vel.y;
player->unk_490 = player->unk_0F8;
}
@@ -1463,12 +1463,12 @@ void func_800578C4(Player* player) {
case 0:
Math_SmoothStepToAngle(&player->wings.unk_30, 0.0f, 0.2f, 3.0f, 0.0f);
Math_SmoothStepToAngle(&player->wings.unk_34, 0.0f, 0.2f, 3.0f, 0.0f);
D_801779D8.x = player->unk_040.x;
D_801779D8.y = player->unk_040.y;
D_801779D8.z = player->unk_040.z;
D_801779E8.x = player->unk_04C.x;
D_801779E8.y = player->unk_04C.y;
D_801779E8.z = player->unk_04C.z;
D_801779D8.x = player->camEye.x;
D_801779D8.y = player->camEye.y;
D_801779D8.z = player->camEye.z;
D_801779E8.x = player->camAt.x;
D_801779E8.y = player->camAt.y;
D_801779E8.z = player->camAt.z;
break;
case 1:
case 2:
@@ -1497,11 +1497,11 @@ void func_800578C4(Player* player) {
Matrix_RotateX(gCalcMatrix, (player->unk_0E8 + D_800CA380) * M_DTOR, 0);
Matrix_RotateY(gCalcMatrix, (player->unk_0E4 + D_800CA384) * M_DTOR, 1);
Matrix_MultVec3f(gCalcMatrix, &sp4C, &sp40);
D_801779D8.x = player->unk_074 + sp40.x;
D_801779D8.y = player->unk_078 + sp40.y + 20.0f;
D_801779D8.x = player->pos.x + sp40.x;
D_801779D8.y = player->pos.y + sp40.y + 20.0f;
D_801779D8.z = player->unk_138 + sp40.z;
D_801779E8.x = (__sinf(gFrameCount * 3.0f * M_DTOR) * 3.0f) + player->unk_074;
D_801779E8.y = (__cosf(gFrameCount * 4.0f * M_DTOR) * 3.0f) + player->unk_078;
D_801779E8.x = (__sinf(gFrameCount * 3.0f * M_DTOR) * 3.0f) + player->pos.x;
D_801779E8.y = (__cosf(gFrameCount * 4.0f * M_DTOR) * 3.0f) + player->pos.y;
D_801779E8.z = (__sinf(gFrameCount * 3.5f * M_DTOR) * 3.0f) + player->unk_138;
break;
}
@@ -1514,15 +1514,15 @@ void func_80057D00(void) {
Vec3f sp60;
s32 pad;
Player* opponent;
Player* player = &gPlayer[D_801778A0];
Player* player = &gPlayer[gPlayerNum];
D_800CA228 = 0;
if (gHitCount > 0x1FF) {
gHitCount = 0x1FF;
if (gHitCount > 511) {
gHitCount = 511;
}
Matrix_Push(&gGfxMatrix);
if ((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].unk_1C8 == 3)) {
if ((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) {
Math_SmoothStepToF(&D_800CA230, 0.01f, 0.2f, 0.002f, 0.0f);
} else {
Math_SmoothStepToF(&D_800CA230, 0.0f, 0.2f, 0.002f, 0.0f);
@@ -1535,35 +1535,38 @@ void func_80057D00(void) {
func_800B73E0(player);
Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG,
gAmbientB);
if (gAllRangeMode == 0) {
if (gLevelMode == LEVELMODE_ON_RAILS) {
Matrix_RotateY(gCalcMatrix, player->unk_114 * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, player->unk_120 * M_DTOR, 1);
sp78.x = player->unk_040.x - player->unk_074;
sp78.y = player->unk_040.y - player->unk_078;
sp78.z = player->unk_040.z - (player->unk_138 + player->unk_144);
sp78.x = player->camEye.x - player->pos.x;
sp78.y = player->camEye.y - player->pos.y;
sp78.z = player->camEye.z - (player->unk_138 + player->unk_144);
Matrix_MultVec3f(gCalcMatrix, &sp78, &D_801779D8);
D_801779D8.x += player->unk_074;
D_801779D8.y += player->unk_078;
D_801779D8.x += player->pos.x;
D_801779D8.y += player->pos.y;
D_801779D8.z += player->unk_138 + player->unk_144;
sp78.x = player->unk_04C.x - player->unk_074;
sp78.y = player->unk_04C.y - player->unk_078;
sp78.z = player->unk_04C.z - (player->unk_138 + player->unk_144);
sp78.x = player->camAt.x - player->pos.x;
sp78.y = player->camAt.y - player->pos.y;
sp78.z = player->camAt.z - (player->unk_138 + player->unk_144);
Matrix_MultVec3f(gCalcMatrix, &sp78, &D_801779E8);
D_801779E8.x += player->unk_074;
D_801779E8.y += player->unk_078;
D_801779E8.x += player->pos.x;
D_801779E8.y += player->pos.y;
D_801779E8.z += player->unk_138 + player->unk_144;
if ((player->unk_238 != 0) && (player->unk_110 > 5.0f)) {
D_801779E8.x += __sinf((f32) gFrameCount * 150.0f * M_DTOR) * player->unk_110 * 0.2f;
}
} else if (player->unk_1C8 == 7) {
} else if (player->state_1C8 == PLAYERSTATE_1C8_7) {
func_800578C4(player);
} else {
D_801779D8.x = player->unk_040.x;
D_801779D8.y = player->unk_040.y;
D_801779D8.z = player->unk_040.z;
D_801779E8.x = player->unk_04C.x;
D_801779E8.y = player->unk_04C.y;
D_801779E8.z = player->unk_04C.z;
D_801779D8.x = player->camEye.x;
D_801779D8.y = player->camEye.y;
D_801779D8.z = player->camEye.z;
D_801779E8.x = player->camAt.x;
D_801779E8.y = player->camAt.y;
D_801779E8.z = player->camAt.z;
}
player->unk_058 = -Math_Atan2F(D_801779D8.x - D_801779E8.x, D_801779D8.z - D_801779E8.z);
player->unk_05C = -Math_Atan2F(D_801779D8.y - D_801779E8.y,
@@ -1585,8 +1588,9 @@ void func_80057D00(void) {
Matrix_Push(&gGfxMatrix);
Matrix_LookAt(gGfxMatrix, D_801779D8.x, D_801779D8.y, D_801779D8.z, D_801779E8.x, D_801779E8.y, D_801779E8.z,
sp6C.x, sp6C.y, sp6C.z, 1);
if ((gLevelType == LEVELTYPE_GROUND) || (gCurrentLevel == LEVEL_BOLSE)) {
if ((gCurrentLevel == LEVEL_TITANIA) && ((gPlayer[0].unk_1C8 != 2) || (gPlayer[0].unk_19C != 0))) {
if ((gLevelType == LEVELTYPE_PLANET) || (gCurrentLevel == LEVEL_BOLSE)) {
if ((gCurrentLevel == LEVEL_TITANIA) &&
((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2) || (gPlayer[0].unk_19C != 0))) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, D_8017847C, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
@@ -1601,21 +1605,21 @@ void func_80057D00(void) {
Lights_SetOneLight(&gMasterDisp, gLight2x, gLight2y, gLight2z, gLight2R, gLight2G, gLight2B, gAmbientR, gAmbientG,
gAmbientB);
for (i = 0, opponent = gPlayer; i < gCamCount; i++, opponent++) {
sp60.x = opponent->unk_074;
sp60.y = opponent->unk_078;
sp60.x = opponent->pos.x;
sp60.y = opponent->pos.y;
sp60.z = opponent->unk_138;
func_8005F670(&sp60);
func_800564C0(opponent, 0);
func_80057814(opponent);
}
if ((D_80161A88 == 2) && (gPlayer[0].unk_1C8 != 2)) {
if ((D_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) {
Lights_SetOneLight(&gMasterDisp, gLight2x, -1 * gLight2y, gLight2z, gLight2R, gLight2G, gLight2B, gAmbientR,
gAmbientG, gAmbientB);
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1);
for (i = 0, opponent = gPlayer; i < gCamCount; i++, opponent++) {
sp60.x = opponent->unk_074;
sp60.y = opponent->unk_078;
sp60.x = opponent->pos.x;
sp60.y = opponent->pos.y;
sp60.z = opponent->unk_138;
func_800564C0(opponent, 1);
}
@@ -1627,7 +1631,7 @@ void func_80057D00(void) {
func_80060968();
D_80161410 = 1;
func_8003DA0C();
if ((D_80161A88 == 2) && (gPlayer[0].unk_1C8 != 2)) {
if ((D_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) {
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1);
D_80161410 = -1;
@@ -1635,7 +1639,7 @@ void func_80057D00(void) {
Matrix_Pop(&gGfxMatrix);
}
D_80161410 = -1;
if ((D_80161A88 == 2) && (gPlayer[0].unk_1C8 != 2)) {
if ((D_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) {
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1);
for (i = 0, opponent = gPlayer; i < gCamCount; i++, opponent++) {
@@ -1654,8 +1658,9 @@ void func_80057D00(void) {
func_8006089C(1);
func_80040CE4();
}
if ((gCurrentLevel != LEVEL_AQUAS) && (((gCurrentLevel != LEVEL_CORNERIA) && (gCurrentLevel != LEVEL_VENOM_2)) ||
((gPlayer[0].unk_1C8 != 7) && (gPlayer[0].unk_1C8 != 2)))) {
if ((gCurrentLevel != LEVEL_AQUAS) &&
(((gCurrentLevel != LEVEL_CORNERIA) && (gCurrentLevel != LEVEL_VENOM_ANDROSS)) ||
((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)))) {
func_8006089C(0);
}
D_80161410 = 1;
@@ -1666,11 +1671,11 @@ void func_80057D00(void) {
func_80056230(opponent);
}
}
if ((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].unk_1C8 == 3)) {
if ((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) {
func_E16C50_801AA20C();
}
if (((gCurrentLevel == LEVEL_CORNERIA) || (gCurrentLevel == LEVEL_VENOM_2)) &&
((gPlayer[0].unk_1C8 == 7) || (gPlayer[0].unk_1C8 == 2))) {
if (((gCurrentLevel == LEVEL_CORNERIA) || (gCurrentLevel == LEVEL_VENOM_ANDROSS)) &&
((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2))) {
func_8006089C(0);
}
func_80077790();
@@ -1682,26 +1687,26 @@ void func_80057D00(void) {
}
for (i = 0, opponent = gPlayer; i < gCamCount; i++, opponent++) {
if (D_800CA224[i] != 0) {
if (D_800D2860[i] != 0) {
if (D_800D2860[i]) {
func_80053F7C(opponent);
}
if (opponent->unk_1CC == 1) {
if (opponent->form == FORM_LANDMASTER) {
func_80052B80(opponent);
} else if (opponent->unk_1CC == 3) {
} else if (opponent->form == FORM_ON_FOOT) {
func_80052584(opponent);
}
}
}
if ((gAllRangeMode == 2) && (gPlayer[0].unk_1C8 == 3)) {
if ((gLevelMode == LEVELMODE_UNK_2) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) {
func_E9F1D0_801A6164(gPlayer);
}
func_80040954();
if ((gCamCount != 1) && ((player->unk_1C8 == 3) || (player->unk_1C8 == 5))) {
if ((gCamCount != 1) && ((player->state_1C8 == PLAYERSTATE_1C8_3) || (player->state_1C8 == PLAYERSTATE_1C8_5))) {
func_8008FA84();
func_8008CA44();
}
Matrix_Pop(&gGfxMatrix);
func_80051B30();
D_800CA224[D_801778A0] = 0;
D_800CA224[gPlayerNum] = 0;
Matrix_Pop(&gGfxMatrix);
}
src/main/fox_edata_1C.c
+1 -1
View File
@@ -927,7 +927,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ITEM_331 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_332 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_333 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_CORN_ARCH */ {(void*) NULL, 1, (ObjectFunc) func_80068C48, D_800CBF18, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_334 */ {(void*) NULL, 1, (ObjectFunc) func_80068C48, D_800CBF18, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_1UP */ {(void*) D_1022120, 0, (ObjectFunc) func_80067B1C, D_800CBE8C, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_GOLD_RING */ {(void*) func_8005CA80, 1, (ObjectFunc) func_800685F8, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_WING_REPAIR */ {(void*) D_3007650, 0, (ObjectFunc) func_80068618, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
src/main/fox_edisplay.c
+95 -90
View File
@@ -23,7 +23,7 @@ void func_800597C0(s32 arg0) {
}
}
void func_8005980C(f32 scale) {
void Graphics_SetScaleMtx(f32 scale) {
Matrix_Scale(gGfxMatrix, scale, scale, scale, 1);
Matrix_SetGfxMtx(&gMasterDisp);
}
@@ -84,7 +84,7 @@ void func_80059B20(Object_80* obj80) {
if (obj80->obj.id == OBJ_80_29) {
gSPDisplayList(gMasterDisp++, D_7007350);
} else {
func_8005980C(D_800CF9B0[obj80->obj.id + 2]);
Graphics_SetScaleMtx(D_800CF9B0[obj80->obj.id + 2]);
gSPDisplayList(gMasterDisp++, D_700BB10);
}
}
@@ -247,14 +247,14 @@ void func_8005A094(Object_2F4* obj2F4) {
gSPDisplayList(gMasterDisp++, D_3015D80);
break;
case 2:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_30155E0);
break;
case 3:
gSPDisplayList(gMasterDisp++, D_3011720);
break;
case 4:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
if (obj2F4->index & 1) {
gSPDisplayList(gMasterDisp++, D_10194C0);
} else {
@@ -294,24 +294,24 @@ void func_8005A094(Object_2F4* obj2F4) {
gDPSetFogColor(gMasterDisp++, 0x10, 0x10, 0x10, gFogAlpha);
gSPFogPosition(gMasterDisp++, gFogNear, gFogFar);
}
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_800CFB40[obj2F4->unk_046]);
}
break;
case 41:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_800CFADC[obj2F4->unk_048]);
break;
case 42:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_800CFB08[obj2F4->unk_048]);
break;
case 43:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_800CFB14[obj2F4->unk_048]);
break;
case 44:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_800CFB28[obj2F4->unk_048]);
break;
case 45:
@@ -328,22 +328,22 @@ void func_8005A094(Object_2F4* obj2F4) {
gSPDisplayList(gMasterDisp++, D_E6A810_801B7608[obj2F4->unk_048]);
break;
case 48:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_800CFB64[obj2F4->unk_048]);
break;
case 49:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_800CFB88[obj2F4->unk_048]);
break;
case 50:
func_8005980C(0.7f);
Graphics_SetScaleMtx(0.7f);
if (obj2F4->unk_054 == 1) {
RCP_SetupDL(&gMasterDisp, 0x1E);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} else if (obj2F4->unk_054 == 2) {
RCP_SetupDL(&gMasterDisp, 0x1E);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
func_8005980C(0.7f);
Graphics_SetScaleMtx(0.7f);
}
switch (obj2F4->unk_050) {
case 0:
@@ -361,43 +361,43 @@ void func_8005A094(Object_2F4* obj2F4) {
}
if (obj2F4->unk_054 != 0) {
RCP_SetupDL(&gMasterDisp, 0x1D);
func_8005980C(0.7f);
Graphics_SetScaleMtx(0.7f);
}
break;
case 51:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_800CFBA8[obj2F4->unk_048]);
break;
case 52:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_800CFBE4[obj2F4->unk_048]);
break;
case 53:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_800CFC0C[obj2F4->unk_048]);
break;
case 54:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_800CFC40[obj2F4->unk_048]);
break;
case 55:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
gSPDisplayList(gMasterDisp++, D_800CFC50[obj2F4->unk_048]);
break;
case 56:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
RCP_SetupDL(&gMasterDisp, 0x29);
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 191, 255, 223, 255);
gSPDisplayList(gMasterDisp++, D_800CFC64[obj2F4->unk_048]);
break;
case 58:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_60148B0);
break;
case 59:
func_8005980C(obj2F4->unk_110);
Graphics_SetScaleMtx(obj2F4->scale);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_800CFC7C[obj2F4->unk_048]);
break;
@@ -440,14 +440,14 @@ void func_8005ADAC(Object_2F4* obj2F4) {
Matrix_RotateZ(gGfxMatrix, -obj2F4->obj.rot.z * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, -obj2F4->obj.rot.x * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, -obj2F4->obj.rot.y * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[D_801778A0].unk_05C, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1);
Matrix_SetGfxMtx(&gMasterDisp);
func_8005465C(gLevelType);
Matrix_Pop(&gGfxMatrix);
}
sp5C = obj2F4->unk_168;
if ((sp5C != 0.0f) && (gLevelType == LEVELTYPE_GROUND)) {
if ((sp5C != 0.0f) && (gLevelType == LEVELTYPE_PLANET)) {
sp54 = 0.0f;
if (gFrameCount & 1) {
sp54 = 180.0f;
@@ -495,7 +495,7 @@ void func_8005B1E8(Object_2F4* obj2F4, s32 levelType) {
Matrix_RotateZ(gGfxMatrix, -obj2F4->obj.rot.z * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, -obj2F4->obj.rot.x * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, -obj2F4->obj.rot.y * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1);
Matrix_SetGfxMtx(&gMasterDisp);
func_8005465C(levelType);
Matrix_Pop(&gGfxMatrix);
@@ -507,14 +507,17 @@ void func_8005B388(Object_2F4* obj2F4) {
Vec3f sp30;
Matrix_MultVec3f(gGfxMatrix, &sp3C, &sp30);
if ((((fabsf(sp30.z) < 3000.0f) && (fabsf(sp30.x) < 3000.0f) && (D_80178284 == 0)) || (gPlayer[0].unk_1C8 == 0) ||
(gCurrentLevel == LEVEL_VENOM_2) || (gCurrentLevel == LEVEL_VENOM_SW) || (gPlayer[0].unk_1C8 == 7)) &&
if ((((fabsf(sp30.z) < 3000.0f) && (fabsf(sp30.x) < 3000.0f) && (D_80178284 == 0)) ||
(gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0) || (gCurrentLevel == LEVEL_VENOM_ANDROSS) ||
(gCurrentLevel == LEVEL_VENOM_2) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7)) &&
(gCurrentLevel != LEVEL_MACBETH) && (gCurrentLevel != LEVEL_TITANIA)) {
if (obj2F4->obj.id == OBJ_2F4_195) {
if (((gCurrentLevel == LEVEL_VENOM_SW) && (gPlayer[0].unk_1C8 == 7) && (obj2F4->index == 10)) ||
((gPlayer[0].unk_1C8 == 7) && (gPlayer[0].unk_1D0 >= 100) && (gCurrentLevel == LEVEL_KATINA) &&
(obj2F4->index == 1)) ||
((gCurrentLevel == LEVEL_SECTOR_Y) && (gPlayer[0].unk_1C8 == 0) && (obj2F4->unk_0B8 == 5))) {
if (((gCurrentLevel == LEVEL_VENOM_2) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) &&
(obj2F4->index == 10)) ||
((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) && (gPlayer[0].unk_1D0 >= 100) &&
(gCurrentLevel == LEVEL_KATINA) && (obj2F4->index == 1)) ||
((gCurrentLevel == LEVEL_SECTOR_Y) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0) &&
(obj2F4->unk_0B8 == 5))) {
D_80161630.rightState = gPlayer[0].wings.rightState;
D_80161630.leftState = gPlayer[0].wings.leftState;
} else {
@@ -537,7 +540,7 @@ void func_8005B388(Object_2F4* obj2F4) {
D_80161630.unk_04 = D_80161630.unk_08 = D_80161630.unk_0C = D_80161630.unk_10 = 0.0f;
}
func_80053658(&D_80161630);
} else if (gLevelType == LEVELTYPE_GROUND) {
} else if (gLevelType == LEVELTYPE_PLANET) {
gSPDisplayList(gMasterDisp++, D_40018A0);
} else if (gPlayer[0].unk_204 == 2) {
gSPDisplayList(gMasterDisp++, D_4003BD0);
@@ -597,7 +600,7 @@ void func_8005B9A4(Object_2F4* obj2F4) {
}
void func_8005BA30(Object_2F4* obj2F4) {
if (obj2F4->unk_0BC != 0) {
if (obj2F4->timer_0BC != 0) {
RCP_SetupDL_27();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
@@ -662,12 +665,12 @@ void func_8005BAB4(s32 objId, s32 index) {
gSPDisplayList(gMasterDisp++, D_6034B90);
break;
case OBJ_408_316:
if (gPlayer[0].unk_1C8 == 0) {
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0) {
RCP_SetupDL(&gMasterDisp, 0x40);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 200);
}
Matrix_RotateX(gGfxMatrix, M_PI / 2.0f, 1);
func_8005980C(150.0f);
Graphics_SetScaleMtx(150.0f);
gSPDisplayList(gMasterDisp++, D_102A8A0);
break;
case OBJ_408_293:
@@ -695,7 +698,7 @@ void func_8005BAB4(s32 objId, s32 index) {
break;
case OBJ_2F4_192:
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 150);
Matrix_Scale(gGfxMatrix, 0.4f, 0.4f, gObjects2F4[index].unk_110, 1);
Matrix_Scale(gGfxMatrix, 0.4f, 0.4f, gObjects2F4[index].scale, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
break;
@@ -707,7 +710,7 @@ void func_8005BAB4(s32 objId, s32 index) {
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
Matrix_RotateX(gGfxMatrix, gObjects2F4[index].unk_114, 1);
Matrix_RotateZ(gGfxMatrix, gObjects2F4[index].unk_11C, 1);
Matrix_Scale(gGfxMatrix, gObjects2F4[index].unk_110, 1.0f, gObjects2F4[index].unk_110, 1);
Matrix_Scale(gGfxMatrix, gObjects2F4[index].scale, 1.0f, gObjects2F4[index].scale, 1);
Matrix_RotateX(gGfxMatrix, -M_PI / 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024AC0);
@@ -774,9 +777,9 @@ void func_8005C5F0(Item* item) {
for (i = 0; i < 8; i++) {
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, i * 45.0f * M_DTOR, 1);
Matrix_Translate(gGfxMatrix, 2.0f * item->unk_68, 0.0f, 0.0f, 1);
Matrix_Translate(gGfxMatrix, 2.0f * item->scale, 0.0f, 0.0f, 1);
Matrix_RotateZ(gGfxMatrix, (gFrameCount + (i * 110.0f)) * M_DTOR * 7.2f * item->unk_54, 1);
func_8005980C(2.0f * item->unk_50);
Graphics_SetScaleMtx(2.0f * item->unk_50);
gSPDisplayList(gMasterDisp++, D_101CAE0);
Matrix_Pop(&gGfxMatrix);
}
@@ -787,7 +790,7 @@ void func_8005C900(Item* item) {
RCP_SetupDL(&gMasterDisp, 0x1D);
gSPTexture(gMasterDisp++, 3000, 0, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR);
func_8005980C(item->unk_68);
Graphics_SetScaleMtx(item->scale);
gSPDisplayList(gMasterDisp++, D_101A570);
gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR);
}
@@ -796,7 +799,7 @@ void func_8005C9C0(Item* item) {
RCP_SetupDL(&gMasterDisp, 0x1D);
gSPTexture(gMasterDisp++, 3000, 0, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR);
func_8005980C(item->unk_68);
Graphics_SetScaleMtx(item->scale);
gSPDisplayList(gMasterDisp++, D_1019CA0);
gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR);
}
@@ -805,17 +808,17 @@ void func_8005CA80(Item* item) {
RCP_SetupDL(&gMasterDisp, 0x1D);
gSPTexture(gMasterDisp++, 1900, 1700, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR);
func_8005980C(item->unk_68);
Graphics_SetScaleMtx(item->scale);
gSPDisplayList(gMasterDisp++, D_1016870);
gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR);
}
void func_8005CB44(Item* item) {
if (gCurrentLevel == LEVEL_AQUAS) {
func_8005980C(item->unk_68);
Graphics_SetScaleMtx(item->scale);
gSPDisplayList(gMasterDisp++, D_3005980);
} else {
func_8005980C(item->unk_68 * 0.1f);
Graphics_SetScaleMtx(item->scale * 0.1f);
RCP_SetupDL(&gMasterDisp, 0x1D);
gSPTexture(gMasterDisp++, 2000, 2000, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
@@ -828,7 +831,7 @@ void func_8005CB44(Item* item) {
}
void func_8005CC9C(Item* item) {
func_8005980C(item->unk_68 * 0.1f);
Graphics_SetScaleMtx(item->scale * 0.1f);
RCP_SetupDL(&gMasterDisp, 0x1D);
gSPTexture(gMasterDisp++, 2000, 2000, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
@@ -842,8 +845,8 @@ void func_8005CC9C(Item* item) {
void func_8005CDA8(Item* item) {
s32 i;
item->obj.rot.y = (Math_Atan2F(gPlayer[D_801778A0].unk_040.x - item->obj.pos.x,
gPlayer[D_801778A0].unk_040.z - (item->obj.pos.z + D_80177D20)) *
item->obj.rot.y = (Math_Atan2F(gPlayer[gPlayerNum].camEye.x - item->obj.pos.x,
gPlayer[gPlayerNum].camEye.z - (item->obj.pos.z + D_80177D20)) *
180.0f) /
M_PI;
if (item->unk_46 != 0) {
@@ -856,7 +859,7 @@ void func_8005CDA8(Item* item) {
for (i = 0; i < 7; i++) {
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, (i * 360.0f / 7.0f) * M_DTOR, 1);
Matrix_Translate(gGfxMatrix, 0.0f, item->unk_68, 0.0f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, item->scale, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_102FE80);
Matrix_Pop(&gGfxMatrix);
@@ -1017,11 +1020,11 @@ void Object_2F4_Draw2(Object_2F4* obj2F4) {
Matrix_MultVec3f(gGfxMatrix, &sp34, &D_80177E98[obj2F4->unk_0E4]);
}
}
if ((obj2F4->unk_0CA[0] != 0) && (D_80161410 > 0)) {
if ((obj2F4->timer_0CA[0] != 0) && (D_80161410 > 0)) {
sp34.y += obj2F4->info.unk_1C;
Matrix_MultVec3f(gGfxMatrix, &sp34, &D_80161578[0]);
if (D_80161578[0].z > -200.0f) {
obj2F4->unk_0CA[0] = 0;
obj2F4->timer_0CA[0] = 0;
}
}
}
@@ -1058,7 +1061,8 @@ void Object_2F4_Draw1(Object_2F4* obj2F4) {
Matrix_RotateZ(gCalcMatrix, obj2F4->obj.rot.z * M_DTOR, 1);
obj2F4->info.draw(&obj2F4->obj);
D_801615EC = 1;
if ((gPlayer[0].unk_1C8 == 3) && (obj2F4->obj.id == OBJ_2F4_197) && (obj2F4->unk_0E4 == 200)) {
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (obj2F4->obj.id == OBJ_2F4_197) &&
(obj2F4->unk_0E4 == 200)) {
D_80177E98[0] = D_801615E0;
}
}
@@ -1067,7 +1071,7 @@ void Object_2F4_Draw1(Object_2F4* obj2F4) {
} else {
Matrix_Translate(gGfxMatrix, obj2F4->obj.pos.x, obj2F4->obj.pos.y, obj2F4->obj.pos.z, 1);
Matrix_MultVec3f(gGfxMatrix, &sp50, &D_801615E0);
if ((gPlayer[0].unk_1C8 == 2) || (gPlayer[0].unk_1C8 == 0) ||
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0) ||
((obj2F4->obj.id == OBJ_2F4_197) && (obj2F4->unk_0E4 >= 100)) ||
((obj2F4->obj.id == OBJ_2F4_195) && (obj2F4->info.bonus != 0))) {
var_ft5 = var_fv0 = 3000.0f;
@@ -1089,7 +1093,7 @@ void Object_2F4_Draw1(Object_2F4* obj2F4) {
Matrix_SetGfxMtx(&gMasterDisp);
obj2F4->info.draw(&obj2F4->obj);
D_801615EC = 1;
if ((gPlayer[0].unk_1C8 == 3) &&
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) &&
(((obj2F4->obj.id == OBJ_2F4_197) &&
((obj2F4->unk_0E4 < 4) || (obj2F4->unk_0E4 == 8) || (obj2F4->unk_0E4 == 9))) ||
(obj2F4->obj.id == OBJ_2F4_198))) {
@@ -1101,17 +1105,17 @@ void Object_2F4_Draw1(Object_2F4* obj2F4) {
}
}
if (D_801615EC == 0) {
obj2F4->unk_0CA[D_801778A0] = 0;
obj2F4->timer_0CA[gPlayerNum] = 0;
if ((obj2F4->obj.id == OBJ_2F4_189) || (obj2F4->obj.id == OBJ_2F4_286)) {
Object_Kill(&obj2F4->obj, &obj2F4->sfxPos);
}
}
for (var_v1 = 0; var_v1 < gCamCount; var_v1++) {
if (obj2F4->unk_0CA[var_v1] != 0) {
if (obj2F4->timer_0CA[var_v1] != 0) {
D_80161578[var_v1] = D_801615E0;
D_80161578[var_v1].y += obj2F4->info.unk_1C;
if ((var_v1 == D_801778A0) && (D_80161578[var_v1].z > -300.0f)) {
obj2F4->unk_0CA[var_v1] = 0;
if ((var_v1 == gPlayerNum) && (D_80161578[var_v1].z > -300.0f)) {
obj2F4->timer_0CA[var_v1] = 0;
}
}
}
@@ -1263,8 +1267,8 @@ void Item_Draw(Item* item, s32 arg1) {
}
}
func_8005F290(&item->sfxPos, &sp38);
if ((var_v0 == 0) && (gAllRangeMode == 1) && (gCamCount == 1) && (item->obj.id < 336) &&
(gCurrentLevel != LEVEL_VENOM_2)) {
if ((var_v0 == 0) && (gLevelMode == LEVELMODE_ALL_RANGE) && (gCamCount == 1) && (item->obj.id < 336) &&
(gCurrentLevel != LEVEL_VENOM_ANDROSS)) {
Object_Kill(&item->obj, &item->sfxPos);
}
}
@@ -1421,7 +1425,7 @@ void Object_58_Draw(Object_58* obj58) {
sp44 = 4000.0f;
sp40 = -13000.0f;
sp3C = 4500.0f;
} else if (gCurrentLevel == LEVEL_VENOM_2) {
} else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
sp40 = -20000.0f;
sp38 = 0.4f;
} else if (obj58->obj.id == OBJ_80_143) {
@@ -1430,7 +1434,7 @@ void Object_58_Draw(Object_58* obj58) {
sp3C = 6000.0f;
sp38 = 0.9f;
}
if ((gLevelType == LEVELTYPE_GROUND) || (gCurrentLevel == LEVEL_BOLSE)) {
if ((gLevelType == LEVELTYPE_PLANET) || (gCurrentLevel == LEVEL_BOLSE)) {
Matrix_Translate(gGfxMatrix, obj58->obj.pos.x, obj58->obj.pos.y + D_8017847C, obj58->obj.pos.z, 1);
} else {
Matrix_Translate(gGfxMatrix, obj58->obj.pos.x, obj58->obj.pos.y, obj58->obj.pos.z, 1);
@@ -1476,7 +1480,7 @@ void func_8005F670(Vec3f* arg0) {
sp9C.y = arg0->y - D_80178374;
sp9C.z = arg0->z - D_80178378;
temp_fv0 = sqrtf(VEC3F_SQ(sp9C));
if (gPlayer[0].unk_1C8 == 2) {
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) {
var_fs0 = 700.0f / temp_fv0;
} else {
var_fs0 = 200.0f / temp_fv0;
@@ -1490,9 +1494,9 @@ void func_8005F670(Vec3f* arg0) {
sp94 = Math_Atan2F(sp9C.x, sp9C.z);
sp98 = -Math_Atan2F(sp9C.y, sqrtf(SQ(sp9C.x) + SQ(sp9C.z)));
Matrix_Push(&gCalcMatrix);
Matrix_RotateZ(gCalcMatrix, gPlayer[D_801778A0].unk_034 * D_80177950 * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, -gPlayer[D_801778A0].unk_05C, 1);
Matrix_RotateY(gCalcMatrix, gPlayer[D_801778A0].unk_058 + sp94, 1);
Matrix_RotateZ(gCalcMatrix, gPlayer[gPlayerNum].unk_034 * D_80177950 * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, -gPlayer[gPlayerNum].unk_05C, 1);
Matrix_RotateY(gCalcMatrix, gPlayer[gPlayerNum].unk_058 + sp94, 1);
Matrix_RotateX(gCalcMatrix, sp98, 1);
sp6C.x = 0.0f;
sp6C.y = 0.0f;
@@ -1511,11 +1515,11 @@ bool func_8005F9DC(Vec3f* arg0) {
Vec3f sp2C;
Vec3f sp20;
Matrix_RotateY(gCalcMatrix, gPlayer[D_801778A0].unk_058, 0);
Matrix_RotateX(gCalcMatrix, gPlayer[D_801778A0].unk_05C, 1);
sp2C.x = arg0->x - gPlayer[D_801778A0].unk_040.x;
sp2C.y = arg0->y - gPlayer[D_801778A0].unk_040.y;
sp2C.z = arg0->z - gPlayer[D_801778A0].unk_040.z;
Matrix_RotateY(gCalcMatrix, gPlayer[gPlayerNum].unk_058, 0);
Matrix_RotateX(gCalcMatrix, gPlayer[gPlayerNum].unk_05C, 1);
sp2C.x = arg0->x - gPlayer[gPlayerNum].camEye.x;
sp2C.y = arg0->y - gPlayer[gPlayerNum].camEye.y;
sp2C.z = arg0->z - gPlayer[gPlayerNum].camEye.z;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp2C, &sp20);
if ((sp20.z < 1000.0f) && (sp20.z > -13000.0f)) {
if (fabsf(sp20.x) < (fabsf(sp20.z * 0.4f) + 2000.0f)) {
@@ -1538,7 +1542,7 @@ void Object_DrawAll(s32 arg0) {
Item* item;
Object_80* obj80;
if ((gAllRangeMode == 1) && (gCurrentLevel != LEVEL_KATINA)) {
if ((gLevelMode == LEVELMODE_ALL_RANGE) && (gCurrentLevel != LEVEL_KATINA)) {
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
if (D_80177AB0 == 5) {
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
@@ -1573,7 +1577,7 @@ void Object_DrawAll(s32 arg0) {
}
for (i = 0, obj408 = gObjects408; i < ARRAY_COUNT(gObjects408); i++, obj408++) {
if ((obj408->obj.status >= 2) && (obj408->obj.id != OBJ_408_310)) {
if (!(obj408->unk_05C & 1)) {
if (!(obj408->timer_05C & 1)) {
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
} else {
RCP_SetupDL_27();
@@ -1606,7 +1610,7 @@ void Object_DrawAll(s32 arg0) {
}
for (i = 0, obj2F4 = gObjects2F4; i < ARRAY_COUNT(gObjects2F4); i++, obj2F4++) {
if (obj2F4->obj.status >= 2) {
if (!(obj2F4->unk_0C6 & 1)) {
if (!(obj2F4->timer_0C6 & 1)) {
if (gCurrentLevel == LEVEL_UNK_15) {
RCP_SetupDL_23();
} else {
@@ -1614,17 +1618,18 @@ void Object_DrawAll(s32 arg0) {
}
} else {
RCP_SetupDL_27();
if (obj2F4->unk_110 >= 0.0f) {
if (obj2F4->scale >= 0.0f) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} else {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 64, 64, 255, 255);
}
}
switch (gAllRangeMode) {
case 0:
case 2:
switch (gLevelMode) {
case LEVELMODE_ON_RAILS:
case LEVELMODE_UNK_2:
Matrix_Push(&gGfxMatrix);
if ((gPlayer[0].unk_1C8 == 2) || (gPlayer[0].unk_1C8 == 7) || (gCurrentLevel == LEVEL_AQUAS)) {
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) ||
(gCurrentLevel == LEVEL_AQUAS)) {
func_8005F670(&obj2F4->obj.pos);
}
func_800597C0(arg0);
@@ -1636,7 +1641,7 @@ void Object_DrawAll(s32 arg0) {
Matrix_Pop(&gGfxMatrix);
}
break;
case 1:
case LEVELMODE_ALL_RANGE:
Matrix_Push(&gGfxMatrix);
Object_2F4_Draw1(obj2F4);
Matrix_Pop(&gGfxMatrix);
@@ -1652,7 +1657,7 @@ void Object_DrawAll(s32 arg0) {
}
gDPSetFogColor(gMasterDisp++, gFogRed, gFogGreen, gFogBlue, gFogAlpha);
gSPFogPosition(gMasterDisp++, gFogNear, gFogFar);
Lights_SetOneLight(&gMasterDisp, -0x3C, -0x3C, 0x3C, 0x96, 0x96, 0x96, 0x14, 0x14, 0x14);
Lights_SetOneLight(&gMasterDisp, -60, -60, 60, 150, 150, 150, 20, 20, 20);
for (i = 0, item = gItems; i < ARRAY_COUNT(gItems); i++, item++) {
if (item->obj.status >= 2) {
Matrix_Push(&gGfxMatrix);
@@ -1675,10 +1680,10 @@ void func_8006046C(s32 arg0) {
for (i = 0, obj8C = gObjects8C; i < ARRAY_COUNT(gObjects8C); i++, obj8C++) {
if (obj8C->obj.status >= 2) {
if (obj8C->info.unk_14 == 1) {
obj8C->obj.rot.y = (-gPlayer[D_801778A0].unk_058 * 180.0f) / M_PI;
obj8C->obj.rot.x = (gPlayer[D_801778A0].unk_05C * 180.0f) / M_PI;
obj8C->obj.rot.y = (-gPlayer[gPlayerNum].unk_058 * 180.0f) / M_PI;
obj8C->obj.rot.x = (gPlayer[gPlayerNum].unk_05C * 180.0f) / M_PI;
}
if (gAllRangeMode == 1) {
if (gLevelMode == LEVELMODE_ALL_RANGE) {
Matrix_Push(&gGfxMatrix);
Object_8C_Draw2(obj8C);
Matrix_Pop(&gGfxMatrix);
@@ -1697,7 +1702,7 @@ void func_8006046C(s32 arg0) {
}
for (i = 0, obj408 = gObjects408; i < ARRAY_COUNT(gObjects408); i++, obj408++) {
if ((obj408->obj.status >= 2) && (obj408->obj.id == OBJ_408_310)) {
if (!(obj408->unk_05C & 1)) {
if (!(obj408->timer_05C & 1)) {
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
} else {
RCP_SetupDL_27();
@@ -1713,7 +1718,7 @@ void func_8006046C(s32 arg0) {
void func_80060714(s32 arg0) {
D_80161410 = 1;
Object_DrawAll(1);
if ((D_80161A88 == 2) && (gPlayer[0].unk_1C8 != 2)) {
if ((D_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) {
D_80161410 = -1;
Lights_SetOneLight(&gMasterDisp, gLight1x, -1 * gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR,
gAmbientG, gAmbientB);
@@ -1730,7 +1735,7 @@ void func_8006089C(u8 arg0) {
if (arg0 == 0) {
D_80161410 = 1;
func_8006046C(1);
} else if ((D_80161A88 == 2) && (gPlayer[0].unk_1C8 != 2)) {
} else if ((D_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) {
D_80161410 = -1;
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1);
@@ -1758,7 +1763,7 @@ void func_80060968(void) {
if (gCurrentLevel == LEVEL_MACBETH) {
RCP_SetupDL(&gMasterDisp, 0x21);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
} else if ((gCurrentLevel == LEVEL_AQUAS) || (gCurrentLevel == LEVEL_VENOM_2)) {
} else if ((gCurrentLevel == LEVEL_AQUAS) || (gCurrentLevel == LEVEL_VENOM_ANDROSS)) {
RCP_SetupDL(&gMasterDisp, 0x29);
} else {
RCP_SetupDL_14();
@@ -1774,7 +1779,7 @@ void func_80060968(void) {
Matrix_RotateZ(gGfxMatrix, ent30->unk_20, 1);
Matrix_Scale(gGfxMatrix, ent30->unk_28, ent30->unk_28, ent30->unk_24, 1);
if ((gCurrentLevel == LEVEL_AQUAS) || (gCurrentLevel == LEVEL_VENOM_2)) {
if ((gCurrentLevel == LEVEL_AQUAS) || (gCurrentLevel == LEVEL_VENOM_ANDROSS)) {
s32 alpha = (gFrameCount & 1) ? 180 : 50;
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, alpha);
@@ -1784,7 +1789,7 @@ void func_80060968(void) {
Matrix_RotateZ(gGfxMatrix, gFrameCount * 5.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_60119A0);
} else if (gCurrentLevel == LEVEL_VENOM_2) {
} else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.0025f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 25.0f * M_DTOR, 1);
src/main/fox_enmy.c
+255 -253
View File
File diff suppressed because it is too large Load Diff
src/main/fox_game.c
+47 -47
View File
@@ -5,7 +5,7 @@ extern void func_80187520(s32, void*);
f32 D_80161A10;
f32 D_80161A14;
s32 D_80161A18[4];
s32 gPlayerInactive[4];
s32 D_80161A28;
u8 D_80161A2C;
u16 D_80161A2E;
@@ -19,7 +19,7 @@ f32 D_80161A3C;
f32 D_80161A40;
f32 D_80161A44;
s32 D_800D2860[4] = { 1, 1, 1, 1 };
s32 D_800D2860[4] = { true, true, true, true };
s32 D_800D2870 = 0;
s32 D_800D2874[] = { 0, 160, 0, 160 };
s32 D_800D2884[] = { 159, 319, 159, 319 };
@@ -35,7 +35,7 @@ s32 sOverlaySetups[] = {
/* LEVEL_VENOM_1 */ OVL_SETUP_VENOM_1,
/* LEVEL_SOLAR */ OVL_SETUP_SOLAR,
/* LEVEL_ZONESS */ OVL_SETUP_ZONESS,
/* LEVEL_VENOM_2 */ OVL_SETUP_VENOM_2,
/* LEVEL_VENOM_ANDROSS */ OVL_SETUP_VENOM_ANDROSS,
/* LEVEL_TRAINING */ OVL_SETUP_TRAINING,
/* LEVEL_MACBETH */ OVL_SETUP_MACBETH,
/* LEVEL_TITANIA */ OVL_SETUP_TITANIA,
@@ -45,7 +45,7 @@ s32 sOverlaySetups[] = {
/* LEVEL_KATINA */ OVL_SETUP_KATINA,
/* LEVEL_BOLSE */ OVL_SETUP_BOLSE,
/* LEVEL_SECTOR_Z */ OVL_SETUP_SECTOR_Z,
/* LEVEL_VENOM_SW */ OVL_SETUP_VENOM_SW,
/* LEVEL_VENOM_2 */ OVL_SETUP_VENOM_2,
/* LEVEL_VERSUS */ OVL_SETUP_VERSUS,
};
@@ -54,7 +54,7 @@ void Game_Initialize(void) {
Rand_Init();
Rand_SetSeed(1, 29000, 9876);
gGameState = GSTATE_BOOT;
D_8017783C = 0;
D_Timer_8017783C = 0;
gBgColor = 0;
gBlurAlpha = 0xFF;
D_80161A3C = 45.0f;
@@ -81,27 +81,27 @@ void Game_SetGameState(void) {
D_80177854 = 0;
D_8017827C = D_80161A2E;
D_80161A2E = 0;
if ((D_8017827C != 0) && (gCurrentLevel != LEVEL_VENOM_2)) {
if ((D_8017827C != 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS)) {
D_8017782C = 0;
}
break;
case GSTATE_MAP:
D_80177B40 = 0;
break;
case GSTATE_STATE_5:
case GSTATE_GAME_OVER:
D_80177868 = 0;
break;
}
Memory_FreeAll();
func_800A6148();
gGameState = gNextGameState;
D_8017783C = 3;
D_Timer_8017783C = 3;
D_8015F924 = 0;
gNextGameState = GSTATE_NONE;
gOverlayStage = 0;
gFillScreenColor = gBgColor = 0;
D_80177D20 = 0.0f;
if ((gCurrentLevel == LEVEL_VENOM_SW) && (D_8017827C == 2)) {
if ((gCurrentLevel == LEVEL_VENOM_2) && (D_8017827C == 2)) {
gFillScreenColor = gBgColor = 0xFFFF;
D_80178348 = D_80178350 = D_80178354 = 255;
} else {
@@ -110,10 +110,10 @@ void Game_SetGameState(void) {
}
D_80178340 = 255;
D_80178380[0] = 0;
D_8017829C = 0;
gRadioState = 0;
D_80178428 = 0.0f;
gBlurAlpha = 255;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
func_8001AE58();
func_8001D400(0);
}
@@ -242,39 +242,39 @@ void func_800A1FB0(Gfx** arg0, u8 arg1, u8 arg2) {
}
void func_800A24DC(s32 arg0) {
switch (D_80177898) {
case 0:
switch (gDrawMode) {
case DRAWMODE_0:
break;
case 1:
case DRAWMODE_1:
func_8003DAF0();
func_80187520(0x68, NULL);
break;
case 2:
case DRAWMODE_2:
func_8003DAF0();
func_80187520(0x6C, NULL);
break;
case 3:
case DRAWMODE_3:
func_8003DAF0();
func_80187520(0x6A, NULL);
break;
case 4:
D_801778A0 = arg0;
case DRAWMODE_4:
gPlayerNum = arg0;
func_80057D00();
break;
case 5:
case DRAWMODE_5:
func_8003DAF0();
func_80187520(0x6E, NULL);
break;
case 6:
case DRAWMODE_6:
func_800C2190();
break;
case 7:
D_801778A0 = arg0;
case DRAWMODE_7:
gPlayerNum = arg0;
func_800A3CA0();
break;
case 8:
case DRAWMODE_8:
func_8003DAF0();
D_801778A0 = arg0;
gPlayerNum = arg0;
func_EF0260_8018AAC4();
break;
}
@@ -330,16 +330,16 @@ void func_800A26C0(void) {
if (func_800A1B6C() != true) {
Lib_Perspective(&gUnkDisp1);
func_800A1FB0(&gUnkDisp1, gCamCount, 0);
if (D_8017783C != 0) {
D_8017783C--;
if (D_Timer_8017783C != 0) {
D_Timer_8017783C--;
}
switch (gGameState) {
case GSTATE_BOOT:
D_8017783C = 2;
D_Timer_8017783C = 2;
gGameState++;
break;
case GSTATE_BOOT_WAIT:
if (D_8017783C == 0) {
if (D_Timer_8017783C == 0) {
gGameState++;
}
break;
@@ -385,21 +385,21 @@ void func_800A26C0(void) {
gLifeCount[0] = 2;
D_80177D20 = 0.0f;
D_8016170C = D_80177A80 = D_80177830 = D_80177838 = D_80177840 = D_80178754 = gVersusMode = D_80177AE0 =
D_80178410 = D_80177B40 = D_80177854 = D_8017784C = D_80177898 = D_80161734 = D_80161A2C =
gBgColor = D_80178340 = 0;
D_80178410 = D_80177B40 = D_80177854 = D_8017784C = gDrawMode = D_80161734 = D_80161A2C = gBgColor =
D_80178340 = 0;
gNextGameState = D_80177C94 = D_80177CAC = D_80177CB4 = D_80177CBC = D_80177CC4 = D_80177C9C =
D_80177CA4 = D_80161A5C = D_80161A34 = 0;
for (i = 0; i < 4; i++) {
D_80177908[i] = L_CBUTTONS;
D_80177928[i] = D_CBUTTONS;
D_80177938[i] = A_BUTTON;
D_80177948[i] = B_BUTTON;
gBoostButton[i] = L_CBUTTONS;
gBrakeButton[i] = D_CBUTTONS;
gShootButton[i] = A_BUTTON;
gBombButton[i] = B_BUTTON;
D_80177958[i] = 1.0f;
D_80177858[i] = 3;
D_80177870[i] = 0;
D_800D2860[i] = R_CBUTTONS;
D_800D2860[i] = true;
D_80178380[i] = 0;
}
gVersusStage = 0;
@@ -442,26 +442,26 @@ void func_800A26C0(void) {
func_8001D8A8(1, gVolumeSettings[1]);
func_8001D8A8(2, gVolumeSettings[2]);
break;
case GSTATE_TITLE: // title screen
case GSTATE_TITLE:
func_80187520(0x67, NULL);
break;
case GSTATE_MENU: // main menu
case GSTATE_MENU:
func_80187520(0x6B, NULL);
break;
case GSTATE_MAP: // world map
case GSTATE_MAP:
func_EBFBE0_8019E8D0();
break;
case GSTATE_VS_INIT: // vs mode
case GSTATE_VS_INIT:
func_800C20B0();
break;
case GSTATE_PLAY: // play
case GSTATE_PLAY:
func_800B86CC();
break;
case GSTATE_STATE_5: // world map
case GSTATE_GAME_OVER:
func_80187520(0x6D, NULL);
break;
case GSTATE_CREDITS: // credits
D_80177898 = 8;
case GSTATE_CREDITS:
gDrawMode = DRAWMODE_8;
func_EF0260_8018A96C();
break;
default:
@@ -473,7 +473,7 @@ void func_800A26C0(void) {
func_800A24DC(1);
gDPPipeSync(gMasterDisp++);
gDPSetScissor(gMasterDisp++, G_SC_NON_INTERLACE, 8, 8, SCREEN_WIDTH - 8, SCREEN_HEIGHT - 8);
} else if ((gCamCount == 4) && (D_80177898 != 0)) {
} else if ((gCamCount == 4) && (gDrawMode != DRAWMODE_0)) {
func_800A1FB0(&gMasterDisp, gCamCount, 3);
func_800A24DC(3);
func_800A1FB0(&gMasterDisp, gCamCount, 2);
@@ -491,7 +491,7 @@ void func_800A26C0(void) {
gDPFillRectangle(gMasterDisp++, SCREEN_WIDTH / 2 - 3, 8, SCREEN_WIDTH / 2 + 2, SCREEN_HEIGHT - 8);
gDPFillRectangle(gMasterDisp++, 8, SCREEN_HEIGHT / 2 - 3, SCREEN_WIDTH - 8, SCREEN_HEIGHT / 2 + 2);
if (gLevelType == LEVELTYPE_GROUND) {
if (gLevelType == LEVELTYPE_PLANET) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x0, 0, 0, 0, 255);
} else {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x0, 100, 100, 255, 255);
@@ -505,7 +505,7 @@ void func_800A26C0(void) {
if (gCamCount == 1) {
Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, D_80178390[0],
D_801783A0[0], D_801783B0[0], D_80178380[0]);
if ((D_80177898 == 4) || (D_80177898 == 8)) {
if ((gDrawMode == DRAWMODE_4) || (gDrawMode == DRAWMODE_8)) {
func_800BB5D0();
if (D_80161A2C != 0) {
func_8008FA84();
@@ -515,7 +515,7 @@ void func_800A26C0(void) {
}
} else {
for (i = 0; i < gCamCount; i++) {
if (gPlayer[i].unk_224 != 0) {
if (gPlayer[i].timer_224 != 0) {
Graphics_FillRectangle(&gMasterDisp, D_800D2874[i], D_800D2894[i], D_800D2884[i], D_800D28A4[i],
D_80178348, D_80178350, D_80178354, D_80178340);
src/main/fox_load.c
+6 -6
View File
@@ -3,7 +3,7 @@
#define SEGMENT_SIZE(segment) ((ptrdiff_t) ((uintptr_t) (segment).end - (uintptr_t) (segment).start))
u8 D_800CA3B0 = 3;
u8 sFillTimer = 3;
#include "fox_load_inits.c"
@@ -35,7 +35,7 @@ void Overlay_LoadSegment(void* vRomAddress, void* dest, ptrdiff_t size) {
Lib_DmaRead(gDmaTable[i].pRom.start, dest, size);
} else {
Lib_FillScreen(true);
D_800CA3B0 = 3;
sFillTimer = 3;
D_80161A39 = true;
Lib_DmaRead(gDmaTable[i].pRom.start, gFrameBuffers, SEGMENT_SIZE(gDmaTable[i].pRom));
Mio0_Decompress(gFrameBuffers, dest);
@@ -85,8 +85,8 @@ u8 Overlay_Init(OverlayInit* ovlInit) {
}
}
if (D_800CA3B0 != 0) {
D_800CA3B0--;
if (sFillTimer != 0) {
sFillTimer--;
} else if (gStartNMI == 0) {
Lib_FillScreen(false);
}
@@ -148,7 +148,7 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
case OVL_SETUP_ZONESS:
changeOvl = Overlay_Init(&sOvlE16C50_Zoness[ovlStage]);
break;
case OVL_SETUP_VENOM_2:
case OVL_SETUP_VENOM_ANDROSS:
changeOvl = Overlay_Init(&sOvlE9F1D0_Venom2[ovlStage]);
break;
case OVL_SETUP_TRAINING:
@@ -157,7 +157,7 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
case OVL_SETUP_VENOM_1:
changeOvl = Overlay_Init(&sOvlDF4260_Venom1[ovlStage]);
break;
case OVL_SETUP_VENOM_SW:
case OVL_SETUP_VENOM_2:
changeOvl = Overlay_Init(&sOvlE9F1D0_VenomSW[ovlStage]);
break;
case OVL_SETUP_20:
src/main/fox_message.c
-1
View File
@@ -115,7 +115,6 @@ void Message_DisplayScrollingText(Gfx** gfxPtr, u16* msgPtr, s32 xPos, s32 yPos,
s32 var_s2 = xPos;
s32 var_s4 = yPos;
s32 i;
// s32 var_v1;
gDPSetTextureLUT((*gfxPtr)++, G_TT_RGBA16);
gDPLoadTLUT((*gfxPtr)++, 64, 0x100, D_Tex_800DBA20);
src/main/fox_play.c
+3625 -617
View File
File diff suppressed because it is too large Load Diff
src/main/fox_radio.c
+83 -82
View File
@@ -74,7 +74,7 @@ void func_800BA808(u16* msg, s32 character) {
}
}
if ((D_8017829C != 0) && (func_800BA7BC(msg, priority) == 1)) {
if ((gRadioState != 0) && (func_800BA7BC(msg, priority) == 1)) {
return;
}
@@ -85,7 +85,7 @@ void func_800BA808(u16* msg, s32 character) {
D_80177D68 = RCID_FOX_EXPERT;
}
if (gCurrentLevel == LEVEL_VENOM_SW) {
if (gCurrentLevel == LEVEL_VENOM_2) {
switch (character) {
case RCID_WOLF:
D_80177D68 = RCID_WOLF_2;
@@ -103,7 +103,7 @@ void func_800BA808(u16* msg, s32 character) {
}
D_80178308 = msg;
D_8017829C = 100;
gRadioState = 100;
switch (gGameState) {
case GSTATE_TITLE:
@@ -245,55 +245,55 @@ void func_800BAAE8(void) {
case RCID_ANDREW_2_OPEN:
sp44 = D_F002D60;
break;
case RCID_BOSS_CORNERIA: // Corneria robot boss
case RCID_BOSS_CORNERIA:
sp44 = D_6026420;
break;
case RCID_BOSS_CORNERIA_OPEN:
sp44 = D_6027340;
break;
case RCID_BOSS_CORNERIA2: // Corneria secret boss
case RCID_BOSS_CORNERIA2:
sp44 = D_60245E0;
break;
case RCID_BOSS_CORNERIA2_OPEN:
sp44 = D_6025500;
break;
case RCID_BOSS_METEO: // Meteo Boss
case RCID_BOSS_METEO:
sp44 = D_601C8E0;
break;
case RCID_BOSS_METEO_OPEN:
sp44 = D_601D800;
break;
case RCID_BOSS_AREA6: // Area 6 Boss
case RCID_BOSS_AREA6:
sp44 = D_60047E0;
break;
case RCID_BOSS_AREA6_OPEN:
sp44 = D_6005700;
break;
case RCID_CAIMAN_AREA6: // Area 6 Caiman
case RCID_CAIMAN_AREA6:
sp44 = D_60029A0;
break;
case RCID_CAIMAN_AREA6_OPEN:
sp44 = D_60038C0;
break;
case RCID_BOSS_ZONESS: // Zoness boss
case RCID_BOSS_ZONESS:
sp44 = D_6014510;
break;
case RCID_BOSS_ZONESS_OPEN:
sp44 = D_6015430;
break;
case RCID_BOSS_SECTORX: // Sector X boss
case RCID_BOSS_SECTORX:
sp44 = D_6020FB0;
break;
case RCID_BOSS_SECTORX_OPEN:
sp44 = D_6021ED0;
break;
case RCID_BOSS_SECTORY: // Sector Y boss
case RCID_BOSS_SECTORY:
sp44 = D_6018F30;
break;
case RCID_BOSS_SECTORY_OPEN:
sp44 = D_6019E50;
break;
case RCID_BOSS_MACBETH: // Macbeth boss
case RCID_BOSS_MACBETH:
sp44 = D_6010C20;
break;
case RCID_BOSS_MACBETH_OPEN:
@@ -353,13 +353,13 @@ void func_800BAAE8(void) {
case RCID_PEPPER_OPEN:
sp44 = D_D008990;
break;
case RCID_ROB64_TITLE: // rob title?
case RCID_ROB64_TITLE:
sp44 = D_E00E100;
break;
case RCID_ROB64_TITLE_OPEN:
sp44 = D_E00F020;
break;
case RCID_PEPPER_TITLE: // pepper title?
case RCID_PEPPER_TITLE:
sp44 = D_E00FF40;
break;
case RCID_PEPPER_TITLE_OPEN:
@@ -474,30 +474,30 @@ void func_800BB5D0(void) {
if ((D_80177854 == 100) && (gGameState != GSTATE_CREDITS)) {
return;
}
if (D_801782AC > 0) {
D_801782AC--;
if (D_Timer_801782AC > 0) {
D_Timer_801782AC--;
}
if (D_801782B4 > 0) {
D_801782B4--;
if (D_Timer_801782B4 > 0) {
D_Timer_801782B4--;
}
switch (D_8017829C) {
switch (gRadioState) {
case 100:
D_80178748 = 1;
D_801782A4 = 1000;
D_8017829C = 1;
gRadioState = 1;
D_801782D8 = 0;
D_80177D38 = 0.0f;
D_80177D50 = 0.0f;
D_8017874C = 0;
if (gCamCount != 1) {
D_8017829C = 0;
gRadioState = 0;
}
break;
case 1:
D_80177D38 += 0.25f;
if (D_80177D38 == 1.0f) {
D_8017829C++;
D_801782AC = 10;
gRadioState++;
D_Timer_801782AC = 10;
}
D_801782A4 = 2;
if (gFrameCount & 1) {
@@ -505,9 +505,9 @@ void func_800BB5D0(void) {
}
break;
case 2:
if (D_801782AC == 0) {
D_8017829C++;
D_801782AC = 10;
if (D_Timer_801782AC == 0) {
gRadioState++;
D_Timer_801782AC = 10;
}
D_801782A4 = 2;
if (gFrameCount & 1) {
@@ -515,16 +515,16 @@ void func_800BB5D0(void) {
}
break;
case 3:
if (D_801782AC == 0) {
D_8017829C++;
if (D_Timer_801782AC == 0) {
gRadioState++;
temp_v0 = Message_GetWidth(D_80178308);
if (D_80137E78 == 3) {
D_801782AC = temp_v0 + 16;
D_Timer_801782AC = temp_v0 + 16;
} else {
D_801782AC = 2 * temp_v0 + 16;
D_Timer_801782AC = 2 * temp_v0 + 16;
}
if ((gGameState == GSTATE_TITLE) || (gGameState == GSTATE_CREDITS)) {
D_801782AC = temp_v0 * 2;
D_Timer_801782AC = temp_v0 * 2;
}
}
D_801782A4 = (s32) D_80177D68;
@@ -534,8 +534,8 @@ void func_800BB5D0(void) {
}
break;
case 31:
D_8017829C++;
D_801782AC = 80 - D_801782AC;
gRadioState++;
D_Timer_801782AC = 80 - D_Timer_801782AC;
break;
case 32:
if (func_8001AE78() == 0) {
@@ -545,26 +545,26 @@ void func_800BB5D0(void) {
D_801782D8 = 0;
D_8017874C = 0;
D_801782AC = 80;
D_801782AC = Message_GetWidth(D_80178308) * 2;
D_8017829C = 4;
D_Timer_801782AC = 80;
D_Timer_801782AC = Message_GetWidth(D_80178308) * 2;
gRadioState = 4;
}
break;
case 4:
if ((func_8001AE78() == 0) && (D_801782AC == 0)) {
D_801782AC = 10;
if ((func_8001AE78() == 0) && (D_Timer_801782AC == 0)) {
D_Timer_801782AC = 10;
D_801782A4 = (s32) D_80177D68;
D_8017829C = 6;
gRadioState = 6;
}
D_801782A4 = (s32) D_80177D68;
if (D_801782B4 > 0) {
if (D_Timer_801782B4 > 0) {
D_801782A4++;
}
temp_v0 = func_8001AED4();
if (D_801782D8 < 60) {
if (D_80178308[D_801782D8 + 1] == 15) {
if (temp_v0 == 0) {
D_8017829C = 31;
gRadioState = 31;
}
} else {
D_801782D8++;
@@ -573,33 +573,33 @@ void func_800BB5D0(void) {
if (D_8017874C != 0) {
if ((D_801782E8 >= 23000) && (D_801782E8 < 23033)) {
if (D_801782F8 != 0) {
D_801782B4 = 2;
func_80019218(0x49000017, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_Timer_801782B4 = 2;
Audio_PlaySfx(0x49000017, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
} else if (temp_v0 == 1) {
D_801782B4 = 2;
D_Timer_801782B4 = 2;
} else {
D_801782B4 = 0;
D_Timer_801782B4 = 0;
}
}
D_8017874C ^= 1;
break;
case 5:
if (D_801782AC == 0) {
D_8017829C++;
D_801782AC = 10;
if (D_Timer_801782AC == 0) {
gRadioState++;
D_Timer_801782AC = 10;
}
D_801782A4 = (s32) D_80177D68;
break;
case 6:
if (D_801782AC == 0) {
if (D_Timer_801782AC == 0) {
if (!D_801782A4) {}
if (gGameState == GSTATE_CREDITS) {
func_8001AE58();
} else {
func_8001ACDC(0);
}
D_8017829C++;
gRadioState++;
}
D_801782A4 = 2;
if (gFrameCount & 1) {
@@ -615,7 +615,7 @@ void func_800BB5D0(void) {
if (D_80177D38 == 0) {
D_80178300 = 0;
sCurrentMsgPri = 0;
D_8017829C = 0;
gRadioState = 0;
}
D_801782A4 = 2;
if (gFrameCount & 1) {
@@ -630,7 +630,7 @@ void func_800BB5D0(void) {
case 0:
break;
}
if ((D_8017829C > 0) && (D_8017829C != 100) && (D_80178300 == 0)) {
if ((gRadioState > 0) && (gRadioState != 100) && (D_80178300 == 0)) {
func_800BAAE8();
func_800BB388();
temp_ft0 = (s32) D_80177D68;
@@ -680,8 +680,9 @@ void func_800BB5D0(void) {
var_v1 = 0;
break;
}
if ((gObjects2F4[var_v1].obj.status != 2) && (gFrameCount & 4) && (gPlayer[0].unk_1C8 == 3) &&
(D_801782A4 != 2) && (D_801782A4 != 3) && (D_801782A4 != 1000)) {
if ((gObjects2F4[var_v1].obj.status != 2) && (gFrameCount & 4) &&
(gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (D_801782A4 != 2) && (D_801782A4 != 3) &&
(D_801782A4 != 1000)) {
RCP_SetupDL(&gMasterDisp, 0x4C);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN");
@@ -706,35 +707,35 @@ void func_800BB5D0(void);
void func_800BC040(void) {
if (D_80177854 != 100) {
if (D_801782AC > 0) {
D_801782AC--;
if (D_Timer_801782AC > 0) {
D_Timer_801782AC--;
}
if (D_801782B4 > 0) {
D_801782B4--;
if (D_Timer_801782B4 > 0) {
D_Timer_801782B4--;
}
switch (D_8017829C) {
switch (gRadioState) {
case 100:
D_801782A4 = 1000;
D_8017829C = 1;
gRadioState = 1;
D_80177D38 = 0.0f;
D_80177D50 = 0.0f;
D_801782D8 = Message_GetWidth(D_80178308);
if (gCamCount != 1) {
D_8017829C = 0;
gRadioState = 0;
}
break;
case 1:
D_80177D38 += 0.02f;
if (D_80177D38 == 0.04f) {
D_8017829C++;
D_801782AC = 5;
gRadioState++;
D_Timer_801782AC = 5;
}
break;
case 2:
if (D_801782AC == 0) {
D_8017829C++;
D_801782AC = 5;
if (D_Timer_801782AC == 0) {
gRadioState++;
D_Timer_801782AC = 5;
}
D_801782A4 = 2;
if (gFrameCount & 1) {
@@ -742,11 +743,11 @@ void func_800BC040(void) {
}
break;
case 3:
if (D_801782AC == 0) {
D_8017829C++;
D_801782AC = 5;
if (D_Timer_801782AC == 0) {
gRadioState++;
D_Timer_801782AC = 5;
if (gGameState == GSTATE_TITLE) {
D_801782AC = 30;
D_Timer_801782AC = 30;
}
}
D_801782A4 = (s32) D_80177D68;
@@ -756,22 +757,22 @@ void func_800BC040(void) {
}
break;
case 4:
if (D_801782AC == 0) {
D_8017829C++;
D_801782AC = 10;
if (D_Timer_801782AC == 0) {
gRadioState++;
D_Timer_801782AC = 10;
}
break;
case 5:
if (D_801782AC == 0) {
D_8017829C++;
D_801782AC = 5;
if (D_Timer_801782AC == 0) {
gRadioState++;
D_Timer_801782AC = 5;
}
D_801782A4 = (s32) D_80177D68;
break;
case 6:
if (D_801782AC == 0) {
if (D_Timer_801782AC == 0) {
func_8001ACDC(0);
D_8017829C++;
gRadioState++;
}
D_801782A4 = 2;
if (gFrameCount & 1) {
@@ -785,8 +786,8 @@ void func_800BC040(void) {
case 7:
D_80177D38 -= 0.02f;
if (D_80177D38 == 0) {
D_8017829C = 0;
D_801782AC = 5;
gRadioState = 0;
D_Timer_801782AC = 5;
}
D_801782A4 = 2;
if (gFrameCount & 1) {
@@ -796,7 +797,7 @@ void func_800BC040(void) {
case 0:
break;
}
if ((D_8017829C > 0) && (D_8017829C != 100)) {
if ((gRadioState > 0) && (gRadioState != 100)) {
func_800BAAE8();
func_800BB388();
if (((s32) D_80177D68 == RCID_FALCO) || ((s32) D_80177D68 == RCID_SLIPPY) ||
@@ -806,7 +807,7 @@ void func_800BC040(void) {
Matrix_Translate(gGfxMatrix, -150.0f, -115.0f, -443.0f, 1);
Matrix_Scale(gGfxMatrix, 0.068f, 0.068f, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
D_801778A0 = 0;
gPlayerNum = 0;
Matrix_Pop(&gGfxMatrix);
}
}
src/main/sf_2EFE0.c
+5 -5
View File
@@ -5,7 +5,7 @@ void func_80187520(s32, void*);
void func_8002E3E0(Object_2F4* obj2F4) {
s32 hits = 0;
if (gCurrentLevel == LEVEL_VENOM_SW) {
if (gCurrentLevel == LEVEL_VENOM_2) {
if (D_8015F940 < 0xF00) {
hits = 50;
} else if (D_8015F940 < 0x1680) {
@@ -34,7 +34,7 @@ void func_8002E3E0(Object_2F4* obj2F4) {
}
s32 func_8002E4F8(u16* arg0, s32 arg1) {
if ((D_8017829C == 0) && (gPlayer[0].unk_1C8 != 0)) {
if ((gRadioState == 0) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) {
func_800BA808(arg0, arg1);
return true;
} else {
@@ -48,7 +48,7 @@ void func_8002E548(void) {
func_8008E51C(D_8015F930, D_8015F944);
if ((D_8015F930[0] == 0) && (sp24 != D_8015F930[1]) && (D_8015F930[1] < 15)) {
func_80019218(0x4900C02A, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x4900C02A, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
}
}
@@ -90,7 +90,7 @@ void func_8002E6DC(Object_2F4* obj408) {
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002ED60.s")
void func_8002EE34(void) {
D_8015F904 = D_8017829C = gObjects2F4[1].unk_054 = gObjects2F4[2].unk_054 = gObjects2F4[3].unk_054 = 0;
D_8015F904 = gRadioState = gObjects2F4[1].unk_054 = gObjects2F4[2].unk_054 = gObjects2F4[3].unk_054 = 0;
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002EE64.s")
@@ -103,7 +103,7 @@ void func_8002EE34(void) {
void func_8002F64C(void) {
if ((D_80177CD0[0] + D_80177CD0[1] + D_80177CD0[2] + D_80177CD0[3]) == 0) {
D_8017829C = 0;
gRadioState = 0;
}
func_8002F5F4();
}
src/main/sf_3E6F0.c
+1 -1
View File
@@ -1,4 +1,4 @@
#include "common.h"
#include "global.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_3E6F0/func_8003DAF0.s")
src/main/sf_77E40.c
+145 -144
View File
@@ -29,11 +29,11 @@ void func_8007729C(void) {
if (ent1C->timer == 0) {
ent1C->hits = 0;
}
if (gAllRangeMode == 0) {
if (gLevelMode == LEVELMODE_ON_RAILS) {
ent1C->pos.z -= D_80177D08;
} else if (gPlayer[0].unk_1C8 == 3) {
ent1C->pos.x += gPlayer[0].unk_0C0.x;
ent1C->pos.z += gPlayer[0].unk_0C0.z;
} else if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) {
ent1C->pos.x += gPlayer[0].vel.x;
ent1C->pos.z += gPlayer[0].vel.z;
}
if (ent1C->timer < 45) {
Math_SmoothStepToF(&ent1C->unk_10, 300.0f, 0.1f, 20.0f, 0.0f);
@@ -55,8 +55,8 @@ void func_80077404(UnkEntity1C* ent1C) {
if ((fabsf(sp54.x) < 20000.0f) && (fabsf(sp54.y) < 20000.0f)) {
if ((sp54.z < 0.0f) && (sp54.z > -20000.0f)) {
sp50 = sqrtf(VEC3F_SQ(sp54)) * 0.0015f * 0.2f;
Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[D_801778A0].unk_05C, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1);
Matrix_Scale(gGfxMatrix, sp50, sp50, 1.0f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, ent1C->unk_10, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
@@ -138,9 +138,9 @@ void func_800778C4(Object_8C* obj8C, f32 posX, f32 posY, f32 posZ, f32 arg4, f32
obj8C->unk_54.x = arg4;
obj8C->unk_54.y = arg5;
obj8C->unk_54.z = arg6;
obj8C->unk_70 = arg7;
obj8C->scale2 = arg7;
obj8C->unk_4C = 0;
obj8C->unk_6C = 0.5f;
obj8C->scale1 = 0.5f;
obj8C->obj.rot.z = Rand_ZeroOne() * 360.0f;
Object_SetInfo(&obj8C->info, obj8C->obj.id);
obj8C->unk_44 = 0xFF;
@@ -158,7 +158,7 @@ void func_8007797C(f32 posX, f32 posY, f32 posZ, f32 arg3, f32 arg4, f32 arg5, f
}
void func_80077A00(Object_8C* obj8C) {
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, obj8C->unk_44);
gSPDisplayList(gMasterDisp++, D_3016B30);
}
@@ -167,7 +167,7 @@ void func_80077A7C(Object_8C* obj8C) {
RCP_SetupDL_49();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, obj8C->unk_44);
gDPSetEnvColor(gMasterDisp++, 255, 255, 255, obj8C->unk_44);
Matrix_Scale(gGfxMatrix, obj8C->unk_6C, obj8C->unk_70, 1.0f, 1);
Matrix_Scale(gGfxMatrix, obj8C->scale1, obj8C->scale2, 1.0f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 20.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6024220);
@@ -178,8 +178,9 @@ void func_80077B78(Object_8C* obj8C) {
}
void func_80077B84(Object_8C* obj8C) {
func_8005980C(obj8C->unk_70);
if ((obj8C->unk_6C == 71.0f) || ((gPlayer[0].unk_1C8 == 7) && (gCurrentLevel == LEVEL_CORNERIA))) {
Graphics_SetScaleMtx(obj8C->scale2);
if ((obj8C->scale1 == 71.0f) ||
((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) && (gCurrentLevel == LEVEL_CORNERIA))) {
RCP_SetupDL(&gMasterDisp, 0x26);
} else {
RCP_SetupDL(&gMasterDisp, 0x43);
@@ -247,7 +248,7 @@ void func_80077B84(Object_8C* obj8C) {
}
void func_80078038(Object_8C* obj8C) {
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
RCP_SetupDL_49();
RCP_SetupDL(&gMasterDisp, 0x26);
gDPSetPrimColor(gMasterDisp++, 0, 0, 64, 192, 255, obj8C->unk_44);
@@ -270,7 +271,7 @@ void func_800780F8(Object_8C* obj8C) {
} else {
gDPSetPrimColor(gMasterDisp++, 0, 0, 96, 96, 255, 255);
}
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
for (i = 0; i < 10; i++) {
if ((i >= obj8C->unk_48) && (i < obj8C->unk_46)) {
Matrix_Push(&gGfxMatrix);
@@ -287,19 +288,19 @@ void func_800780F8(Object_8C* obj8C) {
void func_800783C0(Object_8C* obj8C) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, obj8C->unk_44);
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
gSPDisplayList(gMasterDisp++, D_2006F50);
}
void func_80078438(Object_8C* obj8C) {
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, obj8C->unk_4A);
gSPDisplayList(gMasterDisp++, D_102A8A0);
}
void func_800784B4(Object_8C* obj8C) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, obj8C->unk_46);
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
Matrix_RotateX(gGfxMatrix, (M_PI / 2.0f), 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_200D750);
@@ -307,7 +308,7 @@ void func_800784B4(Object_8C* obj8C) {
void func_80078550(Object_8C* obj8C) {
RCP_SetupDL(&gMasterDisp, 0x43);
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, obj8C->unk_4A);
gDPSetEnvColor(gMasterDisp++, 101, 138, 153, 255);
gSPDisplayList(gMasterDisp++, D_3000660);
@@ -315,8 +316,8 @@ void func_80078550(Object_8C* obj8C) {
}
void func_80078604(Object_8C* obj8C) {
if (obj8C->unk_50 == 0) {
func_8005980C(obj8C->unk_70);
if (obj8C->timer_50 == 0) {
Graphics_SetScaleMtx(obj8C->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, obj8C->unk_44);
gSPDisplayList(gMasterDisp++, D_20112C0);
}
@@ -325,7 +326,7 @@ void func_80078604(Object_8C* obj8C) {
void func_8007868C(Object_8C* obj8C) {
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Matrix_Scale(gGfxMatrix, obj8C->unk_70, obj8C->unk_70, obj8C->unk_70, 1);
Matrix_Scale(gGfxMatrix, obj8C->scale2, obj8C->scale2, obj8C->scale2, 1);
if (obj8C->unk_44 >= 2) {
Matrix_RotateX(gGfxMatrix, (M_PI / 2.0f), 1);
}
@@ -337,7 +338,7 @@ void func_8007868C(Object_8C* obj8C) {
void func_8007879C(Object_8C* obj8C) {
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Matrix_Scale(gGfxMatrix, obj8C->unk_70 * 0.6f, 1.0f, obj8C->unk_70 * 3.5f, 1);
Matrix_Scale(gGfxMatrix, obj8C->scale2 * 0.6f, 1.0f, obj8C->scale2 * 3.5f, 1);
Matrix_RotateX(gGfxMatrix, (M_PI / 2.0f), 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1029780);
@@ -350,17 +351,17 @@ void func_800788B0(Object_8C* obj8C) {
switch (gCurrentLevel) {
case LEVEL_METEO:
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 128, 128, 128, 255);
gSPDisplayList(gMasterDisp++, D_601FF80);
break;
case LEVEL_AQUAS:
RCP_SetupDL(&gMasterDisp, 0x43);
temp_ft3 = Math_ModF(obj8C->index, 4.0f);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) obj8C->unk_6C);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) obj8C->scale1);
tmp = &D_800D173C[(s32) (temp_ft3 * 4.0f)];
gDPSetEnvColor(gMasterDisp++, tmp[0], tmp[1], tmp[2], 255);
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
gSPDisplayList(gMasterDisp++, D_1024AC0);
RCP_SetupDL(&gMasterDisp, 0x40);
break;
@@ -368,7 +369,7 @@ void func_800788B0(Object_8C* obj8C) {
}
void func_80078A64(Object_8C* obj8C) {
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, obj8C->unk_44);
gSPDisplayList(gMasterDisp++, D_20112C0);
}
@@ -378,7 +379,7 @@ void func_80078AE0(void* obj8C) {
void func_80078AEC(Object_8C* obj8C) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 180);
func_8005980C(obj8C->unk_70 * (13.0f + ((gFrameCount & 1) * 2.5f)));
Graphics_SetScaleMtx(obj8C->scale2 * (13.0f + ((gFrameCount & 1) * 2.5f)));
gSPDisplayList(gMasterDisp++, D_102ED50);
}
@@ -396,19 +397,19 @@ void func_80078BE0(Object_8C* obj8C) {
if (gFrameCount & 1) {
var_fv0 *= 1.2f;
}
func_8005980C(obj8C->unk_70 * var_fv0);
Graphics_SetScaleMtx(obj8C->scale2 * var_fv0);
gSPDisplayList(gMasterDisp++, D_600F8A0);
}
void func_80078C84(Object_8C* obj8C) {
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 192);
gSPDisplayList(gMasterDisp++, D_6000A80);
}
void func_80078CE8(Object_8C* obj8C) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, obj8C->unk_4A);
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
gSPDisplayList(gMasterDisp++, D_6033000);
}
@@ -419,7 +420,7 @@ void func_80078D60(Object_8C* obj8C, f32 posX, f32 posY, f32 posZ, f32 arg4) {
obj8C->obj.pos.x = posX;
obj8C->obj.pos.y = posY;
obj8C->obj.pos.z = posZ;
obj8C->unk_70 = arg4;
obj8C->scale2 = arg4;
if (arg4 == 3.1f) {
obj8C->unk_54.x = gObjects2F4[8].unk_0E8.x;
obj8C->unk_54.y = gObjects2F4[8].unk_0E8.y;
@@ -431,7 +432,7 @@ void func_80078D60(Object_8C* obj8C, f32 posX, f32 posY, f32 posZ, f32 arg4) {
if (arg4 == 3.5f) {
obj8C->unk_4E = 2;
}
obj8C->unk_50 = 0xE;
obj8C->timer_50 = 0xE;
Object_SetInfo(&obj8C->info, obj8C->obj.id);
}
@@ -448,17 +449,17 @@ void func_80078E50(f32 posX, f32 posY, f32 posZ, f32 arg3) {
void func_80078EBC(Object_8C* obj8C) {
if (obj8C->unk_4E == 2) {
obj8C->unk_54.x = gPlayer[0].unk_0C0.x;
obj8C->unk_54.y = gPlayer[0].unk_0C0.y;
obj8C->unk_54.z = gPlayer[0].unk_0C0.z;
obj8C->unk_54.x = gPlayer[0].vel.x;
obj8C->unk_54.y = gPlayer[0].vel.y;
obj8C->unk_54.z = gPlayer[0].vel.z;
}
obj8C->obj.rot.z += 35.0f;
if (obj8C->unk_50 >= 7) {
obj8C->unk_6C += 0.25f;
if (obj8C->timer_50 >= 7) {
obj8C->scale1 += 0.25f;
} else {
obj8C->unk_6C -= 0.25f;
obj8C->scale1 -= 0.25f;
}
if (obj8C->unk_6C <= 0.0f) {
if (obj8C->scale1 <= 0.0f) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
}
}
@@ -471,7 +472,7 @@ void func_80078F78(Object_8C* obj8C) {
}
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 255, 0, 255);
func_8005980C(obj8C->unk_70 * obj8C->unk_6C);
Graphics_SetScaleMtx(obj8C->scale2 * obj8C->scale1);
gSPDisplayList(gMasterDisp++, D_101C2E0);
RCP_SetupDL(&gMasterDisp, 0x40);
}
@@ -502,9 +503,9 @@ void func_8007905C(Object_8C* obj8C, f32 posX, f32 posY, f32 posZ, f32 arg4, u8
obj8C->unk_54.x = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj8C->unk_54.z = (Rand_ZeroOne() - 0.5f) * 10.0f;
} else if ((gCurrentLevel == LEVEL_BOLSE) && ((arg4 == 5.11f) || (arg4 == 7.22f))) {
sp3C.x = gPlayer[0].unk_074;
sp3C.y = gPlayer[0].unk_078;
sp3C.z = gPlayer[0].unk_07C;
sp3C.x = gPlayer[0].pos.x;
sp3C.y = gPlayer[0].pos.y;
sp3C.z = gPlayer[0].pos.z;
yAng = Math_Atan2F(sp3C.x - posX, sp3C.z - posZ);
sp38 = sqrtf(SQ(sp3C.x - posX) + SQ(sp3C.z - posZ));
xAng = -Math_Atan2F(sp3C.y - posY, sp38);
@@ -519,12 +520,12 @@ void func_8007905C(Object_8C* obj8C, f32 posX, f32 posY, f32 posZ, f32 arg4, u8
obj8C->unk_54.z = sp48.z;
} else {
obj8C->unk_54.y =
(gLevelType == LEVELTYPE_GROUND) ? (Rand_ZeroOne() * 7.0f) + 7.0f : (Rand_ZeroOne() - 0.5f) * 10.0f;
(gLevelType == LEVELTYPE_PLANET) ? (Rand_ZeroOne() * 7.0f) + 7.0f : (Rand_ZeroOne() - 0.5f) * 10.0f;
obj8C->unk_54.x = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj8C->unk_54.z = (Rand_ZeroOne() - 0.5f) * 10.0f;
}
obj8C->unk_70 = ((Rand_ZeroOne() * 0.8f) + 0.3f) * arg4;
obj8C->unk_50 = (s32) (Rand_ZeroOne() * 50.0f) + 0x46;
obj8C->scale2 = ((Rand_ZeroOne() * 0.8f) + 0.3f) * arg4;
obj8C->timer_50 = (s32) (Rand_ZeroOne() * 50.0f) + 0x46;
obj8C->obj.rot.x = Rand_ZeroOne() * 360.0f;
obj8C->unk_60.x = (Rand_ZeroOne() - 0.5f) * 30.0f;
obj8C->unk_60.y = (Rand_ZeroOne() - 0.5f) * 30.0f;
@@ -578,24 +579,24 @@ void func_80079618(f32 posX, f32 posY, f32 posZ, f32 arg3) {
void func_8007968C(Object_8C* obj8C) {
if ((gCurrentLevel != LEVEL_MACBETH) || (obj8C->unk_44 != 7)) {
if ((obj8C->unk_50 == 0) || (obj8C->obj.pos.y < D_80177940)) {
if ((obj8C->timer_50 == 0) || (obj8C->obj.pos.y < D_80177940)) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
}
} else {
if (!(gFrameCount & 3)) {
func_8007D2C8(obj8C->obj.pos.x, obj8C->obj.pos.y + 550.0f, obj8C->obj.pos.z, 10.0f);
}
if ((obj8C->unk_50 == 0) || (obj8C->obj.pos.y < (D_80177940 - 100.0f))) {
if ((obj8C->timer_50 == 0) || (obj8C->obj.pos.y < (D_80177940 - 100.0f))) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
}
}
obj8C->obj.rot.x += obj8C->unk_60.x;
obj8C->obj.rot.y += obj8C->unk_60.y;
obj8C->obj.rot.z += obj8C->unk_60.z;
if (gLevelType == LEVELTYPE_GROUND) {
if (gLevelType == LEVELTYPE_PLANET) {
obj8C->unk_54.y -= 0.5f;
}
if ((gCurrentLevel == LEVEL_BOLSE) && (gPlayer[0].unk_1C8 == 7) && (D_80177A80 >= 176)) {
if ((gCurrentLevel == LEVEL_BOLSE) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) && (D_80177A80 >= 176)) {
obj8C->unk_54.x *= 0.95f;
obj8C->unk_54.y *= 0.95f;
obj8C->unk_54.z *= 0.95f;
@@ -603,10 +604,10 @@ void func_8007968C(Object_8C* obj8C) {
if ((gCurrentLevel == LEVEL_MACBETH) && (obj8C->unk_44 == 10)) {
obj8C->obj.rot.x = 0.0f;
obj8C->obj.rot.y = 0.0f;
if (obj8C->unk_50 >= 25) {
obj8C->unk_6C = 0.5f;
} else if (obj8C->unk_6C > 0.03) {
obj8C->unk_6C -= 0.02f;
if (obj8C->timer_50 >= 25) {
obj8C->scale1 = 0.5f;
} else if (obj8C->scale1 > 0.03) {
obj8C->scale1 -= 0.02f;
}
}
}
@@ -621,14 +622,14 @@ s32 func_800798C4(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) {
void func_800798F0(Object_8C* obj8C) {
Vec3f frameJointTable[50];
if ((gCurrentLevel == LEVEL_BOLSE) && (gPlayer[0].unk_1C8 == 7)) {
if ((gCurrentLevel == LEVEL_BOLSE) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7)) {
func_8005F670(&obj8C->obj.pos);
}
RCP_SetupDL(&gMasterDisp, 0x1D);
if (gCurrentLevel == LEVEL_KATINA) {
gSPFogPosition(gMasterDisp++, gFogNear, 1005);
}
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
switch (gCurrentLevel) {
case LEVEL_MACBETH:
switch (obj8C->unk_44) {
@@ -666,7 +667,7 @@ void func_800798F0(Object_8C* obj8C) {
RCP_SetupDL(&gMasterDisp, 0x43);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 80, 0, 255);
func_8005980C(obj8C->unk_6C);
Graphics_SetScaleMtx(obj8C->scale1);
gSPDisplayList(gMasterDisp++, D_1024AC0);
break;
case 11:
@@ -761,19 +762,19 @@ void func_8007A28C(Object_8C* obj8C) {
Texture_Scroll(D_10190C0, 16, 32, 0);
D_8017812C = 2;
obj8C->obj.rot.y += 1.0f;
Math_SmoothStepToF(&obj8C->unk_70, obj8C->unk_6C, 0.05f, 1.5f, 0.001f);
if (obj8C->unk_50 >= 0xB) {
Math_SmoothStepToF(&obj8C->scale2, obj8C->scale1, 0.05f, 1.5f, 0.001f);
if (obj8C->timer_50 >= 0xB) {
D_801779A8[0] = 60.0f;
}
if (obj8C->unk_50 == 48) {
if (obj8C->timer_50 == 48) {
D_80178340 = 150;
}
if (obj8C->unk_50 > 45) {
if (obj8C->timer_50 > 45) {
D_80178358 = 0;
D_80178348 = D_80178350 = D_80178354 = 255;
}
D_8017835C = 3;
if (obj8C->unk_50 == 0) {
if (obj8C->timer_50 == 0) {
obj8C->unk_44 -= 2;
if (obj8C->unk_44 < 0) {
obj8C->unk_44 = 0;
@@ -785,7 +786,7 @@ void func_8007A28C(Object_8C* obj8C) {
void func_8007A3C0(Object_8C* obj8C) {
if (D_80161410 > 0) {
Matrix_Scale(gGfxMatrix, obj8C->unk_70, obj8C->unk_70, obj8C->unk_70, 1);
Matrix_Scale(gGfxMatrix, obj8C->scale2, obj8C->scale2, obj8C->scale2, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_64_2();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, obj8C->unk_44);
@@ -800,13 +801,13 @@ void func_8007A4B8(Object_8C* obj8C, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
Object_8C_Initialize(obj8C);
obj8C->obj.status = 1;
obj8C->obj.id = OBJ_8C_383;
obj8C->unk_6C = arg4;
obj8C->unk_50 = 50;
obj8C->scale1 = arg4;
obj8C->timer_50 = 50;
obj8C->unk_44 = 200;
obj8C->obj.pos.x = xPos;
obj8C->obj.pos.y = yPos;
obj8C->obj.pos.z = zPos;
func_80019218(0x2940F026, &obj8C->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x2940F026, &obj8C->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Object_SetInfo(&obj8C->info, obj8C->obj.id);
}
@@ -829,19 +830,19 @@ void func_8007A5F8(Object_8C* obj8C, Vec3f* arg1, u32 arg2) {
obj8C->obj.pos.x = arg1->x;
obj8C->obj.pos.y = arg1->y;
obj8C->obj.pos.z = arg1->z;
obj8C->unk_50 = 50;
obj8C->timer_50 = 50;
if ((arg2 == 0x1903400F) || (arg2 == 0x11000055)) {
func_80019218(arg2, &obj8C->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(arg2, &obj8C->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (arg2 == 0x11000055) {
obj8C->unk_50 = 300;
obj8C->timer_50 = 300;
}
} else {
func_80019218(arg2, &obj8C->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(arg2, &obj8C->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
Object_SetInfo(&obj8C->info, obj8C->obj.id);
}
void func_8007A6F0(Vec3f* arg0, u32 arg1) {
void func_8007A6F0(Vec3f* arg0, s32 arg1) {
s32 i;
for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) {
@@ -853,15 +854,15 @@ void func_8007A6F0(Vec3f* arg0, u32 arg1) {
}
void func_8007A748(Object_8C* obj8C) {
if (obj8C->unk_50 == 0) {
if (obj8C->timer_50 == 0) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
}
}
s32 func_8007A774(Player* player, Object_8C* obj8C, f32 arg2) {
if ((fabsf(player->unk_138 - obj8C->obj.pos.z) < arg2) && (fabsf(player->unk_074 - obj8C->obj.pos.x) < arg2) &&
(fabsf(player->unk_078 - obj8C->obj.pos.y) < arg2) && (player->unk_498 == 0)) {
func_800A6CD0(player, 0, obj8C->info.damage);
if ((fabsf(player->unk_138 - obj8C->obj.pos.z) < arg2) && (fabsf(player->pos.x - obj8C->obj.pos.x) < arg2) &&
(fabsf(player->pos.y - obj8C->obj.pos.y) < arg2) && (player->timer_498 == 0)) {
Player_ApplyDamage(player, 0, obj8C->info.damage);
return 1;
} else {
return 0;
@@ -875,7 +876,7 @@ void func_8007A818(Object_8C* obj8C, f32 posX, f32 posY, f32 posZ, f32 arg4, u8
obj8C->obj.pos.x = posX;
obj8C->obj.pos.y = posY;
obj8C->obj.pos.z = posZ;
obj8C->unk_6C = arg4;
obj8C->scale1 = arg4;
obj8C->unk_44 = arg5;
obj8C->unk_46 = arg6;
obj8C->unk_60.z = (Rand_ZeroOne() - 0.5f) * 10.0f;
@@ -900,7 +901,7 @@ void func_8007A900(f32 posX, f32 posY, f32 posZ, f32 arg3, u8 arg4, u8 arg5, u16
}
void func_8007A994(Object_8C* obj8C) {
Math_SmoothStepToF(&obj8C->unk_70, obj8C->unk_6C, 0.1f, 10.0f, 0.01f);
Math_SmoothStepToF(&obj8C->scale2, obj8C->scale1, 0.1f, 10.0f, 0.01f);
obj8C->obj.rot.z += obj8C->unk_60.z;
obj8C->unk_54.y += obj8C->unk_60.y;
if (obj8C->unk_4A & 1) {
@@ -925,7 +926,7 @@ void func_8007AA60(Object_8C* obj8C) {
RCP_SetupDL(&gMasterDisp, 0x44);
gDPSetPrimColor(gMasterDisp++, 0, 0, 31, 10, 00, obj8C->unk_44);
gDPSetEnvColor(gMasterDisp++, 141, 73, 5, 0);
Matrix_Scale(gGfxMatrix, obj8C->unk_70, obj8C->unk_70, 1.0f, 1);
Matrix_Scale(gGfxMatrix, obj8C->scale2, obj8C->scale2, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_800D178C[obj8C->unk_4C]);
obj8C->unk_4C = obj8C->unk_48;
@@ -934,13 +935,13 @@ void func_8007AA60(Object_8C* obj8C) {
void func_8007AB50(Object_8C* obj8C) {
if (obj8C->unk_4E == 0) {
Math_SmoothStepToF(&obj8C->unk_70, obj8C->unk_6C, 0.1f, 10.0f, 0.0f);
Math_SmoothStepToF(&obj8C->scale2, obj8C->scale1, 0.1f, 10.0f, 0.0f);
obj8C->unk_44 -= 20;
if (obj8C->unk_44 < 0) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
}
} else {
Math_SmoothStepToF(&obj8C->unk_70, obj8C->unk_6C, 0.1f, 10.0f, 0.0f);
Math_SmoothStepToF(&obj8C->scale2, obj8C->scale1, 0.1f, 10.0f, 0.0f);
obj8C->unk_44 -= 10;
if (obj8C->unk_44 < 0) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
@@ -956,11 +957,11 @@ void func_8007AC0C(Object_8C* obj8C, f32 posX, f32 unused_posY, f32 posZ, f32 ar
obj8C->obj.pos.y = D_80177940;
obj8C->obj.pos.z = posZ;
obj8C->unk_44 = 0xB4;
obj8C->unk_70 = arg4;
obj8C->unk_6C = arg5;
obj8C->scale2 = arg4;
obj8C->scale1 = arg5;
obj8C->obj.rot.y = arg6;
obj8C->unk_54.x = gPlayer[0].unk_0C0.x * 0.6f;
obj8C->unk_54.z = gPlayer[0].unk_0C0.z * 0.6; // Forgotten f means bad codegen
obj8C->unk_54.x = gPlayer[0].vel.x * 0.6f;
obj8C->unk_54.z = gPlayer[0].vel.z * 0.6; // Forgotten f means bad codegen
Object_SetInfo(&obj8C->info, obj8C->obj.id);
}
@@ -984,8 +985,8 @@ void func_8007AD58(Object_8C* obj8C, f32 posX, f32 unused_posY, f32 posZ, f32 ar
obj8C->obj.pos.y = D_80177940;
obj8C->obj.pos.z = posZ;
obj8C->unk_44 = 0xB4;
obj8C->unk_70 = arg4;
obj8C->unk_6C = arg5;
obj8C->scale2 = arg4;
obj8C->scale1 = arg5;
obj8C->obj.rot.y = arg6;
Object_SetInfo(&obj8C->info, obj8C->obj.id);
}
@@ -1018,8 +1019,8 @@ void func_8007AF30(Object_8C* obj8C, f32 posX, f32 posZ, f32 arg3, f32 arg4, f32
obj8C->obj.pos.z = posZ;
obj8C->unk_54.x = arg3;
obj8C->unk_54.z = arg4 - D_80177D08;
obj8C->unk_6C = arg5;
obj8C->unk_50 = 0x64;
obj8C->scale1 = arg5;
obj8C->timer_50 = 0x64;
Object_SetInfo(&obj8C->info, obj8C->obj.id);
}
@@ -1039,17 +1040,17 @@ void func_8007B040(Object_8C* obj8C) {
s32 sp28;
if (func_800A73E4(&sp2C, &sp28, obj8C->obj.pos.x, obj8C->obj.pos.y, obj8C->obj.pos.z)) {
D_801782EC[sp28] = obj8C->unk_6C;
D_801782EC[sp28 + 1] = obj8C->unk_6C * 0.7f;
D_801782EC[sp28 - 1] = obj8C->unk_6C * 0.7f;
D_801782EC[sp28] = obj8C->scale1;
D_801782EC[sp28 + 1] = obj8C->scale1 * 0.7f;
D_801782EC[sp28 - 1] = obj8C->scale1 * 0.7f;
}
if (obj8C->unk_50 == 0) {
if (obj8C->timer_50 == 0) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
}
}
void func_8007B0F4(Object_8C* obj8C) {
Math_SmoothStepToF(&obj8C->unk_70, obj8C->unk_6C * 3.0f, 0.1f, 10.0f, 0.0f);
Math_SmoothStepToF(&obj8C->scale2, obj8C->scale1 * 3.0f, 0.1f, 10.0f, 0.0f);
obj8C->unk_44 -= 13;
obj8C->obj.rot.y = 180.0f - obj8C->obj.rot.y;
if (obj8C->unk_44 < 0) {
@@ -1065,9 +1066,9 @@ void func_8007B180(Object_8C* obj8C, f32 posX, f32 posY, f32 posZ, f32 arg4) {
obj8C->obj.pos.y = posY;
obj8C->obj.pos.z = posZ;
obj8C->unk_44 = 0xFF;
obj8C->unk_6C = arg4;
obj8C->scale1 = arg4;
Object_SetInfo(&obj8C->info, obj8C->obj.id);
func_80019218(0x1100000C, &obj8C->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x1100000C, &obj8C->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
void func_8007B228(f32 posX, f32 posY, f32 posZ, f32 arg3) {
@@ -1088,7 +1089,7 @@ void func_8007B2BC(Object_8C* obj8C, f32 xPos, f32 yPos, f32 zPos, f32 arg4, s32
obj8C->obj.pos.x = xPos;
obj8C->obj.pos.y = yPos;
obj8C->obj.pos.z = zPos;
obj8C->unk_6C = arg4;
obj8C->scale1 = arg4;
obj8C->unk_44 = 0xFF;
obj8C->unk_4C = arg5;
Object_SetInfo(&obj8C->info, obj8C->obj.id);
@@ -1123,7 +1124,7 @@ void func_8007B3B8(Object_8C* obj8C) {
var_fv1 = 0.1f;
var_v0 = 8;
}
Math_SmoothStepToF(&obj8C->unk_70, obj8C->unk_6C, var_fv1, var_fv0, 0.0f);
Math_SmoothStepToF(&obj8C->scale2, obj8C->scale1, var_fv1, var_fv0, 0.0f);
obj8C->unk_44 -= var_v0;
if (obj8C->unk_44 < 0) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
@@ -1138,7 +1139,7 @@ void func_8007B494(Object_8C* obj8C, f32 posX, f32 posY, f32 posZ, f32 arg4, s32
obj8C->obj.pos.y = posY;
obj8C->obj.pos.z = posZ;
obj8C->obj.rot.x = 90.0f;
obj8C->unk_6C = arg4;
obj8C->scale1 = arg4;
obj8C->unk_44 = arg5;
if (arg5 < 60) {
obj8C->unk_46 = 1;
@@ -1162,7 +1163,7 @@ void func_8007B550(f32 posX, f32 posY, f32 posZ, f32 arg3, s32 arg4) {
}
void func_8007B5C0(Object_8C* obj8C) {
Math_SmoothStepToF(&obj8C->unk_70, obj8C->unk_6C, 0.1f, 10.0f, 0.1f);
Math_SmoothStepToF(&obj8C->scale2, obj8C->scale1, 0.1f, 10.0f, 0.1f);
obj8C->unk_44 -= obj8C->unk_46;
if (obj8C->unk_44 < 0) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
@@ -1170,7 +1171,7 @@ void func_8007B5C0(Object_8C* obj8C) {
}
void func_8007B62C(Object_8C* obj8C) {
if (obj8C->unk_50 == 0) {
if (obj8C->timer_50 == 0) {
obj8C->unk_46 -= 4;
if (obj8C->unk_46 <= 0) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
@@ -1199,19 +1200,19 @@ void func_8007B67C(Object_8C* obj8C) {
if (var_v1 > 10) {
var_v1 -= 10;
}
obj8C->unk_54.x = gPlayer[var_v1 - 1].unk_0C0.x;
obj8C->unk_54.y = gPlayer[var_v1 - 1].unk_0C0.y;
obj8C->unk_54.z = gPlayer[var_v1 - 1].unk_0C0.z;
obj8C->unk_54.x = gPlayer[var_v1 - 1].vel.x;
obj8C->unk_54.y = gPlayer[var_v1 - 1].vel.y;
obj8C->unk_54.z = gPlayer[var_v1 - 1].vel.z;
}
}
void func_8007B758(Object_8C* obj8C) {
Math_SmoothStepToF(&obj8C->unk_70, obj8C->unk_6C, 0.1f, 10.0f, 0.1f);
Math_SmoothStepToF(&obj8C->scale2, obj8C->scale1, 0.1f, 10.0f, 0.1f);
obj8C->unk_44 -= 2;
if (obj8C->unk_44 < 0) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
}
func_8007A774(gPlayer, obj8C, obj8C->unk_70 * 20.0f);
func_8007A774(gPlayer, obj8C, obj8C->scale2 * 20.0f);
}
void func_8007B7E8(Object_8C* obj8C, f32 posX, f32 posY, f32 posZ, f32 arg4) {
@@ -1229,7 +1230,7 @@ void func_8007B7E8(Object_8C* obj8C, f32 posX, f32 posY, f32 posZ, f32 arg4) {
}
obj8C->unk_4A = 50;
obj8C->unk_46 = 1;
obj8C->unk_70 = arg4 * 0.2f;
obj8C->scale2 = arg4 * 0.2f;
obj8C->obj.rot.z = Rand_ZeroOne() * 360.0f;
Object_SetInfo(&obj8C->info, obj8C->obj.id);
}
@@ -1246,7 +1247,7 @@ void func_8007B8F8(f32 posX, f32 posY, f32 posZ, f32 arg3) {
}
void func_8007B960(Object_8C* obj8C) {
obj8C->unk_70 += 0.07f;
obj8C->scale2 += 0.07f;
obj8C->unk_4A -= obj8C->unk_46;
if (obj8C->unk_4A < 0) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
@@ -1260,7 +1261,7 @@ void func_8007B9DC(Object_8C* arg0) {
if (gControllerHold[3].button & Z_TRIG) {
RCP_SetupDL(&gMasterDisp, 4);
}
func_8005980C(arg0->unk_70);
Graphics_SetScaleMtx(arg0->scale2);
if (gCurrentLevel != LEVEL_MACBETH) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 140, 99, 58, arg0->unk_4A);
} else {
@@ -1295,10 +1296,10 @@ void func_8007BB14(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4) {
arg0->unk_46 = 5;
arg0->unk_4A = 0x50;
}
arg0->unk_70 = arg4 * 0.25f;
arg0->scale2 = arg4 * 0.25f;
arg0->obj.rot.z = Rand_ZeroOne() * 360.0f;
if (arg4 == 6.0f) {
arg0->unk_54.z = gPlayer->unk_0C0.z * 0.6f;
arg0->unk_54.z = gPlayer->vel.z * 0.6f;
}
Object_SetInfo(&arg0->info, arg0->obj.id);
}
@@ -1315,15 +1316,15 @@ void func_8007BC7C(f32 posX, f32 posY, f32 posZ, f32 arg3) {
}
void func_8007BCE8(Object_8C* arg0) {
if (gPlayer->unk_1C8 == 7) {
if (gPlayer->state_1C8 == 7) {
arg0->obj.rot.x = (gPlayer->unk_05C * 180.0f) / M_PI;
arg0->obj.rot.y = (-gPlayer->unk_058 * 180.0f) / M_PI;
}
if (gPlayer->unk_1C8 == 6) {
if (gPlayer->state_1C8 == 6) {
arg0->unk_46 = 2;
arg0->unk_54.y -= 0.13f;
}
arg0->unk_70 += 0.07f;
arg0->scale2 += 0.07f;
arg0->unk_4A -= arg0->unk_46;
if (arg0->unk_4A < 0) {
Object_Kill(&arg0->obj, &arg0->sfxPos);
@@ -1333,28 +1334,28 @@ void func_8007BCE8(Object_8C* arg0) {
}
void func_8007BDE0(Object_8C* arg0) {
arg0->unk_70 += 0.04f;
arg0->scale2 += 0.04f;
arg0->unk_4A -= 2;
if (arg0->unk_4A < 0) {
Object_Kill(&arg0->obj, &arg0->sfxPos);
}
arg0->obj.rot.z += arg0->unk_48;
arg0->unk_54.y += arg0->unk_6C;
arg0->unk_54.y += arg0->scale1;
}
void func_8007BE54(Object_8C* arg0) {
arg0->unk_70 += 0.02f;
arg0->scale2 += 0.02f;
arg0->unk_4A -= 3;
if (arg0->unk_4A < 0) {
Object_Kill(&arg0->obj, &arg0->sfxPos);
}
arg0->unk_54.z = gPlayer->unk_0C0.z + 7.0f;
arg0->unk_54.z = gPlayer->vel.z + 7.0f;
arg0->obj.rot.z += arg0->unk_48;
arg0->unk_54.y += 0.1f;
}
void func_8007BEE8(Object_8C* arg0) {
func_8005980C(arg0->unk_70);
Graphics_SetScaleMtx(arg0->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, arg0->unk_4A);
gSPDisplayList(gMasterDisp++, D_2010A30);
}
@@ -1369,8 +1370,8 @@ void func_8007BF64(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 x, f32 y,
arg0->unk_54.x = x;
arg0->unk_54.y = y;
arg0->unk_54.z = z;
arg0->unk_70 = arg7;
arg0->unk_50 = arg8;
arg0->scale2 = arg7;
arg0->timer_50 = arg8;
Object_SetInfo(&arg0->info, arg0->obj.id);
}
@@ -1395,8 +1396,8 @@ void func_8007C088(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 x, f32 y,
arg0->unk_54.x = x;
arg0->unk_54.y = y;
arg0->unk_54.z = z;
arg0->unk_70 = arg7;
arg0->unk_50 = arg8;
arg0->scale2 = arg7;
arg0->timer_50 = arg8;
Object_SetInfo(&arg0->info, arg0->obj.id);
}
@@ -1433,15 +1434,15 @@ void func_8007C250(Object_8C* arg0) {
Math_SmoothStepToF(&arg0->unk_54.y, 0.0f, 0.2f, 10.0f, 0.1f);
Math_SmoothStepToF(&arg0->unk_54.z, 0.0f, 0.2f, 10.0f, 0.1f);
var_v0 = 3;
if (gAllRangeMode == 1) {
if (gLevelMode == LEVELMODE_ALL_RANGE) {
var_v0 = 1;
}
if (!(arg0->unk_50 & var_v0)) {
if (!(arg0->timer_50 & var_v0)) {
randX = (Rand_ZeroOne() - 0.5f) * 40.0f;
randY = (Rand_ZeroOne() - 0.5f) * 40.0f;
randOther = ((Rand_ZeroOne() * 0.5f) + 1.0f);
func_8007D0E0(arg0->obj.pos.x + randX, arg0->obj.pos.y + randY, arg0->obj.pos.z, arg0->unk_70 * randOther);
if (arg0->unk_50 == 0) {
func_8007D0E0(arg0->obj.pos.x + randX, arg0->obj.pos.y + randY, arg0->obj.pos.z, arg0->scale2 * randOther);
if (arg0->timer_50 == 0) {
Object_Kill(&arg0->obj, &arg0->sfxPos);
}
}
@@ -1457,7 +1458,7 @@ void func_8007C3B4(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 x, f32 y,
arg0->unk_54.x = x;
arg0->unk_54.y = y;
arg0->unk_54.z = z;
arg0->unk_70 = arg7;
arg0->scale2 = arg7;
arg0->unk_4A = arg8;
arg0->unk_4C = (s32) (Rand_ZeroOne() * 12.0f);
arg0->obj.rot.z = Rand_ZeroOne() * 360.0f;
@@ -1481,13 +1482,13 @@ void func_8007C50C(Object_8C* arg0) {
f32 randY;
f32 randOther;
if (!(arg0->unk_50 & 7)) {
randX = (Rand_ZeroOne() - 0.5f) * 40.0f * arg0->unk_70;
randY = (Rand_ZeroOne() - 0.5f) * 40.0f * arg0->unk_70;
if (!(arg0->timer_50 & 7)) {
randX = (Rand_ZeroOne() - 0.5f) * 40.0f * arg0->scale2;
randY = (Rand_ZeroOne() - 0.5f) * 40.0f * arg0->scale2;
randOther = (Rand_ZeroOne() + 1.0f);
func_8007C484(arg0->obj.pos.x + randX, arg0->obj.pos.y + randY, arg0->obj.pos.z, arg0->unk_54.x, arg0->unk_54.y,
arg0->unk_54.z, arg0->unk_70 * randOther, 0);
if (arg0->unk_50 == 0) {
arg0->unk_54.z, arg0->scale2 * randOther, 0);
if (arg0->timer_50 == 0) {
Object_Kill(&arg0->obj, &arg0->sfxPos);
}
}
@@ -1500,8 +1501,8 @@ void func_8007C608(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, s32
arg0->obj.pos.x = posX;
arg0->obj.pos.y = posY;
arg0->obj.pos.z = posZ;
arg0->unk_70 = arg4;
arg0->unk_50 = arg5;
arg0->scale2 = arg4;
arg0->timer_50 = arg5;
Object_SetInfo(&arg0->info, arg0->obj.id);
}
@@ -1528,20 +1529,20 @@ void func_8007C6FC(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4) {
if (Rand_ZeroOne() < 0.5f) {
arg0->unk_48 = -arg0->unk_48;
}
if ((gCurrentLevel == LEVEL_FORTUNA) && (gPlayer->unk_1C8 != 6)) {
if ((gCurrentLevel == LEVEL_FORTUNA) && (gPlayer->state_1C8 != 6)) {
arg0->unk_4A = 180;
} else {
arg0->unk_4A = 255;
}
arg0->unk_70 = arg4 * 0.25f;
arg0->scale2 = arg4 * 0.25f;
arg0->obj.rot.z = Rand_ZeroOne() * 360.0f;
arg0->unk_44 = 0;
if (Rand_ZeroOne() < 0.3f) {
arg0->unk_44 = 1;
arg0->unk_4A = 255;
arg0->unk_70 = arg4 * 0.3f;
arg0->scale2 = arg4 * 0.3f;
}
arg0->unk_6C = Rand_ZeroOne() * 0.2f;
arg0->scale1 = Rand_ZeroOne() * 0.2f;
Object_SetInfo(&arg0->info, arg0->obj.id);
}
@@ -1563,15 +1564,15 @@ void func_8007C8C4(Object_8C* arg0) {
s32 var_v0;
var_v0 = 0;
if ((gCurrentLevel == LEVEL_FORTUNA) && (gPlayer->unk_1C8 != 6)) {
if ((gCurrentLevel == LEVEL_FORTUNA) && (gPlayer->state_1C8 != 6)) {
var_v0 = 3;
}
if (!(arg0->unk_50 & var_v0) && (gLevelType == LEVELTYPE_GROUND)) {
if (!(arg0->timer_50 & var_v0) && (gLevelType == LEVELTYPE_PLANET)) {
randX = (Rand_ZeroOne() - 0.5f) * 10.0f;
randY = (Rand_ZeroOne() - 0.5f) * 10.0f;
randOther = ((Rand_ZeroOne() * 0.5f) + 1.0f);
func_8007C85C(arg0->obj.pos.x + randX, arg0->obj.pos.y + randY, arg0->obj.pos.z, arg0->unk_70 * randOther);
if (arg0->unk_50 == 0) {
func_8007C85C(arg0->obj.pos.x + randX, arg0->obj.pos.y + randY, arg0->obj.pos.z, arg0->scale2 * randOther);
if (arg0->timer_50 == 0) {
Object_Kill(&arg0->obj, &arg0->sfxPos);
}
}
@@ -1728,14 +1729,14 @@ void func_80084194(Object_8C* obj8C) {
if (gCurrentLevel != LEVEL_AQUAS) {
RCP_SetupDL(&gMasterDisp, 0x31);
Matrix_Scale(gGfxMatrix, obj8C->unk_70, obj8C->unk_70, obj8C->unk_70, 1);
Matrix_Scale(gGfxMatrix, obj8C->scale2, obj8C->scale2, obj8C->scale2, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
tmp = obj8C->unk_44 * 4;
gDPSetEnvColor(gMasterDisp++, D_800D18F0[tmp + 0], D_800D18F0[tmp + 1], D_800D18F0[tmp + 2], 255);
} else {
RCP_SetupDL(&gMasterDisp, 0x31);
Matrix_Scale(gGfxMatrix, obj8C->unk_70, obj8C->unk_70, obj8C->unk_70, 1);
Matrix_Scale(gGfxMatrix, obj8C->scale2, obj8C->scale2, obj8C->scale2, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_800D1950[obj8C->unk_44]);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
src/main/sf_hud.c
+90 -89
View File
@@ -23,14 +23,14 @@ void func_80084930(f32 arg0, f32 arg1, s32 arg2) {
player = gPlayer;
var_t0 = 0;
switch (player->unk_1CC) {
case 0:
switch (player->form) {
case FORM_ARWING:
var_t0 = 0;
break;
case 1:
case FORM_LANDMASTER:
var_t0 = 1;
break;
case 2:
case FORM_BLUE_MARINE:
var_t0 = 2;
break;
}
@@ -79,7 +79,7 @@ void func_80084B94(s32 arg0) {
RCP_SetupDL(&gMasterDisp, 0x24);
if (arg0 == 0) {
for (i = 1; i < 4; i++) {
if (((gTeamShields[i] != 0) || (gPlayer[0].unk_1C8 != 7)) && (gTeamShields[i] <= 0) &&
if (((gTeamShields[i] != 0) || (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7)) && (gTeamShields[i] <= 0) &&
(gTeamShields[i] != -2)) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, D_800D1A70[i - 1].x, D_800D1A70[i - 1].y, D_800D1A70[i - 1].z, 1);
@@ -201,7 +201,7 @@ void func_80086110(f32 arg0, f32 arg1, s32 arg2) {
if ((arg2 <= 0) && (arg2 != -2) && ((D_80177854 == 100) || (D_80177830 == 1) || (D_80177838 != 0))) {
RCP_SetupDL(&gMasterDisp, 0x4C);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
if ((arg2 == 0) && (gPlayer[0].unk_1C8 == 7)) {
if ((arg2 == 0) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7)) {
Graphics_DisplaySmallText(arg0 + (8.0f * temp) + 4.0f, arg1 + 2.0f, 1.0f, 1.0f, " OK ");
} else {
Graphics_DisplaySmallText(arg0 + (8.0f * temp) + 4.0f, arg1 + 2.0f, 1.0f, 1.0f, "DOWN");
@@ -222,10 +222,10 @@ s32 func_800863C8(void) {
case LEVEL_TRAINING:
var_v1++;
case LEVEL_VENOM_2:
case LEVEL_VENOM_ANDROSS:
var_v1++;
case LEVEL_VENOM_SW:
case LEVEL_VENOM_2:
var_v1++;
case LEVEL_VENOM_1:
@@ -290,11 +290,11 @@ void func_80086444(void) {
f32 D_800D1CCC[] = { 1.6f, 1.6f };
switch (gCurrentLevel) {
case LEVEL_VENOM_SW:
case LEVEL_VENOM_2:
i = 1;
break;
case LEVEL_VENOM_2:
case LEVEL_VENOM_ANDROSS:
i = 0;
break;
@@ -479,7 +479,7 @@ void func_80088784(s32 arg0) {
Matrix_Scale(gGfxMatrix, 0.37f, 0.37f, 0.37f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (gLevelType == LEVELTYPE_GROUND) {
if (gLevelType == LEVELTYPE_PLANET) {
gSPDisplayList(gMasterDisp++, D_800D1D4C[arg0]);
} else {
gSPDisplayList(gMasterDisp++, D_800D1D94[arg0]);
@@ -612,7 +612,7 @@ void func_80089D28(void) {
if ((gb == 10) || (gb == 0)) {
// clang-format off
//! FAKE: Probably a MACRO
if (1) {func_80019218(0x4900001c, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);}
if (1) {Audio_PlaySfx(0x4900001c, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);}
// clang-format on
}
@@ -641,11 +641,11 @@ void func_80089E98(s32 arg0) {
var_a1 = 1;
}
if (gPlayer[arg0].unk_1C8 == 13) {
if (gPlayer[arg0].state_1C8 == PLAYERSTATE_1C8_13) {
break;
}
}
if ((var_a1_2 == D_801778A0) && (gFrameCount & 2)) {
if ((var_a1_2 == gPlayerNum) && (gFrameCount & 2)) {
var_a1 = (var_a1 * 2) + 1;
} else {
var_a1 = var_a1 * 2;
@@ -794,7 +794,7 @@ void func_8008B044(void) {
return;
}
func_80019218(0x49002018, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49002018, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (D_800CFF90 != 0) {
func_8001AF40(1);
@@ -807,7 +807,7 @@ void func_8008B044(void) {
D_80161790++;
if (D_80161790 >= 7) {
if (D_80161794 & 1) {
func_80019218(0x49002018, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49002018, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
D_80161790 = 0;
D_80161794++;
@@ -947,7 +947,7 @@ void func_8008B9E8(void) {
}
if ((D_80161788 == 0) && (D_8016178C == 0)) {
if ((D_8017829C >= 4) && (D_801782A4 != 2) && (D_801782A4 != 3)) {
if ((gRadioState >= 4) && (D_801782A4 != 2) && (D_801782A4 != 3)) {
temp = func_8008B774();
if (temp == 1) {
D_80161788 = 20;
@@ -1076,8 +1076,8 @@ void func_8008CA44(void) {
s32 i;
s32 j;
if ((gPlayer[D_801778A0].unk228 != 0) && (gPlayer[D_801778A0].unk210 == 0) && (D_80177854 != 0x64)) {
j = gPlayer[D_801778A0].unk228;
if ((gPlayer[gPlayerNum].unk228 != 0) && (gPlayer[gPlayerNum].unk210 == 0) && (D_80177854 != 100)) {
j = gPlayer[gPlayerNum].unk228;
for (i = 0; i < 12; i++) {
if ((j & D_800D2048[i]) != D_800D2048[i]) {
@@ -1136,7 +1136,7 @@ void func_8008D250(void) {
RCP_SetupDL(&gMasterDisp, 0x4C);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_8008C5C8(D_800D20C8[D_801778A0], D_800D20D8[D_801778A0], 0.54f, D_801778A0);
func_8008C5C8(D_800D20C8[gPlayerNum], D_800D20D8[gPlayerNum], 0.54f, gPlayerNum);
}
#else
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008D250.s")
@@ -1147,16 +1147,16 @@ void func_8008D31C(void) {
f32 D_800D20E8[] = { 60.0f, 220.0f, 60.0f, 220.0f };
f32 D_800D20F8[] = { 78.0f, 78.0f, 198.0f, 198.0f };
Math_SmoothStepToF(&D_800D19E0[D_801778A0], gPlayer[D_801778A0].shields * (1.0f / 255.0f), 0.3f, 10.0f, 0.01f);
Math_SmoothStepToF(&D_800D19E0[gPlayerNum], gPlayer[gPlayerNum].shields * (1.0f / 255.0f), 0.3f, 10.0f, 0.01f);
RCP_SetupDL(&gMasterDisp, 0x4E);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_8008D0DC(D_800D20E8[D_801778A0] + 3.0f, D_800D20F8[D_801778A0] + 18.0f, 1.0f, 1.0f, D_800D19E0[D_801778A0]);
func_8008D0DC(D_800D20E8[gPlayerNum] + 3.0f, D_800D20F8[gPlayerNum] + 18.0f, 1.0f, 1.0f, D_800D19E0[gPlayerNum]);
RCP_SetupDL(&gMasterDisp, 0x4C);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_8008CFB8(D_800D20E8[D_801778A0], D_800D20F8[D_801778A0], 1.0f, 1.0f);
func_8008CFB8(D_800D20E8[gPlayerNum], D_800D20F8[gPlayerNum], 1.0f, 1.0f);
}
#else
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008D31C.s")
@@ -1182,7 +1182,7 @@ void func_8008D4F0(f32 arg0, f32 arg1) {
if (gVersusMode) {
temp = 2.0f;
sp60 = 1.0f;
var_v1 = D_801778A0;
var_v1 = gPlayerNum;
sp68 = 24.0f;
} else {
temp = 2.0f;
@@ -1193,12 +1193,12 @@ void func_8008D4F0(f32 arg0, f32 arg1) {
D_800D211C[var_v1] = arg1;
}
temp_fs0 = gPlayer[D_801778A0].unk_2BC * (1.0f / 90.0f);
temp_fs0 = gPlayer[gPlayerNum].unk_2BC * (1.0f / 90.0f);
temp_fv0 = 1.0f - temp_fs0;
temp2 = sp68 * temp_fs0;
if (gPlayer[D_801778A0].unk_2B4 == 0) {
if (gPlayer[gPlayerNum].unk_2B4 == 0) {
Math_SmoothStepToF(&D_800D19AC[var_v1], 255.0f, 0.4f, 100.0f, 0.01f);
} else {
Math_SmoothStepToF(&D_800D19AC[var_v1], 100.0f, 0.4f, 100.0f, 0.01f);
@@ -1233,8 +1233,8 @@ void func_8008D7F4(void) {
s32 D_800D2170[] = { 12, 0, 67, 255 };
RCP_SetupDL(&gMasterDisp, 0x4E);
gDPSetPrimColor(gMasterDisp++, 0, 0, D_800D2150[D_801778A0], D_800D2160[D_801778A0], D_800D2170[D_801778A0], 255);
Graphics_DisplayHUDNumber(D_800D2130[D_801778A0], D_800D2140[D_801778A0], D_801778A0 + 1);
gDPSetPrimColor(gMasterDisp++, 0, 0, D_800D2150[gPlayerNum], D_800D2160[gPlayerNum], D_800D2170[gPlayerNum], 255);
Graphics_DisplayHUDNumber(D_800D2130[gPlayerNum], D_800D2140[gPlayerNum], gPlayerNum + 1);
}
#else
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008D7F4.s")
@@ -1245,22 +1245,22 @@ void func_8008D984(void) {
s32 D_800D21A8[] = { 146, 165, 146, 165 };
s32 D_800D21B8[] = { 94, 94, 137, 137 };
if (gBombCount[D_801778A0] != D_800D2180[D_801778A0]) {
D_800D2180[D_801778A0] = gBombCount[D_801778A0];
if (gBombCount[D_801778A0] == 0) {
D_800D2190[D_801778A0] = 0;
if (gBombCount[gPlayerNum] != D_800D2180[gPlayerNum]) {
D_800D2180[gPlayerNum] = gBombCount[gPlayerNum];
if (gBombCount[gPlayerNum] == 0) {
D_800D2190[gPlayerNum] = 0;
} else {
D_800D2190[D_801778A0] = 30;
D_800D2190[gPlayerNum] = 30;
}
}
if (D_800D2190[D_801778A0] != 0) {
D_800D2190[D_801778A0]--;
if (D_800D2190[gPlayerNum] != 0) {
D_800D2190[gPlayerNum]--;
}
if ((D_800D2190[D_801778A0] & 2) || ((D_800D2190[D_801778A0] == 0) && (gBombCount[D_801778A0] != 0))) {
if ((D_800D2190[gPlayerNum] & 2) || ((D_800D2190[gPlayerNum] == 0) && (gBombCount[gPlayerNum] != 0))) {
RCP_SetupDL_78();
if (gBombCount[D_801778A0] >= 2) {
if (gBombCount[gPlayerNum] >= 2) {
if (Math_SmoothStepToF(&D_800D21A4, D_800D21A0, 0.4f, 100.0f, 0.1f) == 0.0f) {
if (D_800D21A0 == 255.0f) {
D_800D21A0 = 96.0f;
@@ -1272,7 +1272,7 @@ void func_8008D984(void) {
D_800D21A4 = 255.0f;
}
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_800D21A4);
func_8008D1F0(D_800D21A8[D_801778A0], D_800D21B8[D_801778A0], 1.0f, 1.0f);
func_8008D1F0(D_800D21A8[gPlayerNum], D_800D21B8[gPlayerNum], 1.0f, 1.0f);
}
}
#else
@@ -1323,7 +1323,7 @@ void func_8008DE68(void) {
if ((D_80161734 == 1) && (gTeamShields[2] > 0)) {
if ((D_80177848 >= 0) && (D_801616BC == -1.0f)) {
func_80019218(0x4900C028, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x4900C028, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_801616BC = 255.0f;
}
@@ -1514,8 +1514,8 @@ void func_8008E620(f32 arg0, f32 arg1) {
ret = Play_CheckMedalStatus(300);
break;
case LEVEL_VENOM_ANDROSS:
case LEVEL_VENOM_2:
case LEVEL_VENOM_SW:
ret = Play_CheckMedalStatus(200);
break;
@@ -1571,7 +1571,7 @@ void func_8008F96C(void) {
RCP_SetupDL_36();
if ((gAllRangeMode != 2) && (D_80161708 != 0)) {
if ((gLevelMode != LEVELMODE_UNK_2) && (D_80161708 != 0)) {
func_8008D4F0(246.0f, 28.0f);
func_8008EA14(250.0f, 38.0f);
}
@@ -1581,7 +1581,7 @@ void func_8008F96C(void) {
if (D_80161708 != 0) {
func_8008E9EC(24.0f, 30.0f);
if (gCurrentLevel != LEVEL_TRAINING) {
func_80087530(248.0f, 11.0f, gLifeCount[D_801778A0]);
func_80087530(248.0f, 11.0f, gLifeCount[gPlayerNum]);
}
}
@@ -1653,14 +1653,14 @@ s32 func_80090A00(Object_2F4* obj2F4) {
case 0:
obj2F4->unk_134 = 0.0f;
obj2F4->unk_130 = 360.0f;
obj2F4->unk_0BC = 8;
obj2F4->timer_0BC = 8;
obj2F4->unk_0F4.y = 100.0f;
obj2F4->unk_0F4.x = 300.0f;
obj2F4->unk_060 = 1;
obj2F4->unk_064 = 1;
case 1:
if (obj2F4->unk_0BC == 0.0f) {
if (obj2F4->timer_0BC == 0.0f) {
obj2F4->unk_118 = 20.0f;
obj2F4->unk_120 = 3.6f;
obj2F4->unk_058 = 0;
@@ -1700,8 +1700,8 @@ s32 func_80090A00(Object_2F4* obj2F4) {
case 4:
obj2F4->unk_124.z = gPlayer[0].unk_138;
obj2F4->unk_124.y = 100.0f;
obj2F4->unk_124.x = gPlayer[0].unk_074;
if ((fabsf(obj2F4->obj.pos.x - gPlayer[0].unk_074) < 300.0f) &&
obj2F4->unk_124.x = gPlayer[0].pos.x;
if ((fabsf(obj2F4->obj.pos.x - gPlayer[0].pos.x) < 300.0f) &&
(fabsf(obj2F4->obj.pos.z - gPlayer[0].unk_138) < 300.0f)) {
obj2F4->unk_064 = 5;
obj2F4->unk_05C = 20;
@@ -1712,7 +1712,7 @@ s32 func_80090A00(Object_2F4* obj2F4) {
case 5:
obj2F4->unk_124.z = gPlayer[0].unk_138 + 1000.0f;
obj2F4->unk_124.y = 1000.0f;
obj2F4->unk_124.x = gPlayer[0].unk_074 - 1000.0f;
obj2F4->unk_124.x = gPlayer[0].pos.x - 1000.0f;
obj2F4->unk_058++;
if (obj2F4->unk_05C == obj2F4->unk_058) {
Object_Kill(&obj2F4->obj, &obj2F4->sfxPos);
@@ -1751,8 +1751,8 @@ s32 func_80090CCC(Object_2F4* obj2F4) {
ret = 1;
}
if (obj2F4->unk_0BE == 0) {
obj2F4->unk_0BE = (s32) (Rand_ZeroOne() * 200.0f) + 200;
if (obj2F4->timer_0BE == 0) {
obj2F4->timer_0BE = (s32) (Rand_ZeroOne() * 200.0f) + 200;
obj2F4->unk_13C = 30.0f;
}
@@ -1772,7 +1772,7 @@ s32 func_80090E8C(Object_2F4* obj2F4) {
f32 z;
f32 var_fv1_2;
if (obj2F4->unk_0BC == 0) {
if (obj2F4->timer_0BC == 0) {
if (gLevelType == LEVELTYPE_SPACE) {
x = (Rand_ZeroOne() - 0.5f) * 20000.0f;
y = (Rand_ZeroOne() - 0.5f) * 5000.0f;
@@ -1787,7 +1787,7 @@ s32 func_80090E8C(Object_2F4* obj2F4) {
obj2F4->unk_124.x = x;
obj2F4->unk_124.y = y;
obj2F4->unk_124.z = z;
obj2F4->unk_0BC = (s32) (Rand_ZeroOne() * 20.0f) + 10;
obj2F4->timer_0BC = (s32) (Rand_ZeroOne() * 20.0f) + 10;
}
}
@@ -1802,8 +1802,8 @@ s32 func_80090E8C(Object_2F4* obj2F4) {
obj2F4->unk_0B8 = 0;
}
if (obj2F4->unk_0BE == 0) {
obj2F4->unk_0BE = (s32) (Rand_ZeroOne() * 200.0f) + 200;
if (obj2F4->timer_0BE == 0) {
obj2F4->timer_0BE = (s32) (Rand_ZeroOne() * 200.0f) + 200;
obj2F4->unk_13C = 30.0f;
}
return false;
@@ -1812,11 +1812,11 @@ s32 func_80090E8C(Object_2F4* obj2F4) {
s32 func_800910C0(Object_2F4* obj2F4) {
f32 var_fv1;
if (obj2F4->unk_0BC == 0) {
if (obj2F4->timer_0BC == 0) {
obj2F4->unk_2DC.x = (Rand_ZeroOne() - 0.5f) * 2000.0f;
obj2F4->unk_2DC.y = (Rand_ZeroOne() * 1000.0f) + 200.0f;
obj2F4->unk_2DC.z = (Rand_ZeroOne() - 0.5f) * 2000.0f;
obj2F4->unk_0BC = (s32) (Rand_ZeroOne() * 20.0f) + 10;
obj2F4->timer_0BC = (s32) (Rand_ZeroOne() * 20.0f) + 10;
}
obj2F4->unk_124.x = obj2F4->unk_2DC.x + gObjects408->obj.pos.x;
@@ -1834,15 +1834,15 @@ s32 func_800910C0(Object_2F4* obj2F4) {
obj2F4->unk_0B8 = 0;
}
if (obj2F4->unk_0BE == 0) {
obj2F4->unk_0BE = (s32) (Rand_ZeroOne() * 200.0f) + 200;
if (obj2F4->timer_0BE == 0) {
obj2F4->timer_0BE = (s32) (Rand_ZeroOne() * 200.0f) + 200;
obj2F4->unk_13C = 30.0f;
}
return false;
}
void func_80091254(Object_2F4* obj2F4) {
if (gAllRangeMode == 1) {
if (gLevelMode == LEVELMODE_ALL_RANGE) {
func_80090E8C(obj2F4);
} else {
func_800910C0(obj2F4);
@@ -1852,8 +1852,8 @@ void func_80091254(Object_2F4* obj2F4) {
s32 func_80091298(Object_2F4* obj2F4) {
obj2F4->unk_118 = gPlayer[0].unk_0D0 + 10.0f;
obj2F4->unk_120 = 3.6f;
obj2F4->unk_124.x = gPlayer[0].unk_074 + ((f32) (obj2F4->unk_0E4 - 2) * 700.0f);
obj2F4->unk_124.y = gPlayer[0].unk_078;
obj2F4->unk_124.x = gPlayer[0].pos.x + ((f32) (obj2F4->unk_0E4 - 2) * 700.0f);
obj2F4->unk_124.y = gPlayer[0].pos.y;
obj2F4->unk_124.z = gPlayer[0].unk_138;
if ((fabsf(obj2F4->obj.pos.x - obj2F4->unk_124.x) < 700.0f) ||
@@ -1893,8 +1893,8 @@ s32 func_80091368(Object_2F4* obj2F4) {
obj2F4->unk_188 = 2.0f;
}
if (obj2F4->unk_0BC == 0) {
obj2F4->unk_0BC = (s32) (Rand_ZeroOne() * 20.0f) + 30;
if (obj2F4->timer_0BC == 0) {
obj2F4->timer_0BC = (s32) (Rand_ZeroOne() * 20.0f) + 30;
obj2F4->unk_130 = 360.0f;
obj2F4->unk_134 = 0.0f;
}
@@ -1935,7 +1935,7 @@ void func_800914FC(Object_2F4* obj2F4) {
obj2F4->unk_0B8 = 3;
}
if (gPlayer[0].unk_1C8 == 7) {
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) {
if ((obj2F4->unk_0B8 != 2) && (obj2F4->unk_0B8 != 3)) {
obj2F4->unk_060 = 1;
obj2F4->unk_0B8 = 2;
@@ -1966,7 +1966,7 @@ s32 func_80091864(Object_2F4* obj2F4) {
sp44 += 40.0f;
if (sp44 >= 360.0f) {
sp44 -= 360.0f;
} else if ((obj2F4->obj.pos.y < (D_80177940 + 50.0f)) && (gLevelType == LEVELTYPE_GROUND) && (sp44 > 180.0f)) {
} else if ((obj2F4->obj.pos.y < (D_80177940 + 50.0f)) && (gLevelType == LEVELTYPE_PLANET) && (sp44 > 180.0f)) {
sp44 = 0.0f;
}
obj2F4->unk_050 = 0;
@@ -2023,7 +2023,7 @@ s32 func_80091B90(Object_2F4* obj2F4) {
obj2F4->unk_14C -= obj2F4->unk_14C * 0.1f;
obj2F4->unk_144 -= obj2F4->unk_144 * 0.1f;
if ((obj2F4->obj.pos.y < D_80177940 + 40.0f) && (obj2F4->unk_0E8.y < 0.0f) && (gLevelType == LEVELTYPE_GROUND)) {
if ((obj2F4->obj.pos.y < D_80177940 + 40.0f) && (obj2F4->unk_0E8.y < 0.0f) && (gLevelType == LEVELTYPE_PLANET)) {
obj2F4->obj.pos.y = D_80177940 + 40.0f;
obj2F4->unk_0E8.y = 0.0f;
}
@@ -2036,7 +2036,7 @@ s32 func_80091CF8(Object_2F4* obj2F4) {
if (obj2F4->unk_054 != 0) {
if (obj2F4->unk_13C < 0.1f) {
obj2F4->unk_13C = 20.0f;
func_80019218(0x09000002, &obj2F4->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x09000002, &obj2F4->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
obj2F4->unk_188 = 5.0f;
}
obj2F4->unk_054 = 0;
@@ -2083,9 +2083,9 @@ s32 func_80091F00(Object_2F4* obj2F4) {
if (obj2F4->unk_0CE <= 0) {
obj2F4->unk_0CE = -1;
}
obj2F4->unk_0C6 = 20;
obj2F4->timer_0C6 = 20;
func_80019218(0x2903300E, &obj2F4->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x2903300E, &obj2F4->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_8007D10C(obj2F4->obj.pos.x, obj2F4->obj.pos.y, obj2F4->obj.pos.z, 1.5f);
Matrix_RotateY(gCalcMatrix, obj2F4->unk_0F4.y * M_DTOR, 0);
@@ -2106,7 +2106,7 @@ s32 func_80091F00(Object_2F4* obj2F4) {
gTeamShields[obj2F4->unk_0E4] = obj2F4->unk_0CE;
if (D_8017829C != 0) {
if (gRadioState != 0) {
return false;
}
@@ -2168,7 +2168,7 @@ void func_80092244(Object_2F4* obj2F4) {
void func_800922F4(Object_2F4* obj2F4) {
s32 temp;
if ((gTeamShields[obj2F4->unk_0E4] < 64) && (gPlayer[0].unk_1C8 != 7)) {
if ((gTeamShields[obj2F4->unk_0E4] < 64) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7)) {
temp = 7;
if (gTeamShields[obj2F4->unk_0E4] > 16) {
temp = 15;
@@ -2191,7 +2191,7 @@ void func_800922F4(Object_2F4* obj2F4) {
func_8007C120(obj2F4->obj.pos.x + ((Rand_ZeroOne() - 0.5f) * 30.0f),
obj2F4->obj.pos.y + (Rand_ZeroOne() * 10.0f),
obj2F4->obj.pos.z + ((Rand_ZeroOne() - 0.5f) * 30.0f), obj2F4->unk_0E8.x,
obj2F4->unk_0E8.y, obj2F4->unk_0E8.z, obj2F4->unk_110 * 0.07f, 3);
obj2F4->unk_0E8.y, obj2F4->unk_0E8.z, obj2F4->scale * 0.07f, 3);
}
}
}
@@ -2219,7 +2219,7 @@ void func_80093310(void) {
if (1) {}
this->obj.id = OBJ_2F4_195;
Object_SetInfo(&this->info, this->obj.id);
func_80019218(0x11030010, &this->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x11030010, &this->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) {
@@ -2236,8 +2236,8 @@ void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) {
obj8C->obj.pos.y = y;
obj8C->obj.pos.z = z;
if ((player->unk_1C8 == 2) && (gCurrentLevel == LEVEL_AQUAS) && (player->unk_1D0 < 2)) {
obj8C->unk_6C = 0.4f;
if ((player->state_1C8 == PLAYERSTATE_1C8_2) && (gCurrentLevel == LEVEL_AQUAS) && (player->unk_1D0 < 2)) {
obj8C->scale1 = 0.4f;
obj8C->unk_44 = 0;
obj8C->unk_46 = 24;
obj8C->unk_48 = Rand_ZeroOne() * 4.0f;
@@ -2262,7 +2262,7 @@ void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) {
}
}
obj8C->unk_70 = arg3 * 0.2f;
obj8C->scale2 = arg3 * 0.2f;
obj8C->obj.rot.z = Rand_ZeroOne() * 360.0f;
Object_SetInfo(&obj8C->info, obj8C->obj.id);
break;
@@ -2276,12 +2276,12 @@ void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) {
void func_80094954(Object_8C* obj8C) {
Player* player = gPlayer;
if ((player->unk_1C8 == 2) && (gCurrentLevel == LEVEL_AQUAS) && (player->unk_1D0 < 2)) {
if ((player->state_1C8 == PLAYERSTATE_1C8_2) && (gCurrentLevel == LEVEL_AQUAS) && (player->unk_1D0 < 2)) {
switch (obj8C->unk_4E) {
case 0:
obj8C->unk_44 += obj8C->unk_46;
obj8C->unk_4A = obj8C->unk_44;
obj8C->unk_70 += 0.01f;
obj8C->scale2 += 0.01f;
if (obj8C->unk_4A >= 200) {
obj8C->unk_4E = 1;
@@ -2291,7 +2291,7 @@ void func_80094954(Object_8C* obj8C) {
case 1:
obj8C->unk_4A -= obj8C->unk_46;
obj8C->unk_70 -= 0.1f;
obj8C->scale2 -= 0.1f;
break;
}
@@ -2299,46 +2299,47 @@ void func_80094954(Object_8C* obj8C) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
}
obj8C->unk_54.y += obj8C->unk_6C;
obj8C->unk_6C -= 0.05f;
obj8C->unk_54.y += obj8C->scale1;
obj8C->scale1 -= 0.05f;
if (obj8C->unk_6C < -1.0f) {
obj8C->unk_6C = -1.0f;
if (obj8C->scale1 < -1.0f) {
obj8C->scale1 = -1.0f;
}
obj8C->obj.rot.z += obj8C->unk_48;
return;
}
if (player->unk_1C8 == 7) {
if (player->state_1C8 == PLAYERSTATE_1C8_7) {
obj8C->obj.rot.x = player->unk_05C * 180.0f / M_PI;
obj8C->obj.rot.y = -player->unk_058 * 180.0f / M_PI;
}
if (player->unk_1C8 == 6) {
if (player->state_1C8 == PLAYERSTATE_1C8_6) {
obj8C->unk_46 = 2;
if (player->unk_1D0 >= 4) {
obj8C->unk_54.y -= 0.13f;
}
}
obj8C->unk_70 += 0.8f;
obj8C->scale2 += 0.8f;
obj8C->unk_4A -= obj8C->unk_46;
if ((obj8C->unk_4A < 0) || ((player->unk_1C8 == 2) && (gCurrentLevel == LEVEL_AQUAS) && (player->unk_1D0 == 5))) {
if ((obj8C->unk_4A < 0) ||
((player->state_1C8 == PLAYERSTATE_1C8_2) && (gCurrentLevel == LEVEL_AQUAS) && (player->unk_1D0 == 5))) {
Object_Kill(&obj8C->obj, &obj8C->sfxPos);
}
obj8C->obj.rot.z += obj8C->unk_48;
}
void func_80094BBC(Object_8C* obj8C) {
if ((gPlayer[0].unk_1C8 == 2) && (gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].unk_1D0 < 2)) {
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) && (gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].unk_1D0 < 2)) {
RCP_SetupDL(&gMasterDisp, 0x44);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 21, 34, obj8C->unk_4A);
gDPSetEnvColor(gMasterDisp++, 255, 255, 251, 0);
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
gSPDisplayList(gMasterDisp++, D_1023750);
} else {
func_8005980C(obj8C->unk_70);
Graphics_SetScaleMtx(obj8C->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, obj8C->unk_4A);
gSPDisplayList(gMasterDisp++, D_1023750);
}
src/main/sys_audio_17650.c
+2 -12
View File
@@ -59,7 +59,7 @@ void func_80016A50(void) {
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sys_audio_17650/func_800191BC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sys_audio_17650/func_80019218.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sys_audio_17650/Audio_PlaySfx.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sys_audio_17650/func_80019290.s")
@@ -77,17 +77,7 @@ void func_80016A50(void) {
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sys_audio_17650/func_8001A4B8.s")
void func_8001A500(Vec3f* sfxPos) {
Vec3f pad[4];
Vec3f* sp24;
u8 i;
for (i = 0; i < 5; i++) {
func_8001A38C(i, sfxPos);
}
sp24 = sfxPos;
func_80019290(2, &sp24);
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sys_audio_17650/Audio_KillSfx.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sys_audio_17650/func_8001A55C.s")
src/main/sys_main.c
+3 -3
View File
@@ -350,7 +350,7 @@ void Graphics_ThreadEntry(void* arg0) {
if (gFillScreen == 0) {
osViSwapBuffer(&gFrameBuffers[(gFrameCounter - 1) % 3]);
}
func_80007FE4(&gFrameBuffers[(gFrameCounter - 1) % 3], 320, 16);
func_80007FE4(&gFrameBuffers[(gFrameCounter - 1) % 3], SCREEN_WIDTH, 16);
var_v1 = MIN(D_80137E78, 4);
var_v2 = MAX(var_v1, gGfxVImsgQueue.validCount + 1);
@@ -505,8 +505,8 @@ void Main_ThreadEntry(void* arg0) {
osCreateThread(&gGraphicsThread, THREAD_ID_GRAPHICS, Graphics_ThreadEntry, arg0,
gGraphicsThreadStack + sizeof(gGraphicsThreadStack), 40);
osStartThread(&gGraphicsThread);
osCreateThread(&gTimerThread, THREAD_ID_7, Timer_ThreadEntry, arg0, gTimerThreadStack + sizeof(gTimerThreadStack),
60);
osCreateThread(&gTimerThread, THREAD_ID_TIMER, Timer_ThreadEntry, arg0,
gTimerThreadStack + sizeof(gTimerThreadStack), 60);
osStartThread(&gTimerThread);
osCreateThread(&gSerialThread, THREAD_ID_SERIAL, SerialInterface_ThreadEntry, arg0,
gSerialThreadStack + sizeof(gSerialThreadStack), 20);
src/overlays/ovl_DF4260/DFEE30.c
+1 -1
View File
@@ -14,7 +14,7 @@
void func_DF4260_801924A8(Object_80* arg0) {
switch (arg0->unk_48) {
case 0:
if (gPlayer[0].unk_07C < arg0->obj.pos.z) {
if (gPlayer[0].pos.z < arg0->obj.pos.z) {
D_80177AB0 = 0;
D_80177A98 = 0;
src/overlays/ovl_E16C50/E16C50.c
+2
View File
@@ -51,3 +51,5 @@
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E16C50/E16C50/func_E16C50_8018EC38.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E16C50/E16C50/func_E16C50_8018ED78.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E16C50/E16C50/D_E16C50_801C0900.s")
src/overlays/ovl_E9F1D0/E9F1D0.c
+2
View File
@@ -123,3 +123,5 @@
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80195E44.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801961AC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/D_E9F1D0_801A6B90.s")
src/overlays/ovl_EBFBE0/ED6EC0.c
+39 -39
View File
@@ -187,13 +187,13 @@ void func_EBFBE0_8019E800(void) {
gNextGameState = 4;
D_80161A34 = 5;
D_80177868 = 2;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
}
void func_EBFBE0_8019E85C(void) {
switch (D_80177868) {
case 0:
if (D_8017783C == 0) {
if (D_Timer_8017783C == 0) {
D_80177868 = 1;
}
break;
@@ -223,18 +223,18 @@ void func_EBFBE0_8019E8D0(void) {
switch (D_80177B40) {
case 0:
if (D_8017783C == 0) {
if (D_Timer_8017783C == 0) {
D_80177B40 = 1;
}
break;
case 1:
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
func_EBFBE0_8019E99C();
break;
case 2:
D_80177898 = 3;
gDrawMode = DRAWMODE_3;
func_EBFBE0_8019FF48();
break;
}
@@ -389,11 +389,11 @@ bool func_EBFBE0_8019FD1C(LevelId levelId, s32 arg1) {
planetSaveSlot = SAVE_SLOT_VENOM_1;
break;
case LEVEL_VENOM_SW:
case LEVEL_VENOM_2:
planetSaveSlot = SAVE_SLOT_VENOM_2;
break;
case LEVEL_VENOM_2:
case LEVEL_VENOM_ANDROSS:
if (D_8017827C == 0) {
planetSaveSlot = SAVE_SLOT_VENOM_1;
} else {
@@ -406,21 +406,21 @@ bool func_EBFBE0_8019FD1C(LevelId levelId, s32 arg1) {
switch (arg1) {
case 0:
if (!(gSaveFile.save.data.planet[planetSaveSlot].unk_5 & 1)) {
gSaveFile.save.data.planet[planetSaveSlot].unk_5 = 1;
if (!(gSaveFile.save.data.planet[planetSaveSlot].played & 1)) {
gSaveFile.save.data.planet[planetSaveSlot].played = 1;
ret = true;
}
break;
case 1:
if (gExpertMode) {
if (!(gSaveFile.save.data.planet[planetSaveSlot].unk_3 & 1)) {
gSaveFile.save.data.planet[planetSaveSlot].unk_3 = 1;
if (!(gSaveFile.save.data.planet[planetSaveSlot].expertMedal & 1)) {
gSaveFile.save.data.planet[planetSaveSlot].expertMedal = 1;
ret = true;
}
} else {
if (!(gSaveFile.save.data.planet[planetSaveSlot].unk_6 & 1)) {
gSaveFile.save.data.planet[planetSaveSlot].unk_6 = 1;
if (!(gSaveFile.save.data.planet[planetSaveSlot].normalMedal & 1)) {
gSaveFile.save.data.planet[planetSaveSlot].normalMedal = 1;
ret = true;
}
}
@@ -428,13 +428,13 @@ bool func_EBFBE0_8019FD1C(LevelId levelId, s32 arg1) {
case 2:
if (gExpertMode) {
if (!(gSaveFile.save.data.planet[planetSaveSlot].unk_4 & 1)) {
gSaveFile.save.data.planet[planetSaveSlot].unk_4 = 1;
if (!(gSaveFile.save.data.planet[planetSaveSlot].expertClear & 1)) {
gSaveFile.save.data.planet[planetSaveSlot].expertClear = 1;
ret = true;
}
} else {
if (!(gSaveFile.save.data.planet[planetSaveSlot].unk_7 & 1)) {
gSaveFile.save.data.planet[planetSaveSlot].unk_7 = 1;
if (!(gSaveFile.save.data.planet[planetSaveSlot].normalClear & 1)) {
gSaveFile.save.data.planet[planetSaveSlot].normalClear = 1;
ret = true;
}
}
@@ -823,8 +823,8 @@ void func_EBFBE0_801A4F8C(void) {
D_80178410 = 0;
gGameState = 5;
D_80177868 = 0;
D_8017783C = 2;
D_80177898 = 0;
D_Timer_8017783C = 2;
gDrawMode = DRAWMODE_0;
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EBFBE0/ED6EC0/func_EBFBE0_801A4FC4.s")
@@ -833,7 +833,7 @@ void func_EBFBE0_801A4F8C(void) {
s32 func_EBFBE0_801A5770(void) {
bool ret = false;
s8 y = gControllerPress[D_80177AF8].stick_y;
s8 y = gControllerPress[gMainController].stick_y;
if ((y > -40) && (y < 40)) {
y = 0;
@@ -849,7 +849,7 @@ s32 func_EBFBE0_801A5770(void) {
}
if (ret) {
func_80019218(0x49000002U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
return ret;
@@ -949,7 +949,7 @@ bool func_EBFBE0_801A62FC(PlanetId planet) {
break;
}
if (gSaveFile.save.data.planet[planetSaveSlot].unk_5 & 1) {
if (gSaveFile.save.data.planet[planetSaveSlot].played & 1) {
ret = false;
}
@@ -1079,8 +1079,8 @@ PlanetId func_EBFBE0_801A6480(LevelId level) {
break;
case LEVEL_VENOM_1:
case LEVEL_VENOM_ANDROSS:
case LEVEL_VENOM_2:
case LEVEL_VENOM_SW:
planet = PLANET_VENOM;
break;
@@ -1104,11 +1104,11 @@ s32 func_EBFBE0_801A655C(s32 arg0, s32 arg1) {
}
void func_EBFBE0_801A659C(void) {
func_8001A838(0x1100004CU);
func_8001A838(0x1100204CU);
func_8001A838(0x1100004C);
func_8001A838(0x1100204C);
if (D_EBFBE0_801CD954 != 9) {
func_80019218(0x49000003U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
D_EBFBE0_801CEFC8 = 0;
@@ -1118,9 +1118,9 @@ void func_EBFBE0_801A659C(void) {
void func_EBFBE0_801A6628(void) {
gGameState = 7;
D_8017783C = 2;
D_Timer_8017783C = 2;
D_80177854 = 0;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
gHitCount = 0;
func_800A5844();
@@ -1222,13 +1222,13 @@ s32 func_EBFBE0_801A6DAC(PlanetId planetId) {
if (planetId == PLANET_VENOM) {
if (gExpertMode) {
var_v0 = gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].unk_3 & 1;
var_a0 = gSaveFile.save.data.planet[SAVE_SLOT_VENOM_1].unk_4 & 1 |
gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].unk_4 & 1;
var_v0 = gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].expertMedal & 1;
var_a0 = gSaveFile.save.data.planet[SAVE_SLOT_VENOM_1].expertClear & 1 |
gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].expertClear & 1;
} else {
var_v0 = gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].unk_6 & 1;
var_a0 = gSaveFile.save.data.planet[SAVE_SLOT_VENOM_1].unk_7 & 1 |
gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].unk_7 & 1;
var_v0 = gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].normalMedal & 1;
var_a0 = gSaveFile.save.data.planet[SAVE_SLOT_VENOM_1].normalClear & 1 |
gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].normalClear & 1;
}
} else {
planetSaveSlot = planetId;
@@ -1238,11 +1238,11 @@ s32 func_EBFBE0_801A6DAC(PlanetId planetId) {
}
if (gExpertMode) {
var_v0 = gSaveFile.save.data.planet[planetSaveSlot].unk_3 & 1;
var_a0 = gSaveFile.save.data.planet[planetSaveSlot].unk_4 & 1;
var_v0 = gSaveFile.save.data.planet[planetSaveSlot].expertMedal & 1;
var_a0 = gSaveFile.save.data.planet[planetSaveSlot].expertClear & 1;
} else {
var_v0 = gSaveFile.save.data.planet[planetSaveSlot].unk_6 & 1;
var_a0 = gSaveFile.save.data.planet[planetSaveSlot].unk_7 & 1;
var_v0 = gSaveFile.save.data.planet[planetSaveSlot].normalMedal & 1;
var_a0 = gSaveFile.save.data.planet[planetSaveSlot].normalClear & 1;
}
}
@@ -1664,7 +1664,7 @@ void func_EBFBE0_801A9DE8(void) {
}
if (gFrameCount & mask) {
func_EBFBE0_801AD7EC(254, 16, gLifeCount[D_801778A0]);
func_EBFBE0_801AD7EC(254, 16, gLifeCount[gPlayerNum]);
}
if ((D_80161A34 == 7) || (D_80161A34 == 5)) {
src/overlays/ovl_EBFBE0/fox_option.c
+131 -129
View File
@@ -356,10 +356,10 @@ void func_EBFBE0_80191B20(void) {
var_a1_2 = 1;
for (i = 0; i < 16; i++) {
if (i == 14) {
if (i == SAVE_SLOT_VENOM_1) {
continue;
}
if (!(gSaveFile.save.data.planet[i].unk_6 & 1)) {
if (!(gSaveFile.save.data.planet[i].normalMedal & 1)) {
var_a1_2 = 0;
break;
}
@@ -398,22 +398,22 @@ void func_EBFBE0_80191B20(void) {
if (D_80161A34 == 8) {
D_80177B90[D_80177B48] = 13;
if (D_800D3180[9] == 1) {
gSaveFile.save.data.planet[14].unk_5 = 1;
gSaveFile.save.data.planet[SAVE_SLOT_VENOM_1].played = 1;
if (var_v0_2 != 0) {
gSaveFile.save.data.planet[14].unk_4 = 1;
gSaveFile.save.data.planet[SAVE_SLOT_VENOM_1].expertClear = 1;
} else {
gSaveFile.save.data.planet[14].unk_7 = 1;
gSaveFile.save.data.planet[SAVE_SLOT_VENOM_1].normalClear = 1;
}
Save_Write();
} else if (D_800D3180[9] == 2) {
D_80177BB0[D_80177B48] = 1;
gSaveFile.save.data.planet[15].unk_5 = 1;
gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].played = 1;
if (var_v0_2) {
gSaveFile.save.data.planet[15].unk_4 = 1;
gSaveFile.save.data.planet[15].unk_3 = 1;
gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].expertClear = 1;
gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].expertMedal = 1;
} else {
gSaveFile.save.data.planet[15].unk_7 = 1;
gSaveFile.save.data.planet[15].unk_6 = 1;
gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].normalClear = 1;
gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].normalMedal = 1;
}
Save_Write();
}
@@ -517,19 +517,19 @@ void func_EBFBE0_801920C4(void) {
switch (D_8017784C) {
case 0:
if (D_8017783C == 0) {
if (D_Timer_8017783C == 0) {
D_8017784C = 1;
func_8001DC6C(0, 23);
}
break;
case 1:
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
func_EBFBE0_80191B20();
break;
case 2:
D_80177898 = 2;
gDrawMode = DRAWMODE_2;
func_EBFBE0_80192190();
break;
}
@@ -670,7 +670,7 @@ void func_EBFBE0_801924C4(void) {
switch (D_EBFBE0_801B9124) {
case 0:
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
break;
case 10:
@@ -753,9 +753,9 @@ void func_EBFBE0_801928BC(void) {
D_80178410 = 0;
D_EBFBE0_801B9124 = 100;
gGameState = GSTATE_MAP;
D_8017783C = 2;
D_Timer_8017783C = 2;
D_80177B40 = 0;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
gControllerLock = 3;
} else {
D_80178340 += 0x20;
@@ -769,9 +769,9 @@ void func_EBFBE0_80192938(void) {
if (D_80178340 == 0xFF) {
gCurrentLevel = LEVEL_TRAINING;
gGameState = GSTATE_PLAY;
D_8017783C = 2;
D_Timer_8017783C = 2;
D_80177854 = 0;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
func_800A5844();
D_80177CA0 = 0;
D_80177CB0 = 0.0f;
@@ -889,15 +889,16 @@ void func_EBFBE0_80192D58(void) {
break;
case 1:
temp1 = func_EBFBE0_8019C418(&D_EBFBE0_801B91A4, 5, 1, 0, 20, 5, 4, D_80177AF8, &D_EBFBE0_801B9180);
temp1 = func_EBFBE0_8019C418(&D_EBFBE0_801B91A4, 5, 1, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9180);
// clang-format off
if (temp1 != 0) { func_80019218(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }
if (temp1 != 0) { Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }
// clang-format on
if ((D_EBFBE0_801B91A4 == 0) && (D_EBFBE0_801B91C8 != 0)) {
temp2 = func_EBFBE0_8019C418(&D_EBFBE0_801B91B0, 1, 0, 0, 20, 5, 4, D_80177AF8, &D_EBFBE0_801B9190);
temp2 =
func_EBFBE0_8019C418(&D_EBFBE0_801B91B0, 1, 0, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9190);
if (temp2 != 0) {
func_80019218(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (D_EBFBE0_801B91B0) {
D_EBFBE0_801AE638[0].unk_00.unk_08 = D_8004C50;
D_EBFBE0_801AE638[0].unk_00.unk_10 = 80;
@@ -915,9 +916,10 @@ void func_EBFBE0_80192D58(void) {
}
}
if ((D_EBFBE0_801B91A4 == 4) && (D_EBFBE0_801B91C8 != 0)) {
temp2 = func_EBFBE0_8019C418(&D_EBFBE0_801B91AC, 1, 0, 0, 20, 5, 4, D_80177AF8, &D_EBFBE0_801B9198);
temp2 =
func_EBFBE0_8019C418(&D_EBFBE0_801B91AC, 1, 0, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9198);
if (temp2 != 0) {
func_80019218(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (D_EBFBE0_801B91AC) {
D_EBFBE0_801AE638[4].unk_00.unk_08 = D_8004C50;
D_EBFBE0_801AE638[4].unk_00.unk_10 = 80;
@@ -934,14 +936,14 @@ void func_EBFBE0_80192D58(void) {
}
}
if (gControllerPress[D_80177AF8].button & (A_BUTTON | START_BUTTON)) {
func_80019218(0x49000020, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) {
Audio_PlaySfx(0x49000020, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B9208 = D_EBFBE0_801AE570[D_EBFBE0_801B91A4];
D_EBFBE0_801B91BC = 0;
D_EBFBE0_801B912C = 11;
}
if (gControllerPress[D_80177AF8].button & B_BUTTON) {
func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (gControllerPress[gMainController].button & B_BUTTON) {
Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B8284 = 0;
D_EBFBE0_801B8280 = 1;
D_EBFBE0_801B912C = 100;
@@ -1021,10 +1023,10 @@ void func_EBFBE0_80192D58(void) {
} else {
D_80178410 = 0;
gGameState = GSTATE_TITLE;
D_8017783C = 2;
D_Timer_8017783C = 2;
D_80177AE0 = 0;
D_EBFBE0_801B827C = 1;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B8280 = 0;
D_EBFBE0_801B8284 = 0;
gControllerLock = 3;
@@ -1160,21 +1162,21 @@ void func_EBFBE0_80193C4C(void) {
case 1:
// clang-format off
if (func_EBFBE0_8019C418(&D_EBFBE0_801B91A8, 2, 1, 0, 20, 5, 4, D_80177AF8, &D_EBFBE0_801B9188) != 0) { func_80019218(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }
if (func_EBFBE0_8019C418(&D_EBFBE0_801B91A8, 2, 1, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9188) != 0) { Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }
// clang-format on
if (gControllerPress[D_80177AF8].button & (A_BUTTON | START_BUTTON)) {
func_80019218(0x49000020, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) {
Audio_PlaySfx(0x49000020, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B9208 = D_EBFBE0_801AEF84[D_EBFBE0_801B91A8];
D_EBFBE0_801B91BC = 0;
D_EBFBE0_801B912C = 11;
}
if (gControllerPress[D_80177AF8].button & B_BUTTON) {
func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (gControllerPress[gMainController].button & B_BUTTON) {
Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B912C = 0;
D_EBFBE0_801B9124 = 1000;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B9244 = 1;
}
break;
@@ -1337,10 +1339,10 @@ void func_EBFBE0_801948A8(void) {
s32 temp;
sp34 = D_EBFBE0_801B9288;
temp = func_EBFBE0_8019C418(&D_EBFBE0_801B9288, 3, 1, 0, 20, 5, 4, D_80177AF8, &D_EBFBE0_801B9250);
temp = func_EBFBE0_8019C418(&D_EBFBE0_801B9288, 3, 1, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9250);
if (temp != 0) {
D_EBFBE0_801B9270[sp34] = 255.0f;
func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
if (D_EBFBE0_801B9288 == 0) {
@@ -1350,24 +1352,24 @@ void func_EBFBE0_801948A8(void) {
}
// Test sound
if (gControllerPress[D_80177AF8].button & R_TRIG) {
if (gControllerPress[gMainController].button & R_TRIG) {
D_EBFBE0_801B9284 ^= 1;
func_8001D8F4(D_EBFBE0_801B9284);
}
if (gControllerPress[D_80177AF8].button & A_BUTTON) {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (gControllerPress[gMainController].button & A_BUTTON) {
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B9288 = (D_EBFBE0_801B9288 + 1) & 3;
}
if (gControllerPress[D_80177AF8].button & B_BUTTON) {
func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (gControllerPress[gMainController].button & B_BUTTON) {
Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (D_EBFBE0_801B9284 == 1) {
D_EBFBE0_801B9284 = 0;
func_8001D8F4(D_EBFBE0_801B9284);
}
Save_Write();
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B9124 = 1000;
D_EBFBE0_801B912C = 0;
D_EBFBE0_801B9244 = 1;
@@ -1378,8 +1380,8 @@ void func_EBFBE0_80194AEC(void) {
s32 sp3C = gSoundMode;
s32 pad;
if (func_EBFBE0_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, D_80177AF8, &D_EBFBE0_801B9260) != 0) {
func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (func_EBFBE0_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9260) != 0) {
Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
gSoundMode = sp3C;
if (gSoundMode >= 3) {
gSoundMode = 0;
@@ -1627,25 +1629,25 @@ void func_EBFBE0_80195944(void) {
f32 sp28 = D_EBFBE0_801B931C;
if (func_EBFBE0_8019C66C(&sp28, 0.0f, 49.0f, &D_EBFBE0_801B9290) != 0) {
func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B931C = sp28;
}
if (gControllerPress[D_80177AF8].button & A_BUTTON) {
if (gControllerPress[gMainController].button & A_BUTTON) {
func_8001DA90(D_EBFBE0_801B931C);
D_EBFBE0_801B9320 = true;
}
if (gControllerPress[D_80177AF8].button & B_BUTTON) {
if (gControllerPress[gMainController].button & B_BUTTON) {
if (!D_EBFBE0_801B9320) {
func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_8001D444(0, 36, 0, 255);
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B9124 = 1000;
D_EBFBE0_801B912C = 0;
D_EBFBE0_801B9244 = 1;
} else {
func_80019218(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_800182F4(0x100100FF);
func_800182F4(0x110100FF);
D_EBFBE0_801B9320 = false;
@@ -1653,7 +1655,7 @@ void func_EBFBE0_80195944(void) {
}
// Spectrum Analizer mode selector
if (gControllerPress[D_80177AF8].button & R_CBUTTONS) {
if (gControllerPress[gMainController].button & R_CBUTTONS) {
spectrumAnalizerMode++;
if (spectrumAnalizerMode > 2) {
spectrumAnalizerMode = 0;
@@ -1795,7 +1797,7 @@ void func_EBFBE0_801962A4(void) {
if (D_EBFBE0_801B9330[D_EBFBE0_801B91C0]) {
break;
}
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B9124 = 1000;
D_EBFBE0_801B912C = 0;
D_EBFBE0_801B9244 = 1;
@@ -1815,18 +1817,18 @@ void func_EBFBE0_801962A4(void) {
case 1:
D_EBFBE0_801B91CC = 2;
func_80019218(0x0940A00B, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_801779A8[D_80177AF8] = 50.0f;
D_80177990[D_80177AF8] = 0;
Audio_PlaySfx(0x0940A00B, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_801779A8[gMainController] = 50.0f;
D_80177990[gMainController] = 0;
break;
case 2:
D_80177990[D_80177AF8] += (s32) D_801779A8[D_80177AF8];
temp_fv0 = Math_SmoothStepToF(&D_801779A8[D_80177AF8], 100.0f, 0.05f, 100.0f, 0.1f);
D_80177990[gMainController] += (s32) D_801779A8[gMainController];
temp_fv0 = Math_SmoothStepToF(&D_801779A8[gMainController], 100.0f, 0.05f, 100.0f, 0.1f);
if (D_80177990[D_80177AF8] >= 100) {
D_80177990[D_80177AF8] -= 100;
D_80137E84[D_80177AF8] = 1;
if (D_80177990[gMainController] >= 100) {
D_80177990[gMainController] -= 100;
D_80137E84[gMainController] = 1;
}
if (temp_fv0 == 0.0f) {
@@ -1868,36 +1870,36 @@ void func_EBFBE0_801962A4(void) {
void func_EBFBE0_8019669C(void) {
if ((D_EBFBE0_801B91CC == 0) || (D_EBFBE0_801B91CC == 1)) {
if (func_EBFBE0_8019C5A0(&D_EBFBE0_801B91C0) != 0) {
func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
if (1) {}
}
if (gControllerPress[D_80177AF8].button & A_BUTTON) {
if (gControllerPress[gMainController].button & A_BUTTON) {
if (D_EBFBE0_801B91CC == 3) {
func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B912C = 3;
} else {
D_EBFBE0_801B9330[D_EBFBE0_801B91C0] = 10;
if (D_EBFBE0_801B91C0 == 0) {
if (D_EBFBE0_801B91CC == 1) {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B912C = 2;
} else {
func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B912C = 3;
}
} else {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B912C = 4;
}
}
} else if (gControllerPress[D_80177AF8].button & B_BUTTON) {
} else if (gControllerPress[gMainController].button & B_BUTTON) {
if (D_EBFBE0_801B91CC == 1) {
func_80019218(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B912C = 2;
} else {
func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B912C = 3;
}
}
@@ -2025,9 +2027,9 @@ void func_EBFBE0_80196E54(void) {
void func_EBFBE0_80196EFC(void) {
func_EBFBE0_80196FC4();
if (gControllerPress[D_80177AF8].button & B_BUTTON) {
func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_80177898 = 0;
if (gControllerPress[gMainController].button & B_BUTTON) {
Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B9124 = 1000;
D_EBFBE0_801B912C = 0;
D_EBFBE0_801B9244 = 1;
@@ -2040,8 +2042,8 @@ void func_EBFBE0_80196F9C(void) {
}
void func_EBFBE0_80196FC4(void) {
if (gControllerPress[D_80177AF8].button & A_BUTTON) {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (gControllerPress[gMainController].button & A_BUTTON) {
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B93E0 ^= 1;
}
@@ -2054,8 +2056,8 @@ void func_EBFBE0_80196FC4(void) {
}
void func_EBFBE0_80197074(void) {
if (func_EBFBE0_8019C418(&D_EBFBE0_801B93E4, 9, 1, 0, 20, 5, 4, D_80177AF8, &D_EBFBE0_801B9400) != 0) {
func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (func_EBFBE0_8019C418(&D_EBFBE0_801B93E4, 9, 1, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9400) != 0) {
Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B91D4 = 114.0f - D_EBFBE0_801B93E4 * 130.0f;
D_EBFBE0_801B91DC = 114.0f - D_EBFBE0_801B93E4 * 130.0f;
D_EBFBE0_801B91D8 = -6.0f + D_EBFBE0_801B93E4 * 130.0f;
@@ -2071,8 +2073,8 @@ void func_EBFBE0_8019715C(void) {
s32 temp2;
if (D_EBFBE0_801B91D0 != 0) {
if (func_EBFBE0_8019C418(&D_EBFBE0_801B93E4, 9, 1, 1, 20, 2, 9, D_80177AF8, &D_EBFBE0_801B9408) != 0.00f) {
func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (func_EBFBE0_8019C418(&D_EBFBE0_801B93E4, 9, 1, 1, 20, 2, 9, gMainController, &D_EBFBE0_801B9408) != 0.00f) {
Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B91DC = 114.0f - D_EBFBE0_801B93E4 * 130.0f;
D_EBFBE0_801B91E0 = -6.0f + D_EBFBE0_801B93E4 * 130.0f;
D_EBFBE0_801B91D0 = 0;
@@ -2605,9 +2607,9 @@ void func_EBFBE0_801992C4(void) {
D_EBFBE0_801B93C4 = 0;
for (i = 0; i < 4; i++) {
D_80161A18[i] = 0;
gPlayerInactive[i] = false;
if (gControllerPlugged[i] == 0) {
D_80161A18[i] = 1;
gPlayerInactive[i] = true;
D_EBFBE0_801B93C4 |= 1 << i;
}
D_EBFBE0_801B9358[i] = 255.0f;
@@ -2640,20 +2642,20 @@ void func_EBFBE0_8019949C(void) {
if (!(D_EBFBE0_801B93C4 & (1 << i))) {
func_EBFBE0_8019C824(&D_EBFBE0_801B9358[i]);
if (func_EBFBE0_8019C418(&D_EBFBE0_801AED3C[i], 2, 0, 0, 20, 2, 4, i, &D_EBFBE0_801B93A0[i])) {
func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
}
if (gControllerPress[i].button & A_BUTTON) {
if (D_EBFBE0_801B93C4 == 15) {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B91EC = 10;
D_EBFBE0_801B912C++;
break;
} else {
if (!(D_EBFBE0_801B93C4 & (1 << i))) {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_80177888[i] = D_EBFBE0_801AED3C[i];
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
gHandicap[i] = D_EBFBE0_801AED3C[i];
D_EBFBE0_801B9358[i] = 255.0f;
D_EBFBE0_801B9348[i] = 10;
D_EBFBE0_801B93C4 = D_EBFBE0_801B93C4 | (1 << i);
@@ -2663,11 +2665,11 @@ void func_EBFBE0_8019949C(void) {
if (gControllerPress[i].button & B_BUTTON) {
if (D_EBFBE0_801B93C4 & (1 << i)) {
func_80019218(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B93C4 &= (1 << i) ^ 15;
} else {
func_8001D444(0, 36, 0, 255);
func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_EBFBE0_8019B8A0(2);
D_EBFBE0_801B9248 = 1;
break;
@@ -2959,9 +2961,9 @@ void func_EBFBE0_8019A214(void) {
void func_EBFBE0_8019A298(void) {
if (D_EBFBE0_801B91EC == 0.0f) {
gGameState = GSTATE_VS_INIT;
D_8017783C = 2;
D_Timer_8017783C = 2;
D_8017784C = 0;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
}
}
@@ -2984,19 +2986,19 @@ void func_EBFBE0_8019A2E0(void) {
}
if (func_EBFBE0_8019C418(&D_EBFBE0_801B93D4, 4, 0, 0, 20, 2, 4, i, &D_EBFBE0_801B9380[i])) {
func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_801778A4 = D_EBFBE0_801B93D4 + 1;
}
if (gControllerPress[i].button & A_BUTTON) {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_EBFBE0_8019A080();
D_EBFBE0_801B936C = 10;
break;
}
if (gControllerPress[i].button & B_BUTTON) {
func_80019218(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B9124 = D_EBFBE0_801B93D0;
D_EBFBE0_801B91C4 = 0;
func_EBFBE0_801924C4();
@@ -3024,20 +3026,20 @@ void func_EBFBE0_8019A4DC(void) {
}
if (func_EBFBE0_8019C418(&D_EBFBE0_801B93DC, 4, 0, 0, 20, 2, 4, i, &D_EBFBE0_801B9380[i])) {
func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B9340 = D_EBFBE0_801B93DC;
D_801778C8 = D_EBFBE0_801B93DC;
}
if (gControllerPress[i].button & A_BUTTON) {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_EBFBE0_8019A080();
D_EBFBE0_801B937C = 10;
break;
}
if (gControllerPress[i].button & B_BUTTON) {
func_80019218(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B9124 = D_EBFBE0_801B93D0;
D_EBFBE0_801B91C4 = 0;
func_EBFBE0_801924C4();
@@ -3065,19 +3067,19 @@ void func_EBFBE0_8019A6DC(void) {
continue;
}
if (func_EBFBE0_8019C418(&D_EBFBE0_801B93D8, 1, 0, 1, 20, 2, 4, i, &D_EBFBE0_801B9380[i])) {
func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_80161A28 = D_EBFBE0_801B93D8;
}
if (gControllerPress[i].button & A_BUTTON) {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (D_80161A28 == 0) {
gVersusStage = VSTAGE_CORNERIA;
gVersusStage = VS_STAGE_CORNERIA;
if (D_EBFBE0_801B93D0 == 30) {
gVersusStage = VSTAGE_KATINA;
gVersusStage = VS_STAGE_KATINA;
}
} else {
gVersusStage = VSTAGE_SECTOR_Z;
gVersusStage = VS_STAGE_SECTOR_Z;
}
D_EBFBE0_801B9374 = 10;
@@ -3086,7 +3088,7 @@ void func_EBFBE0_8019A6DC(void) {
}
if (gControllerPress[i].button & B_BUTTON) {
func_80019218(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (D_EBFBE0_801B93D0 == 20) {
D_EBFBE0_801B9124 = D_EBFBE0_801B93D0;
D_EBFBE0_801B91C4 = 0;
@@ -3121,13 +3123,13 @@ void func_EBFBE0_8019A954(void) {
}
if (gControllerPress[i].button & A_BUTTON) {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B91EC = 10;
break;
}
if (gControllerPress[i].button & B_BUTTON) {
func_80019218(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_EBFBE0_8019A080();
D_EBFBE0_801B933C = 0;
D_EBFBE0_801B91F0 = 0;
@@ -3452,7 +3454,7 @@ void func_EBFBE0_8019B7D4(void) {
void func_EBFBE0_8019B8A0(s32 arg0) {
D_EBFBE0_801B9124 = arg0;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B912C = 0;
D_EBFBE0_801B91B4 = 0;
}
@@ -3710,8 +3712,8 @@ bool func_EBFBE0_8019C418(s32* arg0, s32 arg1, bool arg2, s32 arg3, s32 arg4, s3
s32 func_EBFBE0_8019C5A0(s32* arg0) {
s32 ret = 0;
s32 temp = *arg0;
s32 x = gControllerPress[D_80177AF8].stick_x;
s32 y = -gControllerPress[D_80177AF8].stick_y;
s32 x = gControllerPress[gMainController].stick_x;
s32 y = -gControllerPress[gMainController].stick_y;
if ((y > 40) || (y < -40)) {
return ret;
@@ -3751,8 +3753,8 @@ s32 func_EBFBE0_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_EBFBE0_801B9
f32 temp2;
s32 var_a2 = 0;
f32 temp = *arg0;
s32 x = gControllerPress[D_80177AF8].stick_x;
s32 y = -gControllerPress[D_80177AF8].stick_y;
s32 x = gControllerPress[gMainController].stick_x;
s32 y = -gControllerPress[gMainController].stick_y;
if ((y > 10) || (y < -10)) {
return 0;
@@ -3804,7 +3806,7 @@ s32 func_EBFBE0_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_EBFBE0_801B9
temp2 = *arg0;
if ((s32) temp2 != (s32) temp) {
func_80019218(0x49004007, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49004007, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
var_a2 = 1;
}
@@ -3852,10 +3854,10 @@ s32 func_EBFBE0_8019C8C4(void) {
break;
}
if (temp[j] <= gLifeCount[D_801778A0]) {
if (temp[j] == gLifeCount[D_801778A0]) {
if (temp[j] <= gLifeCount[gPlayerNum]) {
if (temp[j] == gLifeCount[gPlayerNum]) {
for (k = j; k < 10; k++) {
if ((temp[k] != gLifeCount[D_801778A0]) || (D_EBFBE0_801B8220[k] != D_80161714)) {
if ((temp[k] != gLifeCount[gPlayerNum]) || (D_EBFBE0_801B8220[k] != D_80161714)) {
ret = k;
break;
}
@@ -3906,7 +3908,7 @@ void func_EBFBE0_8019CAE0(void) {
case 3:
if (D_EBFBE0_801B917C == 0) {
gBlurAlpha = 255;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B912C = 0;
D_EBFBE0_801B9124 = 300;
}
@@ -3961,19 +3963,19 @@ void func_EBFBE0_8019CD54(void) {
switch (D_EBFBE0_801B9128) {
case 0:
if (D_EBFBE0_801B9138 == 0) {
if (func_EBFBE0_8019C418(&D_EBFBE0_801B90A0[D_EBFBE0_801B9098], 36, 0, 0, 50, 5, 10, D_80177AF8,
if (func_EBFBE0_8019C418(&D_EBFBE0_801B90A0[D_EBFBE0_801B9098], 36, 0, 0, 50, 5, 10, gMainController,
&D_EBFBE0_801B9160[D_EBFBE0_801B9098]) != 0) {
func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B9150[D_EBFBE0_801B9098][0] = D_EBFBE0_801AEF5C[D_EBFBE0_801B90A0[D_EBFBE0_801B9098]];
D_EBFBE0_801B90D0[D_EBFBE0_801B9098] = 0.0f;
D_EBFBE0_801B9100[D_EBFBE0_801B9098] = 0.0f;
}
}
if (gControllerPress[D_80177AF8].button & A_BUTTON) {
if (gControllerPress[gMainController].button & A_BUTTON) {
D_EBFBE0_801B90D0[D_EBFBE0_801B9098] = 0.0f;
if (D_EBFBE0_801B9138 != 0) {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B9140[0] = 10;
D_EBFBE0_801B9140[1] = 10;
D_EBFBE0_801B9140[2] = 10;
@@ -3983,7 +3985,7 @@ void func_EBFBE0_8019CD54(void) {
} else {
if (D_EBFBE0_801B9098 < 3) {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B90D0[D_EBFBE0_801B9098] = 0.0f;
D_EBFBE0_801B9140[D_EBFBE0_801B9098] = 15;
D_EBFBE0_801B9128 = 1;
@@ -3992,8 +3994,8 @@ void func_EBFBE0_8019CD54(void) {
}
}
if ((gControllerPress[D_80177AF8].button & B_BUTTON) && (D_EBFBE0_801B9098 != 0)) {
func_80019218(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if ((gControllerPress[gMainController].button & B_BUTTON) && (D_EBFBE0_801B9098 != 0)) {
Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (D_EBFBE0_801B9138 != 0) {
D_EBFBE0_801B9138 = 0;
}
@@ -4335,10 +4337,10 @@ void func_EBFBE0_8019DD44(void) {
void func_EBFBE0_8019DE74(void) {
func_EBFBE0_8019715C();
if (gControllerPress[D_80177AF8].button & 0xD00E) { // START, A, B, C-UP, C-LEFT, C-DOWN
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (gControllerPress[gMainController].button & 0xD00E) { // START, A, B, C-UP, C-LEFT, C-DOWN
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B912C = 0;
if (D_80161A34 == 5) {
@@ -4379,10 +4381,10 @@ void func_EBFBE0_8019E030(void) {
case 1:
if (D_EBFBE0_801B9178 == 0) {
if (((D_80161714 * 64) >= 50000) && ((D_80161714 * 64) < 70000)) {
func_80019218(0x49000032, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000032, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
if ((D_80161714 * 64) >= 70000) {
func_80019218(0x49000033, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000033, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
D_EBFBE0_801B9178 = 20;
D_EBFBE0_801B912C++;
@@ -4390,8 +4392,8 @@ void func_EBFBE0_8019E030(void) {
break;
case 2:
if ((D_EBFBE0_801B9178 == 0) && (gControllerPress[D_80177AF8].button & 0xD00E)) {
func_80019218(0x19031083, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if ((D_EBFBE0_801B9178 == 0) && (gControllerPress[gMainController].button & 0xD00E)) {
Audio_PlaySfx(0x19031083, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B9090 = 1;
D_EBFBE0_801B9178 = 60;
D_EBFBE0_801B912C++;
@@ -4402,7 +4404,7 @@ void func_EBFBE0_8019E030(void) {
if (D_EBFBE0_801B9178 == 0) {
D_80178410 = 0;
gGameState = GSTATE_INIT;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
*gLifeCount = 2;
D_80161714 = 0;
}
src/overlays/ovl_EBFBE0/fox_title.c
+48 -49
View File
@@ -39,7 +39,7 @@ void func_EBFBE0_801875E0(void) {
D_80161A34 = 0;
D_800D2870 = 0;
D_80177AF8 = func_EBFBE0_80187ABC();
gMainController = func_EBFBE0_80187ABC();
D_80178348 = 0;
D_80178350 = 0;
@@ -72,7 +72,7 @@ void func_EBFBE0_801875E0(void) {
func_EBFBE0_80188010();
if ((D_80177AF8 == -1) || (D_EBFBE0_801B827C != 0)) {
if ((gMainController == -1) || (D_EBFBE0_801B827C != 0)) {
func_8001DC6C(0, 0x17);
D_EBFBE0_801B82C4 = 0;
D_EBFBE0_801B827C = 0;
@@ -86,19 +86,19 @@ void func_EBFBE0_801875E0(void) {
void func_EBFBE0_80187754(void) {
switch (D_80177AE0) {
case 0:
if (D_8017783C == 0) {
D_80177898 = 0;
if (D_Timer_8017783C == 0) {
gDrawMode = DRAWMODE_0;
D_80177AE0 = 1;
}
break;
case 1:
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
func_EBFBE0_801875E0();
break;
case 2:
D_80177898 = 1;
gDrawMode = DRAWMODE_1;
func_EBFBE0_801877F0();
break;
}
@@ -244,9 +244,9 @@ void func_EBFBE0_80187B00(void) {
}
} else {
D_80178410 = 0;
D_8017829C = 0;
gRadioState = 0;
D_EBFBE0_801B82C0 = 0;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
func_8001DC6C(0, 0x16);
D_EBFBE0_801B82C4 = 1;
}
@@ -333,7 +333,7 @@ s32 func_EBFBE0_80188010(void) {
D_EBFBE0_801B8248[i][0] = gSaveFile.save.data.unk_18[i][0] & 0xFF;
D_EBFBE0_801B8248[i][1] = gSaveFile.save.data.unk_18[i][1] & 0xFF;
D_EBFBE0_801B8248[i][2] = gSaveFile.save.data.unk_18[i][2] & 0xFF;
D_EBFBE0_801B8248[i][3] = 0;
D_EBFBE0_801B8248[i][3] = '\0';
temp3 = gSaveFile.save.data.unk_36[i];
@@ -365,7 +365,7 @@ void func_EBFBE0_801881FC(void) {
s32 i;
for (i = 0; i < 16; i++) {
if ((i != 14) && (!(gSaveFile.save.data.planet[i].unk_3 & 1))) {
if ((i != 14) && (!(gSaveFile.save.data.planet[i].expertMedal & 1))) {
var_a1 = false;
break;
}
@@ -373,7 +373,7 @@ void func_EBFBE0_801881FC(void) {
D_EBFBE0_801B82BC = 900;
D_8017829C = 0;
gRadioState = 0;
D_EBFBE0_801B869C = 255;
@@ -700,7 +700,7 @@ void func_EBFBE0_801888E8(void) {
D_EBFBE0_801B86A4 = 0;
}
if ((gControllerPress[D_80177AF8].stick_x != 0) || (gControllerPress[D_80177AF8].stick_y != 0)) {
if ((gControllerPress[gMainController].stick_x != 0) || (gControllerPress[gMainController].stick_y != 0)) {
D_EBFBE0_801B82D0 = 0.08f;
}
}
@@ -730,7 +730,7 @@ void func_EBFBE0_801888E8(void) {
D_EBFBE0_801B82C0 = 0;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B82C4 = 7;
}
@@ -878,7 +878,7 @@ void func_EBFBE0_8018994C(void) {
D_EBFBE0_801B82C0 = 100;
D_EBFBE0_801B82B8 = 0;
D_8017829C = 0;
gRadioState = 0;
D_80178300 = 0;
sCurrentMsgPri = 0;
break;
@@ -976,8 +976,8 @@ 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);
Audio_PlaySfx(0x11030010, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x31024059, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_800BA808(gMsg_ID_60, RCID_ROB64_TITLE);
}
@@ -1053,7 +1053,7 @@ void func_EBFBE0_8018994C(void) {
D_EBFBE0_801B82C0 = 0;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B82C4 = 2;
}
@@ -1202,8 +1202,8 @@ void func_EBFBE0_8018A644(void) {
switch (D_EBFBE0_801B82C0) {
case 0:
func_EBFBE0_8018A338();
func_80019218(0x49000014, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_80019218(0x0140001C, (Vec3f*) &D_EBFBE0_801B84D8, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000014, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x0140001C, (Vec3f*) &D_EBFBE0_801B84D8, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B82B4 = 0;
D_EBFBE0_801B82C8 = 0.0f;
@@ -1253,7 +1253,7 @@ void func_EBFBE0_8018A644(void) {
D_EBFBE0_801B82C0 = 0;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B82C4 = 3;
}
@@ -1367,8 +1367,8 @@ void func_EBFBE0_8018ACEC(void) {
switch (D_EBFBE0_801B82C0) {
case 0:
func_EBFBE0_8018ABC0();
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);
Audio_PlaySfx(0x11030010, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x31024059, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B82CC = 0.01f;
D_EBFBE0_801B82B4 = 0;
@@ -1391,7 +1391,7 @@ void func_EBFBE0_8018ACEC(void) {
func_8001A55C(&D_EBFBE0_801B867C, 0x11030010);
func_8001A55C(&D_EBFBE0_801B867C, 0x31024059);
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B82C0 = 0;
D_EBFBE0_801B82C4 = 4;
@@ -1545,7 +1545,7 @@ void func_EBFBE0_8018B5C4(void) {
case 10:
if (D_EBFBE0_801B82A8 == 0) {
func_80019218(0x0100001D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x0100001D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B82B4 = 0;
D_EBFBE0_801B82C0 = 1;
}
@@ -1560,7 +1560,7 @@ void func_EBFBE0_8018B5C4(void) {
D_EBFBE0_801B9048 -= 0.41f;
if (D_EBFBE0_801B9048 < 0.0f) {
D_EBFBE0_801B9048 = 0.0f;
func_80019218(0x09002013, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x09002013, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
}
@@ -1574,7 +1574,7 @@ void func_EBFBE0_8018B5C4(void) {
}
if (D_EBFBE0_801B84E8[i].unk_38 == 1) {
func_80019218(0x1950107A, &D_EBFBE0_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x1950107A, &D_EBFBE0_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
};
if (D_EBFBE0_801B84E8[i].unk_38 == 0) {
@@ -1609,7 +1609,7 @@ void func_EBFBE0_8018B5C4(void) {
if (D_EBFBE0_801B82B4 == 226) {
D_EBFBE0_801B7BF0 = 0;
func_80019218(0x0100001E, &D_EBFBE0_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x0100001E, &D_EBFBE0_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B86BC = 105.0f;
D_EBFBE0_801B86C0 = 0.0f;
@@ -1703,7 +1703,7 @@ void func_EBFBE0_8018B5C4(void) {
case 3:
if (D_EBFBE0_801B82A8 == 0) {
func_8001A55C(&D_EBFBE0_801B84E8[3].unk_50, 0x0100001E);
func_80019218(0x09000002, &D_EBFBE0_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x09000002, &D_EBFBE0_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B82A8 = 4;
@@ -1892,8 +1892,8 @@ void func_EBFBE0_8018C644(void) {
switch (D_EBFBE0_801B82C0) {
case 0:
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);
Audio_PlaySfx(0x11030010, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x31024059, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_EBFBE0_8018C1C0();
@@ -1920,7 +1920,7 @@ void func_EBFBE0_8018C644(void) {
D_EBFBE0_801B84E8[i].unk_38--;
} else {
if (D_EBFBE0_801B84E8[i].unk_38 == 0) {
func_80019218(0x19000001, &D_EBFBE0_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34,
Audio_PlaySfx(0x19000001, &D_EBFBE0_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34,
&D_800C5D3C);
D_EBFBE0_801B84E8[i].unk_38 = -1;
D_EBFBE0_801B84E8[i].unk_4C = 1;
@@ -1947,7 +1947,6 @@ void func_EBFBE0_8018C644(void) {
y = D_EBFBE0_801AE444[i] - D_EBFBE0_801B84E8[i].unk_00.y;
z = D_EBFBE0_801AE454[i] + 10.0f - D_EBFBE0_801B84E8[i].unk_00.z;
// M_RTOD doesn't seem to work here for some reason
D_EBFBE0_801B84E8[i].unk_18 = -Math_Atan2F(y, sqrtf(SQ(x) + SQ(z))) * 180.0f / M_PI;
D_EBFBE0_801B84E8[i].unk_1C = Math_Atan2F(x, z) * 180.0f / M_PI;
}
@@ -1979,7 +1978,7 @@ void func_EBFBE0_8018C644(void) {
break;
}
D_EBFBE0_801B82C0 = 0;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B82C4 = 0;
func_8001DC6C(0, 23);
break;
@@ -2746,7 +2745,7 @@ void func_EBFBE0_8018F8E4(void) {
}
}
if (D_80177AF8 < 0) {
if (gMainController < 0) {
RCP_SetupDL(&gMasterDisp, 0x55);
gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 200);
@@ -3081,8 +3080,8 @@ void func_EBFBE0_80190E64(void) {
void func_EBFBE0_80190EA4(void) {
switch (D_EBFBE0_801B8280) {
case 0:
if (gControllerPress[D_80177AF8].button & 0xD00F) { // START, A, B, C-left, C-Down, C-Up, C-Right
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
if (gControllerPress[gMainController].button & 0xD00F) { // START, A, B, C-left, C-Down, C-Up, C-Right
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_EBFBE0_801B8284 = 0;
D_EBFBE0_801B8280 = 1;
gControllerLock = 0x1E;
@@ -3095,9 +3094,9 @@ void func_EBFBE0_80190EA4(void) {
} else {
func_8001DC6C(0, 0x17);
D_80178410 = 0;
D_8017829C = 0;
gRadioState = 0;
D_EBFBE0_801B82C0 = 0;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_EBFBE0_801B82C4 = 0;
gControllerLock = 30;
D_EBFBE0_801B8284 = 0;
@@ -3111,10 +3110,10 @@ void func_EBFBE0_80190FD0(void) {
if (gControllerLock == 0) {
switch (D_EBFBE0_801B8280) {
case 0:
if (((gControllerPress[D_80177AF8].button & START_BUTTON) ||
(gControllerPress[D_80177AF8].button & A_BUTTON)) &&
if (((gControllerPress[gMainController].button & START_BUTTON) ||
(gControllerPress[gMainController].button & A_BUTTON)) &&
(D_EBFBE0_801B8280 == 0)) {
func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_800182F4(0x101E00FF);
func_800182F4(0x111E00FF);
D_EBFBE0_801B8284 = 0;
@@ -3127,9 +3126,9 @@ void func_EBFBE0_80190FD0(void) {
D_EBFBE0_801B8284 += 18;
} else {
gGameState = GSTATE_MENU;
D_8017783C = 2;
D_Timer_8017783C = 2;
D_8017784C = 0;
D_80177898 = 0;
gDrawMode = DRAWMODE_0;
D_80178410 = 0;
D_EBFBE0_801B8280 = 0;
D_EBFBE0_801B8284 = 0;
@@ -3145,13 +3144,13 @@ void func_EBFBE0_8019111C(void) {
f32 y;
if ((D_EBFBE0_801B82B0 == 0) && (D_EBFBE0_801B9040 == 0) &&
((gControllerPress[D_80177AF8].stick_x != 0) || (gControllerPress[D_80177AF8].stick_y != 0))) {
((gControllerPress[gMainController].stick_x != 0) || (gControllerPress[gMainController].stick_y != 0))) {
D_EBFBE0_801B9040 = 1;
D_EBFBE0_801B86A4 = 0;
}
x = gControllerPress[D_80177AF8].stick_x;
y = gControllerPress[D_80177AF8].stick_y;
x = gControllerPress[gMainController].stick_x;
y = gControllerPress[gMainController].stick_y;
if (D_EBFBE0_801B9040 != 0) {
if (((x * 0.2f) + D_EBFBE0_801B905C > -500.0f) && ((x * 0.2f) + D_EBFBE0_801B905C < 500.0f)) {
@@ -3162,8 +3161,8 @@ void func_EBFBE0_8019111C(void) {
}
}
if ((D_EBFBE0_801B9040 != 0) && (gControllerPress[D_80177AF8].stick_x == 0) &&
(gControllerPress[D_80177AF8].stick_y == 0)) {
if ((D_EBFBE0_801B9040 != 0) && (gControllerPress[gMainController].stick_x == 0) &&
(gControllerPress[gMainController].stick_y == 0)) {
D_EBFBE0_801B86A4++;
} else {
D_EBFBE0_801B86A4 = 0;
@@ -3354,7 +3353,7 @@ void func_EBFBE0_801919C4(u16** arg0, s32 arg1) {
D_80178724 = 0;
D_80178308 = arg0[D_80178724];
D_80177D68 = arg1;
D_8017829C = 100;
gRadioState = 100;
switch (gGameState) {
case GSTATE_TITLE: