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

fix merge

Browse Source
This commit is contained in:
Sonic Dreamcaster 2024-09-17 21:07:20 -03:00
parent 63254ffc5e
commit 684f17c27f
18 changed files with 43 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -38,4 +38,7 @@ logs/
starship.cfg.json
default.sav
imgui.ini
.vs
.vs
default.sav
imgui.ini
starship.cfg.json

5
assets/yaml/jp/rev0/ast_A_ti.yaml
View File

@ -7,11 +7,6 @@
header:
- '#include "gfx.h"'
- '#include "sf64object.h"'
<<<<<<<< HEAD:assets/yaml/jp/rev0/ast_A_ti.yaml
========
>>>>>>>> 6fe91928 (Repo upstreamed):assets/yaml/us/rev1/ast_A_ti.yaml
D_TI_A000000:
{type: GFX, offset: 0xA000000, symbol: D_TI_A000000}

6
src/audio/audio_load.c
View File

@ -158,10 +158,6 @@ void AudioLoad_InitSampleDmaBuffers(s32 numNotes) {
u8* dma;
gSampleDmaBuffSize = 0x2D0;
<<<<<<< HEAD
=======
>>>>>>> 6fe91928 (Repo upstreamed)
for (i = 0; i < (3 * gNumNotes * gAudioBufferParams.count); i++) {
dma = AudioHeap_Alloc(&gMiscPool, gSampleDmaBuffSize);
gSampleDmas[gSampleDmaCount].ramAddr = dma;
@ -1192,7 +1188,7 @@ void AudioLoad_ProcessAsyncLoad(AudioAsyncLoad* asyncLoad, s32 resetStatus) {
}
if (asyncLoad->bytesRemaining == 0) {
msg = asyncLoad->retMsg;
msg = asyncLoad->retMsg.data32;
tableType = (msg >> 0x10) & 0xFF;
tableIndex = (msg >> 8) & 0xFF;
loadStatus = msg & 0xFF;

17
src/audio/audio_thread.c
View File

@ -73,18 +73,11 @@ SPTask* AudioThread_CreateTask(void) {
gCurAudioFrameDmaCount = 0;
AudioLoad_DecreaseSampleDmaTtls();
<<<<<<< HEAD
AudioLoad_ProcessLoads(gAudioResetStep);
if (MQ_GET_MESG(gAudioSpecQueue, &specId)) {
if (gAudioResetStep == 0) {
gAudioResetStep = 5;
=======
AudioLoad_ProcessLoads(gResetStatus);
if (osRecvMesg(&gAudioTaskMesgQueue, &sp38, 0) != -1) {
if (gResetStatus == 0) {
gResetStatus = 5;
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
}
gAudioSpecId = specId;
}
@ -123,14 +116,8 @@ SPTask* AudioThread_CreateTask(void) {
gAudioRandom = osGetCount() * (gAudioRandom + gAudioTaskCountQ);
gAudioRandom = gAiBuffers[aiBuffIndex][gAudioTaskCountQ & 0xFF] + gAudioRandom;
<<<<<<< HEAD
aiBuffIndex = gAudioTaskIndexQ;
gAudioCurTask->msgQueue = NULL;
=======
sp4C = gAudioTaskIndexQ;
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
gAudioCurTask->msg = OS_MESG_PTR(NULL);
task = &gAudioCurTask->task.t;
@ -437,11 +424,7 @@ void AudioThread_ResetAudioHeap(s32 specId) {
MQ_CLEAR_QUEUE(gAudioResetQueue);
AudioThread_ResetCmdQueue();
<<<<<<< HEAD
osSendMesg(gAudioSpecQueue, OS_MESG_32(specId), OS_MESG_NOBLOCK);
=======
osSendMesg(gAudioSpecQueue, OS_MESG_32(specId), 0);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
}
void AudioThread_PreNMIReset(void) {

8
src/engine/fox_game.c
View File

@ -377,11 +377,7 @@ void Game_Update(void) {
case GSTATE_SHOW_LOGO:
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
<<<<<<< HEAD
Lib_TextureRect_IA8(&gMasterDisp, gNintendoLogo, 128, 74, 100.0f, 86.0f, 1.0f, 1.0f);
=======
TextureRect_IA8(&gMasterDisp, gNintendoLogo, 128, 74, 100.0f, 86.0f, 1.0f, 1.0f);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
gGameState++;
break;
@ -401,11 +397,7 @@ void Game_Update(void) {
case GSTATE_LOGO_WAIT:
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
<<<<<<< HEAD
Lib_TextureRect_IA8(&gMasterDisp, gNintendoLogo, 128, 74, 100.0f, 86.0f, 1.0f, 1.0f);
=======
TextureRect_IA8(&gMasterDisp, gNintendoLogo, 128, 74, 100.0f, 86.0f, 1.0f, 1.0f);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
break;
case GSTATE_START:

8
src/engine/fox_hud.c
View File

@ -585,7 +585,8 @@ void HUD_VenomTitleCard_Draw(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Lib_TextureRect_IA8(&gMasterDisp, D_800D1C9C[i], D_800D1CA4[i], 19, D_800D1CB4[i], D_800D1CBC[i] - 28.0f, 1.0f,
Lib_TextureRect_IA8(&gMasterDisp, sVenomTitleCardDLs[i], sVenomTitleCardWidths[i], 19, sVenomTitleCardWidths[i],
sVenomTitleCardxPos[i] - 28.0f, 1.0f,
1.0f);
}
}
@ -663,7 +664,8 @@ void HUD_TitleCard_Draw(f32 x, f32 y) {
HUD_VenomTitleCard_Draw();
}
Lib_TextureRect_IA8(&gMasterDisp, sLevelTitleCard[j].titleCardTex, sLevelTitleCard[j].titleCardWidth, sLevelTitleCard[j].titleCardHeight, x2, y2, 1.0f,
Lib_TextureRect_IA8(&gMasterDisp, sLevelTitleCard[levelIdx].titleCardTex, sLevelTitleCard[levelIdx].titleCardWidth,
sLevelTitleCard[levelIdx].titleCardHeight, x2, y2, 1.0f,
1.0f);
if ((gSavedObjectLoadIndex == 0) && (gAllRangeCheckpoint == 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS) &&
@ -2699,7 +2701,7 @@ void HUD_VsModePortraitTex_Draw(f32 xPos, f32 yPos, f32 scale, s32 idx) {
};
s32 i;
Lib_TextureRect_RGBA16(&gMasterDisp, sVsModeFaceDL[arg3], 44, 44, xPos, yPos, scale, scale);
Lib_TextureRect_RGBA16(&gMasterDisp, sVsModeFaceDL[idx], 44, 44, xPos, yPos, scale, scale);
}
void HUD_EdgeArrows_Draw(s32 idx, bool arg1) {

7
src/engine/fox_load.c
View File

@ -29,18 +29,11 @@ void Load_RomFile(void* vRomAddress, void* dest, ptrdiff_t size) {
Lib_FillScreen(true);
sFillTimer = 3;
<<<<<<< HEAD
gGameStandby = true;
}
u8 Load_SceneFiles(Scene* scene) {
=======
// D_game_80161A39 = true;
}
u8 Load_SceneFiles(Scene* scene) {
#if 1
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
sCurrentScene = *scene;
return true;
#else

7
src/engine/fox_radio.c
View File

@ -427,17 +427,10 @@ void func_radio_800BAAE8(void) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
if (mirror) {
<<<<<<< HEAD
Lib_TextureRect_RGBA16_MirX(&gMasterDisp, radioPortraitTex, 44, 44, gRadioPortraitPosX,
gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f, gRadioPortraitScaleY);
} else {
Lib_TextureRect_RGBA16(&gMasterDisp, radioPortraitTex, 44, 44, gRadioPortraitPosX,
=======
TextureRect_RGBA16_MirX(&gMasterDisp, radioPortraitTex, 44, 44, gRadioPortraitPosX,
gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f, gRadioPortraitScaleY);
} else {
TextureRect_RGBA16(&gMasterDisp, radioPortraitTex, 44, 44, gRadioPortraitPosX,
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f, gRadioPortraitScaleY);
}
}

23
src/engine/fox_std_lib.c
View File

@ -311,7 +311,7 @@ void Animation_FindBoundingBox(Gfx* dList, s32 len, Vec3f* min, Vec3f* max, s32*
vtxCount, vtxList);
break;
case G_VTX:
*vtxList = SEGMENTED_TO_VIRTUAL(*var_s0 & 0xFFFFFFFF);
// *vtxList = SEGMENTED_TO_VIRTUAL(*var_s0 & 0xFFFFFFFF);
*vtxCount = (*var_s0 >> 0x30) & 0xF;
break;
case G_TRI1:
@ -1176,28 +1176,9 @@ void Graphics_DisplaySmallText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char*
} else {
xPosCurrent += 8.0f * xScale;
}
TextureRect_8bIA(&gMasterDisp, sSmallCharTex[var_t0], width, 8, xPosCurrent, yPos, xScale, yScale);
if (1) {}
}
switch (text[0]) {
case '!':
case ':':
case 'I':
xPosCurrent += 4.0f * xScale;
break;
case '-':
xPosCurrent += 6.0f * xScale;
break;
default:
if (var_t0 > 29) {
xPosCurrent += 9.0f * xScale;
} else {
xPosCurrent += 8.0f * xScale;
}
}
}
text++;
}
text++;
}
}

28
src/mods/sfxjukebox2.c
View File

@ -3,11 +3,11 @@
#include "fox_option.h"
#include "sf64audio_provisional.h"
extern s32 spectrumAnalyzerMode;
extern bool D_menu_801B9320;
extern s32 D_menu_801B9244;
extern OptionId D_menu_801B9124;
extern s32 D_menu_801B912C;
extern s32 sSpectrumAnalyzerMode;
extern bool sMusicPlaying;
extern bool sMainMenuFromCancel;
extern OptionId sMenuEntryState;
extern s32 sMainMenuState;
static s32 showJukebox = 0;
static u32 prevSfx = NA_SE_NONE;
@ -166,32 +166,32 @@ void Jukebox_Update(void) {
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
AUDIO_PLAY_SFX(sfx, sfxSource, 4);
D_menu_801B9320 = true;
sMusicPlaying = true;
}
if (contPress->button & B_BUTTON) {
if (!D_menu_801B9320) {
if (!sMusicPlaying) {
AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
AUDIO_PLAY_BGM(NA_BGM_SELECT);
gDrawMode = DRAW_NONE;
D_menu_801B9124 = 1000;
D_menu_801B912C = 0;
D_menu_801B9244 = 1;
sMenuEntryState = 1000;
sMainMenuState = 0;
sMainMenuFromCancel = 1;
return;
} else {
AUDIO_PLAY_SFX(NA_SE_CANCEL, gDefaultSfxSource, 4);
Audio_KillSfxBySource(sfxSource);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
D_menu_801B9320 = false;
sMusicPlaying = false;
}
}
// Spectrum Analyzer mode selector
if (contPress->button & Z_TRIG) {
spectrumAnalyzerMode++;
if (spectrumAnalyzerMode > 2) {
spectrumAnalyzerMode = 0;
sSpectrumAnalyzerMode++;
if (sSpectrumAnalyzerMode > 2) {
sSpectrumAnalyzerMode = 0;
}
}

4
src/overlays/ovl_ending/fox_end1.c
View File

@ -81,10 +81,10 @@ void Ending_80187520(s32 arg0) {
switch (arg0) {
case 0:
TextureRect_RGBA16(&gMasterDisp, gEndingAwardBack, 316, 270, 0.0f, 0.0f, 1.0f, 1.0f);
Lib_TextureRect_RGBA16(&gMasterDisp, gEndingAwardBack, 316, 270, 0.0f, 0.0f, 1.0f, 1.0f);
break;
case 1:
TextureRect_RGBA16(&gMasterDisp, gEndingAwardFront, 316, 240, 0.0f, 0.0f, 1.0f, 1.0f);
Lib_TextureRect_RGBA16(&gMasterDisp, gEndingAwardFront, 316, 240, 0.0f, 0.0f, 1.0f, 1.0f);
break;
}
}

2
src/overlays/ovl_menu/fox_i_menu.c
View File

@ -49,7 +49,7 @@ void OvlMenu_CallFunction(u32 mode, void* ptr) {
break;
case 999:
Title_8018F77C();
Title_64Logo_Draw();
break;
default:

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

@ -2044,7 +2044,7 @@ void Map_Texture_Sphere(u8* textureDest, u8* textureSrc, f32* offset) {
s32 j;
s32 k;
arg1 = LOAD_ASSET(arg1);
textureSrc = LOAD_ASSET(textureSrc);
for (i = 1; i < 48; i++, var_v0++) {
for (k = 0, j = *var_v0; j < (95 - *var_v0); j++, k++) {
@ -5294,8 +5294,9 @@ void Map_TitleCards_Draw(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) sMapPlanetCardAlpha);
Lib_TextureRect_IA8(&gMasterDisp, sPlanetNameCards[var_s0].texture,
sPlanetNameCards[var_s0].width, sPlanetNameCards[var_s0].height, sPlanetNameCards[var_s0].xPos, 20.0f, 1.0f, 1.0f);
Lib_TextureRect_IA8(&gMasterDisp, sPlanetNameCards[planetCardIdx].texture, sPlanetNameCards[planetCardIdx].width,
sPlanetNameCards[planetCardIdx].height, sPlanetNameCards[planetCardIdx].xPos, 20.0f, 1.0f,
1.0f);
Math_SmoothStepToF(&sMapPlanetCardAlpha, 255.0f, sMapPlanetCardAlphaScale, 10.0f, 1.0f);
@ -5394,8 +5395,7 @@ void Map_801A9A8C(void) {
Lib_TextureRect_IA8(&gMasterDisp, sPlanetNameCards[planetIdx].texture, sPlanetNameCards[planetIdx].width, sPlanetNameCards[planetIdx].height,
sPlanetNameCards[planetIdx].xPos, 94.0f, 1.0f, 1.0f);
Lib_TextureRect_IA8(&gMasterDisp, sPlanetTitleCards[planetIdx].texture, sPlanetTitleCards[planetIdx].width, sPlanetTitleCards[planetIdx].height,
D_menu_801AF914[planetIdx].xPos, 140.0f, 1.0f, 1.0f);
Lib_TextureRect_IA8(&gMasterDisp, sPlanetTitleCards[planetIdx].texture, sPlanetTitleCards[planetIdx].width, sPlanetTitleCards[planetIdx].height, sPlanetTitleCards[planetIdx].xPos, 140.0f, 1.0f, 1.0f);
}
void Map_801A9DE8(void) {
@ -5918,7 +5918,7 @@ void Map_BriefingRadio_Update(void) {
if ((D_menu_801CF018 > 0) && (D_menu_801CF018 != 100)) {
Map_BriefingRadio_Draw(gCurrentRadioPortrait);
Map_BriefingRadio_Draw(D_menu_801AF420[!D_menu_801CD940]);
if (CVarGetInteger("gLevelSelector", 0) && gCurrentPlanet == 6) {
if (CVarGetInteger("gLevelSelector", 0) && (sCurrentPlanetId == 6)) {
return;
}
func_radio_800BB388();
@ -6709,5 +6709,4 @@ CameraPoint D_menu_801B6C60[] = {
{ { -118.46446f, 1.314066f, 27.860361f }, { -111.59918f, -2.346546f, -49.750645f } },
};
#if MODS_LEVEL_SELECT == 1
#include "../../mods/levelselect.c"

8
src/overlays/ovl_menu/fox_option.c
View File

@ -2806,8 +2806,8 @@ void Option_VS_HandicapSet_Draw(s32 PlayerIdx) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Lib_TextureRect_CI4(&gMasterDisp, aVsHandicapFrameTex, aVsHandicapFrameTLUT, 80, 71, sVsHandicapFrameXpos[arg0],
sVsHandicapFrameYpos[arg0], 1.0f, 1.0f);
Lib_TextureRect_CI4(&gMasterDisp, aVsHandicapFrameTex, aVsHandicapFrameTLUT, 80, 71, sVsHandicapFrameXpos[PlayerIdx],
sVsHandicapFrameYpos[PlayerIdx], 1.0f, 1.0f);
Lib_TextureRect_CI8(&gMasterDisp, sVsCharNameTex[PlayerIdx], sVsCharNameTLUT[PlayerIdx], sCharNameWidth[PlayerIdx],
sCharNameHeight[PlayerIdx], sVsHandicapFrameXpos[PlayerIdx] + sCharNameXoffsetPos[PlayerIdx],
@ -2849,8 +2849,8 @@ void Option_VS_HandicapSet_Draw(s32 PlayerIdx) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Lib_TextureRect_RGBA16(&gMasterDisp, sVsPlayerFaceTex[arg0], 44, 44, sVsHandicapFrameXpos[arg0] + sPlayerFaceXoffsetPos,
sVsHandicapFrameYpos[arg0] + sPlayerFaceYoffsetPos, 0.7f, 0.7f);
Lib_TextureRect_RGBA16(&gMasterDisp, sVsPlayerFaceTex[PlayerIdx], 44, 44, sVsHandicapFrameXpos[PlayerIdx] + sPlayerFaceXoffsetPos,
sVsHandicapFrameYpos[PlayerIdx] + sPlayerFaceYoffsetPos, 0.7f, 0.7f);
width = 24;
if (PlayerIdx == 0) {

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

@ -232,7 +232,7 @@ void Title_Main(void) {
void Title_UpdateEntry(void) {
// LTODO: Verify this is correct
gMainController = Title_80187ABC();
gMainController = Title_CheckControllers();
if (sTimer1 > 0) {
sTimer1--;
@ -2838,11 +2838,7 @@ void Title_StarfoxLogo_Draw(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
// LTodo: Validate this
<<<<<<< HEAD
Lib_TextureRect_RGBA16(&gMasterDisp, aTitleStarfoxLogoTex, 236, 60, sTitleStarfoxLogoXpos, sTitleStarfoxLogoYpos, 1.0f, 1.0f);
=======
TextureRect_RGBA16(&gMasterDisp, gTitleStarfoxLogo, 236, 60, D_menu_801B9054, D_menu_801B9058, 1.0f, 1.0f);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
}
void Title_64Logo_Draw(void) {
@ -2888,36 +2884,21 @@ void Title_PressStart_Draw(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_85);
gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 200);
<<<<<<< HEAD
Lib_TextureRect_CI8(&gMasterDisp, aNoControllerBgTex, aNoControllerBgTLUT, 32, 32, sNoControllerBgXpos,
sNoControllerBgYpos, sNoControllerBgXscale, sNoControllerBgYscale);
// No Controller
=======
TextureRect_CI8(&gMasterDisp, D_TITLE_601D750, D_TITLE_601DB50, 32, 32, D_menu_801AE464, D_menu_801AE468,
D_menu_801AE46C, D_menu_801AE470);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, (s32) sTitleTextPrimCol, (s32) sTitleTextPrimCol, 255);
<<<<<<< HEAD
Lib_TextureRect_IA8(&gMasterDisp, aTitleNoControllerTex, 176, 24, D_menu_801AE474,
D_menu_801AE478, 1.0f, 1.0f);
=======
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, (s32) D_menu_801B7BC8, (s32) D_menu_801B7BC8, 255);
TextureRect_IA8(&gMasterDisp, gTitleNoController, 176, 24, D_menu_801AE474, D_menu_801AE478, 1.0f, 1.0f);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
} else {
// Press Start
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, (s32) sTitleTextPrimCol, (s32) sTitleTextPrimCol, 255);
<<<<<<< HEAD
Lib_TextureRect_IA8(&gMasterDisp, aTitlePressStartTex, 120, 13, 101.0f, yPos, 1.0f, 1.0f);
=======
TextureRect_IA8(&gMasterDisp, gTitlePressStart, 120, 13, 101.0f, temp2, 1.0f, 1.0f);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
}
}
}
@ -2928,11 +2909,7 @@ void Title_Copyright_Draw(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
<<<<<<< HEAD
Lib_TextureRect_IA8(&gMasterDisp, a1997NintendoTex, 120, 12, 102.0f, 209.0f, 1.0f, 1.0f);
=======
TextureRect_IA8(&gMasterDisp, gTitleNintendoCopyright, 120, 12, 102.0f, 209.0f, 1.0f, 1.0f);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
}
void Title_TeamName_Draw(void) {
@ -2961,19 +2938,11 @@ void Title_TeamName_Draw(void) {
break;
case 2:
<<<<<<< HEAD
Lib_TextureRect_IA8(&gMasterDisp, gTitleFalcoCard, 176, 13, temp_fs2, temp, 1.0f, 1.0f);
break;
case 3:
Lib_TextureRect_IA8(&gMasterDisp, gTitleFoxCard, 176, 13, temp_fs2, temp, 1.0f, 1.0f);
=======
TextureRect_IA8(&gMasterDisp, gTitleFalcoCard, 176, 13, temp_fs2, temp, 1.0f, 1.0f);
break;
case 3:
TextureRect_IA8(&gMasterDisp, gTitleFoxCard, 176, 13, temp_fs2, temp, 1.0f, 1.0f);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
break;
}
}
@ -3015,11 +2984,7 @@ void Title_SunGlare_Draw(void) {
gDPSetColorDither(gMasterDisp++, G_CD_NOISE);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801B7BD0);
<<<<<<< HEAD
Lib_TextureRect_RGBA16(&gMasterDisp, aTitleSunGlareTex, 32, 32, D_menu_801B9080, D_menu_801B9084, D_menu_801B7BB0,
=======
TextureRect_RGBA16(&gMasterDisp, gTitleSunBeam, 32, 32, D_menu_801B9080, D_menu_801B9084, D_menu_801B7BB0,
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
D_menu_801B7BB4);
D_menu_801B9080 += 1.66f;
}
@ -3142,19 +3107,11 @@ void Title_Logos_Draw(void) {
Lib_TextureRect_CI4(&gMasterDisp, aIntroInTex, aIntroInTLUT, 32, 13, 150.0f, 110.0f, 1.0f, 1.0f);
break;
<<<<<<< HEAD
case TITLE_LOGO_NINTENDO_64:
RCP_SetupDL(&gMasterDisp, 0x53);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) sStarfoxLogoAlpha);
TextureRect_16bRGBA(&gMasterDisp, aTitleN64LogoTex, 128, 88, D_menu_801B9070,
Lib_TextureRect_RGBA16(&gMasterDisp, aTitleN64LogoTex, 128, 88, D_menu_801B9070,
D_menu_801B9074, D_menu_801B9078, D_menu_801B907C);
=======
case 1:
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801B7BDC);
TextureRect_RGBA16(&gMasterDisp, gTitleNintendo64Logo, 128, 88, D_menu_801B9070, D_menu_801B9074,
D_menu_801B9078, D_menu_801B907C);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
case TITLE_LOGO_NONE:
break;
@ -3224,12 +3181,8 @@ void Title_TitleCard_Draw(void) {
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
<<<<<<< HEAD
Lib_TextureRect_IA8(&gMasterDisp, aTitleArwingCardTex, 112, 26, sTitleArwingCardXpos,
sTitleArwingCardYpos, 1.0f, 1.0f);
=======
TextureRect_IA8(&gMasterDisp, gTitleArwingCard, 112, 26, D_menu_801AE564, D_menu_801AE568, 1.0f, 1.0f);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
}
}

10
src/sys/sys_joybus.c
View File

@ -67,7 +67,7 @@ void Controller_UpdateInput(void) {
for (i = 0; i < 4; i++) {
gControllerPlugged[i] = osContGetStatus(i);
if ((gControllerPlugged[i] == 1) && (sNextController[i].errno == 0)) {
if ((gControllerPlugged[i] == 1) && (sNextController[i].err_no == 0)) {
sPrevController[i] = gControllerHold[i];
gControllerHold[i] = sNextController[i];
gControllerPress[i].button =
@ -100,11 +100,7 @@ void Controller_ReadData(void) {
void Save_ReadData(void) {
if ((gStartNMI == 0) && (Save_ReadEeprom(&gSaveIOBuffer) == 0)) {
<<<<<<< HEAD
osSendMesg(&gSaveMesgQueue, (OSMesg) SI_SAVE_SUCCESS, OS_MESG_NOBLOCK);
=======
osSendMesg(&gSaveMesgQueue, OS_MESG_32(SI_SAVE_SUCCESS), OS_MESG_PRI_NORMAL);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
return;
}
osSendMesg(&gSaveMesgQueue, OS_MESG_32(SI_SAVE_FAILED), OS_MESG_PRI_NORMAL);
@ -112,11 +108,7 @@ void Save_ReadData(void) {
void Save_WriteData(void) {
if ((gStartNMI == 0) && (Save_WriteEeprom(&gSaveIOBuffer) == 0)) {
<<<<<<< HEAD
osSendMesg(&gSaveMesgQueue, (OSMesg) SI_SAVE_SUCCESS, OS_MESG_NOBLOCK);
=======
osSendMesg(&gSaveMesgQueue, OS_MESG_32(SI_SAVE_SUCCESS), OS_MESG_PRI_NORMAL);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
return;
}
osSendMesg(&gSaveMesgQueue, OS_MESG_32(SI_SAVE_FAILED), OS_MESG_PRI_NORMAL);

92
src/sys/sys_main.c
View File

@ -105,31 +105,6 @@ void Main_Initialize(void) {
void Audio_ThreadEntry(void* arg0) {
// SPTask* task;
<<<<<<< HEAD
AudioLoad_Init();
Audio_InitSounds();
task = AudioThread_CreateTask();
if (task != NULL) {
task->mesgQueue = &gAudioTaskMesgQueue;
task->msg = OS_MESG_32(TASK_MESG_1);
osWritebackDCacheAll();
osSendMesg(&gTaskMesgQueue, OS_MESG_PTR(task), OS_MESG_PRI_NORMAL);
}
while (true) {
task = AudioThread_CreateTask();
if (task != NULL) {
task->msgQueue = &gAudioTaskMsgQueue;
task->msg = OS_MESG_32(TASK_MESG_1);
osWritebackDCacheAll();
}
MQ_GET_MESG(&gAudioTaskMesgQueue, NULL);
if (task != NULL) {
osSendMesg(&gTaskMsgQueue, OS_MESG_PTR(task), OS_MESG_PRI_NORMAL);
}
MQ_WAIT_FOR_MESG(&gAudioVImesgQueue, NULL);
}
=======
// AudioLoad_Init();
// Audio_InitSounds();
// task = AudioThread_CreateTask();
@ -152,7 +127,6 @@ void Audio_ThreadEntry(void* arg0) {
// }
// MQ_WAIT_FOR_MESG(&gAudioVImesgQueue, NULL);
// }
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
}
void Graphics_SetTask(void) {
@ -238,15 +212,9 @@ void SerialInterface_ThreadUpdate() {
void Timer_ThreadEntry(void* arg0) {
OSMesg sp24;
<<<<<<< HEAD
while (true) {
MQ_WAIT_FOR_MESG(&gTimerTaskMesgQueue, &sp24);
// Timer_CompleteTask(sp24);
=======
while (1) {
osRecvMesg(&gTimerTaskMesgQueue, &sp24, OS_MESG_BLOCK);
// Timer_CompleteTask(sp24.ptr);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
}
}
@ -387,66 +355,6 @@ void Main_HandleRSP(void) {
// }
}
<<<<<<< HEAD
void Main_GetNewTasks(void) {
u8 i;
SPTask** audioTask;
SPTask** gfxTask;
SPTask** newAudioTask;
SPTask** newGfxTask;
OSMesg spTaskMsg;
SPTask* newTask;
newAudioTask = sNewAudioTasks;
newGfxTask = sNewGfxTasks;
for (i = 0; i < ARRAY_COUNT(sNewAudioTasks); i += 1) {
*(newAudioTask++) = NULL;
}
for (i = 0; i < ARRAY_COUNT(sNewGfxTasks); i += 1) {
*(newGfxTask++) = NULL;
}
newAudioTask = sNewAudioTasks;
newGfxTask = sNewGfxTasks;
while (MQ_GET_MESG(&gTaskMesgQueue, &spTaskMsg)) {
newTask = (SPTask*) spTaskMsg.ptr;
newTask->state = SPTASK_STATE_NOT_STARTED;
switch (newTask->task.t.type) {
case M_AUDTASK:
*(newAudioTask++) = newTask;
break;
case M_GFXTASK:
*(newGfxTask++) = newTask;
break;
}
}
newAudioTask = sNewAudioTasks;
newGfxTask = sNewGfxTasks;
audioTask = sAudioTasks;
gfxTask = sGfxTasks;
for (i = 0; i < ARRAY_COUNT(sAudioTasks); i += 1, audioTask++) {
if (*audioTask == NULL) {
break;
}
}
for (i; i < ARRAY_COUNT(sAudioTasks); i += 1) {
*(audioTask++) = *(newAudioTask++);
}
for (i = 0; i < ARRAY_COUNT(sGfxTasks); i += 1, gfxTask++) {
if (*gfxTask == NULL) {
break;
}
}
for (i; i < ARRAY_COUNT(sGfxTasks); i += 1) {
*(gfxTask++) = *(newGfxTask++);
}
}
=======
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
void Main_StartNextTask(void) {
if (sAudioTasks[0] != NULL) {
if (gCurrentTask != NULL) {

2
src/sys/sys_save.c
View File

@ -20,7 +20,7 @@ s32 Save_WriteBlock(s32 arg0, u8* arg1) {
PRINTF("ＥＥＰＲＯＭ インターフェース回路反応なし (ＷＲＩＴＥ)\n");
return -1;
} else {
Timer_Wait(MSEC_TO_CYCLES(15));
// Timer_Wait(MSEC_TO_CYCLES(15));
PRINTF("EEPROM WRITE %02X: %02X %02X %02X %02X %02X %02X %02X %02X\n");
return 0;
}