PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-02-03 00:33:55 +03:00
Code Issues Actions 1 Packages Projects Releases 1 Wiki Activity

some spaces, corrections and TeamId Enum usages

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2024-04-25 01:00:23 -03:00
parent 81291a0c44
commit a6b80a5825
9 changed files with 253 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -73,7 +73,7 @@ void func_tank_80046358(Player*);
// fox_demo // fox_demo
void Cutscene_KillPlayer(Player*); void Cutscene_KillPlayer(Player*);
void func_demo_80048AC0(s32 teamId); void func_demo_80048AC0(TeamId teamId);
void Cutscene_EnterWarpZone(Player*); void Cutscene_EnterWarpZone(Player*);
void Cutscene_LevelStart(Player*); void Cutscene_LevelStart(Player*);
void func_demo_8004AA84(void); void func_demo_8004AA84(void);

2
src/engine/fox_demo.c
View File

@ -110,7 +110,7 @@ static Animation* D_demo_800CA1F4[] = {
&D_SY_60265B4, &D_SY_602B8DC, &D_SY_60034C4, &D_SY_602A2CC, &D_SY_602CEB4, &D_SY_602B778, &D_SY_601F3B8, &D_SY_60265B4, &D_SY_602B8DC, &D_SY_60034C4, &D_SY_602A2CC, &D_SY_602CEB4, &D_SY_602B778, &D_SY_601F3B8,
}; };
void func_demo_80048AC0(s32 teamId) { void func_demo_80048AC0(TeamId teamId) {
s32 teamShield; s32 teamShield;
if (teamId == TEAM_ID_FALCO) { if (teamId == TEAM_ID_FALCO) {

6
src/overlays/ovl_i2/fox_me.c
View File

@ -2376,7 +2376,7 @@ void Meteo_LevelComplete(Player* player) {
Radio_PlayMessage(gMsg_ID_20345, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20345, RCID_ROB64);
break; break;
default: default:
func_demo_80048AC0(2); func_demo_80048AC0(TEAM_ID_SLIPPY);
break; break;
} }
break; break;
@ -2390,7 +2390,7 @@ void Meteo_LevelComplete(Player* player) {
Radio_PlayMessage(gMsg_ID_20344, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20344, RCID_ROB64);
break; break;
default: default:
func_demo_80048AC0(3); func_demo_80048AC0(TEAM_ID_PEPPY);
break; break;
} }
break; break;
@ -2404,7 +2404,7 @@ void Meteo_LevelComplete(Player* player) {
Radio_PlayMessage(gMsg_ID_20340, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20340, RCID_ROB64);
break; break;
default: default:
func_demo_80048AC0(1); func_demo_80048AC0(TEAM_ID_FALCO);
break; break;
} }
break; break;

15
src/overlays/ovl_i2/fox_sx.c
View File

@ -1216,7 +1216,7 @@ bool SectorX_80192AF0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gCalcMatrix); Matrix_Pop(&gCalcMatrix);
} }
return 1; return true;
case 34: case 34:
rot->x += boss->fwork[27]; rot->x += boss->fwork[27];
@ -1259,7 +1259,7 @@ bool SectorX_80192AF0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
break; break;
} }
return 0; return false;
} }
void SectorX_80193208(s32 limbIndex, Vec3f* rot, void* data) { void SectorX_80193208(s32 limbIndex, Vec3f* rot, void* data) {
@ -1740,6 +1740,7 @@ void SectorX_LevelComplete(Player* player) {
Math_SmoothStepToF(&player->cam.at.z, player->unk_138 + D_ctx_80177D20 + sp48.z, D_ctx_80177A48[1], 500.0f, Math_SmoothStepToF(&player->cam.at.z, player->unk_138 + D_ctx_80177D20 + sp48.z, D_ctx_80177A48[1], 500.0f,
0.0f); 0.0f);
break; break;
case 2: case 2:
player->unk_0D0 += 2.0f; player->unk_0D0 += 2.0f;
if (player->timer_1F8 == 0) { if (player->timer_1F8 == 0) {
@ -1842,7 +1843,7 @@ void SectorX_LevelComplete(Player* player) {
break; break;
default: default:
func_demo_80048AC0(2); func_demo_80048AC0(TEAM_ID_SLIPPY);
break; break;
} }
break; break;
@ -1858,13 +1859,13 @@ void SectorX_LevelComplete(Player* player) {
break; break;
default: default:
func_demo_80048AC0(3); func_demo_80048AC0(TEAM_ID_PEPPY);
break; break;
} }
break; break;
case 521: case 521:
func_demo_80048AC0(1); func_demo_80048AC0(TEAM_ID_FALCO);
switch (gTeamShields[TEAM_ID_FALCO]) { switch (gTeamShields[TEAM_ID_FALCO]) {
case -1: case -1:
Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64);
@ -1875,7 +1876,7 @@ void SectorX_LevelComplete(Player* player) {
break; break;
default: default:
func_demo_80048AC0(1); func_demo_80048AC0(TEAM_ID_FALCO);
break; break;
} }
break; break;
@ -1907,7 +1908,7 @@ void SectorX_LevelComplete(Player* player) {
break; break;
case 569: case 569:
func_demo_80048AC0(1); func_demo_80048AC0(TEAM_ID_FALCO);
switch (gTeamShields[TEAM_ID_FALCO]) { switch (gTeamShields[TEAM_ID_FALCO]) {
case -1: case -1:
Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64);

6
src/overlays/ovl_i3/fox_so.c
View File

@ -3042,7 +3042,7 @@ void Solar_LevelComplete(Player* player) {
Radio_PlayMessage(gMsg_ID_20339, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20339, RCID_ROB64);
break; break;
default: default:
func_demo_80048AC0(2); func_demo_80048AC0(TEAM_ID_SLIPPY);
break; break;
} }
break; break;
@ -3055,7 +3055,7 @@ void Solar_LevelComplete(Player* player) {
Radio_PlayMessage(gMsg_ID_20338, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20338, RCID_ROB64);
break; break;
default: default:
func_demo_80048AC0(3); func_demo_80048AC0(TEAM_ID_PEPPY);
break; break;
} }
break; break;
@ -3068,7 +3068,7 @@ void Solar_LevelComplete(Player* player) {
Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64);
break; break;
default: default:
func_demo_80048AC0(1); func_demo_80048AC0(TEAM_ID_FALCO);
break; break;
} }
break; break;

4
src/overlays/ovl_i3/fox_zo.c
View File

@ -4702,7 +4702,7 @@ void Zoness_LevelComplete(Player* player) {
Radio_PlayMessage(gMsg_ID_20339, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20339, RCID_ROB64);
break; break;
default: default:
func_demo_80048AC0(2); func_demo_80048AC0(TEAM_ID_SLIPPY);
break; break;
} }
break; break;
@ -4716,7 +4716,7 @@ void Zoness_LevelComplete(Player* player) {
break; break;
default: default:
if (!gMissedZoSearchlight) { if (!gMissedZoSearchlight) {
func_demo_80048AC0(3); func_demo_80048AC0(TEAM_ID_PEPPY);
} else { } else {
Radio_PlayMessage(gMsg_ID_6100, RCID_PEPPY); Radio_PlayMessage(gMsg_ID_6100, RCID_PEPPY);
} }

6
src/overlays/ovl_i5/fox_ma.c
View File

@ -6930,7 +6930,7 @@ void Macbeth_LevelComplete1(Player* player) {
Radio_PlayMessage(gMsg_ID_20333, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20333, RCID_ROB64);
break; break;
default: default:
func_demo_80048AC0(2); func_demo_80048AC0(TEAM_ID_SLIPPY);
break; break;
} }
break; break;
@ -6948,7 +6948,7 @@ void Macbeth_LevelComplete1(Player* player) {
Radio_PlayMessage(gMsg_ID_20332, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20332, RCID_ROB64);
break; break;
default: default:
func_demo_80048AC0(3); func_demo_80048AC0(TEAM_ID_PEPPY);
break; break;
} }
break; break;
@ -6966,7 +6966,7 @@ void Macbeth_LevelComplete1(Player* player) {
Radio_PlayMessage(gMsg_ID_20331, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20331, RCID_ROB64);
break; break;
default: default:
func_demo_80048AC0(1); func_demo_80048AC0(TEAM_ID_FALCO);
break; break;
} }
break; break;

247
src/overlays/ovl_i6/fox_sy.c
View File

File diff suppressed because it is too large Load Diff

19
src/overlays/ovl_menu/fox_map.c
View File

@ -6106,9 +6106,6 @@ void Map_801ABF1C(void) {
} }
void Map_801AC200(s32 index) { void Map_801AC200(s32 index) {
// f32 z;
// f32 x;
// f32 y;
Vec3f v; Vec3f v;
f32 r; f32 r;
f32 r2; f32 r2;
@ -6639,53 +6636,53 @@ void Map_801AD11C(void) {
} }
if (gControllerHold[gMainController].button & R_TRIG) { if (gControllerHold[gMainController].button & R_TRIG) {
if (D_menu_801CDA14 - 20.0f > 2475.0f) { if ((D_menu_801CDA14 - 20.0f) > 2475.0f) {
D_menu_801CDA14 -= 20.0f; D_menu_801CDA14 -= 20.0f;
var_t0 = 1; var_t0 = 1;
} }
} }
if (gControllerHold[gMainController].button & Z_TRIG) { if (gControllerHold[gMainController].button & Z_TRIG) {
if (D_menu_801CDA14 + 20.0f < 7695.0f) { if ((D_menu_801CDA14 + 20.0f) < 7695.0f) {
D_menu_801CDA14 += 20.0f; D_menu_801CDA14 += 20.0f;
var_t0 = 1; var_t0 = 1;
} }
} }
if (gControllerHold[gMainController].button & U_CBUTTONS) { if (gControllerHold[gMainController].button & U_CBUTTONS) {
if (D_menu_801CDA04 - 10.0f >= -1200.0f) { if ((D_menu_801CDA04 - 10.0f) >= -1200.0f) {
D_menu_801CDA04 -= 10.0f; D_menu_801CDA04 -= 10.0f;
var_t0 = 1; var_t0 = 1;
} }
} }
if (gControllerHold[gMainController].button & D_CBUTTONS) { if (gControllerHold[gMainController].button & D_CBUTTONS) {
if (D_menu_801CDA04 + 10.0f <= 1200.0f) { if ((D_menu_801CDA04 + 10.0f) <= 1200.0f) {
D_menu_801CDA04 += 10.0f; D_menu_801CDA04 += 10.0f;
var_t0 = 1; var_t0 = 1;
} }
} }
if (gControllerHold[gMainController].button & L_CBUTTONS) { if (gControllerHold[gMainController].button & L_CBUTTONS) {
if (D_menu_801CDA00 + 10.0f <= 1200.0f) { if ((D_menu_801CDA00 + 10.0f) <= 1200.0f) {
D_menu_801CDA00 += 10.0f; D_menu_801CDA00 += 10.0f;
var_t0 = 1; var_t0 = 1;
} }
} }
if (gControllerHold[gMainController].button & R_CBUTTONS) { if (gControllerHold[gMainController].button & R_CBUTTONS) {
if (D_menu_801CDA00 - 10.0f >= -1200.0f) { if ((D_menu_801CDA00 - 10.0f) >= -1200.0f) {
D_menu_801CDA00 -= 10.0f; D_menu_801CDA00 -= 10.0f;
var_t0 = 1; var_t0 = 1;
} }
} }
if (D_menu_801CF010 == 0 && var_t0 == 1) { if ((D_menu_801CF010 == 0) && (var_t0 == 1)) {
AUDIO_PLAY_SFX(0x1100004C, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(0x1100004C, gDefaultSfxSource, 4);
D_menu_801CF010 = 1; D_menu_801CF010 = 1;
} }
if (D_menu_801CF010 == 1 && var_t0 == 0) { if ((D_menu_801CF010 == 1) && (var_t0 == 0)) {
Audio_KillSfxById(0x1100004C); Audio_KillSfxById(0x1100004C);
D_menu_801CF010 = 0; D_menu_801CF010 = 0;
} }