mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-08-31 10:10:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'audio_fixes_v2' of https://github.com/HarbourMasters/Starship into audio_fixes_v2

Browse Source
This commit is contained in:
Sonic Dreamcaster
2024-11-18 02:28:06 -03:00
parent dfd82cbb72 ab1c87f1a3
commit d7f59ea5e2
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/fox_std_lib.c
-5
View File
@@ -83,11 +83,6 @@ void Lib_Texture_Mottle(u16* dst, u16* src, u8 mode) {
u8* src8;
s32 offset;
// LTODO: Causes corruption in the map, there's probably a badly extracted texture
if ((gGameState == GSTATE_MAP)) {
return;
}
dst = LOAD_ASSET(dst);
src = LOAD_ASSET(src);
src/overlays/ovl_menu/fox_map.c
+8 -2
View File
@@ -1989,7 +1989,7 @@ void Map_Draw(void) {
D_menu_801CEEC4 = 0;
}
Lib_Texture_Mottle((u16*) aMapVenomCloud1Tex, (u16*) D_MAP_6048F80, 5);
Lib_Texture_Mottle(aMapVenomCloudEffectTex, D_MAP_6048F80, 5);
}
s32 Map_801A05B4(void) {
@@ -4783,7 +4783,13 @@ void Map_VenomCloud_Draw(f32* zAngle, f32 next, f32 scale) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, aMapVenomCloudDL);
// @port This should be aMapVenomCloudDL but torch is stupid sometimes
u8* buffer = SEGMENTED_TO_VIRTUAL(aMapVenomCloudEffectTex);
gSPVertex(gMasterDisp++, ast_map_seg6_vtx_47F00, 8, 0);
gDPLoadTextureBlock(gMasterDisp++, buffer, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 33, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSP2Triangles(gMasterDisp++, 1, 2, 3, 0, 1, 3, 0, 0);
gDPLoadTextureBlock(gMasterDisp++, buffer + 64 * 32, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSP2Triangles(gMasterDisp++, 5, 6, 7, 0, 5, 7, 4, 0);
Matrix_Pop(&gGfxMatrix);