Archive/Starship
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-04-28 12:27:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

radio fixes: co-authored-by: @Malkierian

Browse source
This commit is contained in:
Sonic Dreamcaster 2024-12-09 05:11:00 -03:00
parent 3599322983
commit 99d13ea7d2
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sf64context.h
View file

@ -98,7 +98,7 @@ extern s32 gRadioMsgCharIndex;
extern UNK_TYPE F_801782E0;
extern s32 gRadioMsgId;
extern UNK_TYPE F_801782F0;
extern s32 gMsgCharIsPrinting;
extern bool gMsgCharIsPrinting;
extern bool gHideRadio;
extern u16* gRadioMsg;
extern ObjectInit* gLevelObjects;

4
src/engine/fox_radio.c
View file

@ -613,7 +613,7 @@ void Radio_Draw(void) {
if (!(fakeTemp)) {
ret = Audio_GetCurrentVoiceStatus();
if ((gGameState == GSTATE_TITLE) && gRadioMsg[gRadioMsgCharIndex + 1] != MSGCHAR_END) {
if (gRadioMsgCharIndex < 60 && gRadioMsg[gRadioMsgCharIndex + 1] != MSGCHAR_END) {
if (gRadioMsg[gRadioMsgCharIndex + 1] == MSGCHAR_NXT) {
if (ret == 0) {
gRadioState = 31;
@ -621,6 +621,8 @@ void Radio_Draw(void) {
} else {
gRadioMsgCharIndex++;
}
} else if (gRadioMsgCharIndex < 60) {
gRadioMsgCharIndex = 60;
}
if (sRadioCheckMouthFlag) {