diff --git a/assets/yaml/us/rev1/ast_title.yaml b/assets/yaml/us/rev1/ast_title.yaml index d1799354..aa4abd86 100644 --- a/assets/yaml/us/rev1/ast_title.yaml +++ b/assets/yaml/us/rev1/ast_title.yaml @@ -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_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 } diff --git a/src/engine/fox_radio.c b/src/engine/fox_radio.c index 827c5cb5..3c0b3617 100644 --- a/src/engine/fox_radio.c +++ b/src/engine/fox_radio.c @@ -572,7 +572,8 @@ void Radio_Draw(void) { case 32: if (Audio_GetCurrentVoice() == 0) { gRadioMsgListIndex++; - gRadioMsg = gRadioMsgList[gRadioMsgListIndex]; + gRadioMsgId = 10 * (gRadioMsgListIndex + 1); + gRadioMsg = SEGMENTED_TO_VIRTUAL(gRadioMsgList[gRadioMsgListIndex]); Audio_PlayVoice(Message_IdFromPtr(gRadioMsg)); gRadioMsgCharIndex = 0; sRadioCheckMouthFlag = 0; @@ -602,7 +603,7 @@ void Radio_Draw(void) { if (!(fakeTemp)) { ret = Audio_GetCurrentVoiceStatus(); - if (gRadioMsgCharIndex < 60) { + if (gRadioMsgId < 50) { if (gRadioMsg[gRadioMsgCharIndex + 1] == MSGCHAR_NXT) { if (ret == 0) { gRadioState = 31; @@ -610,6 +611,8 @@ void Radio_Draw(void) { } else { gRadioMsgCharIndex++; } + } else { + gRadioMsgCharIndex++; } if (sRadioCheckMouthFlag) { diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c index 9ec4ef1b..2a40c0a2 100644 --- a/src/overlays/ovl_menu/fox_map.c +++ b/src/overlays/ovl_menu/fox_map.c @@ -5924,7 +5924,7 @@ void Map_PathPlanetMedal_Draw(f32 x, f32 y, f32 z) { void Map_BriefingRadio_Setup(void) { 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]; D_menu_801CF018 = 100; gRadioPrintPosX = 78; @@ -5964,7 +5964,7 @@ void Map_BriefingRadio_Update(void) { } D_menu_801CD940 = 1; - gRadioMsg = sBriefingMsg[sCurrentPlanetId][D_menu_801CD940]; + gRadioMsg = SEGMENTED_TO_VIRTUAL(sBriefingMsg[sCurrentPlanetId][D_menu_801CD940]); Audio_PlayVoice(Message_IdFromPtr(gRadioMsg)); @@ -6042,7 +6042,7 @@ void Map_BriefingRadio_Update(void) { break; } else { D_menu_801CD940 = 1; - gRadioMsg = sBriefingMsg[sCurrentPlanetId][D_menu_801CD940]; + gRadioMsg = SEGMENTED_TO_VIRTUAL(sBriefingMsg[sCurrentPlanetId][D_menu_801CD940]); Audio_PlayVoice(Message_IdFromPtr(gRadioMsg)); gRadioMsgRadioId = D_menu_801AF420[D_menu_801CD940]; gCurrentRadioPortrait = gRadioMsgRadioId; diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c index bda50270..e0c54bb5 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -1343,7 +1343,7 @@ CameraPoint D_menu_801ADA94[50] = { }; 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) { case 0: @@ -3590,7 +3590,8 @@ void Title_Matrix_Push(void) { void Title_Radio_PlayMessage(u16** msgList, RadioCharacterId character) { gRadioMsgList = msgList; gRadioMsgListIndex = 0; - gRadioMsg = msgList[gRadioMsgListIndex]; + gRadioMsg = SEGMENTED_TO_VIRTUAL(msgList[gRadioMsgListIndex]); + gRadioMsgId = 10 * (gRadioMsgListIndex + 1); gRadioMsgRadioId = character; gRadioState = 100;