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

Run Radio Message box calculations to their draw function
Some checks are pending
GenerateBuilds / build-linux (push) Blocked by required conditions
Details
GenerateBuilds / generate-port-otr (push) Waiting to run
Details
GenerateBuilds / build-windows (push) Blocked by required conditions
Details
GenerateBuilds / build-macos (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
Kiloku 2025-01-12 22:53:02 -03:00 committed by Lywx
parent 8bedb8f30d
commit fae975e483
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sf64mesg.h
View File

@ -64,6 +64,7 @@ typedef enum RadioCharacterId {
} RadioCharacterId; } RadioCharacterId;
void Radio_PlayMessage(u16*, RadioCharacterId); void Radio_PlayMessage(u16*, RadioCharacterId);
void Radio_CalculatePositions();
void func_radio_800BB388(void); void func_radio_800BB388(void);
void Radio_Draw(void); void Radio_Draw(void);

12
src/engine/fox_radio.c
View File

@ -123,7 +123,12 @@ void Radio_PlayMessage(u16* msg, RadioCharacterId character) {
gRadioMsg = msg; gRadioMsg = msg;
gRadioState = 100; gRadioState = 100;
switch (gGameState) { gRadioMsgId = Message_IdFromPtr(msg);
Audio_PlayVoice(gRadioMsgId);
}
void Radio_CalculatePositions(){
switch (gGameState) {
case GSTATE_TITLE: case GSTATE_TITLE:
gRadioPrintPosY = 176; gRadioPrintPosY = 176;
gRadioPrintPosX = OTRGetRectDimensionFromLeftEdgeOverride(85.0f); gRadioPrintPosX = OTRGetRectDimensionFromLeftEdgeOverride(85.0f);
@ -154,9 +159,6 @@ void Radio_PlayMessage(u16* msg, RadioCharacterId character) {
gRadioPortraitPosY = 178.0f; gRadioPortraitPosY = 178.0f;
break; break;
} }
gRadioMsgId = Message_IdFromPtr(msg);
Audio_PlayVoice(gRadioMsgId);
} }
s32 sRadioUseRedBox; s32 sRadioUseRedBox;
@ -454,6 +456,8 @@ void func_radio_800BB388(void) {
u16* palette; u16* palette;
f32 sp30; f32 sp30;
Radio_CalculatePositions();
if ((gGameState != GSTATE_MAP) && (gRadioTextBoxScaleY != 0.0f)) { if ((gGameState != GSTATE_MAP) && (gRadioTextBoxScaleY != 0.0f)) {
temp_fa0 = (gRadioTextBoxScaleY / 0.26f) * 3.0f; temp_fa0 = (gRadioTextBoxScaleY / 0.26f) * 3.0f;
if ((gRadioTextBoxPosY + 16.0f) <= (temp_fa0 + gRadioTextBoxPosY)) { if ((gRadioTextBoxPosY + 16.0f) <= (temp_fa0 + gRadioTextBoxPosY)) {