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

bools and names

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2024-04-27 12:32:07 -03:00
parent 9bc64bd212
commit 5056a6ef31
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/context.h
View File

@ -99,7 +99,7 @@ extern UNK_TYPE F_801782E0;
extern s32 gRadioMsgId; extern s32 gRadioMsgId;
extern UNK_TYPE F_801782F0; extern UNK_TYPE F_801782F0;
extern s32 gMsgCharIsPrinting; extern s32 gMsgCharIsPrinting;
extern s32 gHideRadio; extern bool gHideRadio;
extern u16* gRadioMsg; extern u16* gRadioMsg;
extern ObjectInit* gLevelObjects; extern ObjectInit* gLevelObjects;
extern s32 gFogRed; extern s32 gFogRed;
@ -314,7 +314,7 @@ extern s32 D_ctx_80177DB8[4];
extern s32 D_ctx_80177DD0[4][10]; extern s32 D_ctx_80177DD0[4][10];
extern s32 D_ctx_80177E74; extern s32 D_ctx_80177E74;
extern s32 D_ctx_80177E7C; extern s32 D_ctx_80177E7C;
extern s32 gChangeTo360; extern bool gChangeTo360;
extern Vec3f gTeamArrowsViewPos[10]; extern Vec3f gTeamArrowsViewPos[10];
extern f32 D_ctx_80177F20[65]; extern f32 D_ctx_80177F20[65];
extern f32 D_ctx_80178028[65]; extern f32 D_ctx_80178028[65];

2
src/engine/fox_360.c
View File

@ -461,7 +461,7 @@ void ActorAllRange_SpawnStarWolf(void) {
} }
void ActorAllRange_PlayMessage(u16* msg, RadioCharacterId character) { void ActorAllRange_PlayMessage(u16* msg, RadioCharacterId character) {
if ((gHideRadio == 0) && (gActors[0].state == STATE360_2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_STANDBY)) { if (!gHideRadio && (gActors[0].state == STATE360_2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_STANDBY)) {
Radio_PlayMessage(msg, character); Radio_PlayMessage(msg, character);
} }
} }

4
src/engine/fox_context.c
View File

@ -104,7 +104,7 @@ UNK_TYPE F_801782E0;
s32 gRadioMsgId; s32 gRadioMsgId;
UNK_TYPE F_801782F0; UNK_TYPE F_801782F0;
bool gMsgCharIsPrinting; bool gMsgCharIsPrinting;
s32 gHideRadio; bool gHideRadio;
u16* gRadioMsg; u16* gRadioMsg;
ObjectInit* gLevelObjects; ObjectInit* gLevelObjects;
UNK_TYPE F_80178318; UNK_TYPE F_80178318;
@ -345,7 +345,7 @@ s32 D_ctx_80177DB8[4];
s32 D_ctx_80177DD0[4][10]; s32 D_ctx_80177DD0[4][10];
s32 D_ctx_80177E74; s32 D_ctx_80177E74;
s32 D_ctx_80177E7C; s32 D_ctx_80177E7C;
s32 gChangeTo360; bool gChangeTo360;
Vec3f gTeamArrowsViewPos[10]; Vec3f gTeamArrowsViewPos[10];
f32 D_ctx_80177F20[65]; // Seem to be an early implementation of RadarMark f32 D_ctx_80177F20[65]; // Seem to be an early implementation of RadarMark
f32 D_ctx_80178028[65]; f32 D_ctx_80178028[65];

2
src/engine/fox_play.c
View File

@ -2574,7 +2574,7 @@ void Play_Init(void) {
D_display_800CA230 = D_800D2F58 = 0.0f; D_display_800CA230 = D_800D2F58 = 0.0f;
gLevelMode = LEVELMODE_ON_RAILS; gLevelMode = LEVELMODE_ON_RAILS;
D_ctx_80177CE8 = D_bg_8015F968 = 0.0f; D_ctx_80177CE8 = D_bg_8015F968 = 0.0f;
D_hud_800D1970 = gVersusMode = gHideRadio = gChangeTo360 = 0; D_hud_800D1970 = gVersusMode = gHideRadio = gChangeTo360 = false;
if (gCurrentLevel >= LEVEL_FORTUNA) { if (gCurrentLevel >= LEVEL_FORTUNA) {
gLevelMode = LEVELMODE_ALL_RANGE; gLevelMode = LEVELMODE_ALL_RANGE;
if (gCurrentLevel == LEVEL_VERSUS) { if (gCurrentLevel == LEVEL_VERSUS) {

6
src/engine/fox_radio.c
View File

@ -670,7 +670,7 @@ void Radio_Draw(void) {
case 7: case 7:
gRadioPortraitScaleY -= 0.25f; gRadioPortraitScaleY -= 0.25f;
if (gRadioPortraitScaleY == 0) { if (gRadioPortraitScaleY == 0) {
gHideRadio = 0; gHideRadio = false;
gRadioMsgPri = 0; gRadioMsgPri = 0;
gRadioState = 0; gRadioState = 0;
} }
@ -690,7 +690,7 @@ void Radio_Draw(void) {
break; break;
} }
if (((gRadioState > 0) && (gRadioState != 100)) && (gHideRadio == 0)) { if (((gRadioState > 0) && (gRadioState != 100)) && !gHideRadio) {
func_radio_800BAAE8(); func_radio_800BAAE8();
func_radio_800BB388(); func_radio_800BB388();
@ -773,7 +773,7 @@ void Radio_Draw(void) {
} }
} }
if (gHideRadio == 1) { if (gHideRadio == true) {
func_radio_800BA760(); func_radio_800BA760();
} }
} }

8
src/overlays/ovl_ending/fox_end1.c
View File

@ -376,7 +376,7 @@ void Ending_8018845C(void) {
if (var_a2 != D_ending_8019858C) {} if (var_a2 != D_ending_8019858C) {}
} }
gHideRadio = 1; gHideRadio = true;
switch (gCsFrameCount) { switch (gCsFrameCount) {
case 10: case 10:
@ -570,7 +570,7 @@ void Ending_80189108(void) {
switch (D_ending_80196D08[4].unk_38) { switch (D_ending_80196D08[4].unk_38) {
case 0: case 0:
gHideRadio = 1; gHideRadio = true;
switch (gCsFrameCount) { switch (gCsFrameCount) {
case 30: case 30:
Radio_PlayMessage(gMsg_ID_21030, RCID_FOX); Radio_PlayMessage(gMsg_ID_21030, RCID_FOX);
@ -617,7 +617,7 @@ void Ending_80189108(void) {
break; break;
case 1: case 1:
gHideRadio = 0; gHideRadio = false;
if (gCsFrameCount == 20) { if (gCsFrameCount == 20) {
Radio_PlayMessage(gMsg_ID_21050, RCID_ROB64_TITLE); Radio_PlayMessage(gMsg_ID_21050, RCID_ROB64_TITLE);
} }
@ -630,7 +630,7 @@ void Ending_80189108(void) {
break; break;
case 2: case 2:
gHideRadio = 1; gHideRadio = true;
switch (gCsFrameCount) { switch (gCsFrameCount) {
case 20: case 20:
Radio_PlayMessage(gMsg_ID_21060, RCID_FOX); Radio_PlayMessage(gMsg_ID_21060, RCID_FOX);

2
src/overlays/ovl_i1/fox_co.c
View File

@ -2691,7 +2691,7 @@ void Corneria_LevelStart(Player* player) {
player->pos.x = 0.0f; player->pos.x = 0.0f;
} }
if (player->timer_1F8 == 270) { if (player->timer_1F8 == 270) {
gHideRadio = 0; gHideRadio = false;
Radio_PlayMessage(gMsg_ID_2005, RCID_FOX); Radio_PlayMessage(gMsg_ID_2005, RCID_FOX);
} }
if (player->timer_1F8 == 180) { if (player->timer_1F8 == 180) {

2
src/overlays/ovl_menu/fox_title.c
View File

@ -1006,7 +1006,7 @@ void Title_8018994C(void) {
D_menu_801B82B8 = 0; D_menu_801B82B8 = 0;
gRadioState = 0; gRadioState = 0;
gHideRadio = 0; gHideRadio = false;
gRadioMsgPri = 0; gRadioMsgPri = 0;
break; break;