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

revert back to a working state

Browse Source
This commit is contained in:
Sonic Dreamcaster 2024-12-09 23:12:30 -03:00
parent 94e5d0f5cc
commit 3a3f1a00f7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/engine/fox_radio.c
View File

@ -126,11 +126,11 @@ void Radio_PlayMessage(u16* msg, RadioCharacterId character) {
switch (gGameState) { switch (gGameState) {
case GSTATE_TITLE: case GSTATE_TITLE:
gRadioPrintPosY = 176; gRadioPrintPosY = 176;
gRadioPrintPosX = 85.0f; gRadioPrintPosX = OTRGetRectDimensionFromLeftEdge(85.0f);
gRadioTextBoxPosX = 80.0f; gRadioTextBoxPosX = OTRGetRectDimensionFromLeftEdge(80.0f);
gRadioTextBoxPosY = 174.0f; gRadioTextBoxPosY = 174.0f;
gRadioTextBoxScaleX = 4.63f; gRadioTextBoxScaleX = 4.63f;
gRadioPortraitPosX = 32.0f; gRadioPortraitPosX = OTRGetRectDimensionFromLeftEdge(32.0f);
gRadioPortraitPosY = 174.0f; gRadioPortraitPosY = 174.0f;
break; break;
@ -146,11 +146,11 @@ void Radio_PlayMessage(u16* msg, RadioCharacterId character) {
case GSTATE_PLAY: case GSTATE_PLAY:
gRadioPrintPosY = 180; gRadioPrintPosY = 180;
gRadioPrintPosX = 79.0f; gRadioPrintPosX = OTRGetRectDimensionFromLeftEdge(79.0f);
gRadioTextBoxPosX = 74.0f; gRadioTextBoxPosX = OTRGetRectDimensionFromLeftEdge(74.0f);
gRadioTextBoxPosY = 178.0f; gRadioTextBoxPosY = 178.0f;
gRadioTextBoxScaleX = 4.53f; gRadioTextBoxScaleX = 4.53f;
gRadioPortraitPosX = 26.0f; gRadioPortraitPosX = OTRGetRectDimensionFromLeftEdge(26.0f);
gRadioPortraitPosY = 178.0f; gRadioPortraitPosY = 178.0f;
break; break;
} }
@ -436,11 +436,11 @@ void func_radio_800BAAE8(void) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
if (mirror) { if (mirror) {
Lib_TextureRect_RGBA16_MirX(&gMasterDisp, radioPortraitTex, 44, 44, OTRGetRectDimensionFromLeftEdge(gRadioPortraitPosX), Lib_TextureRect_RGBA16_MirX(&gMasterDisp, radioPortraitTex, 44, 44, gRadioPortraitPosX,
gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f, gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f,
gRadioPortraitScaleY); gRadioPortraitScaleY);
} else { } else {
Lib_TextureRect_RGBA16(&gMasterDisp, radioPortraitTex, 44, 44, OTRGetRectDimensionFromLeftEdge(gRadioPortraitPosX), Lib_TextureRect_RGBA16(&gMasterDisp, radioPortraitTex, 44, 44, gRadioPortraitPosX,
gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f, gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f,
gRadioPortraitScaleY); gRadioPortraitScaleY);
} }
@ -486,14 +486,14 @@ void func_radio_800BB388(void) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 60, 60, 255, 170); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 60, 60, 255, 170);
} }
Lib_TextureRect_CI8(&gMasterDisp, texture, palette, 32, 32, OTRGetRectDimensionFromLeftEdge(gRadioTextBoxPosX), gRadioTextBoxPosY + 16.0f + sp30, Lib_TextureRect_CI8(&gMasterDisp, texture, palette, 32, 32, gRadioTextBoxPosX, gRadioTextBoxPosY + 16.0f + sp30,
gRadioTextBoxScaleX, gRadioTextBoxScaleY); gRadioTextBoxScaleX, gRadioTextBoxScaleY);
} }
if (gRadioTextBoxScaleY == 1.3f) { if (gRadioTextBoxScaleY == 1.3f) {
RCP_SetupDL(&gMasterDisp, SETUPDL_85); RCP_SetupDL(&gMasterDisp, SETUPDL_85);
gMsgCharIsPrinting = gMsgCharIsPrinting =
Message_DisplayText(&gMasterDisp, gRadioMsg, OTRGetRectDimensionFromLeftEdge(gRadioPrintPosX), gRadioPrintPosY, gRadioMsgCharIndex); Message_DisplayText(&gMasterDisp, gRadioMsg, gRadioPrintPosX, gRadioPrintPosY, gRadioMsgCharIndex);
} }
} }