mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-08-15 05:10:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Further docs on script, various other things (#204)

Browse Source 
* stuff

* too much

* Torch commit

* torch again

* names and such

* names

* even more stuff

* format

* enums

* whoops on the gbi
This commit is contained in:
petrie911
2024-04-08 17:25:56 -05:00
committed by GitHub
parent be0d328b4e
commit 52e1b6cb17
92 changed files with 5714 additions and 5203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/fox_360.c
+128 -128
View File
@@ -35,22 +35,22 @@ s32 D_360_800C9B4C = 96 * 30;
/* static */ Vec3f D_360_800C9B98 = { 60.0f, 0.0f, -170.0f };
/* static */ Vec3f D_360_800C9BA4 = { -60.0f, 0.0f, -170.0f };
s32 D_360_8015F900;
s32 D_360_8015F904;
s16 D_360_8015F908;
s32 D_360_8015F90C;
s32 D_360_8015F910;
f32 D_360_8015F914;
f32 D_360_8015F918;
f32 D_360_8015F91C;
u8 D_360_8015F920;
u8 D_360_8015F921;
s32 D_360_8015F924;
s32 D_360_8015F928;
s32 D_360_8015F930[3];
s32 D_360_8015F93C;
s32 D_360_8015F940;
f32 D_360_8015F944;
s32 gAllRangeSupplyTimer;
s32 sStarWolfKillTimer;
s16 gStarWolfMsgTimer;
s32 gAllRangeWingRepairTimer;
s32 gAllRangeWingRepairSent;
f32 gSzMissileR;
f32 gSzMissileG;
f32 gSzMissileB;
u8 gKaKilledAlly;
u8 gKaAllyKillCount;
s32 gAllRangeCheckpoint;
s32 gAllRangeEventTimer;
s32 gAllRangeCountdown[3];
s32 gShowAllRangeCountdown;
s32 gAllRangeFrameCount;
f32 gAllRangeCountdownScale;
void func_360_8002E3E0(Actor* actor) {
s32 hits = 0;
@@ -61,23 +61,23 @@ void func_360_8002E3E0(Actor* actor) {
(void) "time=%d\n";
(void) "time=%d\n";
if (gCurrentLevel == LEVEL_VENOM_2) {
if (D_360_8015F940 < 128 * 30) {
if (gAllRangeFrameCount < 128 * 30) {
hits = 50;
} else if (D_360_8015F940 < 192 * 30) {
} else if (gAllRangeFrameCount < 192 * 30) {
hits = 30;
} else if (D_360_8015F940 < 256 * 30) {
} else if (gAllRangeFrameCount < 256 * 30) {
hits = 20;
} else if (D_360_8015F940 < 320 * 30) {
} else if (gAllRangeFrameCount < 320 * 30) {
hits = 10;
}
} else {
if (D_360_8015F940 < 128 * 30) {
if (gAllRangeFrameCount < 128 * 30) {
hits = 10;
} else if (D_360_8015F940 < 192 * 30) {
} else if (gAllRangeFrameCount < 192 * 30) {
hits = 5;
} else if (D_360_8015F940 < 256 * 30) {
} else if (gAllRangeFrameCount < 256 * 30) {
hits = 2;
} else if (D_360_8015F940 < 320 * 30) {
} else if (gAllRangeFrameCount < 320 * 30) {
hits = 1;
}
}
@@ -97,12 +97,12 @@ bool func_360_8002E4F8(u16* msg, RadioCharacterId rcid) {
}
}
void func_360_8002E548(void) {
if (D_360_8015F93C != 0) {
s32 sp24 = D_360_8015F930[1];
void AllRange_UpdateCountdown(void) {
if (gShowAllRangeCountdown != 0) {
s32 seconds = gAllRangeCountdown[1];
func_hud_8008E51C(D_360_8015F930, D_360_8015F944);
if ((D_360_8015F930[0] == 0) && (sp24 != D_360_8015F930[1]) && (D_360_8015F930[1] < 15)) {
func_hud_8008E51C(gAllRangeCountdown, gAllRangeCountdownScale);
if ((gAllRangeCountdown[0] == 0) && (seconds != gAllRangeCountdown[1]) && (gAllRangeCountdown[1] < 15)) {
AUDIO_PLAY_SFX(0x4900C02A, gDefaultSfxSource, 4);
}
}
@@ -174,9 +174,9 @@ void func_360_8002E700(Player* player) {
break;
case 1:
if (gCsFrameCount >= 47) {
D_ctx_80178358 = 255;
D_ctx_8017835C = 32;
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0;
gFillScreenAlphaTarget = 255;
gFillScreenAlphaStep = 32;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0;
}
if (gCsFrameCount >= 64) {
player->unk_1D0++;
@@ -184,8 +184,8 @@ void func_360_8002E700(Player* player) {
}
break;
case 2:
if (D_ctx_80178340 == 255) {
D_ctx_80178358 = 0;
if (gFillScreenAlpha == 255) {
gFillScreenAlphaTarget = 0;
player->pos.x = 400.0f;
player->pos.y = -420.0f;
player->pos.z = 0.0f;
@@ -206,9 +206,9 @@ void func_360_8002E700(Player* player) {
}
break;
case 3:
D_ctx_8017835C = 32;
gFillScreenAlphaStep = 32;
gCsCamEyeZ -= 1.0f;
if (D_ctx_80178340 == 0) {
if (gFillScreenAlpha == 0) {
player->unk_190 = player->unk_194 = 5.0f;
player->unk_114 = 90.0f;
player->unk_0D0 = D_play_80161A54;
@@ -278,7 +278,7 @@ void func_360_8002ED60(Player* player) {
}
void func_360_8002EE34(void) {
D_360_8015F904 = gRadioState = gActors[1].iwork[1] = gActors[2].iwork[1] = gActors[3].iwork[1] = 0;
sStarWolfKillTimer = gRadioState = gActors[1].iwork[1] = gActors[2].iwork[1] = gActors[3].iwork[1] = 0;
}
void func_360_8002EE64(Actor* actor) {
@@ -390,7 +390,7 @@ void func_360_8002F180(void) {
actor->iwork[11] = 1;
if (actor->aiType <= AI360_PEPPY) {
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CC01C);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(gTeamHitbox);
actor->info.unk_1C = 0.0f;
actor->info.bonus = 0;
} else {
@@ -405,7 +405,7 @@ void func_360_8002F3E0(void) {
s32 i;
for (i = 0, actor = &gActors[4]; i < 4; i++, actor++) {
if (D_ctx_80177CD0[i] != 0) {
if (gStarWolfTeamAlive[i] != 0) {
Actor_Initialize(actor);
actor->obj.status = OBJ_ACTIVE;
actor->obj.pos.x = D_360_800C9AFC[i].x;
@@ -443,7 +443,7 @@ void func_360_8002F5F4(u16* msg, RadioCharacterId character) {
}
void func_360_8002F64C(u16* msg, RadioCharacterId character) {
if ((D_ctx_80177CD0[0] + D_ctx_80177CD0[1] + D_ctx_80177CD0[2] + D_ctx_80177CD0[3]) == 0) {
if ((gStarWolfTeamAlive[0] + gStarWolfTeamAlive[1] + gStarWolfTeamAlive[2] + gStarWolfTeamAlive[3]) == 0) {
gRadioState = 0;
}
func_360_8002F5F4(msg, character);
@@ -453,19 +453,19 @@ void func_360_8002F69C(Actor* actor) {
Actor* otherActor;
s32 i;
if (D_360_8015F904 != 0) {
D_360_8015F904--;
if ((D_360_8015F904 == 0) && (gCurrentLevel != LEVEL_BOLSE) &&
((D_ctx_80177CD0[0] + D_ctx_80177CD0[1] + D_ctx_80177CD0[2] + D_ctx_80177CD0[3]) == 1)) {
if (sStarWolfKillTimer != 0) {
sStarWolfKillTimer--;
if ((sStarWolfKillTimer == 0) && (gCurrentLevel != LEVEL_BOLSE) &&
((gStarWolfTeamAlive[0] + gStarWolfTeamAlive[1] + gStarWolfTeamAlive[2] + gStarWolfTeamAlive[3]) == 1)) {
Radio_PlayMessage(gMsg_ID_19465, RCID_FOX);
}
}
if (((D_360_8015F928 + 100) == (0, D_360_800C9B4C)) && (gCurrentLevel != LEVEL_VENOM_2)) {
if (((gAllRangeEventTimer + 100) == (0, D_360_800C9B4C)) && (gCurrentLevel != LEVEL_VENOM_2)) {
// fake?
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30);
}
if (D_360_8015F928 == D_360_800C9B4C) {
if (gAllRangeEventTimer == D_360_800C9B4C) {
func_360_8002F3E0();
actor->state = 3;
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0;
@@ -485,9 +485,9 @@ void func_360_8002F69C(Actor* actor) {
gPlayer[0].camAt.y = gActors[4].obj.pos.y;
gPlayer[0].camAt.z = gActors[4].obj.pos.z;
}
if (D_360_8015F928 > D_360_800C9B4C) {
if (D_360_8015F908 == 0) {
D_360_8015F940++;
if (gAllRangeEventTimer > D_360_800C9B4C) {
if (gStarWolfMsgTimer == 0) {
gAllRangeFrameCount++;
for (i = 1, otherActor = &gActors[1]; i < 8; i++, otherActor++) {
if ((otherActor->obj.status == OBJ_ACTIVE) && (otherActor->state == 2) && (otherActor->health < 70) &&
(otherActor->timer_0C6 != 0) && (otherActor->unk_0D4 == 1)) {
@@ -526,13 +526,13 @@ void func_360_8002F69C(Actor* actor) {
}
}
}
if (gTeamShields[1] <= 0) {
if (gTeamShields[TEAM_ID_FALCO] <= 0) {
gActors[AI360_LEON].aiIndex = AI360_FOX;
}
if (gTeamShields[2] <= 0) {
if (gTeamShields[TEAM_ID_SLIPPY] <= 0) {
gActors[AI360_ANDREW].aiIndex = AI360_FOX;
}
if (gTeamShields[3] <= 0) {
if (gTeamShields[TEAM_ID_PEPPY] <= 0) {
gActors[AI360_PIGMA].aiIndex = AI360_FOX;
}
}
@@ -611,7 +611,7 @@ void func_360_8002FC00(Actor* actor) {
bool func_360_8002FE74(void) {
switch (gCurrentLevel) {
case LEVEL_FORTUNA:
return D_360_8015F928 == D_360_800C9B4C + 2400;
return gAllRangeEventTimer == D_360_800C9B4C + 2400;
case LEVEL_BOLSE:
return gBosses[2].swork[36] == 4;
case LEVEL_KATINA:
@@ -624,16 +624,16 @@ void func_360_8002FEF0(Actor* actor) {
Actor* newActor;
s32 i;
if ((D_enmy2_80161690 != 0) && (gControllerPress[gMainController].button & R_CBUTTONS)) {
if ((gCallTimer != 0) && (gControllerPress[gMainController].button & R_CBUTTONS)) {
func_8001AF40(0);
D_enmy2_800CFF90 = 0;
D_enmy2_80161690 = 0;
gCallVoiceParam = 0;
gCallTimer = 0;
Radio_PlayMessage(gMsg_ID_20230, RCID_ROB64);
D_360_8015F900 = 160;
gAllRangeSupplyTimer = 160;
}
if (D_360_8015F900 != 0) {
D_360_8015F900--;
if (D_360_8015F900 == 0) {
if (gAllRangeSupplyTimer != 0) {
gAllRangeSupplyTimer--;
if (gAllRangeSupplyTimer == 0) {
for (i = 20, newActor = &gActors[20]; i < 60; i++, newActor++) {
if (newActor->obj.status == OBJ_FREE) {
Actor_Initialize(newActor);
@@ -657,13 +657,13 @@ void func_360_8002FEF0(Actor* actor) {
}
}
}
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (D_360_8015F910 == 0)) {
if (D_360_8015F90C != 0) {
D_360_8015F90C--;
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && !gAllRangeWingRepairSent) {
if (gAllRangeWingRepairTimer != 0) {
gAllRangeWingRepairTimer--;
}
if ((gPlayer[0].shields < 64) || func_360_8002FE74() || (D_360_8015F90C == 1)) {
D_enmy2_80161690 = 60;
D_360_8015F910 = 1;
if ((gPlayer[0].shields < 64) || func_360_8002FE74() || (gAllRangeWingRepairTimer == 1)) {
gCallTimer = 60;
gAllRangeWingRepairSent = true;
}
}
}
@@ -673,7 +673,7 @@ void func_360_8003010C(Actor* actor) {
Object_Kill(&actor->obj, actor->sfxSource);
return;
}
D_360_8015F928++;
gAllRangeEventTimer++;
switch (gCurrentLevel) {
case LEVEL_FORTUNA:
Fortuna_80187960(actor);
@@ -907,14 +907,14 @@ void func_360_8003088C(Actor* actor) {
actor->timer_0BC = 0;
}
if ((gCurrentLevel == LEVEL_KATINA) && (actor->unk_0B6 == 1) && (actor->unk_0D4 == 1)) {
if (D_360_8015F921 < 2) {
if (gKaAllyKillCount < 2) {
func_360_8002F5F4(gMsg_ID_18018, RCID_BILL);
}
D_360_8015F921++;
gKaAllyKillCount++;
}
switch (actor->aiType) {
case AI360_WOLF:
D_ctx_80177CD0[0] = 0;
gStarWolfTeamAlive[0] = 0;
if (gCurrentLevel == LEVEL_VENOM_2) {
func_360_8002F64C(gMsg_ID_19458, RCID_WOLF);
} else {
@@ -922,7 +922,7 @@ void func_360_8003088C(Actor* actor) {
}
break;
case AI360_LEON:
D_ctx_80177CD0[1] = 0;
gStarWolfTeamAlive[1] = 0;
if (gCurrentLevel == LEVEL_VENOM_2) {
func_360_8002F64C(gMsg_ID_19459, RCID_LEON);
} else {
@@ -930,7 +930,7 @@ void func_360_8003088C(Actor* actor) {
}
break;
case AI360_PIGMA:
D_ctx_80177CD0[2] = 0;
gStarWolfTeamAlive[2] = 0;
if (gCurrentLevel == LEVEL_VENOM_2) {
func_360_8002F64C(gMsg_ID_19460, RCID_PIGMA);
} else {
@@ -938,7 +938,7 @@ void func_360_8003088C(Actor* actor) {
}
break;
case AI360_ANDREW:
D_ctx_80177CD0[3] = 0;
gStarWolfTeamAlive[3] = 0;
if (gCurrentLevel == LEVEL_VENOM_2) {
func_360_8002F64C(gMsg_ID_19461, RCID_ANDREW);
} else {
@@ -946,8 +946,8 @@ void func_360_8003088C(Actor* actor) {
}
break;
}
if ((actor->aiType >= AI360_WOLF) && (actor->aiType < AI360_KATT)) {
D_360_8015F904 = 150;
if ((actor->aiType >= AI360_WOLF) && (actor->aiType <= AI360_ANDREW)) {
sStarWolfKillTimer = 150;
}
switch (actor->unk_0D4) {
case 1:
@@ -969,7 +969,8 @@ void func_360_8003088C(Actor* actor) {
case 103:
case 104:
if ((actor->aiType >= AI360_WOLF) && (actor->aiType < AI360_KATT)) {
if ((D_ctx_80177CD0[0] + D_ctx_80177CD0[1] + D_ctx_80177CD0[2] + D_ctx_80177CD0[3]) == 0) {
if ((gStarWolfTeamAlive[0] + gStarWolfTeamAlive[1] + gStarWolfTeamAlive[2] +
gStarWolfTeamAlive[3]) == 0) {
switch (actor->unk_0D4) {
case 102:
Radio_PlayMessage(gMsg_ID_9438, RCID_FALCO);
@@ -1052,8 +1053,8 @@ void func_360_8003088C(Actor* actor) {
} else if (actor->unk_0D4 < 105) {
if (actor->aiType >= AI360_WOLF) {
if (actor->unk_0D4 == 1) {
if ((gCurrentLevel == LEVEL_KATINA) && (actor->unk_0B6 == 1) && (D_360_8015F920 == 0)) {
D_360_8015F920 = 1;
if ((gCurrentLevel == LEVEL_KATINA) && (actor->unk_0B6 == 1) && (gKaKilledAlly == 0)) {
gKaKilledAlly = 1;
Radio_PlayMessage(gMsg_ID_18015, RCID_BILL);
} else if (actor->aiType == AI360_KATT) {
func_360_8002F5F4(gMsg_ID_20084, RCID_KATT);
@@ -1093,7 +1094,7 @@ void func_360_8003088C(Actor* actor) {
(actor->iwork[2] != AI360_FOX)) {
switch (actor->aiType) {
case AI360_FALCO:
if (gTeamShields[1] >= 90) {
if (gTeamShields[TEAM_ID_FALCO] >= 90) {
func_360_8002F5F4(gMsg_ID_9130, RCID_FALCO);
} else {
Radio_PlayMessage(gMsg_ID_9151, RCID_FALCO);
@@ -1104,7 +1105,7 @@ void func_360_8003088C(Actor* actor) {
}
break;
case AI360_SLIPPY:
if (gTeamShields[2] >= 90) {
if (gTeamShields[TEAM_ID_SLIPPY] >= 90) {
func_360_8002F5F4(gMsg_ID_9140, RCID_SLIPPY);
} else {
Radio_PlayMessage(gMsg_ID_9152, RCID_SLIPPY);
@@ -1115,7 +1116,7 @@ void func_360_8003088C(Actor* actor) {
}
break;
case AI360_PEPPY:
if (gTeamShields[3] >= 90) {
if (gTeamShields[TEAM_ID_PEPPY] >= 90) {
func_360_8002F5F4(gMsg_ID_9150, RCID_PEPPY);
} else {
Radio_PlayMessage(gMsg_ID_9153, RCID_PEPPY);
@@ -1221,7 +1222,7 @@ void ActorAllRange_Update(Actor* this) {
}
}
if ((this->timer_0CA[0] != 0) && (gCurrentLevel != LEVEL_VENOM_2) && (this->aiType < AI360_10) &&
(this->timer_0CA[0] < 5) && !(gGameFrameCount & 0x1F)) {
(this->timer_0CA[0] < 5) && ((gGameFrameCount % 32) == 0)) {
this->iwork[16] = 10;
}
if ((this->iwork[16] != 0) && (this->state < 7)) {
@@ -1567,8 +1568,8 @@ void ActorAllRange_Update(Actor* this) {
this->iwork[0] = 1;
}
}
if ((gRadioState == 0) && (this->timer_0C4 == 0) && (D_360_8015F928 > 700) &&
(D_360_8015F908 == 0) && (gActors[0].obj.status == OBJ_ACTIVE)) {
if ((gRadioState == 0) && (this->timer_0C4 == 0) && (gAllRangeEventTimer > 700) &&
(gStarWolfMsgTimer == 0) && (gActors[0].obj.status == OBJ_ACTIVE)) {
this->timer_0C4 = 600;
if (Rand_ZeroOne() < 0.5f) {
gActors[this->aiIndex].iwork[6]++;
@@ -1616,22 +1617,22 @@ void ActorAllRange_Update(Actor* this) {
}
break;
case AI360_WOLF:
if (D_ctx_80177CD0[0] != 0) {
if (gStarWolfTeamAlive[0] != 0) {
func_360_8002F5F4(gMsg_ID_9330, RCID_WOLF);
}
break;
case AI360_LEON:
if (D_ctx_80177CD0[1] != 0) {
if (gStarWolfTeamAlive[1] != 0) {
func_360_8002F5F4(gMsg_ID_9340, RCID_LEON);
}
break;
case AI360_PIGMA:
if (D_ctx_80177CD0[2] != 0) {
if (gStarWolfTeamAlive[2] != 0) {
func_360_8002F5F4(gMsg_ID_9350, RCID_PIGMA);
}
break;
case AI360_ANDREW:
if (D_ctx_80177CD0[3] != 0) {
if (gStarWolfTeamAlive[3] != 0) {
func_360_8002F5F4(gMsg_ID_9360, RCID_ANDREW);
}
break;
@@ -1818,7 +1819,7 @@ void ActorAllRange_Update(Actor* this) {
break;
case 8:
this->fwork[1] = 40.0f;
if (this->index & 1) {
if ((this->index % 2) != 0) {
Math_SmoothStepToAngle(&this->obj.rot.z, 355.0f, 0.1f, 3.0f, 0.01f);
} else {
Math_SmoothStepToAngle(&this->obj.rot.z, 5.0f, 0.1f, 3.0f, 0.01f);
@@ -1942,7 +1943,7 @@ void ActorAllRange_Update(Actor* this) {
}
if ((this->fwork[7] > 0.01f) && (this->fwork[7] < 359.9f)) {
Math_SmoothStepToAngle(&this->obj.rot.z, this->fwork[7], 0.2f, 100.0f, 0.01f);
if ((this->aiType == AI360_KATT) && !(gGameFrameCount & 1)) {
if ((this->aiType == AI360_KATT) && ((gGameFrameCount % 2) == 0)) {
if ((this->fwork[7] > 10.0f) && (this->fwork[7] < 350.0f)) {
Matrix_RotateY(gCalcMatrix, this->obj.rot.y * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, this->obj.rot.x * M_DTOR, 1);
@@ -2154,7 +2155,7 @@ void func_360_80035098(Actor* actor) {
bool func_360_800352E0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) {
Actor* this = thisx;
if (this->timer_0C6 & 1) {
if ((this->timer_0C6 % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x22);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 128, 128, 255);
} else {
@@ -2165,41 +2166,40 @@ bool func_360_800352E0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
}
if ((limbIndex == 1) || (limbIndex == 2)) {
RCP_SetupDL(&gMasterDisp, 0x22);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, (s32) D_360_8015F914, (s32) D_360_8015F918, (s32) D_360_8015F91C,
255);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, (s32) gSzMissileR, (s32) gSzMissileG, (s32) gSzMissileB, 255);
}
return false;
}
void ActorAllRange_Draw(Actor* actor) {
void ActorAllRange_Draw(ActorAllRange* this) {
f32 sp38;
s32 pad[3];
Vec3f sp1E4 = { 0.0f, 0.0f, 0.0f };
Vec3f sp7C[30];
f32 pad2;
if (actor->aiType != AI360_EVENT_HANDLER) {
if ((actor->iwork[8] != 0) && (actor->aiType < AI360_GREAT_FOX)) {
pad2 = SIN_DEG(actor->iwork[8] * 400.0f);
sp38 = actor->iwork[8] * pad2;
if (this->aiType != AI360_EVENT_HANDLER) {
if ((this->iwork[8] != 0) && (this->aiType < AI360_GREAT_FOX)) {
pad2 = SIN_DEG(this->iwork[8] * 400.0f);
sp38 = this->iwork[8] * pad2;
Matrix_RotateY(gGfxMatrix, M_DTOR * sp38, 1);
Matrix_RotateX(gGfxMatrix, M_DTOR * sp38, 1);
Matrix_RotateZ(gGfxMatrix, M_DTOR * sp38, 1);
Matrix_SetGfxMtx(&gMasterDisp);
}
if ((actor->timer_0C6 % 2) == 0) {
if ((this->timer_0C6 % 2) == 0) {
RCP_SetupDL(&gMasterDisp, 0x1D);
gSPFogPosition(gMasterDisp++, gFogNear, 1005);
}
switch (actor->aiType) {
switch (this->aiType) {
case AI360_FOX:
case AI360_FALCO:
case AI360_SLIPPY:
case AI360_PEPPY:
Matrix_Push(&gGfxMatrix);
func_edisplay_8005B388(actor);
func_edisplay_8005B388(this);
Matrix_Pop(&gGfxMatrix);
func_360_80035098(actor);
func_360_80035098(this);
break;
case AI360_WOLF:
case AI360_LEON:
@@ -2209,43 +2209,43 @@ void ActorAllRange_Draw(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F0103D0);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 30.0f, 0.0f, -60.0f, 1);
func_edisplay_8005B1E8(actor, 2);
func_edisplay_8005B1E8(this, 2);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, -30.0f, 0.0f, -60.0f, 1);
func_edisplay_8005B1E8(actor, 2);
func_edisplay_8005B1E8(this, 2);
Matrix_Pop(&gGfxMatrix);
func_360_80035098(actor);
func_360_80034E64(actor);
func_360_80035098(this);
func_360_80034E64(this);
} else {
gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F00F200);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1);
if (gCurrentLevel == LEVEL_BOLSE) {
func_edisplay_8005B1E8(actor, 3);
func_edisplay_8005B1E8(this, 3);
} else {
func_edisplay_8005B1E8(actor, 2);
func_edisplay_8005B1E8(this, 2);
}
}
break;
case AI360_KATT:
gSPDisplayList(gMasterDisp++, D_D009A40);
func_edisplay_8005ADAC(actor);
func_edisplay_8005ADAC(this);
break;
case AI360_BILL:
gSPDisplayList(gMasterDisp++, D_D00B880);
func_edisplay_8005ADAC(actor);
func_edisplay_8005ADAC(this);
break;
case AI360_GREAT_FOX:
func_edisplay_8005F670(&actor->obj.pos);
actor->unk_0B6 = 1;
func_demo_8004FEC0(actor);
func_edisplay_8005F670(&this->obj.pos);
this->unk_0B6 = 1;
func_demo_8004FEC0(this);
break;
case AI360_MISSILE:
Animation_GetFrameData(&D_SZ_6006D64, 0, sp7C);
Animation_DrawSkeleton(3, D_SZ_6006E50, sp7C, func_360_800352E0, NULL, actor, gCalcMatrix);
Animation_DrawSkeleton(3, D_SZ_6006E50, sp7C, func_360_800352E0, NULL, this, gCalcMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -400.0f, 1);
Matrix_Scale(gGfxMatrix, actor->fwork[29], actor->fwork[29], actor->fwork[29], 1);
func_edisplay_8005B1E8(actor, 3);
Matrix_Scale(gGfxMatrix, this->fwork[29], this->fwork[29], this->fwork[29], 1);
func_edisplay_8005B1E8(this, 3);
break;
default:
if (gCurrentLevel == LEVEL_FORTUNA) {
@@ -2254,47 +2254,47 @@ void ActorAllRange_Draw(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_FO_6006BE0);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -100.0f, 1);
Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1);
func_edisplay_8005B1E8(actor, 2);
func_edisplay_8005B1E8(this, 2);
} else if (gCurrentLevel == LEVEL_KATINA) {
switch (actor->unk_0B6) {
switch (this->unk_0B6) {
case 0:
gSPDisplayList(gMasterDisp++, D_KA_600EFF0);
break;
case 1:
gSPDisplayList(gMasterDisp++, D_KA_600E050);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1);
func_edisplay_8005B1E8(actor, 0);
func_edisplay_8005B1E8(this, 0);
break;
case 3:
gSPDisplayList(gMasterDisp++, D_KA_6001530);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 30.0f, 1);
func_360_80034E64(actor);
func_360_80034E64(this);
break;
}
} else if (gCurrentLevel == LEVEL_SECTOR_Z) {
gSPDisplayList(gMasterDisp++, D_SZ_6004FE0) Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1);
func_edisplay_8005B1E8(actor, 2);
func_edisplay_8005B1E8(this, 2);
} else if (gCurrentLevel == LEVEL_BOLSE) {
gSPDisplayList(gMasterDisp++, D_BO_6008770) Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1);
func_edisplay_8005B1E8(actor, 2);
func_edisplay_8005B1E8(this, 2);
Matrix_Pop(&gGfxMatrix);
func_360_80034E64(actor);
func_360_80034E64(this);
} else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
Animation_GetFrameData(&D_VE2_600C200, actor->unk_04A, actor->vwork);
Animation_GetFrameData(&D_VE2_600C200, this->unk_04A, this->vwork);
Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1);
Animation_DrawSkeleton(0, D_VE2_600C2AC, actor->vwork, NULL, NULL, actor, &gIdentityMatrix);
Animation_DrawSkeleton(0, D_VE2_600C2AC, this->vwork, NULL, NULL, this, &gIdentityMatrix);
} else if (gCurrentLevel == LEVEL_VERSUS) {
gSPDisplayList(gMasterDisp++, D_versus_3015740);
} else if (gCurrentLevel == LEVEL_TRAINING) {
if (actor->aiIndex == AI360_FOX) {
if (this->aiIndex == AI360_FOX) {
gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F00F200);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1);
func_edisplay_8005B1E8(actor, 3);
func_edisplay_8005B1E8(this, 3);
} else {
gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40068F0);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1);
func_edisplay_8005B1E8(actor, 2);
func_edisplay_8005B1E8(this, 2);
}
}
break;
src/engine/fox_A48A0.c
+7 -7
View File
@@ -14,13 +14,13 @@ void func_800A3CA0(void) {
void func_800A3E00(void) {
switch (D_ctx_80177868) {
case 0:
if (D_Timer_8017783C == 0) {
if (gNextGameStateTimer == 0) {
D_ctx_80177868 = 1;
}
break;
case 1:
D_ctx_80177868 = 2;
gDrawMode = DRAWMODE_7;
gDrawMode = DRAW_UNK_7;
gCsCamAtY = 0.0f;
gCsCamAtX = gCsCamAtY;
gCsCamEyeZ = gCsCamAtX;
@@ -32,14 +32,14 @@ void func_800A3E00(void) {
if ((gControllerPress[0].button & START_BUTTON) || (gControllerPress[1].button & START_BUTTON)) {
func_8001D638(0);
D_ctx_80177868 = 3;
gDrawMode = DRAWMODE_0;
func_play_800A5844();
D_Timer_8017783C = 0;
gDrawMode = DRAW_NONE;
Play_Setup();
gNextGameStateTimer = 0;
}
break;
case 3:
if (D_Timer_8017783C == 0) {
D_ctx_80177854 = 2;
if (gNextGameStateTimer == 0) {
gPlayState = PLAY_UPDATE;
}
break;
}
src/engine/fox_beam.c
+47 -45
View File
@@ -60,7 +60,7 @@ void func_beam_80035E78(PlayerShot* shot) {
gScreenFlashTimer = 4;
if (shot->obj.pos.y < (gGroundLevel + 450.0f)) {
gCameraShake = 15;
if (D_ctx_80161A88 == 2) {
if (gGroundType == GROUNDTYPE_WATER) {
func_effect_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
shot->unk_48 * 3.0f, 0);
func_effect_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
@@ -184,7 +184,7 @@ void func_beam_800365E4(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, f32 ar
s32 unk44, s32 time) {
s32 i;
if ((D_ctx_801784AC != 4) && (gLevelType == LEVELTYPE_PLANET) && (D_ctx_80161A88 != 2) &&
if ((D_ctx_801784AC != 4) && (gLevelType == LEVELTYPE_PLANET) && (gGroundType != GROUNDTYPE_WATER) &&
(gCurrentLevel != LEVEL_SOLAR) && (gCurrentLevel != LEVEL_BOLSE) && (gCurrentLevel != LEVEL_TRAINING) &&
(gCurrentLevel != LEVEL_ZONESS)) {
for (i = 0; i < 50; i++) {
@@ -213,7 +213,7 @@ void func_beam_800366CC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot,
void func_beam_80036770(f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) {
s32 i;
if ((D_ctx_801784AC != 4) && (gLevelType == LEVELTYPE_PLANET) && (D_ctx_80161A88 <= 0) &&
if ((D_ctx_801784AC != 4) && (gLevelType == LEVELTYPE_PLANET) && (gGroundType <= GROUNDTYPE_GRASS) &&
(gCurrentLevel != LEVEL_TRAINING) && (gCurrentLevel != LEVEL_SOLAR) && (gCurrentLevel != LEVEL_ZONESS)) {
for (i = 0; i < 50; i++) {
if (gEffects[i].obj.status == OBJ_FREE) {
@@ -459,12 +459,12 @@ bool func_beam_80037438(PlayerShot* shot, Actor* actor) {
return false;
}
bool func_beam_80037698(PlayerShot* shot, Object_4C* obj4C) {
f32* temp_v0 = obj4C->info.hitbox;
bool func_beam_80037698(PlayerShot* shot, Sprite* sprite) {
f32* temp_v0 = sprite->info.hitbox;
if (((s32) temp_v0[0] != 0) && (fabsf(temp_v0[1] + obj4C->obj.pos.z - shot->obj.pos.z) < temp_v0[2]) &&
(fabsf(temp_v0[3] + obj4C->obj.pos.y - shot->obj.pos.y) < temp_v0[4]) &&
(fabsf(temp_v0[5] + obj4C->obj.pos.x - shot->obj.pos.x) < temp_v0[6])) {
if (((s32) temp_v0[0] != 0) && (fabsf(temp_v0[1] + sprite->obj.pos.z - shot->obj.pos.z) < temp_v0[2]) &&
(fabsf(temp_v0[3] + sprite->obj.pos.y - shot->obj.pos.y) < temp_v0[4]) &&
(fabsf(temp_v0[5] + sprite->obj.pos.x - shot->obj.pos.x) < temp_v0[6])) {
return true;
}
return false;
@@ -730,7 +730,7 @@ void func_beam_80038140(PlayerShot* shot) {
Actor* actor;
Boss* boss;
Object_58* obj58;
Object_4C* obj4C;
Sprite* sprite;
Object_80* obj80;
Effect* effect;
bool sp60;
@@ -929,15 +929,15 @@ void func_beam_80038140(PlayerShot* shot) {
}
}
if (sp60) {
for (i = 0, obj4C = gObjects4C; i < 40; i++, obj4C++) {
if (obj4C->obj.status == OBJ_ACTIVE) {
if (obj4C->obj.id != OBJ_4C_169) {
if (func_beam_80037698(shot, obj4C)) {
obj4C->unk_46 = 1;
for (i = 0, sprite = gSprites; i < 40; i++, sprite++) {
if (sprite->obj.status == OBJ_ACTIVE) {
if (sprite->obj.id != OBJ_SPRITE_TI_CACTUS) {
if (func_beam_80037698(shot, sprite)) {
sprite->unk_46 = 1;
}
} else {
if (func_beam_80036874(shot, obj4C->info.hitbox, &obj4C->obj) != 0) {
obj4C->unk_46 = 1;
if (func_beam_80036874(shot, sprite->info.hitbox, &sprite->obj) != 0) {
sprite->unk_46 = 1;
}
}
}
@@ -1257,7 +1257,7 @@ void func_beam_80039A50(PlayerShot* shot) {
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 40.0f * M_DTOR, 1);
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.7f, 1);
} else {
Matrix_Scale(gGfxMatrix, 1.2f, 1.2f, 1.2f, 1);
@@ -1334,7 +1334,7 @@ void func_beam_80039A50(PlayerShot* shot) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_versus_301AD60);
} else {
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
var_fv1 = M_PI;
} else {
var_fv1 = 0.0f;
@@ -1346,7 +1346,7 @@ void func_beam_80039A50(PlayerShot* shot) {
gSPDisplayList(gMasterDisp++, D_versus_301AD60);
}
} else {
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
var_fv1 = M_PI;
} else {
var_fv1 = 0.0f;
@@ -1436,7 +1436,7 @@ void func_beam_80039A50(PlayerShot* shot) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_101C2E0);
Matrix_Pop(&gGfxMatrix);
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.7f, 1);
} else {
Matrix_Scale(gGfxMatrix, 1.3f, 1.3f, 1.3f, 1);
@@ -1452,7 +1452,7 @@ void func_beam_80039A50(PlayerShot* shot) {
Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_ctx_80177D20, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1);
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
Matrix_Scale(gGfxMatrix, 1.2f, 1.2f, 1.2f, 1);
} else {
Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1);
@@ -1560,7 +1560,7 @@ void func_beam_8003B00C(PlayerShot* shot, Player* player) {
shot->unk_48 += shot->vel.x;
shot->unk_4C += shot->vel.y;
shot->unk_50 += shot->vel.z;
if (!(gGameFrameCount & 3)) {
if (((gGameFrameCount % 4) == 0)) {
func_play_800A668C(D_ctx_8017849C, D_ctx_801784A0, D_ctx_80178498);
}
if ((fabsf(shot->obj.pos.x - shot->unk_48) < 200.0f) && (fabsf(shot->obj.pos.y - shot->unk_4C) < 200.0f) &&
@@ -1591,7 +1591,7 @@ void func_beam_8003B55C(PlayerShot* shot, s32 index) {
Vec3f sp44;
Vec3f sp38;
if ((D_ctx_80161A88 == 2) && (shot->obj.pos.y < (gGroundLevel + 50.0f)) && (index == 0)) {
if ((gGroundType == GROUNDTYPE_WATER) && (shot->obj.pos.y < (gGroundLevel + 50.0f)) && (index == 0)) {
func_effect_8007ACE0(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y + 20.0f);
func_effect_8007ACE0(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y - 20.0f);
}
@@ -1620,7 +1620,7 @@ void func_beam_8003B55C(PlayerShot* shot, s32 index) {
func_beam_80036770(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f);
}
}
if (D_ctx_80161A88 == 2) {
if (gGroundType == GROUNDTYPE_WATER) {
Object_Kill(&shot->obj, shot->sfxSource);
return;
}
@@ -1644,7 +1644,7 @@ void func_beam_8003B55C(PlayerShot* shot, s32 index) {
if (shot->unk_64 == 0) {
Object_Kill(&shot->obj, shot->sfxSource);
return;
} else if ((shot->playerNum < 110) || (shot->unk_64 & 1)) {
} else if ((shot->playerNum < 110) || ((shot->unk_64 % 2) != 0)) {
func_beam_80038140(shot);
}
}
@@ -1761,10 +1761,10 @@ void func_beam_8003C008(PlayerShot* shot) {
for (i = 0; i < ARRAY_COUNT(gBosses); i++, boss++) {
if ((boss->obj.status == OBJ_ACTIVE) && (boss->timer_05A == 0)) {
if (boss->obj.id == OBJ_BOSS_316) {
var_s6 = gGameFrameCount & 7;
var_s6 = gGameFrameCount % 8U;
var_fs2 = shot->unk_44 * 40.0f;
} else {
var_s6 = gGameFrameCount & 0xF;
var_s6 = gGameFrameCount % 16U;
var_fs2 = shot->unk_44 * 30.0f;
}
hitboxData = boss->info.hitbox;
@@ -1839,7 +1839,7 @@ void func_beam_8003C4D0(PlayerShot* shot, s32 damage) {
f32 sp60;
s32 pad[2];
Actor* actor;
Object_4C* obj4C;
Sprite* sprite;
Object_80* obj80;
Effect* effect;
Player* player;
@@ -1856,14 +1856,15 @@ void func_beam_8003C4D0(PlayerShot* shot, s32 damage) {
obj80->dmgPart = 0;
}
}
for (i = 0, obj4C = gObjects4C; i < 40; i++, obj4C++) {
if ((obj4C->obj.status == OBJ_ACTIVE) && ((obj4C->obj.id == OBJ_4C_163) || (obj4C->obj.id == OBJ_4C_169) ||
(obj4C->obj.id == OBJ_4C_161) || (obj4C->obj.id == OBJ_4C_162))) {
sp68 = obj4C->obj.pos.x - shot->obj.pos.x;
sp64 = obj4C->obj.pos.y - shot->obj.pos.y;
sp60 = obj4C->obj.pos.z - shot->obj.pos.z;
for (i = 0, sprite = gSprites; i < 40; i++, sprite++) {
if ((sprite->obj.status == OBJ_ACTIVE) &&
((sprite->obj.id == OBJ_SPRITE_FO_POLE) || (sprite->obj.id == OBJ_SPRITE_TI_CACTUS) ||
(sprite->obj.id == OBJ_SPRITE_CO_POLE) || (sprite->obj.id == OBJ_SPRITE_CO_TREE))) {
sp68 = sprite->obj.pos.x - shot->obj.pos.x;
sp64 = sprite->obj.pos.y - shot->obj.pos.y;
sp60 = sprite->obj.pos.z - shot->obj.pos.z;
if (sqrtf(SQ(sp68) + SQ(sp64) + SQ(sp60)) < temp_fs2) {
obj4C->unk_46 = 1;
sprite->unk_46 = 1;
}
}
}
@@ -1898,7 +1899,7 @@ void func_beam_8003C4D0(PlayerShot* shot, s32 damage) {
if (actor->info.bonus != 0) {
shot->bonus++;
}
} else if ((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->scale >= 0.5f) && (damage >= 31)) {
} else if ((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->scale >= 0.5f) && (damage > 30)) {
actor->unk_0D4 = shot->playerNum + 1;
actor->vel.x = sp68 * 0.03f;
actor->vel.y = sp64 * 0.03f;
@@ -2065,7 +2066,7 @@ void func_beam_8003CF90(PlayerShot* shot) {
Player* player;
if ((shot->obj.pos.y < gGroundLevel) || (shot->unk_64 == 1)) {
if ((D_ctx_80161A88 == 2) && (shot->obj.pos.y < gGroundLevel)) {
if ((gGroundType == GROUNDTYPE_WATER) && (shot->obj.pos.y < gGroundLevel)) {
shot->unk_48 = 10.0f;
func_effect_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
shot->unk_48 * 3.0f, 0);
@@ -2207,18 +2208,19 @@ void func_beam_8003D54C(PlayerShot* shot, s32 index) {
gHitCount += shot->bonus;
}
if ((shot->bonus >= 7) && (gBossActive == 0) && (gLevelMode == LEVELMODE_ON_RAILS) &&
((gTeamShields[1] > 0) || (gTeamShields[2] > 0) || (gTeamShields[3] > 0))) {
((gTeamShields[TEAM_ID_FALCO] > 0) || (gTeamShields[TEAM_ID_SLIPPY] > 0) ||
(gTeamShields[TEAM_ID_PEPPY] > 0))) {
do {
teamId = RAND_INT(2.9f) + 1;
} while (gTeamShields[teamId] <= 0);
switch (teamId) {
case 1:
case TEAM_ID_FALCO:
Radio_PlayMessage(gMsg_ID_7100, RCID_FALCO);
break;
case 2:
case TEAM_ID_SLIPPY:
Radio_PlayMessage(gMsg_ID_15252, RCID_SLIPPY);
break;
case 3:
case TEAM_ID_PEPPY:
Radio_PlayMessage(gMsg_ID_17160, RCID_PEPPY);
break;
}
@@ -2276,7 +2278,7 @@ void func_beam_8003D854(PlayerShot* shot) {
}
}
void func_beam_8003D9B8(void) {
void PlayerShot_Update(void) {
s32 i;
for (i = 0; i < 16; i++) {
@@ -2285,18 +2287,18 @@ void func_beam_8003D9B8(void) {
}
}
void func_beam_8003DA0C(void) {
void PlayerShot_Draw(void) {
s32 i;
for (i = 0; i < 16; i++) {
gPlayerShots[i].index = i;
if (gPlayerShots[i].obj.status != 0) {
if (!((D_display_80161410 < 0) && (gPlayerShots[i].obj.rot.x < -10.0f))) {
if (!((gReflectY < 0) && (gPlayerShots[i].obj.rot.x < -10.0f))) {
Matrix_Push(&gGfxMatrix);
func_beam_8003AF88(&gPlayerShots[i]);
Matrix_Pop(&gGfxMatrix);
}
if (D_display_80161410 > 0) {
if (gReflectY > 0) {
func_edisplay_8005F290(gPlayerShots[i].sfxSource, &D_beam_8015F950);
}
}
src/engine/fox_bg.c
+28 -26
View File
@@ -21,6 +21,9 @@
#include "assets/ast_area_6.h"
#include "assets/ast_zoness.h"
#include "prevent_bss_reordering2.h"
#include "prevent_bss_reordering3.h"
f32 D_bg_8015F960;
u8 D_bg_8015F964;
f32 D_bg_8015F968;
@@ -505,8 +508,7 @@ void func_bg_8003E1E8(void) {
RCP_SetupDL_36();
sp138 = D_ctx_80178420;
sp134 = D_ctx_80178424;
if (((gCurrentLevel == LEVEL_SECTOR_X) || (gCurrentLevel == LEVEL_METEO)) &&
(D_ctx_8017827C == 1)) {
if (((gCurrentLevel == LEVEL_SECTOR_X) || (gCurrentLevel == LEVEL_METEO)) && (gLevelStage == 1)) {
sp11C = LEVEL_WARP_ZONE;
}
if (sp11C == LEVEL_SECTOR_X) {
@@ -604,7 +606,7 @@ void func_bg_8003E1E8(void) {
break;
case LEVEL_FORTUNA:
sp128 = 1.5f;
if ((gCsFrameCount > 400) && (D_ctx_80177930 == 0)) {
if ((gCsFrameCount > 400) && (gNextPlanetPath == 0)) {
sp128 = 0.75f;
}
Matrix_Translate(gGfxMatrix, sp138 - 120.0f, -(sp134 - 120.0f), -290.0f, 1);
@@ -676,23 +678,23 @@ void func_bg_80040450(void) {
Gfx** var_s3;
f32* var_s4;
s32 i;
s32 temp = gLevelType;
s32 levelType = gLevelType;
if ((gCurrentLevel == LEVEL_KATINA) || (gCurrentLevel == LEVEL_VENOM_2) || (gCurrentLevel == LEVEL_VENOM_ANDROSS) ||
(gCurrentLevel == LEVEL_SOLAR) || (gCurrentLevel == LEVEL_TRAINING) || gVersusMode) {
return;
}
D_ctx_80178380[gPlayerNum] -= D_bg_800C9E4C[temp];
if (D_ctx_80178380[gPlayerNum] > 300) {
D_ctx_80178380[gPlayerNum] = 0;
gPlayerFillScreenAlphas[gPlayerNum] -= D_bg_800C9E4C[levelType];
if (gPlayerFillScreenAlphas[gPlayerNum] > 300) {
gPlayerFillScreenAlphas[gPlayerNum] = 0;
}
if (((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2)) ||
(((gPlayer[gPlayerNum].state_1C8 == PLAYERSTATE_1C8_5) || (gLevelMode == LEVELMODE_ALL_RANGE) ||
(gPlayer[gPlayerNum].state_1C8 == PLAYERSTATE_1C8_7)) &&
(gLevelType == LEVELTYPE_PLANET) && (gCurrentLevel != LEVEL_TITANIA) && (gCurrentLevel != LEVEL_AQUAS))) {
D_ctx_80178390[gPlayerNum] = 128;
D_ctx_801783A0[gPlayerNum] = 128;
D_ctx_801783B0[gPlayerNum] = 128;
gPlayerFillScreenReds[gPlayerNum] = 128;
gPlayerFillScreenGreens[gPlayerNum] = 128;
gPlayerFillScreenBlues[gPlayerNum] = 128;
sp44 = Math_RadToDeg(gPlayer[gPlayerNum].unk_058);
var_fa0 = Math_RadToDeg(gPlayer[gPlayerNum].unk_05C);
if (var_fa0 > 180.0f) {
@@ -704,18 +706,18 @@ void func_bg_80040450(void) {
if (gCurrentLevel == LEVEL_KATINA) {
D_ctx_801783D4 -= 80.0f;
}
if ((gCurrentLevel == LEVEL_ZONESS) && (gPlayer[0].unk_1D0 >= 2) && (D_enmy_80161684 == 0)) {
if ((gCurrentLevel == LEVEL_ZONESS) && (gPlayer[0].unk_1D0 >= 2) && !gMissedZoSearchlight) {
D_ctx_801783D4 -= 60.0f;
D_ctx_801783D0 -= 480.0f;
}
if ((D_ctx_801783D0 < 120.0f) && (D_ctx_801783D0 > -120.0f) && (D_ctx_801783D4 < 120.0f)) {
D_ctx_80178380[gPlayerNum] += D_bg_800C9E4C[temp] * 2;
if (D_bg_800C9E54[temp] < D_ctx_80178380[gPlayerNum]) {
D_ctx_80178380[gPlayerNum] = D_bg_800C9E54[temp];
gPlayerFillScreenAlphas[gPlayerNum] += D_bg_800C9E4C[levelType] * 2;
if (D_bg_800C9E54[levelType] < gPlayerFillScreenAlphas[gPlayerNum]) {
gPlayerFillScreenAlphas[gPlayerNum] = D_bg_800C9E54[levelType];
}
}
}
if (D_ctx_80178380[gPlayerNum] != 0) {
if (gPlayerFillScreenAlphas[gPlayerNum] != 0) {
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, gPlayer[gPlayerNum].unk_034 * M_DTOR, 1);
Matrix_Translate(gGfxMatrix, D_ctx_801783D0, D_ctx_801783D4, -200.0f, 1);
@@ -755,12 +757,12 @@ void func_bg_80040954(void) {
f32 var_fv0;
if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) || (gLevelType == LEVELTYPE_SPACE) ||
(D_ctx_80178380[gPlayerNum] == 0)) {
(gPlayerFillScreenAlphas[gPlayerNum] == 0)) {
return;
}
var_fs2 = 1.0f;
if (D_ctx_80178380[gPlayerNum] < 80) {
var_fs2 = D_ctx_80178380[gPlayerNum] / 80.0f;
if (gPlayerFillScreenAlphas[gPlayerNum] < 80) {
var_fs2 = gPlayerFillScreenAlphas[gPlayerNum] / 80.0f;
}
var_fs2 *= D_bg_800C9E5C[gLevelType];
Matrix_Push(&gGfxMatrix);
@@ -887,16 +889,16 @@ void func_bg_80040CE4(void) {
temp_fv0 = Math_ModF((10000.0f - gPlayer[gPlayerNum].unk_0AC) * 0.32f, 128.0f);
gDPSetupTile(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, temp_fv0, temp_s0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
switch (D_ctx_80161A88) {
case 0:
switch (gGroundType) {
case GROUNDTYPE_GRASS:
gDPLoadTileTexture(gMasterDisp++, D_CO_601B6C0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gBgColor = 0x845; // 8, 8, 32
break;
case 1:
case GROUNDTYPE_ROCK:
gDPLoadTileTexture(gMasterDisp++, D_CO_6028260, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gBgColor = 0x845; // 8, 8, 32
break;
case 2:
case GROUNDTYPE_WATER:
RCP_SetupDL_45(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 128);
gDPLoadTileTexture(gMasterDisp++, D_CO_6028A60, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
@@ -914,7 +916,7 @@ void func_bg_80040CE4(void) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_CO_601B640);
} else {
D_ctx_80161A88 = 0;
gGroundType = GROUNDTYPE_GRASS;
gBgColor = 0x845; // 8, 8, 32
for (i = 0; i < 4; i++) {
Matrix_Push(&gGfxMatrix);
@@ -1100,7 +1102,7 @@ void func_bg_80040CE4(void) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -2000.0f, 1);
Matrix_Scale(gGfxMatrix, 3.0f, 2.0f, 3.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (gGameFrameCount & 1) {
if ((gGameFrameCount % 2) != 0) {
gSPDisplayList(gMasterDisp++, D_SO_60005B0);
} else {
gSPDisplayList(gMasterDisp++, D_SO_6002E60);
@@ -1111,7 +1113,7 @@ void func_bg_80040CE4(void) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -1500.0f, 1);
Matrix_Scale(gGfxMatrix, 3.0f, 2.0f, 3.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (gGameFrameCount & 1) {
if ((gGameFrameCount % 2) != 0) {
gSPDisplayList(gMasterDisp++, D_ZO_6008830);
} else {
gSPDisplayList(gMasterDisp++, D_ZO_600B0E0);
@@ -1137,7 +1139,7 @@ void func_bg_80042D38(void) {
RCP_SetupDL_37(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 125);
Matrix_SetGfxMtx(&gMasterDisp);
if (gGameFrameCount & 1) {
if ((gGameFrameCount % 2) != 0) {
gSPDisplayList(gMasterDisp++, D_AQ_602C030);
} else {
gSPDisplayList(gMasterDisp++, D_AQ_602C088);
src/engine/fox_boss.c
+6 -6
View File
@@ -41,22 +41,22 @@ void func_boss_80042EC0(Boss* boss) {
D_ctx_80177850 = 15;
}
void Boss299_Init(Boss* boss) {
void Boss299_Init(Boss299* this) {
}
void Boss299_Update(Boss* boss) {
void Boss299_Update(Boss299* this) {
}
void Boss299_Draw(Boss* boss) {
void Boss299_Draw(Boss299* this) {
}
void Boss300_Init(Boss* boss) {
void Boss300_Init(Boss300* this) {
}
void Boss300_Update(Boss* boss) {
void Boss300_Update(Boss300* this) {
}
void Boss300_Draw(Boss* boss) {
void Boss300_Draw(Boss300* this) {
}
void func_boss_80042FF4(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,
src/engine/fox_context.c
+33 -33
View File
@@ -9,10 +9,10 @@ s32 gOverlayStage;
s32 D_ctx_80177824; // some sort of flag
s32 D_ctx_8017782C; // some sort of flag. all range related?
GameState gGameState;
s32 D_Timer_8017783C; // next game state timer?
s32 D_ctx_80177844; // timer for vs item spawn
s32 gNextGameStateTimer; // next game state timer?
s32 D_ctx_80177844; // timer for vs item spawn
OptionState gOptionMenuStatus;
s32 D_ctx_80177854; // pause-related state
s32 gPlayState; // pause-related state
s32 D_ctx_80177868; // some sort of state. pause-related?
LevelMode gLevelMode;
DrawMode gDrawMode;
@@ -20,9 +20,9 @@ s32 gPlayerNum;
s32 gCamCount;
s32 gTeamShields[6];
s32 gSavedTeamShields[6];
s32 D_ctx_801778F0[6];
s32 gPrevPlanetSavedTeamShields[6];
s32 gTeamDamage[6];
u8 D_ctx_80177930; // next planet path
u8 gNextPlanetPath; // next planet path
f32 gGroundLevel;
f32 D_ctx_80177950;
f32 D_ctx_80177968;
@@ -50,8 +50,8 @@ s32 D_ctx_80177B50[7];
s32 D_ctx_80177B70[7];
PlanetId D_ctx_80177B90[7];
s32 D_ctx_80177BB0[7];
s32 D_ctx_80177BD8[22]; // overruns D_ctx_80177C38?
s32 D_ctx_80177C38[6];
s32 D_ctx_80177BD8[22]; // overruns gPrevPlanetTeamShields?
s32 gPrevPlanetTeamShields[6];
s32 D_ctx_80177C58[6];
u8 gSoundMode;
s32 gVolumeSettings[3];
@@ -75,13 +75,13 @@ s32 gGameFrameCount;
s32 D_ctx_80177DC8;
s32 D_ctx_80177E70;
s32 D_ctx_80177E78;
s32 D_ctx_80177E80;
s32 gRingPassCount;
Vec3f D_ctx_80177E88;
Vec3f D_ctx_80177F10;
UNK_TYPE F_80178020;
s32 D_ctx_8017812C;
LevelId gCurrentLevel;
s32 D_ctx_8017827C;
s32 gLevelStage;
s32 gBossActive;
s32 D_ctx_8017828C;
s32 D_ctx_80178294;
@@ -102,19 +102,19 @@ UNK_TYPE F_801782F0;
s32 D_ctx_801782F8;
s32 D_ctx_80178300;
u16* D_ctx_80178308;
ObjectInit* D_ctx_80178310;
ObjectInit* gLevelObjects;
UNK_TYPE F_80178318;
s32 gFogRed;
s32 gFogGreen;
s32 gFogBlue;
s32 gFogAlpha;
s32 D_ctx_80178340; // alpha something
s32 D_ctx_80178348; // red something
s32 D_ctx_80178350; // green something
s32 D_ctx_80178354; // blue something
s32 D_ctx_80178358; // alpha target
s32 D_ctx_8017835C; // alpha step
s32 D_ctx_80178360; // 2 lights second color
s32 gFillScreenAlpha; // alpha something
s32 gFillScreenRed; // red something
s32 gFillScreenGreen; // green something
s32 gFillScreenBlue; // blue something
s32 gFillScreenAlphaTarget; // alpha target
s32 gFillScreenAlphaStep; // alpha step
s32 D_ctx_80178360; // 2 lights second color
s32 D_ctx_80178364;
s32 D_ctx_80178368;
f32 D_ctx_8017836C; // 2 lights second color brightness
@@ -122,10 +122,10 @@ f32 D_ctx_80178370; // Vec3f?
f32 D_ctx_80178374;
f32 D_ctx_80178378;
s32 D_ctx_8017837C;
u32 D_ctx_80178380[4]; // player alphas
s32 D_ctx_80178390[4]; // player reds
s32 D_ctx_801783A0[4]; // player greens
s32 D_ctx_801783B0[4]; // player alphas
u32 gPlayerFillScreenAlphas[4]; // player alphas
s32 gPlayerFillScreenReds[4]; // player reds
s32 gPlayerFillScreenGreens[4]; // player greens
s32 gPlayerFillScreenBlues[4]; // player alphas
UNK_TYPE D_ctx_801783C0[4];
f32 D_ctx_801783D0; // something x translate
f32 D_ctx_801783D4; // something y translate
@@ -232,8 +232,8 @@ s32 D_ctx_80161A78;
s32 D_ctx_80161A7C;
s32 D_ctx_80161A80;
s32 D_ctx_80161A84;
s32 D_ctx_80161A88;
s32 D_ctx_80161A8C;
s32 gGroundType;
s32 gSavedGroundType;
u8 gGoldRingCount[4];
u8 D_ctx_80161A94[4];
s32 gHitCount;
@@ -247,7 +247,7 @@ UNK_TYPE F_80161AE0[4];
UNK_TYPE F_80161AF0[4];
UNK_TYPE P_800D31A4 = 0;
Object_80 gObjects80[50];
Object_4C gObjects4C[40];
Sprite gSprites[40];
Actor gActors[60];
Boss gBosses[4];
Effect gEffects[100];
@@ -264,10 +264,10 @@ f32 D_ctx_80176EB8[2][100];
f32 D_ctx_801771D8[2][100];
f32 D_ctx_80177500[2][100];
UNK_TYPE P_800D31A8 = 0;
u16 D_ctx_80177828; // enemy shot speed?
u8 D_ctx_80177830; // show level complete status overlay
s32 D_ctx_80177838; // level clear related
s32 D_ctx_80177840; // timer for mission accomplished scrren
u16 gEnemyShotSpeed; // enemy shot speed?
u8 D_ctx_80177830; // show level complete status overlay
s32 gLevelStatusScreenTimer; // level clear related
s32 gLevelClearScreenTimer; // timer for mission accomplished scrren
s32 gBossHealthBar;
s32 D_ctx_80177850; // bonus text related. set to 15 but never read
s32 D_ctx_80177858[4];
@@ -289,7 +289,7 @@ OSContPad* gInputPress;
u8* D_ctx_80177984;
s32 D_ctx_80177990[4];
f32 D_ctx_801779A8[4];
u8 D_ctx_801779BC;
u8 gPauseEnabled;
s32 gChargeTimers[4];
f32 D_ctx_801779E4;
f32 D_ctx_801779F4;
@@ -320,8 +320,8 @@ s32 D_ctx_80177CAC;
s32 D_ctx_80177CB4;
s32 D_ctx_80177CBC;
s32 D_ctx_80177CC4;
s32 D_ctx_80177CD0[6];
s32 D_ctx_80177CF0[6];
s32 gStarWolfTeamAlive[6];
s32 gSavedStarWolfTeamAlive[6];
s32 gRightWingHealth[4];
s32 gLeftWingHealth[4];
s32 D_ctx_80177D40[4];
@@ -333,8 +333,8 @@ s32 D_ctx_80177DB8[4];
s32 D_ctx_80177DD0[4][10];
s32 D_ctx_80177E74;
s32 D_ctx_80177E7C;
s32 D_ctx_80177E84;
Vec3f D_ctx_80177E98[10];
s32 gChangeTo360;
Vec3f gTeamArrowsViewPos[10];
f32 D_ctx_80177F20[65];
f32 D_ctx_80178028[65];
f32 D_ctx_80178130[65];
src/engine/fox_demo.c
+69 -68
View File
@@ -113,8 +113,8 @@ static Animation* D_demo_800CA1F4[] = {
void func_demo_80048AC0(s32 teamId) {
s32 teamShield;
if (teamId == 1) {
if (gTeamShields[1] < 64) {
if (teamId == TEAM_ID_FALCO) {
if (gTeamShields[TEAM_ID_FALCO] < 64) {
Radio_PlayMessage(gMsg_ID_20303, RCID_FALCO);
return;
}
@@ -134,28 +134,28 @@ void func_demo_80048AC0(s32 teamId) {
if (teamShield > 160) {
switch (teamId) {
case 2:
case TEAM_ID_SLIPPY:
Radio_PlayMessage(gMsg_ID_20011, RCID_SLIPPY);
break;
case 3:
case TEAM_ID_PEPPY:
Radio_PlayMessage(gMsg_ID_20012, RCID_PEPPY);
break;
}
} else if (teamShield > 64) {
switch (teamId) {
case 2:
case TEAM_ID_SLIPPY:
Radio_PlayMessage(gMsg_ID_20013, RCID_SLIPPY);
break;
case 3:
case TEAM_ID_PEPPY:
Radio_PlayMessage(gMsg_ID_20014, RCID_PEPPY);
break;
}
} else {
switch (teamId) {
case 2:
case TEAM_ID_SLIPPY:
Radio_PlayMessage(gMsg_ID_20015, RCID_SLIPPY);
break;
case 3:
case TEAM_ID_PEPPY:
Radio_PlayMessage(gMsg_ID_20016, RCID_PEPPY);
break;
}
@@ -179,7 +179,7 @@ void func_demo_80048CC4(Actor* actor, s32 arg1) {
actor->unk_0B6 = 1;
} else {
actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4U);
AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4);
}
}
@@ -230,19 +230,19 @@ void func_demo_80048E40(Player* player) {
switch (gCsFrameCount) {
case 101:
if (gTeamShields[1] > 0) {
if (gTeamShields[TEAM_ID_FALCO] > 0) {
func_demo_80048CC4(&gActors[0], 0);
}
if (gTeamShields[2] > 0) {
if (gTeamShields[TEAM_ID_SLIPPY] > 0) {
func_demo_80048CC4(&gActors[1], 1);
}
if (gTeamShields[3] > 0) {
if (gTeamShields[TEAM_ID_PEPPY] > 0) {
func_demo_80048CC4(&gActors[2], 2);
}
break;
case 100:
D_ctx_80177840 = 100;
gLevelClearScreenTimer = 100;
break;
case 200:
@@ -284,10 +284,10 @@ void func_demo_80048E40(Player* player) {
}
if (gCsFrameCount > 540) {
D_ctx_80178358 = 255;
D_ctx_80178348 = (D_ctx_80178350 = (D_ctx_80178354 = 0));
D_ctx_8017835C = 8;
if (D_ctx_80178340 == 255) {
gFillScreenAlphaTarget = 255;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0;
gFillScreenAlphaStep = 8;
if (gFillScreenAlpha == 255) {
player->state_1C8 = PLAYERSTATE_1C8_6;
player->timer_1F8 = 0;
D_ctx_8017837C = 4;
@@ -296,7 +296,7 @@ void func_demo_80048E40(Player* player) {
} else {
D_play_800D3180[LEVEL_SECTOR_X] = Play_CheckMedalStatus(150) + 1;
}
D_ctx_80177930 = 2;
gNextPlanetPath = 2;
}
}
} else {
@@ -451,7 +451,7 @@ void func_demo_80049C0C(Player* player) {
player->pos.x += player->vel.x;
player->flags_228 = 0;
player->unk_238 = 0;
player->cockpitView = 0;
player->pos.y += player->vel.y;
player->pos.z += player->vel.z;
@@ -486,13 +486,13 @@ void func_demo_80049C0C(Player* player) {
player->vel.z = -500.0f;
player->unk_0CC = -500.0f;
if (gTeamShields[1] > 0) {
if (gTeamShields[TEAM_ID_FALCO] > 0) {
func_demo_80049968(&gActors[0], 0);
}
if (gTeamShields[2] > 0) {
if (gTeamShields[TEAM_ID_SLIPPY] > 0) {
func_demo_80049968(&gActors[1], 1);
}
if (gTeamShields[3] > 0) {
if (gTeamShields[TEAM_ID_PEPPY] > 0) {
func_demo_80049968(&gActors[2], 2);
}
@@ -538,17 +538,17 @@ void func_demo_80049C0C(Player* player) {
var_v0 = 1;
player->unk_190 = 2.0f;
if ((player->timer_1F8 == 95) && (gTeamShields[1] > 0)) {
if ((player->timer_1F8 == 95) && (gTeamShields[TEAM_ID_FALCO] > 0)) {
gActors[0].state = var_v0;
AUDIO_PLAY_SFX(0x0940802AU, gActors[0].sfxSource, 0);
}
if ((player->timer_1F8 == 90) && (gTeamShields[3] > 0)) {
if ((player->timer_1F8 == 90) && (gTeamShields[TEAM_ID_PEPPY] > 0)) {
gActors[2].state = var_v0;
AUDIO_PLAY_SFX(0x0940802AU, gActors[2].sfxSource, 0);
}
if ((player->timer_1F8 == 85) && (gTeamShields[2] > 0)) {
if ((player->timer_1F8 == 85) && (gTeamShields[TEAM_ID_SLIPPY] > 0)) {
gActors[1].state = var_v0;
AUDIO_PLAY_SFX(0x0940802AU, gActors[1].sfxSource, 0);
}
@@ -570,10 +570,10 @@ void func_demo_80049C0C(Player* player) {
Math_SmoothStepToF(&D_ctx_801779A8[player->num], 100.0f, 1.0f, 3.0f, 0.0f);
player->unk_034 -= 0.5f;
if (player->timer_1F8 == 0) {
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255;
D_ctx_80178358 = 255;
D_ctx_8017835C = 8;
if (D_ctx_80178340 == 255) {
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
gFillScreenAlphaTarget = 255;
gFillScreenAlphaStep = 8;
if (gFillScreenAlpha == 255) {
func_play_800A6148();
player->unk_1D0 = 5;
player->timer_1F8 = 10;
@@ -586,7 +586,7 @@ void func_demo_80049C0C(Player* player) {
player->timer_27C = gSavedHitCount = D_ctx_80177DC8 = D_ctx_80177CA0 = 0;
player->unk_234 = 1;
D_ctx_8017827C = 1;
gLevelStage = 1;
D_display_800CA230 = 0.15f;
AUDIO_PLAY_SFX(0x11407079U, gDefaultSfxSource, 0);
func_play_800AB334();
@@ -597,9 +597,9 @@ void func_demo_80049C0C(Player* player) {
case 5:
Math_SmoothStepToF(&D_ctx_801779A8[player->num], 100.0f, 1.0f, 3.0f, 0.0f);
if (player->timer_1F8 == 0) {
D_ctx_80178358 = 0;
D_ctx_8017835C = 8;
if (D_ctx_80178340 == 0) {
gFillScreenAlphaTarget = 0;
gFillScreenAlphaStep = 8;
if (gFillScreenAlpha == 0) {
player->unk_1D0 = 6;
player->timer_1F8 = 50;
}
@@ -785,7 +785,7 @@ void func_demo_8004A888(Effect* effect) {
void func_demo_8004AA84(void) {
s32 i;
if (!(gGameFrameCount & 7) && (gLevelType == LEVELTYPE_PLANET)) {
if (((gGameFrameCount % 8) == 0) && (gLevelType == LEVELTYPE_PLANET)) {
for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
if (gEffects[i].obj.status == OBJ_FREE) {
func_demo_8004A888(&gEffects[i]);
@@ -810,7 +810,7 @@ void func_demo_8004AAF4(Player* player) {
gCsFrameCount += 1;
Math_SmoothStepToAngle(&player->unk_4D8, 0.0f, 0.1f, 20.0f, 0.0f);
if (gCsFrameCount == 37) {
D_ctx_80177E84 = 1;
gChangeTo360 = true;
if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
Radio_PlayMessage(gMsg_ID_19466, RCID_FOX);
AUDIO_PLAY_BGM(SEQ_ID_AND_BRAIN | SEQ_FLAG);
@@ -1099,7 +1099,7 @@ void func_demo_8004B368(Player* player) {
}
if ((180.0f - fabsf(player->unk_0EC)) <= 3.0f) {
D_ctx_80161A88 = 1;
gGroundType = GROUNDTYPE_ROCK;
}
if (player->timer_1F8 == 0) {
@@ -1156,20 +1156,20 @@ void func_demo_8004B368(Player* player) {
player->vel.y = 5.0f;
if ((player->timer_1F8 == 50) && (gTeamShields[1] > 0)) {
if ((player->timer_1F8 == 50) && (gTeamShields[TEAM_ID_FALCO] > 0)) {
func_demo_8004A840(0);
}
if ((player->timer_1F8 == 70) && (gTeamShields[2] > 0)) {
if ((player->timer_1F8 == 70) && (gTeamShields[TEAM_ID_SLIPPY] > 0)) {
func_demo_8004A840(1);
}
if (player->timer_1F8 == 90) {
func_play_800A6148();
if (gTeamShields[3] > 0) {
if (gTeamShields[TEAM_ID_PEPPY] > 0) {
func_demo_8004A840(2);
}
D_ctx_80161A88 = 0;
gGroundType = GROUNDTYPE_GRASS;
}
Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + 180.0f) * M_DTOR, 0);
@@ -1211,7 +1211,7 @@ void func_demo_8004B368(Player* player) {
switch (gCsFrameCount) {
case 330:
D_ctx_80177840 = 100;
gLevelClearScreenTimer = 100;
break;
case 410:
@@ -1219,7 +1219,7 @@ void func_demo_8004B368(Player* player) {
break;
case 550:
if ((gTeamShields[2] == (-1)) || (gTeamShields[2] == 0)) {
if ((gTeamShields[TEAM_ID_SLIPPY] == (-1)) || (gTeamShields[TEAM_ID_SLIPPY] == 0)) {
Radio_PlayMessage(gMsg_ID_20333, RCID_ROB64);
} else {
Radio_PlayMessage(gMsg_ID_2300, RCID_SLIPPY);
@@ -1227,7 +1227,7 @@ void func_demo_8004B368(Player* player) {
break;
case 682:
if ((gTeamShields[3] == -1) || (gTeamShields[3] == 0)) {
if ((gTeamShields[TEAM_ID_PEPPY] == -1) || (gTeamShields[TEAM_ID_PEPPY] == 0)) {
Radio_PlayMessage(gMsg_ID_20332, RCID_ROB64);
} else {
Radio_PlayMessage(gMsg_ID_2310, RCID_PEPPY);
@@ -1235,7 +1235,7 @@ void func_demo_8004B368(Player* player) {
break;
case 816:
if ((gTeamShields[1] == -1) || (gTeamShields[1] == 0)) {
if ((gTeamShields[TEAM_ID_FALCO] == -1) || (gTeamShields[TEAM_ID_FALCO] == 0)) {
Radio_PlayMessage(gMsg_ID_20331, RCID_ROB64);
} else {
Radio_PlayMessage(gMsg_ID_2320, RCID_FALCO);
@@ -1359,10 +1359,10 @@ void func_demo_8004C930(Player* player) {
switch (player->form) {
case FORM_ARWING:
if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) || ((gCurrentLevel == LEVEL_VENOM_2) && (D_ctx_8017827C == 1))) {
if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) || ((gCurrentLevel == LEVEL_VENOM_2) && (gLevelStage == 1))) {
Andross_80193C4C(player);
} else if (gCurrentLevel == LEVEL_SECTOR_X) {
if (D_ctx_8017827C == 0) {
if (gLevelStage == 0) {
SectorX_80194728(player);
} else {
func_demo_80048E40(player);
@@ -1393,7 +1393,7 @@ void func_demo_8004C930(Player* player) {
Venom2_80196D88(player);
func_play_800AA800(player);
} else if (gCurrentLevel == LEVEL_METEO) {
if (D_ctx_8017827C == 0) {
if (gLevelStage == 0) {
Meteo_8018E084(player);
} else {
func_demo_80048E40(player);
@@ -1422,7 +1422,7 @@ void func_demo_8004C930(Player* player) {
if (gCurrentLevel == LEVEL_TITANIA) {
Titania_801882CC(player);
} else if (D_ctx_80177930 != 0) {
} else if (gNextPlanetPath != 0) {
Macbeth_801AF8F4(player);
} else {
Macbeth_801B3D04(player);
@@ -1627,7 +1627,8 @@ void func_demo_8004D440(Player* player) {
Radio_PlayMessage(gMsg_ID_20318, RCID_FOX);
} else {
if ((gCurrentLevel != LEVEL_TRAINING) &&
((gTeamShields[1] > 0) || (gTeamShields[2] > 0) || (gTeamShields[3] > 0))) {
((gTeamShields[TEAM_ID_FALCO] > 0) || (gTeamShields[TEAM_ID_SLIPPY] > 0) ||
(gTeamShields[TEAM_ID_PEPPY] > 0))) {
do {
teamId = RAND_INT(2.9f) + 1;
} while (gTeamShields[teamId] <= 0);
@@ -1711,11 +1712,11 @@ void func_demo_8004D828(Player* player) {
}
if (gCamCount == 1) {
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
func_effect_8007D24C(RAND_FLOAT_CENTERED(20.0) + player->pos.x, RAND_FLOAT_CENTERED(20.0) + player->pos.y,
player->unk_138, 2.2f);
}
} else if (!(gGameFrameCount & 3)) {
} else if (((gGameFrameCount % 4) == 0)) {
func_effect_8007D10C(RAND_FLOAT_CENTERED(10.0f) + player->pos.x, RAND_FLOAT_CENTERED(10.0f) + player->pos.y,
RAND_FLOAT_CENTERED(10.0f) + player->unk_138, 2.2f);
}
@@ -1827,7 +1828,7 @@ void func_demo_8004DEF8(Player* player) {
player->unk_0E4 += 26.0f;
}
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
func_effect_8007D24C(RAND_FLOAT_CENTERED(20.0) + player->pos.x, RAND_FLOAT_CENTERED(20.0) + player->pos.y,
player->unk_138, 2.2f);
}
@@ -1882,7 +1883,7 @@ void func_demo_8004DEF8(Player* player) {
player->unk_034 += 10.0f;
}
if ((D_ctx_80161A88 == 2) && (player->pos.y <= player->unk_0A4)) {
if ((gGroundType == GROUNDTYPE_WATER) && (player->pos.y <= player->unk_0A4)) {
func_effect_8007D9DC(player->pos.x, gGroundLevel + 2.0f, player->unk_138, 3.0f, 20.0f, 0);
func_effect_8007ADF4(player->pos.x, gGroundLevel, player->unk_138, 0.1f, 2.0f);
}
@@ -1892,7 +1893,7 @@ void func_demo_8004E3D8(Player* player) {
player->flags_228 = 0;
player->unk_280 = 0;
if (gGameFrameCount & 1) {
if ((gGameFrameCount % 2) != 0) {
D_80137E84[gPlayerNum] = 1;
}
@@ -2385,7 +2386,7 @@ void func_demo_8004F8AC(Actor* actor) {
break;
case LEVEL_METEO:
if (D_ctx_8017827C == 0) {
if (gLevelStage == 0) {
Meteo_8018ED9C(actor);
break;
}
@@ -2407,11 +2408,11 @@ void func_demo_8004F8AC(Actor* actor) {
case 1:
Math_SmoothStepToF(&actor->scale, 0.5f, 0.03f, 0.01f, 0.0f);
D_ctx_80178348 = D_ctx_80178340 = D_ctx_80178350 = D_ctx_80178354 = 0;
gFillScreenRed = gFillScreenAlpha = gFillScreenGreen = gFillScreenBlue = 0;
if ((actor->timer_0BC == 43) || (actor->timer_0BC == 46) || (actor->timer_0BC == 49)) {
D_ctx_80178340 = 192;
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255;
gFillScreenAlpha = 192;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
}
actor->iwork[0] -= 2;
@@ -2442,7 +2443,7 @@ void func_demo_8004F8AC(Actor* actor) {
break;
case LEVEL_SECTOR_X:
if (D_ctx_8017827C != 0) {
if (gLevelStage != 0) {
func_demo_80049630(actor);
break;
}
@@ -2589,7 +2590,7 @@ void func_demo_8004FEC0(Actor* actor) {
break;
case 25:
if (actor->index & 1) {
if ((actor->index % 2) != 0) {
gSPDisplayList(gMasterDisp++, D_SZ_6001DA0);
} else {
gSPDisplayList(gMasterDisp++, D_SZ_6001360);
@@ -2625,7 +2626,7 @@ void func_demo_8004FEC0(Actor* actor) {
Matrix_RotateZ(gGfxMatrix, (2.0f * gGameFrameCount) * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, 2.0f * RAND_FLOAT_SEEDED(M_PI), 1);
switch (sp2D0 & 3) {
switch ((s32) (sp2D0 % 4U)) {
case 0:
Matrix_Scale(gGfxMatrix, 1.0f, 0.3f, 1.0f, 1);
break;
@@ -2674,7 +2675,7 @@ void func_demo_8004FEC0(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x40);
switch ((gGameFrameCount >> 3) & 3) {
switch ((gGameFrameCount >> 3) % 4U) {
case 0:
sp2DC = 255.0f;
sp2D8 = 0.0f;
@@ -2909,7 +2910,7 @@ void func_demo_800515C4(void) {
if (gGameState == GSTATE_TITLE) {
var_fp = D_TITLE_60320E0;
} else if (gGameState == GSTATE_CREDITS) {
} else if (gGameState == GSTATE_ENDING) {
var_fp = D_END_7010970;
} else {
var_fp = D_1024AC0;
@@ -2933,13 +2934,13 @@ void func_demo_800515C4(void) {
if ((i != 1) || gGreatFoxIntact) {
sp9C[i] = 0.0f;
if (i < 2) {
if (!(gGameFrameCount & 0x38)) {
sp9C[i] = D_demo_800CA170[gGameFrameCount & 7];
if ((gGameFrameCount & ((64 - 1) & ~(8 - 1))) == 0) {
sp9C[i] = D_demo_800CA170[gGameFrameCount % 8U];
}
gDPSetEnvColor(gMasterDisp++, 255, 32, 32, 128);
} else {
if (!((gGameFrameCount + 32) & 0x38)) {
sp9C[i] = D_demo_800CA170[gGameFrameCount & 7];
if (((gGameFrameCount + 32) & 0x38) == 0) {
sp9C[i] = D_demo_800CA170[gGameFrameCount % 8U];
}
gDPSetEnvColor(gMasterDisp++, 32, 32, 255, 128);
}
@@ -2955,7 +2956,7 @@ void func_demo_800515C4(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 48);
gDPSetEnvColor(gMasterDisp++, 255, 255, 0, 48);
for (i = 0, var_s6_2 = D_demo_800CA0EC; i < 3; i++, var_s6_2++) {
sp9C[i] = D_demo_800CA190[gGameFrameCount & 1];
sp9C[i] = D_demo_800CA190[gGameFrameCount % 2U];
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, var_s6_2->x, var_s6_2->y, var_s6_2->z, 1);
Matrix_Scale(gGfxMatrix, sp9C[i], sp9C[i], 1.0f, 1);
src/engine/fox_display.c
+71 -70
View File
@@ -7,7 +7,7 @@
Vec3f D_display_801613B0[4];
Vec3f D_display_801613E0[4];
s16 D_display_80161410;
s16 gReflectY;
Matrix D_display_80161418[4];
Vec3f D_display_80161518[4];
Vec3f D_display_80161548[4];
@@ -32,7 +32,7 @@ void func_display_80051B30(void) {
Vec3f sp68;
Vec3f sp5C;
if ((D_ctx_80177854 == 100) || (D_display_800CA234 == NULL)) {
if ((gPlayState == PLAY_PAUSE) || (D_display_800CA234 == NULL)) {
return;
}
if ((D_display_800CA234->obj.status != OBJ_ACTIVE) || (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_3)) {
@@ -290,7 +290,7 @@ void func_display_80052884(Player* player) {
if (gPlayerNum == player->num) {
sp64 = 0.0f;
if (gChargeTimers[player->num] >= 20) {
sp64 = (f32) (gGameFrameCount & 7) * 80.0f;
sp64 = (s32) (gGameFrameCount % 8U) * 80.0f;
}
sp58.x = 0.0f;
sp58.y = 0.0f;
@@ -363,7 +363,7 @@ void func_display_80052D48(Player* player) {
if (!gVersusMode) {
sp2C *= 1.1f;
}
if (gGameFrameCount & 1) {
if ((gGameFrameCount % 2) != 0) {
sp2C *= 1.1f;
}
Matrix_Push(&gGfxMatrix);
@@ -386,7 +386,7 @@ void func_display_80052D48(Player* player) {
if (!gVersusMode) {
sp2C *= 1.1f;
}
if (gGameFrameCount & 1) {
if ((gGameFrameCount % 2) != 0) {
sp2C *= 1.1f;
}
Matrix_Push(&gGfxMatrix);
@@ -408,7 +408,7 @@ void func_display_80052D48(Player* player) {
}
void func_display_8005314C(void) {
if (D_display_80161410 != 0) {
if (gReflectY != 0) {
gSPSetGeometryMode(gMasterDisp++, G_CULL_FRONT);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
}
@@ -429,7 +429,7 @@ bool func_display_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot,
if (wings->rightState == WINGSTATE_BROKEN) {
*gfxPtr = D_arwing_3015120;
}
if ((D_display_800CA22C != 0) && (D_ctx_80177D40[0] & 1)) {
if ((D_display_800CA22C != 0) && ((D_ctx_80177D40[0] % 2) != 0)) {
RCP_SetupDL(&gMasterDisp, 0x22);
func_display_8005314C();
if (D_ctx_80177D40[0] > 1000) {
@@ -444,7 +444,7 @@ bool func_display_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot,
if (wings->rightState != 2) {
*gfxPtr = NULL;
}
if ((D_display_800CA22C != 0) && (D_ctx_80177D40[0] & 1)) {
if ((D_display_800CA22C != 0) && ((D_ctx_80177D40[0] % 2) != 0)) {
RCP_SetupDL(&gMasterDisp, 0x22);
func_display_8005314C();
if (D_ctx_80177D40[0] > 1000) {
@@ -461,7 +461,7 @@ bool func_display_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot,
if (wings->leftState == WINGSTATE_BROKEN) {
*gfxPtr = D_arwing_3014BF0;
}
if ((D_display_800CA22C != 0) && (D_ctx_80177D58[0] & 1)) {
if ((D_display_800CA22C != 0) && ((D_ctx_80177D58[0] % 2) != 0)) {
RCP_SetupDL(&gMasterDisp, 0x22);
func_display_8005314C();
if (D_ctx_80177D58[0] > 1000) {
@@ -476,7 +476,7 @@ bool func_display_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot,
if (wings->leftState != 2) {
*gfxPtr = NULL;
}
if ((D_display_800CA22C != 0) && (D_ctx_80177D58[0] & 1)) {
if ((D_display_800CA22C != 0) && ((D_ctx_80177D58[0] % 2) != 0)) {
RCP_SetupDL(&gMasterDisp, 0x22);
func_display_8005314C();
if (D_ctx_80177D58[0] > 1000) {
@@ -549,7 +549,7 @@ void func_display_80053658(WingInfo* wings) {
Matrix_RotateY(gGfxMatrix, wings->unk_34 * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, wings->unk_30 * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 1.0f / 70.925f, 1.0f / 70.925f, 1.0f / 70.925f, 1);
if (gGameState == GSTATE_CREDITS) {
if (gGameState == GSTATE_ENDING) {
Matrix_Scale(gGfxMatrix, 0.95f, 0.95f, 0.95f, 1);
}
Matrix_SetGfxMtx(&gMasterDisp);
@@ -606,7 +606,7 @@ void func_display_80053C38(Player* player, s32 arg1) {
if ((gPlayerNum == player->num) && (arg1 == 0)) {
sp48 = 0.0f;
if (gChargeTimers[player->num] >= 20) {
sp48 = (f32) (gGameFrameCount & 7) * 80.0f;
sp48 = (s32) (gGameFrameCount % 8U) * 80.0f;
}
sp4C.x = 0.0f;
sp4C.y = 0.0f;
@@ -615,7 +615,7 @@ void func_display_80053C38(Player* player, s32 arg1) {
sp4C.z = 2400.0f + sp48;
Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_display_801613E0[1]);
}
if ((player->unk_238 != 0) && (gLevelMode == LEVELMODE_ON_RAILS) &&
if ((player->cockpitView != 0) && (gLevelMode == LEVELMODE_ON_RAILS) &&
(fabsf(player->unk_138 + D_ctx_80177D20 - player->camEye.z) < 10.0f)) {
if (arg1 == 0) {
D_display_800CA228 = 1;
@@ -645,7 +645,7 @@ void func_display_80053C38(Player* player, s32 arg1) {
player->wings.unk_10 = 0.0f;
}
D_display_800CA22C = 1;
D_display_80161410 = arg1;
gReflectY = arg1;
func_display_80053658(&player->wings);
}
}
@@ -711,7 +711,7 @@ void func_display_80054300(Player* player) {
if (player->unk_068 > 30.0f) {
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
}
if ((D_ctx_80161A88 == 2) && (player->unk_068 < 10.0f)) {
if ((gGroundType == GROUNDTYPE_WATER) && (player->unk_068 < 10.0f)) {
player->unk_23C = 90;
} else {
player->unk_23C = 180;
@@ -789,7 +789,7 @@ void func_display_8005478C(Player* player) {
} else {
Matrix_Scale(gGfxMatrix, player->unk_194, player->unk_194, 1.0f, 1);
}
if (gGameFrameCount & 1) {
if ((gGameFrameCount % 2) != 0) {
Matrix_Scale(gGfxMatrix, 0.9f, 0.63f, 1.0f, 1);
} else {
Matrix_Scale(gGfxMatrix, 0.80999994f, 0.567f, 1.0f, 1);
@@ -871,7 +871,7 @@ void func_display_80054E80(Player* player) {
if (gChargeTimers[player->num] > 10) {
RCP_SetupDL(&gMasterDisp, 0x43);
Matrix_Copy(gCalcMatrix, &D_display_80161418[player->num]);
if ((player->unk_238 != 0) && (gLevelMode == LEVELMODE_ON_RAILS)) {
if ((player->cockpitView != 0) && (gLevelMode == LEVELMODE_ON_RAILS)) {
Matrix_MultVec3f(gCalcMatrix, &spB8, &sp94);
} else {
Matrix_MultVec3f(gCalcMatrix, &spC4, &sp94);
@@ -881,7 +881,7 @@ void func_display_80054E80(Player* player) {
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) && (gLevelMode == LEVELMODE_ON_RAILS)) {
if ((player->cockpitView != 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);
@@ -913,11 +913,11 @@ void func_display_80054E80(Player* player) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_101C2E0);
Matrix_Pop(&gGfxMatrix);
if ((player->unk_238 != 0) && (gLevelMode == LEVELMODE_ON_RAILS)) {
if ((player->cockpitView != 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);
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.0f, 1);
} else {
Matrix_Scale(gGfxMatrix, 1.3f, 1.3f, 1.0f, 1);
@@ -938,7 +938,7 @@ void func_display_80054E80(Player* player) {
case LASERS_SINGLE:
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 192, 255, 192, 128);
gDPSetEnvColor(gMasterDisp++, 64, 255, 64, 128);
if ((player->unk_238 != 0) && (gLevelMode == LEVELMODE_ON_RAILS)) {
if ((player->cockpitView != 0) && (gLevelMode == LEVELMODE_ON_RAILS)) {
Matrix_MultVec3f(gCalcMatrix, &spB8, &sp94);
} else {
Matrix_MultVec3f(gCalcMatrix, &spC4, &sp94);
@@ -982,7 +982,7 @@ void func_display_80054E80(Player* player) {
void func_display_80055788(Player* player) {
f32 sp54;
if (gChargeTimers[player->num] >= 11) {
if (gChargeTimers[player->num] > 10) {
RCP_SetupDL(&gMasterDisp, 0x43);
Matrix_Push(&gGfxMatrix);
sp54 = gChargeTimers[player->num] / 20.0f;
@@ -1019,7 +1019,7 @@ void func_display_80055788(Player* player) {
gSPDisplayList(gMasterDisp++, D_101C2E0);
Matrix_Pop(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 1.0f, 1);
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.0f, 1);
} else {
Matrix_Scale(gGfxMatrix, 1.3f, 1.3f, 1.0f, 1);
@@ -1098,7 +1098,7 @@ void func_display_80055E98(Player* player) {
}
if (player->unk_25C != 0.0f) {
sp54 = 0.0f;
if (gGameFrameCount & 1) {
if ((gGameFrameCount % 2) != 0) {
sp54 = 180.0f;
}
var_fs0 = player->unk_0E8;
@@ -1316,8 +1316,8 @@ void func_display_80056E2C(Player* player) {
f32 sp2C;
if ((player->unk_234 != 0) && (player->unk_240 == 0)) {
sp34 = D_display_800CA334[gGameFrameCount & 7];
sp30 = D_display_800CA334[(gGameFrameCount + 4) & 7];
sp34 = D_display_800CA334[gGameFrameCount % 8U];
sp30 = D_display_800CA334[(gGameFrameCount + 4) % 8U];
if (player->unk_1D4 != 0) {
sp34 = sp30 = 0.0f;
}
@@ -1363,16 +1363,17 @@ void func_display_80057248(void) {
if (!(gGameFrameCount & 4)) {
RCP_SetupDL_40();
for (i = 0; i < ARRAY_COUNT(D_ctx_80177E98); i++) {
if (D_ctx_80177E98[i].z < 0.0f) {
var_fs0 = (VEC3F_MAG(&D_ctx_80177E98[i])) * 0.0015f;
for (i = 0; i < ARRAY_COUNT(gTeamArrowsViewPos); i++) {
if (gTeamArrowsViewPos[i].z < 0.0f) {
var_fs0 = (VEC3F_MAG(&gTeamArrowsViewPos[i])) * 0.0015f;
if (var_fs0 > 100.0f) {
var_fs0 = 100.0f;
} else if (var_fs0 < 1.0f) {
var_fs0 = 1.0f;
}
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, D_ctx_80177E98[i].x, D_ctx_80177E98[i].y, D_ctx_80177E98[i].z, 1);
Matrix_Translate(gGfxMatrix, gTeamArrowsViewPos[i].x, gTeamArrowsViewPos[i].y, gTeamArrowsViewPos[i].z,
1);
Matrix_Scale(gGfxMatrix, var_fs0 * 0.25f, var_fs0 * 0.25f, 1.0f, 1);
if ((i == 0) && (gCurrentLevel == LEVEL_SECTOR_Z)) {
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 1.0f, 1);
@@ -1387,8 +1388,8 @@ void func_display_80057248(void) {
}
Matrix_Pop(&gGfxMatrix);
}
D_ctx_80177E98[i].x = D_ctx_80177E98[i].y = 0;
D_ctx_80177E98[i].z = 100.0f;
gTeamArrowsViewPos[i].x = gTeamArrowsViewPos[i].y = 0;
gTeamArrowsViewPos[i].z = 100.0f;
}
gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP);
}
@@ -1413,7 +1414,7 @@ void func_display_80057504(void) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, D_display_80161578[i].x, D_display_80161578[i].y, D_display_80161578[i].z,
1);
if ((D_ctx_80177854 != 100) && (i == gPlayerNum)) {
if ((gPlayState != PLAY_PAUSE) && (i == gPlayerNum)) {
Math_SmoothStepToF(&D_display_801615A8[i], 0.0f, 0.5f, 20.0f, 0);
Math_SmoothStepToF(&D_display_801615B8[i], 1.0, 0.5f, 0.2f, 0);
}
@@ -1510,11 +1511,11 @@ void func_display_800578C4(Player* player) {
}
}
void func_display_80057D00(void) {
void Play_Draw(void) {
s32 i;
Vec3f sp78;
Vec3f sp6C;
Vec3f sp60;
Vec3f tempVec;
Vec3f playerCamUp;
Vec3f opponentPos;
s32 pad;
Player* opponent;
Player* player = &gPlayer[gPlayerNum];
@@ -1542,23 +1543,23 @@ void func_display_80057D00(void) {
Matrix_RotateY(gCalcMatrix, player->unk_114 * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, player->unk_120 * M_DTOR, 1);
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, &gPlayerCamEye);
tempVec.x = player->camEye.x - player->pos.x;
tempVec.y = player->camEye.y - player->pos.y;
tempVec.z = player->camEye.z - (player->unk_138 + player->unk_144);
Matrix_MultVec3f(gCalcMatrix, &tempVec, &gPlayerCamEye);
gPlayerCamEye.x += player->pos.x;
gPlayerCamEye.y += player->pos.y;
gPlayerCamEye.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, &gPlayerCamAt);
tempVec.x = player->camAt.x - player->pos.x;
tempVec.y = player->camAt.y - player->pos.y;
tempVec.z = player->camAt.z - (player->unk_138 + player->unk_144);
Matrix_MultVec3f(gCalcMatrix, &tempVec, &gPlayerCamAt);
gPlayerCamAt.x += player->pos.x;
gPlayerCamAt.y += player->pos.y;
gPlayerCamAt.z += player->unk_138 + player->unk_144;
if ((player->unk_238 != 0) && (player->unk_110 > 5.0f)) {
if ((player->cockpitView != 0) && (player->unk_110 > 5.0f)) {
gPlayerCamAt.x += SIN_DEG(gGameFrameCount * 150.0f) * player->unk_110 * 0.2f;
}
} else if (player->state_1C8 == PLAYERSTATE_1C8_7) {
@@ -1577,10 +1578,10 @@ void func_display_80057D00(void) {
Matrix_RotateY(gCalcMatrix, -player->unk_058, 0);
Matrix_RotateX(gCalcMatrix, player->unk_05C, 1);
Matrix_RotateZ(gCalcMatrix, -player->unk_034 * M_DTOR, 1);
sp78.x = 0.0f;
sp78.y = 100.0f;
sp78.z = 0.0f;
Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C);
tempVec.x = 0.0f;
tempVec.y = 100.0f;
tempVec.z = 0.0f;
Matrix_MultVec3f(gCalcMatrix, &tempVec, &playerCamUp);
if (D_ctx_80178410 != 0) {
D_ctx_80178428 = DEG_TO_RAD(gPlayer[0].unk_034);
func_play_800B6F50(gPlayerCamEye.x, gPlayerCamEye.y, gPlayerCamEye.z, gPlayerCamAt.x, gPlayerCamAt.y,
@@ -1591,7 +1592,7 @@ void func_display_80057D00(void) {
func_bg_80040450();
Matrix_Push(&gGfxMatrix);
Matrix_LookAt(gGfxMatrix, gPlayerCamEye.x, gPlayerCamEye.y, gPlayerCamEye.z, gPlayerCamAt.x, gPlayerCamAt.y,
gPlayerCamAt.z, sp6C.x, sp6C.y, sp6C.z, 1);
gPlayerCamAt.z, playerCamUp.x, playerCamUp.y, playerCamUp.z, 1);
if ((gLevelType == LEVELTYPE_PLANET) || (gCurrentLevel == LEVEL_BOLSE)) {
if ((gCurrentLevel == LEVEL_TITANIA) &&
((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2) || (gPlayer[0].unk_19C != 0))) {
@@ -1601,7 +1602,7 @@ void func_display_80057D00(void) {
Ground_801B58AC(&gMasterDisp, D_ctx_80177CC8);
D_ctx_80177CC8 = 0.0f;
Matrix_Pop(&gGfxMatrix);
} else if (D_ctx_80161A88 != 2) {
} else if (gGroundType != GROUNDTYPE_WATER) {
D_bg_8015F964 = 0;
func_bg_80040CE4();
}
@@ -1609,22 +1610,22 @@ void func_display_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->pos.x;
sp60.y = opponent->pos.y;
sp60.z = opponent->unk_138;
func_edisplay_8005F670(&sp60);
opponentPos.x = opponent->pos.x;
opponentPos.y = opponent->pos.y;
opponentPos.z = opponent->unk_138;
func_edisplay_8005F670(&opponentPos);
func_display_800564C0(opponent, 0);
func_display_80057814(opponent);
}
if ((D_ctx_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) {
if ((gGroundType == GROUNDTYPE_WATER) && (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->pos.x;
sp60.y = opponent->pos.y;
sp60.z = opponent->unk_138;
opponentPos.x = opponent->pos.x;
opponentPos.y = opponent->pos.y;
opponentPos.z = opponent->unk_138;
func_display_800564C0(opponent, 1);
}
Matrix_Pop(&gGfxMatrix);
@@ -1633,17 +1634,17 @@ void func_display_80057D00(void) {
gAmbientB);
Object_Draw(1);
TexturedLine_Draw();
D_display_80161410 = 1;
func_beam_8003DA0C();
if ((D_ctx_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) {
gReflectY = 1;
PlayerShot_Draw();
if ((gGroundType == GROUNDTYPE_WATER) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) {
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1);
D_display_80161410 = -1;
func_beam_8003DA0C();
gReflectY = -1;
PlayerShot_Draw();
Matrix_Pop(&gGfxMatrix);
}
D_display_80161410 = -1;
if ((D_ctx_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) {
gReflectY = -1;
if ((gGroundType == GROUNDTYPE_WATER) && (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++) {
@@ -1657,7 +1658,7 @@ void func_display_80057D00(void) {
if (gCurrentLevel == LEVEL_AQUAS) {
Effect_Draw(0);
}
if ((D_ctx_80161A88 == 2) || (D_ctx_80177AC8 != 0)) {
if ((gGroundType == GROUNDTYPE_WATER) || (D_ctx_80177AC8 != 0)) {
D_bg_8015F964 = 1;
Effect_Draw(1);
func_bg_80040CE4();
@@ -1667,7 +1668,7 @@ void func_display_80057D00(void) {
((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)))) {
Effect_Draw(0);
}
D_display_80161410 = 1;
gReflectY = 1;
for (i = 0, opponent = gPlayer; i < gCamCount; i++, opponent++) {
if (D_display_800CA224[i] != 0) {
func_display_80056E2C(opponent);
@@ -1691,7 +1692,7 @@ void func_display_80057D00(void) {
}
for (i = 0, opponent = gPlayer; i < gCamCount; i++, opponent++) {
if (D_display_800CA224[i] != 0) {
if (D_game_800D2860[i]) {
if (gShowCrosshairs[i]) {
func_display_80053F7C(opponent);
}
if (opponent->form == FORM_LANDMASTER) {
src/engine/fox_edata_info.c
+146 -145
View File
@@ -22,86 +22,87 @@
#include "assets/ast_area_6.h"
#include "assets/ast_zoness.h"
f32 D_edata_800CBE70[] = {
f32 gActor241Hitbox[] = {
1.0f, 0.0f, 50.0f, 0.0f, 25.0f, 0.0f, 25.0f,
};
f32 D_edata_800CBE8C[] = {
f32 gDefaultCubeHitbox100[] = {
1.0f, 0.0f, 50.0f, 0.0f, 50.0f, 0.0f, 50.0f,
};
f32 D_edata_800CBEA8[] = {
f32 gDefaultCubeHitbox150[] = {
1.0f, 0.0f, 75.0f, 0.0f, 75.0f, 0.0f, 75.0f,
};
f32 D_edata_800CBEC4[] = {
f32 gDefaultCubeHitbox200[] = {
1.0f, 0.0f, 100.0f, 0.0f, 100.0f, 0.0f, 100.0f,
};
f32 D_edata_800CBEE0[] = {
f32 gDefaultCubeHitbox300[] = {
// unused
1.0f, 0.0f, 150.0f, 0.0f, 150.0f, 0.0f, 150.0f,
};
f32 D_edata_800CBEFC[] = {
f32 gDefaultCubeHitbox400[] = {
1.0f, 0.0f, 200.0f, 0.0f, 200.0f, 0.0f, 200.0f,
};
f32 D_edata_800CBF18[] = {
f32 gItemRingCheckHitbox[] = {
1.0f, -113.0f, 61.0f, 98.0f, 100.0f, 0.0f, 219.0f,
};
f32 D_edata_800CBF34[] = {
f32 gHitboxNone[] = {
0.0f,
};
f32 D_edata_800CBF38[] = {
f32 gItemCheckpointHitbox[] = {
1.0f, -40.0f, 40.0f, 0.0f, 180.0f, 0.0f, 180.0f,
};
f32 D_edata_800CBF54[] = {
f32 gItemSupplyRingHitbox[] = {
1.0f, 0.0f, 120.0f, 0.0f, 120.0f, 0.0f, 120.0f,
};
f32 D_edata_800CBF70[] = {
f32 gMeteoWarpHitbox[] = {
1.0f, -40.0f, 100.0f, 0.0f, 100.0f, 0.0f, 100.0f,
};
f32 D_edata_800CBF8C[] = {
1.0f, 0.0f, 100.0f, 0.0f, 1200.0f, 0.0f, 1200.0f,
};
f32 D_edata_800CBFA8[] = {
f32 gItemLasersHitbox[] = {
1.0f, 0.0f, 120.0f, 0.0f, 120.0f, 0.0f, 120.0f, 0.0f,
};
f32 D_edata_800CBFC8[] = {
f32 gItemBombHitbox[] = {
1.0f, 0.0f, 120.0f, 0.0f, 120.0f, 0.0f, 120.0f,
};
f32 D_edata_800CBFE4[] = {
f32 gActor190_191Hitbox[] = {
1.0f, 0.0f, 40.0f, 0.0f, 40.0f, 0.0f, 40.0f,
};
f32 D_edata_800CC000[] = {
f32 gActor194HItbox[] = {
1.0f, 0.0f, 50.0f, 0.0f, 50.0f, 0.0f, 50.0f,
};
f32 D_edata_800CC01C[] = {
f32 gTeamHitbox[] = {
1.0f, 0.0f, 40.0f, 0.0f, 40.0f, 0.0f, 40.0f,
};
f32 D_edata_800CC038[] = {
f32 gActorAllRangeHItbox[] = {
1.0f, 0.0f, 40.0f, 0.0f, 40.0f, 0.0f, 40.0f,
};
f32 D_edata_800CC054[] = {
f32 gWarpZoneEvent94Hitbox[] = {
1.0f, 0.0f, 140.0f, 0.0f, 170.0f, 0.0f, 140.0f,
};
f32 D_edata_800CC070[] = {
f32 gWarpZoneEvent96Hitbox[] = {
4.0f, 0.0f, 140.0f, -675.0f, 140.0f, 0.0f, 810.0f, 0.0f, 140.0f, 675.0f, 140.0f, 0.0f, 810.0f,
0.0f, 140.0f, 0.0f, 810.0f, 675.0f, 140.0f, 0.0f, 140.0f, 0.0f, 810.0f, -675.0f, 140.0f,
};
f32 D_edata_800CC0D4[] = {
f32 gWarpZoneEvent92Hitbox[] = {
1.0f, 0.0f, 140.0f, 0.0f, 140.0f, 0.0f, 1800.0f,
};
f32 D_edata_800CC0F0[] = {
f32 gWarpZoneEvent93Hitbox[] = {
2.0f, 0.0f, 140.0f, 0.0f, 140.0f, 0.0f, 1800.0f, 1.0f, 141.0f, 1.0f, 1800.0f, 1.0f, 140.0f,
};
// clang-format off
ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_80_0, */ {(void*) D_CO_6015F00, 0, (ObjectFunc) NULL, D_CO_603E3E0, 800.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_1, */ {(void*) D_CO_602E9E0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_2, */ {(void*) D_CO_601BEC0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_3, */ {(void*) D_CO_602E7A0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_4, */ {(void*) D_CO_60244A0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_5, */ {(void*) D_CO_602E570, 0, (ObjectFunc) NULL, D_edata_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_1, */ {(void*) D_CO_602E9E0, 0, (ObjectFunc) NULL, gHitboxNone, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_2, */ {(void*) D_CO_601BEC0, 0, (ObjectFunc) NULL, gHitboxNone, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_3, */ {(void*) D_CO_602E7A0, 0, (ObjectFunc) NULL, gHitboxNone, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_4, */ {(void*) D_CO_60244A0, 0, (ObjectFunc) NULL, gHitboxNone, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_5, */ {(void*) D_CO_602E570, 0, (ObjectFunc) NULL, gHitboxNone, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_6, */ {(void*) D_CO_60132B0, 0, (ObjectFunc) NULL, D_CO_603DCA4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_7, */ {(void*) D_CO_602E080, 0, (ObjectFunc) NULL, D_CO_603DD40, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_8, */ {(void*) D_CO_60164F0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_9, */ {(void*) D_CO_6014500, 0, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_8, */ {(void*) D_CO_60164F0, 0, (ObjectFunc) NULL, gHitboxNone, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_9, */ {(void*) D_CO_6014500, 0, (ObjectFunc) NULL, gHitboxNone, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_10, */ {(void*) D_CO_602D5F0, 0, (ObjectFunc) NULL, D_CO_603DDF0, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_11, */ {(void*) D_CO_601A7D0, 0, (ObjectFunc) NULL, D_CO_603DE8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_12, */ {(void*) D_CO_6014B50, 0, (ObjectFunc) NULL, D_CO_603DEF4, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
@@ -131,7 +132,7 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_80_36, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_60066E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_37, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_600672C, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_38, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_6006778, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_39, */ {(void*) Obj39_Draw, 1, (ObjectFunc) Obj39_Update, D_edata_800CBF34, 6000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_39, */ {(void*) Obj39_Draw, 1, (ObjectFunc) Obj39_Update, gHitboxNone, 6000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_40, */ {(void*) func_edisplay_80059F68, 1, (ObjectFunc) func_enmy_80066D5C, D_CO_603E4A4, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_41, */ {(void*) func_edisplay_80059FDC, 1, (ObjectFunc) func_enmy_80066EA8, D_CO_603E4DC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_42, */ {(void*) Obj42_Draw, 1, (ObjectFunc) Obj42_Update, D_CO_603E514, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
@@ -154,7 +155,7 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_80_59, */ {(void*) D_MA_6024010, 0, (ObjectFunc) NULL, D_MA_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_60, */ {(void*) D_MA_6027180, 0, (ObjectFunc) NULL, D_MA_6036288, 400.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_61, */ {(void*) Macbeth_801A2A78, 1, (ObjectFunc) NULL, D_MA_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_62, */ {(void*) D_MA_60270E0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_62, */ {(void*) D_MA_60270E0, 0, (ObjectFunc) NULL, gHitboxNone, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_63, */ {(void*) D_MA_6013960, 0, (ObjectFunc) NULL, D_MA_6036894, 500.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_64, */ {(void*) D_MA_600AF40, 0, (ObjectFunc) NULL, D_MA_60368E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_65, */ {(void*) Macbeth_801A6608, 1, (ObjectFunc) NULL, D_MA_6036724, 400.0f, 0, 0, 0, 0, 0.0f, 0 },
@@ -168,34 +169,34 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_80_73, */ {(void*) D_MA_6030630, 0, (ObjectFunc) NULL, D_MA_6036410, 1100.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_74, */ {(void*) D_MA_602DC20, 0, (ObjectFunc) NULL, D_MA_603643C, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_75, */ {(void*) D_MA_601B0D0, 0, (ObjectFunc) NULL, D_MA_6036760, 3000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_76, */ {(void*) D_MA_60075D0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_76, */ {(void*) D_MA_60075D0, 0, (ObjectFunc) NULL, gHitboxNone, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_77, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_MA_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_78, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_79, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_80, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_81, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_82, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_83, */ {(void*) Macbeth_801A3240, 1, (ObjectFunc) Macbeth_801A2DD8, D_edata_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_84, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_85, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_86, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_87, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_88, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_89, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_90, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_91, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_92, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_93, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_94, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_95, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_96, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_97, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_98, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_99, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_100 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_101 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_102 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_103 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_78, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_79, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_80, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_81, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_82, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_83, */ {(void*) Macbeth_801A3240, 1, (ObjectFunc) Macbeth_801A2DD8, gHitboxNone, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_84, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_85, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_86, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_87, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_88, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_89, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_90, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_91, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, gHitboxNone, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_92, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, gHitboxNone, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_93, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, gHitboxNone, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_94, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, gHitboxNone, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_95, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, gHitboxNone, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_96, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, gHitboxNone, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_97, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, gHitboxNone, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_98, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, gHitboxNone, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_99, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, gHitboxNone, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_100 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, gHitboxNone, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_101 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, gHitboxNone, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_102 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, gHitboxNone, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_103 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, gHitboxNone, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_104 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) Macbeth_801A0BD8, D_MA_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_105 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_MA_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_106 */ {(void*) D_SY_60097E0, 0, (ObjectFunc) NULL, D_SY_6034478, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
@@ -203,10 +204,10 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_80_108 */ {(void*) D_SY_60102C0, 0, (ObjectFunc) NULL, D_SY_6034588, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_109 */ {(void*) D_SY_60036A0, 0, (ObjectFunc) SectorY_801A4E44, D_SY_6034664, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_110 */ {(void*) D_SY_6005360, 0, (ObjectFunc) NULL, D_SY_6034770, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_111 */ {(void*) Obj111_Draw, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_111 */ {(void*) Obj111_Draw, 1, (ObjectFunc) NULL, gHitboxNone, 2000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_112 */ {(void*) D_SY_600F6C0, 0, (ObjectFunc) SectorY_801A52B8, D_SY_60347F0, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_113 */ {(void*) D_SY_601B610, 0, (ObjectFunc) NULL, D_edata_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_114 */ {(void*) D_SY_601C6A0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_113 */ {(void*) D_SY_601B610, 0, (ObjectFunc) NULL, gHitboxNone, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_114 */ {(void*) D_SY_601C6A0, 0, (ObjectFunc) NULL, gHitboxNone, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_115 */ {(void*) D_SY_60188D0, 0, (ObjectFunc) NULL, D_SY_603486C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_116 */ {(void*) D_SY_60034D0, 0, (ObjectFunc) NULL, D_SY_60347D4, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_117 */ {(void*) D_AQ_60231C0, 0, (ObjectFunc) NULL, D_AQ_6030C60, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
@@ -216,9 +217,9 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_80_121 */ {(void*) D_AQ_602B4C0, 0, (ObjectFunc) NULL, D_AQ_6030E14, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_122 */ {(void*) D_AQ_600EE10, 0, (ObjectFunc) NULL, D_AQ_6030E30_Hitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_123 */ {(void*) D_AQ_60120F0, 0, (ObjectFunc) NULL, D_AQ_6030E4C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_124 */ {(void*) D_AQ_600EEF0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_124 */ {(void*) D_AQ_600EEF0, 0, (ObjectFunc) NULL, gHitboxNone, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_125 */ {(void*) D_AQ_600BF80, 0, (ObjectFunc) NULL, D_AQ_6030E68, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_126 */ {(void*) Aquas_801BE1FC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_126 */ {(void*) Aquas_801BE1FC, 1, (ObjectFunc) NULL, gHitboxNone, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_127 */ {(void*) D_VE1_9005C80, 0, (ObjectFunc) Venom1_801924A8, D_VE1_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_128 */ {(void*) D_VE1_9003F50, 0, (ObjectFunc) NULL, D_VE1_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_129 */ {(void*) D_VE1_900F060, 0, (ObjectFunc) NULL, D_VE1_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
@@ -229,17 +230,17 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_80_134 */ {(void*) D_VE2_6003000, 0, (ObjectFunc) NULL, D_ANDROSS_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_135 */ {(void*) D_TI_6006890, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_136 */ {(void*) D_VE2_6002990, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_137 */ {(void*) D_VE2_6004170, 0, (ObjectFunc) NULL, D_edata_800CBF34, 0.0f, 0, 0, 0, 1, 0.0f, 0 },
/* OBJ_80_137 */ {(void*) D_VE2_6004170, 0, (ObjectFunc) NULL, gHitboxNone, 0.0f, 0, 0, 0, 1, 0.0f, 0 },
/* OBJ_80_138 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_139 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_140 */ {(void*) D_versus_30173C0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_141 */ {(void*) D_versus_30174E0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_140 */ {(void*) D_versus_30173C0, 0, (ObjectFunc) NULL, gHitboxNone, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_141 */ {(void*) D_versus_30174E0, 0, (ObjectFunc) NULL, gHitboxNone, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_142 */ {(void*) D_versus_301B080, 0, (ObjectFunc) NULL, D_versus_302EE9C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_143 */ {(void*) D_versus_3016B00, 0, (ObjectFunc) NULL, D_versus_302EE00, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_144 */ {(void*) D_versus_3013780, 0, (ObjectFunc) NULL, D_versus_302ED4C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_145 */ {(void*) D_versus_3013580, 0, (ObjectFunc) NULL, D_versus_302ED98, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_146 */ {(void*) D_versus_3012ED0, 0, (ObjectFunc) NULL, D_versus_302EDB4, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_147 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_edata_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_147 */ {(void*) NULL, 0, (ObjectFunc) NULL, gHitboxNone, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_148 */ {(void*) D_FO_60079B0, 0, (ObjectFunc) NULL, D_FO_600FF80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_149 */ {(void*) D_FO_6007D80, 0, (ObjectFunc) NULL, D_FO_600FFA0, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_150 */ {(void*) D_FO_6006310, 0, (ObjectFunc) NULL, D_FO_600FFC0, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
@@ -247,55 +248,55 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_80_152 */ {(void*) D_BO_600F4C0, 0, (ObjectFunc) NULL, D_BO_6011C10, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_153 */ {(void*) D_BO_600B8B0, 0, (ObjectFunc) NULL, D_BO_6011C48, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_154 */ {(void*) D_KA_600BAF0, 0, (ObjectFunc) NULL, D_KA_601115C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_155 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_edata_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_155 */ {(void*) NULL, 0, (ObjectFunc) NULL, gHitboxNone, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_156 */ {(void*) SectorY_80197CB8, 1, (ObjectFunc) NULL, D_SY_6034368, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_157 */ {(void*) D_SZ_6001DA0, 0, (ObjectFunc) NULL, D_SZ_600924C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_158 */ {(void*) D_SZ_6001360, 0, (ObjectFunc) NULL, D_SZ_60092E8, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_159 */ {(void*) D_VE2_6008370, 0, (ObjectFunc) NULL, D_VE2_601668C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_160 */ {(void*) D_VE2_6010960, 0, (ObjectFunc) NULL, D_VE2_6016714, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_161 */ {(void*) D_CO_602F7C0, 0, (ObjectFunc) func_enmy_80068FE0, D_CO_603E468, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_162 */ {(void*) D_CO_601C9B0, 0, (ObjectFunc) func_enmy_80068FE0, D_CO_603E484, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_163 */ {(void*) D_FO_600A420, 0, (ObjectFunc) func_enmy_80068FE0, D_FO_600FE9C, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_164 */ {(void*) func_edisplay_80059C40, 1, (ObjectFunc) NULL, D_edata_800CBF34, 1800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_165 */ {(void*) D_CO_602DCA0, 0, (ObjectFunc) NULL, D_edata_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_166 */ {(void*) D_CO_601F500, 0, (ObjectFunc) NULL, D_edata_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_167 */ {(void*) func_edisplay_80059C34, 1, (ObjectFunc) func_enmy_80066E8C, D_edata_800CBF34, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_168 */ {(void*) func_edisplay_80059850, 1, (ObjectFunc) NULL, D_edata_800CBF34, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_169 */ {(void*) D_TI_60023B0, 0, (ObjectFunc) Titania_8018F038, D_TI_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_170 */ {(void*) NULL, 1, (ObjectFunc) Corneria_801875A4, D_edata_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_171 */ {(void*) NULL, 1, (ObjectFunc) Venom1_801922DC, D_edata_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_172 */ {(void*) NULL, 1, (ObjectFunc) Venom1_80192358, D_edata_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_173 */ {(void*) NULL, 1, (ObjectFunc) Venom1_801923C0, D_edata_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_174 */ {(void*) NULL, 1, (ObjectFunc) Venom1_8019243C, D_edata_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_175 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_edata_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SPRITE_CO_POLE */ {(void*) D_CO_602F7C0, 0, (ObjectFunc) Sprite_UpdateDoodad, D_CO_603E468, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SPRITE_CO_TREE */ {(void*) D_CO_601C9B0, 0, (ObjectFunc) Sprite_UpdateDoodad, D_CO_603E484, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SPRITE_FO_POLE */ {(void*) D_FO_600A420, 0, (ObjectFunc) Sprite_UpdateDoodad, D_FO_600FE9C, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SPRITE_FOG_SHADOW */ {(void*) FogShadow_Draw, 1, (ObjectFunc) NULL, gHitboxNone, 1800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SPRITE_CO_RUIN1 */ {(void*) D_CO_602DCA0, 0, (ObjectFunc) NULL, gHitboxNone, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SPRITE_CO_RUIN2 */ {(void*) D_CO_601F500, 0, (ObjectFunc) NULL, gHitboxNone, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SPRITE_167 */ {(void*) Sprite167_Draw, 1, (ObjectFunc) Sprite167_Update, gHitboxNone, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SPRITE_168 */ {(void*) Sprite168_Draw, 1, (ObjectFunc) NULL, gHitboxNone, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SPRITE_TI_CACTUS */ {(void*) D_TI_60023B0, 0, (ObjectFunc) Titania_Cactus_Update, D_TI_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SPRITE_CO_SMOKE */ {(void*) NULL, 1, (ObjectFunc) Corneria_801875A4, gHitboxNone, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SPRITE_VE1_BOSS_TRIGGER1 */ {(void*) NULL, 1, (ObjectFunc) Venom1_BossTrigger1_Update, gHitboxNone, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SPRITE_VE1_BOSS_TRIGGER2 */ {(void*) NULL, 1, (ObjectFunc) Venom1_BossTrigger2_Update, gHitboxNone, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SPRITE_VE1_BOSS_TRIGGER3 */ {(void*) NULL, 1, (ObjectFunc) Venom1_BossTrigger3_Update, gHitboxNone, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SPRITE_VE1_BOSS_TRIGGER4 */ {(void*) NULL, 1, (ObjectFunc) Venom1_BossTrigger4_Update, gHitboxNone, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SPRITE_GFOX_TARGET */ {(void*) NULL, 1, (ObjectFunc) NULL, gHitboxNone, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_176 */ {(void*) Corneria_8018BAAC, 2, (ObjectFunc) Corneria_8018AED0, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_177 */ {(void*) Corneria_8018BBA4, 2, (ObjectFunc) Corneria_8018B15C, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_178 */ {(void*) Corneria_8018BBF8, 2, (ObjectFunc) Corneria_8018B418, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_179 */ {(void*) Corneria_8018BD7C, 2, (ObjectFunc) Corneria_8018B58C, D_CO_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_180 */ {(void*) func_edisplay_8005B6A4, 1, (ObjectFunc) func_enmy_80066A80, D_edata_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_180 */ {(void*) func_edisplay_8005B6A4, 1, (ObjectFunc) func_enmy_80066A80, gHitboxNone, 1000.0f, 0, 0, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_181 */ {(void*) D_ME_6018C00, 0, (ObjectFunc) Meteo_8018756C, D_ME_602F6EC, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_182 */ {(void*) func_edisplay_8005B71C, 1, (ObjectFunc) Meteo_80187650, D_ME_602F708, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_183 */ {(void*) Meteo_8018DA6C, 1, (ObjectFunc) Meteo_8018D9EC, D_edata_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_184 */ {(void*) Meteo_8018DAEC, 1, (ObjectFunc) Meteo_8018D9EC, D_edata_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_185 */ {(void*) Meteo_8018DB6C, 1, (ObjectFunc) Meteo_8018D9EC, D_edata_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_183 */ {(void*) Meteo_8018DA6C, 1, (ObjectFunc) Meteo_8018D9EC, gHitboxNone, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_184 */ {(void*) Meteo_8018DAEC, 1, (ObjectFunc) Meteo_8018D9EC, gHitboxNone, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_185 */ {(void*) Meteo_8018DB6C, 1, (ObjectFunc) Meteo_8018D9EC, gHitboxNone, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_186 */ {(void*) func_edisplay_8005B7CC, 1, (ObjectFunc) Meteo_8018795C, D_ME_602F724, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_187 */ {(void*) D_ME_6018450, 0, (ObjectFunc) Meteo_801877C4, D_ME_602F740, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_188 */ {(void*) Aquas_801BEC74, 1, (ObjectFunc) Aquas_801BEC68, D_AQ_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_189 */ {(void*) Actor189_Draw, 1, (ObjectFunc) Actor189_Update, D_edata_800CBF34, 0.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_190 */ {(void*) func_edisplay_8005B848, 1, (ObjectFunc) func_enmy_800656D4, D_edata_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_191 */ {(void*) func_edisplay_8005B848, 1, (ObjectFunc) func_enmy_800656D4, D_edata_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_189 */ {(void*) Actor189_Draw, 1, (ObjectFunc) Actor189_Update, gHitboxNone, 0.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_190 */ {(void*) func_edisplay_8005B848, 1, (ObjectFunc) func_enmy_800656D4, gActor190_191Hitbox, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_191 */ {(void*) func_edisplay_8005B848, 1, (ObjectFunc) func_enmy_800656D4, gActor190_191Hitbox, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_192 */ {(void*) func_edisplay_8005B9A4, 1, (ObjectFunc) func_enmy_8006654C, D_CO_603E54C, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
/* OBJ_ACTOR_193 */ {(void*) func_edisplay_8005BA30, 1, (ObjectFunc) func_enmy_800669A0, D_CO_603E598, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_194 */ {(void*) Actor194_Draw, 1, (ObjectFunc) Actor194_Update, D_edata_800CC000, 200.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_195 */ {(void*) func_demo_8004FEC0, 1, (ObjectFunc) func_demo_8004F8AC, D_edata_800CBF34, 20000.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_194 */ {(void*) Actor194_Draw, 1, (ObjectFunc) Actor194_Update, gActor194HItbox, 200.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_195 */ {(void*) func_demo_8004FEC0, 1, (ObjectFunc) func_demo_8004F8AC, gHitboxNone, 20000.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_196 */ {(void*) Actor196_Draw, 1, (ObjectFunc) Actor196_Update, D_CO_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_ALLRANGE */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorAllRange_Update, D_edata_800CC038, 20000.0f, 0, 1, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_TEAM_BOSS */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorTeamBoss_Update, D_edata_800CC01C, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_199 */ {(void*) Andross_80188448, 1, (ObjectFunc) Andross_801880E4, D_edata_800CBF34, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_EVENT */ {(void*) ActorEvent_Draw, 1, (ObjectFunc) ActorEvent_Update, D_edata_800CBF34, 2000.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_ALLRANGE */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorAllRange_Update, gActorAllRangeHItbox, 20000.0f, 0, 1, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_TEAM_BOSS */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorTeamBoss_Update, gTeamHitbox, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_199 */ {(void*) Andross_80188448, 1, (ObjectFunc) Andross_801880E4, gHitboxNone, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_EVENT */ {(void*) ActorEvent_Draw, 1, (ObjectFunc) ActorEvent_Update, gHitboxNone, 2000.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_201 */ {(void*) Actor201_Draw, 1, (ObjectFunc) Actor201_Update, D_ME_602F684, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_202 */ {(void*) Actor202_Draw, 1, (ObjectFunc) Actor202_Update, D_ME_602F6A0, 100.0f, 0, 1, 39, 0, 180.0f, 1 },
/* OBJ_ACTOR_SLIPPY_SX */ {(void*) SectorX_8018F884, 1, (ObjectFunc) SectorX_8018F330, D_edata_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_SLIPPY_SX */ {(void*) SectorX_8018F884, 1, (ObjectFunc) SectorX_8018F330, gHitboxNone, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_204 */ {(void*) SectorY_Actor204_Draw, 1, (ObjectFunc) SectorY_Actor204_Update, D_SY_603405C, 1000.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_205 */ {(void*) Macbeth_801A12C4, 1, (ObjectFunc) Macbeth_8019C778, D_MA_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_206 */ {(void*) Macbeth_801A12C4, 1, (ObjectFunc) Macbeth_801AC438, D_MA_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
@@ -316,7 +317,7 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_ACTOR_221 */ {(void*) Macbeth_801AE2C0, 1, (ObjectFunc) Macbeth_801ADD68, D_MA_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_222 */ {(void*) Macbeth_801AEEFC, 1, (ObjectFunc) Macbeth_801AEC04, D_MA_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_223 */ {(void*) Macbeth_801A54E8, 1, (ObjectFunc) Macbeth_801A4B24, D_MA_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_224 */ {(void*) NULL, 1, (ObjectFunc) Titania_80189194, D_edata_800CBF34, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_224 */ {(void*) NULL, 1, (ObjectFunc) Titania_80189194, gHitboxNone, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_225 */ {(void*) D_TI1_700AB70, 0, (ObjectFunc) Titania_8018AB44, D_TI_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 },
/* OBJ_ACTOR_226 */ {(void*) Titania_80189AFC, 1, (ObjectFunc) Titania_801895B8, D_TI_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 },
/* OBJ_ACTOR_227 */ {(void*) Titania_8018E5B4, 1, (ObjectFunc) Titania_8018E54C, D_TI_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 },
@@ -326,22 +327,22 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_ACTOR_231 */ {(void*) Titania_8018BE84, 1, (ObjectFunc) Titania_8018B9D0, D_TI_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_232 */ {(void*) Titania_8018B6AC, 1, (ObjectFunc) Titania_8018B268, D_TI_6006890, 0.0f, 0, 0, 39, 1, 20.0f, 1 },
/* OBJ_ACTOR_233 */ {(void*) Titania_8018A1C0, 1, (ObjectFunc) Titania_80189CC8, D_TI_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_234 */ {(void*) Actor234_Draw, 1, (ObjectFunc) Actor234_Update, D_edata_800CBF34, 2000.0f, 0, 0, 39, 0, 0.0f, 5 },
/* OBJ_ACTOR_234 */ {(void*) Actor234_Draw, 1, (ObjectFunc) Actor234_Update, gHitboxNone, 2000.0f, 0, 0, 39, 0, 0.0f, 5 },
/* OBJ_ACTOR_235 */ {(void*) Zoness_80190430, 2, (ObjectFunc) Zoness_801904CC, D_ZO_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_236 */ {(void*) Zoness_80190F08, 1, (ObjectFunc) Zoness_80190A00, D_ZO_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_237 */ {(void*) Actor237_Draw, 1, (ObjectFunc) Actor237_Update, D_edata_800CBF34, 200.0f, 0, 0, 40, 0, 0.0f, 2 },
/* OBJ_ACTOR_238 */ {(void*) Zoness_801914C4, 2, (ObjectFunc) Zoness_80191010, D_edata_800CBE8C, 200.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_239 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_edata_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_240 */ {(void*) Zoness_80191B4C, 1, (ObjectFunc) Zoness_80191680, D_edata_800CBE8C, 1500.0f, 0, 1, 40, 0, 20.0f, 0 },
/* OBJ_ACTOR_241 */ {(void*) Zoness_80191DB0, 1, (ObjectFunc) Zoness_80191BC4, D_edata_800CBE70, 1500.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_237 */ {(void*) Actor237_Draw, 1, (ObjectFunc) Actor237_Update, gHitboxNone, 200.0f, 0, 0, 40, 0, 0.0f, 2 },
/* OBJ_ACTOR_238 */ {(void*) Zoness_801914C4, 2, (ObjectFunc) Zoness_80191010, gDefaultCubeHitbox100, 200.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_239 */ {(void*) NULL, 1, (ObjectFunc) NULL, gHitboxNone, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_240 */ {(void*) Zoness_80191B4C, 1, (ObjectFunc) Zoness_80191680, gDefaultCubeHitbox100, 1500.0f, 0, 1, 40, 0, 20.0f, 0 },
/* OBJ_ACTOR_241 */ {(void*) Zoness_80191DB0, 1, (ObjectFunc) Zoness_80191BC4, gActor241Hitbox, 1500.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_242 */ {(void*) Zoness_80191FFC, 2, (ObjectFunc) Zoness_80192094, D_ZO_602BE3C, 500.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_243 */ {(void*) Zoness_80192C18, 2, (ObjectFunc) Zoness_80192834, D_edata_800CBE8C, 0.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_243 */ {(void*) Zoness_80192C18, 2, (ObjectFunc) Zoness_80192834, gDefaultCubeHitbox100, 0.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_244 */ {(void*) Zoness_80193240, 2, (ObjectFunc) Zoness_80192E64, D_ZO_602BE58, 2000.0f, 0, 0, 40, 0, 50.0f, 0 },
/* OBJ_ACTOR_245 */ {(void*) Zoness_8019983C, 1, (ObjectFunc) Zoness_8019969C, D_edata_800CBE8C, 200.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_246 */ {(void*) Zoness_80199E24, 1, (ObjectFunc) Zoness_80199A28, D_edata_800CBE8C, 2000.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_245 */ {(void*) Zoness_8019983C, 1, (ObjectFunc) Zoness_8019969C, gDefaultCubeHitbox100, 200.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_246 */ {(void*) Zoness_80199E24, 1, (ObjectFunc) Zoness_80199A28, gDefaultCubeHitbox100, 2000.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_247 */ {(void*) Zoness_8019D3C4, 1, (ObjectFunc) Zoness_8019D15C, D_ZO_602BFC4, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_248 */ {(void*) Zoness_8019A1FC, 1, (ObjectFunc) Zoness_80199F10, D_edata_800CBEA8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_249 */ {(void*) Zoness_8019ACCC, 1, (ObjectFunc) Zoness_8019A5D4, D_edata_800CBEC4, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_248 */ {(void*) Zoness_8019A1FC, 1, (ObjectFunc) Zoness_80199F10, gDefaultCubeHitbox150, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_249 */ {(void*) Zoness_8019ACCC, 1, (ObjectFunc) Zoness_8019A5D4, gDefaultCubeHitbox200, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_250 */ {(void*) Zoness_8019B7DC, 1, (ObjectFunc) Zoness_8019B548, D_ZO_602C1D4, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_251 */ {(void*) Zoness_8019BDE0, 2, (ObjectFunc) Zoness_8019B854, D_ZO_602C218, 1000.0f, 0, 0, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_252 */ {(void*) Zoness_8019C1CC, 1, (ObjectFunc) Zoness_8019BE48, D_ZO_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 },
@@ -350,13 +351,13 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_ACTOR_255 */ {(void*) Aquas_801AE168, 1, (ObjectFunc) Aquas_801AD6C0, D_AQ_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_256 */ {(void*) Aquas_801AEB44, 1, (ObjectFunc) Aquas_801AE3D8, D_AQ_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_257 */ {(void*) Aquas_801B099C, 1, (ObjectFunc) Aquas_801AFA5C, D_AQ_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_258 */ {(void*) Aquas_801B0EC0, 1, (ObjectFunc) Aquas_801B0B60, D_edata_800CBE8C, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_258 */ {(void*) Aquas_801B0EC0, 1, (ObjectFunc) Aquas_801B0B60, gDefaultCubeHitbox100, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_259 */ {(void*) Aquas_801B619C, 2, (ObjectFunc) Aquas_801B638C, D_AQ_6031398, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_260 */ {(void*) Aquas_801B90DC, 2, (ObjectFunc) Aquas_801B7C78, D_AQ_60313CC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_261 */ {(void*) Aquas_801B504C, 2, (ObjectFunc) Aquas_801B50E8, D_AQ_6031400, 300.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_262 */ {(void*) Aquas_801B7A24, 2, (ObjectFunc) Aquas_801B6FF8, D_AQ_603144C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_263 */ {(void*) Aquas_801BA108, 2, (ObjectFunc) Aquas_801B91A4, D_AQ_6031480, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_264 */ {(void*) Aquas_801BA4E4, 1, (ObjectFunc) Aquas_801BA26C, D_edata_800CBE8C, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_264 */ {(void*) Aquas_801BA4E4, 1, (ObjectFunc) Aquas_801BA26C, gDefaultCubeHitbox100, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_265 */ {(void*) Aquas_801BAD7C, 1, (ObjectFunc) Aquas_801BA6A4, D_AQ_6031500, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_266 */ {(void*) Aquas_801BB204, 2, (ObjectFunc) Aquas_801BADF8, D_AQ_6031538, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_267 */ {(void*) Aquas_801BC930, 2, (ObjectFunc) Aquas_801BB79C, D_AQ_6031554, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
@@ -366,24 +367,24 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_ACTOR_271 */ {(void*) func_360_8002E694, 2, (ObjectFunc) func_360_8002E670, D_BO_6011B24, 0.0f, 0, 0, 39, 0, 730.0f, 1 },
/* OBJ_ACTOR_272 */ {(void*) func_360_8002E6DC, 1, (ObjectFunc) func_360_8002E6B8, D_BO_6011BF4, 0.0f, 0, 0, 39, 0, 150.0f, 1 },
/* OBJ_ACTOR_273 */ {(void*) Fortuna_80188FE4, 2, (ObjectFunc) Fortuna_80188AD0, D_FO_600FF30, 0.0f, 0, 0, 39, 0, 220.0f, 1 },
/* OBJ_ACTOR_274 */ {(void*) SectorZ_8019E3A8, 1, (ObjectFunc) SectorZ_8019E234, D_edata_800CBEC4, 0.0f, 0, 0, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_275 */ {(void*) Solar_8019F7AC, 1, (ObjectFunc) Solar_8019F20C, D_edata_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_276 */ {(void*) Solar_8019F7AC, 1, (ObjectFunc) Solar_8019F20C, D_edata_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_277 */ {(void*) Solar_8019F7AC, 1, (ObjectFunc) Solar_8019F20C, D_edata_800CBEC4, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_278 */ {(void*) NULL, 1, (ObjectFunc) Solar_8019EA7C, D_edata_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_ACTOR_279 */ {(void*) NULL, 1, (ObjectFunc) Solar_801A003C, D_edata_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_ACTOR_274 */ {(void*) SectorZ_8019E3A8, 1, (ObjectFunc) SectorZ_8019E234, gDefaultCubeHitbox200, 0.0f, 0, 0, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_275 */ {(void*) Solar_8019F7AC, 1, (ObjectFunc) Solar_8019F20C, gDefaultCubeHitbox100, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_276 */ {(void*) Solar_8019F7AC, 1, (ObjectFunc) Solar_8019F20C, gDefaultCubeHitbox100, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_277 */ {(void*) Solar_8019F7AC, 1, (ObjectFunc) Solar_8019F20C, gDefaultCubeHitbox200, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_278 */ {(void*) NULL, 1, (ObjectFunc) Solar_8019EA7C, gHitboxNone, 200.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_ACTOR_279 */ {(void*) NULL, 1, (ObjectFunc) Solar_801A003C, gHitboxNone, 1000.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_ACTOR_280 */ {(void*) D_VE1_900DD20, 0, (ObjectFunc) Venom1_80192518, D_VE1_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_281 */ {(void*) Venom1_80192E2C, 1, (ObjectFunc) Venom1_80192CD4, D_VE1_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_282 */ {(void*) D_VE1_901DA50, 0, (ObjectFunc) Venom1_80192CD4, D_VE1_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_283 */ {(void*) D_VE1_9023AD0, 0, (ObjectFunc) Venom1_80192EB0, D_VE1_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_284 */ {(void*) Venom1_801934D0, 1, (ObjectFunc) Venom1_801933DC, D_VE1_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_285 */ {(void*) Andross_80193244, 1, (ObjectFunc) Andross_80192E94, D_edata_800CBE8C, 1000.0f, 0, 0, 20, 0, 1.0f, 1 },
/* OBJ_ACTOR_286 */ {(void*) Andross_80188660, 1, (ObjectFunc) Andross_80188528, D_edata_800CBE8C, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_ACTOR_287 */ {(void*) NULL, 1, (ObjectFunc) Andross_80189724, D_edata_800CBF34, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_288 */ {(void*) NULL, 1, (ObjectFunc) Andross_801893B8, D_edata_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_ACTOR_289 */ {(void*) func_edata_800596B0, 1, (ObjectFunc) Andross_80189470, D_edata_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_ACTOR_290 */ {(void*) NULL, 1, (ObjectFunc) Andross_8018933C, D_edata_800CBF34, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_ACTOR_SUPPLIES */ {(void*) ActorSupplies_Draw, 1, (ObjectFunc) ActorSupplies_Update, D_edata_800CBEA8, 1000.0f, 0, 0, 0, 0, 1.0f, 0 },
/* OBJ_ACTOR_285 */ {(void*) Andross_80193244, 1, (ObjectFunc) Andross_80192E94, gDefaultCubeHitbox100, 1000.0f, 0, 0, 20, 0, 1.0f, 1 },
/* OBJ_ACTOR_286 */ {(void*) Andross_80188660, 1, (ObjectFunc) Andross_80188528, gDefaultCubeHitbox100, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_ACTOR_287 */ {(void*) NULL, 1, (ObjectFunc) Andross_80189724, gHitboxNone, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_288 */ {(void*) NULL, 1, (ObjectFunc) Andross_801893B8, gHitboxNone, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_ACTOR_289 */ {(void*) func_edata_800596B0, 1, (ObjectFunc) Andross_80189470, gHitboxNone, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_ACTOR_290 */ {(void*) NULL, 1, (ObjectFunc) Andross_8018933C, gHitboxNone, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_ACTOR_SUPPLIES */ {(void*) ActorSupplies_Draw, 1, (ObjectFunc) ActorSupplies_Update, gDefaultCubeHitbox150, 1000.0f, 0, 0, 0, 0, 1.0f, 0 },
/* OBJ_BOSS_292 */ {(void*) Corneria_8018AA74, 2, (ObjectFunc) Corneria_80189058, D_CO_603E620, 20000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_293 */ {(void*) Corneria_8018ECAC, 1, (ObjectFunc) Corneria_8018C19C, D_CO_603E840, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_294 */ {(void*) Corneria_8018ED78, 1, (ObjectFunc) Corneria_8018DDAC, D_CO_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
@@ -391,8 +392,8 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_BOSS_296 */ {(void*) Corneria_8018EF90, 1, (ObjectFunc) Corneria_8018E76C, D_CO_603E7C4, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_297 */ {(void*) Meteo_8018BACC, 1, (ObjectFunc) Meteo_8018978C, D_ME_602F75C, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_298 */ {(void*) Meteo_801887D0, 1, (ObjectFunc) Meteo_80188344, D_ME_602FA50, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_299 */ {(void*) Boss299_Draw, 2, (ObjectFunc) Boss299_Update, D_edata_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_300 */ {(void*) Boss300_Draw, 1, (ObjectFunc) Boss300_Update, D_edata_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_299 */ {(void*) Boss299_Draw, 2, (ObjectFunc) Boss299_Update, gHitboxNone, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_300 */ {(void*) Boss300_Draw, 1, (ObjectFunc) Boss300_Update, gHitboxNone, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_301 */ {(void*) Aquas_801BEC5C, 1, (ObjectFunc) Aquas_801BEC50, D_AQ_6030B10, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_A6 */ {(void*) Area6_8018C54C, 1, (ObjectFunc) Area6_80187944, D_A6_6028454, 2000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_303 */ {(void*) SectorX_80193434, 2, (ObjectFunc) SectorX_80190078, D_SX_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 },
@@ -401,35 +402,35 @@ ObjectInfo D_edata_800CC124[0x190] = {
/* OBJ_BOSS_306 */ {(void*) Titania_801982A8, 1, (ObjectFunc) Titania_80197A94,D_TI_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_ZO */ {(void*) Zoness_801949DC, 2, (ObjectFunc) Zoness_80194A84, D_ZO_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 },
/* OBJ_BOSS_308 */ {(void*) func_hud_8008FE78, 1, (ObjectFunc) func_hud_800907C4, D_FO_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_309 */ {(void*) func_360_8002E604, 1, (ObjectFunc) func_360_8002E5E0, D_edata_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_310 */ {(void*) func_360_8002E64C, 1, (ObjectFunc) func_360_8002E628, D_edata_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_309 */ {(void*) func_360_8002E604, 1, (ObjectFunc) func_360_8002E5E0, gHitboxNone, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_310 */ {(void*) func_360_8002E64C, 1, (ObjectFunc) func_360_8002E628, gHitboxNone, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_311 */ {(void*) Bolse_80191AFC, 2, (ObjectFunc) Bolse_801912FC, D_BO_6011C80, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_312 */ {(void*) Venom2_80196288, 2, (ObjectFunc) Venom2_80196210, D_VE2_60166F4, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_313 */ {(void*) SectorZ_8019E98C, 1, (ObjectFunc) SectorZ_8019E454, D_SZ_6009388, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_314 */ {(void*) SectorY_8019E2C4, 2, (ObjectFunc) SectorY_8019C888, D_edata_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_SO */ {(void*) Solar_801A71B8, 2, (ObjectFunc) Solar_801A5B3C, D_edata_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_314 */ {(void*) SectorY_8019E2C4, 2, (ObjectFunc) SectorY_8019C888, gHitboxNone, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_SO */ {(void*) Solar_801A71B8, 2, (ObjectFunc) Solar_801A5B3C, gHitboxNone, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_316 */ {(void*) Katina_801968F4, 1, (ObjectFunc) Katina_801946C4, D_KA_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_317 */ {(void*) Katina_80193B1C, 1, (ObjectFunc) Katina_80193718, D_KA_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_AQ */ {(void*) Aquas_801B4D84, 2, (ObjectFunc) Aquas_801B134C, D_AQ_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_319 */ {(void*) Venom1_801985E4, 1, (ObjectFunc) Venom1_80194398,D_VE1_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_320 */ {(void*) Andross_801928C8, 2, (ObjectFunc) Andross_8018DBF0, D_ANDROSS_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_321 */ {(void*) Andross_8018B8C0, 1, (ObjectFunc) Andross_80189B70, D_ANDROSS_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_ITEM_LASERS */ {(void*) ItemLasers_Draw, 1, (ObjectFunc) ItemLasers_Update, D_edata_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_CHECKPOINT */ {(void*) ItemCheckpoint_Draw, 1, (ObjectFunc) ItemCheckpoint_Update, D_edata_800CBF38, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_SILVER_RING */ {(void*) ItemSilverRing_Draw, 1, (ObjectFunc) ItemSupplyRing_Update, D_edata_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_SILVER_STAR */ {(void*) ItemSilverStar_Draw, 1, (ObjectFunc) ItemSilverStar_Update, D_edata_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_METEO_WARP */ {(void*) ItemMeteoWarp_Draw, 1, (ObjectFunc) ItemMeteoWarp_Update, D_edata_800CBF70, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_BOMB */ {(void*) ItemBomb_Draw, 1, (ObjectFunc) ItemPickup_Update, D_edata_800CBFC8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_328 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C88, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_329 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C88, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_330 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C88, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_331 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C88, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_332 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C88, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_333 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C88, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_334 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C48, D_edata_800CBF18, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_1UP */ {(void*) D_1022120, 0, (ObjectFunc) Item1up_Update, D_edata_800CBE8C, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_GOLD_RING */ {(void*) ItemGoldRing_Draw, 1, (ObjectFunc) ItemGoldRing_Update, D_edata_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_WING_REPAIR */ {(void*) D_arwing_3007650, 0, (ObjectFunc) ItemWingRepair_Update, D_edata_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_LASERS */ {(void*) ItemLasers_Draw, 1, (ObjectFunc) ItemLasers_Update, gItemLasersHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_CHECKPOINT */ {(void*) ItemCheckpoint_Draw, 1, (ObjectFunc) ItemCheckpoint_Update, gItemCheckpointHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_SILVER_RING */ {(void*) ItemSilverRing_Draw, 1, (ObjectFunc) ItemSupplyRing_Update, gItemSupplyRingHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_SILVER_STAR */ {(void*) ItemSilverStar_Draw, 1, (ObjectFunc) ItemSilverStar_Update, gItemSupplyRingHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_METEO_WARP */ {(void*) ItemMeteoWarp_Draw, 1, (ObjectFunc) ItemMeteoWarp_Update, gMeteoWarpHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_BOMB */ {(void*) ItemBomb_Draw, 1, (ObjectFunc) ItemPickup_Update, gItemBombHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_PATH_SPLIT_X */ {(void*) NULL, 1, (ObjectFunc) ItemPathChange_Update, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_PATH_TURN_LEFT */ {(void*) NULL, 1, (ObjectFunc) ItemPathChange_Update, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_PATH_TURN_RIGHT */ {(void*) NULL, 1, (ObjectFunc) ItemPathChange_Update, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_PATH_SPLIT_Y */ {(void*) NULL, 1, (ObjectFunc) ItemPathChange_Update, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_PATH_TURN_UP */ {(void*) NULL, 1, (ObjectFunc) ItemPathChange_Update, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_PATH_TURN_DOWN */ {(void*) NULL, 1, (ObjectFunc) ItemPathChange_Update, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_RING_CHECK */ {(void*) NULL, 1, (ObjectFunc) ItemRingCheck_Update, gItemRingCheckHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_1UP */ {(void*) D_1022120, 0, (ObjectFunc) Item1up_Update, gDefaultCubeHitbox100, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_GOLD_RING */ {(void*) ItemGoldRing_Draw, 1, (ObjectFunc) ItemGoldRing_Update, gItemSupplyRingHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_WING_REPAIR */ {(void*) D_arwing_3007650, 0, (ObjectFunc) ItemWingRepair_Update, gItemLasersHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_TRAINING_RING */ {(void*) gItemTrainingRingDL, 0, (ObjectFunc) Training_ItemRing_Update, D_TR_6009CFC, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_339 */ {(void*) func_effect_8007D55C, 1, (ObjectFunc) func_effect_8007D2F4, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_340 */ {(void*) func_effect_8007D55C, 1, (ObjectFunc) func_effect_8007D748, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
src/engine/fox_edisplay.c
+263 -263
View File
File diff suppressed because it is too large Load Diff
src/engine/fox_effect.c
+64 -63
View File
@@ -252,7 +252,7 @@ void func_effect_80077B84(Effect* effect) {
if (gCurrentLevel == LEVEL_BOLSE) {
RCP_SetupDL(&gMasterDisp, 0x26);
}
switch ((effect->index + gGameFrameCount) & 3) {
switch ((effect->index + gGameFrameCount) % 4U) {
case 0:
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 0, 0, effect->unk_44);
break;
@@ -332,13 +332,13 @@ static f32 D_800D1534[][10] = {
void func_effect_800780F8(Effect* effect) {
s32 i;
if (effect->unk_4A >= 11) {
if (!((effect->index + gGameFrameCount) & 1)) {
if (effect->unk_4A > 10) {
if (((effect->index + gGameFrameCount) % 2) == 0) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 128, 128, 32);
} else {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 128, 128, 128);
}
} else if (!((effect->index + gGameFrameCount) & 1)) {
} else if (((effect->index + gGameFrameCount) % 2) == 0) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
} else {
gDPSetPrimColor(gMasterDisp++, 0, 0, 96, 96, 255, 255);
@@ -456,7 +456,7 @@ void func_effect_80078AE0(void* effect) {
void func_effect_80078AEC(Effect* effect) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 180);
Graphics_SetScaleMtx(effect->scale2 * (13.0f + ((gGameFrameCount & 1) * 2.5f)));
Graphics_SetScaleMtx(effect->scale2 * (13.0f + ((s32) (gGameFrameCount % 2U) * 2.5f)));
gSPDisplayList(gMasterDisp++, D_102ED50);
}
@@ -472,7 +472,7 @@ void func_effect_80078BE0(Effect* effect) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 160);
var_fv0 = 3.0f;
if (gGameFrameCount & 1) {
if ((gGameFrameCount % 2) != 0) {
var_fv0 *= 1.2f;
}
Graphics_SetScaleMtx(effect->scale2 * var_fv0);
@@ -667,7 +667,7 @@ void func_effect_8007968C(Effect* effect) {
Object_Kill(&effect->obj, effect->sfxSource);
}
} else {
if (!(gGameFrameCount & 3)) {
if (((gGameFrameCount % 4) == 0)) {
func_effect_8007D2C8(effect->obj.pos.x, effect->obj.pos.y + 550.0f, effect->obj.pos.z, 10.0f);
}
if ((effect->timer_50 == 0) || (effect->obj.pos.y < (gGroundLevel - 100.0f))) {
@@ -683,7 +683,7 @@ void func_effect_8007968C(Effect* effect) {
effect->vel.y -= 0.5f;
}
if ((gCurrentLevel == LEVEL_BOLSE) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) && (gCsFrameCount >= 176)) {
if ((gCurrentLevel == LEVEL_BOLSE) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) && (gCsFrameCount > 175)) {
effect->vel.x *= 0.95f;
effect->vel.y *= 0.95f;
effect->vel.z *= 0.95f;
@@ -726,7 +726,7 @@ void func_effect_800798F0(Effect* effect) {
case LEVEL_MACBETH:
switch (effect->unk_44) {
case 1:
if (effect->index & 1) {
if ((effect->index % 2) != 0) {
gSPDisplayList(gMasterDisp++, D_MA_6022530);
} else {
gSPDisplayList(gMasterDisp++, D_MA_6022450);
@@ -735,7 +735,7 @@ void func_effect_800798F0(Effect* effect) {
case 2:
RCP_SetupDL(&gMasterDisp, 0x39);
if (effect->index & 1) {
if ((effect->index % 2) != 0) {
gSPDisplayList(gMasterDisp++, D_MA_601A7A0);
} else {
gSPDisplayList(gMasterDisp++, D_MA_60223C0);
@@ -812,7 +812,7 @@ void func_effect_800798F0(Effect* effect) {
break;
default:
if (effect->index & 1) {
if ((effect->index % 2) != 0) {
gSPDisplayList(gMasterDisp++, D_10194C0);
} else {
gSPDisplayList(gMasterDisp++, D_1024290);
@@ -830,7 +830,7 @@ void func_effect_800798F0(Effect* effect) {
default:
switch (effect->unk_4C) {
case 0:
if (effect->index & 1) {
if ((effect->index % 2) != 0) {
gSPDisplayList(gMasterDisp++, D_10194C0);
} else {
gSPDisplayList(gMasterDisp++, D_1024290);
@@ -838,7 +838,7 @@ void func_effect_800798F0(Effect* effect) {
break;
case 1:
switch (effect->index & 3) {
switch ((s32) (effect->index % 4U)) {
case 0:
Matrix_Scale(gGfxMatrix, 1.0f, 0.3f, 1.0f, 1);
break;
@@ -875,18 +875,18 @@ void func_effect_8007A28C(Effect* effect) {
effect->obj.rot.y += 1.0f;
Math_SmoothStepToF(&effect->scale2, effect->scale1, 0.05f, 1.5f, 0.001f);
if (effect->timer_50 >= 11) {
if (effect->timer_50 > 10) {
D_ctx_801779A8[0] = 60.0f;
}
if (effect->timer_50 == 48) {
D_ctx_80178340 = 150;
gFillScreenAlpha = 150;
}
if (effect->timer_50 > 45) {
D_ctx_80178358 = 0;
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255;
gFillScreenAlphaTarget = 0;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
}
D_ctx_8017835C = 3;
gFillScreenAlphaStep = 3;
if (effect->timer_50 == 0) {
effect->unk_44 -= 2;
@@ -899,7 +899,7 @@ void func_effect_8007A28C(Effect* effect) {
}
void func_effect_8007A3C0(Effect* effect) {
if (D_display_80161410 > 0) {
if (gReflectY > 0) {
Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_64_2();
@@ -1026,9 +1026,9 @@ void func_effect_8007A994(Effect* effect) {
effect->obj.rot.z += effect->unk_60.z;
effect->vel.y += effect->unk_60.y;
if (effect->unk_4A & 1) {
if ((effect->unk_4A % 2) != 0) {
effect->unk_48++;
if (effect->unk_48 >= 6) {
if (effect->unk_48 > 5) {
effect->unk_48 = 5;
}
}
@@ -1408,8 +1408,8 @@ void func_effect_8007B9DC(Effect* effect) {
if (gCurrentLevel != LEVEL_MACBETH) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 140, 99, 58, effect->unk_4A);
} else {
gDPSetPrimColor(gMasterDisp++, 0, 0, (gGameFrameCount & 3) + 5, (gGameFrameCount & 3) + 3,
(gGameFrameCount & 3) + 3, 220);
gDPSetPrimColor(gMasterDisp++, 0, 0, (gGameFrameCount % 4U) + 5, (gGameFrameCount % 4U) + 3,
(gGameFrameCount % 4U) + 3, 220);
}
//! DEBUG: Hold Z on controller 4 to set up a display list.
if (!(gControllerHold[3].button & A_BUTTON)) {
@@ -1648,7 +1648,7 @@ void func_effect_8007C50C(Effect* effect) {
f32 randY;
f32 randOther;
if (!(effect->timer_50 & 7)) {
if ((effect->timer_50 % 8) == 0) {
randX = RAND_FLOAT_CENTERED(40.0f) * effect->scale2;
randY = RAND_FLOAT_CENTERED(40.0f) * effect->scale2;
randOther = RAND_FLOAT(1.0f) + 1.0f;
@@ -2117,7 +2117,7 @@ void func_effect_8007D8A8(Effect* effect) {
Object_Kill(&effect->obj, effect->sfxSource);
}
}
if (effect->unk_4C >= 16) {
if (effect->unk_4C > 15) {
effect->unk_44 -= 20;
}
}
@@ -2188,7 +2188,7 @@ void func_effect_8007DB70(Effect* effect) {
func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 7.0f);
func_effect_8007BFFC(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 0.0f, 0.0f, 0.0f,
4.0f, 5);
if ((effect->obj.pos.y < (gGroundLevel + 10.0f)) || (D_ctx_80161A88 != 2)) {
if ((effect->obj.pos.y < (gGroundLevel + 10.0f)) || (gGroundType != GROUNDTYPE_WATER)) {
func_beam_800365E4(effect->obj.pos.x, 3.0f, effect->obj.pos.z, effect->obj.pos.x, effect->obj.pos.z,
0.0f, 0.0f, 90.0f, 5.0f, 0, 0);
break;
@@ -2251,7 +2251,8 @@ void func_effect_8007E014(Effect* effect) {
effect->obj.rot.z = RAD_TO_DEG(z);
}
if (((effect->unk_44 == 1) || (effect->unk_44 == 3)) && ((effect->timer_50 & 3) == 1) && (Rand_ZeroOne() < 0.5f)) {
if (((effect->unk_44 == 1) || (effect->unk_44 == 3)) && ((s32) (effect->timer_50 % 4U) == 1) &&
(Rand_ZeroOne() < 0.5f)) {
func_effect_8007D10C(effect->obj.pos.x, effect->obj.pos.y + (effect->scale2 * 5.0f), effect->obj.pos.z + 3.0f,
(RAND_FLOAT(0.7f) + 1.0f) * (effect->scale2 * 1.2f));
}
@@ -2358,7 +2359,7 @@ void func_effect_8007E648(Effect* effect) {
}
}
void func_effect_8007E6B8(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg5) {
void func_effect_8007E6B8(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 speed) {
f32 sp54;
f32 sp50;
f32 temp_ft4;
@@ -2384,7 +2385,7 @@ void func_effect_8007E6B8(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPo
sp40.x = 0.0f;
sp40.y = 0.0f;
sp40.z = arg5;
sp40.z = speed;
Matrix_MultVec3f(gCalcMatrix, &sp40, &sp34);
@@ -2415,7 +2416,7 @@ void func_effect_8007E6B8(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPo
AUDIO_PLAY_SFX(0x29002002, effect->sfxSource, 4);
}
void func_effect_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg5) {
void func_effect_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 speed) {
f32 sp54;
f32 sp50;
f32 temp_ft4;
@@ -2441,7 +2442,7 @@ void func_effect_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPo
sp40.x = 0.0f;
sp40.y = 0.0f;
sp40.z = arg5;
sp40.z = speed;
Matrix_MultVec3f(gCalcMatrix, &sp40, &sp34);
@@ -2577,14 +2578,14 @@ void func_effect_8007F04C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xRot
}
}
void func_effect_8007F11C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
void func_effect_8007F11C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 speed) {
s32 i;
if ((fabsf(zPos - gPlayer[0].unk_138) > 300.0f) || (fabsf(xPos - gPlayer[0].pos.x) > 300.0f)) {
for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
if (gEffects[i].obj.status == OBJ_FREE) {
Matrix_Push(&gCalcMatrix);
func_effect_8007E6B8(&gEffects[i], objId, xPos, yPos, zPos, arg4);
func_effect_8007E6B8(&gEffects[i], objId, xPos, yPos, zPos, speed);
Matrix_Pop(&gCalcMatrix);
break;
}
@@ -2592,14 +2593,14 @@ void func_effect_8007F11C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4
}
}
void func_effect_8007F20C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
void func_effect_8007F20C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 speed) {
s32 i;
if ((fabsf(zPos - gPlayer[0].camEye.z) > 300.0f) || (fabsf(xPos - gPlayer[0].camEye.x) > 300.0f)) {
for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
if (gEffects[i].obj.status == OBJ_FREE) {
Matrix_Push(&gCalcMatrix);
func_effect_8007E93C(&gEffects[i], objId, xPos, yPos, zPos, arg4);
func_effect_8007E93C(&gEffects[i], objId, xPos, yPos, zPos, speed);
Matrix_Pop(&gCalcMatrix);
break;
}
@@ -2627,7 +2628,7 @@ void func_effect_8007F2FC(Effect* effect) {
effect->obj.pos.z -= effect->vel.z * 0.5f;
}
if ((effect->unk_44 == 1) && !(gGameFrameCount & 1)) {
if ((effect->unk_44 == 1) && ((gGameFrameCount % 2) == 0)) {
func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 1.5f);
}
}
@@ -2678,7 +2679,7 @@ void func_effect_8007F5AC(Effect* effect) {
effect->vel.x -= 0.5f;
}
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
effect->unk_44--;
if (effect->unk_44 < 20) {
Object_Kill(&effect->obj, effect->sfxSource);
@@ -2712,7 +2713,7 @@ void func_effect_8007F6B0(Effect* effect) {
Object_Kill(&effect->obj, effect->sfxSource);
}
if (!(gGameFrameCount & 3) && (effect->state == 0)) {
if (((gGameFrameCount % 4) == 0) && (effect->state == 0)) {
randfloat = RAND_FLOAT(30.0f);
for (i = 0; i < 36; i += 2) {
temp = (i * 10.0f * M_DTOR) + randfloat;
@@ -2759,7 +2760,7 @@ void func_effect_8007F958(Effect* effect) {
return;
}
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
randFloat = RAND_FLOAT(144.0f);
for (i = 0; i < 5; i++) {
temp = (i * 72.0f * M_DTOR) + randFloat;
@@ -2800,7 +2801,7 @@ void func_effect_8007FBE0(Effect* effect) {
Object_Kill(&effect->obj, effect->sfxSource);
}
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
randFloat = RAND_FLOAT(144.0f);
for (i = 0; i < 10; i++) {
temp = (i * 36.0f * M_DTOR) + randFloat;
@@ -2899,7 +2900,7 @@ void func_effect_8007FE88(Effect* effect) {
}
} else if (effect->obj.pos.y < gGroundLevel) {
Object_Kill(&effect->obj, effect->sfxSource);
if (D_ctx_80161A88 != 2) {
if (gGroundType != GROUNDTYPE_WATER) {
effect->obj.pos.y = gGroundLevel;
func_effect_8007D074(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f);
}
@@ -2932,7 +2933,7 @@ void func_effect_800802F8(Effect* effect) {
func_effect_8007FE88(effect);
effect->obj.rot.z += 10.0f;
effect->scale2 = 3.0f;
if (gGameFrameCount & 1) {
if ((gGameFrameCount % 2) != 0) {
effect->scale2 = 3.5f;
}
}
@@ -3030,7 +3031,7 @@ void func_effect_8008040C(Effect* effect) {
}
} else if (effect->obj.pos.y < gGroundLevel) {
Object_Kill(&effect->obj, effect->sfxSource);
if (D_ctx_80161A88 != 2) {
if (gGroundType != GROUNDTYPE_WATER) {
effect->obj.pos.y = gGroundLevel;
func_effect_8007D074(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f);
}
@@ -3092,7 +3093,7 @@ void func_effect_80080ACC(Effect* effect) {
}
temp_ft2 = (((f32) effect->unk_44 / (f32) effect->unk_46) * 255.0f);
effect->unk_48 = temp_ft2;
if (temp_ft2 >= 256) {
if (temp_ft2 > 255) {
effect->unk_48 = 255;
}
if (effect->unk_48 < 32) {
@@ -3266,7 +3267,7 @@ void func_effect_80080D04(Effect* effect) {
D_800D18E4++;
}
if (!((effect->index + gGameFrameCount) & 1)) {
if (((effect->index + gGameFrameCount) % 2) == 0) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
} else {
gDPSetPrimColor(gMasterDisp++, 0, 0, 96, 96, 255, 255);
@@ -3490,7 +3491,7 @@ void func_effect_80081C5C(Effect* effect) {
break;
}
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
func_effect_8007C484(RAND_FLOAT_CENTERED(50.0f) + effect->obj.pos.x,
RAND_FLOAT_CENTERED(50.0f) + effect->obj.pos.y,
RAND_FLOAT_CENTERED(50.0f) + effect->obj.pos.z, effect->vel.x, effect->vel.y,
@@ -3513,7 +3514,7 @@ void func_effect_80081C5C(Effect* effect) {
effect->unk_60.z += 10.0f;
effect->vel.z = 5.0f;
if (!(gGameFrameCount & 7)) {
if (((gGameFrameCount % 8) == 0)) {
effect->unk_44++;
effect->unk_44 &= 1;
}
@@ -3556,7 +3557,7 @@ void func_effect_80081C5C(Effect* effect) {
break;
}
if (!(gGameFrameCount & 3)) {
if (((gGameFrameCount % 4) == 0)) {
func_effect_8007C120((RAND_FLOAT_CENTERED(effect->scale2) * 50.0f) + effect->obj.pos.x,
(RAND_FLOAT_CENTERED(effect->scale2) * 50.0f) + effect->obj.pos.y,
(RAND_FLOAT_CENTERED(effect->scale2) * 50.0f) + effect->obj.pos.z, effect->vel.x,
@@ -3614,7 +3615,7 @@ void func_effect_80081C5C(Effect* effect) {
case 7:
switch (gCurrentLevel) {
case LEVEL_AQUAS:
if (!(gGameFrameCount & 3)) {
if (((gGameFrameCount % 4) == 0)) {
func_effect_80081A8C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->scale2,
6);
}
@@ -3628,7 +3629,7 @@ void func_effect_80081C5C(Effect* effect) {
break;
case LEVEL_ZONESS:
if (!(gGameFrameCount & 3)) {
if (((gGameFrameCount % 4) == 0)) {
// clang-format off
func_effect_80081A8C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->scale2 * 3.0f, 6);
// clang-format on
@@ -3677,10 +3678,10 @@ void func_effect_80081C5C(Effect* effect) {
gEffects[ARRAY_COUNT(gEffects) - 1].obj.status =
gEffects[ARRAY_COUNT(gEffects) - 2].obj.status = OBJ_FREE;
func_effect_80081BEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 1.0f, 10);
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255;
D_ctx_80178340 = D_ctx_80178358 = 255;
D_ctx_80178358 = 0;
D_ctx_8017835C = 25;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
gFillScreenAlpha = gFillScreenAlphaTarget = 255;
gFillScreenAlphaTarget = 0;
gFillScreenAlphaStep = 25;
effect->timer_50 = 10;
D_800D18EC = 0.0f;
D_800D18E8 = 0.0f;
@@ -3693,8 +3694,8 @@ void func_effect_80081C5C(Effect* effect) {
case 1:
Math_SmoothStepToF(&effect->scale2, 8.0f, 0.1f, 1.0f, 0.00001f);
if (effect->timer_50 == 0) {
if (D_ctx_80178340 != 0) {
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 0;
if (gFillScreenAlpha != 0) {
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = gFillScreenAlpha = 0;
}
effect->timer_50 = gBosses[0].timer_050;
effect->unk_44++;
@@ -3748,20 +3749,20 @@ void func_effect_80081C5C(Effect* effect) {
case 0:
D_ctx_801779A8[0] = 50.0f;
if (effect->unk_46 == 10) {
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255;
D_ctx_80178340 = D_ctx_80178358 = 255;
D_ctx_80178358 = 0;
D_ctx_8017835C = 25;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
gFillScreenAlpha = gFillScreenAlphaTarget = 255;
gFillScreenAlphaTarget = 0;
gFillScreenAlphaStep = 25;
gCameraShake = 50;
}
if (effect->unk_46 == 0) {
D_ctx_80178348 = (D_ctx_80178350 = (D_ctx_80178354 = (D_ctx_80178340 = 0)));
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = gFillScreenAlpha = 0;
effect->unk_46 = 50;
}
if (effect->unk_46 != 0) {
effect->unk_46 -= 1;
}
if ((!(gGameFrameCount & 0xF)) && (effect->timer_50 == 0)) {
if ((((gGameFrameCount % 16) == 0)) && (effect->timer_50 == 0)) {
D_800D18EC =
RAD_TO_DEG(Math_Atan2F(gPlayer[0].camEye.x - gBosses[0].obj.pos.x,
gPlayer[0].camEye.z - (gBosses[0].obj.pos.z + D_ctx_80177D20)));
@@ -3940,7 +3941,7 @@ void func_effect_80082F78(Effect* effect) {
break;
case 10:
if (D_ctx_80177854 != 100) {
if (gPlayState != PLAY_PAUSE) {
Texture_Scroll(D_A6_6012840, 16, 16, 0);
}
RCP_SetupDL(&gMasterDisp, 0x35);
src/engine/fox_enmy.c
+493 -494
View File
File diff suppressed because it is too large Load Diff
src/engine/fox_enmy2.c
+314 -311
View File
File diff suppressed because it is too large Load Diff
src/engine/fox_game.c
+60 -60
View File
@@ -8,7 +8,7 @@ f32 D_game_80161A14;
s32 gPlayerInactive[4];
s32 D_game_80161A28;
u8 D_game_80161A2C;
u16 D_game_80161A2E;
u16 gNextLevelStage;
u16 gNextLevel;
u16 gNextGameState;
u16 D_game_80161A34;
@@ -19,7 +19,7 @@ f32 D_game_80161A3C;
f32 D_game_80161A40;
f32 D_game_80161A44;
s32 D_game_800D2860[4] = { true, true, true, true };
s32 gShowCrosshairs[4] = { true, true, true, true };
s32 D_game_800D2870 = 0;
static s32 sVsCameraULx[] = { 0, SCREEN_WIDTH / 2, 0, SCREEN_WIDTH / 2 };
static s32 sVsCameraLRx[] = { SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1, SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1 };
@@ -54,7 +54,7 @@ void Game_Initialize(void) {
Rand_Init();
Rand_SetSeed(1, 29000, 9876);
gGameState = GSTATE_BOOT;
D_Timer_8017783C = 0;
gNextGameStateTimer = 0;
gBgColor = 0;
gBlurAlpha = 255;
D_game_80161A3C = 45.0f;
@@ -77,11 +77,11 @@ void Game_SetGameState(void) {
switch (gNextGameState) {
case GSTATE_PLAY:
gCurrentLevel = gNextLevel;
func_play_800A5844();
D_ctx_80177854 = 0;
D_ctx_8017827C = D_game_80161A2E;
D_game_80161A2E = 0;
if ((D_ctx_8017827C != 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS)) {
Play_Setup();
gPlayState = PLAY_STANDBY;
gLevelStage = gNextLevelStage;
gNextLevelStage = 0;
if ((gLevelStage != 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS)) {
D_ctx_8017782C = 0;
}
break;
@@ -95,25 +95,25 @@ void Game_SetGameState(void) {
Memory_FreeAll();
func_play_800A6148();
gGameState = gNextGameState;
D_Timer_8017783C = 3;
D_360_8015F924 = 0;
gNextGameStateTimer = 3;
gAllRangeCheckpoint = 0;
gNextGameState = GSTATE_NONE;
gOverlayStage = 0;
gFillScreenColor = gBgColor = 0;
D_ctx_80177D20 = 0.0f;
if ((gCurrentLevel == LEVEL_VENOM_2) && (D_ctx_8017827C == 2)) {
if ((gCurrentLevel == LEVEL_VENOM_2) && (gLevelStage == 2)) {
gFillScreenColor = gBgColor = 0xFFFF; // 248, 248, 248
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
} else {
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0;
Audio_FadeOutAll(1);
}
D_ctx_80178340 = 255;
D_ctx_80178380[0] = 0;
gFillScreenAlpha = 255;
gPlayerFillScreenAlphas[0] = 0;
gRadioState = 0;
D_ctx_80178428 = 0.0f;
gBlurAlpha = 255;
gDrawMode = DRAWMODE_0;
gDrawMode = DRAW_NONE;
Audio_ClearVoice();
Audio_SetBaseSfxReverb(0);
}
@@ -241,15 +241,15 @@ void func_game_800A1FB0(Gfx** arg0, u8 arg1, u8 arg2) {
gSPViewport((*arg0)++, gViewport++);
}
void func_game_800A24DC(s32 arg0) {
void Game_Draw(s32 playerNum) {
switch (gDrawMode) {
case DRAWMODE_0:
case DRAW_NONE:
break;
case DRAWMODE_1:
case DRAW_TITLE:
func_bg_8003DAF0();
OvlMenu_CallFunction(104, NULL);
break;
case DRAWMODE_2:
case DRAW_OPTION:
func_bg_8003DAF0();
OvlMenu_CallFunction(108, NULL);
break;
@@ -257,24 +257,24 @@ void func_game_800A24DC(s32 arg0) {
func_bg_8003DAF0();
OvlMenu_CallFunction(106, NULL);
break;
case DRAWMODE_4:
gPlayerNum = arg0;
func_display_80057D00();
case DRAW_PLAY:
gPlayerNum = playerNum;
Play_Draw();
break;
case DRAWMODE_5:
case DRAW_UNK_MAP:
func_bg_8003DAF0();
OvlMenu_CallFunction(110, NULL);
break;
case DRAWMODE_6:
case DRAW_UNK_VS:
func_versus_800C2190();
break;
case DRAWMODE_7:
gPlayerNum = arg0;
case DRAW_UNK_7:
gPlayerNum = playerNum;
func_800A3CA0();
break;
case DRAWMODE_8:
case DRAW_ENDING:
func_bg_8003DAF0();
gPlayerNum = arg0;
gPlayerNum = playerNum;
Ending_8018AAC4();
break;
}
@@ -308,7 +308,7 @@ void func_game_800A25DC(void) {
gOverlaySetup = OVL_SETUP_GAME_OVER;
gOverlayStage = 0;
break;
case GSTATE_CREDITS:
case GSTATE_ENDING:
gOverlaySetup = OVL_SETUP_CREDITS;
break;
}
@@ -328,18 +328,18 @@ void Game_Update(void) {
func_game_800A1C14(&gUnkDisp1);
func_game_800A25DC();
if (func_game_800A1B6C() != true) {
Lib_Perspective(&gUnkDisp1);
Lib_InitPerspective(&gUnkDisp1);
func_game_800A1FB0(&gUnkDisp1, gCamCount, 0);
if (D_Timer_8017783C != 0) {
D_Timer_8017783C--;
if (gNextGameStateTimer != 0) {
gNextGameStateTimer--;
}
switch (gGameState) {
case GSTATE_BOOT:
D_Timer_8017783C = 2;
gNextGameStateTimer = 2;
gGameState++;
break;
case GSTATE_BOOT_WAIT:
if (D_Timer_8017783C == 0) {
if (gNextGameStateTimer == 0) {
gGameState++;
}
break;
@@ -384,10 +384,10 @@ void Game_Update(void) {
gCamCount = 1;
gLifeCount[0] = 2;
D_ctx_80177D20 = 0.0f;
D_hud_8016170C = gCsFrameCount = D_ctx_80177830 = D_ctx_80177838 = D_ctx_80177840 = D_versus_80178754 =
gVersusMode = D_ctx_80177AE0 = D_ctx_80178410 = D_ctx_80177B40 = D_ctx_80177854 =
gOptionMenuStatus = gDrawMode = gShowBossHealth = D_game_80161A2C = gBgColor = D_ctx_80178340 =
0;
D_hud_8016170C = gCsFrameCount = D_ctx_80177830 = gLevelStatusScreenTimer = gLevelClearScreenTimer =
D_versus_80178754 = gVersusMode = D_ctx_80177AE0 = D_ctx_80178410 = D_ctx_80177B40 = gPlayState =
gOptionMenuStatus = gDrawMode = gShowBossHealth = D_game_80161A2C = gBgColor =
gFillScreenAlpha = 0;
gNextGameState = D_ctx_80177C94 = D_ctx_80177CAC = D_ctx_80177CB4 = D_ctx_80177CBC = D_ctx_80177CC4 =
D_ctx_80177C9C = D_ctx_80177CA4 = D_play_80161A5C = D_game_80161A34 = 0;
for (i = 0; i < 4; i++) {
@@ -400,8 +400,8 @@ void Game_Update(void) {
D_ctx_80177858[i] = 3;
D_ctx_80177870[i] = 0;
D_game_800D2860[i] = true;
D_ctx_80178380[i] = 0;
gShowCrosshairs[i] = true;
gPlayerFillScreenAlphas[i] = 0;
}
gVersusStage = 0;
D_ctx_801778A4 = 3;
@@ -456,31 +456,31 @@ void Game_Update(void) {
func_versus_800C20B0();
break;
case GSTATE_PLAY:
func_play_800B86CC();
Play_Main();
break;
case GSTATE_GAME_OVER:
OvlMenu_CallFunction(109, NULL);
break;
case GSTATE_CREDITS:
gDrawMode = DRAWMODE_8;
case GSTATE_ENDING:
gDrawMode = DRAW_ENDING;
Ending_8018A96C();
break;
default:
break;
}
func_game_800A24DC(0);
Game_Draw(0);
if (gCamCount == 2) {
func_game_800A1FB0(&gMasterDisp, gCamCount, 1);
func_game_800A24DC(1);
Game_Draw(1);
gDPPipeSync(gMasterDisp++);
gDPSetScissor(gMasterDisp++, G_SC_NON_INTERLACE, 8, 8, SCREEN_WIDTH - 8, SCREEN_HEIGHT - 8);
} else if ((gCamCount == 4) && (gDrawMode != DRAWMODE_0)) {
} else if ((gCamCount == 4) && (gDrawMode != DRAW_NONE)) {
func_game_800A1FB0(&gMasterDisp, gCamCount, 3);
func_game_800A24DC(3);
Game_Draw(3);
func_game_800A1FB0(&gMasterDisp, gCamCount, 2);
func_game_800A24DC(2);
Game_Draw(2);
func_game_800A1FB0(&gMasterDisp, gCamCount, 1);
func_game_800A24DC(1);
Game_Draw(1);
gDPPipeSync(gMasterDisp++);
gDPSetScissor(gMasterDisp++, G_SC_NON_INTERLACE, 8, 8, SCREEN_WIDTH - 8, SCREEN_HEIGHT - 8);
gDPSetColorDither(gMasterDisp++, G_CD_NOISE);
@@ -504,9 +504,9 @@ void Game_Update(void) {
}
spBB = 0;
if (gCamCount == 1) {
Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, D_ctx_80178390[0],
D_ctx_801783A0[0], D_ctx_801783B0[0], D_ctx_80178380[0]);
if ((gDrawMode == DRAWMODE_4) || (gDrawMode == DRAWMODE_8)) {
Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, gPlayerFillScreenReds[0],
gPlayerFillScreenGreens[0], gPlayerFillScreenBlues[0], gPlayerFillScreenAlphas[0]);
if ((gDrawMode == DRAW_PLAY) || (gDrawMode == DRAW_ENDING)) {
func_radio_800BB5D0();
if (D_game_80161A2C != 0) {
func_hud_8008FA84();
@@ -519,26 +519,26 @@ void Game_Update(void) {
if (gPlayer[i].timer_224 != 0) {
Graphics_FillRectangle(&gMasterDisp, sVsCameraULx[i], sVsCameraULy[i], sVsCameraLRx[i],
sVsCameraLRy[i], D_ctx_80178348, D_ctx_80178350, D_ctx_80178354,
D_ctx_80178340);
sVsCameraLRy[i], gFillScreenRed, gFillScreenGreen, gFillScreenBlue,
gFillScreenAlpha);
spBB = 1;
} else {
Graphics_FillRectangle(&gMasterDisp, sVsCameraULx[i], sVsCameraULy[i], sVsCameraLRx[i],
sVsCameraLRy[i], D_ctx_80178390[i], D_ctx_801783A0[i], D_ctx_801783B0[i],
D_ctx_80178380[i]);
sVsCameraLRy[i], gPlayerFillScreenReds[i], gPlayerFillScreenGreens[i],
gPlayerFillScreenBlues[i], gPlayerFillScreenAlphas[i]);
}
}
}
func_bg_80040CDC();
func_hud_8008865C();
func_360_8002E548();
AllRange_UpdateCountdown();
if ((gGameState == GSTATE_PLAY) && gVersusMode) {
func_versus_800C1ED4();
}
func_fade_80084688(0, D_ctx_80177C50);
if (spBB == 0) {
Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, D_ctx_80178348,
D_ctx_80178350, D_ctx_80178354, D_ctx_80178340);
Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, gFillScreenRed,
gFillScreenGreen, gFillScreenBlue, gFillScreenAlpha);
}
func_80016A50();
}
src/engine/fox_hud.c
+203 -205
View File
@@ -1,5 +1,5 @@
#include "sf64math.h"
#include "prevent_bss_reordering.h"
typedef struct {
/* 0x00 */ u8* unk_00;
/* 0x04 */ s32 width;
@@ -464,7 +464,8 @@ void func_hud_80086110(f32 arg0, f32 arg1, s32 arg2) {
func_hud_800856C0((8.0f * temp) + arg0, arg1 + 2.0f, temp, 1.0f, arg2 / 255.0f);
}
if ((arg2 <= 0) && (arg2 != -2) && ((D_ctx_80177854 == 100) || (D_ctx_80177830 == 1) || (D_ctx_80177838 != 0))) {
if ((arg2 <= 0) && (arg2 != -2) &&
((gPlayState == PLAY_PAUSE) || (D_ctx_80177830 == 1) || (gLevelStatusScreenTimer != 0))) {
RCP_SetupDL(&gMasterDisp, 0x4C);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
if ((arg2 == 0) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7)) {
@@ -669,7 +670,7 @@ void func_hud_80086664(f32 x, f32 y) {
y2 + i, 1.0f, 1.0f);
}
if ((D_ctx_80177CA0 == 0) && (D_360_8015F924 == 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS) &&
if ((D_ctx_80177CA0 == 0) && (gAllRangeCheckpoint == 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS) &&
(gCurrentLevel != LEVEL_TRAINING)) {
func_hud_80087788();
func_hud_80084B94(0);
@@ -723,11 +724,11 @@ void func_hud_80086CC8(void) {
f32 sp18;
f32 temp;
if ((D_ctx_80177854 != 100) && (D_ctx_80177838 != 0)) {
D_ctx_80177838 -= 1;
if ((gPlayState != PLAY_PAUSE) && (gLevelStatusScreenTimer != 0)) {
gLevelStatusScreenTimer -= 1;
}
if (D_ctx_80177838 == 1) {
if (gLevelStatusScreenTimer == 1) {
D_80161718 = 30;
D_8016171C = 0;
}
@@ -735,7 +736,7 @@ void func_hud_80086CC8(void) {
temp = 108.0f;
sp18 = 81.0f;
if (D_ctx_80177838 != 0) {
if (gLevelStatusScreenTimer != 0) {
func_hud_80086C08(temp - 4.5f - 32.0f, sp18 - 24.0f - 4.0f, 7.4f, 3.9f);
if (gCurrentLevel != LEVEL_TRAINING) {
@@ -756,11 +757,11 @@ void func_hud_80086DCC(void) {
f32 x;
f32 y;
if ((D_ctx_80177854 != 100) && (D_ctx_80177840)) {
D_ctx_80177840--;
if ((gPlayState != PLAY_PAUSE) && (gLevelClearScreenTimer)) {
gLevelClearScreenTimer--;
}
boolTemp = D_ctx_80177930;
boolTemp = gNextPlanetPath;
if ((gCurrentLevel == LEVEL_TITANIA) || (gCurrentLevel == LEVEL_BOLSE) || (gCurrentLevel == LEVEL_VENOM_1) ||
(gCurrentLevel == LEVEL_VENOM_2) || (gCurrentLevel == LEVEL_AREA_6) || (gCurrentLevel == LEVEL_AQUAS) ||
@@ -771,55 +772,57 @@ void func_hud_80086DCC(void) {
temp = 0;
if (gCurrentLevel == LEVEL_AQUAS) {
if (D_ctx_80177840 <= 100) {
if (gLevelClearScreenTimer <= 100) {
temp = 5;
}
if (D_ctx_80177840 <= 96) {
if (gLevelClearScreenTimer <= 96) {
temp = 5;
}
if (D_ctx_80177840 <= 92) {
if (gLevelClearScreenTimer <= 92) {
temp = 4;
}
if (D_ctx_80177840 <= 87) {
if (gLevelClearScreenTimer <= 87) {
temp = 3;
}
if (D_ctx_80177840 <= 82) {
if (gLevelClearScreenTimer <= 82) {
temp = 2;
}
if (D_ctx_80177840 <= 77) {
if (gLevelClearScreenTimer <= 77) {
temp = 1;
}
if (D_ctx_80177840 == 0) {
if (gLevelClearScreenTimer == 0) {
temp = 0;
}
if ((D_ctx_80177840 == 92) || (D_ctx_80177840 == 87) || (D_ctx_80177840 == 82) || (D_ctx_80177840 == 77)) {
if ((gLevelClearScreenTimer == 92) || (gLevelClearScreenTimer == 87) || (gLevelClearScreenTimer == 82) ||
(gLevelClearScreenTimer == 77)) {
AUDIO_PLAY_SFX(0x49008031U, gDefaultSfxSource, 4U);
}
} else {
if (D_ctx_80177840 <= 100) {
if (gLevelClearScreenTimer <= 100) {
temp = 5;
}
if (D_ctx_80177840 <= 90) {
if (gLevelClearScreenTimer <= 90) {
temp = 5;
}
if (D_ctx_80177840 <= 80) {
if (gLevelClearScreenTimer <= 80) {
temp = 4;
}
if (D_ctx_80177840 <= 72) {
if (gLevelClearScreenTimer <= 72) {
temp = 3;
}
if (D_ctx_80177840 <= 64) {
if (gLevelClearScreenTimer <= 64) {
temp = 2;
}
if (D_ctx_80177840 <= 56) {
if (gLevelClearScreenTimer <= 56) {
temp = 1;
}
if (D_ctx_80177840 == 0) {
if (gLevelClearScreenTimer == 0) {
temp = 0;
}
if ((D_ctx_80177840 == 80) || (D_ctx_80177840 == 72) || (D_ctx_80177840 == 64) || (D_ctx_80177840 == 56)) {
if ((gLevelClearScreenTimer == 80) || (gLevelClearScreenTimer == 72) || (gLevelClearScreenTimer == 64) ||
(gLevelClearScreenTimer == 56)) {
if (!boolTemp) {
AUDIO_PLAY_SFX(0x49008034U, gDefaultSfxSource, 4U);
} else {
@@ -1054,7 +1057,7 @@ void func_hud_80087B5C(void) {
D_801617C0[0] = 0;
}
if ((D_ctx_80177854 != 100) && (D_ctx_80177830 == 1) && (!D_801617E8[0])) {
if ((gPlayState != PLAY_PAUSE) && (D_ctx_80177830 == 1) && (!D_801617E8[0])) {
switch (D_801617C0[0]) {
case 0:
D_801617C0[5] = gHitCount;
@@ -1077,9 +1080,9 @@ void func_hud_80087B5C(void) {
break;
case 1:
if (((gTeamShields[1] > 0) && (gTeamShields[1] < 255)) &&
((gTeamShields[2] > 0) && (gTeamShields[2] < 255)) &&
((gTeamShields[3] > 0) && (gTeamShields[3] < 255))) {
if (((gTeamShields[TEAM_ID_FALCO] > 0) && (gTeamShields[TEAM_ID_FALCO] < 255)) &&
((gTeamShields[TEAM_ID_SLIPPY] > 0) && (gTeamShields[TEAM_ID_SLIPPY] < 255)) &&
((gTeamShields[TEAM_ID_PEPPY] > 0) && (gTeamShields[TEAM_ID_PEPPY] < 255))) {
AUDIO_PLAY_SFX(0x41007012U, gDefaultSfxSource, 4U);
}
D_801617C0[0] = 2;
@@ -1105,7 +1108,7 @@ void func_hud_80087B5C(void) {
}
if (D_801617C0[4] > 0) {
for (i = 1, temp = 0; i < 4; i++) {
for (i = TEAM_ID_FALCO, temp = 0; i <= TEAM_ID_PEPPY; i++) {
if (gTeamShields[i] > 0) {
if (D_801617C0[4] >= 4) {
gTeamShields[i] += 4;
@@ -1150,7 +1153,7 @@ void func_hud_80087B5C(void) {
D_801617E8[0] = 10;
D_801617C0[0]++;
} else {
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
AUDIO_PLAY_SFX(0x4900C024U, gDefaultSfxSource, 4U);
D_801617C0[3]++;
}
@@ -1237,7 +1240,7 @@ void func_hud_80087B5C(void) {
func_hud_800869A0(x4 + 4.0f, y4 + 3.0f, D_801617C0[2], 1.00f, 1, 9999);
if (!(D_801617C0[6] & 1)) {
if ((D_801617C0[6] % 2) == 0) {
func_hud_80087530(232.0f, 90.0f, D_801617C0[3]);
}
@@ -1397,7 +1400,7 @@ void func_hud_80088970(void) {
D_80161838[0]++;
if (D_ctx_80177854 != 100) {
if (gPlayState != PLAY_PAUSE) {
D_80161838[0] = 0;
D_80161838[1] = 0;
// clang-format off
@@ -1407,12 +1410,12 @@ void func_hud_80088970(void) {
}
if (D_80161810[0] >= 2) {
D_ctx_801779BC = 0;
gPauseEnabled = 0;
}
player = &gPlayer[gPlayerNum];
if ((D_ctx_80177854 == 100) && !D_ctx_80177838 && !gVersusMode) {
if ((gPlayState == PLAY_PAUSE) && !gLevelStatusScreenTimer && !gVersusMode) {
switch (D_80161810[0]) {
case 0:
D_80161838[0] = 0;
@@ -1445,12 +1448,12 @@ void func_hud_80088970(void) {
case 2:
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0;
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0;
D_ctx_80178358 = 255;
D_ctx_8017835C = 32;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0;
gFillScreenAlphaTarget = 255;
gFillScreenAlphaStep = 32;
D_ctx_80178340 += 32;
if (D_ctx_80178340 < 255) {
gFillScreenAlpha += 32;
if (gFillScreenAlpha < 255) {
break;
}
@@ -1462,7 +1465,7 @@ void func_hud_80088970(void) {
func_play_800A6148();
gShowBossHealth = false;
D_ctx_80178340 = 255;
gFillScreenAlpha = 255;
if (gLifeCount[gPlayerNum] == 0) {
D_80161810[0] = 3;
@@ -1476,22 +1479,22 @@ void func_hud_80088970(void) {
case 3:
Graphics_FillRectangle(&gMasterDisp, 0, 0, 319, 239, 0, 0, 0, 255);
D_ctx_80178358 = 0;
gFillScreenAlphaTarget = 0;
if ((D_ctx_80178340 -= 32) <= 0) {
D_ctx_80178340 = 0;
if ((gFillScreenAlpha -= 32) <= 0) {
gFillScreenAlpha = 0;
}
if (gCurrentLevel == LEVEL_TRAINING) {
gGameState = GSTATE_MENU;
D_Timer_8017783C = 2;
gNextGameStateTimer = 2;
gOptionMenuStatus = OPTION_WAIT;
gDrawMode = DRAWMODE_0;
gDrawMode = DRAW_NONE;
D_game_80161A34 = 7;
D_ctx_80178410 = 0;
break;
} else {
if (D_ctx_80178340 == 0) {
if (gFillScreenAlpha == 0) {
if (gLevelType == LEVELTYPE_PLANET) {
if (D_80161838[1] == 0) {
func_8001D520();
@@ -1528,13 +1531,13 @@ void func_hud_80088970(void) {
break;
}
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0;
D_ctx_80178358 = 255;
D_ctx_8017835C = 32;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0;
gFillScreenAlphaTarget = 255;
gFillScreenAlphaStep = 32;
D_ctx_80178340 += 32;
if (D_ctx_80178340 > 255) {
D_ctx_80178340 = 255;
gFillScreenAlpha += 32;
if (gFillScreenAlpha > 255) {
gFillScreenAlpha = 255;
};
if (D_80161838[0] < 160) {
break;
@@ -1544,21 +1547,21 @@ void func_hud_80088970(void) {
Graphics_FillRectangle(&gMasterDisp, 0, 0, 319, 239, 0, 0, 0, 255);
for (i = 0; i < 6; i++) {
if (D_ctx_80177C38[i] == -1) {
if (gPrevPlanetTeamShields[i] == -1) {
gSavedTeamShields[i] = 0;
} else {
gSavedTeamShields[i] = D_ctx_80177C38[i];
gSavedTeamShields[i] = gPrevPlanetTeamShields[i];
}
D_ctx_80177CD0[i] = D_ctx_80177CF0[i];
gStarWolfTeamAlive[i] = gSavedStarWolfTeamAlive[i];
}
if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_360_8015F924 != 0)) {
if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (gAllRangeCheckpoint != 0)) {
D_ctx_80177CA4 = D_play_80161A5C;
}
D_ctx_80177CB0 = 0.0f;
D_360_8015F924 = 0;
D_play_80161A50 = 0;
gAllRangeCheckpoint = 0;
gSavedZoSearchlightStatus = false;
gSavedHitCount = D_ctx_80177CA0 = 0;
@@ -1566,22 +1569,22 @@ void func_hud_80088970(void) {
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_6;
gScreenFlashTimer = 0;
gPlayer[0].timer_1F8 = 0;
D_ctx_80178340 = D_ctx_80178358 = 255;
gFillScreenAlpha = gFillScreenAlphaTarget = 255;
D_ctx_8017837C = 7;
gDrawMode = DRAWMODE_4;
D_ctx_80177854 = 2;
gDrawMode = DRAW_PLAY;
gPlayState = PLAY_UPDATE;
break;
case 10:
func_8001D638(0);
gDrawMode = DRAWMODE_4;
D_ctx_80177854 = 2;
gDrawMode = DRAW_PLAY;
gPlayState = PLAY_UPDATE;
break;
}
}
if ((D_80161810[3] == 0) && (D_ctx_80177854 == 100) && !gVersusMode && (D_ctx_80177838 == 0)) {
if ((D_80161810[3] == 0) && (gPlayState == PLAY_PAUSE) && !gVersusMode && (gLevelStatusScreenTimer == 0)) {
switch (D_80161810[0]) {
case 0:
case 1:
@@ -1970,7 +1973,7 @@ void func_hud_8008A240(void) {
continue;
}
if (gGameFrameCount & 0x3F) {
if ((gGameFrameCount % 64) != 0) {
gRadarMarks[i].unk_02 = 999;
}
}
@@ -2011,7 +2014,7 @@ s32 func_hud_8008A4DC(void) {
return 0;
}
if (D_ctx_80177838) {
if (gLevelStatusScreenTimer) {
D_800D1E10 = 60.0f;
} else {
Math_SmoothStepToF(&D_800D1E10, 0.0f, 0.3f, 10.0f, 0.1f);
@@ -2243,31 +2246,31 @@ void func_hud_8008AD94(void) {
void func_hud_8008B044(void) {
switch (D_80161798) {
case 0:
if (D_enmy2_80161690 == 0) {
if (gCallTimer == 0) {
return;
}
AUDIO_PLAY_SFX(0x49002018, gDefaultSfxSource, 4);
if (D_enmy2_800CFF90 != 0) {
if (gCallVoiceParam != 0) {
func_8001AF40(1);
}
D_80161794 = 0;
D_80161798 = 1;
case 1:
if (D_enmy2_80161690 != 0) {
if (gCallTimer != 0) {
D_80161790++;
if (D_80161790 >= 7) {
if (D_80161794 & 1) {
if ((D_80161794 % 2) != 0) {
AUDIO_PLAY_SFX(0x49002018, gDefaultSfxSource, 4);
}
D_80161790 = 0;
D_80161794++;
}
D_enmy2_80161690--;
gCallTimer--;
} else {
D_enmy2_800CFF90 = 0;
gCallVoiceParam = 0;
D_80161790 = 0;
D_80161798 = 0;
Audio_KillSfxById(0x49002018);
@@ -2299,10 +2302,10 @@ void func_hud_8008B1B0(void) {
}
void func_hud_8008B2A4(void) {
if (D_ctx_80177854 != 100) {
if (gPlayState != PLAY_PAUSE) {
func_hud_8008B044();
}
if (D_enmy2_80161690 != 0) {
if (gCallTimer != 0) {
func_hud_8008B1B0();
}
}
@@ -2567,7 +2570,7 @@ void func_hud_8008BAE4(void) {
}
void func_hud_8008BC80(void) {
if (D_ctx_80177854 != 100) {
if (gPlayState != PLAY_PAUSE) {
func_hud_8008B9E8();
func_hud_8008BAE4();
}
@@ -2690,22 +2693,22 @@ void func_hud_8008C104(u16* texture, u16* arg1) {
Texture_Mottle(dst, src, 2);
}
void func_hud_8008C390(f32 arg0, f32 arg1, f32 arg2, s32 arg3) {
void func_hud_8008C390(f32 xPos, f32 yPos, f32 scale, s32 number) {
void* D_800D1EC0[] = {
D_5000000, D_5000080, D_5000100, D_5000180, D_5000200, D_5000280, D_5000300, D_5000380, D_5000400, D_5000480,
};
s32 i;
for (i = 10; i != 1; i /= 10) {
if ((arg0 > 0.0f) && (arg1 > 0.0f)) {
TextureRect_8bIA(&gMasterDisp, D_800D1EC0[arg3 / i], 16, 8, arg0, arg1, arg2, arg2);
if ((xPos > 0.0f) && (yPos > 0.0f)) {
TextureRect_8bIA(&gMasterDisp, D_800D1EC0[number / i], 16, 8, xPos, yPos, scale, scale);
}
arg0 += 9.0f * arg2;
arg3 %= i;
xPos += 9.0f * scale;
number %= i;
}
if ((arg0 > 0.0f) && (arg1 > 0.0f)) {
TextureRect_8bIA(&gMasterDisp, D_800D1EC0[arg3 / i], 16, 8, arg0, arg1, arg2, arg2);
if ((xPos > 0.0f) && (yPos > 0.0f)) {
TextureRect_8bIA(&gMasterDisp, D_800D1EC0[number / i], 16, 8, xPos, yPos, scale, scale);
}
}
@@ -2738,7 +2741,7 @@ void func_hud_8008C6F4(s32 idx, s32 arg1) {
Matrix_Push(&gGfxMatrix);
if (gPlayer[0].unk_238) {
if (gPlayer[0].cockpitView) {
Matrix_RotateZ(gGfxMatrix, M_DTOR * gPlayer[0].unk_034, 1);
}
@@ -2766,12 +2769,12 @@ void func_hud_8008C6F4(s32 idx, s32 arg1) {
void func_hud_8008CA44(void) {
s32 D_800D2048[] = {
0x80, 0x40, 0x20, 0x10, 0x0A, 0x09, 0x06, 0x05, 0x08, 0x04, 0x02, 0x01,
0x80, 0x40, 0x20, 0x10, 8 | 2, 8 | 1, 4 | 2, 4 | 1, 8, 4, 2, 1,
};
s32 i;
s32 j;
if ((gPlayer[gPlayerNum].flags_228 != 0) && (gPlayer[gPlayerNum].timer_210 == 0) && (D_ctx_80177854 != 100)) {
if ((gPlayer[gPlayerNum].flags_228 != 0) && (gPlayer[gPlayerNum].timer_210 == 0) && (gPlayState != PLAY_PAUSE)) {
j = gPlayer[gPlayerNum].flags_228;
for (i = 0; i < 12; i++) {
@@ -3066,7 +3069,7 @@ void func_hud_8008DE68(void) {
f32 temp7;
f32 var_fv0;
if ((gShowBossHealth == 1) && (gTeamShields[2] > 0)) {
if ((gShowBossHealth == 1) && (gTeamShields[TEAM_ID_SLIPPY] > 0)) {
if ((gBossHealthBar >= 0) && (D_801616BC == -1.0f)) {
AUDIO_PLAY_SFX(0x4900C028, gDefaultSfxSource, 4);
D_801616BC = 255.0f;
@@ -3129,63 +3132,63 @@ void func_hud_8008DE68(void) {
}
}
void func_hud_8008E2C8(f32 arg0, f32 arg1, s32* arg2, f32 arg3) {
void func_hud_8008E2C8(f32 xPos, f32 yPos, s32* countdown, f32 scale) {
f32 var_fs0 = 0.0f;
s32 var_s2 = 0;
s32 i;
arg0 -= (arg3 - 1.0f) * 34.0f;
arg1 -= (arg3 - 1.0f) * 4.0f;
xPos -= (scale - 1.0f) * 34.0f;
yPos -= (scale - 1.0f) * 4.0f;
for (i = 0; i != 5; i++) {
if ((i == 0) || (i == 2)) {
var_s2 = arg2[i / 2] % 60;
var_s2 = countdown[i / 2] % 60;
}
if (i == 4) {
var_s2 = arg2[i / 2] % 100;
var_s2 = countdown[i / 2] % 100;
}
if (i & 1) {
if ((i % 2) != 0) {
RCP_SetupDL_78();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_4bCI(&gMasterDisp, D_1011E80, D_1011EC0, 16, 8, (var_fs0 * arg3) + arg0, arg1, arg3, arg3);
TextureRect_4bCI(&gMasterDisp, D_1011E80, D_1011EC0, 16, 8, (var_fs0 * scale) + xPos, yPos, scale, scale);
} else {
RCP_SetupDL_76();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
func_hud_8008C390((var_fs0 * arg3) + arg0, arg1, arg3, var_s2);
func_hud_8008C390((var_fs0 * scale) + xPos, yPos, scale, var_s2);
var_fs0 += 9.0f;
}
var_fs0 += 9.0f;
}
}
void func_hud_8008E51C(s32* arg0, f32 arg1) {
void func_hud_8008E51C(s32* countdown, f32 scale) {
//! FAKE:
if (1) {}
if (D_ctx_80177854 != 100) {
arg0[2] -= 3;
if (arg0[2] >= 3) {
if (gPlayState != PLAY_PAUSE) {
countdown[2] -= 3;
if (countdown[2] >= 3) {
} else {
arg0[2] = 99;
arg0[1]--;
if (arg0[1] >= 0) {
countdown[2] = 99;
countdown[1]--;
if (countdown[1] >= 0) {
} else {
arg0[1] = 59;
arg0[0]--;
if (arg0[0] >= 0) {
countdown[1] = 59;
countdown[0]--;
if (countdown[0] >= 0) {
} else {
arg0[0] = 0;
arg0[1] = 0;
arg0[2] = 0;
countdown[0] = 0;
countdown[1] = 0;
countdown[2] = 0;
}
}
}
}
if (D_ctx_80177854 != 100) {
func_hud_8008E2C8(176.0f, 22.0f, arg0, arg1);
if (gPlayState != PLAY_PAUSE) {
func_hud_8008E2C8(176.0f, 22.0f, countdown, scale);
}
}
@@ -3278,7 +3281,7 @@ void func_hud_8008E620(f32 arg0, f32 arg1) {
gMedalStatus = ret;
}
if (gMedalFlashTimer & 1) {
if ((gMedalFlashTimer % 2) != 0) {
r = 255;
g = 255;
b = 255;
@@ -3504,7 +3507,7 @@ void func_hud_8008F94C(void) {
}
void func_hud_8008F96C(void) {
if (D_ctx_80177854 != 100) {
if (gPlayState != PLAY_PAUSE) {
func_hud_8008E5E8();
}
@@ -3627,7 +3630,7 @@ void func_hud_8008FA84(void) {
}
}
if ((D_hud_80161704 != 0) && (D_ctx_80177854 != 100)) {
if ((D_hud_80161704 != 0) && (gPlayState != PLAY_PAUSE)) {
D_hud_80161708 += 16;
if (D_hud_80161708 >= D_hud_80161704) {
D_hud_80161708 = D_hud_80161704;
@@ -3693,7 +3696,7 @@ void func_hud_8008FFF0(Boss* boss, s32 arg1) {
boss->obj.pos.z + D_800D21C8[i].z, 0.0f, 0.0f, 0.0f, 0.3f * temp, 20);
}
if (!(gGameFrameCount & 7)) {
if (((gGameFrameCount % 8) == 0)) {
func_effect_8007BFFC(boss->obj.pos.x + D_800D21C8[i].x, boss->obj.pos.y + D_800D21C8[i].y,
boss->obj.pos.z + D_800D21C8[i].z, 0.0f, 0.0f, 0.0f, 7.0f * temp, 10);
}
@@ -3828,7 +3831,7 @@ void func_hud_800907C4(Boss* boss) {
}
break;
}
func_hud_8008FFF0(boss, D_360_8015F928);
func_hud_8008FFF0(boss, gAllRangeEventTimer);
}
bool func_hud_8009092C(Actor* actor) {
@@ -4160,11 +4163,7 @@ bool func_hud_800915FC(Actor* actor) {
Math_Vec3fFromAngles(&vec, 0.0f, actor->unk_0F4.y, 650.0f + actor->fwork[9] * 10.0f);
while (true) {
if (gLevelMode != LEVELMODE_ALL_RANGE) {
break;
}
if (gLevelMode == LEVELMODE_ALL_RANGE) {
for (i = 0, obj58 = &gObjects58[0]; i < 200; i++, obj58++) {
if (obj58->obj.status != OBJ_ACTIVE) {
continue;
@@ -4182,7 +4181,6 @@ bool func_hud_800915FC(Actor* actor) {
ret = true;
}
}
break;
}
if (ret) {
@@ -4433,15 +4431,15 @@ void func_hud_800922F4(Actor* actor) {
s32 temp;
if ((gTeamShields[actor->aiType] < 64) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7)) {
temp = 7;
temp = 8 - 1;
if (gTeamShields[actor->aiType] > 16) {
temp = 15;
temp = 16 - 1;
}
if (gTeamShields[actor->aiType] > 32) {
temp = 31;
temp = 32 - 1;
}
if (gTeamShields[actor->aiType] > 48) {
temp = 63;
temp = 64 - 1;
}
if (!(gGameFrameCount & temp)) {
@@ -4658,18 +4656,18 @@ bool func_hud_800927A0(Actor* actor) {
}
void ActorTeamBoss_Init(Actor* actor) {
s32 D_800D22A8[] = { 1, 2, 3 };
s32 D_800D22A8[] = { TEAM_ID_FALCO, TEAM_ID_SLIPPY, TEAM_ID_PEPPY };
if (gCurrentLevel != LEVEL_TITANIA) {
actor->fwork[1] = 40.0f;
actor->fwork[3] = 1.2f;
actor->aiType = (D_hud_800D1970 & 3) + 1;
actor->aiType = (D_hud_800D1970 % 4U) + 1;
D_hud_800D1970++;
} else {
actor->state = 7;
actor->aiType = AI360_SLIPPY;
actor->iwork[5] = 0;
gTeamShields[2] = 255;
gTeamShields[TEAM_ID_SLIPPY] = 255;
}
actor->iwork[12] = D_800D22A8[actor->aiType - 1];
@@ -4681,7 +4679,7 @@ void ActorTeamBoss_Init(Actor* actor) {
AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4U);
if (((D_hud_800D1970 & 3) == AI360_SLIPPY) && (gCurrentLevel == LEVEL_SECTOR_X)) {
if (((s32) (D_hud_800D1970 % 4U) == AI360_SLIPPY) && (gCurrentLevel == LEVEL_SECTOR_X)) {
Object_Kill(&actor->obj, actor->sfxSource);
}
@@ -4690,23 +4688,23 @@ void ActorTeamBoss_Init(Actor* actor) {
}
}
void ActorTeamBoss_Update(Actor* actor) {
void ActorTeamBoss_Update(ActorTeamBoss* this) {
f32 var_fv1;
actor->health = gTeamShields[actor->aiType];
this->health = gTeamShields[this->aiType];
switch (actor->unk_048) {
switch (this->unk_048) {
case 0:
func_hud_800914FC(actor);
func_hud_80091864(actor);
func_hud_80091B90(actor);
func_hud_80091DF4(actor);
func_hud_800914FC(this);
func_hud_80091864(this);
func_hud_80091B90(this);
func_hud_80091DF4(this);
if (actor->unk_0D0 != 0) {
func_hud_80091F00(actor);
if (this->unk_0D0 != 0) {
func_hud_80091F00(this);
}
if (actor->state == 3) {
if (this->state == 3) {
break;
}
@@ -4728,44 +4726,44 @@ void ActorTeamBoss_Update(Actor* actor) {
break;
}
if ((actor->iwork[10] != 0) && (gLevelMode == LEVELMODE_ALL_RANGE) && (actor->iwork[9] == 0) &&
if ((this->iwork[10] != 0) && (gLevelMode == LEVELMODE_ALL_RANGE) && (this->iwork[9] == 0) &&
(gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7)) {
actor->unk_048 = 2;
actor->unk_04A = 0;
this->unk_048 = 2;
this->unk_04A = 0;
}
if ((gLevelMode == LEVELMODE_ALL_RANGE) &&
(fabsf(actor->obj.pos.x > var_fv1) || fabsf(actor->obj.pos.z > var_fv1)) &&
(fabsf(this->obj.pos.x > var_fv1) || fabsf(this->obj.pos.z > var_fv1)) &&
(gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7)) {
actor->unk_048 = 2;
actor->unk_04A = 1;
this->unk_048 = 2;
this->unk_04A = 1;
}
break;
case 1:
if (func_hud_800924E0(actor) != 0) {
actor->unk_048 = 0;
actor->iwork[9] = RAND_INT(30.0f) + 90;
if (func_hud_800924E0(this) != 0) {
this->unk_048 = 0;
this->iwork[9] = RAND_INT(30.0f) + 90;
}
break;
case 2:
if (func_hud_800927A0(actor) != 0) {
actor->unk_04A = 0;
actor->unk_048 = actor->unk_04A;
actor->iwork[9] = RAND_INT(30.0f) + 90;
if (func_hud_800927A0(this) != 0) {
this->unk_04A = 0;
this->unk_048 = this->unk_04A;
this->iwork[9] = RAND_INT(30.0f) + 90;
}
break;
}
func_hud_80091CF8(actor);
func_hud_800922F4(actor);
func_hud_80092244(actor);
func_hud_80091CF8(this);
func_hud_800922F4(this);
func_hud_80092244(this);
if (actor->iwork[9] != 0) {
actor->iwork[9]--;
if (this->iwork[9] != 0) {
this->iwork[9]--;
}
actor->iwork[10] = 0;
this->iwork[10] = 0;
}
void func_hud_80093164(Actor* actor) {
@@ -4928,9 +4926,9 @@ void func_hud_800935E8(Player* player) {
player->unk_208 = 0;
player->unk_0D0 = 0.0f;
D_ctx_80178340 = 255;
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0;
D_ctx_80178358 = 0;
gFillScreenAlpha = 255;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0;
gFillScreenAlphaTarget = 0;
player->camEye.x = gCsCamEyeX = -3061.2f;
player->camEye.y = gCsCamEyeY = 1745.9f;
@@ -5047,17 +5045,17 @@ void func_hud_800935E8(Player* player) {
if (gCsFrameCount >= 50) {
// clang-format off
if (D_ctx_80178340 == 255) { player->unk_1D0 = 2; }
if (gFillScreenAlpha == 255) { player->unk_1D0 = 2; }
// clang-format on
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255;
D_ctx_80178358 = 255;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
gFillScreenAlphaTarget = 255;
Math_SmoothStepToF(&D_ctx_80177A48[7], 16.0f, 0.04f, 0.05f, 0.0f);
D_ctx_8017835C = D_ctx_80177A48[7];
gFillScreenAlphaStep = D_ctx_80177A48[7];
}
break;
case 2:
D_ctx_80178380[0] = 0;
gPlayerFillScreenAlphas[0] = 0;
D_ctx_80177A10[0] = gLight1R;
D_ctx_80177A10[1] = gLight1G;
@@ -5091,16 +5089,16 @@ void func_hud_800935E8(Player* player) {
player->pos.x = -50.0f;
player->pos.y = 1200.0f;
D_ctx_80178358 = 0;
gFillScreenAlphaTarget = 0;
Aquas_801BDF14();
AUDIO_PLAY_BGM(SEQ_ID_INTRO_45);
case 3:
D_ctx_8017835C = 16;
gFillScreenAlphaStep = 16;
if (player->timer_1F8 > 774) {
if (player->timer_1F8 >= 775) {
if (D_ctx_80177A48[4] >= 200.0f) {
Math_SmoothStepToF(&D_ctx_80177A48[4], -200.0f, 1.00f, 4.0f, 4.0f);
} else {
@@ -5133,7 +5131,7 @@ void func_hud_800935E8(Player* player) {
D_ctx_80177A10[9] = 40;
}
if (player->timer_1F8 <= 774) {
if (player->timer_1F8 < 775) {
D_ctx_80177A48[0] = 0.0f;
temp2 = 0.0f;
@@ -5189,13 +5187,13 @@ void func_hud_800935E8(Player* player) {
if (player->timer_1F8 < 736) {
player->unk_1D0 = 4;
D_ctx_80177AC8 = 1;
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255;
D_ctx_80178358 = 255;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
gFillScreenAlphaTarget = 255;
}
break;
case 4:
if (D_ctx_80178340 == 255) {
if (gFillScreenAlpha == 255) {
player->unk_1D0 = 5;
}
break;
@@ -5226,7 +5224,7 @@ void func_hud_800935E8(Player* player) {
player->timer_1F8 = 1000;
D_ctx_80177AC8 = 0;
D_ctx_80178358 = 0;
gFillScreenAlphaTarget = 0;
Object_Kill(&actor->obj, actor->sfxSource);
@@ -5259,7 +5257,7 @@ void func_hud_800935E8(Player* player) {
}
if (player->timer_1F8 <= 900) {
D_ctx_80177838 = 50;
gLevelStatusScreenTimer = 50;
player->state_1C8 = PLAYERSTATE_1C8_3;
player->unk_1D0 = 0;
@@ -5615,9 +5613,9 @@ void func_hud_80095604(Player* player) {
case 1:
if (gCsFrameCount > 240) {
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255;
D_ctx_80178358 = 255;
D_ctx_8017835C = 16;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
gFillScreenAlphaTarget = 255;
gFillScreenAlphaStep = 16;
if (gCsFrameCount == 280) {
player->unk_1D0 = 10;
}
@@ -5794,11 +5792,11 @@ void func_hud_80095604(Player* player) {
D_ctx_80177A48[0] = 1.0f;
case 11:
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255;
D_ctx_80178358 = 0;
D_ctx_8017835C = 8;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
gFillScreenAlphaTarget = 0;
gFillScreenAlphaStep = 8;
if (D_ctx_80178340 == 0) {
if (gFillScreenAlpha == 0) {
player->unk_1D0 = 12;
}
@@ -5854,11 +5852,11 @@ void func_hud_80095604(Player* player) {
gCsCamEyeZ = dest.z;
if (gCsFrameCount >= 1360) {
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0;
D_ctx_80178358 = 255;
D_ctx_8017835C = 16;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0;
gFillScreenAlphaTarget = 255;
gFillScreenAlphaStep = 16;
if (D_ctx_80178340 == 255) {
if (gFillScreenAlpha == 255) {
D_play_800D3180[LEVEL_AQUAS] = Play_CheckMedalStatus(150) + 1;
player->state_1C8 = PLAYERSTATE_1C8_6;
player->timer_1F8 = 0;
@@ -5887,7 +5885,7 @@ void func_hud_80095604(Player* player) {
break;
case 440:
D_ctx_80177840 = 100;
gLevelClearScreenTimer = 100;
break;
case 520:
@@ -5895,31 +5893,31 @@ void func_hud_80095604(Player* player) {
break;
case 600:
shield = gTeamShields[3];
gTeamShields[3] = 1;
shield = gTeamShields[TEAM_ID_PEPPY];
gTeamShields[TEAM_ID_PEPPY] = 1;
Radio_PlayMessage(gMsg_ID_15210, RCID_PEPPY);
gTeamShields[3] = shield;
gTeamShields[TEAM_ID_PEPPY] = shield;
break;
case 680:
shield = gTeamShields[2];
gTeamShields[2] = 1;
shield = gTeamShields[TEAM_ID_SLIPPY];
gTeamShields[TEAM_ID_SLIPPY] = 1;
Radio_PlayMessage(gMsg_ID_15220, RCID_SLIPPY);
gTeamShields[2] = shield;
gTeamShields[TEAM_ID_SLIPPY] = shield;
break;
case 760:
shield = gTeamShields[1];
gTeamShields[1] = 1;
shield = gTeamShields[TEAM_ID_FALCO];
gTeamShields[TEAM_ID_FALCO] = 1;
Radio_PlayMessage(gMsg_ID_15230, RCID_FALCO);
gTeamShields[1] = shield;
gTeamShields[TEAM_ID_FALCO] = shield;
break;
case 840:
shield = gTeamShields[2];
gTeamShields[2] = 1;
shield = gTeamShields[TEAM_ID_SLIPPY];
gTeamShields[TEAM_ID_SLIPPY] = 1;
Radio_PlayMessage(gMsg_ID_15240, RCID_SLIPPY);
gTeamShields[2] = shield;
gTeamShields[TEAM_ID_SLIPPY] = shield;
break;
case 1000:
@@ -5993,7 +5991,7 @@ void func_hud_80096A74(Player* player) {
D_ctx_80177A48[0] = 0.2f;
gCsFrameCount = 0;
player->unk_1D0 = 1;
D_ctx_80178340 = D_ctx_80178358 = 255;
gFillScreenAlpha = gFillScreenAlphaTarget = 255;
player->camEye.x = gCsCamEyeX = 0.0f;
player->camEye.y = gCsCamEyeY = player->pos.y + D_ctx_80177A48[1];
@@ -6012,9 +6010,9 @@ void func_hud_80096A74(Player* player) {
break;
}
if ((gCsFrameCount >= 40) && (D_ctx_80178340 != 0)) {
D_ctx_80178358 = 0;
D_ctx_8017835C = 8;
if ((gCsFrameCount >= 40) && (gFillScreenAlpha != 0)) {
gFillScreenAlphaTarget = 0;
gFillScreenAlphaStep = 8;
}
if (gCsFrameCount < 140) {
@@ -6082,7 +6080,7 @@ void func_hud_80096A74(Player* player) {
if (gCsFrameCount == 300) {
D_ctx_80177CE8 = 0;
D_ctx_80177838 = 50;
gLevelStatusScreenTimer = 50;
player->state_1C8 = PLAYERSTATE_1C8_3;
player->unk_0D0 = D_play_80161A54;
player->unk_1D0 = 0;
src/engine/fox_message.c
+1 -1
View File
@@ -51,7 +51,7 @@ s32 Message_GetCharCount(u16* msgPtr) {
}
void Message_DisplayChar(Gfx** gfxPtr, u16 msgChar, s32 xpos, s32 ypos) {
gDPLoadTextureBlock_4b((*gfxPtr)++, gTextCharTextures[msgChar >> 2], G_IM_FMT_CI, 16, 13, msgChar & 3,
gDPLoadTextureBlock_4b((*gfxPtr)++, gTextCharTextures[msgChar >> 2], G_IM_FMT_CI, 16, 13, msgChar % 4U,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, xpos << 2, ypos << 2, (xpos + 13) << 2, (ypos + 13) << 2, G_TX_RENDERTILE, 64, 0,
src/engine/fox_play.c
+281 -276
View File
File diff suppressed because it is too large Load Diff
src/engine/fox_radio.c
+37 -36
View File
@@ -4,6 +4,7 @@
* Description: Starfox Radio Handler
*/
#include "prevent_bss_reordering.h"
#include "global.h"
#include "assets/ast_allies.h"
#include "assets/ast_corneria.h"
@@ -76,13 +77,13 @@ void Radio_PlayMessage(u16* msg, RadioCharacterId character) {
if (gGameState == GSTATE_PLAY) {
if ((character == RCID_FALCO) || (character == RCID_SLIPPY) || (character == RCID_PEPPY)) {
if (character == RCID_FALCO) {
var_v1 = 1;
var_v1 = TEAM_ID_FALCO;
}
if (character == RCID_SLIPPY) {
var_v1 = 2;
var_v1 = TEAM_ID_SLIPPY;
}
if (character == RCID_PEPPY) {
var_v1 = 3;
var_v1 = TEAM_ID_PEPPY;
}
if ((gTeamShields[var_v1] <= 0) && (gTeamShields[var_v1] != -2)) {
return;
@@ -123,7 +124,7 @@ void Radio_PlayMessage(u16* msg, RadioCharacterId character) {
switch (gGameState) {
case GSTATE_TITLE:
case GSTATE_CREDITS:
case GSTATE_ENDING:
D_radio_8017872C = 176;
D_radio_80178728 = 85;
D_radio_80178730 = 80.0f;
@@ -147,7 +148,7 @@ void Radio_PlayMessage(u16* msg, RadioCharacterId character) {
Audio_PlayVoice(D_ctx_801782E8);
}
s32 D_radio_80178744;
s32 sRadioUseRedBox;
void func_radio_800BAAE8(void) {
static f32 D_800D4A74 = -1.0f;
@@ -158,19 +159,19 @@ void func_radio_800BAAE8(void) {
f32 temp_fa0;
s32 j;
D_radio_80178744 = 0;
sRadioUseRedBox = 0;
mirror = false;
switch (D_ctx_801782A4) {
case RCID_FOX_RED:
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
/* fallthrough */
case RCID_FOX:
sp44 = D_10050E0;
break;
case RCID_FOX_RED_OPEN:
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
/* fallthrough */
case RCID_FOX_OPEN:
sp44 = D_1006000;
@@ -182,37 +183,37 @@ void func_radio_800BAAE8(void) {
sp44 = D_1007E40;
break;
case RCID_FALCO_RED:
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
/* fallthrough */
case RCID_FALCO:
sp44 = D_10032A0;
break;
case RCID_FALCO_RED_OPEN:
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
/* fallthrough */
case RCID_FALCO_OPEN:
sp44 = D_10041C0;
break;
case RCID_SLIPPY_RED:
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
/* fallthrough */
case RCID_SLIPPY:
sp44 = D_100D900;
break;
case RCID_SLIPPY_RED_OPEN:
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
/* fallthrough */
case RCID_SLIPPY_OPEN:
sp44 = D_100E820;
break;
case RCID_PEPPY_RED:
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
/* fallthrough */
case RCID_PEPPY:
sp44 = D_100BAC0;
break;
case RCID_PEPPY_RED_OPEN:
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
/* fallthrough */
case RCID_PEPPY_OPEN:
sp44 = D_100C9E0;
@@ -320,14 +321,14 @@ void func_radio_800BAAE8(void) {
sp44 = D_MA_6011B40;
break;
case RCID_ROB64_RED:
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
/* fallthrough */
case RCID_ROB64:
case RCID_ROB64_2:
sp44 = D_1009C80;
break;
case RCID_ROB64_RED_OPEN:
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
/* fallthrough */
case RCID_ROB64_OPEN:
case RCID_ROB64_2_OPEN:
@@ -345,7 +346,7 @@ void func_radio_800BAAE8(void) {
if ((gGameState == GSTATE_PLAY) && (gCurrentLevel == LEVEL_AREA_6)) {
sp44 = D_A6_6000B60;
}
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
break;
case RCID_ANDROSS_RED_OPEN:
case RCID_ANDROSS_OPEN:
@@ -353,7 +354,7 @@ void func_radio_800BAAE8(void) {
if ((gGameState == GSTATE_PLAY) && (gCurrentLevel == LEVEL_AREA_6)) {
sp44 = D_A6_6001A80;
}
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
break;
case RCID_JAMES:
sp44 = D_D005C30;
@@ -403,12 +404,12 @@ void func_radio_800BAAE8(void) {
sp44 = D_1008D60;
break;
case GSTATE_TITLE:
case GSTATE_CREDITS:
case GSTATE_ENDING:
sp44 = gTitleRadioStatic;
break;
}
if (((s32) D_ctx_80177D68 == RCID_ANDROSS) || ((s32) D_ctx_80177D68 == RCID_ANDROSS_RED)) {
D_radio_80178744 = 1;
sRadioUseRedBox = 1;
}
break;
}
@@ -463,7 +464,7 @@ void func_radio_800BB388(void) {
RCP_SetupDL(&gMasterDisp, 0x55);
switch (gGameState) {
case GSTATE_TITLE:
case GSTATE_CREDITS:
case GSTATE_ENDING:
sp38 = D_TITLE_601D750;
sp34 = D_TITLE_601DB50;
break;
@@ -472,7 +473,7 @@ void func_radio_800BB388(void) {
sp34 = D_1013570;
break;
}
if (D_radio_80178744 == 1) {
if (sRadioUseRedBox == 1) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 25, 25, 170);
} else {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 60, 60, 255, 170);
@@ -496,7 +497,7 @@ void func_radio_800BB5D0(void) {
u32 temp_v0;
s32 fakeTemp;
if ((D_ctx_80177854 == 100) && (gGameState != GSTATE_CREDITS)) {
if ((gPlayState == PLAY_PAUSE) && (gGameState != GSTATE_ENDING)) {
return;
}
@@ -529,7 +530,7 @@ void func_radio_800BB5D0(void) {
D_Timer_801782AC = 10;
}
D_ctx_801782A4 = 2;
if (gGameFrameCount & 1) {
if ((gGameFrameCount & 1) != 0) {
D_ctx_801782A4 = 3;
}
break;
@@ -540,7 +541,7 @@ void func_radio_800BB5D0(void) {
D_Timer_801782AC = 10;
}
D_ctx_801782A4 = 2;
if (gGameFrameCount & 1) {
if ((gGameFrameCount & 1) != 0) {
D_ctx_801782A4 = 3;
}
break;
@@ -554,7 +555,7 @@ void func_radio_800BB5D0(void) {
} else {
D_Timer_801782AC = (2 * temp_v0) + 16;
}
if ((gGameState == GSTATE_TITLE) || (gGameState == GSTATE_CREDITS)) {
if ((gGameState == GSTATE_TITLE) || (gGameState == GSTATE_ENDING)) {
D_Timer_801782AC = temp_v0 * 2;
}
}
@@ -639,7 +640,7 @@ void func_radio_800BB5D0(void) {
case 6:
if (D_Timer_801782AC == 0) {
if (gGameState == GSTATE_CREDITS) {
if (gGameState == GSTATE_ENDING) {
Audio_ClearVoice();
} else {
Audio_PlayVoice(0);
@@ -647,7 +648,7 @@ void func_radio_800BB5D0(void) {
gRadioState++;
}
D_ctx_801782A4 = 2;
if (gGameFrameCount & 1) {
if ((gGameFrameCount & 1) != 0) {
D_ctx_801782A4 = 3;
}
D_ctx_80177D50 -= 0.26f;
@@ -664,7 +665,7 @@ void func_radio_800BB5D0(void) {
gRadioState = 0;
}
D_ctx_801782A4 = 2;
if (gGameFrameCount & 1) {
if ((gGameFrameCount & 1) != 0) {
D_ctx_801782A4 = 3;
}
break;
@@ -687,13 +688,13 @@ void func_radio_800BB5D0(void) {
if (((temp_ft0 == RCID_FALCO) || (temp_ft0 == RCID_SLIPPY)) || (temp_ft0 == RCID_PEPPY)) {
if (temp_ft0 == RCID_FALCO) {
var_v1 = 1;
var_v1 = TEAM_ID_FALCO;
}
if (temp_ft0 == RCID_SLIPPY) {
var_v1 = 2;
var_v1 = TEAM_ID_SLIPPY;
}
if (temp_ft0 == RCID_PEPPY) {
var_v1 = 3;
var_v1 = TEAM_ID_PEPPY;
}
if ((gTeamShields[var_v1] <= 0) && (gGameFrameCount & 4) && (gTeamShields[var_v1] != -2) &&
(D_ctx_801782A4 != 2) && (D_ctx_801782A4 != 3) && (D_ctx_801782A4 != 1000)) {
@@ -764,7 +765,7 @@ void func_radio_800BB5D0(void) {
}
void func_radio_800BC040(void) {
if (D_ctx_80177854 != 100) {
if (gPlayState != PLAY_PAUSE) {
if (D_Timer_801782AC > 0) {
D_Timer_801782AC--;
}
@@ -800,7 +801,7 @@ void func_radio_800BC040(void) {
D_ctx_801782A4 = 2;
if (gGameFrameCount & 1) {
if ((gGameFrameCount & 1) != 0) {
D_ctx_801782A4 = 3;
}
break;
@@ -846,7 +847,7 @@ void func_radio_800BC040(void) {
D_ctx_801782A4 = 2;
if (gGameFrameCount & 1) {
if ((gGameFrameCount & 1) != 0) {
D_ctx_801782A4 = 3;
}
@@ -864,7 +865,7 @@ void func_radio_800BC040(void) {
D_Timer_801782AC = 5;
}
D_ctx_801782A4 = 2;
if (gGameFrameCount & 1) {
if ((gGameFrameCount & 1) != 0) {
D_ctx_801782A4 = 3;
}
break;
src/engine/fox_rcp.c
-1
View File
@@ -1,5 +1,4 @@
#include "global.h"
#include "fox_rcp_setup.c"
u8 D_80178580[0x190];
src/engine/fox_std_lib.c
+2 -2
View File
@@ -1132,7 +1132,7 @@ void Graphics_DisplaySmallText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char*
xPosCurrent += 6.0f * xScale;
break;
default:
if (var_t0 > 29) {
if (var_t0 >= 30) {
xPosCurrent += 9.0f * xScale;
} else {
xPosCurrent += 8.0f * xScale;
@@ -1163,7 +1163,7 @@ s32 Graphics_GetSmallTextWidth(char* text) {
xPos += 6.0f;
break;
default:
if (charIndex > 29) {
if (charIndex >= 30) {
xPos += 9.0f;
} else {
xPos += 8.0f;
src/engine/fox_tank.c
+25 -24
View File
@@ -178,11 +178,11 @@ void func_tank_80043B18(Player* player) {
if (gCurrentLevel == LEVEL_MACBETH) {
func_tank_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f);
} else {
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
Titania_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z,
player->unk_0E8 + sp38, 1.3f);
}
if (!(gGameFrameCount & 3)) {
if (((gGameFrameCount % 4) == 0)) {
func_effect_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->unk_138 + sp3C.z,
2.0f, 255, 15, 0);
}
@@ -193,15 +193,15 @@ void func_tank_80043B18(Player* player) {
sp48.x = 36.0f;
Matrix_MultVec3f(gCalcMatrix, &sp48, &sp3C);
if (gCurrentLevel == LEVEL_MACBETH) {
if (gGameFrameCount & 1) {
if ((gGameFrameCount % 2) != 0) {
func_tank_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f);
}
} else {
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
Titania_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z,
player->unk_0E8 + sp38, 1.0f);
}
if (!(gGameFrameCount & 3) && (player->unk_0D0 >= 5.0f)) {
if (((gGameFrameCount % 4) == 0) && (player->unk_0D0 >= 5.0f)) {
func_effect_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f,
player->unk_138 + sp3C.z, 2.0f, 255, 15, 0);
}
@@ -211,15 +211,15 @@ void func_tank_80043B18(Player* player) {
sp48.x = -36.0f;
Matrix_MultVec3f(gCalcMatrix, &sp48, &sp3C);
if (gCurrentLevel == LEVEL_MACBETH) {
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
func_tank_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f);
}
} else {
if (!(gGameFrameCount & 1)) {
if (((gGameFrameCount % 2) == 0)) {
Titania_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z,
player->unk_0E8 + sp38, 1.0f);
}
if (!(gGameFrameCount & 3) && (player->unk_0D0 >= 5.0f)) {
if (((gGameFrameCount % 4) == 0) && (player->unk_0D0 >= 5.0f)) {
func_effect_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f,
player->unk_138 + sp3C.z, 2.0f, 255, 15, 0);
}
@@ -449,10 +449,10 @@ void func_tank_80044868(Player* player) {
}
player->pos.x += player->vel.x;
if ((player->unk_0AC + (player->unk_09C - 100.0f)) < player->pos.x) {
player->flags_228 = 1;
player->flags_228 = PFLAG_228_0;
}
if (player->pos.x < (player->unk_0AC - (player->unk_09C - 100.0f))) {
player->flags_228 = 2;
player->flags_228 = PFLAG_228_1;
}
if (player->unk_09C + player->unk_0AC < player->pos.x) {
player->pos.x = player->unk_09C + player->unk_0AC;
@@ -672,13 +672,13 @@ void func_tank_80045678(Player* player) {
player->unk_0D4 = 0.0f;
Math_SmoothStepToF(&player->vel.y, 0.0f, 0.1f, 2.0f, 0);
}
if ((gCamCount == 1) && !(gGameFrameCount & 1)) {
if ((gCamCount == 1) && ((gGameFrameCount % 2) == 0)) {
func_effect_8007A900(RAND_FLOAT_CENTERED(20.0f) + player->pos.x, player->unk_068 + 10.0f,
player->unk_138 - 10.0f, RAND_FLOAT(2.0f) + 3.5f, 255, 16, 1);
}
} else {
D_800C9F3C = 0;
if ((gCamCount == 1) && !(gGameFrameCount & 3) && (player->unk_1DC == 0)) {
if ((gCamCount == 1) && ((gGameFrameCount % 4) == 0) && (player->unk_1DC == 0)) {
if ((player->unk_16C > 0.2f) && (player->timer_220 == 0)) {
func_effect_8007A900(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x - 57.0f), player->unk_068 + 10.0f,
player->unk_138 - 10.0f, RAND_FLOAT(1.0f) + 1.5f, 255, 15, 0);
@@ -1328,7 +1328,7 @@ void func_tank_800481F4(Player* player) {
s32 temp_v0;
Actor* actor;
Boss* boss;
Object_4C* obj4C;
Sprite* sprite;
Object_80* obj80;
s32 sp98;
s32 pad2;
@@ -1472,21 +1472,22 @@ void func_tank_800481F4(Player* player) {
}
}
}
for (i = 0, obj4C = gObjects4C; i < ARRAY_COUNT(gObjects4C); i++, obj4C++) {
if (obj4C->obj.status == OBJ_ACTIVE) {
if ((player->unk_138 - 200.0f) < obj4C->obj.pos.z) {
temp_v0 = func_play_800A7974(player, obj4C->info.hitbox, &sp98, obj4C->obj.pos.x, obj4C->obj.pos.y,
obj4C->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
for (i = 0, sprite = gSprites; i < ARRAY_COUNT(gSprites); i++, sprite++) {
if (sprite->obj.status == OBJ_ACTIVE) {
if ((player->unk_138 - 200.0f) < sprite->obj.pos.z) {
temp_v0 =
func_play_800A7974(player, sprite->info.hitbox, &sp98, sprite->obj.pos.x, sprite->obj.pos.y,
sprite->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
if (temp_v0 != 0) {
if ((obj4C->obj.id == OBJ_4C_163) || (obj4C->obj.id == OBJ_4C_161) ||
(obj4C->obj.id == OBJ_4C_162)) {
obj4C->unk_46 = 1;
if ((sprite->obj.id == OBJ_SPRITE_FO_POLE) || (sprite->obj.id == OBJ_SPRITE_CO_POLE) ||
(sprite->obj.id == OBJ_SPRITE_CO_TREE)) {
sprite->unk_46 = 1;
player->unk_1F4 = 6;
player->unk_21C = 0;
} else if (obj4C->obj.id == OBJ_4C_169) {
obj4C->unk_46 = 1;
} else if (sprite->obj.id == OBJ_SPRITE_TI_CACTUS) {
sprite->unk_46 = 1;
} else {
Player_ApplyDamage(player, temp_v0, obj4C->info.damage);
Player_ApplyDamage(player, temp_v0, sprite->info.damage);
}
}
}
src/engine/fox_versus.c
+29 -28
View File
@@ -1,3 +1,4 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "fox_option.h"
#include "assets/ast_vs_menu.h"
@@ -59,24 +60,24 @@ void func_versus_800BC760(void) {
}
gGameState = GSTATE_INIT;
D_Timer_8017783C = 2;
gNextGameStateTimer = 2;
gCamCount = GSTATE_INIT;
D_ctx_80177854 = 0;
gDrawMode = DRAWMODE_0;
gPlayState = PLAY_STANDBY;
gDrawMode = DRAW_NONE;
D_ctx_80177AE0 = 0;
gOptionMenuStatus = OPTION_WAIT;
D_ctx_80177B40 = 0;
gBgColor = 0;
D_ctx_80178380[0] = 0;
D_ctx_80178380[1] = 0;
D_ctx_80178380[2] = 0;
D_ctx_80178380[3] = 0;
gPlayerFillScreenAlphas[0] = 0;
gPlayerFillScreenAlphas[1] = 0;
gPlayerFillScreenAlphas[2] = 0;
gPlayerFillScreenAlphas[3] = 0;
gOverlayStage = 0;
gRadioState = 0;
gVersusMode = 0;
D_ctx_80178358 = 0;
D_ctx_80178340 = 255;
D_ctx_80177824 = GSTATE_INIT;
gFillScreenAlphaTarget = 0;
gFillScreenAlpha = 255;
D_ctx_80177824 = 1;
}
void func_versus_800BC88C(f32 xPos, f32 yPos, f32 scale) {
@@ -1065,7 +1066,7 @@ s32 func_versus_800C04DC(f32 xPos, f32 scale, s32 arg2) {
f32 x;
f32 y;
if ((D_ctx_801778AC == 2) && (D_800D4A98 & 32) && (D_801787A8 != 99)) {
if ((D_ctx_801778AC == 2) && (D_800D4A98 & 0x20) && (D_801787A8 != 99)) {
x = 118.0f;
y = 110.0f;
@@ -1372,9 +1373,9 @@ void func_versus_800C1368(void) {
D_800D4A90 = 0;
D_800D4A98 = 0;
D_800D4A9C = D_800D4AA0 = 0;
D_ctx_80178340 = 255;
D_ctx_8017835C = 0;
D_ctx_80178358 = 0;
gFillScreenAlpha = 255;
gFillScreenAlphaStep = 0;
gFillScreenAlphaTarget = 0;
for (i = 0; i < 4; i++) {
D_ctx_80177C30[i] = 0;
@@ -1465,7 +1466,7 @@ void func_versus_800C16D0(void) {
void func_versus_800C1700(void) {
func_versus_800BC760();
gGameState = GSTATE_MENU;
D_Timer_8017783C = 2;
gNextGameStateTimer = 2;
gOptionMenuStatus = OPTION_WAIT;
D_game_800D2870 = 1;
gBgColor = 0;
@@ -1667,8 +1668,8 @@ bool func_versus_800C176C(void) {
case 11:
D_80178830 += 16;
if (D_80178830 > 480) {
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0;
D_ctx_80178340 = D_ctx_80178358 = 255;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0;
gFillScreenAlpha = gFillScreenAlphaTarget = 255;
gBgColor = 0;
func_versus_800C16D0();
}
@@ -1680,7 +1681,7 @@ bool func_versus_800C176C(void) {
if (D_80178830 > 176) {
gCamCount = 1;
}
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0;
gBgColor = 0;
if (D_80178830 > 224) {
func_versus_800C1700();
@@ -1695,7 +1696,7 @@ bool func_versus_800C176C(void) {
gCamCount = 1;
}
D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0;
gBgColor = 0;
if (D_80178830 > 224) {
@@ -1723,14 +1724,14 @@ bool func_versus_800C176C(void) {
}
if (D_versus_80178754 >= 5) {
D_ctx_801779BC = 0;
gPauseEnabled = 0;
}
return false;
}
s32 func_versus_800C1E9C(void) {
if (D_ctx_80177854 != 100) {
if (gPlayState != PLAY_PAUSE) {
func_versus_800C176C();
}
return 0;
@@ -1766,7 +1767,7 @@ void func_versus_800C1ED4(void) {
break;
}
case 4:
if ((D_ctx_801778AC != 2) || (!(D_800D4A98 & 32))) {
if ((D_ctx_801778AC != 2) || (!(D_800D4A98 & 0x20))) {
if (D_801787A8 < 4) {
func_versus_800C075C();
}
@@ -1807,7 +1808,7 @@ void func_versus_800C1ED4(void) {
void func_versus_800C20B0(void) {
switch (gOptionMenuStatus) {
case 0:
if (D_Timer_8017783C == 0) {
if (gNextGameStateTimer == 0) {
gOptionMenuStatus = OPTION_SETUP;
D_ctx_80178410 = 0;
}
@@ -1818,8 +1819,8 @@ void func_versus_800C20B0(void) {
break;
case 2:
gDrawMode = DRAWMODE_0;
func_play_800A5844();
gDrawMode = DRAW_NONE;
Play_Setup();
if (gVersusStage == VS_STAGE_SECTOR_Z) {
gOverlayStage = 1;
@@ -1827,8 +1828,8 @@ void func_versus_800C20B0(void) {
gCurrentLevel = LEVEL_VERSUS;
gGameState = GSTATE_PLAY;
D_Timer_8017783C = 2;
D_ctx_80177854 = 0;
gNextGameStateTimer = 2;
gPlayState = PLAY_STANDBY;
D_versus_80178758 = 0;
break;
}
@@ -1897,7 +1898,7 @@ void func_versus_800C2244(Actor* actor) {
y = actor->fwork[5] - actor->obj.pos.y;
z = actor->fwork[6] - actor->obj.pos.z;
if (!((gGameFrameCount + actor->index) & 7)) {
if (((gGameFrameCount + actor->index) % 8) == 0) {
actor->fwork[19] = Math_RadToDeg((Math_Atan2F(x, z)));
z = sqrtf(SQ(x) + SQ(z));
actor->fwork[20] = Math_RadToDeg((Math_Atan2F(y, z)));