From be38e531769b03e50f5d06b2a9324864ad138e3a Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Mon, 20 May 2024 22:29:23 -0600 Subject: [PATCH] Bump LUS --- src/audio/audio_thread.c | 16 ++++++++++++ src/engine/fox_game.c | 8 ++++++ src/engine/fox_hud.c | 41 +++++++++++++++++++++++++++++ src/engine/fox_load.c | 8 ++++++ src/engine/fox_radio.c | 7 +++++ src/engine/fox_std_lib.c | 12 +++++++++ src/engine/fox_versus.c | 30 +++++++++++++++++++++ src/overlays/ovl_menu/fox_map.c | 42 ++++++++++++++++++++++++++++++ src/overlays/ovl_menu/fox_option.c | 14 ++++++++++ 9 files changed, 178 insertions(+) diff --git a/src/audio/audio_thread.c b/src/audio/audio_thread.c index d72016ad..8c287661 100644 --- a/src/audio/audio_thread.c +++ b/src/audio/audio_thread.c @@ -73,11 +73,18 @@ 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; } @@ -116,9 +123,14 @@ 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; @@ -425,7 +437,11 @@ 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) { diff --git a/src/engine/fox_game.c b/src/engine/fox_game.c index 5c55069d..adfcfa89 100644 --- a/src/engine/fox_game.c +++ b/src/engine/fox_game.c @@ -374,7 +374,11 @@ 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; @@ -394,7 +398,11 @@ 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: diff --git a/src/engine/fox_hud.c b/src/engine/fox_hud.c index 8c5d1f8f..4526c88d 100644 --- a/src/engine/fox_hud.c +++ b/src/engine/fox_hud.c @@ -585,7 +585,11 @@ void HUD_VenomTitleCard_Draw(void) { RCP_SetupDL(&gMasterDisp, SETUPDL_76); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); +<<<<<<< HEAD Lib_TextureRect_IA8(&gMasterDisp, D_800D1C9C[i], D_800D1CA4[i], 19, D_800D1CB4[i], D_800D1CBC[i] - 28.0f, 1.0f, +======= + TextureRect_IA8(&gMasterDisp, D_800D1C9C[i], D_800D1CA4[i], 19, D_800D1CB4[i], D_800D1CBC[i] - 28.0f, 1.0f, +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) 1.0f); } } @@ -663,7 +667,11 @@ void HUD_TitleCard_Draw(f32 x, f32 y) { HUD_VenomTitleCard_Draw(); } +<<<<<<< HEAD Lib_TextureRect_IA8(&gMasterDisp, sLevelTitleCard[j].titleCardTex, sLevelTitleCard[j].titleCardWidth, sLevelTitleCard[j].titleCardHeight, x2, y2, 1.0f, +======= + TextureRect_IA8(&gMasterDisp, D_800D1AEC[j].unk_0C, D_800D1AEC[j].unk_10, D_800D1AEC[j].unk_14, x2, y2, 1.0f, +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) 1.0f); if ((gSavedObjectLoadIndex == 0) && (gAllRangeCheckpoint == 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS) && @@ -855,6 +863,7 @@ void HUD_DrawLevelClearScreen(void) { y = 64.0f; } +<<<<<<< HEAD switch (levelClearState) { case LEVEL_CLEAR_STATE_1: if (missionStatus != MISSION_COMPLETE) { @@ -868,6 +877,21 @@ void HUD_DrawLevelClearScreen(void) { Lib_TextureRect_IA8(&gMasterDisp, aTextACCOM, 120, 23, x - 62.0f, y + 50.0f, 1.0f, 1.0f); } else { Lib_TextureRect_IA8(&gMasterDisp, aTextCOMP, 96, 23, x - 22.0f, y + 50.0f, 1.0f, 1.0f); +======= + switch (temp) { + case 1: + if (boolTemp) { + TextureRect_IA8(&gMasterDisp, aTextPLISHED, 136, 23, x + 50.0f, y + 50.0f, 1.0f, 1.0f); + } else { + TextureRect_IA8(&gMasterDisp, aTextLETE, 80, 21, x + 66.0f, y + 50.0f, 1.0f, 1.0f); + } + + case 2: + if (boolTemp) { + TextureRect_IA8(&gMasterDisp, aTextACCOM, 120, 23, x - 62.0f, y + 50.0f, 1.0f, 1.0f); + } else { + TextureRect_IA8(&gMasterDisp, aTextCOMP, 96, 23, x - 22.0f, y + 50.0f, 1.0f, 1.0f); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) } case LEVEL_CLEAR_STATE_3: @@ -998,7 +1022,11 @@ void HUD_TeammateStatus_Draw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); } +<<<<<<< HEAD Lib_TextureRect_RGBA16(&gMasterDisp, sPortraitTex[j + 1], 44, 44, x[j][0], y[j][0], 1.0f, 1.0f); +======= + TextureRect_RGBA16(&gMasterDisp, D_800D1D18[j + 1], 44, 44, x[j][0], y[j][0], 1.0f, 1.0f); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) HUD_TeamShields_Draw(x[j][2], y[j][2], shield); } @@ -1613,7 +1641,11 @@ void HUD_PauseScreen_Update(void) { RCP_SetupDL(&gMasterDisp, SETUPDL_76); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); +<<<<<<< HEAD Lib_TextureRect_IA8(&gMasterDisp, sLevelTitleCard[j].titleCardTex, sLevelTitleCard[j].titleCardWidth, sLevelTitleCard[j].titleCardHeight, x2, +======= + TextureRect_IA8(&gMasterDisp, D_800D1AEC[j].unk_0C, D_800D1AEC[j].unk_10, D_800D1AEC[j].unk_14, x2, +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) y2 + i, 1.0f, 1.0f); HUD_MsgWindowBg_Draw2(x1 - 10.0f, y0 - 4.0f, 4.7f, 2.8f); @@ -2699,7 +2731,11 @@ void HUD_VsModePortraitTex_Draw(f32 xPos, f32 yPos, f32 scale, s32 idx) { }; s32 i; +<<<<<<< HEAD Lib_TextureRect_RGBA16(&gMasterDisp, sVsModeFaceDL[arg3], 44, 44, xPos, yPos, scale, scale); +======= + TextureRect_RGBA16(&gMasterDisp, D_800D1EE8[arg3], 44, 44, arg0, arg1, arg2, arg2); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) } void HUD_EdgeArrows_Draw(s32 idx, bool arg1) { @@ -2850,8 +2886,13 @@ void HUD_VS_ShieldGaugeFrame_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { s32 i; // LTodo: [HD-Texture] Is broken +<<<<<<< HEAD u8* texture = (u8*) LOAD_ASSET(aVsShieldGaugeFrameTex); Lib_TextureRect_IA8(&gMasterDisp, texture + 2 * ((640 * i) / 2), 80, 8, xPos, (8 * i * yScale) + yPos, xScale, yScale); +======= + u8* texture = (u8*) LOAD_ASSET(D_versus_3000BC0); + TextureRect_IA8(&gMasterDisp, texture + 2 * ((640 * i) / 2), 80, 8, arg0, (8 * i * arg3) + arg1, arg2, arg3); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) } void HUD_VS_ShieldGaugeTex_Draw(f32 xPos, f32 yPos, f32 xScale, f32 yScale, f32 width) { diff --git a/src/engine/fox_load.c b/src/engine/fox_load.c index 0e3ea571..7c05f19c 100644 --- a/src/engine/fox_load.c +++ b/src/engine/fox_load.c @@ -29,10 +29,18 @@ 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 diff --git a/src/engine/fox_radio.c b/src/engine/fox_radio.c index 48ddb59e..72a5b989 100644 --- a/src/engine/fox_radio.c +++ b/src/engine/fox_radio.c @@ -427,10 +427,17 @@ 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); } } diff --git a/src/engine/fox_std_lib.c b/src/engine/fox_std_lib.c index dac86d0d..b10289b8 100644 --- a/src/engine/fox_std_lib.c +++ b/src/engine/fox_std_lib.c @@ -599,7 +599,11 @@ void Lib_TextureRect_CI8(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 (s32) (1.0f / yScale * 1024.0f)); } +<<<<<<< HEAD void Lib_TextureRect_RGBA16(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, +======= +void TextureRect_RGBA16(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) f32 yScale) { gDPSetTileCustom((*gfxPtr)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -613,7 +617,11 @@ void Lib_TextureRect_RGBA16(Gfx** gfxPtr, void* texture, u32 width, u32 height, (s32) (1.0f / yScale * 1024.0f)); } +<<<<<<< HEAD void Lib_TextureRect_RGBA16_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, +======= +void TextureRect_RGBA16_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) f32 yScale) { gDPSetTileCustom((*gfxPtr)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -627,7 +635,11 @@ void Lib_TextureRect_RGBA16_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 hei (u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f)); } +<<<<<<< HEAD void Lib_TextureRect_IA8(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) { +======= +void TextureRect_IA8(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) { +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) gDPSetTileCustom((*gfxPtr)++, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); diff --git a/src/engine/fox_versus.c b/src/engine/fox_versus.c index 8ad870d2..fca4bd73 100644 --- a/src/engine/fox_versus.c +++ b/src/engine/fox_versus.c @@ -88,7 +88,11 @@ void func_versus_800BC88C(f32 xPos, f32 yPos, f32 scale) { } void func_versus_800BC8D8(f32 xPos, f32 yPos, f32 scale) { +<<<<<<< HEAD Lib_TextureRect_CI8(&gMasterDisp, D_versus_300A470, D_versus_300B218, 152, 23, xPos, yPos, scale, scale); +======= + TextureRect_CI8(&gMasterDisp, D_versus_300A470, D_versus_300B218, 152, 23, xPos, yPos, scale, scale); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) } void func_versus_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) { @@ -96,12 +100,20 @@ void func_versus_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) { u8* D_800D4ABC[] = { D_versus_30087A0, D_versus_3008EC0, D_versus_3009990 }; s32 D_800D4AB0[] = { 40, 64, 64 }; +<<<<<<< HEAD Lib_TextureRect_CI8(&gMasterDisp, D_800D4ABC[yScale], D_800D4AA4[yScale], D_800D4AB0[yScale], 40, xPos, yPos, scale, +======= + TextureRect_CI8(&gMasterDisp, D_800D4ABC[yScale], D_800D4AA4[yScale], D_800D4AB0[yScale], 40, xPos, yPos, scale, +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) scale); } void func_versus_800BCB44(f32 xPos, f32 yPos, f32 scale) { +<<<<<<< HEAD Lib_TextureRect_CI8(&gMasterDisp, D_versus_3006C60, D_versus_3007500, 96, 23, xPos, yPos, scale, scale); +======= + TextureRect_CI8(&gMasterDisp, D_versus_3006C60, D_versus_3007500, 96, 23, xPos, yPos, scale, scale); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) } void func_versus_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4) { @@ -109,11 +121,16 @@ void func_versus_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4) u8* D_800D4AD8[] = { D_versus_3006040, D_versus_30076C0, D_versus_300B3F0, D_versus_3004F60 }; s32 D_800D4AE8[] = { 104, 152, 168, 152 }; +<<<<<<< HEAD Lib_TextureRect_CI8(&gMasterDisp, D_800D4AD8[arg4], D_800D4AC8[arg4], D_800D4AE8[arg4], 25, xPos, yPos, xScale, +======= + TextureRect_CI8(&gMasterDisp, D_800D4AD8[arg4], D_800D4AC8[arg4], D_800D4AE8[arg4], 25, xPos, yPos, xScale, +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) yScale); } void func_versus_800BCE24(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { +<<<<<<< HEAD Lib_TextureRect_CI8(&gMasterDisp, D_versus_3001420, D_versus_3003E20, 256, 42, xPos, yPos, xScale, yScale); } @@ -121,6 +138,13 @@ void func_versus_800BCEF8(f32 xPos, f32 yPos, f32 scale) { s32 i; Lib_TextureRect_CI8(&gMasterDisp, D_versus_3004010, D_versus_3004D58, 136, 25, xPos, yPos, scale, scale); +======= + TextureRect_CI8(&gMasterDisp, D_versus_3001420, D_versus_3003E20, 256, 42, xPos, yPos, xScale, yScale); +} + +void func_versus_800BCEF8(f32 xPos, f32 yPos, f32 scale) { + TextureRect_CI8(&gMasterDisp, D_versus_3004010, D_versus_3004D58, 136, 25, xPos, yPos, scale, scale); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) } void func_versus_800BCFFC(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { @@ -168,9 +192,15 @@ void func_versus_800BD350(f32 xPos, f32 yPos) { } void func_versus_800BD3A8(f32 xPos, f32 yPos) { +<<<<<<< HEAD s32 i; Lib_TextureRect_CI4(&gMasterDisp, aVsHandicapFrameTex + ((80 * 8 * i) / 2), aVsHandicapFrameTLUT, 80, 71, xPos, yPos, 1.0f, +======= + s32 i = 0; + + TextureRect_CI4(&gMasterDisp, D_VS_MENU_70118E0 + ((80 * 8 * i) / 2), D_VS_MENU_70123F8, 80, 71, xPos, yPos, 1.0f, +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) 1.0f); } diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c index 7c132163..858d0c0d 100644 --- a/src/overlays/ovl_menu/fox_map.c +++ b/src/overlays/ovl_menu/fox_map.c @@ -2201,15 +2201,27 @@ void Map_Prologue_Draw(void) { Lib_TextureRect_RGBA16(&gMasterDisp, sPrologueTextures[sPrologueTexIdx], 96, 52, 109.0f, 24.0f, 1.0f, 1.0f); +<<<<<<< HEAD // Next Prologue texture if ((sPrologueNextTexAlpha != 0) && ((sPrologueTexIdx + 1) < 7)) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sPrologueNextTexAlpha); +======= + TextureRect_RGBA16(&gMasterDisp, D_menu_801B6954[D_menu_801CD9F0], 96, 52, 109.0f, 24.0f, 1.0f, 1.0f); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) Lib_TextureRect_RGBA16(&gMasterDisp, sPrologueTextures[sPrologueTexIdx + 1], 96, 52, 109.0f, 24.0f, 1.0f, 1.0f); +<<<<<<< HEAD if (sPrologueNextTexAlpha == 255) { sPrologueNextTexAlpha = 0; sPrologueTexIdx++; +======= + TextureRect_RGBA16(&gMasterDisp, D_menu_801B6954[D_menu_801CD9F0 + 1], 96, 52, 109.0f, 24.0f, 1.0f, 1.0f); + + if (D_menu_801CD9E4 == 255) { + D_menu_801CD9E4 = 0; + D_menu_801CD9F0++; +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) } } } @@ -2385,7 +2397,11 @@ void Map_LylatCard_Draw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801CEA9C); +<<<<<<< HEAD Lib_TextureRect_IA8(&gMasterDisp, D_MAP_600D590, 168, 19, 72.0f, 104.0f, 1.0f, 1.0f); +======= + TextureRect_IA8(&gMasterDisp, D_MAP_600D590, 168, 19, 72.0f, 104.0f, 1.0f, 1.0f); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) } void Map_ZoomPlanet_Setup(void) { @@ -5294,8 +5310,13 @@ void Map_TitleCards_Draw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) sMapPlanetCardAlpha); +<<<<<<< HEAD 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); +======= + TextureRect_IA8(&gMasterDisp, D_menu_801AF834[var_s0].texture, D_menu_801AF834[var_s0].width, + D_menu_801AF834[var_s0].height, D_menu_801AF834[var_s0].xPos, 20.0f, 1.0f, 1.0f); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) Math_SmoothStepToF(&sMapPlanetCardAlpha, 255.0f, sMapPlanetCardAlphaScale, 10.0f, 1.0f); @@ -5388,6 +5409,7 @@ void Map_801A9A8C(void) { return; } +<<<<<<< HEAD Lib_TextureRect_IA8(&gMasterDisp, aTextMissionNo, 112, 19, sCardXpos[0], sCardYpos[0], 1.0f, 1.0f); Lib_TextureRect_IA8(&gMasterDisp, missionNoTex, 16, 15, sCardXpos[1], sCardYpos[1], 1.0f, 1.0f); @@ -5396,6 +5418,16 @@ void Map_801A9A8C(void) { Lib_TextureRect_IA8(&gMasterDisp, sPlanetTitleCards[planetIdx].texture, sPlanetTitleCards[planetIdx].width, sPlanetTitleCards[planetIdx].height, D_menu_801AF914[planetIdx].xPos, 140.0f, 1.0f, 1.0f); +======= + TextureRect_IA8(&gMasterDisp, aTextMissionNo, 112, 19, D_menu_801B6AC0[0], D_menu_801B6AC8[0], 1.0f, 1.0f); + TextureRect_IA8(&gMasterDisp, missionNoTex, 16, 15, D_menu_801B6AC0[1], D_menu_801B6AC8[1], 1.0f, 1.0f); + + TextureRect_IA8(&gMasterDisp, D_menu_801AF834[sp58].texture, D_menu_801AF834[sp58].width, + D_menu_801AF834[sp58].height, D_menu_801AF834[sp58].xPos, 94.0f, 1.0f, 1.0f); + + TextureRect_IA8(&gMasterDisp, D_menu_801AF914[sp58].texture, D_menu_801AF914[sp58].width, + D_menu_801AF914[sp58].height, D_menu_801AF914[sp58].xPos, 140.0f, 1.0f, 1.0f); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) } void Map_801A9DE8(void) { @@ -5916,9 +5948,15 @@ void Map_BriefingRadio_Update(void) { } if ((D_menu_801CF018 > 0) && (D_menu_801CF018 != 100)) { +<<<<<<< HEAD Map_BriefingRadio_Draw(gCurrentRadioPortrait); Map_BriefingRadio_Draw(D_menu_801AF420[!D_menu_801CD940]); if (CVarGetInteger("gLevelSelector", 0) && gCurrentPlanet == 6) { +======= + Map_801AB978(gCurrentRadioPortrait); + Map_801AB978(D_menu_801AF420[!D_menu_801CD940]); + if (CVarGetInteger("gLevelSelector", 0) && gCurrentLevel == 6) { +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) return; } func_radio_800BB388(); @@ -5947,7 +5985,11 @@ void Map_BriefingRadio_Draw(s32 arg0) { xPos = 205.0f; yPos = 77.0f; +<<<<<<< HEAD Lib_TextureRect_RGBA16(&gMasterDisp, D_MAP_6044820, 92, 51, xPos, yPos, 1.0f, 1.0f); +======= + TextureRect_RGBA16(&gMasterDisp, D_MAP_6044820, 92, 51, xPos, yPos, 1.0f, 1.0f); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) if (arg0 == 21) { Lib_TextureRect_RGBA16(&gMasterDisp, D_MAP_6046CD0, 32, 34, xPos + 47.0, yPos, 1.0f, 1.0f); diff --git a/src/overlays/ovl_menu/fox_option.c b/src/overlays/ovl_menu/fox_option.c index 5004e7a4..0fc8f5f9 100644 --- a/src/overlays/ovl_menu/fox_option.c +++ b/src/overlays/ovl_menu/fox_option.c @@ -2806,8 +2806,13 @@ void Option_VS_HandicapSet_Draw(s32 PlayerIdx) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); +<<<<<<< HEAD Lib_TextureRect_CI4(&gMasterDisp, aVsHandicapFrameTex, aVsHandicapFrameTLUT, 80, 71, sVsHandicapFrameXpos[arg0], sVsHandicapFrameYpos[arg0], 1.0f, 1.0f); +======= + TextureRect_CI4(&gMasterDisp, D_VS_MENU_70118E0, D_VS_MENU_70123F8, 80, 71, D_menu_801AF148[arg0], + D_menu_801AF158[arg0], 1.0f, 1.0f); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) Lib_TextureRect_CI8(&gMasterDisp, sVsCharNameTex[PlayerIdx], sVsCharNameTLUT[PlayerIdx], sCharNameWidth[PlayerIdx], sCharNameHeight[PlayerIdx], sVsHandicapFrameXpos[PlayerIdx] + sCharNameXoffsetPos[PlayerIdx], @@ -2849,8 +2854,13 @@ void Option_VS_HandicapSet_Draw(s32 PlayerIdx) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); +<<<<<<< HEAD Lib_TextureRect_RGBA16(&gMasterDisp, sVsPlayerFaceTex[arg0], 44, 44, sVsHandicapFrameXpos[arg0] + sPlayerFaceXoffsetPos, sVsHandicapFrameYpos[arg0] + sPlayerFaceYoffsetPos, 0.7f, 0.7f); +======= + TextureRect_RGBA16(&gMasterDisp, D_menu_801AF20C[arg0], 44, 44, D_menu_801AF148[arg0] + D_menu_801AF1B4, + D_menu_801AF158[arg0] + D_menu_801AF1B8, 0.7f, 0.7f); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) width = 24; if (PlayerIdx == 0) { @@ -2869,7 +2879,11 @@ void Option_VS_N64Console_Draw(void) { RCP_SetupDL_76(); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); +<<<<<<< HEAD Lib_TextureRect_RGBA16(&gMasterDisp, aVsN64ConsoleTex, 144, 42, 87.0f, 84, 1.0f, 1.0f); +======= + TextureRect_RGBA16(&gMasterDisp, D_VS_MENU_700E9A0, 144, 42, 87.0f, 84, 1.0f, 1.0f); +>>>>>>> edd7dba2 (Fixed all remaining compilation issues) } void Option_VersusStage_Setup(void) {