mirror of
https://github.com/HarbourMasters/Starship
synced 2026-07-09 07:03:15 -04:00
avoid widescreen Radio at the ending
This commit is contained in:
+15
-5
@@ -125,7 +125,6 @@ void Radio_PlayMessage(u16* msg, RadioCharacterId character) {
|
||||
|
||||
switch (gGameState) {
|
||||
case GSTATE_TITLE:
|
||||
case GSTATE_ENDING:
|
||||
gRadioPrintPosY = 176;
|
||||
gRadioPrintPosX = OTRGetRectDimensionFromLeftEdge(85.0f);
|
||||
gRadioTextBoxPosX = OTRGetRectDimensionFromLeftEdge(80.0f);
|
||||
@@ -135,6 +134,16 @@ void Radio_PlayMessage(u16* msg, RadioCharacterId character) {
|
||||
gRadioPortraitPosY = 174.0f;
|
||||
break;
|
||||
|
||||
case GSTATE_ENDING:
|
||||
gRadioPrintPosY = 176;
|
||||
gRadioPrintPosX = 85.0f;
|
||||
gRadioTextBoxPosX = 80.0f;
|
||||
gRadioTextBoxPosY = 174.0f;
|
||||
gRadioTextBoxScaleX = 4.63f;
|
||||
gRadioPortraitPosX = 32.0f;
|
||||
gRadioPortraitPosY = 174.0f;
|
||||
break;
|
||||
|
||||
case GSTATE_PLAY:
|
||||
gRadioPrintPosY = 180;
|
||||
gRadioPrintPosX = OTRGetRectDimensionFromLeftEdge(79.0f);
|
||||
@@ -428,10 +437,12 @@ void func_radio_800BAAE8(void) {
|
||||
|
||||
if (mirror) {
|
||||
Lib_TextureRect_RGBA16_MirX(&gMasterDisp, radioPortraitTex, 44, 44, gRadioPortraitPosX,
|
||||
gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f, gRadioPortraitScaleY);
|
||||
gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f,
|
||||
gRadioPortraitScaleY);
|
||||
} else {
|
||||
Lib_TextureRect_RGBA16(&gMasterDisp, radioPortraitTex, 44, 44, gRadioPortraitPosX,
|
||||
gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f, gRadioPortraitScaleY);
|
||||
gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f,
|
||||
gRadioPortraitScaleY);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -607,8 +618,7 @@ void Radio_Draw(void) {
|
||||
if (ret == 0) {
|
||||
gRadioState = 31;
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
gRadioMsgCharIndex++;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user