PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 13:35:11 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Fixed title cs and logic on message system

Browse Source
This commit is contained in:
KiritoDv 2024-11-19 00:28:09 -06:00
parent 45c334c585
commit 2ee52903cd
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/yaml/us/rev1/ast_title.yaml
View File

@ -154,7 +154,7 @@ D_TITLE_6028708: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height:
D_TITLE_6028788: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6028788, symbol: D_TITLE_6028788 } D_TITLE_6028788: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6028788, symbol: D_TITLE_6028788 }
D_TITLE_6028988: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x6028988, symbol: D_TITLE_6028988 } D_TITLE_6028988: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6028988, symbol: D_TITLE_6028988 }
D_TITLE_6028A08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6028A08, symbol: D_TITLE_6028A08 } D_TITLE_6028A08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6028A08, symbol: D_TITLE_6028A08 }

7
src/engine/fox_radio.c
View File

@ -572,7 +572,8 @@ void Radio_Draw(void) {
case 32: case 32:
if (Audio_GetCurrentVoice() == 0) { if (Audio_GetCurrentVoice() == 0) {
gRadioMsgListIndex++; gRadioMsgListIndex++;
gRadioMsg = gRadioMsgList[gRadioMsgListIndex]; gRadioMsgId = 10 * (gRadioMsgListIndex + 1);
gRadioMsg = SEGMENTED_TO_VIRTUAL(gRadioMsgList[gRadioMsgListIndex]);
Audio_PlayVoice(Message_IdFromPtr(gRadioMsg)); Audio_PlayVoice(Message_IdFromPtr(gRadioMsg));
gRadioMsgCharIndex = 0; gRadioMsgCharIndex = 0;
sRadioCheckMouthFlag = 0; sRadioCheckMouthFlag = 0;
@ -602,7 +603,7 @@ void Radio_Draw(void) {
if (!(fakeTemp)) { if (!(fakeTemp)) {
ret = Audio_GetCurrentVoiceStatus(); ret = Audio_GetCurrentVoiceStatus();
if (gRadioMsgCharIndex < 60) { if (gRadioMsgId < 50) {
if (gRadioMsg[gRadioMsgCharIndex + 1] == MSGCHAR_NXT) { if (gRadioMsg[gRadioMsgCharIndex + 1] == MSGCHAR_NXT) {
if (ret == 0) { if (ret == 0) {
gRadioState = 31; gRadioState = 31;
@ -610,6 +611,8 @@ void Radio_Draw(void) {
} else { } else {
gRadioMsgCharIndex++; gRadioMsgCharIndex++;
} }
} else {
gRadioMsgCharIndex++;
} }
if (sRadioCheckMouthFlag) { if (sRadioCheckMouthFlag) {

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

@ -5924,7 +5924,7 @@ void Map_PathPlanetMedal_Draw(f32 x, f32 y, f32 z) {
void Map_BriefingRadio_Setup(void) { void Map_BriefingRadio_Setup(void) {
D_menu_801CD940 = 0; D_menu_801CD940 = 0;
gRadioMsg = sBriefingMsg[sCurrentPlanetId][D_menu_801CD940]; gRadioMsg = SEGMENTED_TO_VIRTUAL(sBriefingMsg[sCurrentPlanetId][D_menu_801CD940]);
gRadioMsgRadioId = D_menu_801AF420[D_menu_801CD940]; gRadioMsgRadioId = D_menu_801AF420[D_menu_801CD940];
D_menu_801CF018 = 100; D_menu_801CF018 = 100;
gRadioPrintPosX = 78; gRadioPrintPosX = 78;
@ -5964,7 +5964,7 @@ void Map_BriefingRadio_Update(void) {
} }
D_menu_801CD940 = 1; D_menu_801CD940 = 1;
gRadioMsg = sBriefingMsg[sCurrentPlanetId][D_menu_801CD940]; gRadioMsg = SEGMENTED_TO_VIRTUAL(sBriefingMsg[sCurrentPlanetId][D_menu_801CD940]);
Audio_PlayVoice(Message_IdFromPtr(gRadioMsg)); Audio_PlayVoice(Message_IdFromPtr(gRadioMsg));
@ -6042,7 +6042,7 @@ void Map_BriefingRadio_Update(void) {
break; break;
} else { } else {
D_menu_801CD940 = 1; D_menu_801CD940 = 1;
gRadioMsg = sBriefingMsg[sCurrentPlanetId][D_menu_801CD940]; gRadioMsg = SEGMENTED_TO_VIRTUAL(sBriefingMsg[sCurrentPlanetId][D_menu_801CD940]);
Audio_PlayVoice(Message_IdFromPtr(gRadioMsg)); Audio_PlayVoice(Message_IdFromPtr(gRadioMsg));
gRadioMsgRadioId = D_menu_801AF420[D_menu_801CD940]; gRadioMsgRadioId = D_menu_801AF420[D_menu_801CD940];
gCurrentRadioPortrait = gRadioMsgRadioId; gCurrentRadioPortrait = gRadioMsgRadioId;

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

@ -1343,7 +1343,7 @@ CameraPoint D_menu_801ADA94[50] = {
}; };
void Title_CsTeamRunning_Update(void) { void Title_CsTeamRunning_Update(void) {
static s32 D_menu_801ADF44[] = { 63, 170, 268, 368 }; static s32 D_menu_801ADF44[] = { 63, 170, 268, 368, 368 };
switch (sSceneState) { switch (sSceneState) {
case 0: case 0:
@ -3590,7 +3590,8 @@ void Title_Matrix_Push(void) {
void Title_Radio_PlayMessage(u16** msgList, RadioCharacterId character) { void Title_Radio_PlayMessage(u16** msgList, RadioCharacterId character) {
gRadioMsgList = msgList; gRadioMsgList = msgList;
gRadioMsgListIndex = 0; gRadioMsgListIndex = 0;
gRadioMsg = msgList[gRadioMsgListIndex]; gRadioMsg = SEGMENTED_TO_VIRTUAL(msgList[gRadioMsgListIndex]);
gRadioMsgId = 10 * (gRadioMsgListIndex + 1);
gRadioMsgRadioId = character; gRadioMsgRadioId = character;
gRadioState = 100; gRadioState = 100;